fix(ModuleImports): This PR fixes the module import resolver for modu…

…le of type `BaseClassDataType` (#1862) * When resolving imports, in the instance where the model is of data type BaseClassDataType, it needs to be ensured that the from_ value is joined appropriately. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Modified nested directory structure of unit test to test module import resolver works as intended. * Fix broken tests. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Koudai Aono <[email protected]>
koxudaxi · Apr 12, 2024 · 95260f5 · 95260f5
1 parent 76fc354
commit 95260f5
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 28 deletions.
diff --git a/datamodel_code_generator/parser/base.py b/datamodel_code_generator/parser/base.py
@@ -682,7 +682,12 @@ def __change_from_import(
                     continue
 
                 if isinstance(data_type, BaseClassDataType):
-                    from_ = ''.join(relative(model.module_name, data_type.full_name))
+                    left, right = relative(model.module_name, data_type.full_name)
+                    from_ = (
+                        ''.join([left, right])
+                        if left.endswith('.')
+                        else '.'.join([left, right])
+                    )
                     import_ = data_type.reference.short_name
                     full_path = from_, import_
                 else:

diff --git a/tests/data/expected/main/main_nested_directory/definitions/machine/robot.py b/tests/data/expected/main/main_nested_directory/definitions/machine/robot.py
@@ -7,9 +7,10 @@
 from typing import Optional
 
 from ... import person
-from .. import food, pet
+from .. import food
 from ..drink import coffee
-from ..pet import Pet
+from ..relative.animal.pet import pet
+from ..relative.animal.pet.pet import Pet
 
 
 class Robot(Pet):

diff --git a/tests/data/expected/main/main_nested_directory/definitions/relative/animal/__init__.py b/tests/data/expected/main/main_nested_directory/definitions/relative/animal/__init__.py
@@ -0,0 +1,3 @@
+# generated by datamodel-codegen:
+#   filename:  external_files_in_directory
+#   timestamp: 2019-07-26T00:00:00+00:00
diff --git a/.../main_nested_directory/definitions/fur.py → ...ectory/definitions/relative/animal/fur.py b/.../main_nested_directory/definitions/fur.py → ...ectory/definitions/relative/animal/fur.py
@@ -1,5 +1,5 @@
 # generated by datamodel-codegen:
-#   filename:  definitions/fur.json
+#   filename:  definitions/relative/animal/fur.json
 #   timestamp: 2019-07-26T00:00:00+00:00
 
 from __future__ import annotations

diff --git a/tests/data/expected/main/main_nested_directory/definitions/relative/animal/pet/__init__.py b/tests/data/expected/main/main_nested_directory/definitions/relative/animal/pet/__init__.py
@@ -0,0 +1,3 @@
+# generated by datamodel-codegen:
+#   filename:  external_files_in_directory
+#   timestamp: 2019-07-26T00:00:00+00:00
diff --git a/.../main_nested_directory/definitions/pet.py → ...ry/definitions/relative/animal/pet/pet.py b/.../main_nested_directory/definitions/pet.py → ...ry/definitions/relative/animal/pet/pet.py
@@ -1,5 +1,5 @@
 # generated by datamodel-codegen:
-#   filename:  definitions/pet.json
+#   filename:  definitions/relative/animal/pet/pet.json
 #   timestamp: 2019-07-26T00:00:00+00:00
 
 from __future__ import annotations
@@ -8,7 +8,7 @@
 
 from pydantic import BaseModel
 
-from . import fur
+from .. import fur
 
 
 class Pet(BaseModel):

diff --git a/tests/data/expected/main/main_nested_directory/person.py b/tests/data/expected/main/main_nested_directory/person.py
@@ -8,9 +8,10 @@
 
 from pydantic import BaseModel, Field, conint
 
-from .definitions import food, friends, pet
+from .definitions import food, friends
 from .definitions.drink import coffee, tea
 from .definitions.machine import robot
+from .definitions.relative.animal.pet import pet
 
 
 class Person(BaseModel):

diff --git a/tests/data/expected/main/main_use_union_operator/definitions/machine/robot.py b/tests/data/expected/main/main_use_union_operator/definitions/machine/robot.py
@@ -5,9 +5,10 @@
 from __future__ import annotations
 
 from ... import person
-from .. import food, pet
+from .. import food
 from ..drink import coffee
-from ..pet import Pet
+from ..relative.animal.pet import pet
+from ..relative.animal.pet.pet import Pet
 
 
 class Robot(Pet):

diff --git a/tests/data/expected/main/main_use_union_operator/definitions/relative/animal/__init__.py b/tests/data/expected/main/main_use_union_operator/definitions/relative/animal/__init__.py
@@ -0,0 +1,3 @@
+# generated by datamodel-codegen:
+#   filename:  external_files_in_directory
+#   timestamp: 2019-07-26T00:00:00+00:00
diff --git a/...ain_use_union_operator/definitions/fur.py → ...erator/definitions/relative/animal/fur.py b/...ain_use_union_operator/definitions/fur.py → ...erator/definitions/relative/animal/fur.py
@@ -1,5 +1,5 @@
 # generated by datamodel-codegen:
-#   filename:  definitions/fur.json
+#   filename:  definitions/relative/animal/fur.json
 #   timestamp: 2019-07-26T00:00:00+00:00
 
 from __future__ import annotations

diff --git a/tests/data/expected/main/main_use_union_operator/definitions/relative/animal/pet/__init__.py b/tests/data/expected/main/main_use_union_operator/definitions/relative/animal/pet/__init__.py
@@ -0,0 +1,3 @@
+# generated by datamodel-codegen:
+#   filename:  external_files_in_directory
+#   timestamp: 2019-07-26T00:00:00+00:00
diff --git a/...ain_use_union_operator/definitions/pet.py → ...or/definitions/relative/animal/pet/pet.py b/...ain_use_union_operator/definitions/pet.py → ...or/definitions/relative/animal/pet/pet.py
@@ -1,12 +1,12 @@
 # generated by datamodel-codegen:
-#   filename:  definitions/pet.json
+#   filename:  definitions/relative/animal/pet/pet.json
 #   timestamp: 2019-07-26T00:00:00+00:00
 
 from __future__ import annotations
 
 from pydantic import BaseModel
 
-from . import fur
+from .. import fur
 
 
 class Pet(BaseModel):

diff --git a/tests/data/expected/main/main_use_union_operator/person.py b/tests/data/expected/main/main_use_union_operator/person.py
@@ -8,9 +8,10 @@
 
 from pydantic import BaseModel, Field, conint
 
-from .definitions import food, friends, pet
+from .definitions import food, friends
 from .definitions.drink import coffee, tea
 from .definitions.machine import robot
+from .definitions.relative.animal.pet import pet
 
 
 class Person(BaseModel):

diff --git a/tests/data/jsonschema/external_files_in_directory/definitions/machine/robot.json b/tests/data/jsonschema/external_files_in_directory/definitions/machine/robot.json
@@ -3,7 +3,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Robot",
   "type": "object",
-  "allOf": [{ "$ref": "../pet.json"}],
+  "allOf": [{ "$ref": "../relative/animal/pet/pet.json"}],
   "properties": {
     "friends": {
      "$ref": "../../person.json"
@@ -15,7 +15,7 @@
       "$ref": "../food.json#/definitions/noodle"
     },
     "pet": {
-      "$ref": "../pet.json"
+      "$ref": "../relative/animal/pet/pet.json"
     }
   }
 }
diff --git a/...l_files_in_directory/definitions/fur.json → ...tory/definitions/relative/animal/fur.json b/...l_files_in_directory/definitions/fur.json → ...tory/definitions/relative/animal/fur.json
@@ -1,10 +1,10 @@
 {
-  "$id": "https://example.com/external_files_in_directory/definitions/fur.json",
+  "$id": "https://example.com/external_files_in_directory/definitions/relative/animal/fur.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Fur",
   "type": "string",
     "enum": [
         "Short hair",
         "Long hair"
-    ],
+    ]
 }
diff --git a/...l_files_in_directory/definitions/pet.json → .../definitions/relative/animal/pet/pet.json b/...l_files_in_directory/definitions/pet.json → .../definitions/relative/animal/pet/pet.json
@@ -1,5 +1,5 @@
 {
-  "$id": "https://example.com/external_files_in_directory/definitions/pet.json",
+  "$id": "https://example.com/external_files_in_directory/definitions/relative/animal/pet/pet.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Pet",
   "type": "object",
@@ -11,7 +11,7 @@
       "type": "integer"
     },
     "fur": {
-      "$ref": "fur.json#"
+      "$ref": "../fur.json"
     }
   }
 }
diff --git a/tests/data/jsonschema/external_files_in_directory/person.json b/tests/data/jsonschema/external_files_in_directory/person.json
@@ -21,7 +21,7 @@
       "type": "array",
       "items": [
         {
-          "$ref": "definitions/pet.json#"
+          "$ref": "definitions/relative/animal/pet/pet.json#"
         }
       ]
     },

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -3089,8 +3089,8 @@ def get_mock_response(path: str) -> mocker.Mock:
         'httpx.get',
         side_effect=[
             get_mock_response('person.json'),
-            get_mock_response('definitions/pet.json'),
-            get_mock_response('definitions/fur.json'),
+            get_mock_response('definitions/relative/animal/pet/pet.json'),
+            get_mock_response('definitions/relative/animal/fur.json'),
             get_mock_response('definitions/friends.json'),
             get_mock_response('definitions/food.json'),
             get_mock_response('definitions/machine/robot.json'),
@@ -3126,13 +3126,13 @@ def get_mock_response(path: str) -> mocker.Mock:
                     follow_redirects=True,
                 ),
                 call(
-                    'https://example.com/external_files_in_directory/definitions/pet.json',
+                    'https://example.com/external_files_in_directory/definitions/relative/animal/pet/pet.json',
                     headers=None,
                     verify=True,
                     follow_redirects=True,
                 ),
                 call(
-                    'https://example.com/external_files_in_directory/definitions/fur.json',
+                    'https://example.com/external_files_in_directory/definitions/relative/animal/fur.json',
                     headers=None,
                     verify=True,
                     follow_redirects=True,
@@ -3201,8 +3201,8 @@ def get_mock_response(path: str) -> mocker.Mock:
         'httpx.get',
         side_effect=[
             get_mock_response('person.json'),
-            get_mock_response('definitions/pet.json'),
-            get_mock_response('definitions/fur.json'),
+            get_mock_response('definitions/relative/animal/pet/pet.json'),
+            get_mock_response('definitions/relative/animal/fur.json'),
             get_mock_response('definitions/friends.json'),
             get_mock_response('definitions/food.json'),
             get_mock_response('definitions/machine/robot.json'),
@@ -3242,13 +3242,13 @@ def get_mock_response(path: str) -> mocker.Mock:
                     follow_redirects=True,
                 ),
                 call(
-                    'https://example.com/external_files_in_directory/definitions/pet.json',
+                    'https://example.com/external_files_in_directory/definitions/relative/animal/pet/pet.json',
                     headers=headers_requests,
                     verify=True if not http_ignore_tls else False,
                     follow_redirects=True,
                 ),
                 call(
-                    'https://example.com/external_files_in_directory/definitions/fur.json',
+                    'https://example.com/external_files_in_directory/definitions/relative/animal/fur.json',
                     headers=headers_requests,
                     verify=True if not http_ignore_tls else False,
                     follow_redirects=True,