Merge pull request #8 from python-ellar/field_widget

Feat: Field Widgets

Author: eadwinCode

tests/test_boolean_field.py

@@ -60,21 +60,21 @@ class TestModel(BaseModel):
     def test_render_html(self):
         field = BooleanField(name="active")
         field.process(True)
-        html = str(field.render())
+        html = str(field())
         assert 'type="checkbox"' in html
         assert 'name="active"' in html
         assert "checked" in html
 
     def test_render_html_with_help_text(self):
         field = BooleanField(name="active", help_text="Active")
-        html = str(field.render())
+        html = str(field())
         assert 'type="checkbox"' in html
         assert 'name="active"' in html
         assert "checked" not in html
         assert "Active" in html
 
     def test_render_html_checkbox(self):
         field = BooleanField(name="agree")
-        html = str(field.render())
+        html = str(field())
         assert 'type="checkbox"' in html
         assert 'name="agree"' in html

tests/test_choice_field.py

@@ -51,7 +51,7 @@ def test_get_render_context(self):
         choices = [("a", "Option A"), ("b", "Option B")]
         field = ChoiceField(name="test", choices=choices)
         field.data = "a"
-        attrs, context = field.get_render_context({})
+        context = field.widget.get_render_context()
 
         assert context["choices"] == choices
         assert context["is_selected"]("a")
@@ -105,3 +105,16 @@ class TestModel(BaseModel):
         assert form.errors["multi_choice"] == [
             "Value error, Input should be in ['x', 'y', 'z']"
         ]
+
+    def test_choice_field_with_choices_loader(self):
+        def choices_loader():
+            return [("a", "Option A"), ("b", "Option B")]
+
+        field = ChoiceField(name="test", choices_loader=choices_loader)
+        assert field._choices_loader == choices_loader
+
+    def test_choice_field_with_choices_loader_and_choices(self, create_context):
+        field = ChoiceField(
+            name="test", choices_loader=lambda: [("a", "Option A"), ("b", "Option B")]
+        )
+        assert field._choices == [("a", "Option A"), ("b", "Option B")]

tests/test_enum_field.py

@@ -55,7 +55,7 @@ def test_enum_field_process():
 
 def test_enum_field_render():
     field = EnumField(enum=Color, name="color")
-    rendered = field.render()
+    rendered = field.widget.render()
     assert '<select class="" id="color" name="color" required>' in rendered
     assert 'name="color"' in rendered
     assert "<option value='red'>RED</option>" in rendered
@@ -89,7 +89,7 @@ def test_enum_field_render_multiple():
         field_info_args={"default": [Color.RED, Color.GREEN]},
     )
     field.load()
-    rendered = field.render()
+    rendered = field.widget.render()
     assert '<select class="" id="color" multiple name="color">' in rendered
     assert 'name="color"' in rendered
     assert "<option value='red' selected>RED</option>" in rendered

tests/test_form_manager.py

@@ -4,7 +4,7 @@
 from ellar.testing import Test
 
 from zform import ZForm, FormManager
-from zform.fields import StringField, EmailField
+from zform.fields import StringField, EmailField, FieldBase
 
 
 class UserFormModel(BaseModel):
@@ -130,3 +130,31 @@ def login():
     assert response.status_code == 200
     assert response.json()["status"] == "error"
     assert "errors" in response.json()
+
+
+def test_zform_from_fields():
+    fields = [StringField(name="username"), EmailField(name="email")]
+    form = FormManager.from_fields(fields)
+    assert isinstance(form, FormManager)
+    assert len(list(form)) == 2
+    assert all(isinstance(field, FieldBase) for field in list(form))
+
+
+def test_zform_from_fields_with_populate_form():
+    fields = [StringField(name="username"), EmailField(name="email")]
+    form = FormManager.from_fields(fields)
+    form.populate_form(data={"username": "testuser", "email": "[email protected]"})
+    assert form.get_field("username").value == "testuser"
+    assert form.get_field("email").value == "[email protected]"
+
+
+def test_zform_from_fields_with_validate(create_context):
+    fields = [StringField(name="username"), EmailField(name="email")]
+    ctx = create_context({"username": "testuser", "email": "[email protected]"})
+    form = FormManager.from_fields(fields, ctx=ctx)
+
+    is_valid = form.validate()
+
+    assert is_valid
+    assert form.errors == {}
+    assert form.value == {"username": "testuser", "email": "[email protected]"}

tests/test_numbers_field.py

@@ -46,7 +46,7 @@ def test_render_html(self):
             step=2,
             field_info_args={"annotation": int},
         )
-        html = field.render()
+        html = field.widget.render()
         assert 'type="number"' in html
         assert 'name="age"' in html
         assert 'max="100"' in html
@@ -83,7 +83,7 @@ def test_render_html(self):
             step=0.1,
             field_info_args={"annotation": float},
         )
-        html = field.render()
+        html = field.widget.render()
         assert 'type="number"' in html
         assert 'name="weight"' in html
         assert 'max="100.5"' in html
@@ -134,7 +134,7 @@ def test_render_html(self):
         field = DecimalField(
             name="price", max=100, min=0, placeholder="Enter a decimal", step="0.01"
         )
-        html = str(field.render())
+        html = str(field.widget.render())
         assert 'type="number"' in html
         assert 'name="price"' in html
         assert 'max="100"' in html
@@ -188,7 +188,7 @@ class TestModel(BaseModel):
 
     def test_render_html(self):
         field = RangeField(name="volume", max=100, min=0, step=5)
-        html = field.render()
+        html = field.widget.render()
         assert 'type="range"' in html
         assert 'name="volume"' in html
         assert 'max="100"' in html

tests/test_string_form_fields.py

@@ -10,7 +10,7 @@
 
 class TestTimeZoneField:
     def test_default_timezones(self):
-        field = TimeZoneField(name="timezone").rebuild()
+        field = TimeZoneField(name="timezone")
         assert len(field._choices) > 0
         assert all(isinstance(choice, tuple) for choice in field._choices)
 
@@ -19,11 +19,11 @@ def test_custom_timezones(self):
             ("UTC", "Coordinated Universal Time"),
             ("GMT", "Greenwich Mean Time"),
         ]
-        field = TimeZoneField(name="timezone", time_zones=custom_zones).rebuild()
+        field = TimeZoneField(name="timezone", time_zones=custom_zones)
         assert field._choices == custom_zones
 
     def test_render(self):
-        field = TimeZoneField(name="timezone", required=True).rebuild()
+        field = TimeZoneField(name="timezone", required=True)
         rendered = str(field())
         assert '<select class="" id="timezone" name="timezone" required>' in rendered
         assert "<option value='UTC'>UTC</option>" in rendered
@@ -32,19 +32,19 @@ def test_render(self):
 
 class TestDateTimeLocalField:
     def test_type(self):
-        field = DateTimeLocalField(name="datetime_local").rebuild()
+        field = DateTimeLocalField(name="datetime_local")
         assert field.type == "datetime-local"
 
     def test_data_alt_format(self):
         field = DateTimeLocalField(name="datetime_local", data_alt_format="Y-m-d H:i:S")
         assert field.attrs["data_alt_format"] == "Y-m-d H:i:S"
 
     def test_python_type(self):
-        field = DateTimeLocalField(name="datetime_local").rebuild()
+        field = DateTimeLocalField(name="datetime_local")
         assert field.python_type == datetime.datetime
 
     def test_render(self):
-        field = DateTimeLocalField(name="datetime_local").rebuild()
+        field = DateTimeLocalField(name="datetime_local")
         rendered = field()
         assert 'type="datetime-local"' in rendered
         assert 'name="datetime_local"' in rendered
@@ -53,15 +53,15 @@ def test_render(self):
 
 class TestDateTimeField:
     def test_type(self):
-        field = DateTimeField(name="datetime").rebuild()
+        field = DateTimeField(name="datetime")
         assert field.type == "datetime"
 
     def test_python_type(self):
-        field = DateTimeField(name="datetime").rebuild()
+        field = DateTimeField(name="datetime")
         assert field.python_type == datetime.datetime
 
     def test_render(self):
-        field = DateTimeField(name="datetime").rebuild()
+        field = DateTimeField(name="datetime")
         rendered = field()
         assert 'type="datetime"' in rendered
         assert 'name="datetime"' in rendered
@@ -70,15 +70,15 @@ def test_render(self):
 
 class TestDateField:
     def test_type(self):
-        field = DateField(name="date").rebuild()
+        field = DateField(name="date")
         assert field.type == "date"
 
     def test_python_type(self):
-        field = DateField(name="date").rebuild()
+        field = DateField(name="date")
         assert field.python_type == datetime.date
 
     def test_render(self):
-        field = DateField(name="date").rebuild()
+        field = DateField(name="date")
         rendered = field()
         assert 'type="date"' in rendered
         assert 'name="date"' in rendered
@@ -87,15 +87,15 @@ def test_render(self):
 
 class TestTimeField:
     def test_type(self):
-        field = TimeField(name="time").rebuild()
+        field = TimeField(name="time")
         assert field.type == "time"
 
     def test_data_alt_format(self):
-        field = TimeField(name="time", data_alt_format="H:i").rebuild()
+        field = TimeField(name="time", data_alt_format="H:i")
         assert field.attrs["data_alt_format"] == "H:i"
 
     def test_python_type(self):
-        field = TimeField(name="time").rebuild()
+        field = TimeField(name="time")
         assert field.python_type == datetime.time
 
     def test_render(self):

tests/test_zform_field_list.py

@@ -25,7 +25,8 @@ def test_add_item(field_list):
     new_field = field_list.add_item()
     assert len(field_list._items) == 1
     assert isinstance(new_field, StringField)
-    assert new_field.name == "xys.0"
+    assert new_field.name == "xys"
+    assert new_field.field_info_args.alias == "xys.0"
 
 
 def test_clear_items(field_list):
@@ -59,7 +60,8 @@ def test_extra_indices(field_list):
 def test_get_new_field_at(field_list):
     new_field = field_list._get_new_field_at("xys.2")
     assert isinstance(new_field, StringField)
-    assert new_field.name == "xys.2"
+    assert new_field.name == "xys"
+    assert new_field.field_info_args.alias == "xys.2"
 
 
 def test_field_list_iteration(field_list):
@@ -74,8 +76,10 @@ def test_field_list_indexing(field_list):
     field_list.add_item()
     field_list.add_item()
     assert isinstance(field_list._items[0], StringField)
-    assert field_list._items[0].name == "xys.0"
-    assert field_list._items[1].name == "xys.1"
+    assert field_list._items[0].name == "xys"
+    assert field_list._items[0].field_info_args.alias == "xys.0"
+    assert field_list._items[1].name == "xys"
+    assert field_list._items[1].field_info_args.alias == "xys.1"
 
 
 def test_field_list_len(field_list):

tests/test_zform_obj_field.py

@@ -38,7 +38,7 @@ def test_validate_setup():
 
 
 def test_get_render_context(object_field):
-    attrs, context = object_field.get_render_context({})
+    context = object_field.widget.get_render_context()
     assert "fields" in context
     assert len(context["fields"]) == 2
 
@@ -73,8 +73,8 @@ def test_process(object_field):
     data = {"name": "Alice", "age": 25}
     object_field.process(data)
 
-    assert object_field._fields[0]._value == "Alice"
-    assert object_field._fields[1]._value == 25
+    assert object_field._fields[0].value == "Alice"
+    assert object_field._fields[1].value == 25
 
 
 def test_python_type_with_schema(schema_object_field):

zform/fields/__init__.py

@@ -4,10 +4,10 @@
 from datetime import date, datetime, time
 
 from pydantic import BaseModel, EmailStr
-from pydantic._internal._utils import lenient_issubclass
+from ellar.pydantic import lenient_issubclass
 from typing_extensions import get_origin
-
-from .base import FieldBase, FormLabel
+from .select import ChoiceField
+from .base import FieldBase
 from .dates import (
     DateField,
     DateTimeField,
@@ -37,7 +37,8 @@
 from .files import FileField, ImageFileField
 from starlette.datastructures import UploadFile
 from ellar.common.datastructures import UploadFile as EllarUploadFile
-
+from .widget import FieldWidget
+from .label import FormLabel
 
 __ZFORM_TYPES__ = {
     int: IntegerField,
@@ -126,4 +127,7 @@ def get_field_by_annotation(
     "BooleanField",
     "FileField",
     "ImageFileField",
+    "FieldBase",
+    "ChoiceField",
+    "FieldWidget",
 ]