Move inference onto the API

rpi/services/game_service.py

@@ -2,29 +2,29 @@ import json
 from typing import Callable
 
 from hardware.buzzer.buzzer import Buzzer
+from hardware.camera.camera import Camera
 from hardware.led.led import Led
 from models.exceptions.ServiceException import ServiceException
 from models.game import Game
 from services.clock_service import ClockService
-from services.detection_service import DetectionService
 
 
 class GameService:
 
     _game : Game
-    _detection_service : DetectionService
+    _camera : Camera
     _clock_service : ClockService
-    _has_started : bool
     _led : Led
     _buzzer : Buzzer
     _on_terminated : Callable[[str], None]
+    _has_started : bool
 
     def __init__(self):
-        self._detection_service = DetectionService()
+        self._camera = Camera()
         self._clock_service = ClockService()
-        self._has_started = False
         self._led = Led(7)
         self._buzzer = Buzzer(8)
+        self._has_started = False
 
     def start(self, white_name, back_name, time_control : int, increment : int, timestamp : int) -> None:
         if self._has_started :
@@ -46,18 +46,20 @@ class GameService:
         self._notify()
         self._has_started = False
 
-    def make_move(self) -> tuple[bytes, str] | None:
+    def make_move(self) -> bytes:
         try :
             if not self._has_started :
                 raise Exception("Game hasn't started yet.")
             self._clock_service.switch()
-            img, fen = self._detection_service.analyze_single_frame()
-            self._game.add_move(fen)
-            return img, fen
+            img = self._camera.take_photo()
+            return img
         except Exception as e:
             print(e)
             raise ServiceException(e)
 
+    def add_move(self, fen):
+        self._game.add_move(fen)
+
     def set_on_terminated(self, callback: Callable[[str], None]):
         self._on_terminated = callback