Fix form constraints, take 4

Author: ischaojie

demo/forms.py

@@ -156,7 +156,9 @@ class BigModel(BaseModel):
     human: bool | None = Field(
         None, title='Is human', description='Are you human?', json_schema_extra={'mode': 'switch'}
     )
-    number: int | None = Field(None, title='Number', ge=0, le=10, multiple_of=2, description='This is a number should be 0-10 and step with 2')
+    number: int | None = Field(
+        None, title='Number', ge=0, le=10, multiple_of=2, description='This is a number should be 0-10 and step with 2'
+    )
     size: SizeModel
 
     @field_validator('name')

src/npm-fastui/src/components/FormField.tsx

@@ -39,6 +39,10 @@ interface FormFieldInputProps extends BaseFormFieldProps {
   /** @TJS-type ["integer", "number"] */
   le?: number
   /** @TJS-type ["integer", "number"] */
+  gt?: number
+  /** @TJS-type ["integer", "number"] */
+  lt?: number
+  /** @TJS-type ["integer", "number"] */
   multipleOf?: number
   placeholder?: string
 }

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

@@ -34,6 +34,8 @@ class FormFieldInput(BaseFormField):
     min_length: _t.Union[int, None] = pydantic.Field(default=None, serialization_alias='minLength')
     ge: _t.Union[int, float, None] = None
     le: _t.Union[int, float, None] = None
+    gt: _t.Union[int, float, None] = None
+    lt: _t.Union[int, float, None] = None
     multiple_of: _t.Union[int, float, None] = pydantic.Field(default=None, serialization_alias='multipleOf')
     type: _t.Literal['FormFieldInput'] = 'FormFieldInput'
 

src/python-fastui/fastui/json_schema.py

@@ -49,6 +49,8 @@ class JsonSchemaString(JsonSchemaBase):
     type: _ta.Required[_t.Literal['string']]
     default: str
     format: _t.Literal['date', 'date-time', 'time', 'email', 'uri', 'uuid', 'password']
+    maxLength: int
+    minLength: int
 
 
 class JsonSchemaStringEnum(JsonSchemaBase, total=False):
@@ -86,8 +88,6 @@ class JsonSchemaInt(JsonSchemaBase, total=False):
     maximum: int
     exclusiveMaximum: int
     multipleOf: int
-    maxLength: int
-    minLength: int
 
 
 class JsonSchemaNumber(JsonSchemaBase, total=False):
@@ -195,6 +195,8 @@ def json_schema_field_to_field(
             min_length=schema.get('minLength'),
             ge=schema.get('minimum'),
             le=schema.get('maximum'),
+            gt=schema.get('exclusiveMinimum'),
+            lt=schema.get('exclusiveMaximum'),
             multiple_of=schema.get('multipleOf'),
         )
 

src/python-fastui/tests/react-fastui-json-schema.json

@@ -575,6 +575,9 @@
         "ge": {
           "type": ["integer", "number"]
         },
+        "gt": {
+          "type": ["integer", "number"]
+        },
         "htmlType": {
           "enum": ["date", "datetime-local", "email", "hidden", "number", "password", "text", "time", "url"],
           "type": "string"
@@ -588,6 +591,9 @@
         "locked": {
           "type": "boolean"
         },
+        "lt": {
+          "type": ["integer", "number"]
+        },
         "maxLength": {
           "type": "integer"
         },

src/python-fastui/tests/test_forms.py

@@ -12,6 +12,11 @@
 
 
 class SimpleForm(BaseModel):
+    name: str
+    size: int = 4
+
+
+class FormWithConstraints(BaseModel):
     name: str = Field(..., max_length=10, min_length=2, description='This field is required, it must have length 2-10')
     size: int = Field(4, ge=0, le=10, multiple_of=2, description='size with range 0-10 and step with 2')
 
@@ -44,9 +49,6 @@ def test_simple_form_fields():
                 'locked': False,
                 'htmlType': 'text',
                 'type': 'FormFieldInput',
-                'maxLength': 10,
-                'minLength': 2,
-                'description': 'This field is required, it must have length 2-10',
             },
             {
                 'name': 'size',
@@ -56,10 +58,6 @@ def test_simple_form_fields():
                 'locked': False,
                 'htmlType': 'number',
                 'type': 'FormFieldInput',
-                'ge': 0,
-                'le': 10,
-                'multipleOf': 2,
-                'description': 'size with range 0-10 and step with 2',
             },
         ],
     }
@@ -96,6 +94,42 @@ def test_inline_form_fields():
     }
 
 
+def test_form_with_constraints_fields():
+    m = components.ModelForm[FormWithConstraints](submit_url='/foobar/')
+
+    assert m.model_dump(by_alias=True, exclude_none=True) == {
+        'submitUrl': '/foobar/',
+        'method': 'POST',
+        'type': 'ModelForm',
+        'formFields': [
+            {
+                'name': 'name',
+                'title': ['Name'],
+                'required': True,
+                'locked': False,
+                'htmlType': 'text',
+                'type': 'FormFieldInput',
+                'description': 'This field is required, it must have length 2-10',
+                'maxLength': 10,
+                'minLength': 2,
+            },
+            {
+                'name': 'size',
+                'title': ['Size'],
+                'initial': 4,
+                'required': False,
+                'locked': False,
+                'htmlType': 'number',
+                'type': 'FormFieldInput',
+                'description': 'size with range 0-10 and step with 2',
+                'le': 10,
+                'ge': 0,
+                'multipleOf': 2,
+            },
+        ],
+    }
+
+
 async def test_simple_form_submit():
     form_dep = fastui_form(SimpleForm)