fix: form field Enum overrides

src/python-fastui/fastui/json_schema.py

@@ -312,6 +312,7 @@ def deference_json_schema(
         if def_schema is None:
             raise ValueError(f'Invalid $ref "{ref}", not found in {defs}')
         else:
+            def_schema.update({k: v for k, v in schema.items() if k != '$ref'})  # type: ignore
             return def_schema, required
     elif any_of := schema.get('anyOf'):
         if len(any_of) == 2 and sum(s.get('type') == 'null' for s in any_of) == 1:

src/python-fastui/tests/test_forms.py

@@ -1,12 +1,13 @@
 from contextlib import asynccontextmanager
+from enum import Enum
 from io import BytesIO
 from typing import List, Tuple, Union
 
 import pytest
 from fastapi import HTTPException
 from fastui import components
 from fastui.forms import FormFile, Textarea, fastui_form
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 from starlette.datastructures import FormData, Headers, UploadFile
 from typing_extensions import Annotated
 
@@ -469,3 +470,59 @@ def test_form_textarea_form_fields():
             }
         ],
     }
+
+
+class ToolEnum(str, Enum):
+    """Tools that can be leveraged to complete a job."""
+
+    hammer = 'hammer'
+    screwdriver = 'screwdriver'
+    saw = 'saw'
+    claw_hammer = 'claw_hammer'
+
+
+class FormEnumWithOptionalEnum(BaseModel):
+    job_name: str
+    tool_required: Union[ToolEnum, None] = Field(
+        json_schema_extra={
+            # Override certain schema fields.
+            'placeholder': 'tool',
+            'description': '',
+        }
+    )
+
+
+def test_form_with_enum():
+    m = components.ModelForm(model=FormEnumWithOptionalEnum, submit_url='/foobar')
+
+    assert m.model_dump(by_alias=True, exclude_none=True) == {
+        'submitUrl': '/foobar',
+        'method': 'POST',
+        'type': 'ModelForm',
+        'formFields': [
+            {
+                'name': 'job_name',
+                'title': ['Job Name'],
+                'required': True,
+                'locked': False,
+                'htmlType': 'text',
+                'type': 'FormFieldInput',
+            },
+            {
+                'name': 'tool_required',
+                'title': ['ToolEnum'],
+                'required': False,
+                'locked': False,
+                'description': '',
+                'options': [
+                    {'value': 'hammer', 'label': 'Hammer'},
+                    {'value': 'screwdriver', 'label': 'Screwdriver'},
+                    {'value': 'saw', 'label': 'Saw'},
+                    {'value': 'claw_hammer', 'label': 'Claw Hammer'},
+                ],
+                'multiple': False,
+                'placeholder': 'tool',
+                'type': 'FormFieldSelect',
+            },
+        ],
+    }