fastapi_swagger2 0.3.0__tar.gz → 0.3.2__tar.gz

{fastapi_swagger2-0.3.0 → fastapi_swagger2-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi_swagger2
-Version: 0.3.0
+Version: 0.3.2
 Summary: Swagger2 support for FastAPI framework
 Project-URL: Homepage, https://github.com/virajkanwade/fastapi_swagger2
 Project-URL: Documentation, https://github.com/virajkanwade/fastapi_swagger2
@@ -53,7 +53,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: >=3.9
-Requires-Dist: fastapi<=0.123.8,>=0.119.0
+Requires-Dist: fastapi>=0.128.0
 Provides-Extra: all
 Requires-Dist: httpx>=0.28.1; extra == 'all'
 Provides-Extra: dev
@@ -98,6 +98,8 @@ Python 3.9+
 * 0.2.4 - FastAPI >= 0.100.0
 * 0.2.7 - FastAPI >= 0.100.0, < 0.119.0 + Pydantic v1/v2
 * 0.3.0 - FastAPI >= 0.119.0, <= 0.123.8 + Pydantic v1/v2
+* 0.3.1 - FastAPI >= 0.123.9, <= 0.127.1 + Pydantic v1/v2 (Since FastAPI 0.126.1, Pydantic v1 is deprecated)
+* 0.3.2 - FastAPI >= 0.128.0
 
 ## Installation
 

{fastapi_swagger2-0.3.0 → fastapi_swagger2-0.3.2}/README.md

@@ -28,6 +28,8 @@ Python 3.9+
 * 0.2.4 - FastAPI >= 0.100.0
 * 0.2.7 - FastAPI >= 0.100.0, < 0.119.0 + Pydantic v1/v2
 * 0.3.0 - FastAPI >= 0.119.0, <= 0.123.8 + Pydantic v1/v2
+* 0.3.1 - FastAPI >= 0.123.9, <= 0.127.1 + Pydantic v1/v2 (Since FastAPI 0.126.1, Pydantic v1 is deprecated)
+* 0.3.2 - FastAPI >= 0.128.0
 
 ## Installation
 

{fastapi_swagger2-0.3.0 → fastapi_swagger2-0.3.2}/pyproject.toml

@@ -39,7 +39,7 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP",
 ]
 dependencies = [
-    "fastapi >=0.119.0,<=0.123.8",
+    "fastapi >=0.128.0",
 ]
 dynamic = ["version"]
 

{fastapi_swagger2-0.3.0 → fastapi_swagger2-0.3.2}/src/fastapi_swagger2/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.0"
+__version__ = "0.3.2"
 
 from typing import Any, Dict, List, Optional, TypeVar
 

{fastapi_swagger2-0.3.0 → fastapi_swagger2-0.3.2}/src/fastapi_swagger2/utils.py

@@ -4,7 +4,6 @@ from typing import Any, Dict, List, Optional, Sequence, Set, Tuple, Type, Union
 
 from fastapi import routing
 from fastapi._compat import (
-    JsonSchemaValue,
     ModelField,
     get_compat_model_name_map,
     get_definitions,
@@ -209,10 +208,11 @@ def get_swagger2_security_definitions(
     }
 
     security_definitions = {}
-    operation_security = []
-    for security_requirement in flat_dependant.security_requirements:
+    # Use a dict to merge scopes for same security scheme
+    operation_security_dict: Dict[str, List[str]] = {}
+    for security_dependency in flat_dependant._security_dependencies:
         security_definition = jsonable_encoder(
-            security_requirement.security_scheme.model,
+            security_dependency._security_scheme.model,
             by_alias=True,
             exclude_none=True,
         )
@@ -234,7 +234,7 @@ def get_swagger2_security_definitions(
             if not flows:
                 continue
 
-            security_name = security_requirement.security_scheme.scheme_name
+            security_name = security_dependency._security_scheme.scheme_name
 
             for flow_key, flow_data in flows.items():
                 swagger2_flow_key = oauth2_flows_keys_map.get(flow_key)
@@ -246,14 +246,22 @@ def get_swagger2_security_definitions(
 
                 suffixed_name = f"{security_name}_{swagger2_flow_key}"
                 security_definitions[suffixed_name] = mapped_security
-                operation_security.append({suffixed_name: security_requirement.scopes})
+                for scope in security_dependency.oauth_scopes or []:
+                    if scope not in operation_security_dict.setdefault(suffixed_name, []):
+                        operation_security_dict[suffixed_name].append(scope)
 
             continue
         # swagger2 logic - end
 
-        security_name = security_requirement.security_scheme.scheme_name
+        security_name = security_dependency._security_scheme.scheme_name
         security_definitions[security_name] = security_definition
-        operation_security.append({security_name: security_requirement.scopes})
+        # Merge scopes for the same security scheme
+        if security_name not in operation_security_dict:
+            operation_security_dict[security_name] = []
+        for scope in security_dependency.oauth_scopes or []:
+            if scope not in operation_security_dict[security_name]:
+                operation_security_dict[security_name].append(scope)
+    operation_security = [{name: scopes} for name, scopes in operation_security_dict.items()]
     return security_definitions, operation_security
 
 
@@ -262,7 +270,7 @@ def get_swagger2_path(
     route: routing.APIRoute,
     operation_ids: Set[str],
     model_name_map: ModelNameMap,
-    field_mapping: Dict[Tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue],
+    field_mapping: Dict[Tuple[ModelField, Literal["validation", "serialization"]], dict[str, Any]],
     separate_input_output_schemas: bool = True,
 ) -> Tuple[Dict[str, Any], Dict[str, Any], Dict[str, Any]]:
     path: Dict[str, Any] = {}