Fixed issue not allowing conflciting model names to be resolved corre…

…ctly when building map of models to create schema from (pydantic#1912)
jusexton · Dec 2, 2020 · 28ca33b · 28ca33b
1 parent de0657e
commit 28ca33b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/pydantic/schema.py b/pydantic/schema.py
@@ -395,7 +395,7 @@ def get_flat_models_from_models(models: Sequence[Type['BaseModel']]) -> TypeMode
 
 
 def get_long_model_name(model: TypeModelOrEnum) -> str:
-    return f'{model.__module__}__{model.__name__}'.replace('.', '__')
+    return str(model)
 
 
 def field_type_schema(

diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -1111,9 +1111,9 @@ class Baz(BaseModel):
         Foo: 'Foo',
         Bar: 'Bar',
         Baz: 'Baz',
-        ModelA: 'pydantic_schema_test__modulea__modela__Model',
-        ModelB: 'pydantic_schema_test__moduleb__modelb__Model',
-        ModelC: 'pydantic_schema_test__modulec__modelc__Model',
+        ModelA: '<class \'pydantic_schema_test.modulea.modela.Model\'>',
+        ModelB: '<class \'pydantic_schema_test.moduleb.modelb.Model\'>',
+        ModelC: '<class \'pydantic_schema_test.modulec.modelc.Model\'>',
     }
 
 
@@ -2097,3 +2097,19 @@ class Model(BaseModel):
         'properties': {'a': {'title': 'A', 'type': 'string'}},
         'required': ['a'],
     }
+
+
+def test_multiple_nested_model_declarations_do_not_raise_error():
+    class ModelOne(BaseModel):
+        class NestedModel(BaseModel):
+            a: float
+
+        nested: NestedModel
+
+    class ModelTwo(BaseModel):
+        class NestedModel(BaseModel):
+            b: float
+
+        nested: NestedModel
+
+    schema([ModelOne, ModelTwo])