Improving typing conventions

Author: kevin-david

python_snoo/baby.py

@@ -1,6 +1,7 @@
+from typing import AsyncGenerator
 from datetime import datetime
 
-from python_snoo.containers import Activity, BabyData, DiaperActivity, DiaperTypes, parse_activities_from_list
+from python_snoo.containers import Activity, BabyData, BreastfeedingActivity, DiaperActivity, DiaperTypes
 from python_snoo.exceptions import SnooBabyError
 from python_snoo.snoo import Snoo
 
@@ -51,10 +52,22 @@ async def get_activity_data(self, from_date: datetime, to_date: datetime) -> lis
             if r.status < 200 or r.status >= 300:
                 raise SnooBabyError(f"Failed to get activity data: {r.status}: {resp}. Payload: {params}")
 
+            activities: list[Activity] = []
             if isinstance(resp, list):
-                return parse_activities_from_list(resp)
+                for activity in resp:
+                    activity_type = activity.get("type", "").lower()
+                    
+                    if activity_type == "diaper":
+                        activities.append(DiaperActivity.from_dict(activity))
+                    elif activity_type == "breastfeeding":
+                        activities.append(BreastfeedingActivity.from_dict(activity))
+                    else:
+                        # Other activity types exist but aren't supported yet
+                        raise SnooBabyError(f"Unknown activity type: {activity_type}")
             else:
                 raise SnooBabyError(f"Unexpected response format: {type(resp)}")
+
+            return activities
 
         except Exception as ex:
             raise SnooBabyError from ex
@@ -81,16 +94,14 @@ async def log_diaper_change(
         if start_time.tzinfo is None:
             start_time = start_time.astimezone()
 
-        start_time = start_time.isoformat(timespec="milliseconds")
-
         hdrs = self.snoo.generate_snoo_auth_headers(self.snoo.tokens.aws_id)
         url = f"{self.activity_base_url}/journals"
 
         payload = {
             "babyId": self.baby_id,
             "data": {"types": [dt.value for dt in diaper_types]},
             "type": "diaper",
-            "startTime": start_time,
+            "startTime": start_time.isoformat(timespec="milliseconds"),
         }
 
         if note:

python_snoo/containers.py

@@ -198,22 +198,4 @@ class BreastfeedingActivity(DataClassJSONMixin):
     createdAt: str
     updatedAt: str
 
-
-# Union type for all activity types
 Activity = Union[DiaperActivity, BreastfeedingActivity]
-
-
-def parse_activity_from_dict(data: dict) -> Activity:
-    activity_type = data.get("type", "").lower()
-    
-    if activity_type == "diaper":
-        return DiaperActivity.from_dict(data)
-    elif activity_type == "breastfeeding":
-        return BreastfeedingActivity.from_dict(data)
-    else:
-        raise ValueError(f"Unknown activity type: {activity_type}")
-
-
-def parse_activities_from_list(activities_data: list) -> list[Activity]:
-    """Parse a list of activity dictionaries into typed objects"""
-    return [parse_activity_from_dict(activity) for activity in activities_data]