can now create a spec usable by mosaic_widget

Author: Hamzu24

packages/schema_wrapper/src/utils.py

@@ -102,6 +102,9 @@ def get_valid_identifier(
         valid += "_"
     return valid
 
+def revert_validation(field):
+    return field.strip('_')
+
 def get_key_by_value(dictionary, target_value):
     for key, value in dictionary.items():
         if value == target_value:
@@ -126,12 +129,16 @@ def get_dependencies(data) -> List[str]:
 
 def to_dict(cur_object):
     if isinstance(cur_object, dict):
-        return {k: to_dict(v) for k, v in cur_object.items()}
+        return {revert_validation(k): to_dict(v) for k, v in cur_object.items() if v is not None}
     elif isinstance(cur_object, list):
-        return [to_dict(i) for i in cur_object]
+        return [to_dict(i) for i in cur_object if i is not None]
     elif hasattr(cur_object, '__dict__'):
-        return {k: to_dict(v) for k, v in cur_object.__dict__.items()}
-    elif isinstance(cur_object, (str, int, float, bool, type(None))):
+        obj_asdict = cur_object.__dict__
+        if len(obj_asdict.keys()) == 1:
+            return to_dict(list(obj_asdict.values())[0])
+        else:
+            return {revert_validation(k): to_dict(v) for k, v in obj_asdict.items() if v is not None}
+    elif isinstance(cur_object, (str, int, float, bool)):
         return cur_object
-    else:
+    elif cur_object != None:
         return str(cur_object)

packages/schema_wrapper/test/test_generated_classes.py

@@ -1,28 +1,12 @@
 """
 pytest packages/schema_wrapper/test/test.py
 """
-
 import unittest
 from pathlib import Path
 import pytest
+from ..src.utils import to_dict
 
-from ..generated_classes import (
-    AggregateExpression,
-    AggregateTransform,
-    ChannelValue,
-    PlotMarkData,
-    ChannelValueSpec,
-    Argmin,
-    Argmax,
-    Avg,
-    CSSStyles,
-    Plot,
-    BrushStyles,
-    DataCSV,
-    DataQuery,
-    DataSpatial,
-    DataTable
-)
+from ..generated_classes import *
 
 @pytest.fixture
 def sample_data():
@@ -111,6 +95,7 @@ def test_plot_components():
     assert styles.opacity == 0.7
     assert styles.stroke == "black"
     assert styles.strokeOpacity == 0.3
+    print(to_dict(styles))
 
 def test_argmin_argmax():
     # Test Argmin
@@ -127,5 +112,25 @@ def test_argmin_argmax():
     assert argmax.distinct == True
     assert argmax.orderby == "date"
 
+def test_composite():
+    argmax = Argmax([5, 6, True, 0.5], False, TransformField("test"), [TransformField("1"), TransformField("2"), TransformField("3")], ParamRef())
+    print(to_dict(argmax))
+
+def test_plot():
+    plot_spec = Plot(
+
+        plot = [PlotMark(Dot(mark="dot", data=PlotFrom(from_="weather", filterBy="$click"), x=ChannelValueSpec(ChannelValue({"dateMonthDay": "date"})), y=ChannelValueSpec(ChannelValue("temp_max")), fill="weather", r="precipitation"))],
+        xyDomain = "Fixed",
+        xTickFormat = "%b",
+        colorDomain = "$domain",
+        colorRange = "$colors",
+        rDomain = "Fixed",
+        rRange = [2, 10],
+        width = 800
+    )
+
+    print(to_dict(plot_spec))
+
 if __name__ == '__main__':
-    pytest.main([__file__])
+    pytest.main([__file__])
+