Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support tuples in forms #52

Merged
merged 10 commits into from
Dec 21, 2023
Merged

Support tuples in forms #52

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
91a3c9a
Support tuples in forms.
WolfDWyc Dec 2, 2023
7db6ae3
Fix linting.
WolfDWyc Dec 2, 2023
b06c278
Remove support for optionals.
WolfDWyc Dec 5, 2023
1138ca4
Add submitting.
WolfDWyc Dec 5, 2023
055d1eb
Update demo for optionals update.
WolfDWyc Dec 5, 2023
eb31646
Revert unrelated changes.
WolfDWyc Dec 5, 2023
d4248b9
Remove unrelated changes.
WolfDWyc Dec 5, 2023
a5d6871
Merge branch 'main' into WolfDWyc-tuples-in-forms
samuelcolvin Dec 21, 2023
6c19d6f
add and fix tests
samuelcolvin Dec 21, 2023
3e7641c
fix types for older python
samuelcolvin Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions python/demo/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,12 @@ class BigModel(BaseModel):
dob: date = Field(title='Date of Birth', description='Your date of birth, this is required hence bold')
size: SizeModel

address: tuple[
Annotated[str, Field(description='Main Address')],
Annotated[str | None, Field(description='Secondary Address')],
Annotated[str | None, Field(description='Business Address')],
]

@field_validator('name')
def name_validator(cls, v: str | None) -> str:
if v and v[0].islower():
Expand Down
5 changes: 5 additions & 0 deletions python/fastui/json_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ def json_schema_array_to_fields(
items_schema[field_name] = value # type: ignore
if field := special_string_field(items_schema, loc_to_name(loc), title, required, True):
return [field]
elif 'minItems' in schema and schema.get('minItems') == schema.get('maxItems'):
if items := schema.get('prefixItems'):
samuelcolvin marked this conversation as resolved.
Show resolved Hide resolved
for i, item in enumerate(items):
yield from json_schema_any_to_fields(item, loc + [i], title, required, defs)
return
raise NotImplementedError('todo')


Expand Down