diff --git a/distribution/philter.properties b/distribution/philter.properties index 2b629e9..eb565e1 100644 --- a/distribution/philter.properties +++ b/distribution/philter.properties @@ -1,7 +1,7 @@ # General configuration server.port=8080 logging.level.root=INFO -ner.endpoint=http://philter-ner:18080 +ner.endpoint=http://ph-eye:18080 # Span Disambiguation span.disambiguation.enabled=false diff --git a/docker-compose.yaml b/docker-compose.yaml index b18f571..d8ca5fe 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,14 +1,18 @@ services: - philter-ner: - image: philterd/philter-ner:2.5.0-general-lite-3.0 + ph-eye: + image: philterd/ph-eye:1.0.0 ports: - - "8000:18080" + - "18080:5000" networks: - philter + environment: + model_name: "urchade/gliner_medium-v2.1" philter: depends_on: - - philter-ner + - ph-eye image: philterd/philter:2.5.0 + environment: + ner.endpoint: http://ph-eye:18080/ ports: - "8080:8080" networks: @@ -18,7 +22,6 @@ services: # - NVIDIA_VISIBLE_DEVICES=all philter-ui: depends_on: - - philter-ner - philter image: philterd/philter-ui:2.5.0 ports: diff --git a/philter-api/src/main/java/ai/philterd/philter/api/controllers/AbstractController.java b/philter-api/src/main/java/ai/philterd/philter/api/controllers/AbstractController.java index af0ec4d..b69a852 100644 --- a/philter-api/src/main/java/ai/philterd/philter/api/controllers/AbstractController.java +++ b/philter-api/src/main/java/ai/philterd/philter/api/controllers/AbstractController.java @@ -20,7 +20,7 @@ public abstract class AbstractController { protected String getPythonRESTServiceStatus(String philterNerEndpoint) { - LOGGER.trace("Retrieving philter-ner status."); + LOGGER.trace("Retrieving ph-eye status."); final HttpClient client = HttpClientBuilder.create().build(); @@ -42,12 +42,12 @@ protected String getPythonRESTServiceStatus(String philterNerEndpoint) { if (entity != null) { final String response = EntityUtils.toString(entity); - LOGGER.debug("philter-ner status response: {}", response); + LOGGER.debug("ph-eye status response: {}", response); return response; } else { - LOGGER.debug("Received empty response from philter-ner status."); + LOGGER.debug("Received empty response from ph-eye status."); } diff --git a/philter-api/src/main/java/ai/philterd/philter/api/controllers/StatusApiController.java b/philter-api/src/main/java/ai/philterd/philter/api/controllers/StatusApiController.java index 6ee227a..c18c123 100644 --- a/philter-api/src/main/java/ai/philterd/philter/api/controllers/StatusApiController.java +++ b/philter-api/src/main/java/ai/philterd/philter/api/controllers/StatusApiController.java @@ -33,7 +33,7 @@ public ResponseEntity status() throws IOException { final String health = getPythonRESTServiceStatus(phileasConfiguration.nerEndpoint()); - LOGGER.info("philter-ner status is: {}", health); + LOGGER.info("ph-eye status is: {}", health); if(health.startsWith("healthy:")) {