Fix Model Info Displays in Tool Controller (#32)

* Passthrough CONFIG_NAME Build Arg in Dockerfile

* Fix Format String in Tool Controller

* Specify CONFIG_NAME in CI Docker Build

* Add Good Build Arg Defaults to docker-compose.yml

* Remove Extraneous Enum from config.py; Add Better Diagnostic Defaults

Author: boyleconnor

.github/workflows/ci.yml

@@ -159,6 +159,7 @@ jobs:
         tags: ${{ env.tags }}
         build-args: |
           MODEL_NAME=${{ env.MODEL_NAME }}
+          CONFIG_NAME=${{ env.CONFIG_NAME }}
         labels: |
           org.opencontainers.image.created=${{ env.created }}
           org.opencontainers.image.source=${{ github.repositoryUrl }}

docker-compose.yml

@@ -5,8 +5,9 @@ services:
     image: docker.synapse.org/syn22277123/phi-annotator-huggingface
     build:
       context: server
-      # args:
-        # MODEL_NAME: "dslim/bert-base-NER"
+      args:
+        MODEL_NAME: "dslim/bert-base-NER-uncased"
+        CONFIG_NAME: "bert-base-ner-uncased"
     container_name: phi-annotator
     networks:
       - nlpsandbox-internal

server/Dockerfile

@@ -1,8 +1,10 @@
 FROM python:3.9.6-slim-buster
 
-ARG MODEL_NAME="dslim/bert-base-NER"
+ARG MODEL_NAME
+ARG CONFIG_NAME
 
 ENV APP_DIR=/opt/app
+ENV CONFIG_NAME=${CONFIG_NAME}
 
 SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]
 

server/openapi_server/config.py

@@ -1,18 +1,12 @@
 import os
-from enum import Enum
+
 
 defaultValues = {
-    "CONFIG_NAME": "",
-    "MODEL_NAME": ""
+    "CONFIG_NAME": "<UNSPECIFIED>",
+    "MODEL_NAME": "<UNSPECIFIED>"
 }
 
 
-class ConfigName(Enum):
-    BERT_BASE_NER = "bert-base-ner"
-    BERT_BASE_NER_UNCASED = "bert-base-ner-uncased"
-    BERT_LARGE_NER = "bert-large-ner"
-
-
 class AbstractConfig(object):
     """
     Parent class containing get_property to return the environment variable or
@@ -32,10 +26,9 @@ def get_property(self, property_name):
 
 
 class Config(AbstractConfig):
-    """
-    This class is used to provide coniguration values to the application, first
-    using environment variables and if not found, defaulting to those values
-    provided in the defaultValues dictionary above.
+    """This class is used to provide configuration values to the application,
+    first using environment variables and if not found, defaulting to those
+    values provided in the defaultValues dictionary above.
     """
 
     @property

server/openapi_server/controllers/tool_controller.py

@@ -18,7 +18,7 @@ def get_tool():  # noqa: E501
         version="1.0.0",
         license=License.APACHE_2_0,
         repository="github:nlpsandbox/phi-annotator-huggingface",
-        description="Hugging Face PHI annotator ({config.model_name})",
+        description=f"Hugging Face PHI annotator ({config.model_name})",
         author="NLP Sandbox Team",
         author_email="team@nlpsandbox.io",
         url="https://github.com/nlpsandbox/phi-annotator-huggingface",