Merge branch 'RES-196-red-hotfix-persistent-service-address' into 'master'

Resolve RES-196 "Red hotfix persistent service address"

Closes RES-196

See merge request redactmanager/image-classification-service!2

.gitlab-ci.yml

@@ -1,4 +1,4 @@
 include:
-  - project: 'Gitlab/gitlab'
-    ref: 0.2.1
-    file: '/ci-templates/research/red-dvc_versioning_build_gitlab-ci.yml'
+  - project: "Gitlab/gitlab"
+    ref: 0.2.3
+    file: "/ci-templates/research/red-dvc_versioning_build_gitlab-ci.yml"

Dockerfile

@@ -20,7 +20,9 @@ ENV PATH="$POETRY_HOME/bin:$PATH"
 RUN curl -sSL https://install.python-poetry.org | python3 -
 
 COPY ./data ./data
-COPY pyproject.toml poetry.lock banner.txt config.yaml ./src ./image_prediction ./
+COPY ./scripts ./scripts
+COPY ./image_prediction ./image_prediction
+COPY pyproject.toml poetry.lock banner.txt config.yaml ./src ./
 
 RUN poetry config virtualenvs.create false && \
     poetry config installer.max-workers 10 && \

Dockerfile_tests

@@ -20,7 +20,9 @@ ENV PATH="$POETRY_HOME/bin:$PATH"
 RUN curl -sSL https://install.python-poetry.org | python3 -
 
 COPY ./data ./data
-COPY pyproject.toml poetry.lock banner.txt config.yaml ./src ./image_prediction ./
+COPY ./image_prediction ./image_prediction
+COPY ./test ./test
+COPY pyproject.toml poetry.lock banner.txt config.yaml ./src ./
 
 RUN poetry config virtualenvs.create false && \
     poetry config installer.max-workers 10 && \

pyproject.toml

@@ -1,17 +1,17 @@
 [tool.poetry]
 name = "image-classification-service"
-version = "1.29.2"
+version = "1.30.2"
 description = ""
 authors = ["Team Research <research@knecon.com>"]
 readme = "README.md"
-packages = [{include = "image_prediction"}]
+packages = [{ include = "image_prediction" }]
 
 [tool.poetry.dependencies]
 python = "~3.8"
 dvc = "^2.34.0"
 dvc-ssh = "^2.20.0"
 dvc-azure = "^2.21.2"
-pyinfra = {version = "1.5.8", source = "gitlab-research"}
+pyinfra = { version = "1.5.9", source = "gitlab-research" }
 Flask = "^2.1.1"
 requests = "^2.27.1"
 iteration-utilities = "^0.11.0"
@@ -35,9 +35,13 @@ protobuf = "^3.20.0"
 fsspec = "^2022.11.0"
 PyMonad = "^2.4.0"
 pdfnetpython3 = "9.4.2"
+loguru = "^0.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.0.1"
+pymonad = "^2.4.0"
+pylint = "^2.17.4"
+ipykernel = "^6.23.2"
 
 [tool.pytest.ini_options]
 testpaths = ["test"]

scripts/docker_build_run.sh

@@ -0,0 +1,6 @@
+docker build -t image-clsasification-service:$(poetry version -s)-dev \                                                               
+    -f Dockerfile \
+    --build-arg USERNAME=$GITLAB_USER \
+    --build-arg TOKEN=$GITLAB_ACCESS_TOKEN \
+    . && \
+docker run -it --rm image-clsasification-service:$(poetry version -s)-dev

scripts/docker_tag_push.sh

@@ -0,0 +1,3 @@
+docker tag image-clsasification-service:$(poetry version -s)-dev $NEXUS_REGISTRY/red/image-clsasification-service:$(poetry version -s)-dev
+
+docker push $NEXUS_REGISTRY/red/image-clsasification-service:$(poetry version -s)-dev

scripts/k8s_startup_probe.py

@@ -0,0 +1,6 @@
+from pyinfra.k8s_probes import startup
+from loguru import logger
+
+if __name__ == "__main__":
+    logger.debug("running health check")
+    startup.run_checks()