update imports for strawberry 0.236.0

RELEASE.md

@@ -0,0 +1,4 @@
+Release type: patch
+
+Updated imports to be compatible with strawberry 0.236.0
+Increased the minimum required strawberry version to 0.236.0

pyproject.toml

@@ -41,7 +41,7 @@ version_scheme = "no-guess-dev"
 [tool.poetry.dependencies]
 python = "^3.8"
 sqlalchemy = {extras = ["asyncio"], version = ">=1.4"}
-strawberry-graphql = ">=0.95"
+strawberry-graphql = ">=0.236.0"
 sentinel = ">=0.3,<1.1"
 greenlet = {version = ">=3.0.0rc1", python = ">=3.12"}
 sqlakeyset = "^2.0.1695177552"

src/strawberry_sqlalchemy_mapper/field.py

@@ -33,23 +33,23 @@
 from sqlalchemy.orm import Query, Session
 from strawberry import relay
 from strawberry.annotation import StrawberryAnnotation
-from strawberry.arguments import StrawberryArgument, argument
 from strawberry.extensions.field_extension import (
     FieldExtension,
 )
-from strawberry.field import (
-    _RESOLVER_TYPE,
-    StrawberryField,
-)
 from strawberry.permission import BasePermission
 from strawberry.relay.exceptions import RelayWrongAnnotationError
 from strawberry.relay.types import NodeIterableType
-from strawberry.type import (
+from strawberry.types import Info
+from strawberry.types.arguments import StrawberryArgument, argument
+from strawberry.types.base import (
     StrawberryList,
     StrawberryOptional,
     get_object_definition,
 )
-from strawberry.types import Info
+from strawberry.types.field import (
+    _RESOLVER_TYPE,
+    StrawberryField,
+)
 from strawberry.types.fields.resolver import StrawberryResolver
 from strawberry.utils.aio import asyncgen_to_list
 
@@ -210,7 +210,7 @@ def resolver(
             resolved_nodes = {
                 node_t: (
                     session.run_sync(
-                        lambda s, node_t=node_t, node_ids=node_ids: list(
+                        lambda s, node_t=node_t, node_ids=node_ids: list(  # type: ignore
                             node_t.resolve_nodes(
                                 info=info,
                                 node_ids=node_ids,

src/strawberry_sqlalchemy_mapper/mapper.py

@@ -72,12 +72,12 @@
 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
 from strawberry.types import Info
+from strawberry.types.base import WithStrawberryObjectDefinition, get_object_definition
+from strawberry.types.field import StrawberryField
+from strawberry.types.lazy_type import LazyType
+from strawberry.types.private import is_private
 
 from strawberry_sqlalchemy_mapper.exc import (
     HybridPropertyNotAnnotated,

src/strawberry_sqlalchemy_mapper/relay.py

@@ -22,7 +22,7 @@
 from strawberry import relay
 from strawberry.relay.exceptions import NodeIDAnnotationError
 from strawberry.relay.types import NodeType
-from strawberry.type import StrawberryContainer, get_object_definition
+from strawberry.types.base import StrawberryContainer, get_object_definition
 
 if TYPE_CHECKING:
     from typing_extensions import Literal, Self

src/strawberry_sqlalchemy_mapper/utils.py

@@ -5,7 +5,7 @@
     overload,
 )
 
-from strawberry.type import (
+from strawberry.types.base import (
     StrawberryContainer,
     StrawberryType,
 )

tests/test_mapper.py

@@ -8,7 +8,7 @@
 from sqlalchemy.dialects.postgresql.array import ARRAY
 from sqlalchemy.orm import relationship
 from strawberry.scalars import JSON as StrawberryJSON
-from strawberry.type import StrawberryOptional
+from strawberry.types.base import StrawberryOptional
 from strawberry_sqlalchemy_mapper import StrawberrySQLAlchemyMapper
 
 
@@ -228,8 +228,8 @@ class Employee:
     assert len(additional_types) == 1
     mapped_employee_type = additional_types[0]
     assert mapped_employee_type.__name__ == "Employee"
-    assert len(mapped_employee_type.__strawberry_definition__._fields) == 2
-    employee_type_fields = mapped_employee_type.__strawberry_definition__._fields
+    assert len(mapped_employee_type.__strawberry_definition__.fields) == 2
+    employee_type_fields = mapped_employee_type.__strawberry_definition__.fields
     name = next(iter(filter(lambda f: f.name == "name", employee_type_fields)))
     assert name.type == str
     id = next(iter(filter(lambda f: f.name == "id", employee_type_fields)))
@@ -275,8 +275,8 @@ class Employee:
     assert len(additional_types) == 2
     mapped_employee_type = additional_types[0]
     assert mapped_employee_type.__name__ == "Employee"
-    assert len(mapped_employee_type.__strawberry_definition__._fields) == 4
-    employee_type_fields = mapped_employee_type.__strawberry_definition__._fields
+    assert len(mapped_employee_type.__strawberry_definition__.fields) == 4
+    employee_type_fields = mapped_employee_type.__strawberry_definition__.fields
     name = next(iter(filter(lambda f: f.name == "department_id", employee_type_fields)))
     assert type(name.type) == StrawberryOptional
     id = next(iter(filter(lambda f: f.name == "department", employee_type_fields)))