Drop support for Python 3.9 and Support for Python 3.14

.github/workflows/tests.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
+        python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
         flask-version: [ "Flask>=2.0,<3.0", "Flask>=3.0" ]
     env:
       PYTHONPATH: .

README.md

@@ -37,7 +37,7 @@ The key features are:
 
 ## Requirements
 
-Python 3.9+
+Python 3.10+
 
 flask-openapi3 is dependent on the following libraries:
 

docs/index.zh.md

@@ -32,7 +32,7 @@
 
 ## 依赖
 
-Python 3.9+
+Python 3.10+
 
 flask-openapi3 依赖以下库：
 

examples/api_blueprint_demo.py

@@ -2,7 +2,6 @@
 # @Author  : llc
 # @Time    : 2021/6/6 14:05
 
-from typing import Optional
 
 from pydantic import BaseModel, Field
 
@@ -37,7 +36,7 @@ class Unauthorized(BaseModel):
 
 
 class BookBody(BaseModel):
-    age: Optional[int] = Field(..., ge=2, le=4, description="Age")
+    age: int | None = Field(..., ge=2, le=4, description="Age")
     author: str = Field(None, min_length=2, max_length=4, description="Author")
 
 

examples/api_view_demo.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2022/10/18 9:00
-from typing import Optional
 
 from pydantic import BaseModel, Field
 
@@ -22,11 +21,11 @@ class BookPath(BaseModel):
 
 
 class BookQuery(BaseModel):
-    age: Optional[int] = Field(None, description="Age")
+    age: int | None = Field(None, description="Age")
 
 
 class BookBody(BaseModel):
-    age: Optional[int] = Field(..., ge=2, le=4, description="Age")
+    age: int | None = Field(..., ge=2, le=4, description="Age")
     author: str = Field(None, min_length=2, max_length=4, description="Author")
 
 

examples/async_demo.py

@@ -2,7 +2,6 @@
 # @Author  : llc
 # @Time    : 2022/11/30 14:55
 
-from typing import Optional
 
 from pydantic import BaseModel, Field
 
@@ -17,11 +16,11 @@ class Query(BaseModel):
 
 
 class BookQuery(BaseModel):
-    age: Optional[int] = Field(None, description="Age")
+    age: int | None = Field(None, description="Age")
 
 
 class BookBody(BaseModel):
-    age: Optional[int] = Field(..., ge=2, le=4, description="Age")
+    age: int | None = Field(..., ge=2, le=4, description="Age")
     author: str = Field(None, min_length=2, max_length=4, description="Author")
 
 

examples/rest_demo.py

@@ -2,7 +2,6 @@
 # @Author  : llc
 # @Time    : 2021/4/28 11:24
 from http import HTTPStatus
-from typing import Optional
 
 from pydantic import BaseModel, Field
 
@@ -45,25 +44,25 @@ class BookPath(BaseModel):
 
 
 class BookQuery(BaseModel):
-    age: Optional[int] = Field(None, description="Age")
+    age: int | None = Field(None, description="Age")
     s_list: list[str] = Field(None, alias="s_list[]", description="some array")
 
 
 class BookBody(BaseModel):
-    age: Optional[int] = Field(..., ge=2, le=4, description="Age")
+    age: int | None = Field(..., ge=2, le=4, description="Age")
     author: str = Field(None, min_length=2, max_length=4, description="Author")
 
 
 class BookBodyWithID(BaseModel):
     bid: int = Field(..., description="book id")
-    age: Optional[int] = Field(None, ge=2, le=4, description="Age")
+    age: int | None = Field(None, ge=2, le=4, description="Age")
     author: str = Field(None, min_length=2, max_length=4, description="Author")
 
 
 class BookResponse(BaseModel):
     code: int = Field(0, description="Status Code")
     message: str = Field("ok", description="Exception Information")
-    data: Optional[BookBodyWithID]
+    data: BookBodyWithID | None
 
 
 @app.get(

flask_openapi3/blueprint.py

@@ -2,7 +2,7 @@
 # @Author  : llc
 # @Time    : 2022/4/1 16:54
 import inspect
-from typing import Any, Callable, Optional
+from typing import Any, Callable
 
 from flask import Blueprint
 
@@ -28,9 +28,9 @@ def __init__(
         name: str,
         import_name: str,
         *,
-        abp_tags: Optional[list[Tag]] = None,
-        abp_security: Optional[list[dict[str, list[str]]]] = None,
-        abp_responses: Optional[ResponseDict] = None,
+        abp_tags: list[Tag] | None = None,
+        abp_security: list[dict[str, list[str]]] | None = None,
+        abp_responses: ResponseDict | None = None,
         doc_ui: bool = True,
         operation_id_callback: Callable = get_operation_id_for_path,
         **kwargs: Any,
@@ -111,16 +111,16 @@ def _collect_openapi_info(
         rule: str,
         func: Callable,
         *,
-        tags: Optional[list[Tag]] = None,
-        summary: Optional[str] = None,
-        description: Optional[str] = None,
-        external_docs: Optional[ExternalDocumentation] = None,
-        operation_id: Optional[str] = None,
-        responses: Optional[ResponseDict] = None,
-        deprecated: Optional[bool] = None,
-        security: Optional[list[dict[str, list[Any]]]] = None,
-        servers: Optional[list[Server]] = None,
-        openapi_extensions: Optional[dict[str, Any]] = None,
+        tags: list[Tag] | None = None,
+        summary: str | None = None,
+        description: str | None = None,
+        external_docs: ExternalDocumentation | None = None,
+        operation_id: str | None = None,
+        responses: ResponseDict | None = None,
+        deprecated: bool | None = None,
+        security: list[dict[str, list[Any]]] | None = None,
+        servers: list[Server] | None = None,
+        openapi_extensions: dict[str, Any] | None = None,
         doc_ui: bool = True,
         method: str = HTTPMethod.GET,
     ) -> ParametersTuple:

flask_openapi3/models/__init__.py

@@ -57,13 +57,13 @@ class APISpec(BaseModel):
 
     openapi: str
     info: Info
-    servers: Optional[list[Server]] = None
+    servers: list[Server] | None = None
     paths: Paths
-    components: Optional[Components] = None
-    security: Optional[list[SecurityRequirement]] = None
-    tags: Optional[list[Tag]] = None
-    externalDocs: Optional[ExternalDocumentation] = None
-    webhooks: Optional[dict[str, Union[PathItem, Reference]]] = None
+    components: Components | None = None
+    security: list[SecurityRequirement] | None = None
+    tags: list[Tag] | None = None
+    externalDocs: ExternalDocumentation | None = None
+    webhooks: dict[str, PathItem | Reference] | None = None
 
     model_config = {"extra": "allow"}
 
@@ -73,15 +73,15 @@ class OAuthConfig(BaseModel):
     https://github.com/swagger-api/swagger-ui/blob/master/docs/usage/oauth2.md#oauth-20-configuration
     """
 
-    clientId: Optional[str] = None
-    clientSecret: Optional[str] = None
-    realm: Optional[str] = None
-    appName: Optional[str] = None
-    scopeSeparator: Optional[str] = None
-    scopes: Optional[str] = None
-    additionalQueryStringParams: Optional[dict[str, str]] = None
-    useBasicAuthenticationWithAccessCodeGrant: Optional[bool] = False
-    usePkceWithAuthorizationCodeGrant: Optional[bool] = False
+    clientId: str | None = None
+    clientSecret: str | None = None
+    realm: str | None = None
+    appName: str | None = None
+    scopeSeparator: str | None = None
+    scopes: str | None = None
+    additionalQueryStringParams: dict[str, str] | None = None
+    useBasicAuthenticationWithAccessCodeGrant: bool | None = False
+    usePkceWithAuthorizationCodeGrant: bool | None = False
 
 
 class RawModel(Request):

flask_openapi3/models/components.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/7/4 9:36
-from typing import Any, Optional, Union
+from typing import Any
 
 from pydantic import BaseModel, Field
 
@@ -23,15 +23,15 @@ class Components(BaseModel):
     https://spec.openapis.org/oas/v3.1.0#components-object
     """
 
-    schemas: Optional[dict[str, Union[Reference, Schema]]] = Field(None)
-    responses: Optional[dict[str, Union[Response, Reference]]] = None
-    parameters: Optional[dict[str, Union[Parameter, Reference]]] = None
-    examples: Optional[dict[str, Union[Example, Reference]]] = None
-    requestBodies: Optional[dict[str, Union[RequestBody, Reference]]] = None
-    headers: Optional[dict[str, Union[Header, Reference]]] = None
-    securitySchemes: Optional[dict[str, Union[SecurityScheme, dict[str, Any]]]] = None
-    links: Optional[dict[str, Union[Link, Reference]]] = None
-    callbacks: Optional[dict[str, Union[Callback, Reference]]] = None
-    pathItems: Optional[dict[str, Union[PathItem, Reference]]] = None
+    schemas: dict[str, Reference | Schema] | None = Field(None)
+    responses: dict[str, Response | Reference] | None = None
+    parameters: dict[str, Parameter | Reference] | None = None
+    examples: dict[str, Example | Reference] | None = None
+    requestBodies: dict[str, RequestBody | Reference] | None = None
+    headers: dict[str, Header | Reference] | None = None
+    securitySchemes: dict[str, SecurityScheme | dict[str, Any]] | None = None
+    links: dict[str, Link | Reference] | None = None
+    callbacks: dict[str, Callback | Reference] | None = None
+    pathItems: dict[str, PathItem | Reference] | None = None
 
     model_config = {"extra": "allow"}

flask_openapi3/models/contact.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/7/4 9:37
-from typing import Optional
 
 from pydantic import BaseModel
 
@@ -11,8 +10,8 @@ class Contact(BaseModel):
     https://spec.openapis.org/oas/v3.1.0#contact-object
     """
 
-    name: Optional[str] = None
-    url: Optional[str] = None
-    email: Optional[str] = None
+    name: str | None = None
+    url: str | None = None
+    email: str | None = None
 
     model_config = {"extra": "allow"}

flask_openapi3/models/discriminator.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/7/4 9:41
-from typing import Optional
 
 from pydantic import BaseModel
 
@@ -12,6 +11,6 @@ class Discriminator(BaseModel):
     """
 
     propertyName: str
-    mapping: Optional[dict[str, str]] = None
+    mapping: dict[str, str] | None = None
 
     model_config = {"extra": "allow"}

flask_openapi3/models/encoding.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/7/4 9:41
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, Union
 
 from pydantic import BaseModel
 
@@ -18,10 +18,10 @@ class Encoding(BaseModel):
     https://spec.openapis.org/oas/v3.1.0#encoding-object
     """
 
-    contentType: Optional[str] = None
-    headers: Optional[dict[str, Union[Header, Reference]]] = None
-    style: Optional[str] = None
-    explode: Optional[bool] = None
+    contentType: str | None = None
+    headers: dict[str, Union[Header, Reference]] | None = None
+    style: str | None = None
+    explode: bool | None = None
     allowReserved: bool = False
 
     model_config = {"extra": "allow"}

flask_openapi3/models/example.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/7/4 9:42
-from typing import Any, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -11,9 +11,9 @@ class Example(BaseModel):
     https://spec.openapis.org/oas/v3.1.0#example-object
     """
 
-    summary: Optional[str] = None
-    description: Optional[str] = None
-    value: Optional[Any] = None
-    externalValue: Optional[str] = None
+    summary: str | None = None
+    description: str | None = None
+    value: Any | None = None
+    externalValue: str | None = None
 
     model_config = {"extra": "allow"}

flask_openapi3/models/external_documentation.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/7/4 9:43
-from typing import Optional
 
 from pydantic import BaseModel
 
@@ -11,7 +10,7 @@ class ExternalDocumentation(BaseModel):
     https://spec.openapis.org/oas/v3.1.0#external-documentation-object
     """
 
-    description: Optional[str] = None
+    description: str | None = None
     url: str
 
     model_config = {"extra": "allow"}

flask_openapi3/models/header.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/7/4 9:44
-from typing import Optional
 
 from .parameter import Parameter
 from .parameter_in_type import ParameterInType
@@ -12,7 +11,7 @@ class Header(Parameter):
     https://spec.openapis.org/oas/v3.1.0#header-object
     """
 
-    name: Optional[str] = None  # type:ignore
-    param_in: Optional[ParameterInType] = None  # type:ignore
+    name: str | None = None  # type:ignore
+    param_in: ParameterInType | None = None  # type:ignore
 
     model_config = {"extra": "allow"}

flask_openapi3/models/info.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2021/4/28 10:58
-from typing import Optional
 
 from pydantic import BaseModel
 
@@ -15,11 +14,11 @@ class Info(BaseModel):
     """
 
     title: str
-    summary: Optional[str] = None
-    description: Optional[str] = None
-    termsOfService: Optional[str] = None
-    contact: Optional[Contact] = None
-    license: Optional[License] = None
+    summary: str | None = None
+    description: str | None = None
+    termsOfService: str | None = None
+    contact: Contact | None = None
+    license: License | None = None
     version: str
 
     model_config = {"extra": "allow"}