refactor userver: use built-in typings from Python 3.10

* Use `|` instead of `Optional` and `Union`
* Use `list`, `dict`, `set`, `frozenset` instead of `typing.List` etc.
* Use `collections.abc` instead of deprecated generic types from `typing`
* Use `from typing` and `from collections.abc` instead of `import typing` and `import collections.abc`
* Use `TypeAlias` for type aliases
* Use `from __future__ import annotations` instead of quoting types
   * Except for chaotic, because it seems to confuse pydantic
commit_hash:c6b0d5d1547ff48cc4f489620408d279ae48e422

Author: Anton3

chaotic-openapi/chaotic_openapi/back/cpp_client/output.py

@@ -3,7 +3,6 @@
 import os
 import pathlib
 from typing import Any
-from typing import Optional
 
 import yaml
 
@@ -104,7 +103,7 @@ def _get_template_includes(name: str, client_name: str, graph: dict[str, list[st
     return includes[name]
 
 
-def extract_includes(name: str, path: pathlib.Path, schemas_dir: pathlib.Path) -> Optional[list[str]]:
+def extract_includes(name: str, path: pathlib.Path, schemas_dir: pathlib.Path) -> list[str] | None:
     with open(path) as ifile:
         content = yaml.safe_load(ifile)
 
@@ -160,7 +159,7 @@ def is_file_produced_feature(data: dict[str, Any]) -> bool:
     return False
 
 
-def extract_cpp_type_header(cpp_type: str) -> Optional[str]:
+def extract_cpp_type_header(cpp_type: str) -> str | None:
     parts = cpp_type.split('::')
     if len(parts) < 2:
         return None

chaotic-openapi/chaotic_openapi/back/cpp_client/translator.py

@@ -2,7 +2,6 @@
 import sys
 import traceback
 import typing
-from typing import Union
 
 from chaotic import cpp_names
 from chaotic import error as chaotic_error
@@ -266,7 +265,7 @@ def _translate_single_schema(self, schema: chaotic_types.Schema) -> cpp_types.Cp
 
     def _translate_response(
         self,
-        response: Union[model.Response, model.Ref],
+        response: model.Response | model.Ref,
         status: int,
     ) -> types.Response:
         if isinstance(response, model.Ref):

chaotic-openapi/chaotic_openapi/back/cpp_client/types.py

@@ -1,7 +1,5 @@
+from collections.abc import Generator
 import dataclasses
-from typing import Generator
-from typing import Optional
-from typing import Union
 
 from chaotic import cpp_names
 from chaotic import error
@@ -79,7 +77,7 @@ def span_value(self) -> str:
 @dataclasses.dataclass
 class Body:
     content_type: str
-    schema: Optional[cpp_types.CppType]
+    schema: cpp_types.CppType | None
 
     def cpp_name(self) -> str:
         return 'RequestBody' + cpp_names.camel_case(
@@ -119,7 +117,7 @@ def map_method(method: str) -> str:
 class Operation:
     method: str
     path: str
-    operation_id: Union[str, None]
+    operation_id: str | None
 
     description: str = ''
     parameters: list[Parameter] = dataclasses.field(default_factory=list)

chaotic-openapi/chaotic_openapi/front/model.py

@@ -1,8 +1,6 @@
 import dataclasses
 import enum
 from typing import Any
-from typing import Optional
-from typing import Union
 
 from chaotic.front import types
 from . import base_model
@@ -40,13 +38,13 @@ class Parameter:
     style: Style
     schema: types.Schema
 
-    x_cpp_name: Optional[str]
+    x_cpp_name: str | None
     x_query_log_mode_hide: bool
 
 
 @dataclasses.dataclass
 class MediaType:
-    schema: Union[types.Schema, types.Ref, None]
+    schema: types.Schema | types.Ref | None
     examples: dict[str, Any]
 
 
@@ -61,7 +59,7 @@ class Response:
 class RequestBody:
     content_type: str
     required: bool
-    schema: Union[types.Ref, types.Schema]
+    schema: types.Ref | types.Schema
 
 
 @dataclasses.dataclass
@@ -121,7 +119,7 @@ class OAuthSecurity(Security):
 @dataclasses.dataclass
 class HttpSecurity(Security):
     scheme: str
-    bearerFormat: Optional[str] = None
+    bearerFormat: str | None = None
 
 
 @dataclasses.dataclass
@@ -134,10 +132,10 @@ class Operation:
     description: str
     path: str
     method: str
-    operationId: Union[str, None]
+    operationId: str | None
     parameters: list[Parameter]
-    requestBody: Union[list[RequestBody], Ref]
-    responses: dict[int, Union[Response, Ref]]
+    requestBody: list[RequestBody] | Ref
+    responses: dict[int, Response | Ref]
     security: list[Security]
 
     x_client_codegen: bool

chaotic-openapi/chaotic_openapi/front/openapi.py

@@ -1,7 +1,6 @@
 import enum
 from typing import Any
-from typing import Optional
-from typing import Union
+from typing import TypeAlias
 
 import pydantic
 
@@ -12,8 +11,8 @@
 # https://spec.openapis.org/oas/v3.0.0.html#info-object
 class Info(base_model.BaseModel):
     title: str
-    description: Optional[str] = None
-    termsOfService: Optional[str] = None
+    description: str | None = None
+    termsOfService: str | None = None
     contact: Any = None
     license: Any = None
     version: str
@@ -22,11 +21,11 @@ class Info(base_model.BaseModel):
 # https://spec.openapis.org/oas/v3.0.0.html#server-object
 class Server(base_model.BaseModel):
     url: str
-    description: Optional[str] = None
+    description: str | None = None
     variables: dict[str, Any] = pydantic.Field(default_factory=dict)
 
 
-Schema = Any
+Schema: TypeAlias = Any
 
 
 # https://spec.openapis.org/oas/v3.0.0.html#style-values
@@ -42,13 +41,13 @@ class Style(str, enum.Enum):
 
 # https://spec.openapis.org/oas/v3.0.0.html#header-object
 class Header(base_model.BaseModel):
-    description: Optional[str] = None
+    description: str | None = None
     required: bool = False
     deprecated: bool = False
     allowEmptyValue: bool = False
 
-    style: Optional[Style] = None
-    explode: Optional[bool] = None
+    style: Style | None = None
+    explode: bool | None = None
     allowReserved: bool = False
     schema_: Schema = pydantic.Field(alias='schema')
     example: Any = None
@@ -76,7 +75,7 @@ class Ref(base_model.BaseModel):
 # https://spec.openapis.org/oas/v3.0.0.html#responses-object
 class Response(base_model.BaseModel):
     description: str
-    headers: dict[str, Union[Header, Ref]] = pydantic.Field(default_factory=dict)
+    headers: dict[str, Header | Ref] = pydantic.Field(default_factory=dict)
     content: dict[str, MediaType] = pydantic.Field(default_factory=dict)
     # TODO: links
 
@@ -102,25 +101,25 @@ class QueryLogMode(str, enum.Enum):
 class Parameter(base_model.BaseModel):
     name: str
     in_: In = pydantic.Field(alias='in')
-    description: Optional[str] = None
+    description: str | None = None
     required: bool = False
     deprecated: bool = False
     allowEmptyValue: bool = False
 
-    style: Optional[Style] = None
-    explode: Optional[bool] = None
+    style: Style | None = None
+    explode: bool | None = None
     allowReserved: bool = False
     schema_: Schema = pydantic.Field(alias='schema')
     example: Any = None
     examples: dict[str, Any] = pydantic.Field(default_factory=dict)
 
     # content: dict[str, MediaType] = {}
 
-    x_handler_tag: Optional[str] = pydantic.Field(
+    x_handler_tag: str | None = pydantic.Field(
         default=None,
         validation_alias=pydantic.AliasChoices('x-taxi-handler-tag', 'x-usrv-handler-tag'),
     )
-    x_cpp_name: Optional[str] = pydantic.Field(
+    x_cpp_name: str | None = pydantic.Field(
         default=None,
         validation_alias=pydantic.AliasChoices('x-taxi-cpp-name', 'x-usrv-cpp-name'),
     )
@@ -148,7 +147,7 @@ def model_post_init(self, context: Any, /) -> None:
 
 # https://spec.openapis.org/oas/v3.0.0.html#request-body-object
 class RequestBody(base_model.BaseModel):
-    description: Optional[str] = None
+    description: str | None = None
     content: dict[str, MediaType]
     required: bool = False
 
@@ -167,48 +166,48 @@ class SecurityIn(str, enum.Enum):
 
 
 class ImplicitFlow(base_model.BaseModel):
-    refreshUrl: Optional[str] = None
+    refreshUrl: str | None = None
     scopes: dict[str, str] = pydantic.Field(default_factory=dict)
     authorizationUrl: str
 
 
 class PasswordFlow(base_model.BaseModel):
-    refreshUrl: Optional[str] = None
+    refreshUrl: str | None = None
     scopes: dict[str, str] = pydantic.Field(default_factory=dict)
     tokenUrl: str
 
 
 class ClientCredFlow(base_model.BaseModel):
-    refreshUrl: Optional[str] = None
+    refreshUrl: str | None = None
     scopes: dict[str, str] = pydantic.Field(default_factory=dict)
     tokenUrl: str
 
 
 class AuthCodeFlow(base_model.BaseModel):
-    refreshUrl: Optional[str] = None
+    refreshUrl: str | None = None
     scopes: dict[str, str] = pydantic.Field(default_factory=dict)
     authorizationUrl: str
     tokenUrl: str
 
 
 # https://spec.openapis.org/oas/v3.0.0.html#oauth-flows-object
 class OAuthFlows(base_model.BaseModel):
-    implicit: Optional[ImplicitFlow] = None
-    password: Optional[PasswordFlow] = None
-    clientCredentials: Optional[ClientCredFlow] = None
-    authorizationCode: Optional[AuthCodeFlow] = None
+    implicit: ImplicitFlow | None = None
+    password: PasswordFlow | None = None
+    clientCredentials: ClientCredFlow | None = None
+    authorizationCode: AuthCodeFlow | None = None
 
 
 # https://spec.openapis.org/oas/v3.0.0.html#security-scheme-object
 class SecurityScheme(base_model.BaseModel):
     type: SecurityType
-    description: Optional[str] = None
-    name: Optional[str] = None
-    in_: Optional[SecurityIn] = pydantic.Field(alias='in', default=None)
-    scheme_: Optional[str] = pydantic.Field(alias='scheme', default=None)
-    bearerFormat: Optional[str] = None
-    flows: Optional[OAuthFlows] = None
-    openIdConnectUrl: Optional[str] = None
+    description: str | None = None
+    name: str | None = None
+    in_: SecurityIn | None = pydantic.Field(alias='in', default=None)
+    scheme_: str | None = pydantic.Field(alias='scheme', default=None)
+    bearerFormat: str | None = None
+    flows: OAuthFlows | None = None
+    openIdConnectUrl: str | None = None
 
     def model_post_init(self, context: Any, /) -> None:
         super().model_post_init(context)
@@ -229,11 +228,11 @@ def model_post_init(self, context: Any, /) -> None:
                 raise ValueError(errors.missing_field_msg('openIdConnectUrl'))
 
 
-SecuritySchemes = dict[str, Union[SecurityScheme, Ref]]
+SecuritySchemes: TypeAlias = dict[str, SecurityScheme | Ref]
 
 
 # https://spec.openapis.org/oas/v3.0.0.html#security-requirement-object
-Security = dict[str, list[str]]
+Security: TypeAlias = dict[str, list[str]]
 
 
 # https://spec.openapis.org/oas/v3.0.0.html#components-object
@@ -250,19 +249,19 @@ class Components(base_model.BaseModel):
 # https://spec.openapis.org/oas/v3.0.0.html#operation-object
 class Operation(base_model.BaseModel):
     tags: list[str] = pydantic.Field(default_factory=list)
-    summary: Optional[str] = None
+    summary: str | None = None
     description: str = ''
     externalDocs: Any = None
 
-    operationId: Optional[str] = None
-    parameters: list[Union[Parameter, Ref]] = pydantic.Field(default_factory=list)
-    requestBody: Optional[Union[RequestBody, Ref]] = None
-    responses: dict[Union[str, int], Union[Response, Ref]]
+    operationId: str | None = None
+    parameters: list[Parameter | Ref] = pydantic.Field(default_factory=list)
+    requestBody: RequestBody | Ref | None = None
+    responses: dict[str | int, Response | Ref]
     deprecated: bool = False
-    security: Optional[Security] = None
+    security: Security | None = None
     servers: list[Server] = pydantic.Field(default_factory=list)
 
-    x_taxi_middlewares: Optional[base_model.XMiddlewares] = pydantic.Field(
+    x_taxi_middlewares: base_model.XMiddlewares | None = pydantic.Field(
         default=None,
         validation_alias=pydantic.AliasChoices('x-taxi-middlewares', 'x-usrv-middlewares'),
     )
@@ -292,20 +291,20 @@ def model_post_init(self, context: Any, /) -> None:
 
 # https://spec.openapis.org/oas/v3.0.0.html#path-item-object
 class Path(base_model.BaseModel):
-    summary: Optional[str] = None
+    summary: str | None = None
     description: str = ''
 
-    get: Optional[Operation] = None
-    post: Optional[Operation] = None
-    put: Optional[Operation] = None
-    delete: Optional[Operation] = None
-    options: Optional[Operation] = None
-    head: Optional[Operation] = None
-    patch: Optional[Operation] = None
-    trace: Optional[Operation] = None
+    get: Operation | None = None
+    post: Operation | None = None
+    put: Operation | None = None
+    delete: Operation | None = None
+    options: Operation | None = None
+    head: Operation | None = None
+    patch: Operation | None = None
+    trace: Operation | None = None
 
     servers: list[Server] = pydantic.Field(default_factory=list)
-    parameters: list[Union[Parameter, Ref]] = pydantic.Field(default_factory=list)
+    parameters: list[Parameter | Ref] = pydantic.Field(default_factory=list)
 
 
 class XTaxiClientQos(base_model.BaseModel):
@@ -315,24 +314,24 @@ class XTaxiClientQos(base_model.BaseModel):
 # https://spec.openapis.org/oas/v3.0.0.html#schema
 class OpenApi(base_model.BaseModel):
     openapi: str = '3.0.0'
-    info: Optional[Info] = None
+    info: Info | None = None
     servers: list[Server] = pydantic.Field(default_factory=list)
     paths: dict[str, Path] = pydantic.Field(default_factory=dict)
     components: Components = Components()
     security: Security = pydantic.Field(default_factory=dict)
     tags: list[Any] = pydantic.Field(default_factory=list)
     externalDocs: Any = None
 
-    x_taxi_client_qos: Optional[XTaxiClientQos] = pydantic.Field(
+    x_taxi_client_qos: XTaxiClientQos | None = pydantic.Field(
         default=None,
         validation_alias=pydantic.AliasChoices('x-taxi-client-qos', 'x-usrv-client-qos'),
     )
-    x_taxi_middlewares: Optional[base_model.XMiddlewares] = pydantic.Field(
+    x_taxi_middlewares: base_model.XMiddlewares | None = pydantic.Field(
         default=None,
         validation_alias=pydantic.AliasChoices('x-taxi-middlewares', 'x-usrv-middlewares'),
     )
 
-    def validate_security(self, security: Optional[Security]) -> None:
+    def validate_security(self, security: Security | None) -> None:
         if not security:
             return