mms-client 1.9.0__tar.gz → 1.9.1__tar.gz

{mms_client-1.9.0 → mms_client-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mms-client
-Version: 1.9.0
+Version: 1.9.1
 Summary: API client for accessing the MMS
 Home-page: https://github.com/ElectroRoute-Japan/mms-client
 Author: Ryan Wood

{mms_client-1.9.0 → mms_client-1.9.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mms_client"
-version = "v1.9.0"
+version = "v1.9.1"
 description = "API client for accessing the MMS"
 authors = ["Ryan Wood <ryan.wood@electroroute.co.jp>"]
 readme = "README.md"

{mms_client-1.9.0 → mms_client-1.9.1}/src/mms_client/services/market.py

@@ -1,10 +1,11 @@
 """Contains the client layer for making market requests to the MMS server."""
 
-from datetime import date as Date
 from logging import getLogger
 from typing import List
 from typing import Optional
 
+from pydantic_extra_types.pendulum_dt import Date
+
 from mms_client.services.base import ClientProto
 from mms_client.services.base import ServiceConfiguration
 from mms_client.services.base import mms_endpoint

{mms_client-1.9.0 → mms_client-1.9.1}/src/mms_client/services/registration.py

@@ -1,10 +1,11 @@
 """Contains the client layer for making registration requests to the MMS server."""
 
-from datetime import date as Date
 from logging import getLogger
 from typing import List
 from typing import Optional
 
+from pydantic_extra_types.pendulum_dt import Date
+
 from mms_client.services.base import ClientProto
 from mms_client.services.base import ServiceConfiguration
 from mms_client.services.base import mms_endpoint

{mms_client-1.9.0 → mms_client-1.9.1}/src/mms_client/types/award.py

@@ -5,6 +5,9 @@ from enum import Enum
 from typing import List
 from typing import Optional
 
+from pendulum import Timezone
+from pydantic import field_serializer
+from pydantic import field_validator
 from pydantic_core import PydanticUndefined
 from pydantic_extra_types.pendulum_dt import DateTime
 from pydantic_xml import attr
@@ -109,6 +112,16 @@ class AwardQuery(Payload, tag="AwardResultsQuery"):
     # regardless of gate closure.
     gate_closed: Optional[BooleanFlag] = attr(default=None, name="AfterGC")
 
+    @field_serializer("start", "end")
+    def encode_datetime(self, value: DateTime) -> str:
+        """Encode the datetime to an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=None).isoformat()
+
+    @field_validator("start", "end")
+    def decode_datetime(cls, value: DateTime) -> DateTime:  # pylint: disable=no-self-argument
+        """Decode the datetime from an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=Timezone("Asia/Tokyo"))
+
 
 class Award(Payload):
     """Represents the details of a bid award."""
@@ -286,6 +299,16 @@ class Award(Payload):
     # Whether we are before gate close or after gate close
     gate_closed: BooleanFlag = attr(name="AfterGC")
 
+    @field_serializer("submission_time")
+    def encode_datetime(self, value: DateTime) -> str:
+        """Encode the datetime to an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=None).isoformat() if value else ""
+
+    @field_validator("submission_time")
+    def decode_datetime(cls, value: DateTime) -> DateTime:  # pylint: disable=no-self-argument
+        """Decode the datetime from an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=Timezone("Asia/Tokyo"))
+
 
 class AwardResult(Payload, tag="AwardResults"):
     """Contains a number of bid rewards associated with a block of time and trade direction."""
@@ -302,6 +325,16 @@ class AwardResult(Payload, tag="AwardResults"):
     # The bid awards associated with these parameters
     data: List[Award] = element(tag="AwardResultsData", min_length=1)
 
+    @field_serializer("start", "end")
+    def encode_datetime(self, value: DateTime) -> str:
+        """Encode the datetime to an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=None).isoformat()
+
+    @field_validator("start", "end")
+    def decode_datetime(cls, value: DateTime) -> DateTime:  # pylint: disable=no-self-argument
+        """Decode the datetime from an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=Timezone("Asia/Tokyo"))
+
 
 class AwardResponse(AwardQuery, tag="AwardResultsQuery"):
     """Contains the results of a bid award query."""

{mms_client-1.9.0 → mms_client-1.9.1}/src/mms_client/types/market.py

@@ -1,11 +1,9 @@
 """Contains objects for market information."""
 
-# Have to use this becasue pydantic doesn't like pendulum.Date. I've submitted a PR to address this but it hasn't been
-# merged or released yet.
-from datetime import date as Date
 from enum import Enum
 from typing import Optional
 
+from pydantic_extra_types.pendulum_dt import Date
 from pydantic_xml import attr
 
 from mms_client.types.base import Envelope

{mms_client-1.9.0 → mms_client-1.9.1}/src/mms_client/types/offer.py

@@ -4,6 +4,9 @@ from decimal import Decimal
 from typing import List
 from typing import Optional
 
+from pendulum import Timezone
+from pydantic import field_serializer
+from pydantic import field_validator
 from pydantic_extra_types.pendulum_dt import DateTime
 from pydantic_xml import attr
 from pydantic_xml import element
@@ -115,6 +118,16 @@ class OfferData(Payload):
     # The date and time when the offer was submitted
     submission_time: Optional[DateTime] = attr(default=None, name="SubmissionTime")
 
+    @field_serializer("start", "end", "submission_time")
+    def encode_datetime(self, value: DateTime) -> str:
+        """Encode the datetime to an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=None).isoformat() if value else ""
+
+    @field_validator("start", "end", "submission_time")
+    def decode_datetime(cls, value: DateTime) -> DateTime:  # pylint: disable=no-self-argument
+        """Decode the datetime from an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=Timezone("Asia/Tokyo"))
+
 
 class OfferCancel(Payload):
     """Describes the data necessary to cancel an offer in the MMS."""
@@ -132,6 +145,16 @@ class OfferCancel(Payload):
     # The type of market for the offer was submitted on
     market_type: MarketType = attr(name="MarketType")
 
+    @field_serializer("start", "end")
+    def encode_datetime(self, value: DateTime) -> str:
+        """Encode the datetime to an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=None).isoformat()
+
+    @field_validator("start", "end")
+    def decode_datetime(cls, value: DateTime) -> DateTime:  # pylint: disable=no-self-argument
+        """Decode the datetime from an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=Timezone("Asia/Tokyo"))
+
 
 class OfferQuery(Payload):
     """Describes the data necessary to query for offers in the MMS."""

{mms_client-1.9.0 → mms_client-1.9.1}/src/mms_client/types/registration.py

@@ -1,11 +1,9 @@
 """Contains objects for registrations."""
 
-# Have to use this becasue pydantic doesn't like pendulum.Date. I've submitted a PR to address this but it hasn't been
-# merged or released yet.
-from datetime import date as Date
 from enum import Enum
 from typing import Optional
 
+from pydantic_extra_types.pendulum_dt import Date
 from pydantic_xml import attr
 
 from mms_client.types.base import Envelope

{mms_client-1.9.0 → mms_client-1.9.1}/src/mms_client/types/report.py

@@ -1,13 +1,16 @@
 """Contains objects for report data."""
 
-from datetime import date as Date
 from decimal import Decimal
 from enum import StrEnum
 from typing import Annotated
 from typing import List
 from typing import Optional
 
+from pendulum import Timezone as TZ
+from pydantic import field_serializer
+from pydantic import field_validator
 from pydantic_core import PydanticUndefined
+from pydantic_extra_types.pendulum_dt import Date
 from pydantic_extra_types.pendulum_dt import DateTime
 from pydantic_xml import BaseXmlModel
 from pydantic_xml import attr
@@ -331,6 +334,16 @@ class OutboundData(Envelope):
     # The time the report was published
     publish_time: Optional[DateTime] = attr(default=None, name="PublishTime")
 
+    @field_serializer("publish_time")
+    def encode_datetime(self, value: DateTime) -> str:
+        """Encode the datetime to an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=None).isoformat() if value else ""
+
+    @field_validator("publish_time")
+    def decode_datetime(cls, value: DateTime) -> DateTime:  # pylint: disable=no-self-argument
+        """Decode the datetime from an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=TZ("Asia/Tokyo"))
+
 
 class ReportLineBase(Payload):
     """Represents the base fields for a report line item."""

{mms_client-1.9.0 → mms_client-1.9.1}/src/mms_client/types/reserve.py

@@ -3,6 +3,9 @@
 from typing import List
 from typing import Optional
 
+from pendulum import Timezone
+from pydantic import field_serializer
+from pydantic import field_validator
 from pydantic_extra_types.pendulum_dt import DateTime
 from pydantic_xml import attr
 from pydantic_xml import element
@@ -50,6 +53,16 @@ class Requirement(Payload):
     # The minimum reserve of compound primary and tertiary 1 in kW
     primary_tertiary_1_qty_kw: Optional[int] = power_positive("CompoundPriTer1ReserveQuantityInKw", True)
 
+    @field_serializer("start", "end")
+    def encode_datetime(self, value: DateTime) -> str:
+        """Encode the datetime to an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=None).isoformat()
+
+    @field_validator("start", "end")
+    def decode_datetime(cls, value: DateTime) -> DateTime:  # pylint: disable=no-self-argument
+        """Decode the datetime from an MMS-compliant ISO 8601 string."""
+        return value.replace(tzinfo=Timezone("Asia/Tokyo"))
+
 
 class ReserveRequirement(Payload):
     """Represents a set of reserve requirements."""

{mms_client-1.9.0 → mms_client-1.9.1}/src/mms_client/types/resource.py

@@ -2,7 +2,6 @@
 
 # pylint: disable=too-many-lines
 
-from datetime import date as Date
 from decimal import Decimal
 from enum import Enum
 from typing import Annotated
@@ -10,6 +9,7 @@ from typing import List
 from typing import Optional
 
 from pydantic_core import PydanticUndefined
+from pydantic_extra_types.pendulum_dt import Date
 from pydantic_xml import attr
 from pydantic_xml import element
 from pydantic_xml import wrapped