digitalkin 0.3.2.dev28__py3-none-any.whl → 0.3.2.dev30__py3-none-any.whl

digitalkin/__version__.py

@@ -5,4 +5,4 @@ from importlib.metadata import PackageNotFoundError, version
 try:
     __version__ = version("digitalkin")
 except PackageNotFoundError:
-    __version__ = "0.3.2.dev28"
+    __version__ = "0.3.2.dev30"

digitalkin/utils/schema_splitter.py

@@ -58,10 +58,19 @@ class SchemaSplitter:
                 cls._extract_ui_properties(value, items_ui, defs)
                 if items_ui:
                     ui_target["items"] = items_ui
-            elif key == "allOf" and isinstance(value, list):
-                for item in value:
-                    if isinstance(item, dict):
-                        cls._extract_ui_properties(item, ui_target, defs)
+            elif key in {"allOf", "oneOf", "anyOf"} and isinstance(value, list):
+                # For oneOf/anyOf, create a mirrored structure in ui_target
+                if key in {"oneOf", "anyOf"}:
+                    ui_target[key] = []
+                    for item in value:
+                        if isinstance(item, dict):
+                            item_ui: dict[str, Any] = {}
+                            cls._extract_ui_properties(item, item_ui, defs)
+                            ui_target[key].append(item_ui)
+                else:  # allOf - merge into parent
+                    for item in value:
+                        if isinstance(item, dict):
+                            cls._extract_ui_properties(item, ui_target, defs)
             elif key in {"if", "then", "else"} and isinstance(value, dict):
                 cls._extract_ui_properties(value, ui_target, defs)
             elif key == "$ref" and isinstance(value, str) and defs is not None and value.startswith("#/$defs/"):
@@ -71,7 +80,7 @@ class SchemaSplitter:
                     cls._extract_ui_properties(defs[def_name], ui_target, defs)
 
     @classmethod
-    def _process_object(  # noqa: C901, PLR0912
+    def _process_object(  # noqa: C901, PLR0912, PLR0915
         cls,
         source: dict[str, Any],
         json_target: dict[str, Any],
@@ -123,13 +132,27 @@ class SchemaSplitter:
                 json_target["allOf"] = []
                 for item in value:
                     if isinstance(item, dict):
-                        item_json: dict[str, Any] = {}
-                        cls._strip_ui_properties(item, item_json)
-                        json_target["allOf"].append(item_json)
+                        item_json_all_of: dict[str, Any] = {}
+                        cls._strip_ui_properties(item, item_json_all_of)
+                        json_target["allOf"].append(item_json_all_of)
                         # Extract UI properties from allOf item
                         cls._extract_ui_properties(item, ui_target, schema_defs)
                     else:
                         json_target["allOf"].append(item)
+            elif key in {"oneOf", "anyOf"} and isinstance(value, list):
+                json_target[key] = []
+                ui_target[key] = []  # Mirror structure in ui_schema
+                for item in value:
+                    if isinstance(item, dict):
+                        item_json_oneof_anyof: dict[str, Any] = {}
+                        cls._strip_ui_properties(item, item_json_oneof_anyof)
+                        json_target[key].append(item_json_oneof_anyof)
+                        # Extract UI properties into a separate dict for this variant
+                        item_ui_oneof_anyof: dict[str, Any] = {}
+                        cls._extract_ui_properties(item, item_ui_oneof_anyof, schema_defs)
+                        ui_target[key].append(item_ui_oneof_anyof)
+                    else:
+                        json_target[key].append(item)
             elif key in {"if", "then", "else"} and isinstance(value, dict):
                 json_target[key] = {}
                 cls._strip_ui_properties(value, json_target[key])
@@ -187,6 +210,22 @@ class SchemaSplitter:
                 cls._process_property(value, json_target["items"], items_ui, defs_ui)
                 if items_ui:
                     ui_target["items"] = items_ui
+            elif key in {"oneOf", "anyOf"} and isinstance(value, list):
+                json_target[key] = []
+                ui_target[key] = []  # Mirror structure in ui_schema
+                for item in value:
+                    if isinstance(item, dict):
+                        item_json_oneof_anyof: dict[str, Any] = {}
+                        cls._strip_ui_properties(item, item_json_oneof_anyof)
+                        json_target[key].append(item_json_oneof_anyof)
+                        # Extract UI properties for this variant
+                        item_ui_oneof_anyof: dict[str, Any] = {}
+                        ref_path = item.get("$ref", "")
+                        if ref_path.startswith("#/$defs/") and ref_path[8:] in defs_ui:
+                            item_ui_oneof_anyof.update(defs_ui[ref_path[8:]])
+                        ui_target[key].append(item_ui_oneof_anyof)
+                    else:
+                        json_target[key].append(item)
             elif key == "hidden":
                 # Strip hidden key from json schema
                 continue
@@ -230,11 +269,20 @@ class SchemaSplitter:
                 json_target["allOf"] = []
                 for item in value:
                     if isinstance(item, dict):
-                        item_json: dict[str, Any] = {}
-                        cls._strip_ui_properties(item, item_json)
-                        json_target["allOf"].append(item_json)
+                        item_json_all_of: dict[str, Any] = {}
+                        cls._strip_ui_properties(item, item_json_all_of)
+                        json_target["allOf"].append(item_json_all_of)
                     else:
                         json_target["allOf"].append(item)
+            elif key in {"oneOf", "anyOf"} and isinstance(value, list):
+                json_target[key] = []
+                for item in value:
+                    if isinstance(item, dict):
+                        item_json_oneof_anyof: dict[str, Any] = {}
+                        cls._strip_ui_properties(item, item_json_oneof_anyof)
+                        json_target[key].append(item_json_oneof_anyof)
+                    else:
+                        json_target[key].append(item)
             elif key in {"if", "then", "else"} and isinstance(value, dict):
                 json_target[key] = {}
                 cls._strip_ui_properties(value, json_target[key])

{digitalkin-0.3.2.dev28.dist-info → digitalkin-0.3.2.dev30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.2.dev28
+Version: 0.3.2.dev30
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International

{digitalkin-0.3.2.dev28.dist-info → digitalkin-0.3.2.dev30.dist-info}/RECORD

@@ -7,7 +7,7 @@ base_server/mock/__init__.py,sha256=YZFT-F1l_TpvJYuIPX-7kTeE1CfOjhx9YmNRXVoi-jQ,
 base_server/mock/mock_pb2.py,sha256=sETakcS3PAAm4E-hTCV1jIVaQTPEAIoVVHupB8Z_k7Y,1843
 base_server/mock/mock_pb2_grpc.py,sha256=BbOT70H6q3laKgkHfOx1QdfmCS_HxCY4wCOX84YAdG4,3180
 digitalkin/__init__.py,sha256=7LLBAba0th-3SGqcpqFO-lopWdUkVLKzLZiMtB-mW3M,162
-digitalkin/__version__.py,sha256=6iGJUSWdUJ2iwJ1TLCMXC_k2mRKmytScG0f_7FAyFlo,196
+digitalkin/__version__.py,sha256=ae9RK0HSLfcT6PpMoP-U9CLQQeJH7Ej6t5Jw6ZGL7t8,196
 digitalkin/logger.py,sha256=8ze_tjt2G6mDTuQcsf7-UTXWP3UHZ7LZVSs_iqF4rX4,4685
 digitalkin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalkin/core/__init__.py,sha256=FJRcJ-B1Viyn-38L8XpOpZ8KOnf1I7PCDOAmKXLQhqc,71
@@ -122,8 +122,8 @@ digitalkin/utils/development_mode_action.py,sha256=2hznh0ajW_4ZTysfoc0Y49161f_PQ
 digitalkin/utils/dynamic_schema.py,sha256=y5csxjuqVHjWDpnTUzxbcUuI_wou9-ibRVHQlBs_btY,15275
 digitalkin/utils/llm_ready_schema.py,sha256=JjMug_lrQllqFoanaC091VgOqwAd-_YzcpqFlS7p778,2375
 digitalkin/utils/package_discover.py,sha256=sa6Zp5Kape1Zr4iYiNrnZxiHDnqM06ODk6yfWHom53w,13465
-digitalkin/utils/schema_splitter.py,sha256=f1RGzs0wSRPn8oydO9Ojo8mYTF4TFDkRFeGUt5jbPt4,11132
-digitalkin-0.3.2.dev28.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin/utils/schema_splitter.py,sha256=lMaReyLD4kGAZSQ9MSxpNZ4D4luWANVArFqNWV_bsko,14040
+digitalkin-0.3.2.dev30.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
 modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modules/archetype_with_tools_module.py,sha256=kJkVhAFWG0aDDqzupOXOnV3l8j3z5bEdWos_6Z9rUP8,7303
 modules/cpu_intensive_module.py,sha256=GZlirQDZdYuXrI46sv1q4RNAHZjL4EptHVQTvgK9zz8,8363
@@ -138,7 +138,7 @@ monitoring/digitalkin_observability/prometheus.py,sha256=gDmM9ySaVwPAe7Yg84pLxmE
 monitoring/tests/test_metrics.py,sha256=ugnYfAwqBPO6zA8z4afKTlyBWECTivacYSN-URQCn2E,5856
 services/filesystem_module.py,sha256=U4dgqtuDadaXz8PJ1d_uQ_1EPncBqudAQCLUICF9yL4,7421
 services/storage_module.py,sha256=Wz2MzLvqs2D_bnBBgtnujYcAKK2V2KFMk8K21RoepSE,6972
-digitalkin-0.3.2.dev28.dist-info/METADATA,sha256=hwYFHYrLASp_RxVjCh5sbgNL-fn8XaTeUsGiEBIknok,29725
-digitalkin-0.3.2.dev28.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-digitalkin-0.3.2.dev28.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
-digitalkin-0.3.2.dev28.dist-info/RECORD,,
+digitalkin-0.3.2.dev30.dist-info/METADATA,sha256=p61ucL27xrbUi7r5PXTNAiQqdV5p_3a1PogbLEvK0mk,29725
+digitalkin-0.3.2.dev30.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+digitalkin-0.3.2.dev30.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
+digitalkin-0.3.2.dev30.dist-info/RECORD,,