fastapi_swagger2 0.3.1__tar.gz → 0.3.3__tar.gz

{fastapi_swagger2-0.3.1 → fastapi_swagger2-0.3.3}/PKG-INFO

@@ -1,71 +1,69 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: fastapi_swagger2
-Version: 0.3.1
+Version: 0.3.3
 Summary: Swagger2 support for FastAPI framework
-Project-URL: Homepage, https://github.com/virajkanwade/fastapi_swagger2
-Project-URL: Documentation, https://github.com/virajkanwade/fastapi_swagger2
+Author: Viraj Kanwade
 Author-email: Viraj Kanwade <virajk.oib@gmail.com>
 License: MIT License
-        
-        Copyright (c) 2023 Viraj Kanwade
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-License-File: LICENSE
+         
+         Copyright (c) 2023 Viraj Kanwade
+         
+         Permission is hereby granted, free of charge, to any person obtaining a copy
+         of this software and associated documentation files (the "Software"), to deal
+         in the Software without restriction, including without limitation the rights
+         to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+         copies of the Software, and to permit persons to whom the Software is
+         furnished to do so, subject to the following conditions:
+         
+         The above copyright notice and this permission notice shall be included in all
+         copies or substantial portions of the Software.
+         
+         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+         IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+         FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+         AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+         SOFTWARE.
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python
+Classifier: Topic :: Internet
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development
+Classifier: Typing :: Typed
 Classifier: Environment :: Web Environment
 Classifier: Framework :: AsyncIO
 Classifier: Framework :: FastAPI
 Classifier: Framework :: Pydantic
 Classifier: Framework :: Pydantic :: 1
 Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Internet
-Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: HTTP Servers
-Classifier: Topic :: Software Development
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Typing :: Typed
+Classifier: Topic :: Internet :: WWW/HTTP
+Requires-Dist: fastapi>=0.128.4
+Requires-Dist: httpx>=0.28.1 ; extra == 'all'
+Requires-Dist: ruff==0.14.10 ; extra == 'dev'
+Requires-Dist: pytest>=7.0.0,<9.0.0 ; extra == 'test'
+Requires-Dist: coverage[toml]>=6.0,<8.0 ; extra == 'test'
+Requires-Dist: ty ; extra == 'test'
+Requires-Dist: ruff==0.14.10 ; extra == 'test'
+Requires-Dist: httpx>=0.28.1 ; extra == 'test'
 Requires-Python: >=3.9
-Requires-Dist: fastapi<=0.127.1,>=0.123.9
+Project-URL: Homepage, https://github.com/virajkanwade/fastapi_swagger2
+Project-URL: Documentation, https://github.com/virajkanwade/fastapi_swagger2
 Provides-Extra: all
-Requires-Dist: httpx>=0.28.1; extra == 'all'
 Provides-Extra: dev
-Requires-Dist: ruff==0.14.10; extra == 'dev'
 Provides-Extra: test
-Requires-Dist: black==25.12.0; extra == 'test'
-Requires-Dist: coverage[toml]<8.0,>=7.13.1; extra == 'test'
-Requires-Dist: httpx>=0.28.1; extra == 'test'
-Requires-Dist: isort>=7.0.0; extra == 'test'
-Requires-Dist: mypy==1.19.1; extra == 'test'
-Requires-Dist: pytest<10.0.0,>=9.0.2; extra == 'test'
-Requires-Dist: ruff==0.14.10; extra == 'test'
 Description-Content-Type: text/markdown
 
 # fastapi_swagger2
@@ -99,6 +97,8 @@ Python 3.9+
 * 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, <= 0.128.3
+* 0.3.3 - FastAPI >= 0.128.4, <= 0.128.8 (FastAPI has dropped Python 3.9 support since 0.129.1)
 
 ## Installation
 
@@ -110,6 +110,12 @@ $ pip install fastapi_swagger2
 
 </div>
 
+## Development
+
+```console
+$ uv sync --extra dev --extra test --extra all
+```
+
 ## Example
 
 ```Python
@@ -159,5 +165,5 @@ print(yaml.dump(spec))
 ## Development
 
 ```console
-$ pip install "/path/to/fastapi_swagger2/repo[test,all]"
+$ uv sync --extra dev --extra test --extra all
 ```

{fastapi_swagger2-0.3.1 → fastapi_swagger2-0.3.3}/README.md

@@ -29,6 +29,8 @@ Python 3.9+
 * 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, <= 0.128.3
+* 0.3.3 - FastAPI >= 0.128.4, <= 0.128.8 (FastAPI has dropped Python 3.9 support since 0.129.1)
 
 ## Installation
 
@@ -40,6 +42,12 @@ $ pip install fastapi_swagger2
 
 </div>
 
+## Development
+
+```console
+$ uv sync --extra dev --extra test --extra all
+```
+
 ## Example
 
 ```Python
@@ -89,5 +97,5 @@ print(yaml.dump(spec))
 ## Development
 
 ```console
-$ pip install "/path/to/fastapi_swagger2/repo[test,all]"
+$ uv sync --extra dev --extra test --extra all
 ```

{fastapi_swagger2-0.3.1/fastapi_0.100.0 → fastapi_swagger2-0.3.3}/pyproject.toml

@@ -1,9 +1,10 @@
 [build-system]
-requires = ["hatchling", "flit_core >=3.2,<4"]
-build-backend = "hatchling.build"
+requires = ["uv_build>=0.9.23,<0.10.0"]
+build-backend = "uv_build"
 
 [project]
 name = "fastapi_swagger2"
+version = "0.3.3"
 description = "Swagger2 support for FastAPI framework"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -39,9 +40,8 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP",
 ]
 dependencies = [
-    "fastapi >=0.100.0,<0.119.0",
+    "fastapi >=0.128.4",
 ]
-dynamic = ["version"]
 
 [project.urls]
 Homepage = "https://github.com/virajkanwade/fastapi_swagger2"
@@ -49,12 +49,10 @@ Documentation = "https://github.com/virajkanwade/fastapi_swagger2"
 
 [project.optional-dependencies]
 test = [
-    "pytest >=9.0.2,<10.0.0",
-    "coverage[toml] >= 7.13.1,< 8.0",
-    "mypy ==1.19.1",
+    "pytest >=7.0.0,<9.0.0",
+    "coverage[toml] >= 6.0, < 8.0",
+    "ty",
     "ruff ==0.14.10",
-    "black == 25.12.0",
-    "isort >=7.0.0",
     "httpx >=0.28.1",
 ]
 dev = [
@@ -64,29 +62,29 @@ all = [
     "httpx >=0.28.1",
 ]
 
-[tool.hatch.version]
-path = "src/fastapi_swagger2/__init__.py"
-
-[tool.isort]
-profile = "black"
-known_third_party = ["fastapi", "pydantic", "starlette"]
-
-[tool.mypy]
-strict = true
+[tool.ruff]
+line-length = 119
 
 [tool.ruff.lint]
 select = [
     "E",  # pycodestyle errors
     "W",  # pycodestyle warnings
     "F",  # pyflakes
-    # "I",  # isort
+    "I",  # isort
     "C",  # flake8-comprehensions
     "B",  # flake8-bugbear
 ]
 ignore = [
-    "E501",  # line too long, handled by black
+    "E501",  # line too long, handled by ruff format
     "B008",  # do not perform function calls in argument defaults
     "C901",  # too complex
 ]
 per-file-ignores = { "__init__.py" = ["F401"] }
-isort = { known-third-party = ["fastapi", "pydantic", "starlette"] }
+
+[tool.ruff.lint.isort]
+known-third-party = ["fastapi", "pydantic", "starlette"]
+
+[dependency-groups]
+dev = [
+    "nox>=2025.11.12",
+]

{fastapi_swagger2-0.3.1 → fastapi_swagger2-0.3.3}/src/fastapi_swagger2/__init__.py

@@ -1,5 +1,3 @@
-__version__ = "0.3.1"
-
 from typing import Any, Dict, List, Optional, TypeVar
 
 from fastapi import FastAPI
@@ -12,10 +10,11 @@ from starlette.requests import Request
 from starlette.responses import HTMLResponse, JSONResponse, Response
 from typing_extensions import Annotated, Doc, deprecated
 
+from ._version import __version__
 from .utils import get_swagger2
 
 
-# Keep mypy happy with the monkey patching
+# Keep type checker happy with the monkey patching
 class FastAPIEx(FastAPI):
     swagger2_url: Optional[str]
     swagger2_tags: Optional[List[Dict[str, Any]]]

fastapi_swagger2-0.3.3/src/fastapi_swagger2/_version.py

@@ -0,0 +1 @@
+__version__ = "0.3.3"

{fastapi_swagger2-0.3.1 → fastapi_swagger2-0.3.3}/src/fastapi_swagger2/utils.py

@@ -4,10 +4,10 @@ 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,
+    get_flat_models_from_fields,
+    get_model_name_map,
     get_schema_from_model_field,
     lenient_issubclass,
 )
@@ -271,7 +271,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] = {}
@@ -373,9 +373,9 @@ def get_swagger2_path(
                     if isinstance(status_code_param.default, int):
                         status_code = str(status_code_param.default)
 
-            operation.setdefault("responses", {}).setdefault(status_code, {})[
-                "description"
-            ] = route.response_description
+            operation.setdefault("responses", {}).setdefault(status_code, {})["description"] = (
+                route.response_description
+            )
 
             if route_response_media_type and is_body_allowed_for_status_code(route.status_code):
                 response_schema = {"type": "string"}
@@ -499,7 +499,8 @@ def get_swagger2(
     operation_ids: Set[str] = set()
 
     all_fields = get_fields_from_routes(list(routes or []) + list(webhooks or []))
-    model_name_map = get_compat_model_name_map(all_fields)
+    flat_models = get_flat_models_from_fields(all_fields, known_models=set())
+    model_name_map = get_model_name_map(flat_models)
     field_mapping, definitions = get_definitions(
         fields=all_fields,
         model_name_map=model_name_map,
@@ -541,4 +542,4 @@ def get_swagger2(
 
     output = _resolve_parameter_refs(output, definitions)
 
-    return jsonable_encoder(Swagger2(**output), by_alias=True, exclude_none=True)  # type: ignore
+    return jsonable_encoder(Swagger2(**output), by_alias=True, exclude_none=True)

fastapi_swagger2-0.3.1/.flake8

@@ -1,2 +0,0 @@
-[flake8]
-max-line-length = 88

fastapi_swagger2-0.3.1/.gitignore

@@ -1,163 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
-.pdm.toml
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-
-.DS_Store

fastapi_swagger2-0.3.1/fastapi_0.100.0/.git

@@ -1 +0,0 @@
-gitdir: /Users/vkanwade/Work/open_source/fastapi_swagger2/.git/worktrees/fastapi_0.100.0

fastapi_swagger2-0.3.1/fastapi_0.100.0/.gitignore

@@ -1,163 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
-.pdm.toml
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-
-.DS_Store

fastapi_swagger2-0.3.1/fastapi_0.100.0/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Viraj Kanwade
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.