cc userver: reformat Python code according to Ruff rules

commit_hash:340c31c5395290be9ef8f4e438447f3b7dd1b80a

Author: Anton3

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

@@ -33,23 +33,20 @@ def request_member_name(self) -> str:
         """
         Generated `Request` member name for middleware data.
         """
-        pass  # noqa: PIE790
 
     @property
     @abc.abstractmethod
     def request_member_cpp_type(self) -> str:
         """
         C++ type of `request_member_name`.
         """
-        pass  # noqa: PIE790
 
     @property
     @abc.abstractmethod
     def requests_hpp_includes(self) -> list[str]:
         """
         C++ include path used to access `request_member_cpp_type`.
         """
-        pass  # noqa: PIE790
 
     @abc.abstractmethod
     def write_member_command(
@@ -65,7 +62,6 @@ def write_member_command(
         sink - variable name of `ParameterSinkHttpClient` type
         http_request - variable name of `clients::http::Request` type
         """
-        pass  # noqa: PIE790
 
 
 class MiddlewarePlugin(abc.ABC):
@@ -84,7 +80,6 @@ def field(self) -> str:
         Returns `x-usrv-middleware` property name that is responsible for
         middleware activation and parameters storage.
         """
-        pass  # noqa: PIE790
 
     @abc.abstractmethod
     def create(self, args: dict) -> Middleware:
@@ -93,4 +88,3 @@ def create(self, args: dict) -> Middleware:
         "x-usrv-middleware." + field property is discovered.
         It creates a per-operation `Middleware` object.
         """
-        pass  # noqa: PIE790

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

@@ -63,7 +63,7 @@ def translate(
                 namespaces={schema.source_location().filepath: '' for schema in service.schemas.values()},
                 infile_to_name_func=self.map_infile_path_to_cpp_type,
                 include_dirs=self._include_dirs,
-            )  # noqa: COM812
+            ),
         )
         self._spec.schemas = gen.generate_types(resolved_schemas)
         self._raw_schemas = {str(schema.source_location()): schema for schema in service.schemas.values()}
@@ -131,7 +131,7 @@ def map_infile_path_to_cpp_type(self, name: str, stem: str) -> str:
 
         match = re.fullmatch(
             '/paths/\\[([^\\]]*)\\]/([a-zA-Z]*)/responses/([0-9]*)/headers/([-a-zA-Z0-9_]*)/schema',
-            name,  # noqa: COM812
+            name,
         )
         if match:
             return '{}::{}::{}::Response{}Header{}'.format(
@@ -249,7 +249,7 @@ def _translate_single_schema(self, schema: chaotic_types.Schema) -> cpp_types.Cp
                 namespaces={schema.source_location().filepath: ''},
                 infile_to_name_func=self.map_infile_path_to_cpp_type,
                 include_dirs=self._include_dirs,
-            )  # noqa: COM812
+            ),
         )
         gen_types = gen.generate_types(
             resolved_schemas,
@@ -272,7 +272,7 @@ def _translate_response(
             response = self._raw_responses[response.ref]
 
         headers = []
-        for name, header in response.headers.items():  # noqa: PERF102
+        for header in response.headers.values():
             headers.append(self._translate_parameter(header))
 
         body = {}

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

@@ -221,7 +221,7 @@ def responses_declaration_includes(self) -> list[str]:
                 continue
 
             for response in op.responses:
-                for _, body in response.body.items():  # noqa: PERF102
+                for body in response.body.values():
                     includes.update(body.declaration_includes())
                 for header in response.headers:
                     includes.update(header.declaration_includes())
@@ -234,7 +234,7 @@ def responses_definitions_includes(self) -> list[str]:
                 continue
 
             for response in op.responses:
-                for _, body in response.body.items():  # noqa: PERF102
+                for body in response.body.values():
                     includes.update(body.definition_includes())
         return sorted(includes)
 

chaotic-openapi/chaotic_openapi/back/linter/__main__.py

@@ -1,4 +1,4 @@
-import argparse  # noqa: I001
+import argparse
 import json
 import pprint
 

chaotic-openapi/chaotic_openapi/back/linter/validators.py

@@ -1,4 +1,4 @@
-import sys  # noqa: I001
+import sys
 
 from chaotic.front import types
 from chaotic_openapi.front import model
@@ -17,15 +17,15 @@ def validate(service: model.Service) -> None:
 
 def validate_nonobject_body(service: model.Service) -> None:
     for operation in service.operations:
-        for content_type, body in operation.requestBody.items():  # noqa: PERF102
+        for body in operation.requestBody.values():
             if isinstance(body, types.Ref):
                 schema = service.schemas[body.ref]
             else:
                 schema = body
 
             if not isinstance(
                 schema,
-                (types.SchemaObject, types.OneOfWithDiscriminator, types.OneOfWithoutDiscriminator),  # noqa: COM812
+                (types.SchemaObject, types.OneOfWithDiscriminator, types.OneOfWithoutDiscriminator),
             ):
                 report_error('non-object-body', schema.source_location(), 'Non-object type in body root is forbidden')
 
@@ -44,11 +44,11 @@ def visitor(child: types.Schema, _: types.Schema):
                 report_error(
                     'dash-in-field-name',
                     child.source_location(),
-                    'Dash in field name is useless for JS/Typescript',  # noqa: COM812
+                    'Dash in field name is useless for JS/Typescript',
                 )
 
     for operation in service.operations:
-        for content_type, body in operation.requestBody.items():  # noqa: PERF102
+        for body in operation.requestBody.values():
             if isinstance(body, types.Ref):
                 schema = service.schemas[body.ref]
             else:

chaotic-openapi/chaotic_openapi/front/base_model.py

@@ -17,7 +17,7 @@ def model_post_init(self, context: Any) -> None:
                 continue
             if field.startswith('x-taxi-go-'):
                 continue
-            if field.startswith('x-taxi-') or field.startswith('x-usrv-'):  # noqa: PIE810
+            if field.startswith(('x-taxi-', 'x-usrv-')):
                 assert field in self._model_userver_tags, f'Field {field} is not allowed in this context'
                 continue
 

chaotic-openapi/chaotic_openapi/front/openapi.py

@@ -339,14 +339,14 @@ def validate_security(self, security: Security | None) -> None:
         for name, values in security.items():
             if name not in self.components.securitySchemes:
                 raise ValueError(
-                    f'Undefined security name="{name}". Expected on of: {self.components.securitySchemes.keys()}'  # noqa: COM812
+                    f'Undefined security name="{name}". Expected on of: {self.components.securitySchemes.keys()}',
                 )
             sec_scheme = self.components.securitySchemes[name]
 
             if isinstance(sec_scheme, Ref):
                 if sec_scheme not in self.components.securitySchemes:
                     raise ValueError(
-                        f'Invalid reference "{sec_scheme}". Expected one of: "{self.components.securitySchemes.keys()}"'  # noqa: COM812
+                        f'Invalid reference "{sec_scheme}". Expected one of: "{self.components.securitySchemes.keys()}"',
                     )
             elif isinstance(sec_scheme, SecurityScheme):
                 if sec_scheme.type not in [SecurityType.oauth2, SecurityType.openIdConnect]:

chaotic-openapi/chaotic_openapi/front/parser.py

@@ -196,7 +196,7 @@ def _convert_swagger_request_body(
     def _convert_swagger_parameter(
         self,
         parameter: swagger.Parameter | swagger.Ref,
-        infile_path: str,  # noqa: COM812
+        infile_path: str,
     ) -> model.Parameter:
         if isinstance(parameter, swagger.Ref):
             return self._state.service.parameters[self._locate_ref(parameter.ref)]
@@ -270,7 +270,7 @@ def _convert_swagger_response(
         self,
         response: swagger.Response | swagger.Ref,
         produces: list[str],
-        infile_path: str,  # noqa: COM812
+        infile_path: str,
     ) -> model.Response | model.Ref:
         assert infile_path.count('#') <= 1
 
@@ -324,7 +324,7 @@ def _convert_openapi_request_body(
                     content_type=content_type,
                     schema=schema,
                     required=request_body.required,
-                )  # noqa: COM812
+                )
             )
         return requestBody
 
@@ -346,15 +346,15 @@ def _convert_openapi_flows(self, flows: openapi.OAuthFlows) -> list[model.Flow]:
             authCode = flows.authorizationCode
             refreshUrl = authCode.refreshUrl or ''
             model_flows.append(
-                model.AuthCodeFlow(refreshUrl, authCode.scopes, authCode.authorizationUrl, authCode.tokenUrl)  # noqa: COM812
+                model.AuthCodeFlow(refreshUrl, authCode.scopes, authCode.authorizationUrl, authCode.tokenUrl),
             )
 
         return model_flows
 
     def _convert_openapi_securuty(
         self,
         security_scheme: openapi.SecurityScheme | openapi.Ref,
-        flows_scopes: list[str] | None = None,  # noqa: COM812
+        flows_scopes: list[str] | None = None,
     ) -> model.Security:
         if isinstance(security_scheme, openapi.Ref):
             return self._state.service.security[self._locate_ref(security_scheme.ref)]
@@ -385,7 +385,7 @@ def _convert_openapi_securuty(
     def _convert_swagger_security(
         self,
         security_def: swagger.SecurityDef,
-        flows_scopes: list[str] | None = None,  # noqa: COM812
+        flows_scopes: list[str] | None = None,
     ) -> model.Security:
         description = security_def.description or ''
         match security_def.type:
@@ -564,7 +564,7 @@ def _convert_op_security(security: swagger.Security | None) -> list[model.Securi
                     if self._is_swagger_request_body(sw_path_parameter, global_params):
                         sw_path_body = self._convert_swagger_request_body(
                             sw_path_parameter,
-                            infile_path + f'/requestBodies/{i}',  # noqa: COM812
+                            infile_path + f'/requestBodies/{i}',
                         )
                     else:
                         sw_param = self._convert_swagger_parameter(sw_path_parameter, infile_path + f'/parameters/{i}')
@@ -582,7 +582,7 @@ def _convert_op_params(
                             body = self._convert_swagger_request_body(
                                 sw_parameter,
                                 infile_path + '/requestBody',
-                                consumes,  # noqa: COM812
+                                consumes,
                             )
                         else:
                             param = self._convert_swagger_parameter(sw_parameter, infile_path + f'/parameters/{i}')
@@ -595,49 +595,49 @@ def _convert_op_params(
                     'get',
                     sw_path_item.get,
                     _convert_op_security,
-                    _convert_op_params,  # noqa: COM812
+                    _convert_op_params,
                 )
                 self._append_swagger_operation(
                     parsed.basePath + sw_path,
                     'post',
                     sw_path_item.post,
                     _convert_op_security,
-                    _convert_op_params,  # noqa: COM812
+                    _convert_op_params,
                 )
                 self._append_swagger_operation(
                     parsed.basePath + sw_path,
                     'put',
                     sw_path_item.put,
                     _convert_op_security,
-                    _convert_op_params,  # noqa: COM812
+                    _convert_op_params,
                 )
                 self._append_swagger_operation(
                     parsed.basePath + sw_path,
                     'delete',
                     sw_path_item.delete,
                     _convert_op_security,
-                    _convert_op_params,  # noqa: COM812
+                    _convert_op_params,
                 )
                 self._append_swagger_operation(
                     parsed.basePath + sw_path,
                     'options',
                     sw_path_item.options,
                     _convert_op_security,
-                    _convert_op_params,  # noqa: COM812
+                    _convert_op_params,
                 )
                 self._append_swagger_operation(
                     parsed.basePath + sw_path,
                     'head',
                     sw_path_item.head,
                     _convert_op_security,
-                    _convert_op_params,  # noqa: COM812
+                    _convert_op_params,
                 )
                 self._append_swagger_operation(
                     parsed.basePath + sw_path,
                     'patch',
                     sw_path_item.patch,
                     _convert_op_security,
-                    _convert_op_params,  # noqa: COM812
+                    _convert_op_params,
                 )
             self._make_sure_operations_are_unique()
         else:
@@ -730,7 +730,7 @@ def _append_openapi_operation(
                 security=security_converter(operation.security),
                 x_middlewares=operation.x_taxi_middlewares or base_model.XMiddlewares(tvm=True),
                 x_client_codegen=operation.x_client_codegen,
-            )  # noqa: COM812
+            ),
         )
 
     def _append_swagger_operation(
@@ -763,14 +763,14 @@ def _append_swagger_operation(
                     int(status): self._convert_swagger_response(
                         response,
                         operation.produces,
-                        infile_path + f'/responses/{status}',  # noqa: COM812
+                        infile_path + f'/responses/{status}',
                     )
                     for status, response in operation.responses.items()
                 },
                 security=security_converter(operation.security),
                 x_middlewares=operation.x_taxi_middlewares or base_model.XMiddlewares(tvm=True),
                 x_client_codegen=operation.x_client_codegen,
-            )  # noqa: COM812
+            ),
         )
 
     def service(self) -> model.Service:

chaotic-openapi/chaotic_openapi/front/ref_resolver.py

@@ -14,7 +14,7 @@ def normalize_ref(filepath: str, ref_: str) -> str:
         '{}/{}'.format(
             filepath.rsplit('/', 1)[0],
             ref_,
-        )  # noqa: COM812
+        ),
     )
 
 

chaotic-openapi/tests/back/conftest.py

@@ -1,4 +1,4 @@
-from chaotic_openapi.back.cpp_client import translator  # noqa: I001
+from chaotic_openapi.back.cpp_client import translator
 from chaotic_openapi.front import parser as front_parser
 import pytest