cadwyn 3.6.5__tar.gz → 3.7.0__tar.gz

{cadwyn-3.6.5 → cadwyn-3.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cadwyn
-Version: 3.6.5
+Version: 3.7.0
 Summary: Production-ready community-driven modern Stripe-like API versioning in FastAPI
 Home-page: https://github.com/zmievsa/cadwyn
 License: MIT

{cadwyn-3.6.5 → cadwyn-3.7.0}/cadwyn/__main__.py

@@ -1,10 +1,12 @@
 import importlib
 import sys
+import warnings
 from pathlib import Path
 from typing import Any
 
 import typer
 
+from cadwyn.exceptions import CadwynError
 from cadwyn.structure.versions import VersionBundle
 
 app = typer.Typer(
@@ -22,8 +24,8 @@ def version_callback(value: bool):
         raise typer.Exit
 
 
-@app.command(name="generate-code-for-versioned-packages")
-def generate_versioned_packages(
+@app.command(name="generate-code-for-versioned-packages", hidden=True)
+def deprecated_generate_versioned_packages(
     path_to_template_package: str = typer.Argument(
         ...,
         help=(
@@ -43,6 +45,12 @@ def generate_versioned_packages(
     ),
 ) -> None:
     """For each version in the version bundle, generate a versioned package based on the template package"""
+    warnings.warn(
+        "`cadwyn generate-code-for-versioned-packages` is deprecated. Please, use `cadwyn codegen` instead",
+        DeprecationWarning,
+        stacklevel=1,
+    )
+
     from .codegen._main import generate_code_for_versioned_packages
 
     sys.path.append(str(Path.cwd()))
@@ -59,6 +67,39 @@ def generate_versioned_packages(
     )
 
 
+@app.command(
+    name="codegen",
+    help=(
+        "For each version in the version bundle, generate a versioned package based on the "
+        "`latest_schema_package` package"
+    ),
+    short_help="Generate code for all versions of schemas",
+)
+def generate_versioned_packages(
+    full_path_to_version_bundle: str = typer.Argument(
+        ...,
+        help="The python path to the version bundle. Format: 'path.to.version_bundle:my_version_bundle_var'",
+        show_default=False,
+    ),
+) -> None:
+    from .codegen._main import generate_code_for_versioned_packages
+
+    sys.path.append(str(Path.cwd()))
+    path_to_version_bundle, version_bundle_variable_name = full_path_to_version_bundle.split(":")
+    version_bundle_module = importlib.import_module(path_to_version_bundle)
+    possibly_version_bundle = getattr(version_bundle_module, version_bundle_variable_name)
+    version_bundle = _get_version_bundle(possibly_version_bundle)
+
+    if version_bundle.latest_schemas_package is None:  # pragma: no cover
+        raise CadwynError("VersionBundle requires a 'latest_schemas_package' argument to generate schemas.")
+
+    return generate_code_for_versioned_packages(
+        version_bundle.latest_schemas_package,
+        version_bundle,
+        ignore_coverage_for_latest_aliases=True,
+    )
+
+
 def _get_version_bundle(possibly_version_bundle: Any) -> VersionBundle:
     if not isinstance(possibly_version_bundle, VersionBundle):
         err = TypeError(

{cadwyn-3.6.5 → cadwyn-3.7.0}/cadwyn/codegen/_main.py

@@ -96,6 +96,7 @@ def _generate_versioned_directories(
     migration_plugins: Collection[MigrationPlugin],
 ):
     for version in versions:
+        print(f"Generating code for version={version.value!s}")  # noqa: T201
         global_context = GlobalCodegenContext(
             current_version=version,
             versions=versions,
@@ -104,6 +105,7 @@ def _generate_versioned_directories(
             modules=modules,
             extra=extra_context,
         )
+
         _generate_directory_for_version(template_package, codegen_plugins, version, global_context)
         for plugin in migration_plugins:
             plugin(global_context)
@@ -117,6 +119,7 @@ def _generate_directory_for_version(
 ):
     template_dir = get_package_path_from_module(template_package)
     version_dir = get_version_dir_path(template_package, version.value)
+
     for (
         _relative_path_to_file,
         template_module,

{cadwyn-3.6.5 → cadwyn-3.7.0}/cadwyn/routing.py

@@ -24,7 +24,9 @@ from typing import (
     get_origin,
 )
 
+import fastapi.params
 import fastapi.routing
+import fastapi.security.base
 import fastapi.utils
 from fastapi._compat import ModelField as FastAPIModelField
 from fastapi._compat import create_body_model
@@ -472,6 +474,10 @@ class _AnnotationTransformer:
                 )
             return self._change_version_of_type(annotation, version_dir)
         elif callable(annotation):
+            if type(annotation).__module__.startswith(
+                ("fastapi.", "pydantic.", "pydantic_core.", "starlette.")
+            ) or isinstance(annotation, fastapi.params.Security | fastapi.security.base.SecurityBase):
+                return annotation
 
             def modifier(annotation: Any):
                 return self._change_version_of_annotations(annotation, version_dir)
@@ -545,7 +551,6 @@ def _modify_callable(
     annotation_modifying_wrapper = _copy_function(call)
     old_params = inspect.signature(call).parameters
     callable_annotations = annotation_modifying_wrapper.__annotations__
-
     annotation_modifying_wrapper.__annotations__ = modify_annotations(callable_annotations)
     annotation_modifying_wrapper.__defaults__ = modify_defaults(
         tuple(p.default for p in old_params.values() if p.default is not inspect.Signature.empty),
@@ -718,8 +723,7 @@ def _get_migrated_routes_by_path(version: Version) -> dict[_EndpointPath, set[_E
 def _copy_function(function: _T) -> _T:
     while hasattr(function, "__alt_wrapped__"):
         function = function.__alt_wrapped__
-
-    if not isinstance(function, types.FunctionType):
+    if not isinstance(function, types.FunctionType | types.MethodType):
         # This means that the callable is actually an instance of a regular class
         function = function.__call__
     if inspect.iscoroutinefunction(function):

{cadwyn-3.6.5 → cadwyn-3.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cadwyn"
-version = "3.6.5"
+version = "3.7.0"
 description = "Production-ready community-driven modern Stripe-like API versioning in FastAPI"
 authors = ["Stanislav Zmiev <zmievsa@gmail.com>"]
 license = "MIT"