Support enums

Author: agoose77

qt_jsonschema_form/defaults.py

@@ -0,0 +1,36 @@
+def enum_defaults(schema):
+    try:
+        return schema["enum"][0]
+    except IndexError:
+        return None
+
+
+def object_defaults(schema):
+    return {k: compute_defaults(s) for k, s in schema["properties"].items()}
+
+
+def array_defaults(schema):
+    items_schema = schema['items']
+    if isinstance(items_schema, dict):
+        return []
+
+    return [compute_defaults(s) for s in schema["items"]]
+
+
+def compute_defaults(schema):
+    if "default" in schema:
+        return schema["default"]
+
+    # Enum
+    if "enum" in schema:
+        return enum_defaults(schema)
+
+    schema_type = schema["type"]
+
+    if schema_type == "object":
+        return object_defaults(schema)
+
+    elif schema_type == "array":
+        return array_defaults(schema)
+
+    return None

qt_jsonschema_form/form.py

@@ -1,26 +1,9 @@
 from copy import deepcopy
-from typing import Optional
 
-from . import widgets
 from jsonschema.validators import validator_for
-
-
-# TODO
-def compute_defaults(schema):
-    if "default" in schema:
-        return schema["default"]
-
-    schema_type = schema["type"]
-
-    if schema_type == "object":
-        return {k: compute_defaults(s) for k, s in schema["properties"].items()}
-    elif schema_type == "array":
-        items_schema = schema['items']
-        if isinstance(items_schema, dict):
-            return []
-        return [compute_defaults(s) for s in schema["items"]]
-
-    return None
+\
+from . import widgets
+from .defaults import compute_defaults
 
 
 def get_widget_state(schema, state=None):
@@ -35,13 +18,14 @@ def get_schema_type(schema: dict) -> str:
 
 class WidgetBuilder:
     default_widget_map = {
-        "boolean": {"checkbox": widgets.CheckboxWidget},
-        "object": {"object": widgets.ObjectWidget},
-        "number": {"spin": widgets.SpinDoubleWidget, "text": widgets.TextWidget},
+        "boolean": {"checkbox": widgets.CheckboxWidget, "enum": widgets.EnumWidget},
+        "object": {"object": widgets.ObjectWidget, "enum": widgets.EnumWidget},
+        "number": {"spin": widgets.SpinDoubleWidget, "text": widgets.TextWidget, "enum": widgets.EnumWidget},
         "string": {"textarea": widgets.TextAreaWidget, "text": widgets.TextWidget, "password": widgets.PasswordWidget,
-                   "filepath": widgets.FilepathWidget, "colour": widgets.ColorWidget},
-        "integer": {"spin": widgets.SpinWidget, "text": widgets.TextWidget, "range": widgets.IntegerRangeWidget},
-        "array": {"array": widgets.ArrayWidget}
+                   "filepath": widgets.FilepathWidget, "colour": widgets.ColorWidget, "enum": widgets.EnumWidget},
+        "integer": {"spin": widgets.SpinWidget, "text": widgets.TextWidget, "range": widgets.IntegerRangeWidget,
+                    "enum": widgets.EnumWidget},
+        "array": {"array": widgets.ArrayWidget, "enum": widgets.EnumWidget}
     }
 
     default_widget_variants = {
@@ -86,6 +70,9 @@ def create_widget(self, schema: dict, ui_schema: dict, state=None) -> widgets.Wi
         except KeyError:
             default_variant = self.default_widget_variants[schema_type]
 
+        if "enum" in schema:
+            default_variant = "enum"
+
         widget_variant = ui_schema.get('ui:widget', default_variant)
         widget_cls = self.widget_map[schema_type][widget_variant]
 

qt_jsonschema_form/widgets.py

@@ -410,7 +410,6 @@ def _add_item(self, item_state=None):
 
         # Create widget
         item_ui_schema = self.ui_schema.get("items", {})
-        print(item_schema, item_state)
         widget = self.widget_builder.create_widget(item_schema, item_ui_schema, item_state)
         controls = ArrayControlsWidget()
 
@@ -484,3 +483,29 @@ def populate_from_schema(self, schema: dict, ui_schema: dict, widget_builder: 'W
             widgets[name] = widget
 
         return widgets
+
+
+class EnumWidget(WidgetMixin, QtWidgets.QComboBox):
+
+    @state_property
+    def state(self):
+        return self.itemData(self.currentIndex())
+
+    @state.setter
+    def state(self, value):
+        index = self.findData(value)
+        if index == -1:
+            raise ValueError(value)
+        self.setCurrentIndex(index)
+
+    def configure(self):
+        options = self.schema["enum"]
+        for i, opt in enumerate(options):
+            self.addItem(str(opt))
+            self.setItemData(i, opt)
+
+        self.currentIndexChanged.connect(lambda _: self.on_changed.emit(self.state))
+
+    def _index_changed(self, index: int):
+        value = self.itemData(index)
+        self.on_changed.emit(self.state)

test.py

@@ -32,16 +32,22 @@
                 "items": [
                     {
                         "type": "string",
-                        "pattern": "[a-zA-Z\-'\s]+"
+                        "pattern": "[a-zA-Z\-'\s]+",
+                        "enum": [
+                            "Jack", "Jill"
+                        ]
                     },
                     {
                         "type": "string",
-                        "pattern": "[a-zA-Z\-'\s]+"
-                    }
+                        "pattern": "[a-zA-Z\-'\s]+",
+                        "enum": [
+                            "Alice", "Bob"
+                        ]
+                    },
                 ],
                 "additionalItems": {
                     "type": "number"
-                }
+                },
             }
         }
     }
@@ -60,13 +66,14 @@
         "schema_path": "/home/angus/PycharmProjects/qt-jsonschema-form/qt_jsonschema_form/__pycache__/__init__.cpython-37.pyc",
         "integerRangeSteps": 60,
         "sky_colour": "#8f5902",
-        # "names": [
-        #     "wer",
-        #     ""
-        # ]
+        "names": [
+            "Jack",
+            "Bob"
+        ]
     }
     w.show()
     w.on_changed.connect(lambda d: print(dumps(d, indent=4)))
 
     print(w)
     app.exec_()
+