dearpygui-forms 0.2.1__tar.gz → 0.3.0__tar.gz

{dearpygui_forms-0.2.1 → dearpygui_forms-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dearpygui-forms
-Version: 0.2.1
+Version: 0.3.0
 Summary: Dearpygui extention for autogeneration forms powered by pydantic.
 Project-URL: homepage, https://github.com/vlewicki/dearpygui-forms
 Author-email: Valentin Lewicki <vlewicki@vlewicki.ru>
@@ -21,6 +21,8 @@ Generate GUI forms for your Pydantic models.
 
 
 Currently supported Pydantic fields:
+- nested entities
+- arrays
 - str
 - int
 - float
@@ -28,6 +30,8 @@ Currently supported Pydantic fields:
 - datetime
 - date
 - time
+- anyOf sequences
+
 
 ## Example:
 ```python

{dearpygui_forms-0.2.1 → dearpygui_forms-0.3.0}/README.md

@@ -9,6 +9,8 @@ Generate GUI forms for your Pydantic models.
 
 
 Currently supported Pydantic fields:
+- nested entities
+- arrays
 - str
 - int
 - float
@@ -16,6 +18,8 @@ Currently supported Pydantic fields:
 - datetime
 - date
 - time
+- anyOf sequences
+
 
 ## Example:
 ```python

{dearpygui_forms-0.2.1 → dearpygui_forms-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dearpygui-forms"
-version = "0.2.1"
+version = "0.3.0"
 description = "Dearpygui extention for autogeneration forms powered by pydantic."
 readme = "README.md"
 authors = [

{dearpygui_forms-0.2.1 → dearpygui_forms-0.3.0}/src/dearpygui_forms/models.py

@@ -9,6 +9,7 @@ class PropertySchema:
         self.anyOf: list[dict[str, Any]] = schema.get("anyOf", [])
         self.properties: dict[str, dict[str, Any]] = schema.get("properties", {})
         self.default = schema.get("default", None)
+        self.items = schema.get("items", None)
 
     def __repr__(self) -> str:
         return f"PropertySchema(title={self.title}, type={self.type}, anyOf={self.anyOf}, properties={self.properties}, default={self.default})"

{dearpygui_forms-0.2.1 → dearpygui_forms-0.3.0}/src/dearpygui_forms/widgets.py

@@ -62,6 +62,9 @@ class Widget:
     def get_value(self) -> Any:
         pass
 
+    def __del__(self):
+        dpg.delete_item(self._root_item)
+
 
 class ObjectWidget(Widget):
     def __init__(self, schema, defs, **kwargs):
@@ -72,6 +75,7 @@ class ObjectWidget(Widget):
         for property_name, property in self.schema.properties.items():
             property_widget = generate_widget(property, self._defs, generate_object=False)
             property_widget.add()
+            dpg.add_spacer(height=10)
             self._properties[property_name] = property_widget
 
     def get_value(self) -> dict[str, Any]:
@@ -82,9 +86,69 @@ class ObjectWidget(Widget):
             property_widget.set_value(value.get(property_name))
 
 
+class ExternalWidget(Widget):
+    def __init__(self, schema, defs, **kwargs):
+        self._external_id = dpg.generate_uuid()
+        self._widget: Widget | None = None
+        super().__init__(schema, defs, **kwargs)
+
+    def _ui(self):
+        if self.schema.title:
+            dpg.add_text(self.schema.title)
+        with dpg.group(indent=25) as self._form:
+            self._edit_button = dpg.add_button(label=f"Edit", callback=self.show_object_form)
+
+    def show_object_form(self):
+        if self._widget is None:
+            dpg.delete_item(self._edit_button)
+            self._widget = ObjectWidget(self.schema, self._defs)
+            self._widget.add(parent=self._form)
+
+    def get_value(self):
+        if self._widget is None:
+            raise DearpyguiFormsError(f"{self.schema.title}: set up object.")
+        return self._widget.get_value()
+
+    def set_value(self, value):
+        self.show_object_form()
+        self._widget.set_value(value)
+
+
+
 class ArrayWidget(Widget):
     def __init__(self, schema, defs, **kwargs):
         super().__init__(schema, defs, **kwargs)
+        self.widgets: list[Widget] = []
+
+    def _ui(self):
+        with dpg.group(horizontal=True):
+            dpg.add_text(f"{self.schema.title}")
+            dpg.add_button(label="Add", callback=self.add_item)
+            dpg.add_button(label="Remove", callback=self.remove_item)
+        with dpg.group(indent=25) as self._form:
+            pass
+
+    def add_item(self):
+        widget = generate_widget(self.schema.items, self._defs)
+        self.widgets.append(widget)
+        widget.add(parent=self._form)
+
+    def remove_item(self):
+        if self.widgets:
+            widget = self.widgets.pop()
+            dpg.delete_item(widget._root_item)
+
+    def get_value(self):
+        return [widget.get_value() for widget in self.widgets]
+
+    def set_value(self, value):
+        self.widgets = []
+        for item in value:
+            widget = generate_widget(self.schema.items, self._defs)
+            self.widgets.append(widget)
+            widget.set_value(item)
+            widget.add(parent=self._form)
+
 
 
 class MultiTypeWidget(Widget):
@@ -94,25 +158,26 @@ class MultiTypeWidget(Widget):
         self._widgets: dict[str, Widget] = {}
         for type_schema in schema.anyOf:
             widget = generate_widget(type_schema, defs, generate_object=False)
-            self._widgets[widget.schema.type] = widget
+            self._widgets[widget.schema.title or widget.schema.type] = widget
 
         super().__init__(schema, defs, **kwargs)
 
     def _ui(self):
         with dpg.group(horizontal=True):
-            dpg.add_text(self.schema.title)
-            dpg.add_combo(label="Type",
-                tag=self._type_switcher_id,
-                items=list(self._widgets.keys()),
-                callback=self.switch_value_type,
-                no_preview=True
-            )
-        with dpg.group(indent=25) as self._form:
+            if self.schema.title:
+                dpg.add_text(self.schema.title)
+            items = list(self._widgets.keys())
+            for i in items:
+                dpg.add_button(label=i,
+                    user_data=i,
+                    callback=lambda sender, app_data, user_data: self.switch_value_type(user_data),
+                    small=True
+                )
+        with dpg.group() as self._form:
             for widget in self._widgets.values():
                 widget.add(hidden=True)
 
-    def switch_value_type(self):
-        new_type = dpg.get_value(self._type_switcher_id)
+    def switch_value_type(self, new_type):
         if self._widget is not None:
             self._widget.hide()
         self._widget = self._widgets[new_type]
@@ -135,7 +200,9 @@ class StringWidget(Widget):
         super().__init__(schema, defs, **kwargs)
 
     def _ui(self):
-        dpg.add_input_text(label=self.schema.title, tag=self._input_id)
+        if self.schema.title:
+            dpg.add_text(self.schema.title)
+        dpg.add_input_text(tag=self._input_id)
 
     def get_value(self):
         return dpg.get_value(self._input_id)
@@ -150,7 +217,9 @@ class IntegerWidget(Widget):
         super().__init__(schema, defs, **kwargs)
 
     def _ui(self):
-        dpg.add_input_int(label=self.schema.title, tag=self._input_id)
+        if self.schema.title:
+            dpg.add_text(self.schema.title)
+        dpg.add_input_int(tag=self._input_id)
 
     def get_value(self):
         return dpg.get_value(self._input_id)
@@ -165,7 +234,9 @@ class NumberWidget(Widget):
         super().__init__(schema, defs, **kwargs)
 
     def _ui(self):
-        dpg.add_input_float(label=self.schema.title, tag=self._input_id)
+        if self.schema.title:
+            dpg.add_text(self.schema.title)
+        dpg.add_input_float(tag=self._input_id)
 
     def get_value(self):
         return dpg.get_value(self._input_id)
@@ -180,7 +251,9 @@ class BooleanWidget(Widget):
         super().__init__(schema, defs, **kwargs)
 
     def _ui(self):
-       dpg.add_checkbox(label=self.schema.title, tag=self._checkbox_id)
+        if self.schema.title:
+            dpg.add_text(self.schema.title)
+        dpg.add_checkbox(tag=self._checkbox_id)
 
     def get_value(self):
         return dpg.get_value(self._checkbox_id)
@@ -194,7 +267,9 @@ class NoneWidget(Widget):
         super().__init__(schema, defs, **kwargs)
 
     def _ui(self):
-        dpg.add_input_text(default_value='<None>', label=self.schema.title, tag=self._none_id, enabled=False)
+        if self.schema.title:
+            dpg.add_text(self.schema.title)
+        dpg.add_text("<None>", color=(128, 128, 128))
 
     def get_value(self):
         return None
@@ -203,32 +278,6 @@ class NoneWidget(Widget):
         pass
 
 
-class ExternalWidget(Widget):
-    def __init__(self, schema, defs, **kwargs):
-        self._external_id = dpg.generate_uuid()
-        self._widget: Widget | None = None
-        super().__init__(schema, defs, **kwargs)
-
-    def _ui(self):
-        with dpg.tree_node(label=self.schema.title) as self._form:
-            self._edit_button = dpg.add_button(label=f"Edit", callback=self.show_object_form)
-
-    def show_object_form(self):
-        if self._widget is None:
-            dpg.delete_item(self._edit_button)
-            self._widget = ObjectWidget(self.schema, self._defs)
-            self._widget.add(parent=self._form)
-
-    def get_value(self):
-        if self._widget is None:
-            raise DearpyguiFormsError(f"{self.schema.title}: set up object.")
-        return self._widget.get_value()
-
-    def set_value(self, value):
-        self.show_object_form()
-        self._widget.set_value(value)
-
-
 def generate_widget(json_schema: dict[str, Any],  defs: dict[str, Any], generate_object: bool = True, **kwargs) -> Widget:
     schema = PropertySchema(dereference_property(json_schema, defs))
     match schema:
@@ -238,7 +287,6 @@ def generate_widget(json_schema: dict[str, Any],  defs: dict[str, Any], generate
             else:
                 return ExternalWidget(schema, defs, **kwargs)
         case PropertySchema(type='array'):
-            raise NotImplementedError("ArrayWidget is not implemented yet")
             return ArrayWidget(schema, defs, **kwargs)
         case PropertySchema(type='string'):
             return StringWidget(schema, defs, **kwargs)

{dearpygui_forms-0.2.1 → dearpygui_forms-0.3.0}/tests/demo.py

@@ -1,6 +1,6 @@
 import datetime
 import decimal
-from pprint import pprint
+from pprint import pformat, pprint
 import dearpygui.dearpygui as dpg
 
 import dearpygui.dearpygui as dpg
@@ -25,10 +25,11 @@ class User(BaseModel):
     fingers_on_the_hand: int = 5
     weight: float = 60.0
     pi: decimal.Decimal = decimal.Decimal('3.1415')
-    male: bool|None = True
+    male: bool|None|int = True
     tool: Tool = Field(title="Gun", default=Tool(name="Gun00", price=100.0, quantity=1))
     best_friend: 'User | None' = Field(title='Best friend')
     zero: None
+    tools: list[int | Tool | None]
     # friends: list['User']
 
 
@@ -63,6 +64,7 @@ def main():
             dpg.add_menu_item(label='About', callback=dpg.show_about)
 
     with dpg.window(label="Template", width=641, height=480):
+        logger.debug(f"{pformat(User.model_json_schema())}")
         UserForm(lambda x: logger.success(x)).add()
 
 

{dearpygui_forms-0.2.1 → dearpygui_forms-0.3.0}/uv.lock

@@ -62,7 +62,7 @@ wheels = [
 
 [[package]]
 name = "dearpygui-forms"
-version = "0.2.1"
+version = "0.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "dearpygui" },