Improvements

.gitignore

@@ -158,6 +158,5 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-DataCollector/apikey
-config.yaml
+.idea/
+/**/config.yaml

requirements.txt

@@ -1,3 +1,5 @@
-opencv-python
-google-api-python-client
-telebot
+opencv-python~=4.9.0.80
+google-api-python-client~=2.125.0
+pyTelegramBotAPI~=4.16.1
+PyYAML~=6.0.1
+Pillow~=10.3.0

src/data_collector/camera_utils.py

@@ -0,0 +1,39 @@
+import cv2
+from PIL import Image
+
+camera: cv2.VideoCapture | None = None
+
+
+def get_camera(camera_port: int = 0) -> bool:
+    """
+    This function initializes the camera
+
+    :param camera_port: The camera port
+    :return: True if the camera was initialized successfully, False otherwise
+    """
+    global camera
+    camera = cv2.VideoCapture(camera_port)
+    if camera is None or not camera.isOpened():
+        camera = None
+        return False
+    camera.set(3, 1280)
+    camera.set(4, 960)
+    return True
+
+
+def release_camera() -> None:
+    """
+    This function releases the camera
+    """
+    global camera
+    camera.release()
+    camera = None
+
+
+def get_camera_image() -> Image.Image | None:
+    """
+    This function captures an image from the camera
+    :return: A PIL Image object if the image was captured successfully, None otherwise
+    """
+    result, image = camera.read()
+    return Image.fromarray(cv2.cvtColor(image, cv2.COLOR_BGR2RGB)) if result else None

DataCollector/gdrive.py → src/data_collector/gdrive.py

@@ -1,12 +1,13 @@
-import os
 import io
 from google.oauth2 import service_account
 from googleapiclient.discovery import build
 from googleapiclient.http import MediaIoBaseUpload
+from PIL.Image import Image
+import datetime
 
 # Define the Google Drive API scopes and service account file path
 SCOPES = ["https://www.googleapis.com/auth/drive"]
-SERVICE_ACCOUNT_FILE = "./DataCollector/apikey/datacollector-419114-bdc0fad0e57d.json"
+SERVICE_ACCOUNT_FILE = "./datacollector-419114-bdc0fad0e57d.json"
 PARENT_FOLDER_ID = "1ne0IuBRl5cK_PeAnpU8PIaaRpVKQ1lFB"
 # Create credentials using the service account file
 credentials = service_account.Credentials.from_service_account_file(
@@ -17,9 +18,8 @@
 drive_service = build("drive", "v3", credentials=credentials)
 
 
-def upload_photo(name, buffer):
+def upload_photo(image: Image) -> None:
+    name: str = f"{datetime.datetime.now().timestamp()}.jpg"
     file_metadata = {"name": name, "parents": [PARENT_FOLDER_ID]}
-
-    media = MediaIoBaseUpload(io.BytesIO(buffer.tobytes()), mimetype="image/jpeg")
-
-    file = drive_service.files().create(body=file_metadata, media_body=media).execute()
+    media = MediaIoBaseUpload(image.tobytes(), mimetype="image/jpeg")
+    _ = drive_service.files().create(body=file_metadata, media_body=media).execute()