🧑‍💻 Develop: migrate to ruff isort (#168)

Author: yanyongyu

.devcontainer/devcontainer.json

@@ -9,7 +9,6 @@
     "vscode": {
       "settings": {
         "python.analysis.diagnosticMode": "workspace",
-        "python.analysis.typeCheckingMode": "basic",
         "[python]": {
           "editor.defaultFormatter": "charliermarsh.ruff",
           "editor.codeActionsOnSave": {

.pre-commit-config.yaml

@@ -6,14 +6,8 @@ ci:
   autoupdate_schedule: monthly
   autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        stages: [pre-commit]
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.2
+    rev: v0.8.0
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

codegen/__init__.py

@@ -6,10 +6,8 @@
 import httpx
 from jinja2 import Environment, PackageLoader
 
-from .config import Config
-from .source import get_source
 from .log import logger as logger
-from .parser.schemas import UnionSchema
+from .config import Config
 from .parser import (
     ModelGroup,
     WebhookData,
@@ -20,6 +18,8 @@
     pascal_case,
     parse_openapi_spec,
 )
+from .source import get_source
+from .parser.schemas import UnionSchema
 
 if sys.version_info >= (3, 11):
     import tomllib

codegen/parser/__init__.py

@@ -1,12 +1,12 @@
-from contextvars import ContextVar
 from typing import TYPE_CHECKING, Optional
+from contextvars import ContextVar
 
 import httpx
 from openapi_pydantic import OpenAPI
 
 if TYPE_CHECKING:
-    from ..source import Source
     from ..config import Override
+    from ..source import Source
 
 # parser context
 _override_config: ContextVar["Override"] = ContextVar("override_config")
@@ -31,20 +31,20 @@ def add_schema(ref: httpx.URL, schema: "SchemaData"):
     _schemas.get()[ref] = schema
 
 
-from .models import parse_models
-from .utils import merge_inplace
-from .webhooks import parse_webhook
-from .endpoints import parse_endpoint
-from .utils import sanitize as sanitize
 from .data import ModelGroup as ModelGroup
-from .utils import kebab_case as kebab_case
-from .utils import snake_case as snake_case
 from .data import OpenAPIData as OpenAPIData
 from .data import WebhookData as WebhookData
-from .utils import pascal_case as pascal_case
 from .data import EndpointData as EndpointData
-from .schemas import SchemaData, ModelSchema, parse_schema
+from .utils import sanitize as sanitize
+from .utils import kebab_case as kebab_case
+from .utils import snake_case as snake_case
+from .utils import pascal_case as pascal_case
+from .utils import merge_inplace
 from .utils import fix_reserved_words as fix_reserved_words
+from .models import parse_models
+from .schemas import SchemaData, ModelSchema, parse_schema
+from .webhooks import parse_webhook
+from .endpoints import parse_endpoint
 
 
 def parse_openapi_spec(source: "Source", override: "Override") -> OpenAPIData:

codegen/parser/data.py

@@ -2,8 +2,8 @@
 from collections import defaultdict
 from dataclasses import field, dataclass
 
-from .schemas import Property, SchemaData, ModelSchema, UnionSchema
 from .utils import snake_case, concat_snake_name, fix_reserved_words
+from .schemas import Property, SchemaData, ModelSchema, UnionSchema
 
 
 @dataclass(eq=False)

codegen/parser/endpoints/__init__.py

@@ -2,11 +2,11 @@
 
 import openapi_pydantic as oas
 
-from .parameter import build_param
-from .response import build_response
+from ..data import EndpointData as EndpointData
 from ..utils import concat_snake_name
+from .response import build_response
+from .parameter import build_param
 from .request_body import build_request_body
-from ..data import EndpointData as EndpointData
 
 if TYPE_CHECKING:
     from ...source import Source

codegen/parser/endpoints/parameter.py

@@ -3,8 +3,8 @@
 import openapi_pydantic as oas
 
 from ..data import Parameter
-from ..schemas import parse_schema, build_any_schema
 from ..utils import build_prop_name, concat_snake_name, type_ref_from_source
+from ..schemas import parse_schema, build_any_schema
 
 if TYPE_CHECKING:
     from ...source import Source

codegen/parser/endpoints/request_body.py

@@ -3,8 +3,8 @@
 import openapi_pydantic as oas
 
 from ..data import RequestBodyData
-from ..schemas import parse_schema
 from ..utils import concat_snake_name, type_ref_from_source
+from ..schemas import parse_schema
 
 if TYPE_CHECKING:
     from ...source import Source

codegen/parser/endpoints/response.py

@@ -3,8 +3,8 @@
 import openapi_pydantic as oas
 
 from ..data import ResponseData
-from ..schemas import parse_schema
 from ..utils import type_ref_from_source
+from ..schemas import parse_schema
 
 if TYPE_CHECKING:
     from ...source import Source

codegen/parser/schemas/__init__.py

@@ -2,6 +2,8 @@
 
 import openapi_pydantic as oas
 
+from .. import add_schema, get_schema, get_schemas
+from ..utils import schema_from_source, type_ref_from_source
 from .schema import Property as Property
 from .schema import AnySchema as AnySchema
 from .schema import IntSchema as IntSchema
@@ -16,10 +18,8 @@
 from .schema import ModelSchema as ModelSchema
 from .schema import UnionSchema as UnionSchema
 from .schema import StringSchema as StringSchema
-from .. import add_schema, get_schema, get_schemas
 from .schema import DateTimeSchema as DateTimeSchema
 from .schema import UniqueListSchema as UniqueListSchema
-from ..utils import schema_from_source, type_ref_from_source
 
 if TYPE_CHECKING:
     from ...source import Source