Drop support for Python 3.8

Author: luolingchun

docs/Usage/Model_Config.md

@@ -130,7 +130,7 @@ Sometimes you may not want to use aliases (such as in the responses model). In t
 ```python
 class MessageResponse(BaseModel):
     message: str = Field(..., description="The message")
-    metadata: Dict[str, str] = Field(alias="metadata_")
+    metadata: dict[str, str] = Field(alias="metadata_")
 
     model_config = dict(
         by_alias=False

examples/openapi_extra.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/6/1 15:04
-from typing import List
-
 from pydantic import BaseModel
 
 from flask_openapi3 import OpenAPI, FileStorage
@@ -12,7 +10,7 @@
 
 class UploadFilesForm(BaseModel):
     file: FileStorage
-    str_list: List[str]
+    str_list: list[str]
 
     model_config = dict(
         openapi_extra={

examples/pydantic_custom_root_types.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2022/2/27 15:26
-from typing import List, Dict, Any
+from typing import Any
 
 from pydantic import BaseModel, RootModel
 
@@ -16,15 +16,15 @@ class Sellout(BaseModel):
 
 
 class SelloutList(RootModel):
-    root: List[Sellout]
+    root: list[Sellout]
 
 
 class SelloutDict(RootModel):
-    root: Dict[str, Sellout]
+    root: dict[str, Sellout]
 
 
 class SelloutDict2(RootModel):
-    root: Dict[Any, Any]
+    root: dict[Any, Any]
 
 
 class SelloutDict3(BaseModel):

examples/rest_demo.py

@@ -2,7 +2,7 @@
 # @Author  : llc
 # @Time    : 2021/4/28 11:24
 from http import HTTPStatus
-from typing import Optional, List
+from typing import Optional
 
 from pydantic import BaseModel, Field
 
@@ -66,7 +66,7 @@ class BookPath(BaseModel):
 
 class BookQuery(BaseModel):
     age: Optional[int] = Field(None, description='Age')
-    s_list: List[str] = Field(None, alias='s_list[]', description='some array')
+    s_list: list[str] = Field(None, alias='s_list[]', description='some array')
 
 
 class BookBody(BaseModel):

examples/upload_file_demo.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2021/5/11 14:03
-
-from typing import List
-
 from pydantic import BaseModel, Field
 
 from flask_openapi3 import OpenAPI, FileStorage
@@ -17,9 +14,9 @@ class UploadFileForm(BaseModel):
 
 
 class UploadFilesForm(BaseModel):
-    files: List[FileStorage]
-    str_list: List[str]
-    int_list: List[int]
+    files: list[FileStorage]
+    str_list: list[str]
+    int_list: list[int]
 
 
 @app.post('/upload/file')

flask_openapi3/blueprint.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2022/4/1 16:54
-from typing import Optional, List, Dict, Any, Callable
+from typing import Optional, Any, Callable
 
 from flask import Blueprint
 
@@ -28,8 +28,8 @@ def __init__(
             name: str,
             import_name: str,
             *,
-            abp_tags: Optional[List[Tag]] = None,
-            abp_security: Optional[List[Dict[str, List[str]]]] = None,
+            abp_tags: Optional[list[Tag]] = None,
+            abp_security: Optional[list[dict[str, list[str]]]] = None,
             abp_responses: Optional[ResponseDict] = None,
             doc_ui: bool = True,
             operation_id_callback: Callable = get_operation_id_for_path,
@@ -54,10 +54,10 @@ def __init__(
         super(APIBlueprint, self).__init__(name, import_name, **kwargs)
 
         # Initialize instance variables
-        self.paths: Dict = dict()
-        self.components_schemas: Dict = dict()
-        self.tags: List[Tag] = []
-        self.tag_names: List[str] = []
+        self.paths: dict = dict()
+        self.components_schemas: dict = dict()
+        self.tags: list[Tag] = []
+        self.tag_names: list[str] = []
 
         # Set values from arguments or default values
         self.abp_tags = abp_tags or []
@@ -111,16 +111,16 @@ def _collect_openapi_info(
             rule: str,
             func: Callable,
             *,
-            tags: Optional[List[Tag]] = None,
+            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,
+            security: Optional[list[dict[str, list[Any]]]] = None,
+            servers: Optional[list[Server]] = None,
+            openapi_extensions: Optional[dict[str, Any]] = None,
             doc_ui: bool = True,
             method: str = HTTPMethod.GET
     ) -> ParametersTuple:

flask_openapi3/models/__init__.py

@@ -9,7 +9,7 @@
 https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#table-of-contents
 """
 
-from typing import Optional, List, Dict, Union
+from typing import Optional, Union
 
 from flask import Request
 from pydantic import BaseModel
@@ -57,13 +57,13 @@ class APISpec(BaseModel):
     """https://spec.openapis.org/oas/v3.1.0#openapi-object"""
     openapi: str
     info: Info
-    servers: Optional[List[Server]] = None
+    servers: Optional[list[Server]] = None
     paths: Paths
     components: Optional[Components] = None
-    security: Optional[List[SecurityRequirement]] = None
-    tags: Optional[List[Tag]] = None
+    security: Optional[list[SecurityRequirement]] = None
+    tags: Optional[list[Tag]] = None
     externalDocs: Optional[ExternalDocumentation] = None
-    webhooks: Optional[Dict[str, Union[PathItem, Reference]]] = None
+    webhooks: Optional[dict[str, Union[PathItem, Reference]]] = None
 
     model_config = {
         "extra": "allow"
@@ -80,13 +80,13 @@ class OAuthConfig(BaseModel):
     appName: Optional[str] = None
     scopeSeparator: Optional[str] = None
     scopes: Optional[str] = None
-    additionalQueryStringParams: Optional[Dict[str, str]] = None
+    additionalQueryStringParams: Optional[dict[str, str]] = None
     useBasicAuthenticationWithAccessCodeGrant: Optional[bool] = False
     usePkceWithAuthorizationCodeGrant: Optional[bool] = False
 
 
 class RawModel(Request):
-    mimetypes: List[str] = ["application/json"]
+    mimetypes: list[str] = ["application/json"]
 
 
 Encoding.model_rebuild()

flask_openapi3/models/callback.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/7/4 9:35
-from typing import TYPE_CHECKING, Dict
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:  # pragma: no cover
     from .path_item import PathItem
@@ -15,4 +15,4 @@
 The key value used to identify the path item object is an expression, evaluated at runtime,
 that identifies a URL to use for the callback operation.
 """
-Callback = Dict[str, PathItem]
+Callback = dict[str, PathItem]

flask_openapi3/models/components.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # @Author  : llc
 # @Time    : 2023/7/4 9:36
-from typing import Dict, Optional, Union, Any
+from typing import Optional, Union, Any
 
 from pydantic import BaseModel, Field
 
@@ -23,16 +23,16 @@ 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: 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
 
     model_config = {
         "extra": "allow"

flask_openapi3/models/discriminator.py

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