change: Changed the api library to fastapi because it spawnes subtasks easier

Author: KaiserRuben

Dockerfile

@@ -9,11 +9,13 @@ ADD . /app
 # Install any needed packages specified in requirements.txt
 RUN pip install -r requirements.txt
 
-# Install Gunicorn
-RUN /bin/bash -c "source venv/bin/activate && pip install gunicorn"
-
 # Make port 8000 available to the world outside this container
 EXPOSE 8000
 
 # Run main.py when the container launches
-CMD ["/bin/bash", "-c", "source venv/bin/activate && gunicorn src.app:app -b 0.0.0.0:8000"]
+# Add a shell script to run Uvicorn
+ADD run.sh /run.sh
+RUN chmod +x /run.sh
+
+# Run the shell script when the container launches
+CMD ["/run.sh"]

requirements.txt

@@ -1,105 +1,5 @@
-anyio==4.3.0
-appnope==0.1.4
-argon2-cffi==23.1.0
-argon2-cffi-bindings==21.2.0
-arrow==1.3.0
-asttokens==2.4.1
-async-lru==2.0.4
-attrs==23.2.0
-Babel==2.14.0
-beautifulsoup4==4.12.3
-bleach==6.1.0
-blinker==1.8.1
-certifi==2024.2.2
-cffi==1.16.0
-charset-normalizer==3.3.2
-click==8.1.7
-comm==0.2.2
-debugpy==1.8.1
-decorator==5.1.1
-defusedxml==0.7.1
-exceptiongroup==1.2.1
-executing==2.0.1
-fastjsonschema==2.19.1
-Flask==3.0.3
-fqdn==1.5.1
-h11==0.14.0
-httpcore==1.0.5
-httpx==0.27.0
-idna==3.7
-importlib_metadata==7.1.0
-ipykernel==6.29.4
-ipython==8.18.1
-isoduration==20.11.0
-itsdangerous==2.2.0
-jedi==0.19.1
-Jinja2==3.1.3
-json5==0.9.25
-jsonpointer==2.4
-jsonschema==4.22.0
-jsonschema-specifications==2023.12.1
-jupyter-events==0.10.0
-jupyter-lsp==2.2.5
-jupyter_client==8.6.1
-jupyter_core==5.7.2
-jupyter_server==2.14.0
-jupyter_server_terminals==0.5.3
-jupyterlab==4.1.8
-jupyterlab_pygments==0.3.0
-jupyterlab_server==2.27.1
-MarkupSafe==2.1.5
-matplotlib-inline==0.1.7
-mistune==3.0.2
-nbclient==0.10.0
-nbconvert==7.16.4
-nbformat==5.10.4
-nest-asyncio==1.6.0
-notebook_shim==0.2.4
-numpy==1.26.4
-overrides==7.7.0
-packaging==24.0
-pandas==2.2.2
-pandocfilters==1.5.1
-parso==0.8.4
-pexpect==4.9.0
-platformdirs==4.2.1
-prometheus_client==0.20.0
-prompt-toolkit==3.0.43
-psutil==5.9.8
-ptyprocess==0.7.0
-pure-eval==0.2.2
-pycparser==2.22
-Pygments==2.17.2
-python-dateutil==2.9.0.post0
-python-json-logger==2.0.7
-pytz==2024.1
-PyYAML==6.0.1
-pyzmq==26.0.3
-referencing==0.35.1
-requests==2.31.0
-rfc3339-validator==0.1.4
-rfc3986-validator==0.1.1
-rpds-py==0.18.0
-Send2Trash==1.8.3
-six==1.16.0
-sniffio==1.3.1
-soupsieve==2.5
-stack-data==0.6.3
-terminado==0.18.1
-tinycss2==1.3.0
-tomli==2.0.1
-tornado==6.4
-traitlets==5.14.3
-types-python-dateutil==2.9.0.20240316
-typing_extensions==4.11.0
-tzdata==2024.1
-uri-template==1.3.0
-urllib3==2.2.1
-wcwidth==0.2.13
-webcolors==1.13
-webencodings==0.5.1
-websocket-client==1.8.0
-Werkzeug==3.0.2
-zipp==3.18.1
-
-python-dotenv
+fastapi==0.68.1
+uvicorn==0.15.0
+python-dotenv==0.19.1
+requests==2.26.0
+jsonschema==4.22.0

run.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+source venv/bin/activate
+uvicorn src.app:app --host 0.0.0.0 --port 8000

src/app.py

@@ -1,4 +1,4 @@
-from flask import Flask, request
+from fastapi import FastAPI, Request
 import time
 
 from src.data.Findings import Findings
@@ -7,7 +7,7 @@
 
 import src.api.ollama as ollama
 
-app = Flask(__name__)
+app = FastAPI()
 
 start_time = time.time()
 
@@ -33,12 +33,12 @@ def health():
 
 
 @app.post('/upload')
-def upload():
+async def upload(request: Request):
     """
     This function takes the string from the request and converts it to a data object.
     :return: 200 OK if the data is valid, 400 BAD REQUEST otherwise.
     """
-    json_data = request.get_json()
+    json_data = await request.json()
     # Check if the JSON data is valid
     if not validate_json(json_data):
         return 'Invalid JSON data', 400
@@ -77,4 +77,6 @@ def recommendations():
 
 
 if __name__ == '__main__':
-    app.run(debug=True)
+    import uvicorn
+
+    uvicorn.run(app)