Fix JSON schema representation when there are extra keys (pydantic#3896)

dogukancagatay · Dec 22, 2022 · 4edfe28 · 4edfe28
1 parent 1a1497e
commit 4edfe28
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/pydantic/schema.py b/pydantic/schema.py
@@ -263,7 +263,7 @@ def field_schema(
     )
 
     # $ref will only be returned when there are no schema_overrides
-    if '$ref' in f_schema:
+    if '$ref' in f_schema and not schema_overrides:
         return f_schema, f_definitions, f_nested_models
     else:
         s.update(f_schema)
@@ -818,7 +818,7 @@ def get_schema_ref(name: str, ref_prefix: Optional[str], ref_template: str, sche
         schema_ref = {'$ref': ref_prefix + name}
     else:
         schema_ref = {'$ref': ref_template.format(model=name)}
-    return {'allOf': [schema_ref]} if schema_overrides else schema_ref
+    return schema_ref
 
 
 def field_singleton_schema(  # noqa: C901 (ignore complexity)

diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -327,12 +327,12 @@ class Model(BaseModel):
         },
         'properties': {
             'pikalias': {
-                'allOf': [{'$ref': '#/definitions/FooBarEnum'}],
+                '$ref': '#/definitions/FooBarEnum',
                 'description': 'Pika is definitely the best!',
                 'title': 'Pikapika!',
             },
             'bulbialias': {
-                'allOf': [{'$ref': '#/definitions/FooBarEnum'}],
+                '$ref': '#/definitions/FooBarEnum',
                 'description': 'Bulbi is not...',
                 'title': 'Bulbibulbi!',
                 'default': 'foo',
@@ -387,12 +387,12 @@ class Foo(BaseModel):
             'enum': {'$ref': '#/definitions/Names'},
             'model': {'$ref': '#/definitions/Pika'},
             'titled_enum': {
-                'allOf': [{'$ref': '#/definitions/Names'}],
+                '$ref': '#/definitions/Names',
                 'description': 'Description of enum',
                 'title': 'Title of enum',
             },
             'titled_model': {
-                'allOf': [{'$ref': '#/definitions/Pika'}],
+                '$ref': '#/definitions/Pika',
                 'description': 'Description of model',
                 'title': 'Title of model',
             },
@@ -424,7 +424,7 @@ class Foo(BaseModel):
         },
         'properties': {
             'enum': {'$ref': '#/definitions/Names'},
-            'extra_enum': {'allOf': [{'$ref': '#/definitions/Names'}], 'extra': 'Extra field'},
+            'extra_enum': {'$ref': '#/definitions/Names', 'extra': 'Extra field'},
         },
         'required': ['enum', 'extra_enum'],
         'title': 'Foo',
@@ -1273,7 +1273,7 @@ class Model(BaseModel):
             'Bar': {
                 'title': 'Bar',
                 'type': 'object',
-                'properties': {'b': {'title': 'B', 'default': {'a': 'foo'}, 'allOf': [{'$ref': '#/definitions/Foo'}]}},
+                'properties': {'b': {'title': 'B', 'default': {'a': 'foo'}, '$ref': '#/definitions/Foo'}},
             },
             'Baz': {'title': 'Baz', 'type': 'object', 'properties': {'c': {'$ref': '#/definitions/Bar'}}},
         },
@@ -1547,9 +1547,7 @@ class Outer(BaseModel):
                 'type': 'object',
             }
         },
-        'properties': {
-            'inner': {'allOf': [{'$ref': '#/definitions/Inner'}], 'default': {'a': {'.': ''}}, 'title': 'Inner'}
-        },
+        'properties': {'inner': {'$ref': '#/definitions/Inner', 'default': {'a': {'.': ''}}, 'title': 'Inner'}},
         'title': 'Outer',
         'type': 'object',
     }