diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f70276fd..33702a7b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.2.2' + rev: 'v0.3.2' hooks: - id: ruff files: "^datamodel_code_generator|^tests" diff --git a/datamodel_code_generator/__init__.py b/datamodel_code_generator/__init__.py index aaa3e177..4c18282e 100644 --- a/datamodel_code_generator/__init__.py +++ b/datamodel_code_generator/__init__.py @@ -58,8 +58,7 @@ def load_yaml_from_path(path: Path, encoding: str) -> Any: if TYPE_CHECKING: - def get_version() -> str: - ... + def get_version() -> str: ... else: diff --git a/datamodel_code_generator/__main__.py b/datamodel_code_generator/__main__.py index 07c5472e..f72946ce 100644 --- a/datamodel_code_generator/__main__.py +++ b/datamodel_code_generator/__main__.py @@ -94,8 +94,7 @@ class Config(BaseModel): if TYPE_CHECKING: @classmethod - def get_fields(cls) -> Dict[str, Any]: - ... + def get_fields(cls) -> Dict[str, Any]: ... else: diff --git a/datamodel_code_generator/format.py b/datamodel_code_generator/format.py index 7eb4a345..88219057 100644 --- a/datamodel_code_generator/format.py +++ b/datamodel_code_generator/format.py @@ -76,8 +76,7 @@ class PythonVersion(Enum): if TYPE_CHECKING: - class _TargetVersion(Enum): - ... + class _TargetVersion(Enum): ... BLACK_PYTHON_VERSION: Dict[PythonVersion, _TargetVersion] else: @@ -98,8 +97,7 @@ def black_find_project_root(sources: Sequence[Path]) -> Path: def _find_project_root( srcs: Union[Sequence[str], Iterable[str]], - ) -> Union[Tuple[Path, str], Path]: - ... + ) -> Union[Tuple[Path, str], Path]: ... else: from black import find_project_root as _find_project_root @@ -153,9 +151,9 @@ class CodeFormatter: f' for wrapping string literal in {black.__version__}' ) elif black.__version__ < '24.1.0': # type: ignore - black_kwargs[ - 'experimental_string_processing' - ] = experimental_string_processing + black_kwargs['experimental_string_processing'] = ( + experimental_string_processing + ) elif experimental_string_processing: black_kwargs['preview'] = True black_kwargs['unstable'] = config.get('unstable', False) @@ -240,8 +238,7 @@ class CodeFormatter: if TYPE_CHECKING: - def apply_isort(self, code: str) -> str: - ... + def apply_isort(self, code: str) -> str: ... else: if isort.__version__.startswith('4.'): diff --git a/datamodel_code_generator/model/base.py b/datamodel_code_generator/model/base.py index 559dd144..de62a962 100644 --- a/datamodel_code_generator/model/base.py +++ b/datamodel_code_generator/model/base.py @@ -267,8 +267,7 @@ class TemplateBase(ABC): return self.render() -class BaseClassDataType(DataType): - ... +class BaseClassDataType(DataType): ... UNDEFINED: Any = object() diff --git a/datamodel_code_generator/parser/base.py b/datamodel_code_generator/parser/base.py index a2f6dbbc..51953856 100644 --- a/datamodel_code_generator/parser/base.py +++ b/datamodel_code_generator/parser/base.py @@ -408,19 +408,19 @@ class Parser(ABC): self.base_class: Optional[str] = base_class self.target_python_version: PythonVersion = target_python_version self.results: List[DataModel] = [] - self.dump_resolve_reference_action: Optional[ - Callable[[Iterable[str]], str] - ] = dump_resolve_reference_action + self.dump_resolve_reference_action: Optional[Callable[[Iterable[str]], str]] = ( + dump_resolve_reference_action + ) self.validation: bool = validation self.field_constraints: bool = field_constraints self.snake_case_field: bool = snake_case_field self.strip_default_none: bool = strip_default_none - self.apply_default_values_for_required_fields: ( - bool - ) = apply_default_values_for_required_fields - self.force_optional_for_required_fields: ( - bool - ) = force_optional_for_required_fields + self.apply_default_values_for_required_fields: bool = ( + apply_default_values_for_required_fields + ) + self.force_optional_for_required_fields: bool = ( + force_optional_for_required_fields + ) self.use_schema_description: bool = use_schema_description self.use_field_description: bool = use_field_description self.use_default_kwarg: bool = use_default_kwarg @@ -433,9 +433,9 @@ class Parser(ABC): self.use_generic_container_types: bool = use_generic_container_types self.use_union_operator: bool = use_union_operator self.enable_faux_immutability: bool = enable_faux_immutability - self.custom_class_name_generator: Optional[ - Callable[[str], str] - ] = custom_class_name_generator + self.custom_class_name_generator: Optional[Callable[[str], str]] = ( + custom_class_name_generator + ) self.field_extra_keys: Set[str] = field_extra_keys or set() self.field_extra_keys_without_x_prefix: Set[str] = ( field_extra_keys_without_x_prefix or set() @@ -568,9 +568,9 @@ class Parser(ABC): def __delete_duplicate_models(self, models: List[DataModel]) -> None: model_class_names: Dict[str, DataModel] = {} - model_to_duplicate_models: DefaultDict[ - DataModel, List[DataModel] - ] = defaultdict(list) + model_to_duplicate_models: DefaultDict[DataModel, List[DataModel]] = ( + defaultdict(list) + ) for model in models[:]: if isinstance(model, self.data_model_root_type): root_data_type = model.fields[0].data_type diff --git a/datamodel_code_generator/parser/jsonschema.py b/datamodel_code_generator/parser/jsonschema.py index 16b64a40..2850751a 100644 --- a/datamodel_code_generator/parser/jsonschema.py +++ b/datamodel_code_generator/parser/jsonschema.py @@ -632,9 +632,9 @@ class JsonSchemaParser(Parser): def set_additional_properties(self, name: str, obj: JsonSchemaObject) -> None: if isinstance(obj.additionalProperties, bool): - self.extra_template_data[name][ - 'additionalProperties' - ] = obj.additionalProperties + self.extra_template_data[name]['additionalProperties'] = ( + obj.additionalProperties + ) def set_title(self, name: str, obj: JsonSchemaObject) -> None: if obj.title: diff --git a/datamodel_code_generator/util.py b/datamodel_code_generator/util.py index 1a158512..b00b2231 100644 --- a/datamodel_code_generator/util.py +++ b/datamodel_code_generator/util.py @@ -23,8 +23,7 @@ if TYPE_CHECKING: from typing_extensions import Literal - def load_toml(path: Path) -> Dict[str, Any]: - ... + def load_toml(path: Path) -> Dict[str, Any]: ... else: try: