Update database.py

database.py

@@ -387,41 +387,39 @@ class DogDatabase:
             print(f"Error adding dog image: {e}")
             raise
     
-    def get_dog_images(self, dog_id, validated_only=False, include_discarded=False):
-        """Get all images for a specific dog"""
-        conn = sqlite3.connect(self.db_path)
-        conn.row_factory = sqlite3.Row
-        cursor = conn.cursor()
-        
+    def get_dog_images(self, dog_id: int, validated_only: bool = False,
+                   include_discarded: bool = False) -> List[Dict]:
+        """Get all images for a dog"""
         query = "SELECT * FROM dog_images WHERE dog_id = ?"
         params = [dog_id]
-        
         if validated_only:
             query += " AND is_validated = 1"
         if not include_discarded:
             query += " AND is_discarded = 0"
+        query += " ORDER BY timestamp DESC"
         
-        cursor.execute(query, params)
-        rows = cursor.fetchall()
+        self.cursor.execute(query, params)
+        rows = self.cursor.fetchall()
         
         images = []
         for row in rows:
-            image = np.frombuffer(row['image_data'], dtype=np.uint8)
-            image = cv2.imdecode(image, cv2.IMREAD_COLOR)
+            # ✅ Decode base64 string to bytes first
+            image_bytes = base64.b64decode(row['image_data'])
+            nparr = np.frombuffer(image_bytes, np.uint8)
+            image = cv2.imdecode(nparr, cv2.IMREAD_COLOR)
             
             images.append({
                 'image_id': row['image_id'],
                 'image': image,
-                'timestamp': row['timestamp'],
-                'frame_number': row['frame_number'],  # Use bracket notation
+                'thumbnail': row['thumbnail'],
+                'bbox': json.loads(row['bbox']) if row['bbox'] else [],
                 'confidence': row['confidence'],
-                'bbox': json.loads(row['bbox']) if row['bbox'] else None,
-                'video_source': row['video_source'],
+                'frame_number': row['frame_number'] if 'frame_number' in row.keys() else None,
+                'video_source': row['video_source'] if 'video_source' in row.keys() else None,
                 'is_validated': row['is_validated'],
-                'is_discarded': row['is_discarded']
+                'is_discarded': row['is_discarded'],
+                'pose_keypoints': json.loads(row['pose_keypoints']) if row.get('pose_keypoints') else None
             })
-        
-        conn.close()
         return images
     
     def validate_image(self, image_id: int, is_valid: bool = True):