More compat

Author: Viicos

src/python-fastui/fastui/components/__init__.py

@@ -154,7 +154,8 @@ def __get_pydantic_json_schema__(
     ) -> _t.Any:
         # until https://github.com/pydantic/pydantic/issues/8413 is fixed
         json_schema = handler(core_schema)
-        json_schema['required'].append('level')
+        schema_def = handler.resolve_ref_schema(json_schema)
+        schema_def['required'].append('level')
         return json_schema
 
 
@@ -309,7 +310,8 @@ def __get_pydantic_json_schema__(
     ) -> _t.Any:
         # until https://github.com/pydantic/pydantic/issues/8413 is fixed
         json_schema = handler(core_schema)
-        json_schema.setdefault('required', []).extend(['startLinks', 'endLinks'])
+        schema_def = handler.resolve_ref_schema(json_schema)
+        schema_def.setdefault('required', []).extend(['startLinks', 'endLinks'])
         return json_schema
 
 
@@ -523,7 +525,8 @@ def __get_pydantic_json_schema__(
     ) -> _t.Any:
         # add `children` to the schema so it can be used in the client
         json_schema = handler(core_schema)
-        json_schema['properties']['children'] = {'tsType': 'ReactNode'}
+        schema_def = handler.resolve_ref_schema(json_schema)
+        schema_def['properties']['children'] = {'tsType': 'ReactNode'}
         return json_schema
 
 

src/python-fastui/fastui/json_schema.py

@@ -160,17 +160,17 @@ def json_schema_obj_to_fields(
 def json_schema_any_to_fields(
     schema: JsonSchemaAny, loc: SchemeLocation, title: _t.List[str], required: bool, defs: JsonSchemaDefs
 ) -> _t.Iterable[FormField]:
-    schema, required = deference_json_schema(schema, defs, required)
-    title = title + [schema.get('title') or loc_to_title(loc)]
+    dereferenced, required = deference_json_schema(schema, defs, required)
+    title = title + [schema.get('title', dereferenced.get('title', loc_to_title(loc)))]
 
-    if schema_is_field(schema):
-        yield json_schema_field_to_field(schema, loc, title, required)
-    elif schema_is_array(schema):
-        yield from json_schema_array_to_fields(schema, loc, title, required, defs)
+    if schema_is_field(dereferenced):
+        yield json_schema_field_to_field(dereferenced, loc, title, required)
+    elif schema_is_array(dereferenced):
+        yield from json_schema_array_to_fields(dereferenced, loc, title, required, defs)
     else:
-        assert schema_is_object(schema), f'Unexpected schema type {schema}'
+        assert schema_is_object(dereferenced), f'Unexpected schema type {dereferenced}'
 
-        yield from json_schema_obj_to_fields(schema, loc, title, defs)
+        yield from json_schema_obj_to_fields(dereferenced, loc, title, defs)
 
 
 def json_schema_field_to_field(

src/python-fastui/requirements/pyproject.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --constraint=src/python-fastui/requirements/lint.txt --extra=fastapi --output-file=src/python-fastui/requirements/pyproject.txt --strip-extras src/python-fastui/pyproject.toml
@@ -18,20 +18,19 @@ idna==3.6
     # via
     #   anyio
     #   email-validator
-pydantic==2.6.1
+pydantic==2.10.6
     # via
     #   fastapi
     #   fastui (src/python-fastui/pyproject.toml)
-    #   pydantic
-pydantic-core==2.16.2
+pydantic-core==2.27.2
     # via pydantic
 python-multipart==0.0.7
     # via fastui (src/python-fastui/pyproject.toml)
 sniffio==1.3.0
     # via anyio
 starlette==0.36.3
     # via fastapi
-typing-extensions==4.9.0
+typing-extensions==4.12.2
     # via
     #   fastapi
     #   pydantic

src/python-fastui/tests/test_components.py

@@ -5,7 +5,7 @@
 that's just testing pydantic!
 """
 from fastui import FastUI, components
-from pydantic_core import Url
+from pydantic import HttpUrl
 
 
 def test_div_text():
@@ -56,7 +56,7 @@ def test_root_model_single():
 def test_iframe():
     iframe = components.Iframe(src='https://www.example.com', srcdoc='<p>hello world</p>', sandbox='allow-scripts')
     assert iframe.model_dump(by_alias=True, exclude_none=True) == {
-        'src': Url('https://www.example.com'),
+        'src': HttpUrl('https://www.example.com'),
         'type': 'Iframe',
         'srcdoc': '<p>hello world</p>',
         'sandbox': 'allow-scripts',