cadwyn 4.2.1__tar.gz → 4.2.3__tar.gz

{cadwyn-4.2.1 → cadwyn-4.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cadwyn
-Version: 4.2.1
+Version: 4.2.3
 Summary: Production-ready community-driven modern Stripe-like API versioning in FastAPI
 Home-page: https://github.com/zmievsa/cadwyn
 License: MIT
@@ -31,14 +31,13 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Provides-Extra: cli
 Requires-Dist: backports-strenum (>=1.3.1,<2.0.0) ; python_version < "3.11"
-Requires-Dist: fastapi (>=0.110.0)
+Requires-Dist: fastapi[standard] (>=0.112.3)
 Requires-Dist: issubclass (>=0.1.2,<0.2.0)
 Requires-Dist: jinja2 (>=3.1.2)
 Requires-Dist: pydantic (>=2.0.0)
 Requires-Dist: starlette (>=0.30.0)
-Requires-Dist: typer (>=0.7.0) ; extra == "cli"
+Requires-Dist: typer (>=0.7.0)
 Requires-Dist: typing-extensions
 Project-URL: Documentation, https://docs.cadwyn.dev
 Project-URL: Repository, https://github.com/zmievsa/cadwyn

{cadwyn-4.2.1 → cadwyn-4.2.3}/cadwyn/_asts.py

@@ -28,7 +28,7 @@ _BaseGenericAlias = cast(type, type(List[int])).mro()[1]  # noqa: UP006
 GenericAliasUnion = GenericAlias | _BaseGenericAlias
 
 
-def get_fancy_repr(value: Any):
+def get_fancy_repr(value: Any) -> Any:
     if isinstance(value, annotated_types.GroupedMetadata) and hasattr(type(value), "__dataclass_fields__"):
         return transform_grouped_metadata(value)
     if isinstance(value, list | tuple | set | frozenset):
@@ -85,7 +85,7 @@ def transform_generic_alias(value: GenericAliasUnion) -> Any:
     return f"{get_fancy_repr(get_origin(value))}[{', '.join(get_fancy_repr(a) for a in get_args(value))}]"
 
 
-def transform_none(_: NoneType) -> Any:
+def transform_none(_: type[None]) -> Any:
     return "None"
 
 

{cadwyn-4.2.1 → cadwyn-4.2.3}/cadwyn/applications.py

@@ -269,12 +269,20 @@ class Cadwyn(FastAPI):
         else:
             raise not_found_error
 
+        # Add root path to servers when mounted as sub-app or proxy is used
+        urls = (server_data.get("url") for server_data in self.servers)
+        server_urls = {url for url in urls if url}
+        root_path = self._extract_root_path(req)
+        if root_path and root_path not in server_urls and self.root_path_in_servers:
+            self.servers.insert(0, {"url": root_path})
+
         return JSONResponse(
             get_openapi(
                 title=self.title,
                 version=formatted_version,
                 openapi_version=self.openapi_version,
                 description=self.description,
+                summary=self.summary,
                 terms_of_service=self.terms_of_service,
                 contact=self.contact,
                 license_info=self.license_info,
@@ -320,7 +328,7 @@ class Cadwyn(FastAPI):
 
     def _render_docs_dashboard(self, req: Request, docs_url: str):
         base_host = str(req.base_url).rstrip("/")
-        root_path = req.scope.get("root_path", "")
+        root_path = self._extract_root_path(req)
         base_url = base_host + root_path
         table = {version: f"{base_url}{docs_url}?version={version}" for version in self.router.sorted_versions}
         if self._there_are_public_unversioned_routes():

{cadwyn-4.2.1 → cadwyn-4.2.3}/cadwyn/middleware.py

@@ -64,11 +64,11 @@ class HeaderVersioningMiddleware(BaseHTTPMiddleware):
                     request=request,
                     dependant=self.version_header_validation_dependant,
                     async_exit_stack=async_exit_stack,
+                    embed_body_fields=False,
                 )
-                values, errors, *_ = solved_result
-                if errors:
-                    return self.default_response_class(status_code=422, content=_normalize_errors(errors))
-                api_version = cast(date, values[self.api_version_header_name.replace("-", "_")])
+                if solved_result.errors:
+                    return self.default_response_class(status_code=422, content=_normalize_errors(solved_result.errors))
+                api_version = cast(date, solved_result.values[self.api_version_header_name.replace("-", "_")])
                 self.api_version_var.set(api_version)
 
         response = await call_next(request)

{cadwyn-4.2.1 → cadwyn-4.2.3}/cadwyn/schema_generation.py

@@ -341,12 +341,12 @@ class _PydanticModelWrapper(Generic[_T_PYDANTIC_MODEL]):
         per_field_validators = {
             name: validator.decorator(*validator.fields, **validator.kwargs)(validator.func)
             for name, validator in self.validators.items()
-            if not validator.is_deleted and type(validator) == _PerFieldValidatorWrapper
+            if not validator.is_deleted and type(validator) == _PerFieldValidatorWrapper  # noqa: E721
         }
         root_validators = {
             name: validator.decorator(**validator.kwargs)(validator.func)
             for name, validator in self.validators.items()
-            if not validator.is_deleted and type(validator) == _ValidatorWrapper
+            if not validator.is_deleted and type(validator) == _ValidatorWrapper  # noqa: E721
         }
         fields = {name: field.generate_field_copy(generator) for name, field in self.fields.items()}
         model_copy = type(self.cls)(
@@ -441,7 +441,7 @@ class _AnnotationTransformer:
     def migrate_route_to_version(self, route: fastapi.routing.APIRoute, *, ignore_response_model: bool = False):
         if route.response_model is not None and not ignore_response_model:
             route.response_model = self.change_version_of_annotation(route.response_model)
-            route.response_field = fastapi.utils.create_response_field(
+            route.response_field = fastapi.utils.create_model_field(
                 name="Response_" + route.unique_id,
                 type_=route.response_model,
                 mode="serialization",

{cadwyn-4.2.1 → cadwyn-4.2.3}/cadwyn/structure/versions.py

@@ -350,7 +350,9 @@ class VersionBundle:
         request_info: RequestInfo,
         current_version: VersionDate,
         head_route: APIRoute,
+        *,
         exit_stack: AsyncExitStack,
+        embed_body_fields: bool = False,
     ) -> dict[str, Any]:
         method = request.method
         for v in reversed(self.versions):
@@ -367,19 +369,20 @@ class VersionBundle:
         request.scope["headers"] = tuple((key.encode(), value.encode()) for key, value in request_info.headers.items())
         del request._headers
         # Remember this: if len(body_params) == 1, then route.body_schema == route.dependant.body_params[0]
-        dependencies, errors, _, _, _ = await solve_dependencies(
+        result = await solve_dependencies(
             request=request,
             response=response,
             dependant=head_dependant,
             body=request_info.body,
             dependency_overrides_provider=head_route.dependency_overrides_provider,
             async_exit_stack=exit_stack,
+            embed_body_fields=embed_body_fields,
         )
-        if errors:
+        if result.errors:
             raise CadwynHeadRequestValidationError(
-                _normalize_errors(errors), body=request_info.body, version=current_version
+                _normalize_errors(result.errors), body=request_info.body, version=current_version
             )
-        return dependencies
+        return result.values
 
     def _migrate_response(
         self,
@@ -452,7 +455,8 @@ class VersionBundle:
                         response_param,
                         route,
                         head_route,
-                        exit_stack,
+                        exit_stack=exit_stack,
+                        embed_body_fields=route._embed_body_fields,
                     )
 
                     response = await self._convert_endpoint_response_to_version(
@@ -479,7 +483,7 @@ class VersionBundle:
             if response_param_name == _CADWYN_RESPONSE_PARAM_NAME:
                 _add_keyword_only_parameter(decorator, _CADWYN_RESPONSE_PARAM_NAME, FastapiResponse)
 
-            return decorator
+            return decorator  # pyright: ignore[reportReturnType]
 
         return wrapper
 
@@ -524,10 +528,14 @@ class VersionBundle:
             if isinstance(response_or_response_body, StreamingResponse | FileResponse):
                 body = None
             elif response_or_response_body.body:
-                if isinstance(response_or_response_body, JSONResponse) or raised_exception is not None:
+                if (isinstance(response_or_response_body, JSONResponse) or raised_exception is not None) and isinstance(
+                    response_or_response_body.body, str | bytes
+                ):
                     body = json.loads(response_or_response_body.body)
-                else:
+                elif isinstance(response_or_response_body.body, bytes):
                     body = response_or_response_body.body.decode(response_or_response_body.charset)
+                else:  # pragma: no cover # I don't see a good use case here yet
+                    body = response_or_response_body.body
             else:
                 body = None
                 # TODO (https://github.com/zmievsa/cadwyn/issues/51): Only do this if there are migrations
@@ -614,7 +622,9 @@ class VersionBundle:
         response: FastapiResponse,
         route: APIRoute,
         head_route: APIRoute,
+        *,
         exit_stack: AsyncExitStack,
+        embed_body_fields: bool,
     ) -> dict[str, Any]:
         request: FastapiRequest = kwargs[request_param_name]
         if request_param_name == _CADWYN_REQUEST_PARAM_NAME:
@@ -655,6 +665,7 @@ class VersionBundle:
             api_version,
             head_route,
             exit_stack=exit_stack,
+            embed_body_fields=embed_body_fields,
         )
         # Because we re-added it into our kwargs when we did solve_dependencies
         if _CADWYN_REQUEST_PARAM_NAME in new_kwargs:

{cadwyn-4.2.1 → cadwyn-4.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cadwyn"
-version = "4.2.1"
+version = "4.2.3"
 description = "Production-ready community-driven modern Stripe-like API versioning in FastAPI"
 authors = ["Stanislav Zmiev <zmievsa@gmail.com>"]
 license = "MIT"
@@ -50,19 +50,16 @@ classifiers = [
 
 
 [tool.poetry.dependencies]
+fastapi = { version = ">=0.112.3", extras = ["standard"] }
 python = "^3.10"
 typing-extensions = "*"
-fastapi = ">=0.110.0"
-starlette = ">=0.30.0"                                       # Because of this: https://github.com/encode/starlette/pull/2191
+starlette = ">=0.30.0"
 pydantic = ">=2.0.0"
-typer = { version = ">=0.7.0", optional = true }
+typer = ">=0.7.0"
 jinja2 = ">=3.1.2"
 issubclass = "^0.1.2"
 backports-strenum = { version = "^1.3.1", python = "<3.11" }
 
-[tool.poetry.extras]
-cli = ["typer"]
-
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.2.1"