Presidio maintenance

presidio/.gitignore

@@ -0,0 +1 @@
+__pycache__/

presidio/Dockerfile

@@ -1,19 +1,25 @@
-FROM python:3.9-slim
+FROM python:3.11-slim
 
-ARG NAME
-ARG NLP_CONF_FILE=conf/default.yaml
+ARG NLP_CONF_FILE=server/conf/default.yaml
+
+ENV PORT=3000
 ENV PIPENV_VENV_IN_PROJECT=1
 ENV PIP_NO_CACHE_DIR=1
-WORKDIR /usr/bin/${NAME}
 
-COPY ./Pipfile* /usr/bin/${NAME}/
-RUN pip install pipenv \
-  && pipenv sync
+EXPOSE ${PORT}
+WORKDIR /app
+
+COPY ./Pipfile* /app/
+RUN \
+    pip install pipenv \
+    && pipenv sync
+
 # install nlp models specified in conf/default.yaml
-COPY ./install_nlp_models.py /usr/bin/${NAME}/
-COPY ${NLP_CONF_FILE} /usr/bin/${NAME}/${NLP_CONF_FILE}
-RUN pipenv run python install_nlp_models.py --conf_file ${NLP_CONF_FILE}
+COPY ./scripts/ /app/scripts/
+COPY ${NLP_CONF_FILE} /app/${NLP_CONF_FILE}
 
-COPY . /usr/bin/${NAME}/
-EXPOSE ${PORT}
-CMD pipenv run python app.py --host 0.0.0.0
+RUN pipenv run python scripts/install_nlp_models.py --conf_file /app/${NLP_CONF_FILE}
+
+COPY server/ /app/server/
+
+CMD pipenv run python /app/server --host 0.0.0.0

presidio/Pipfile

@@ -4,19 +4,19 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-presidio_analyzer = "2.2.33"
-presidio_anonymizer = "2.2.33"
-spacy = ">=3.4.4"
+flake8 = "*"
+flask = "*"
+phonenumbers = "*"
+presidio-analyzer = "*"
+presidio-anonymizer = "*"
+pyyaml = "*"
 regex = "*"
+spacy = "*"
 tldextract = "*"
-flask = ">=1.1"
-pyyaml = "*"
-phonenumbers = ">=8.12"
 typing-extensions = "*"
 
 [dev-packages]
-pytest = "*"
-flake8= {version = ">=3.7.9"}
-pep8-naming = "*"
 flake8-docstrings = "*"
+pep8-naming = "*"
 pre_commit = "*"
+pytest = "*"

presidio/local-testing.http

@@ -0,0 +1,24 @@
+POST http://localhost:3000/batchanalyze
+Content-Type: application/json
+Accept: application/json
+
+{
+  "json_to_analyze": {
+    "key_F": {
+      "key_a1": "My phone number is 212-121-1424"
+    },
+    "URL": "www.abc.com",
+    "key_c": 3,
+    "names": [
+      "James Bond",
+      "Clark Kent",
+      "Hakeem Olajuwon",
+      "No name here!"
+    ],
+    "address": "200 University Ave West, Waterloo ON N2L5G7, Canada",
+    "DOB": "01-01-1989",
+    "gender": "Female",
+    "race": "Asian",
+    "language": "French"
+  }
+}