WIP Docker and some minor updates

Long strings work with pipelines! Yay

.dockerignore

@@ -0,0 +1,3 @@
+.idea
+data/
+.pytest_cache

Dockerfile

@@ -0,0 +1,13 @@
+FROM python:3.10-slim
+
+WORKDIR /comma-fixer
+
+COPY requirements.txt .
+RUN pip install -r requirements.txt
+
+COPY . .
+
+COPY ~/.cache/huggingface/hub/models--oliverguhr--fullstop-punctuation-multilang-large/ ~/.cache/huggingface/hub/models--oliverguhr--fullstop-punctuation-multilang-large/
+
+EXPOSE 8000
+#CMD gunicorn "app:app"

README.txt

@@ -0,0 +1 @@
+`docker log [id]` for logs from the container.

app.py

@@ -1,11 +1,14 @@
 from flask import Flask, request, jsonify, make_response
-from baseline import fix_commas, create_baseline_pipeline
+from src.baseline import fix_commas, create_baseline_pipeline
 import logging
 
-app = Flask(__name__)
 logger = logging.Logger(__name__)
 logging.basicConfig(level=logging.INFO)
 
+app = Flask(__name__)
+logging.info('Loading the baseline model...')
+app.baseline_pipeline = create_baseline_pipeline()
+
 
 @app.route('/', methods=['GET'])
 def root():
@@ -25,6 +28,5 @@ def fix_commas_with_baseline():
 
 
 if __name__ == '__main__':
-    logger.info("Loading the baseline model.")
-    app.baseline_pipeline = create_baseline_pipeline()
-    app.run(debug=True) # TODO get this from config or env variable
+    app.run(debug=True)
+

docker-compose.yml

@@ -0,0 +1,28 @@
+services:
+  nginx:
+    image: nginx:latest
+    container_name: nginx
+    volumes:
+      - ./:/comma-fixer
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
+    ports:
+      - 8001:80
+    networks:
+      - my-network
+    depends_on:
+      - flask
+  flask:
+    build:
+      context: ./
+      dockerfile: Dockerfile
+    container_name: comma-fixer
+    command: gunicorn --bind 0.0.0.0:8000 "app:app" --timeout 300 #--workers 4
+    volumes:
+      - ./:/comma-fixer
+    networks:
+      my-network:
+        aliases:
+          - flask-app
+
+networks:
+  my-network:

nginx.conf

@@ -0,0 +1,15 @@
+upstream flask-app {
+    server flask:8000;
+}
+
+server {
+    listen 80;
+    server_name localhost;
+
+    location / {
+        proxy_pass http://flask-app;
+        proxy_set_header Host "localhost";
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_redirect off;
+    }
+}

openapi.yaml

@@ -19,7 +19,8 @@ paths:
                 s:
                   type: string
                   example: 'This, is a sentence with wrong commas at least some.'
-                  description: The text with commas to fix, can be removed, added, reordered at will, or left unchanged.
+                  description: The text with commas to fix. Commas can be removed, added, reordered at will, or left 
+                    unchanged. Other punctuation, whitespaces and so on will stay intact.
       responses:
         200:
           description: Commas fixed.

requirements.txt

@@ -1,4 +1,5 @@
 flask == 2.2.2
+gunicorn == 21.2.0
 pytest
 torch == 2.0.1
 transformers == 4.31.0

tests/test_integration.py

@@ -47,3 +47,11 @@ def test_fix_commas_fixes_wrong_commas(client, test_input: str, expected: str):
 
     assert response.status_code == 200
     assert response.get_json().get('s') == expected
+
+
+def test_with_a_very_long_string(client):
+    s = "Just a long string. " * 1000
+    response = client.post('/baseline/fix-commas/', json={'s': s})
+
+    assert response.status_code == 200
+    assert response.get_json().get('s') == s