Fix: Handle dots in title when using --use-title-as-name option (#2598)

* Sanitize titles with dots to use as names in model generation

* Refactor test_jsonschema_title_with_dots docstring for clarity

Author: koxudaxi

src/datamodel_code_generator/parser/base.py

@@ -578,6 +578,7 @@ def __init__(  # noqa: PLR0913, PLR0915
             capitalise_enum_members=capitalise_enum_members,
             no_alias=no_alias,
             parent_scoped_naming=parent_scoped_naming,
+            treat_dot_as_module=treat_dot_as_module,
         )
         self.class_name: str | None = class_name
         self.wrap_string_literal: bool | None = wrap_string_literal

src/datamodel_code_generator/parser/jsonschema.py

@@ -40,7 +40,7 @@
 )
 from datamodel_code_generator.model import DataModel, DataModelFieldBase
 from datamodel_code_generator.model import pydantic as pydantic_model
-from datamodel_code_generator.model.base import UNDEFINED, get_module_name
+from datamodel_code_generator.model.base import UNDEFINED, get_module_name, sanitize_module_name
 from datamodel_code_generator.model.dataclass import DataClass
 from datamodel_code_generator.model.enum import (
     SPECIALIZED_ENUM_TYPE_MATCH,
@@ -967,7 +967,7 @@ def _parse_object_common_part(  # noqa: PLR0913, PLR0917
                         self.data_model_field_type(required=True, original_name=required_, data_type=DataType())
                     )
         if self.use_title_as_name and obj.title:  # pragma: no cover
-            name = obj.title
+            name = sanitize_module_name(obj.title, treat_dot_as_module=self.treat_dot_as_module)
         reference = self.model_resolver.add(path, name, class_name=True, loaded=True)
         self.set_additional_properties(reference.path, obj)
 
@@ -1184,7 +1184,7 @@ def parse_object(
                 stacklevel=2,
             )
         if self.use_title_as_name and obj.title:
-            name = obj.title
+            name = sanitize_module_name(obj.title, treat_dot_as_module=self.treat_dot_as_module)
         reference = self.model_resolver.add(
             path,
             name,
@@ -1281,7 +1281,7 @@ def parse_item(  # noqa: PLR0911, PLR0912
     ) -> DataType:
         """Parse a single JSON Schema item into a data type."""
         if self.use_title_as_name and item.title:
-            name = item.title
+            name = sanitize_module_name(item.title, treat_dot_as_module=self.treat_dot_as_module)
             singular_name = False
         if parent and not item.enum and item.has_constraint and (parent.has_constraint or self.field_constraints):
             root_type_path = get_special_path("array", path)
@@ -1441,7 +1441,7 @@ def parse_array(
     ) -> DataType:
         """Parse array schema into a root model with array type."""
         if self.use_title_as_name and obj.title:
-            name = obj.title
+            name = sanitize_module_name(obj.title, treat_dot_as_module=self.treat_dot_as_module)
         reference = self.model_resolver.add(path, name, loaded=True, class_name=True)
         field = self.parse_array_fields(original_name or name, obj, [*path, name])
 
@@ -1530,7 +1530,7 @@ def parse_root_type(  # noqa: PLR0912
         else:
             required = not obj.nullable and not (obj.has_default and self.apply_default_values_for_required_fields)
         if self.use_title_as_name and obj.title:
-            name = obj.title
+            name = sanitize_module_name(obj.title, treat_dot_as_module=self.treat_dot_as_module)
         if not reference:
             reference = self.model_resolver.add(path, name, loaded=True, class_name=True)
         self.set_title(reference.path, obj)
@@ -1729,7 +1729,7 @@ def create_enum(reference_: Reference) -> DataType:
             return self.data_type(reference=reference_)
 
         if self.use_title_as_name and obj.title:
-            name = obj.title
+            name = sanitize_module_name(obj.title, treat_dot_as_module=self.treat_dot_as_module)
         reference = self.model_resolver.add(
             path,
             name,

src/datamodel_code_generator/reference.py

@@ -412,6 +412,7 @@ def __init__(  # noqa: PLR0913, PLR0917
         no_alias: bool = False,  # noqa: FBT001, FBT002
         remove_suffix_number: bool = False,  # noqa: FBT001, FBT002
         parent_scoped_naming: bool = False,  # noqa: FBT001, FBT002
+        treat_dot_as_module: bool = False,  # noqa: FBT001, FBT002
     ) -> None:
         """Initialize model resolver with naming and resolution options."""
         self.references: dict[str, Reference] = {}
@@ -447,6 +448,7 @@ def __init__(  # noqa: PLR0913, PLR0917
         self._current_base_path: Path | None = self._base_path
         self.remove_suffix_number: bool = remove_suffix_number
         self.parent_scoped_naming = parent_scoped_naming
+        self.treat_dot_as_module = treat_dot_as_module
 
     @property
     def current_base_path(self) -> Path | None:

tests/data/expected/main/jsonschema/title_with_dots.py

@@ -0,0 +1,18 @@
+# generated by datamodel-codegen:
+#   filename:  title_with_dots.json
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+
+class Nested15(BaseModel):
+    value: Optional[int] = None
+
+
+class GenomeStudio20MethylationModule(BaseModel):
+    version: Optional[str] = None
+    nested: Optional[Nested15] = Field(None, title='Nested 1.5')

tests/data/jsonschema/title_with_dots.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "GenomeStudio 2.0 - Methylation Module",
+  "type": "object",
+  "properties": {
+    "version": {
+      "type": "string"
+    },
+    "nested": {
+      "title": "Nested 1.5",
+      "type": "object",
+      "properties": {
+        "value": {
+          "type": "integer"
+        }
+      }
+    }
+  }
+}

tests/main/jsonschema/test_main_jsonschema.py

@@ -1735,6 +1735,18 @@ def test_jsonschema_without_titles_use_title_as_name(output_file: Path) -> None:
     )
 
 
+def test_jsonschema_title_with_dots(output_file: Path) -> None:
+    """Test using title as name when title contains dots (e.g., version numbers)."""
+    run_main_and_assert(
+        input_path=JSON_SCHEMA_DATA_PATH / "title_with_dots.json",
+        output_path=output_file,
+        input_file_type="jsonschema",
+        assert_func=assert_file_content,
+        expected_file="title_with_dots.py",
+        extra_args=["--use-title-as-name"],
+    )
+
+
 def test_main_jsonschema_has_default_value(output_file: Path) -> None:
     """Test default value handling."""
     run_main_and_assert(