PyPI - indico_toolkit - Versions diffs - 10.2.0__tar.gz → 10.3.0__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: indico-toolkit
-Version: 10.2.0
+Version: 10.3.0
 Summary: Indico Toolkit for Intake and Insights
 License-Expression: MIT
 Requires-Dist: asyncstdlib>=3.14.0,<4.0.0

@@ -8,7 +8,7 @@ description = "Indico Toolkit for Intake and Insights"
 license = "MIT"
 readme = "README.md"
 requires-python = ">=3.11,<4"
-version = "10.2.0"
+version = "10.3.0"
 dependencies = [
     "asyncstdlib (>=3.14.0,<4.0.0)",
     "httpx (>=0.28.1,<0.29.0)",

@@ -9,7 +9,7 @@ license = "MIT"
 readme = "README.md"
 urls = { source = "https://github.com/IndicoDelivery/indico-toolkit-python" }
 requires-python = ">=3.11,<4"
-version = "10.2.0"
+version = "10.3.0"
 dependencies = [
     "asyncstdlib (>=3.14.0,<4.0.0)",
     "httpx (>=0.28.1,<0.29.0)",

@@ -5,14 +5,16 @@ from typing import Any
 from . import submissions, tables
 from .submissions import Submission
 from .tables import Table
-from .types import GraphqlIterator, OrmType
+from .types import GraphqlIterator, OrmType, Price, User
 __all__ = (
     "init",
     "load",
+    "Price",
     "save",
     "Submission",
     "Table",
+    "User",
 )

@@ -17,6 +17,12 @@ class Field:
     collection_type: type | None
     attribute: str
+    def parse(self, value: Any) -> Any:
+        if dataclasses.is_dataclass(self.scalar_type):
+            return self.scalar_type(**vars(value.structured))
+        else:
+            return self.scalar_parser(value.value)
 def validate_fields(
     orm: type,

@@ -8,7 +8,7 @@ from typing import Any
 from .collections import WeakIdKeyDictionary
 from .fields import get_fields, validate_fields
-from .types import GraphqlIterator, SubmissionType
+from .types import GraphqlIterator, Price, SubmissionType, User
 _SUPPORTED_COLLECTION_TYPES = (
     list,
@@ -21,8 +21,10 @@ _SUPPORTED_SCALAR_TYPES = (
     datetime,
     float,
     int,
+    Price,
     str,
     StrEnum,
+    User,
 )
 _INSTANCE_PREV_VALUES = WeakIdKeyDictionary()
@@ -73,6 +75,17 @@ def load(submission_class: type[Submission], submission_id: int) -> GraphqlItera
                         ) {
                             id
                             value
+                            structured {
+                                ... on PriceStructured {
+                                    amount
+                                    currency
+                                }
+                                ... on UserStructured {
+                                    id: userId
+                                    name: displayName
+                                    email
+                                }
+                            }
                         }
                     }
                 }
@@ -109,23 +122,17 @@ def init(submission_class: type[SubmissionType], graphql: Iterable[Any]) -> Iter
                 prev_values[field.id] = field.collection_type()
                 prev_ids[field.id] = None
             else:
-                kwargs[field.id] = field.collection_type(
-                    field.scalar_parser(value.value) for value in values
-                )
-                prev_values[field.id] = field.collection_type(
-                    field.scalar_parser(value.value) for value in values
-                )
-                prev_ids[field.id] = {
-                    field.scalar_parser(value.value): value.id for value in values
-                }
+                kwargs[field.id] = field.collection_type(map(field.parse, values))
+                prev_values[field.id] = field.collection_type(map(field.parse, values))
+                prev_ids[field.id] = {field.parse(value): value.id for value in values}
         else:
             if not values:
                 kwargs[field.id] = None
                 prev_values[field.id] = None
                 prev_ids[field.id] = None
             else:
-                kwargs[field.id] = field.scalar_parser(values[0].value)
-                prev_values[field.id] = field.scalar_parser(values[0].value)
+                kwargs[field.id] = field.parse(values[0])
+                prev_values[field.id] = field.parse(values[0])
                 prev_ids[field.id] = values[0].id
     instance = submission_class(**kwargs)
@@ -266,7 +273,13 @@ def _structured(scalar_type: type[Any], value: Any) -> dict[str, dict[str, Any]]
     if scalar_type is bool:
         return {"boolean": {"value": value}}
     elif scalar_type is date:
-        return {"date": {"year": value.year, "month": value.month, "day": value.day}}
+        return {
+            "date": {
+                "year": value.year,
+                "month": value.month,
+                "day": value.day,
+            }
+        }
     elif scalar_type is datetime:
         return {
             "dateTime": {
@@ -277,9 +290,23 @@ def _structured(scalar_type: type[Any], value: Any) -> dict[str, dict[str, Any]]
         }  # fmt: skip
     elif scalar_type is int or scalar_type is float:
         return {"number": {"numberPrecise": str(value)}}
+    elif scalar_type is Price:
+        return {
+            "price": {
+                "amountPrecise": str(value.amount),
+                "currency": value.currency,
+            }
+        }
     elif scalar_type is str:
         return {"text": {"text": value}}
     elif scalar_type is StrEnum or issubclass(scalar_type, StrEnum):
         return {"lookup": {"option": value}}
+    elif scalar_type is User:
+        return {
+            "user": {
+                "userId": value.id,
+                "email": value.email,
+            }
+        }
     else:
         raise TypeError(f"unmapped scalar type {scalar_type}")

@@ -79,7 +79,7 @@ def init(table_class: type[TableType], graphql: Iterable[Any]) -> Iterator[Table
         for field in get_fields(table_class):
             if value := values_by_field_id.get(field.id):
-                kwargs[field.id] = field.scalar_type(value.value)
+                kwargs[field.id] = field.parse(value)
             else:
                 kwargs[field.id] = None

@@ -1,4 +1,5 @@
 from collections.abc import Iterator
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, TypeAlias, TypeVar
 if TYPE_CHECKING:
@@ -16,5 +17,16 @@ SubmissionType = TypeVar("SubmissionType", bound="Submission")
 TableType = TypeVar("TableType", bound="Table")
 OrmType = TypeVar("OrmType", bound="Submission | Table")
 # Scalar Field Types
-# Price = ...
+@dataclass(frozen=True)
+class Price:
+    amount: float
+    currency: str
+@dataclass(frozen=True)
+class User:
+    id: int
+    name: str
+    email: str

indico_toolkit 10.2.0__tar.gz → 10.3.0__tar.gz

indico_toolkit 10.2.0tar.gz → 10.3.0tar.gz