tinesight 0.0.6.dev1__tar.gz → 0.0.10.dev1__tar.gz

{tinesight-0.0.6.dev1 → tinesight-0.0.10.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tinesight
-Version: 0.0.6.dev1
+Version: 0.0.10.dev1
 Summary: Tinesight SDK
 Requires-Dist: cryptography>=46.0.3
 Requires-Dist: pycognito>=2024.5.1

{tinesight-0.0.6.dev1 → tinesight-0.0.10.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tinesight"
-version = "0.0.6.dev1"
+version = "0.0.10.dev1"
 description = "Tinesight SDK"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -12,6 +12,8 @@ dependencies = [
 [project.optional-dependencies]
 video = [
     "opencv-python>=4.13.0.90",
+#    "python-prctl; sys_platform == 'linux'",
+#    "picamera2; sys_platform== 'linux'",
 ]
 
 [build-system]

{tinesight-0.0.6.dev1 → tinesight-0.0.10.dev1}/src/tinesight/client.py

@@ -27,6 +27,15 @@ class TinesightClient(TinesightApiMixin):
         """Private wrapper for making invoking requests with a certa"""
         return partial(requests.post, cert=(self.cert_path, self.key_path))
 
+    def _is_raspberry_pi(self) -> bool:
+        """Check if running on a Raspberry Pi"""
+        try:
+            with open("/proc/device-tree/model", "r") as f:
+                model = f.read()
+                return "Raspberry Pi" in model
+        except FileNotFoundError:
+            return False
+
     def __init__(self, x509_key_path: Path | str, x509_cert_path: Path | str):
         self.key_path: str = str(x509_key_path)
         self.cert_path: str = str(x509_cert_path)
@@ -92,12 +101,34 @@ class TinesightClient(TinesightApiMixin):
                 "OpenCV is required for video streaming. Install with: pip install opencv-python"
             )
 
-        # Open video stream
-        cap = cv2.VideoCapture(video_source)
-        if not cap.isOpened():
-            raise RuntimeError(f"Could not open video source: {video_source}")
+        # Check if we should use picamera2 (Raspberry Pi with CSI camera)
+        use_picamera2 = False
+        picam2 = None
+
+        if isinstance(video_source, int) and self._is_raspberry_pi():
+            try:
+                from picamera2 import Picamera2
+
+                use_picamera2 = True
+                print("Detected Raspberry Pi - using picamera2 for CSI camera")
+            except ImportError:
+                print("picamera2 not available, falling back to OpenCV")
+
+        # Initialize camera
+        if use_picamera2:
+            picam2 = Picamera2()
+            config = picam2.create_preview_configuration(
+                main={"size": (640, 480), "format": "RGB888"}
+            )
+            picam2.configure(config)
+            picam2.start()
+            print("Starting picamera2 stream")
+        else:
+            cap = cv2.VideoCapture(video_source)
+            if not cap.isOpened():
+                raise RuntimeError(f"Could not open video source: {video_source}")
+            print(f"Starting video stream from: {video_source}")
 
-        print(f"Starting video stream from: {video_source}")
         print(f"Classifying every {frame_skip} frames")
         print("Press Ctrl+C to stop")
 
@@ -111,12 +142,29 @@ class TinesightClient(TinesightApiMixin):
 
         try:
             while True:
-                ret, frame = cap.read()
+                # Capture frame based on camera type
+                if use_picamera2:
+                    try:
+                        frame = picam2.capture_array()
+                        # picamera2 returns RGB, convert to BGR for OpenCV
+                        frame = cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
+                        ret = True
+                    except Exception as e:
+                        print(f"Failed to capture frame from picamera2: {e}")
+                        ret = False
+                else:
+                    ret, frame = cap.read()
+
                 if not ret:
                     print("Failed to read frame, attempting to reconnect...")
-                    cap.release()
-                    time.sleep(1)
-                    cap = cv2.VideoCapture(video_source)
+                    if use_picamera2:
+                        picam2.stop()
+                        time.sleep(1)
+                        picam2.start()
+                    else:
+                        cap.release()
+                        time.sleep(1)
+                        cap = cv2.VideoCapture(video_source)
                     continue
 
                 # Calculate FPS
@@ -221,5 +269,8 @@ class TinesightClient(TinesightApiMixin):
         except KeyboardInterrupt:
             print("\nStopping video stream...")
         finally:
-            cap.release()
+            if use_picamera2 and picam2:
+                picam2.stop()
+            elif not use_picamera2:
+                cap.release()
             cv2.destroyAllWindows()