strawberry-sqlalchemy-mapper 0.4.0__tar.gz → 0.4.2__tar.gz

{strawberry_sqlalchemy_mapper-0.4.0 → strawberry_sqlalchemy_mapper-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strawberry-sqlalchemy-mapper
-Version: 0.4.0
+Version: 0.4.2
 Summary: A library for autogenerating Strawberry GraphQL types from SQLAlchemy models.
 Home-page: https://strawberry.rocks/
 License: MIT
@@ -172,7 +172,7 @@ Natively supports the following SQLAlchemy types:
 ```python
 Integer: int,
 Float: float,
-BigInteger: int,
+BigInteger: BigInt,
 Numeric: Decimal,
 DateTime: datetime,
 Date: date,

{strawberry_sqlalchemy_mapper-0.4.0 → strawberry_sqlalchemy_mapper-0.4.2}/README.md

@@ -136,7 +136,7 @@ Natively supports the following SQLAlchemy types:
 ```python
 Integer: int,
 Float: float,
-BigInteger: int,
+BigInteger: BigInt,
 Numeric: Decimal,
 DateTime: datetime,
 Date: date,

{strawberry_sqlalchemy_mapper-0.4.0 → strawberry_sqlalchemy_mapper-0.4.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-sqlalchemy-mapper"
 packages = [ { include = "strawberry_sqlalchemy_mapper", from = "src" } ]
-version = "0.4.0"
+version = "0.4.2"
 description = "A library for autogenerating Strawberry GraphQL types from SQLAlchemy models."
 authors = ["Tim Dumol <tim@timdumol.com>"]
 license = "MIT"
@@ -50,7 +50,7 @@ sqlakeyset = "^2.0.1695177552"
 asyncpg = ">=0.28,<0.30"
 black = ">=22,<24"
 importlib-metadata = ">=4.11.1,<8.0.0"
-mypy = "1.7.1"
+mypy = "1.8.0"
 nox = "^2023.4.22"
 nox-poetry = "^1.0.2"
 packaging = ">=23.1"

{strawberry_sqlalchemy_mapper-0.4.0 → strawberry_sqlalchemy_mapper-0.4.2}/src/strawberry_sqlalchemy_mapper/mapper.py

@@ -73,6 +73,7 @@ from sqlalchemy.sql.type_api import TypeEngine
 from strawberry import relay
 from strawberry.annotation import StrawberryAnnotation
 from strawberry.field import StrawberryField
+from strawberry.lazy_type import LazyType
 from strawberry.private import is_private
 from strawberry.scalars import JSON as StrawberryJSON
 from strawberry.type import WithStrawberryObjectDefinition, get_object_definition
@@ -92,6 +93,7 @@ from strawberry_sqlalchemy_mapper.relay import (
     resolve_model_node,
     resolve_model_nodes,
 )
+from strawberry_sqlalchemy_mapper.scalars import BigInt
 
 if TYPE_CHECKING:
     from sqlalchemy.sql.expression import ColumnElement
@@ -112,6 +114,19 @@ _IS_GENERATED_CONNECTION_TYPE_KEY = "_is_generated_connection_type"
 _IS_GENERATED_RESOLVER_KEY = "_is_generated_resolver"
 
 
+@dataclasses.dataclass(frozen=True)
+class StrawberrySQLAlchemyLazy(LazyType):
+    # We don't actually want `Optional` here but we can't use dataclasse's
+    # kw_only untul python 3.10, and we do have fields with default values
+    # in strawberry's LazyType
+    mapper: Optional["StrawberrySQLAlchemyMapper[Any]"] = None
+    module: str = "__not_used__"
+
+    def resolve_type(self) -> Type[Any]:
+        assert self.mapper is not None
+        return self.mapper.mapped_types[self.type_name]
+
+
 class WithStrawberrySQLAlchemyObjectDefinition(
     WithStrawberryObjectDefinition,
     Protocol,
@@ -179,7 +194,7 @@ class StrawberrySQLAlchemyMapper(Generic[BaseModelType]):
     ] = {
         Integer: int,
         Float: float,
-        BigInteger: int,
+        BigInteger: BigInt,
         Numeric: Decimal,
         DateTime: datetime,
         Date: date,
@@ -282,11 +297,12 @@ class StrawberrySQLAlchemyMapper(Generic[BaseModelType]):
         """
         edge_name = f"{type_name}Edge"
         if edge_name not in self.edge_types:
+            lazy_type = StrawberrySQLAlchemyLazy(type_name=type_name, mapper=self)
             self.edge_types[edge_name] = edge_type = strawberry.type(
                 dataclasses.make_dataclass(
                     edge_name,
                     [],
-                    bases=(relay.Edge[type_name],),  # type: ignore[valid-type]
+                    bases=(relay.Edge[lazy_type],),  # type: ignore[valid-type]
                 )
             )
             setattr(edge_type, _GENERATED_FIELD_KEYS_KEY, ["node"])
@@ -300,13 +316,14 @@ class StrawberrySQLAlchemyMapper(Generic[BaseModelType]):
         connection_name = f"{type_name}Connection"
         if connection_name not in self.connection_types:
             edge_type = self._edge_type_for(type_name)
+            lazy_type = StrawberrySQLAlchemyLazy(type_name=type_name, mapper=self)
             self.connection_types[connection_name] = connection_type = strawberry.type(
                 dataclasses.make_dataclass(
                     connection_name,
                     [
                         ("edges", List[edge_type]),  # type: ignore[valid-type]
                     ],
-                    bases=(relay.ListConnection[type_name],),  # type: ignore[valid-type]
+                    bases=(relay.ListConnection[lazy_type],),  # type: ignore[valid-type]
                 )
             )
             setattr(connection_type, _GENERATED_FIELD_KEYS_KEY, ["edges"])
@@ -337,6 +354,8 @@ class StrawberrySQLAlchemyMapper(Generic[BaseModelType]):
             if item_type is SkipTypeSentinel:
                 return item_type
             type_annotation = List[item_type]  # type: ignore
+        elif isinstance(column.type, BigInteger):
+            type_annotation = BigInt
         else:
             for (
                 sqlalchemy_type,

strawberry_sqlalchemy_mapper-0.4.2/src/strawberry_sqlalchemy_mapper/scalars.py

@@ -0,0 +1,10 @@
+from typing import Union
+
+import strawberry
+
+BigInt = strawberry.scalar(
+    Union[int, str],  # type: ignore
+    serialize=lambda v: int(v),
+    parse_value=lambda v: str(v),
+    description="BigInt field",
+)