python-midas 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

midas/entities/models.py

@@ -38,13 +38,10 @@ def _parse_decimal(n: int | float | None) -> Decimal | None:
     return Decimal(str(n))
 
 
-def _parse_day_type(s: str | None) -> DayType | None:
-    if not s:
-        return None
-    try:
-        return DayType(s)
-    except ValueError:
-        return None
+def _parse_day_type(v: object) -> DayType | None:
+    # v2.0 MOER/ALRT send an integer code (1=Mon..8=Holiday); v1.0/electricity
+    # send a weekday string. DayType.from_wire accepts both.
+    return DayType.from_wire(v)
 
 
 def _parse_unit(s: str | None) -> Unit | str | None:
@@ -114,6 +111,8 @@ class RateInfo(MIDASBase):
     id: str | None = None
     system_time: PendulumDateTime = None
     name: str | None = None
+    signal_type: SignalType | None = None
+    description: str | None = None
     type: RateType | str | None = None
     sector: str | None = None
     end_use: str | None = None
@@ -137,6 +136,10 @@ class RateInfo(MIDASBase):
             id=raw.get("RateID"),
             system_time=parse_instant(raw.get("SystemTime_UTC")),
             name=raw.get("RateName"),
+            # v2.0 rate-values responses carry the per-RIN SignalType label and
+            # Description at the top level (as in the RIN list).
+            signal_type=_parse_signal_type(raw.get("SignalType")),
+            description=raw.get("Description"),
             type=_parse_rate_type(raw.get("RateType")),
             sector=raw.get("Sector"),
             end_use=raw.get("EndUse"),

midas/enums.py

@@ -71,3 +71,41 @@ class DayType(str, Enum):
     SATURDAY = "Saturday"
     SUNDAY = "Sunday"
     HOLIDAY = "Holiday"
+
+    @classmethod
+    def from_wire(cls, v: object) -> "DayType | None":
+        """Coerce a wire day-type value to a DayType, or None if unmappable.
+
+        v2.0 SGIP GHG (MOER) and Flex Alert (ALRT) responses encode the day
+        type as an INTEGER upload code (1=Monday ... 7=Sunday, 8=Holiday); v1.0
+        and electricity rates use the weekday string ("Monday"). Both forms are
+        accepted (a digit string such as "1" is treated as the integer code).
+        """
+        if isinstance(v, bool) or v is None:
+            return None
+        if isinstance(v, int):
+            return _DAY_TYPE_BY_CODE.get(v)
+        if isinstance(v, str):
+            s = v.strip()
+            if not s:
+                return None
+            if s.isdigit():
+                return _DAY_TYPE_BY_CODE.get(int(s))
+            try:
+                return cls(s)
+            except ValueError:
+                return None
+        return None
+
+
+#: v2.0 integer day-type upload codes (1=Monday ... 7=Sunday, 8=Holiday).
+_DAY_TYPE_BY_CODE: dict[int, DayType] = {
+    1: DayType.MONDAY,
+    2: DayType.TUESDAY,
+    3: DayType.WEDNESDAY,
+    4: DayType.THURSDAY,
+    5: DayType.FRIDAY,
+    6: DayType.SATURDAY,
+    7: DayType.SUNDAY,
+    8: DayType.HOLIDAY,
+}

{python_midas-1.0.0.dist-info → python_midas-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-midas
-Version: 1.0.0
+Version: 1.0.1
 Summary: Python client library for the California Energy Commission MIDAS API
 Project-URL: Homepage, https://grid-coordination.energy
 Project-URL: Repository, https://github.com/grid-coordination/python-midas
@@ -23,6 +23,7 @@ Requires-Dist: httpx>=0.27
 Requires-Dist: pendulum>=3.0
 Requires-Dist: pydantic>=2.5
 Provides-Extra: dev
+Requires-Dist: jsonschema>=4.18; extra == 'dev'
 Requires-Dist: pytest-httpx>=0.30; extra == 'dev'
 Requires-Dist: pytest>=8.0; extra == 'dev'
 Requires-Dist: ruff>=0.3; extra == 'dev'

{python_midas-1.0.0.dist-info → python_midas-1.0.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 midas/__init__.py,sha256=aKqmLyoRRu0pZZn4kA6RbqxB3EhXezSLuT9CS_m27Z0,1493
 midas/auth.py,sha256=iAZmp3-pGzcvmVKgzP9jnyWeviX8ufwyAvMsetnG8dM,3301
 midas/client.py,sha256=KfsY9-jm5MyCSNdrhonFZX93POcLkJZ1ExO0I6Eik7o,6718
-midas/enums.py,sha256=4iamwyP426SBamteYhwSOqOALp2ulxlCNghr1SIwZJ0,2253
+midas/enums.py,sha256=2UgzcJUTGHL6dy5lys_0kngm0xcQljJo5nrKVTQwCDY,3501
 midas/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 midas/time.py,sha256=rUIMN_ARZJ7bzKie6OMnngdxKXpIncab9aaE2rHFBNM,3810
 midas/entities/__init__.py,sha256=dD0Y3AjK9qI3BkO-v1fFcL_K5_yVAEzuKvP2pVntRGE,1404
-midas/entities/models.py,sha256=cGVbdAfPF7UqFa19ZmWkByLG7-_Xs6swxzX04jUYFYo,8200
-python_midas-1.0.0.dist-info/METADATA,sha256=dqWTHrqcA3VH4-7Yt3ZdqfRy0uYXgvaPhfZD3e-ctlc,19841
-python_midas-1.0.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-python_midas-1.0.0.dist-info/licenses/LICENSE,sha256=SNfEtQtKuaLySMOhEdErGT_hoKN-6L0BJlPJpUXZoDI,1089
-python_midas-1.0.0.dist-info/RECORD,,
+midas/entities/models.py,sha256=3iLS9Aj7vj-6ef6rV1-K27e-Etx8sknrDZFYSSgEwBE,8593
+python_midas-1.0.1.dist-info/METADATA,sha256=5-Sz4Xp1sSddzxrc29LoAkrCxSzxjICuKfrxfGeRv9Q,19889
+python_midas-1.0.1.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+python_midas-1.0.1.dist-info/licenses/LICENSE,sha256=SNfEtQtKuaLySMOhEdErGT_hoKN-6L0BJlPJpUXZoDI,1089
+python_midas-1.0.1.dist-info/RECORD,,