code-loader 1.0.151.dev1__tar.gz → 1.0.151.dev3__tar.gz

{code_loader-1.0.151.dev1 → code_loader-1.0.151.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: code-loader
-Version: 1.0.151.dev1
+Version: 1.0.151.dev3
 Summary: 
 Home-page: https://github.com/tensorleap/code-loader
 License: MIT

{code_loader-1.0.151.dev1 → code_loader-1.0.151.dev3}/code_loader/leaploader.py

@@ -521,24 +521,38 @@ class LeapLoader(LeapLoaderBase):
 
         return converted_value, is_none
 
-    def get_metadata(self, state: DataStateEnum, sample_id: Union[int, str], only_handler_names: Optional[List[str]] = None) -> Tuple[
+    def get_metadata(self, state: DataStateEnum, sample_id: Union[int, str], only_metadata_names: Optional[List[str]] = None) -> Tuple[
         Dict[str, Union[str, int, bool, float]], Dict[str, bool]]:
+
+        def is_metadata_name_starts_with_handler_name(_handler):
+            for metadata_name in only_metadata_names:
+                if metadata_name.startswith(_handler.name + '_') or metadata_name == _handler.name:
+                    return True
+            return False
+
         result_agg = {}
         is_none = {}
         preprocess_result = self._preprocess_result()
         preprocess_state = preprocess_result[state]
         for handler in global_leap_binder.setup_container.metadata:
-            if only_handler_names:
-                if handler.name not in only_handler_names:
+            if only_metadata_names:
+                if not is_metadata_name_starts_with_handler_name(handler):
                     continue
+
             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}'
+                    if only_metadata_names:
+                        if handler_name not in only_metadata_names:
+                            continue
                     result_agg[handler_name], is_none[handler_name] = self._convert_metadata_to_correct_type(
                         handler_name, single_metadata_result)
             else:
                 handler_name = handler.name
+                if only_metadata_names:
+                    if handler_name not in only_metadata_names:
+                        continue
                 result_agg[handler_name], is_none[handler_name] = self._convert_metadata_to_correct_type(
                     handler_name, handler_result)
 

{code_loader-1.0.151.dev1 → code_loader-1.0.151.dev3}/code_loader/leaploaderbase.py

@@ -68,6 +68,24 @@ class LeapLoaderBase:
     def get_instances_data(self, state: DataStateEnum) -> Tuple[Dict[str, List[str]], Dict[str, str]]:
         pass
 
+    def get_metadata_multiple_samples(self, state: DataStateEnum, sample_ids: Union[List[int], List[str]],
+                     only_metadata_names: Optional[List[str]] = None
+                                      ) -> Tuple[Dict[str, Union[List[str], List[int], List[bool],
+    List[float]]], Dict[str, List[bool]]]:
+        aggregated_results: Dict[str, List[Union[str, int, bool, float]]] = {}
+        aggregated_is_none: Dict[str, List[bool]] = {}
+        sample_id_type = self.get_sample_id_type()
+        for sample_id in sample_ids:
+            sample_id = sample_id_type(sample_id)
+            metadata_result, is_none_result = self.get_metadata(state, sample_id, only_metadata_names)
+            for metadata_name, metadata_value in metadata_result.items():
+                if metadata_name not in aggregated_results:
+                    aggregated_results[metadata_name] = []
+                    aggregated_is_none[metadata_name] = []
+                aggregated_results[metadata_name].append(metadata_value)
+                aggregated_is_none[metadata_name].append(is_none_result[metadata_name])
+        return aggregated_results, aggregated_is_none
+
     @abstractmethod
     def check_dataset(self) -> DatasetIntegParseResult:
         pass
@@ -90,7 +108,7 @@ class LeapLoaderBase:
     @abstractmethod
     def get_metadata(
             self, state: DataStateEnum, sample_id: Union[int, str],
-            only_handler_names: Optional[List[str]] = None
+            only_metadata_names: Optional[List[str]] = None
     ) -> Tuple[Dict[str, Union[str, int, bool, float]], Dict[str, bool]]:
         pass
 

{code_loader-1.0.151.dev1 → code_loader-1.0.151.dev3}/pyproject.toml

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