handle edge cases in conversions

Author: myTselection

custom_components/cityparking/coordinator.py

@@ -42,7 +42,7 @@ async def async_find_city_parking_info(
 
     return cityParkingInfo.model_dump()
 
-def extract_readable_info(cityParkingInfo):
+def extract_readable_info(cityParkingInfo: CityParkingModel):
     rules = cityParkingInfo.rules.model_dump() if cityParkingInfo.rules else {}
     streetComplete = cityParkingInfo.streetComplete.model_dump() if cityParkingInfo.streetComplete else {}
     locationResults = cityParkingInfo.location.model_dump().get('results', [{}])[0] if cityParkingInfo.location else {}
@@ -83,6 +83,9 @@ def days_to_string(days):
         return 'sat-sun'
 
     # check consecutive
+    if len(sorted_days) < 2:
+        return ",".join(names[d] for d in sorted_days)
+
     consecutive = all(
         sorted_days[i] == sorted_days[i - 1] + 1
         for i in range(1, len(sorted_days))
@@ -153,7 +156,7 @@ async def _async_update_data(self):
         so entities can quickly look up their data.
         """
         data: CityParkingModel = None
-        
+        _LOGGER.debug("Coordinator _async_update_data called, origin: %s", self._origin)
         resolved_origin = find_coordinates(self.hass, self._origin)
         origin_coordinates_json = await self._routeCalculatorClient._ensure_coords(resolved_origin)
         origin_coordinates = Coords.model_validate(origin_coordinates_json)
@@ -167,33 +170,38 @@ async def _async_update_data(self):
             # _LOGGER.debug(f"nearby_stations: {data}")
         except EmptyResponseError as exc:
             _LOGGER.error(
-                "Error occurred while fetching data for charger(s) %s, not found, or coordinates are invalid, %s",
+                "EmptyResponseError occurred while fetching data for %s (%s): %s",
+                self._origin,
                 resolved_origin, exc
             )
             raise UpdateFailed() from exc
         except CancelledError as exc:
             _LOGGER.error(
-                "CancelledError occurred while fetching data for charger(s) %s, %s",
+                "CancelledError occurred while fetching data for %s (%s): %s",
+                self._origin,
                 resolved_origin, exc
             )
             raise UpdateFailed() from exc
         except TimeoutError as exc:
             _LOGGER.error(
-                "TimeoutError occurred while fetching data for charger(s) %s, %s",
+                "TimeoutError occurred while fetching data for %s (%s): %s",
+                self._origin,
                 resolved_origin, exc
             )
             raise UpdateFailed() from exc
         except ClientError as exc:
             _LOGGER.error(
-                "ClientError occurred while fetching data for charger(s) %s: %s",
+                "ClientError error occurred while fetching data for %s (%s): %s",
+                self._origin,
                 resolved_origin,
                 exc,
                 exc_info=True,
             )
             raise UpdateFailed() from exc
         except Exception as exc:
             _LOGGER.error(
-                "Unexpected error occurred while fetching data for charger(s) %s: %s",
+                "Unexpected error occurred while fetching data for %s (%s): %s",
+                self._origin,
                 resolved_origin,
                 exc,
                 exc_info=True,
@@ -202,9 +210,9 @@ async def _async_update_data(self):
 
         if data is None:
             _LOGGER.error(
-                "API returned None data for charger(s) %s",
-                resolved_origin,
-            )
-            raise UpdateFailed("API returned None data")
+                "API returned None data for %s (%s)",
+                self._origin,
+                resolved_origin)
+            raise UpdateFailed(f"API returned None data for {self._origin} ({resolved_origin})")
 
         return data

custom_components/cityparking/manifest.json

@@ -12,5 +12,5 @@
   "issue_tracker": "https://github.com/myTselection/CityParking/issues",
   "loggers": ["pywaze", "homeassistant.helpers.location"],
   "requirements": ["pywaze==1.1.1"],
-  "version": "0.0.1"
+  "version": "0.1.1"
 }

custom_components/cityparking/seetyApi/models.py

@@ -21,41 +21,41 @@ class Coords(BaseModel):
 
 
 class UserModel(BaseModel):
-    verified: bool
-    cars: List[str]
-    mustSendMailOnEachTransaction: bool
-    proAccountActivated: bool
-    subscribedToOnboardingCampaign: bool
-    _id: str
-    time: datetime
-    lastSeen: datetime
-    confidence: int
-    lang: str
-    __v: int
+    verified: Optional[bool] = None
+    cars: Optional[List[str]] = []
+    mustSendMailOnEachTransaction: Optional[bool] = None
+    proAccountActivated: Optional[bool] = None
+    subscribedToOnboardingCampaign: Optional[bool] = None
+    _id: Optional[str] = None
+    time: Optional[datetime] = None
+    lastSeen: Optional[datetime] = None
+    confidence: Optional[int] = None
+    lang: Optional[str] = None
+    __v: Optional[int] = None
 
 class RemoteConfigsLastUpdateModel(BaseModel):
     messages: str
 
 class SeetyUser(BaseModel):
-    user: UserModel
-    lastMapUpdate: datetime
-    remoteConfigsLastUpdate: RemoteConfigsLastUpdateModel
-    access_token: str
-    expires_in: int
-    refresh_token: str
-    status: str
+    user: Optional[UserModel] = {}
+    lastMapUpdate: Optional[datetime] = None
+    remoteConfigsLastUpdate: Optional[RemoteConfigsLastUpdateModel] = {}
+    access_token: Optional[str] = None
+    expires_in: Optional[int] = None
+    refresh_token: Optional[str] = None
+    status: Optional[str] = None
 
 
 class Rules(BaseModel):
-    days: List[int]
-    prices: Dict[str, float]
-    hours: List[str]
-    type: str
+    days: Optional[List[int]] = []
+    prices: Optional[Dict[str, float]] = {}
+    hours: Optional[List[str]] = []
+    type: Optional[str] = None
     paymentPartner: Optional[str] = None
-    advantageInApp: bool
-    displayNotPayable: bool
-    overrides: Dict[str, Any]
-    forceDisplayPriceTables: bool
+    advantageInApp: Optional[bool] = False
+    displayNotPayable: Optional[bool] = False
+    overrides: Optional[Dict[str, Any]] = {}
+    forceDisplayPriceTables: Optional[bool] = False
 
 
 class Properties(BaseModel):
@@ -69,12 +69,12 @@ class Properties(BaseModel):
 
 
 class SeetyStreetRules(BaseModel):
-    rules: Rules
+    rules: Optional[Rules] = {}
     risk: Optional[int] = None
-    overrides: Dict[str, Any]
-    properties: Properties
-    twoSided: bool
-    status: str
+    overrides: Optional[Dict[str, Any]] = {}
+    properties: Optional[Properties] = {}
+    twoSided: Optional[bool] = False
+    status: Optional[str] = None
 
 
 class Location(BaseModel):
@@ -121,18 +121,18 @@ class ZoneColor(BaseModel):
 # Special Permits
 # -------------------------
 class SpecialPermits(BaseModel):
-    residents: List[str] = []
-    disabled: List[str] = []
+    residents: Optional[List[str]] = []
+    disabled: Optional[List[str]] = []
 
 
 # -------------------------
 # Summary Info
 # -------------------------
 class ZoneSummary(BaseModel):
-    days: List[int]
-    prices: Dict[str, float] = {}
+    days: Optional[List[int]] = []
+    prices: Optional[Dict[str, float]] = {}
     hours: Optional[List[str]] = None
-    type: str
+    type: Optional[str] = None
     paymentPartner: Optional[str] = None
     advantageInApp: Optional[bool] = False
     displayNotPayable: Optional[bool] = False
@@ -144,15 +144,15 @@ class ZoneSummary(BaseModel):
 # Zone Definition
 # -------------------------
 class Zone(BaseModel):
-    weight: float
-    summary: ZoneSummary
-    remarks: List[str] = []
-    specialPermits: SpecialPermits = SpecialPermits()
-    maxStay: Union[str, int] = 0
-    color: ZoneColor
-    name: str
-    table: List[ZoneTable] = []
-    parkingPaymentProviders: List[str] = []
+    weight: Optional[float] = None
+    summary: Optional[ZoneSummary] = {}
+    remarks: Optional[List[str]] = []
+    specialPermits: Optional[SpecialPermits] = {}
+    maxStay: Optional[Union[str, int]] = None
+    color: Optional[ZoneColor] = {}
+    name: Optional[str] = None
+    table: Optional[List[ZoneTable]] = []
+    parkingPaymentProviders: Optional[List[str]] = []
     displayNotPayable: Optional[bool] = False
 
 # -------------------------
@@ -167,7 +167,7 @@ class ProviderDescription(BaseModel):
 
 
 class SessionFee(BaseModel):
-    comment: Optional[ProviderDescription] = None 
+    comment: Optional[ProviderDescription] = {} 
     fixed: Optional[float] = None
     percentage: Optional[float] = None
 
@@ -176,10 +176,10 @@ class SessionFee(BaseModel):
 # -------------------------
 class Fees(BaseModel):
     registration: Optional[Dict[str, float]] = {}
-    session: Optional[SessionFee] = None
-    sessionSubscription: Optional[SessionFee] = None
-    notifSms: Optional[SessionFee] = None
-    notifApp: Optional[SessionFee] = None
+    session: Optional[SessionFee] = {}
+    sessionSubscription: Optional[SessionFee] = {}
+    notifSms: Optional[SessionFee] = {}
+    notifApp: Optional[SessionFee] = {}
 
 
 
@@ -197,9 +197,9 @@ class Subscription(BaseModel):
 # Provider Definition
 # -------------------------
 class Provider(BaseModel):
-    descriptionApp: Optional[ProviderDescription] = None
-    descriptionSMS: Optional[ProviderDescription] = None
-    fees: Optional[Fees] = None
+    descriptionApp: Optional[ProviderDescription] = {}
+    descriptionSMS: Optional[ProviderDescription] = {}
+    fees: Optional[Fees] = {}
     advantageApp: Optional[Dict[str, List[str]]] = {}
     disadvantageApp: Optional[Dict[str, List[str]]] = {}
     advantageSms: Optional[Dict[str, List[str]]] = {}
@@ -231,21 +231,21 @@ class CityInfo(BaseModel):
 # Full Response Model
 # -------------------------
 class SeetyStreetComplete(BaseModel):
-    rules: Dict[str, Zone]
+    rules: Optional[Dict[str, Zone]] = {}
     table: Optional[List[ZoneTable]] = []
-    maxStay: Union[str, int] = 0
+    maxStay: Optional[Union[str, int]] = None
     remarks: Optional[List[str]] = []
-    specialPermits: Optional[SpecialPermits] = SpecialPermits()
+    specialPermits: Optional[SpecialPermits] = {}
     providers: Optional[List[Provider]] = []
-    city: CityInfo
-    cityName: str
-    status: str
+    city: Optional[CityInfo] = {}
+    cityName: Optional[str] = None
+    status: Optional[str] = None
 
 class CityParkingModel(BaseModel):
-    user: Optional[SeetyUser] = None
-    location: Optional[SeetyLocationResponse] = None
-    rules: Optional[SeetyStreetRules] = None
-    streetComplete: Optional[SeetyStreetComplete] = None
+    user: Optional[SeetyUser] = {}
+    location: Optional[SeetyLocationResponse] = {}
+    rules: Optional[SeetyStreetRules] = {}
+    streetComplete: Optional[SeetyStreetComplete] = {}
     origin: Optional[str] = None
-    origin_coordinates: Optional[Coords] = None
-    extra_data: Optional[Dict[str, Any]] = None
+    origin_coordinates: Optional[Coords] = {}
+    extra_data: Optional[Dict[str, Any]] = {}