Skip to content

Commit ec07ba2

Browse files
authored
Annotate ty ignores (#3587)
* Fix ty diagnostics * Annotate ty ignores
1 parent 7cf7486 commit ec07ba2

13 files changed

Lines changed: 30 additions & 30 deletions

File tree

src/datamodel_code_generator/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ def run_generate_from_config( # noqa: PLR0913, PLR0917
11591159
)
11601160
return generate(
11611161
input_=input_,
1162-
config=generation_config,
1162+
config=cast("Any", generation_config), # ty: ignore[redundant-cast]
11631163
)
11641164

11651165

src/datamodel_code_generator/dynamic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def generate_dynamic_models(
337337
while len(_dynamic_models_cache) >= cache_size:
338338
oldest_key = next(iter(_dynamic_models_cache))
339339
del _dynamic_models_cache[oldest_key]
340-
_dynamic_models_cache[cache_key] = models # type: ignore[index]
340+
_dynamic_models_cache[cache_key] = models # ty: ignore[invalid-assignment]
341341

342342
return _filter_target_models(models, normalized_target_model_names)
343343

src/datamodel_code_generator/input_model.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ def _try_rebuild_model(obj: type) -> None:
669669
"StrictTypes": StrictTypes,
670670
"UnionMode": UnionMode,
671671
}
672-
obj.model_rebuild(_types_namespace=types_namespace) # ty: ignore
672+
obj.model_rebuild(_types_namespace=types_namespace) # ty: ignore[unresolved-attribute]
673673
elif module == "datamodel_code_generator.__main__" and class_name in main_config_classes: # pragma: no cover
674674
from datamodel_code_generator.enums import UnionMode # noqa: PLC0415
675675
from datamodel_code_generator.types import StrictTypes # noqa: PLC0415
@@ -678,9 +678,9 @@ def _try_rebuild_model(obj: type) -> None:
678678
"UnionMode": UnionMode,
679679
"StrictTypes": StrictTypes,
680680
}
681-
obj.model_rebuild(_types_namespace=types_namespace) # ty: ignore
681+
obj.model_rebuild(_types_namespace=types_namespace) # ty: ignore[unresolved-attribute]
682682
else:
683-
obj.model_rebuild() # ty: ignore
683+
obj.model_rebuild() # ty: ignore[unresolved-attribute]
684684

685685

686686
def _get_base_model_parents(model_class: type) -> list[type]:
@@ -827,7 +827,7 @@ def load_model_schema( # noqa: PLR0912, PLR0914, PLR0915
827827
model_name = model_class.__name__
828828
_try_rebuild_model(model_class)
829829

830-
schema = model_class.model_json_schema(schema_generator=schema_generator) # ty: ignore
830+
schema = model_class.model_json_schema(schema_generator=schema_generator) # ty: ignore[unresolved-attribute]
831831
schema = _add_python_type_for_unserializable(schema, model_class)
832832
schema = _add_python_type_info(schema, model_class)
833833

@@ -923,7 +923,7 @@ def _load_single_model_schema( # noqa: PLR0912, PLR0915
923923
if ref_strategy and ref_strategy != InputModelRefStrategy.RegenerateAll:
924924
nested_models = _collect_nested_models(obj)
925925
model_name = getattr(obj, "__name__", None)
926-
if model_name and "$defs" in schema and model_name in schema["$defs"]: # pragma: no cover # ty: ignore
926+
if model_name and "$defs" in schema and model_name in schema["$defs"]: # pragma: no cover # ty: ignore[unsupported-operator]
927927
nested_models[model_name] = obj
928928
schema = _filter_defs_by_strategy(schema, nested_models, output_model_type, ref_strategy)
929929

src/datamodel_code_generator/model/pydantic_v2/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ConfigDict(_BaseModel):
5050
use_attribute_docstrings: Optional[bool] = None # noqa: UP045
5151
json_schema_extra: Optional[Dict[str, Any]] = None # noqa: UP006, UP045
5252

53-
def dict(self, **kwargs: Any) -> dict[str, Any]: # type: ignore[override]
53+
def dict(self, **kwargs: Any) -> dict[str, Any]: # ty: ignore[invalid-type-form]
5454
"""Return dict for templates."""
5555
return self.model_dump(**kwargs)
5656

src/datamodel_code_generator/model/pydantic_v2/types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ def get_data_str_type(self, types: Types, **kwargs: Any) -> DataType:
382382
strict = StrictTypes.str in self.strict_types
383383
if data_type_kwargs:
384384
if strict:
385-
data_type_kwargs["strict"] = True # ty: ignore
385+
data_type_kwargs["strict"] = True # ty: ignore[invalid-assignment]
386386
if self.PATTERN_KEY in data_type_kwargs:
387387
data_type_kwargs[self.PATTERN_KEY] = _get_regex_literal(data_type_kwargs[self.PATTERN_KEY])
388388
return self.data_type.from_import(IMPORT_CONSTR, kwargs=data_type_kwargs)

src/datamodel_code_generator/parser/asyncapi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def __init__(
239239
**options: Unpack[AsyncAPIParserConfigDict],
240240
) -> None:
241241
"""Initialize the AsyncAPI parser."""
242-
super().__init__(source=source, config=config, **options) # type: ignore[arg-type]
242+
super().__init__(source=source, config=config, **options) # ty: ignore[invalid-argument-type]
243243

244244
@property
245245
def schema_features(self) -> OpenAPISchemaFeatures:

src/datamodel_code_generator/parser/base.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ def _create_default_config(cls, options: ParserConfigDict) -> ParserConfigT:
12271227
"DataTypeManager": DataTypeManager,
12281228
}
12291229
)
1230-
return config_class.model_validate(options) # type: ignore[return-value]
1230+
return config_class.model_validate(options) # ty: ignore[invalid-return-type]
12311231

12321232
def _create_data_model(self, model_type: type[DataModel] | None = None, **kwargs: Any) -> DataModel:
12331233
"""Create data model instance with dataclass_arguments support for DataClass."""
@@ -1277,7 +1277,7 @@ def __init__( # noqa: PLR0912, PLR0915
12771277
raise ValueError(msg)
12781278

12791279
if config is None:
1280-
config = self._create_default_config(options) # ty: ignore
1280+
config = self._create_default_config(options) # ty: ignore[invalid-argument-type]
12811281

12821282
self.config = config
12831283

@@ -2570,7 +2570,7 @@ def __set_default_enum_member(
25702570
if data_type.alias:
25712571
if isinstance(enum_member, list):
25722572
for enum_member_ in enum_member:
2573-
enum_member_.alias = data_type.alias # ty: ignore
2573+
enum_member_.alias = data_type.alias # ty: ignore[unresolved-attribute]
25742574
else:
25752575
enum_member.alias = data_type.alias
25762576

@@ -2694,7 +2694,7 @@ def __change_field_name(
26942694
resolver._reset_for_reuse(all_class_names.copy()) # noqa: SLF001
26952695
source = cast("DataModel", colliding_reference.source)
26962696
resolver.exclude_names.add(cast("str", filed_name))
2697-
new_class_name = resolver.add(["type"], cast("str", source.class_name)).name # ty: ignore
2697+
new_class_name = resolver.add(["type"], cast("str", source.class_name)).name # ty: ignore[redundant-cast]
26982698
source.class_name = new_class_name
26992699
all_class_names.add(new_class_name)
27002700
elif not rename_type:

src/datamodel_code_generator/parser/graphql.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
# graphql-core >=3.2.7 removed TypeResolvers in favor of TypeFields.kind.
4949
# Normalize to a single callable for resolving type kinds.
5050
try: # graphql-core < 3.2.7
51-
graphql_resolver_kind = graphql.type.introspection.TypeResolvers().kind # ty: ignore
51+
graphql_resolver_kind = graphql.type.introspection.TypeResolvers().kind # ty: ignore[unresolved-attribute]
5252
except AttributeError:
5353
graphql_resolver_kind = graphql.type.introspection.TypeFields.kind
5454

@@ -422,7 +422,7 @@ def parse_object_like(
422422

423423
base_classes = []
424424
if hasattr(obj, "interfaces"):
425-
base_classes = [self.references[i.name] for i in obj.interfaces] # ty: ignore
425+
base_classes = [self.references[i.name] for i in obj.interfaces] # ty: ignore[not-iterable]
426426

427427
data_model_type = self._create_data_model(
428428
reference=self.references[obj.name],
@@ -505,4 +505,4 @@ def parse_raw(self) -> None:
505505
for next_type in self.parse_order:
506506
for obj in self.support_graphql_types[next_type]:
507507
parser_ = mapper_from_graphql_type_to_parser_method[next_type]
508-
parser_(obj) # ty: ignore
508+
parser_(obj) # ty: ignore[invalid-argument-type]

src/datamodel_code_generator/parser/openapi.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ def parse_object_fields(
491491

492492
result_fields: list[DataModelFieldBase] = []
493493
for field_obj in fields:
494-
field = properties.get(field_obj.original_name) # ty: ignore
494+
field = properties.get(field_obj.original_name) # ty: ignore[invalid-argument-type]
495495

496496
if (
497497
isinstance(field, JsonSchemaObject)
@@ -503,7 +503,7 @@ def parse_object_fields(
503503
result_fields.append(field_obj)
504504
continue
505505
normalized_discriminator = self._normalize_discriminator(discriminator)
506-
field_obj = self.data_model_field_type(**{ # noqa: PLW2901 # ty: ignore
506+
field_obj = self.data_model_field_type(**{ # noqa: PLW2901 # ty: ignore[invalid-argument-type]
507507
**field_obj.__dict__,
508508
"data_type": new_field_type,
509509
"extras": {**field_obj.extras, "discriminator": normalized_discriminator},
@@ -723,7 +723,7 @@ def parse_responses(
723723
continue
724724
schema_path = self._media_schema_path(response_path, from_item_schema=media_schema.from_item_schema)
725725
data_type = self._parse_schema_or_ref(response_name, media_schema.schema, schema_path)
726-
data_types[status_code][content_type] = data_type # ty: ignore
726+
data_types[status_code][content_type] = data_type # ty: ignore[invalid-assignment]
727727

728728
return data_types
729729

src/datamodel_code_generator/reference.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def dict( # noqa: PLR0913 # pragma: no cover
104104
exclude_none: bool = False,
105105
) -> dict[str, Any]:
106106
return self.model_dump(
107-
include=include, # ty: ignore
107+
include=include, # ty: ignore[invalid-argument-type]
108108
exclude=set(exclude or ()) | self._exclude_fields,
109109
by_alias=by_alias,
110110
exclude_unset=exclude_unset,
@@ -672,7 +672,7 @@ def current_base_path_context(self, base_path: Path | None) -> Generator[None, N
672672
"""Temporarily set the current base path within a context."""
673673
if base_path:
674674
base_path = (self._base_path / base_path).resolve()
675-
with context_variable(self.set_current_base_path, self.current_base_path, base_path): # ty: ignore
675+
with context_variable(self.set_current_base_path, self.current_base_path, base_path): # ty: ignore[invalid-argument-type]
676676
yield
677677

678678
@contextmanager
@@ -686,7 +686,7 @@ def base_url_context(self, base_url: str | None) -> Generator[None, None, None]:
686686
this method was previously a no-op.
687687
"""
688688
if self._base_url or (base_url and is_url(base_url)):
689-
with context_variable(self.set_base_url, self.base_url, base_url): # ty: ignore
689+
with context_variable(self.set_base_url, self.base_url, base_url): # ty: ignore[invalid-argument-type]
690690
yield
691691
else:
692692
yield
@@ -703,7 +703,7 @@ def set_current_root(self, current_root: Sequence[str]) -> None:
703703
@contextmanager
704704
def current_root_context(self, current_root: Sequence[str]) -> Generator[None, None, None]:
705705
"""Temporarily set the current root path within a context."""
706-
with context_variable(self.set_current_root, self.current_root, current_root): # ty: ignore
706+
with context_variable(self.set_current_root, self.current_root, current_root): # ty: ignore[invalid-argument-type]
707707
yield
708708

709709
@property
@@ -1407,7 +1407,7 @@ def _get_inflect_engine() -> inflect.engine:
14071407
@lru_cache(maxsize=4096)
14081408
def get_singular_name(name: str, suffix: str = SINGULAR_NAME_SUFFIX) -> str:
14091409
"""Convert a plural name to singular form."""
1410-
singular_name = _get_inflect_engine().singular_noun(cast("inflect.Word", name)) # ty: ignore
1410+
singular_name = _get_inflect_engine().singular_noun(cast("inflect.Word", name)) # ty: ignore[redundant-cast]
14111411
if singular_name is False:
14121412
singular_name = f"{name}{suffix}"
14131413
return singular_name

0 commit comments

Comments
 (0)