refactor: allow non-str keys in KiaraDict data type

DHARPA-Project · Nov 14, 2023 · 02b2890 · 02b2890
1 parent d189cd7
commit 02b2890
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/kiara/data_types/included_core_types/__init__.py b/src/kiara/data_types/included_core_types/__init__.py
@@ -438,7 +438,9 @@ def _pretty_print_as__terminal_renderable(
         table.add_column("value")
 
         data: KiaraDict = value.data
-        data_json = orjson_dumps(data.dict_data, option=orjson.OPT_INDENT_2)
+        data_json = orjson_dumps(
+            data.dict_data, option=orjson.OPT_INDENT_2 | orjson.OPT_NON_STR_KEYS
+        )
         table.add_row(
             "dict data", Syntax(data_json, "json", background_color="default")
         )

diff --git a/src/kiara/models/data_types.py b/src/kiara/models/data_types.py
@@ -10,7 +10,7 @@
 sub-class a pydantic BaseModel or implement custom base classes.
 """
 
-from typing import Any, Dict, Mapping
+from typing import Any, Dict, Hashable, Mapping
 
 from pydantic import BaseModel, Field, PrivateAttr
 
@@ -20,7 +20,7 @@
 
 class KiaraDict(BaseModel, Mapping):
 
-    dict_data: Dict[str, Any] = Field(description="The data.")
+    dict_data: Dict[Hashable, Any] = Field(description="The data.")
     data_schema: Dict[str, Any] = Field(description="The schema.")
     python_class: PythonClass = Field(
         description="The python class of which model instances are created. This is mostly meant as a hint for client applications."

diff --git a/src/kiara/models/module/pipeline/__init__.py b/src/kiara/models/module/pipeline/__init__.py
@@ -494,7 +494,7 @@ def from_file(
         kiara: Union["Kiara", None] = None,
         pipeline_name: Union[None, str] = None,
         # module_map: Optional[Mapping[str, Any]] = None,
-    ):
+    ) -> "PipelineConfig":
 
         data = get_data_from_file(path)
         _pipeline_name = data.pop("pipeline_name", None)
@@ -522,7 +522,7 @@ def from_string(
         kiara: Union["Kiara", None] = None,
         pipeline_name: Union[None, str] = None,
         # module_map: Optional[Mapping[str, Any]] = None,
-    ):
+    ) -> "PipelineConfig":
 
         data = get_data_from_string(string_data)
         _pipeline_name = data.pop("pipeline_name", None)