Merge pull request #13 from software-students-spring2024/features/mlm…

…odel

Features/mlmodel

.github/workflows/ml.yml

@@ -24,6 +24,3 @@ jobs:
         pip install --user pipenv
         pipenv install
         cd machine-learning-client
-    # - name: Test with pytest
-    #   run: |
-    #     pipenv run pytest

Pipfile

@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3.11"

db/Dockerfile

@@ -0,0 +1 @@
+FROM mongo:latest

machine-learning-client/Dockerfile

@@ -1,3 +1,13 @@
 FROM python:3.10
+
 WORKDIR /machine-learning-client
+
 COPY . .
+
+RUN pip install pipenv
+
+RUN pipenv install
+
+EXPOSE 46377
+
+CMD ["pipenv", "run", "python", "client.py"]

machine-learning-client/Pipfile

@@ -7,6 +7,9 @@ name = "pypi"
 cv2 = "*"
 pymongo = "*"
 fer = "*"
+python-dotenv = "*"
+tensorflow = ">=1.7"
+opencv-contrib-python = "==3.3.0.9"
 
 
 [dev-packages]
@@ -15,4 +18,4 @@ black = "*"
 pytest = "*"
 
 [requires]
-python_version = "3.10"
+python_version = "3.11"

machine-learning-client/client.py

@@ -1,8 +1,16 @@
+"""
+Machine learning client for detecting emotions in images.
+This client connects to a MongoDB Atlas database, retrieves images.
+It then processes the images to detect emotions for target faces, and updates db with the results.
+
+...
+"""
 import os
-os.environ["IMAGEIO_FFMPEG_EXE"] = "/usr/bin/ffmpeg"
+import time
+import pymongo
 from fer import FER
-import cv2, pymongo, time
 
+os.environ["IMAGEIO_FFMPEG_EXE"] = "/usr/bin/ffmpeg"
 
 def get_emotion(image):
     """
@@ -21,15 +29,15 @@ def get_emotion(image):
             i += 1
         return res
     except Exception as e:
-        return f"Error in detecting emotions: {str(e)}"
+        return f"ERROR: \n{str(e)}"
 
 def connect_db():
     """
-    Method for connecting to the MongoDB Atlas database.
+    Method for connecting to the MongoDB client.
     """
-    client = pymongo.MongoClient(os.environ['MONGO_URI'])
-    db = client["emotionDB"]
-    collection = db["emotions"]
+    client = pymongo.MongoClient("mongodb://mongodb:27017/")
+    db = client["emotion_detection"]
+    collection = db["emotion_images"]
     while True:
         while not collection.find_one():
             pass
@@ -40,7 +48,7 @@ def connect_db():
                     "_id": collection.find_one()["_id"]},  
                 {
                     "$set": {
-                        #"title" or name? , need a way to id image
+                        #name? , need a way to id image
                         "emotion": emotion_message,
                         "processed": True,
                     }

machine-learning-client/testclient.py

@@ -1 +0,0 @@
-# add tests here

web-app/Dockerfile

@@ -0,0 +1,13 @@
+FROM python:3.10
+
+WORKDIR /web-app 
+
+COPY  . .
+
+RUN pip install pipenv
+
+RUN pipenv install
+
+EXPOSE 5000
+
+CMD ["pipenv", "run", "python", "main.py"]

web-app/Pipfile

@@ -10,4 +10,4 @@ black = "*"
 [dev-packages]
 
 [requires]
-python_version = "3.10"
+python_version = "3.11"