Split detections

client/pyroclient/client.py

@@ -4,7 +4,7 @@
 # See LICENSE or go to <https://opensource.org/licenses/Apache-2.0> for full license details.
 
 from enum import Enum
-from typing import Dict, List, Optional, Tuple
+from typing import Dict, List, Tuple
 from urllib.parse import urljoin
 
 import requests
@@ -180,17 +180,27 @@ def create_pose(
             timeout=self.timeout,
         )
 
-    def patch_pose(
+    def get_current_poses(self) -> Response:
+        """Fetch poses for the authenticated camera."""
+        params: Dict[str, int] | None = None
+        return requests.get(
+            urljoin(self._route_prefix, ClientRoute.POSES_CREATE),
+            headers=self.headers,
+            params=params,
+            timeout=self.timeout,
+        )
+
+    def update_pose(
         self,
         pose_id: int,
         azimuth: float | None = None,
         patrol_id: int | None = None,
     ) -> Response:
         """Update a pose
 
-        >>> api_client.patch_pose(pose_id=1, azimuth=90.0)
+        >>> api_client.update_pose(pose_id=1, azimuth=90.0)
         """
-        payload = {}
+        payload: Dict[str, float | int] = {}
         if azimuth is not None:
             payload["azimuth"] = azimuth
         if patrol_id is not None:
@@ -203,6 +213,9 @@ def patch_pose(
             timeout=self.timeout,
         )
 
+    # Backward compatibility alias
+    patch_pose = update_pose
+
     def delete_pose(self, pose_id: int) -> Response:
         """Delete a pose
 
@@ -296,34 +309,30 @@ def delete_occlusion_mask(self, mask_id: int) -> Response:
     def create_detection(
         self,
         media: bytes,
-        azimuth: float,
         bboxes: List[Tuple[float, float, float, float, float]],
-        pose_id: Optional[int] = None,
+        pose_id: int,
     ) -> Response:
         """Notify the detection of a wildfire on the picture taken by a camera.
 
         >>> from pyroclient import Client
         >>> api_client = Client("MY_CAM_TOKEN")
         >>> with open("path/to/my/file.ext", "rb") as f: data = f.read()
-        >>> response = api_client.create_detection(data, azimuth=124.2, bboxes=[(.1,.1,.5,.8,.5)], pose_id=12)
+        >>> response = api_client.create_detection(data, bboxes=[(.1,.1,.5,.8,.5)], pose_id=12)
 
         Args:
             media: byte data of the picture
-            azimuth: the azimuth of the camera when the picture was taken
             bboxes: list of tuples where each tuple is a relative coordinate in order xmin, ymin, xmax, ymax, conf
-            pose_id: optional, pose_id of the detection
+            pose_id: pose_id of the detection
 
         Returns:
             HTTP response
         """
         if not isinstance(bboxes, (list, tuple)) or len(bboxes) == 0 or len(bboxes) > 5:
             raise ValueError("bboxes must be a non-empty list of tuples with a maximum of 5 boxes")
-        data = {
-            "azimuth": azimuth,
+        data: Dict[str, str] = {
             "bboxes": _dump_bbox_to_json(bboxes),
         }
-        if pose_id is not None:
-            data["pose_id"] = pose_id
+        data["pose_id"] = str(pose_id)
         return requests.post(
             urljoin(self._route_prefix, ClientRoute.DETECTIONS_CREATE),
             headers=self.headers,

client/tests/conftest.py

@@ -26,7 +26,7 @@ def mock_img():
 
 
 @pytest.fixture(scope="session")
-def cam_token():
+def cam_setup():
     admin_headers = {"Authorization": f"Bearer {SUPERADMIN_TOKEN}"}
     payload = {
         "name": "pyro-camera-01",
@@ -44,11 +44,22 @@ def cam_token():
     payload = {"azimuth": 359, "patrol_id": 1, "camera_id": cam_id}
     response = requests.post(urljoin(API_URL, "poses"), json=payload, headers=admin_headers, timeout=5)
     assert response.status_code == 201
+    pose_id = response.json()["id"]
 
-    # Create a cam token
-    return requests.post(urljoin(API_URL, f"cameras/{cam_id}/token"), headers=admin_headers, timeout=5).json()[
+    cam_token = requests.post(urljoin(API_URL, f"cameras/{cam_id}/token"), headers=admin_headers, timeout=5).json()[
         "access_token"
     ]
+    return {"token": cam_token, "pose_id": pose_id}
+
+
+@pytest.fixture(scope="session")
+def cam_token(cam_setup):
+    return cam_setup["token"]
+
+
+@pytest.fixture(scope="session")
+def cam_pose_id(cam_setup):
+    return cam_setup["pose_id"]
 
 
 @pytest.fixture(scope="session")

client/tests/test_client.py

@@ -26,7 +26,7 @@ def test_client_constructor(token, host, timeout, expected_error):
 
 
 @pytest.fixture(scope="session")
-def test_cam_workflow(cam_token, mock_img):
+def test_cam_workflow(cam_token, cam_pose_id, mock_img):
     cam_client = Client(cam_token, "http://localhost:5050", timeout=10)
     response = cam_client.heartbeat()
     assert response.status_code == 200
@@ -37,14 +37,18 @@ def test_cam_workflow(cam_token, mock_img):
     assert isinstance(response.json()["last_image"], str)
     # Check that adding bboxes works
     with pytest.raises(ValueError, match="bboxes must be a non-empty list of tuples"):
-        cam_client.create_detection(mock_img, 123.2, None)
+        cam_client.create_detection(mock_img, None, pose_id=cam_pose_id)
     with pytest.raises(ValueError, match="bboxes must be a non-empty list of tuples"):
-        cam_client.create_detection(mock_img, 123.2, [])
-    response = cam_client.create_detection(mock_img, 123.2, [(0, 0, 1.0, 0.9, 0.5)], pose_id=1)
+        cam_client.create_detection(mock_img, [], pose_id=cam_pose_id)
+    response = cam_client.create_detection(mock_img, [(0, 0, 1.0, 0.9, 0.5)], pose_id=cam_pose_id)
     assert response.status_code == 201, response.__dict__
-    response = cam_client.create_detection(mock_img, 123.2, [(0, 0, 1.0, 0.9, 0.5), (0.2, 0.2, 0.7, 0.7, 0.8)])
+    response = cam_client.create_detection(
+        mock_img,
+        [(0, 0, 1.0, 0.9, 0.5), (0.2, 0.2, 0.7, 0.7, 0.8)],
+        pose_id=cam_pose_id,
+    )
     assert response.status_code == 201, response.__dict__
-    response = cam_client.create_detection(mock_img, 123.2, [(0, 0, 1.0, 0.9, 0.5)])
+    response = cam_client.create_detection(mock_img, [(0, 0, 1.0, 0.9, 0.5)], pose_id=cam_pose_id)
     assert response.status_code == 201, response.__dict__
     return response.json()["id"]