code-loader 0.2.86.dev4__tar.gz → 0.2.88__tar.gz

{code_loader-0.2.86.dev4 → code_loader-0.2.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: code-loader
-Version: 0.2.86.dev4
+Version: 0.2.88
 Summary: 
 Home-page: https://github.com/tensorleap/code-loader
 License: MIT
@@ -16,7 +16,7 @@ Requires-Dist: numpy (>=1.22.3,<2.0.0)
 Requires-Dist: psutil (>=5.9.5,<6.0.0)
 Requires-Dist: tensorflow (>=2.11.0,<3.0.0) ; platform_machine == "x86_64"
 Requires-Dist: tensorflow-macos (>=2.11.0,<3.0.0) ; platform_machine == "arm64"
-Requires-Dist: torch (==1.12.1)
+Requires-Dist: torch (>=1.12,<3.0)
 Requires-Dist: typeguard (>=2.13.3,<3.0.0)
 Project-URL: Repository, https://github.com/tensorleap/code-loader
 Description-Content-Type: text/markdown

{code_loader-0.2.86.dev4 → code_loader-0.2.88}/code_loader/contract/datasetclasses.py

@@ -43,9 +43,6 @@ class UnlabeledDataPreprocessHandler:
     data_length: int = 0
 
 
-VisualizerCallableReturnType = Union[LeapImage, LeapText, LeapGraph, LeapHorizontalBar,
-                                     LeapImageMask, LeapTextMask, LeapImageWithBBox]
-
 VisualizerCallableInterface = Union[
     Callable[..., LeapImage],
     Callable[..., LeapText],
@@ -53,10 +50,12 @@ VisualizerCallableInterface = Union[
     Callable[..., LeapHorizontalBar],
     Callable[..., LeapImageMask],
     Callable[..., LeapTextMask],
-    Callable[..., LeapImageWithBBox],
-    Callable[..., Dict[str, VisualizerCallableReturnType]]
+    Callable[..., LeapImageWithBBox]
 ]
 
+VisualizerCallableReturnType = Union[LeapImage, LeapText, LeapGraph, LeapHorizontalBar,
+                                     LeapImageMask, LeapTextMask, LeapImageWithBBox]
+
 CustomCallableInterface = Callable[..., tf.Tensor]
 
 

{code_loader-0.2.86.dev4 → code_loader-0.2.88}/code_loader/leap_binder/leapbinder.py

@@ -10,9 +10,9 @@ from code_loader.contract.datasetclasses import SectionCallableInterface, InputH
     GroundTruthHandler, MetadataHandler, DatasetIntegrationSetup, VisualizerHandler, PreprocessResponse, \
     PreprocessHandler, VisualizerCallableInterface, CustomLossHandler, CustomCallableInterface, PredictionTypeHandler, \
     MetadataSectionCallableInterface, UnlabeledDataPreprocessHandler, CustomLayerHandler, MetricHandler, \
-    ConfusionMatrixCallableInterface, CustomCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs, \
+    CustomCallableInterfaceMultiArgs, ConfusionMatrixCallableInterfaceMultiArgs, \
     CustomMultipleReturnCallableInterfaceMultiArgs
-from code_loader.contract.enums import DatasetMetadataType, LeapDataType, MetricEnum
+from code_loader.contract.enums import LeapDataType
 from code_loader.metrics.default_metrics import metrics_names_to_functions
 from code_loader.utils import to_numpy_return_wrapper
 from code_loader.visualizers.default_visualizers import DefaultVisualizer, \
@@ -95,12 +95,7 @@ class LeapBinder:
         self.setup_container.metrics.append(MetricHandler(name, function, arg_names))
 
     @typechecked
-    def add_prediction(self, name: str, labels: List[str], metrics: Optional[List[MetricEnum]] = None,
-                       custom_metrics: Optional[
-                           List[Union[CustomCallableInterface, ConfusionMatrixCallableInterface]]] = None) -> None:
-        if metrics or custom_metrics:
-            raise DeprecationWarning("Adding metrics on 'leap_binder.add_prediction' method is deprecated."
-                                     "Please update the leap script and use metric block instead.")
+    def add_prediction(self, name: str, labels: List[str]) -> None:
         self.setup_container.prediction_types.append(PredictionTypeHandler(name, labels))
 
     @typechecked

{code_loader-0.2.86.dev4 → code_loader-0.2.88}/code_loader/leaploader.py

@@ -44,6 +44,12 @@ class LeapLoader:
                 torch.cuda.is_available = lambda: False
 
             self.evaluate_module()
+        except TypeError as e:
+            import traceback
+            if "leap_binder.set_metadata(" in traceback.format_exc(5):
+                raise DeprecationWarning(
+                    "Please remove the metadata_type on leap_binder.set_metadata in your dataset script")
+            raise DatasetScriptException(getattr(e, 'message', repr(e))) from e
         except Exception as e:
             raise DatasetScriptException(getattr(e, 'message', repr(e))) from e
 
@@ -280,8 +286,11 @@ class LeapLoader:
                 dataset_metadata_type = DatasetMetadataType.string
             elif metadata_type == bool:
                 dataset_metadata_type = DatasetMetadataType.boolean
+            elif metadata_type == float:
+                dataset_metadata_type = DatasetMetadataType.float
             else:
-                dataset_metadata_type = DatasetMetadataType[metadata_type.__name__]
+                raise Exception(f"Unsupported return type of metadata {handler_test_payload.name}."
+                                f"The return type should be one of [int, float, str, bool]. Got {metadata_type}")
             metadata_instances.append(DatasetMetadataInstance(name=handler_test_payload.name,
                                                               type=dataset_metadata_type))
 

{code_loader-0.2.86.dev4 → code_loader-0.2.88}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "code-loader"
-version = "0.2.86.dev4"
+version = "0.2.88"
 description = ""
 authors = ["dorhar <doron.harnoy@tensorleap.ai>"]
 license = "MIT"
@@ -18,7 +18,7 @@ tensorflow = {version = "^2.11.0", markers = "platform_machine  == 'x86_64'"}
 tensorflow-macos = {version = "^2.11.0", markers = "platform_machine  == 'arm64'"}
 typeguard = "^2.13.3"
 psutil = "^5.9.5"
-torch = "1.12.1"
+torch = ">= 1.12, < 3.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1.1"