strawberry-graphql 0.262.7.dev1743345593__tar.gz → 0.263.0__tar.gz

{strawberry_graphql-0.262.7.dev1743345593 → strawberry_graphql-0.263.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: strawberry-graphql
-Version: 0.262.7.dev1743345593
+Version: 0.263.0
 Summary: A library for creating GraphQL APIs
 License: MIT
 Keywords: graphql,api,rest,starlette,async

{strawberry_graphql-0.262.7.dev1743345593 → strawberry_graphql-0.263.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "strawberry-graphql"
 packages = [ { include = "strawberry" } ]
-version = "0.262.7.dev.1743345593"
+version = "0.263.0"
 description = "A library for creating GraphQL APIs"
 authors = ["Patrick Arminio <patrick.arminio@gmail.com>"]
 license = "MIT"

{strawberry_graphql-0.262.7.dev1743345593 → strawberry_graphql-0.263.0}/strawberry/__init__.py

@@ -23,7 +23,7 @@ from .types.object_type import asdict, input, interface, type  # noqa: A004
 from .types.private import Private
 from .types.scalar import scalar
 from .types.union import union
-from .types.unset import UNSET, Maybe, exists
+from .types.unset import UNSET
 
 __all__ = [
     "ID",
@@ -31,7 +31,6 @@ __all__ = [
     "BasePermission",
     "Info",
     "LazyType",
-    "Maybe",
     "Parent",
     "Private",
     "Schema",
@@ -43,7 +42,6 @@ __all__ = [
     "directive_field",
     "enum",
     "enum_value",
-    "exists",
     "experimental",
     "federation",
     "field",

{strawberry_graphql-0.262.7.dev1743345593 → strawberry_graphql-0.263.0}/strawberry/annotation.py

@@ -30,7 +30,7 @@ from strawberry.types.enum import enum as strawberry_enum
 from strawberry.types.lazy_type import LazyType
 from strawberry.types.private import is_private
 from strawberry.types.scalar import ScalarDefinition
-from strawberry.types.unset import UNSET, _annot_is_maybe
+from strawberry.types.unset import UNSET
 from strawberry.utils.typing import eval_type, is_generic, is_type_var
 
 if TYPE_CHECKING:
@@ -143,11 +143,6 @@ class StrawberryAnnotation:
             return evaled_type
         if self._is_list(evaled_type):
             return self.create_list(evaled_type)
-        if type_of := self._get_maybe_type(evaled_type):
-            return StrawberryAnnotation(
-                annotation=Union[type_of, None],
-                namespace=self.namespace,
-            ).resolve()
 
         if self._is_graphql_generic(evaled_type):
             if any(is_type_var(type_) for type_ in get_args(evaled_type)):
@@ -315,10 +310,6 @@ class StrawberryAnnotation:
             or is_list
         )
 
-    @classmethod
-    def _get_maybe_type(cls, annotation: Any) -> type | None:
-        return get_args(annotation)[0] if _annot_is_maybe(annotation) else None
-
     @classmethod
     def _is_strawberry_type(cls, evaled_type: Any) -> bool:
         # Prevent import cycles

{strawberry_graphql-0.262.7.dev1743345593 → strawberry_graphql-0.263.0}/strawberry/experimental/pydantic/_compat.py

@@ -12,7 +12,7 @@ from pydantic.version import VERSION as PYDANTIC_VERSION
 from strawberry.experimental.pydantic.exceptions import UnsupportedTypeError
 
 if TYPE_CHECKING:
-    from pydantic.fields import FieldInfo
+    from pydantic.fields import ComputedFieldInfo, FieldInfo
 
 IS_PYDANTIC_V2: bool = PYDANTIC_VERSION.startswith("2.")
 IS_PYDANTIC_V1: bool = not IS_PYDANTIC_V2
@@ -128,7 +128,33 @@ class PydanticV2Compat:
 
         return PydanticUndefined
 
-    def get_model_fields(self, model: type[BaseModel]) -> dict[str, CompatModelField]:
+    def get_model_computed_fields(
+        self, model: type[BaseModel]
+    ) -> dict[str, CompatModelField]:
+        computed_field_info: dict[str, ComputedFieldInfo] = model.model_computed_fields
+        new_fields = {}
+        # Convert it into CompatModelField
+        for name, field in computed_field_info.items():
+            new_fields[name] = CompatModelField(
+                name=name,
+                type_=field.return_type,
+                outer_type_=field.return_type,
+                default=None,
+                default_factory=None,
+                required=False,
+                alias=field.alias,
+                # v2 doesn't have allow_none
+                allow_none=False,
+                has_alias=field is not None,
+                description=field.description,
+                _missing_type=self.PYDANTIC_MISSING_TYPE,
+                is_v1=False,
+            )
+        return new_fields
+
+    def get_model_fields(
+        self, model: type[BaseModel], include_computed: bool = False
+    ) -> dict[str, CompatModelField]:
         field_info: dict[str, FieldInfo] = model.model_fields
         new_fields = {}
         # Convert it into CompatModelField
@@ -148,6 +174,8 @@ class PydanticV2Compat:
                 _missing_type=self.PYDANTIC_MISSING_TYPE,
                 is_v1=False,
             )
+        if include_computed:
+            new_fields |= self.get_model_computed_fields(model)
         return new_fields
 
     @cached_property
@@ -175,7 +203,10 @@ class PydanticV1Compat:
     def PYDANTIC_MISSING_TYPE(self) -> Any:  # noqa: N802
         return dataclasses.MISSING
 
-    def get_model_fields(self, model: type[BaseModel]) -> dict[str, CompatModelField]:
+    def get_model_fields(
+        self, model: type[BaseModel], include_computed: bool = False
+    ) -> dict[str, CompatModelField]:
+        """`include_computed` is a noop for PydanticV1Compat."""
         new_fields = {}
         # Convert it into CompatModelField
         for name, field in model.__fields__.items():  # type: ignore[attr-defined]
@@ -284,7 +315,6 @@ else:
         smart_deepcopy,
     )
 
-
 __all__ = [
     "PydanticCompat",
     "get_args",

{strawberry_graphql-0.262.7.dev1743345593 → strawberry_graphql-0.263.0}/strawberry/experimental/pydantic/object_type.py

@@ -126,11 +126,12 @@ def type(  # noqa: PLR0915
     description: Optional[str] = None,
     directives: Optional[Sequence[object]] = (),
     all_fields: bool = False,
+    include_computed: bool = False,
     use_pydantic_alias: bool = True,
 ) -> Callable[..., builtins.type[StrawberryTypeFromPydantic[PydanticModel]]]:
     def wrap(cls: Any) -> builtins.type[StrawberryTypeFromPydantic[PydanticModel]]:  # noqa: PLR0915
         compat = PydanticCompat.from_model(model)
-        model_fields = compat.get_model_fields(model)
+        model_fields = compat.get_model_fields(model, include_computed=include_computed)
         original_fields_set = set(fields) if fields else set()
 
         if fields:
@@ -171,7 +172,10 @@ def type(  # noqa: PLR0915
             raise MissingFieldsListError(cls)
 
         ensure_all_auto_fields_in_pydantic(
-            model=model, auto_fields=auto_fields_set, cls_name=cls.__name__
+            model=model,
+            auto_fields=auto_fields_set,
+            cls_name=cls.__name__,
+            include_computed=include_computed,
         )
 
         wrapped = _wrap_dataclass(cls)

{strawberry_graphql-0.262.7.dev1743345593 → strawberry_graphql-0.263.0}/strawberry/experimental/pydantic/utils.py

@@ -117,11 +117,17 @@ def get_default_factory_for_field(
 
 
 def ensure_all_auto_fields_in_pydantic(
-    model: type[BaseModel], auto_fields: set[str], cls_name: str
+    model: type[BaseModel],
+    auto_fields: set[str],
+    cls_name: str,
+    include_computed: bool = False,
 ) -> None:
     compat = PydanticCompat.from_model(model)
     # Raise error if user defined a strawberry.auto field not present in the model
-    non_existing_fields = list(auto_fields - compat.get_model_fields(model).keys())
+    non_existing_fields = list(
+        auto_fields
+        - compat.get_model_fields(model, include_computed=include_computed).keys()
+    )
 
     if non_existing_fields:
         raise AutoFieldsNotInBaseModelError(

{strawberry_graphql-0.262.7.dev1743345593 → strawberry_graphql-0.263.0}/strawberry/types/object_type.py

@@ -20,7 +20,6 @@ from strawberry.exceptions import (
     ObjectIsNotClassError,
 )
 from strawberry.types.base import get_object_definition
-from strawberry.types.unset import UNSET, _annot_is_maybe
 from strawberry.utils.deprecations import DEPRECATION_MESSAGES, DeprecatedDescriptor
 from strawberry.utils.str_converters import to_camel_case
 
@@ -123,15 +122,6 @@ def _wrap_dataclass(cls: builtins.type[T]) -> builtins.type[T]:
     return dclass
 
 
-def _inject_default_for_maybe_annotations(
-    cls: builtins.type[T], annotations: dict[str, Any]
-) -> None:
-    """Inject `= UNSET` for fields with `Maybe` annotations and no default value."""
-    for name, annot in annotations.copy().items():
-        if _annot_is_maybe(annot) and not getattr(cls, name, None):
-            setattr(cls, name, UNSET)
-
-
 def _process_type(
     cls: T,
     *,
@@ -296,8 +286,7 @@ def type(
 
             if field and isinstance(field, StrawberryField) and field.type_annotation:
                 original_type_annotations[field_name] = field.type_annotation.annotation
-        if is_input:
-            _inject_default_for_maybe_annotations(cls, annotations)
+
         wrapped = _wrap_dataclass(cls)
 
         return _process_type(  # type: ignore

{strawberry_graphql-0.262.7.dev1743345593 → strawberry_graphql-0.263.0}/strawberry/types/unset.py

@@ -1,7 +1,5 @@
-import typing
 import warnings
-from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar, Union
-from typing_extensions import TypeAlias, TypeGuard
+from typing import Any, Optional
 
 DEPRECATED_NAMES: dict[str, str] = {
     "is_unset": "`is_unset` is deprecated use `value is UNSET` instead",
@@ -63,26 +61,6 @@ def __getattr__(name: str) -> Any:
     raise AttributeError(f"module {__name__} has no attribute {name}")
 
 
-NOTHING = UnsetType()
-"""A special value that can be used to represent an unset value in a field or argument."""
-
-T = TypeVar("T")
-
-if TYPE_CHECKING:
-    Maybe: TypeAlias = Union[T, UnsetType, None]
-else:
-    # we do this trick so we can inspect that at runtime
-    class Maybe(Generic[T]): ...
-
-
-def _annot_is_maybe(annotation: Any) -> bool:
-    return (orig := typing.get_origin(annotation)) and orig is Maybe
-
-
-def exists(value: Union[T, UnsetType, None]) -> TypeGuard[Union[T, None]]:
-    return value is not UNSET or not isinstance(value, UnsetType)
-
-
 __all__ = [
     "UNSET",
 ]