Flatten schemas and replace macros with boilerplate

Author: adriangb

generate_self_schema.py

@@ -197,26 +197,9 @@ def main() -> None:
         assert m, f'Unknown schema type: {type_}'
         key = m.group(1)
         value = get_schema(s)
-        if key == 'function':
-            mode = value['fields']['mode']['schema']['expected']
-            if mode == ['plain']:
-                key = 'function-plain'
-            elif mode == ['wrap']:
-                key = 'function-wrap'
-        elif key == 'tuple':
-            if value['fields']['mode']['schema']['expected'] == ['positional']:
-                key = 'tuple-positional'
-            else:
-                key = 'tuple-variable'
-
         choices[key] = value
 
-    schema = {
-        'type': 'tagged-union',
-        'ref': 'root-schema',
-        'discriminator': 'self-schema-discriminator',
-        'choices': choices,
-    }
+    schema = {'type': 'tagged-union', 'ref': 'root-schema', 'discriminator': 'type', 'choices': choices}
     python_code = (
         f'# this file is auto-generated by generate_self_schema.py, DO NOT edit manually\nself_schema = {schema}\n'
     )

pydantic_core/core_schema.py

@@ -1092,8 +1092,7 @@ def list_schema(
 
 
 class TuplePositionalSchema(TypedDict, total=False):
-    type: Required[Literal['tuple']]
-    mode: Required[Literal['positional']]
+    type: Required[Literal['tuple-positional']]
     items_schema: Required[List[CoreSchema]]
     extra_schema: CoreSchema
     strict: bool
@@ -1132,8 +1131,7 @@ def tuple_positional_schema(
         serialization: Custom serialization schema
     """
     return dict_not_none(
-        type='tuple',
-        mode='positional',
+        type='tuple-positional',
         items_schema=items_schema,
         extra_schema=extra_schema,
         strict=strict,
@@ -1144,8 +1142,7 @@ def tuple_positional_schema(
 
 
 class TupleVariableSchema(TypedDict, total=False):
-    type: Required[Literal['tuple']]
-    mode: Literal['variable']
+    type: Required[Literal['tuple-variable']]
     items_schema: CoreSchema
     min_length: int
     max_length: int
@@ -1185,8 +1182,7 @@ def tuple_variable_schema(
         serialization: Custom serialization schema
     """
     return dict_not_none(
-        type='tuple',
-        mode='variable',
+        type='tuple-variable',
         items_schema=items_schema,
         min_length=min_length,
         max_length=max_length,
@@ -1447,24 +1443,30 @@ def __call__(self, __input_value: Any, __info: ValidationInfo) -> Any:  # pragma
         ...
 
 
-class FunctionSchema(TypedDict, total=False):
-    type: Required[Literal['function']]
-    mode: Required[Literal['before', 'after']]
+class _FunctionSchema(TypedDict, total=False):
     function: Required[ValidatorFunction]
     schema: Required[CoreSchema]
     ref: str
     metadata: Any
     serialization: SerSchema
 
 
+class FunctionBeforeSchema(_FunctionSchema, total=False):
+    type: Required[Literal['function-before']]
+
+
+class FunctionAfterSchema(_FunctionSchema, total=False):
+    type: Required[Literal['function-after']]
+
+
 def function_before_schema(
     function: ValidatorFunction,
     schema: CoreSchema,
     *,
     ref: str | None = None,
     metadata: Any = None,
     serialization: SerSchema | None = None,
-) -> FunctionSchema:
+) -> FunctionBeforeSchema:
     """
     Returns a schema that calls a validator function before validating the provided schema, e.g.:
 
@@ -1490,8 +1492,7 @@ def fn(v: Any, info: core_schema.ValidationInfo) -> str:
         serialization: Custom serialization schema
     """
     return dict_not_none(
-        type='function',
-        mode='before',
+        type='function-before',
         function=function,
         schema=schema,
         ref=ref,
@@ -1507,7 +1508,7 @@ def function_after_schema(
     ref: str | None = None,
     metadata: Any = None,
     serialization: SerSchema | None = None,
-) -> FunctionSchema:
+) -> FunctionAfterSchema:
     """
     Returns a schema that calls a validator function after validating the provided schema, e.g.:
 
@@ -1531,13 +1532,7 @@ def fn(v: str, info: core_schema.ValidationInfo) -> str:
         serialization: Custom serialization schema
     """
     return dict_not_none(
-        type='function',
-        mode='after',
-        function=function,
-        schema=schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
+        type='function-after', function=function, schema=schema, ref=ref, metadata=metadata, serialization=serialization
     )
 
 
@@ -1554,8 +1549,7 @@ def __call__(
 
 
 class FunctionWrapSchema(TypedDict, total=False):
-    type: Required[Literal['function']]
-    mode: Required[Literal['wrap']]
+    type: Required[Literal['function-wrap']]
     function: Required[WrapValidatorFunction]
     schema: Required[CoreSchema]
     ref: str
@@ -1595,19 +1589,12 @@ def fn(v: str, validator: core_schema.CallableValidator, info: core_schema.Valid
         serialization: Custom serialization schema
     """
     return dict_not_none(
-        type='function',
-        mode='wrap',
-        function=function,
-        schema=schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
+        type='function-wrap', function=function, schema=schema, ref=ref, metadata=metadata, serialization=serialization
     )
 
 
 class FunctionPlainSchema(TypedDict, total=False):
-    type: Required[Literal['function']]
-    mode: Required[Literal['plain']]
+    type: Required[Literal['function-plain']]
     function: Required[ValidatorFunction]
     ref: str
     metadata: Any
@@ -1639,7 +1626,7 @@ def fn(v: str, info: core_schema.ValidationInfo) -> str:
         serialization: Custom serialization schema
     """
     return dict_not_none(
-        type='function', mode='plain', function=function, ref=ref, metadata=metadata, serialization=serialization
+        type='function-plain', function=function, ref=ref, metadata=metadata, serialization=serialization
     )
 
 
@@ -2638,7 +2625,8 @@ def definition_reference_schema(
     FrozenSetSchema,
     GeneratorSchema,
     DictSchema,
-    FunctionSchema,
+    FunctionBeforeSchema,
+    FunctionAfterSchema,
     FunctionWrapSchema,
     FunctionPlainSchema,
     WithDefaultSchema,
@@ -2677,12 +2665,16 @@ def definition_reference_schema(
     'is-subclass',
     'callable',
     'list',
-    'tuple',
+    'tuple-positional',
+    'tuple-variable',
     'set',
     'frozenset',
     'generator',
     'dict',
-    'function',
+    'function-before',
+    'function-after',
+    'function-wrap',
+    'function-plain',
     'default',
     'nullable',
     'union',

rust-toolchain

@@ -1 +1 @@
-nightly
+stable