code-loader 1.0.92.dev4__tar.gz → 1.0.93.dev0__tar.gz

{code_loader-1.0.92.dev4 → code_loader-1.0.93.dev0}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: code-loader
-Version: 1.0.92.dev4
+Version: 1.0.93.dev0
 Summary: 
+Home-page: https://github.com/tensorleap/code-loader
 License: MIT
 Author: dorhar
 Author-email: doron.harnoy@tensorleap.ai
@@ -16,7 +17,6 @@ Requires-Dist: numpy (>=1.22.3,<2.0.0)
 Requires-Dist: psutil (>=5.9.5,<6.0.0)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: requests (>=2.32.3,<3.0.0)
-Project-URL: Homepage, https://github.com/tensorleap/code-loader
 Project-URL: Repository, https://github.com/tensorleap/code-loader
 Description-Content-Type: text/markdown
 

{code_loader-1.0.92.dev4 → code_loader-1.0.93.dev0}/code_loader/contract/datasetclasses.py

@@ -40,9 +40,6 @@ class PreprocessResponse:
     sample_id_type: Optional[Union[Type[str], Type[int]]] = None
 
     def __post_init__(self) -> None:
-        def is_valid_string(s: str) -> bool:
-            return bool(re.match(r'^[A-Za-z0-9_]+$', s))
-
         if self.length is not None and self.sample_ids is None:
             self.sample_ids = [i for i in range(self.length)]
             self.sample_id_type = int
@@ -53,8 +50,6 @@ class PreprocessResponse:
             if self.sample_id_type == str:
                 for sample_id in self.sample_ids:
                     assert isinstance(sample_id, str), f"Sample id should be of type str. Got: {type(sample_id)}"
-                    if not is_valid_string(sample_id):
-                        raise Exception(f"Sample id should contain only letters (A-Z, a-z), numbers or '_'. Got: {sample_id}")
         else:
             raise Exception("length is deprecated.")
 

{code_loader-1.0.92.dev4 → code_loader-1.0.93.dev0}/code_loader/contract/visualizer_classes.py

@@ -121,23 +121,19 @@ class LeapGraph:
         x_label = 'Frequency [Seconds]'
         y_label = 'Amplitude [Voltage]'
         x_range = (0.1, 3.0)
-        legend = ['experiment1', 'experiment2', 'experiment3']
-        leap_graph = LeapGraph(data=graph_data, x_label=x_label, y_label=y_label, x_range=x_range, legend=legend)
+        leap_graph = LeapGraph(data=graph_data, x_label=x_label, y_label=y_label, x_range=x_range)
     """
     data: npt.NDArray[np.float32]
     type: LeapDataType = LeapDataType.Graph
     x_label: Optional[str] = None
     y_label: Optional[str] = None
     x_range: Optional[Tuple[float,float]] = None
-    legend: Optional[List[str]] = None
 
     def __post_init__(self) -> None:
         validate_type(self.type, LeapDataType.Graph)
         validate_type(type(self.data), np.ndarray)
         validate_type(self.data.dtype, np.float32)
-        validate_type(len(self.data.shape), 2, f'Graph must be of shape 2. Data is: {self.data}')
-        if self.legend:
-            validate_type(self.data.shape[1], len(self.legend), 'Number of labels supplied should equal the number of graphs')
+        validate_type(len(self.data.shape), 2, 'Graph must be of shape 2')
         validate_type(type(self.x_label), [str, type(None)], 'x_label must be a string or None')
         validate_type(type(self.y_label), [str, type(None)], 'y_label must be a string or None')
         validate_type(type(self.x_range), [tuple, type(None)], 'x_range must be a tuple or None')

{code_loader-1.0.92.dev4 → code_loader-1.0.93.dev0}/code_loader/leaploader.py

@@ -23,7 +23,7 @@ from code_loader.contract.responsedataclasses import DatasetIntegParseResult, Da
     EngineFileContract
 from code_loader.inner_leap_binder import global_leap_binder
 from code_loader.leaploaderbase import LeapLoaderBase
-from code_loader.utils import get_root_exception_file_and_line_number
+from code_loader.utils import get_root_exception_file_and_line_number, flatten
 
 
 class LeapLoader(LeapLoaderBase):
@@ -477,22 +477,18 @@ class LeapLoader(LeapLoaderBase):
 
         return converted_value, is_none
 
-    def _get_metadata(self, state: DataStateEnum, sample_id: Union[int, str]) -> Tuple[Dict[str, Union[str, int, bool, float]], Dict[str, bool]]:
+    def _get_metadata(self, state: DataStateEnum, sample_id: Union[int, str]) -> Tuple[
+        Dict[str, Union[str, int, bool, float]], Dict[str, bool]]:
         result_agg = {}
         is_none = {}
         preprocess_result = self._preprocess_result()
         preprocess_state = preprocess_result[state]
         for handler in global_leap_binder.setup_container.metadata:
             handler_result = handler.function(sample_id, preprocess_state)
-            if isinstance(handler_result, dict):
-                for single_metadata_name, single_metadata_result in handler_result.items():
-                    handler_name = f'{handler.name}_{single_metadata_name}'
-                    result_agg[handler_name], is_none[handler_name] = self._convert_metadata_to_correct_type(
-                        handler_name, single_metadata_result)
-            else:
-                handler_name = handler.name
-                result_agg[handler_name], is_none[handler_name] = self._convert_metadata_to_correct_type(
-                    handler_name, handler_result)
+
+            for flat_name, flat_result in flatten(handler_result, prefix=handler.name):
+                result_agg[flat_name], is_none[flat_name] = self._convert_metadata_to_correct_type(
+                    flat_name, flat_result)
 
         return result_agg, is_none
 

{code_loader-1.0.92.dev4 → code_loader-1.0.93.dev0}/code_loader/utils.py

@@ -1,7 +1,7 @@
 import sys
 from pathlib import Path
 from types import TracebackType
-from typing import List, Union, Tuple, Any
+from typing import List, Union, Tuple, Any, Iterator
 import traceback
 import numpy as np
 import numpy.typing as npt
@@ -66,3 +66,28 @@ def rescale_min_max(image: npt.NDArray[np.float32]) -> npt.NDArray[np.float32]:
     return image
 
 
+def flatten(
+    value: Any,
+    *,
+    prefix: str = "",
+    list_token: str = "e",
+) -> Iterator[Tuple[str, Any]]:
+    """
+    Recursively walk `value` and yield (flat_key, leaf_value) pairs.
+
+    • Dicts → descend with   new_prefix = f"{prefix}_{key}" (or just key if top level)
+    • Sequences → descend with new_prefix = f"{prefix}_{list_token}{idx}"
+    • Leaf scalars → yield the accumulated flat key and the scalar itself
+    """
+    if isinstance(value, dict):
+        for k, v in value.items():
+            new_prefix = f"{prefix}_{k}" if prefix else k
+            yield from flatten(v, prefix=new_prefix, list_token=list_token)
+
+    elif isinstance(value, (list, tuple)):
+        for idx, v in enumerate(value):
+            new_prefix = f"{prefix}_{list_token}{idx}"
+            yield from flatten(v, prefix=new_prefix, list_token=list_token)
+
+    else:  # primitive leaf (str, int, float, bool, None…)
+        yield prefix, value

{code_loader-1.0.92.dev4 → code_loader-1.0.93.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "code-loader"
-version = "1.0.92.dev4"
+version = "1.0.93.dev0"
 description = ""
 authors = ["dorhar <doron.harnoy@tensorleap.ai>"]
 license = "MIT"