indico_toolkit 10.1.0__tar.gz → 10.3.0__tar.gz

{indico_toolkit-10.1.0 → indico_toolkit-10.3.0}/PKG-INFO

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

{indico_toolkit-10.1.0 → indico_toolkit-10.3.0}/pyproject.toml

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

{indico_toolkit-10.1.0 → indico_toolkit-10.3.0}/pyproject.toml.orig

@@ -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.1.0"
+version = "10.3.0"
 dependencies = [
     "asyncstdlib (>=3.14.0,<4.0.0)",
     "httpx (>=0.28.1,<0.29.0)",

{indico_toolkit-10.1.0 → indico_toolkit-10.3.0}/src/indico_toolkit/orm/__init__.py

@@ -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",
 )
 
 

{indico_toolkit-10.1.0 → indico_toolkit-10.3.0}/src/indico_toolkit/orm/fields.py

@@ -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,

{indico_toolkit-10.1.0 → indico_toolkit-10.3.0}/src/indico_toolkit/orm/submissions.py

@@ -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()
@@ -46,28 +48,44 @@ def load(submission_class: type[Submission], submission_id: int) -> GraphqlItera
     Yield GraphQL queries to load the fields specified on dataclass `submission_class`
     for submission ID `submission_id`.
     """
+    fields = get_fields(submission_class)
     yield (
         textwrap.dedent("""
             query load(
                 $submissionId: ID!
                 $fieldIds: [String!]!
+                $limit: Int
             ) {
                 submission(id: $submissionId) {
-                    fields(fieldIds: $fieldIds) {
+                    fields(
+                        fieldIds: $fieldIds
+                        limit: $limit
+                    ) {
                         field {
                             fieldId
                         }
                         values(
-                            filters: [
-                                {
-                                    field: "status"
-                                    op: EQUAL
+                            filters: {
+                                match: {
+                                    property: "status"
+                                    operator: EQUAL
                                     textValues: ["ACCEPTED", "BUILTIN"]
                                 }
-                            ]
+                            }
                         ) {
                             id
                             value
+                            structured {
+                                ... on PriceStructured {
+                                    amount
+                                    currency
+                                }
+                                ... on UserStructured {
+                                    id: userId
+                                    name: displayName
+                                    email
+                                }
+                            }
                         }
                     }
                 }
@@ -75,7 +93,8 @@ def load(submission_class: type[Submission], submission_id: int) -> GraphqlItera
         """).strip(),
         {
             "submissionId": submission_id,
-            "fieldIds": [field.id for field in get_fields(submission_class)],
+            "fieldIds": [field.id for field in fields],
+            "limit": len(fields),
         },
     )
 
@@ -103,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)
@@ -260,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": {
@@ -271,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}")

{indico_toolkit-10.1.0 → indico_toolkit-10.3.0}/src/indico_toolkit/orm/tables.py

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

{indico_toolkit-10.1.0 → indico_toolkit-10.3.0}/src/indico_toolkit/orm/types.py

@@ -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.1.0 → indico_toolkit-10.3.0}/src/indico_toolkit/router/__init__.py

@@ -8,11 +8,13 @@ from .annotations import (
     ExportId,
     FieldIds,
     FileNameBytes,
+    MergedSubmissionId,
     OrmIter,
     SubmissionId,
     TableId,
 )
 from .create_submission import CreateSubmission, on_create_submission
+from .merge_submission import MergeSubmission, on_merge_submission
 from .start_export import (
     StartExport,
     on_start_custom_export,
@@ -30,7 +32,10 @@ __all__ = (
     "ExportId",
     "FieldIds",
     "FileNameBytes",
+    "MergedSubmissionId",
+    "MergeSubmission",
     "on_create_submission",
+    "on_merge_submission",
     "on_start_custom_export",
     "on_start_export",
     "on_start_json_export",
@@ -52,6 +57,7 @@ _ROUTE_MAPPING = {
     "new_submission": CreateSubmission,
     "status_change": UpdateStatus,
     "table_update": UpdateTable,
+    "submission_merge": MergeSubmission,
 }
 
 

{indico_toolkit-10.1.0 → indico_toolkit-10.3.0}/src/indico_toolkit/router/annotations.py

@@ -14,6 +14,7 @@ _AsyncKwargsIter: TypeAlias = AsyncIterator[tuple[str, Any]]
 DocumentId = NewType("DocumentId", int)
 ExportId = NewType("ExportId", int)
 FieldIds = NewType("FieldIds", frozenset[str])
+MergedSubmissionId = NewType("MergedSubmissionId", int)
 SubmissionId = NewType("SubmissionId", int)
 TableId = NewType("TableId", str)
 
@@ -48,6 +49,12 @@ def resolve_field(callback: Callback, signal: Any) -> _KwargsIter:
             )
 
 
+def resolve_merged_submission(callback: Callback, signal: Any) -> _KwargsIter:
+    for annotation_name, annotation_type in _annotations(callback):
+        if annotation_type is MergedSubmissionId:
+            yield annotation_name, signal["merged_submission_id"]
+
+
 def resolve_microclient(callback: Callback, client: MicroClient) -> _KwargsIter:
     for annotation_name, annotation_type in _annotations(callback):
         if annotation_type is MicroClient:

indico_toolkit-10.3.0/src/indico_toolkit/router/merge_submission.py

@@ -0,0 +1,43 @@
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import Any, Awaitable, Self, TypeVar
+
+import asyncstdlib as a
+
+from .. import orm
+from ..microclient import MicroClient
+from . import annotations
+from .annotations import AsyncOrmIter, OrmIter
+from .routes import Callback, Route, register
+
+
+@dataclass(frozen=True)
+class MergeSubmission(Route):
+    @classmethod
+    def from_signal(cls, signal: Any) -> Self:
+        return cls()
+
+    def matches(self, other: Any) -> bool:
+        return isinstance(other, type(self))
+
+    async def run(self, callback: Callback, client: MicroClient, signal: Any) -> None:
+        kwargs = await a.dict(
+            a.chain(
+                annotations.resolve_merged_submission(callback, signal),
+                annotations.resolve_microclient(callback, client),
+                annotations.resolve_orm(callback, client, signal),
+                annotations.resolve_submission(callback, signal),
+            )
+        )
+
+        changes = await a.list((await a.sync(callback)(**kwargs)) or [])
+
+        for query, variables in orm.save(changes, signal["submission_id"]):
+            await client.graphql(query, variables)
+
+
+T = TypeVar("T", bound=Callable[..., OrmIter | AsyncOrmIter | None | Awaitable[None]])
+
+
+def on_merge_submission() -> Callable[[T], T]:
+    return register(MergeSubmission())