From 482aa475eba3fdde28675b4efe96601679e47444 Mon Sep 17 00:00:00 2001
From: vladd-bit <vlad.a.dinu@gmail.com>
Date: Fri, 27 Sep 2024 15:59:56 +0100
Subject: [PATCH] Updated MedCAT to v1.13, pinpointed transformer version (tmp
 fix).

---
 docker/docker-compose-gpu.yml   | 40 +++++++++++++++++++++++++++++++++
 docker/docker-compose.yml       | 11 ---------
 medcat_service/requirements.txt | 18 ++++++++-------
 3 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 docker/docker-compose-gpu.yml

diff --git a/docker/docker-compose-gpu.yml b/docker/docker-compose-gpu.yml
new file mode 100644
index 0000000..6047add
--- /dev/null
+++ b/docker/docker-compose-gpu.yml
@@ -0,0 +1,40 @@
+services:
+  nlp-medcat-service-production:
+    container_name: cogstack-medcat-service-production
+    ### Multiple images available:
+    ## default image, only CPU support: cogstacksystems/medcat-service:latest 
+    ## GPU support: cogstacksystems/medcat-service-gpu:latest
+    # image: cogstacksystems/medcat-service:latest
+    platform: linux
+    restart: always
+    ## Default dockerfile: ../Dockerfile
+    ## GPU dockerfile: ../Dockerfile_gpu
+    build:
+      context: ../
+      dockerfile: "Dockerfile_gpu"
+    environment:
+      - http_proxy=$HTTP_PROXY
+      - https_proxy=$HTTPS_PROXY
+      - no_proxy=$no_proxy
+    env_file:
+      - ../envs/env_app
+      - ../envs/env_medcat
+    volumes:
+    - ../models:/cat/models/:rw
+    ports:
+      - "5555:5000"
+    networks:
+      - cognet
+    
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: 1
+              device_ids: ['0']
+              capabilities: ["gpu", "utility", "compute", "video"]
+      
+networks:
+  cognet:
+    name: cogstack-net
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 9449286..e23fd3d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.6"
-
 services:
   nlp-medcat-service-production:
     container_name: cogstack-medcat-service-production
@@ -27,15 +25,6 @@ services:
       - "5555:5000"
     networks:
       - cognet
-    
-    # uncomment this only when you have gpu access  
-    #deploy:
-    #  resources:
-    #    reservations:
-    #      devices:
-    #        - driver: nvidia
-    #          device_ids: ['0']
-    #          capabilities: ["gpu", "utility", "compute", "video"]
       
 networks:
   cognet:
diff --git a/medcat_service/requirements.txt b/medcat_service/requirements.txt
index 63db853..dbac93d 100644
--- a/medcat_service/requirements.txt
+++ b/medcat_service/requirements.txt
@@ -1,9 +1,11 @@
-Flask==3.0.2
-gunicorn==22.0.0
-injector==0.21.0
+Flask==3.0.3
+gunicorn==23.0.0
+injector==0.22.0
 flask-injector==0.15.0
-medcat==1.12.0
-setuptools==65.5.1
-simplejson==3.19.2
-werkzeug==3.0.3
-setuptools_rust==1.9.0
\ No newline at end of file
+setuptools==75.1.0
+simplejson==3.19.3
+werkzeug==3.0.4
+setuptools_rust==1.10.1
+medcat==1.13.0
+# pinned because of issues with de-id models and past models (it will not do any de-id)
+transformers==4.39.1
\ No newline at end of file