Skip to content

Commit 3fd2050

Browse files
committed
Working on removing git lfs.
1 parent 2188056 commit 3fd2050

File tree

5 files changed

+37
-29005
lines changed

5 files changed

+37
-29005
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ distribution/indexes
1616
distribution/documentation/
1717
manifest.json
1818
.attach_*
19+
*.onnx
20+
vocab.txt

download-models.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash -e
2+
3+
# todo: download onnx model
4+
cp model.onnx ./phileas/phileas-core/src/test/resources/models/model.onnx
5+
cp model.onnx ./phileas-services/phileas-services-ai/src/test/resources/models/model.onnx
6+

phileas-core/src/test/java/ai/philterd/test/phileas/services/filters/PersonsV2FilterTest.java

+29-6
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.mockito.Mockito;
3434

3535
import java.io.File;
36+
import java.net.URISyntaxException;
3637
import java.util.LinkedHashMap;
3738
import java.util.List;
3839
import java.util.Map;
@@ -44,13 +45,15 @@ public class PersonsV2FilterTest extends AbstractFilterTest {
4445

4546
private static final Logger LOGGER = LogManager.getLogger(PersonsV2FilterTest.class);
4647

47-
private AlertService alertService = Mockito.mock(AlertService.class);
48-
private MetricsService metricsService = Mockito.mock(MetricsService.class);
48+
private final AlertService alertService = Mockito.mock(AlertService.class);
49+
private final MetricsService metricsService = Mockito.mock(MetricsService.class);
4950

5051
@Test
5152
@DisabledOnOs({WINDOWS, MAC})
5253
public void filter1() throws Exception {
5354

55+
Assertions.assertTrue(modelFilesExist());
56+
5457
final FilterConfiguration filterConfiguration = new FilterConfiguration.FilterConfigurationBuilder()
5558
.withStrategies(List.of(new PersonsFilterStrategy()))
5659
.withAlertService(alertService)
@@ -84,6 +87,8 @@ public void filter1() throws Exception {
8487
@DisabledOnOs({WINDOWS, MAC})
8588
public void filter2() throws Exception {
8689

90+
Assertions.assertTrue(modelFilesExist());
91+
8792
final FilterConfiguration filterConfiguration = new FilterConfiguration.FilterConfigurationBuilder()
8893
.withStrategies(List.of(new PersonsFilterStrategy()))
8994
.withAlertService(alertService)
@@ -124,6 +129,8 @@ public void filter2() throws Exception {
124129
@DisabledOnOs({WINDOWS, MAC})
125130
public void filter3() throws Exception {
126131

132+
Assertions.assertTrue(modelFilesExist());
133+
127134
final FilterConfiguration filterConfiguration = new FilterConfiguration.FilterConfigurationBuilder()
128135
.withStrategies(List.of(new PersonsFilterStrategy()))
129136
.withAlertService(alertService)
@@ -152,16 +159,14 @@ public void filter3() throws Exception {
152159

153160
Assertions.assertEquals(3, filterResult.getSpans().size());
154161

155-
//Assertions.assertTrue(checkSpanInSpans(filterResult.getSpans(), 1181, 1194, FilterType.PERSON, "Reverend King", "{{{REDACTED-person}}}"));
156-
//Assertions.assertTrue(checkSpanInSpans(filterResult.getSpans(), 1154, 1175, FilterType.PERSON, "Barbara Ferrer Ferrer", "{{{REDACTED-person}}}"));
157-
//Assertions.assertTrue(checkSpanInSpans(filterResult.getSpans(), 1043, 1061, FilterType.PERSON, "Martin Luther King", "{{{REDACTED-person}}}"));
158-
159162
}
160163

161164
@Test
162165
@DisabledOnOs({WINDOWS, MAC})
163166
public void filter4() throws Exception {
164167

168+
Assertions.assertTrue(modelFilesExist());
169+
165170
final FilterConfiguration filterConfiguration = new FilterConfiguration.FilterConfigurationBuilder()
166171
.withStrategies(List.of(new PersonsFilterStrategy()))
167172
.withAlertService(alertService)
@@ -196,6 +201,8 @@ public void filter4() throws Exception {
196201
@DisabledOnOs({WINDOWS, MAC})
197202
public void filter5() throws Exception {
198203

204+
Assertions.assertTrue(modelFilesExist());
205+
199206
final FilterConfiguration filterConfiguration = new FilterConfiguration.FilterConfigurationBuilder()
200207
.withStrategies(List.of(new PersonsFilterStrategy()))
201208
.withAlertService(alertService)
@@ -232,6 +239,8 @@ public void filter5() throws Exception {
232239
@DisabledOnOs({WINDOWS, MAC})
233240
public void filter6() throws Exception {
234241

242+
Assertions.assertTrue(modelFilesExist());
243+
235244
final FilterConfiguration filterConfiguration = new FilterConfiguration.FilterConfigurationBuilder()
236245
.withStrategies(List.of(new PersonsFilterStrategy()))
237246
.withAlertService(alertService)
@@ -264,4 +273,18 @@ public void filter6() throws Exception {
264273

265274
}
266275

276+
private boolean modelFilesExist() throws URISyntaxException {
277+
278+
try {
279+
new File(getClass().getClassLoader().getResource("models/model.onnx").toURI());
280+
new File(getClass().getClassLoader().getResource("models/vocab.txt").toURI());
281+
} catch (NullPointerException ex) {
282+
LOGGER.warn("Unable to read the required models/model.onnx and/or models.vocab.txt for unit test. Ensure both files exist.");
283+
return false;
284+
}
285+
286+
return true;
287+
288+
}
289+
267290
}

phileas-core/src/test/resources/models/model.onnx

-3
This file was deleted.

0 commit comments

Comments
 (0)