mms-client 1.9.0__py3-none-any.whl → 1.9.1__py3-none-any.whl

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/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/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/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/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/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/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/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/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

{mms_client-1.9.0.dist-info → mms_client-1.9.1.dist-info}/METADATA

@@ -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.dist-info → mms_client-1.9.1.dist-info}/RECORD

@@ -13,21 +13,21 @@ mms_client/security/certs.py,sha256=Gy-CuSsdLPFeoPH_sEYhY67dI5sy6yJ8iTwlysRKT1s,
 mms_client/security/crypto.py,sha256=u9Z6nkAW6LbBqUzjIEbZ-CcqdkMJ9fqvdX7IXTTh1EI,2345
 mms_client/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mms_client/services/base.py,sha256=4r_hsmSDmoutu9A-fVayBKqoe6FOAkm10qzNs47cFUI,30421
-mms_client/services/market.py,sha256=DUtnzWRLmTrTgZ4jo93B0S5Pq9K7dEtAGWYWbTbe5rA,9524
+mms_client/services/market.py,sha256=dRarOS-rxilincVEzhfPnSnXlLKYAimwcoTX9qigvog,9541
 mms_client/services/omi.py,sha256=UG1zYkFz0sFsEbhE6P0CLoAOZZOyEshkZ_b7D_e3CjQ,626
-mms_client/services/registration.py,sha256=tPJo-cBYURH5KkpxMQqWvZW6IqelzoBm5x6jzkJy-C0,3822
+mms_client/services/registration.py,sha256=XkXBgPK9PXFyNxo3ways_hUJ3E_vKTUlgCPgQQbDgWM,3839
 mms_client/services/report.py,sha256=hgRvjVxy8Hvbj5hQb0GMyDW0-1kMW2XFS5iKfO90YZY,6258
 mms_client/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mms_client/types/award.py,sha256=BWE9V_KHXpg_cW1LZsetVrPs2hZDOklvRpNnoZtmR3k,14139
+mms_client/types/award.py,sha256=1Tew43jo0HfaGJy4Uu3zFrB3HBjdwwR9ca-PADhenTI,15722
 mms_client/types/base.py,sha256=VYXnUkEKcI1ki6Sk0ekklDLKDLkv03xrfbSFzzV_RXk,11240
 mms_client/types/enums.py,sha256=hALMuqRChLUJ1Eglll5R5mkYLpcO-ZIaEBps3MjkTg0,2534
 mms_client/types/fields.py,sha256=pa5qvQVwEr8dh44IGHyYqgJYTYyTIeAjBW6CylXrkP0,14785
-mms_client/types/market.py,sha256=IbXsH4Q5MJI-CEvGvZlzv2S36mX_Ea02U11Ik-NwSxQ,2706
-mms_client/types/offer.py,sha256=KosFiKRMnt7XwlLBUfjHUGHiWzrMJUPPhGQMxgdeepM,6791
-mms_client/types/registration.py,sha256=Nir73S3ffpk0O_fnTD2alFaqV1k67_8dcyyduXvPBI4,1381
-mms_client/types/report.py,sha256=ogfzIMvQeGBR_21JVHqQo1fqBZY7ExuRlpj6nNcKRcU,23044
-mms_client/types/reserve.py,sha256=pLV47w_749EIVhj0tUuJdWdHBBEl0-v10oVioccgxnU,2667
-mms_client/types/resource.py,sha256=TNQM51SLxnkjSlyJ2Sh-8Ph1-rNgkz3JKrAgI6qSHEg,65284
+mms_client/types/market.py,sha256=D5tZB97ewHfwG9gVC35bHfdlGthi5GBeMaGBk5393wY,2577
+mms_client/types/offer.py,sha256=K6B8TgolIepJgveHz70I-dpE-ZSalcoFKKgH7C6b7P4,7921
+mms_client/types/registration.py,sha256=bPA_FQwLVIwb5CRqK8F3YqeV0dEeN04j1wMsClrV5Wc,1252
+mms_client/types/report.py,sha256=mIsqkF6pbzUBVpY-ushO_mxhMO1WeBw7jWtAEiD1O50,23667
+mms_client/types/reserve.py,sha256=mTWv1uUHImkucPyrp2SxUSE5zabggcjLT7qBiyEJxrg,3257
+mms_client/types/resource.py,sha256=749SNzqK1UVwzS2Ct_Q-a30PgnVQPp-CUQkoO_LCkao,65300
 mms_client/types/transport.py,sha256=-hRmhv1VdMiby6zQJjqNRO7TkatRU-ZEqoCdtQMpgdg,4407
 mms_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mms_client/utils/errors.py,sha256=6k-NOjGZyTbTUISzN7B4JrmU2P8cwjpFFmFC7kJOQFQ,3005
@@ -35,7 +35,7 @@ mms_client/utils/multipart_transport.py,sha256=GJvjdlmXituiT78f5XuhpPkcHdDHFtVEL
 mms_client/utils/plugin.py,sha256=_Jymcny5ta9uV4CMLGDX7O5xSQIhuu76rb-A6uhtFSY,2013
 mms_client/utils/serialization.py,sha256=weXZQOqAiQ4ga-vAVz8PQ1JR_iX2iN0lyMimqqC3mio,33783
 mms_client/utils/web.py,sha256=Qk8azZpxAIEtI9suOikxBNtFQFNuWh-92DaUBU1qX8s,10927
-mms_client-1.9.0.dist-info/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
-mms_client-1.9.0.dist-info/METADATA,sha256=sMf-OwVTryynN6TL4f_XykJj-GDpV1u0zPqMp_QKQkE,16578
-mms_client-1.9.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-mms_client-1.9.0.dist-info/RECORD,,
+mms_client-1.9.1.dist-info/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
+mms_client-1.9.1.dist-info/METADATA,sha256=4Ds55FAHJyhg1lCa_KzY8mPZMJOzXjY4Ljc3qu7xBj0,16578
+mms_client-1.9.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+mms_client-1.9.1.dist-info/RECORD,,