Refactor: Update imports to directly use Sigima objects and remove redundant object module

Author: PierreRaybaut

datalab_kernel/backends/webapi.py

@@ -44,9 +44,9 @@
 except ImportError:
     HTTPX_AVAILABLE = False
 
-if TYPE_CHECKING:
-    from sigima.objects import ImageObj, SignalObj
+from sigima import ImageObj, SignalObj
 
+if TYPE_CHECKING:
     DataObject = SignalObj | ImageObj
 
 
@@ -472,11 +472,6 @@ def _load_object_from_group(self, grp, name: str) -> DataObject | None:
         obj_type = grp.attrs.get("type", "unknown")
 
         if obj_type == "SignalObj" or ("x" in grp and "y" in grp):
-            try:
-                from sigima import SignalObj
-            except ImportError:
-                from datalab_kernel.objects import SignalObj
-
             x = np.array(grp["x"])
             y = np.array(grp["y"])
             dx = np.array(grp["dx"]) if "dx" in grp else None
@@ -488,11 +483,6 @@ def _load_object_from_group(self, grp, name: str) -> DataObject | None:
             return obj
 
         if obj_type == "ImageObj" or "data" in grp:
-            try:
-                from sigima import ImageObj
-            except ImportError:
-                from datalab_kernel.objects import ImageObj
-
             data = np.array(grp["data"])
             obj = ImageObj()
             obj.data = data

datalab_kernel/kernel.py

@@ -18,6 +18,7 @@
 from datalab_kernel import __version__
 from datalab_kernel.plotter import Plotter
 from datalab_kernel.workspace import Workspace
+from sigima import create_image, create_signal
 
 
 class DataLabKernel(IPythonKernel):
@@ -88,8 +89,6 @@ def _setup_namespace(self) -> None:
             pass
 
         # Add convenience functions
-        from datalab_kernel.objects import create_image, create_signal
-
         ns["create_signal"] = create_signal
         ns["create_image"] = create_image
 

datalab_kernel/objects.py

@@ -35,10 +35,9 @@
 from typing import TYPE_CHECKING
 
 import numpy as np
+from sigima import ImageObj, SignalObj
 
 if TYPE_CHECKING:
-    from sigima.objects import ImageObj, SignalObj
-
     DataObject = SignalObj | ImageObj
 
 
@@ -158,11 +157,6 @@ def _read_array_from_zip(zf: zipfile.ZipFile, name: str) -> np.ndarray | None:
 
 def _deserialize_signal(zf: zipfile.ZipFile, metadata: dict) -> DataObject:
     """Deserialize a SignalObj from NPZ archive."""
-    try:
-        from sigima import SignalObj
-    except ImportError:
-        from datalab_kernel.objects import SignalObj
-
     x = _read_array_from_zip(zf, "x.npy")
     y = _read_array_from_zip(zf, "y.npy")
     dx = _read_array_from_zip(zf, "dx.npy")
@@ -190,11 +184,6 @@ def _deserialize_signal(zf: zipfile.ZipFile, metadata: dict) -> DataObject:
 
 def _deserialize_image(zf: zipfile.ZipFile, metadata: dict) -> DataObject:
     """Deserialize an ImageObj from NPZ archive."""
-    try:
-        from sigima import ImageObj
-    except ImportError:
-        from datalab_kernel.objects import ImageObj
-
     data = _read_array_from_zip(zf, "data.npy")
     if data is None:
         raise ValueError("Invalid image NPZ: missing data.npy")

datalab_kernel/serialization_npz.py

@@ -17,7 +17,7 @@
 import numpy as np
 import pytest
 
-from datalab_kernel.objects import create_image, create_signal
+from sigima import create_image, create_signal
 from datalab_kernel.plotter import Plotter
 from datalab_kernel.workspace import StandaloneBackend, Workspace
 

datalab_kernel/tests/contract/test_api.py

@@ -12,7 +12,7 @@
 
 import numpy as np
 
-from datalab_kernel.objects import ImageObj, SignalObj, create_image, create_signal
+from sigima import ImageObj, SignalObj, create_image, create_signal
 
 
 def make_test_signal(

datalab_kernel/tests/data.py

@@ -87,15 +87,15 @@ def test_plotter_class_importable(self):
         assert Plotter is not None
 
     def test_objects_importable(self):
-        """Verify object classes are importable."""
-        from datalab_kernel.objects import ImageObj, SignalObj
+        """Verify object classes are importable from Sigima."""
+        from sigima import ImageObj, SignalObj
 
         assert SignalObj is not None
         assert ImageObj is not None
 
     def test_create_functions_importable(self):
-        """Verify create functions are importable."""
-        from datalab_kernel.objects import create_image, create_signal
+        """Verify create functions are importable from Sigima."""
+        from sigima import create_image, create_signal
 
         assert callable(create_signal)
         assert callable(create_image)

datalab_kernel/tests/unit/test_kernel.py

@@ -12,7 +12,7 @@
 
 import numpy as np
 
-from datalab_kernel.objects import (
+from sigima import (
     ImageObj,
     SignalObj,
     create_image,

datalab_kernel/tests/unit/test_objects.py

@@ -24,10 +24,9 @@
 from typing import TYPE_CHECKING
 
 import numpy as np
+from sigima import ImageObj, SignalObj
 
 if TYPE_CHECKING:
-    from sigima.objects import ImageObj, SignalObj
-
     DataObject = SignalObj | ImageObj
 
 
@@ -282,13 +281,6 @@ def _load_object_from_group(self, grp, name: str) -> DataObject | None:
 
     def _load_signal(self, grp, name: str) -> DataObject:
         """Load a SignalObj from an HDF5 group."""
-        # Conditional import: prefer sigima, fallback to local objects
-        # pylint: disable=import-outside-toplevel
-        try:
-            from sigima import SignalObj
-        except ImportError:
-            from datalab_kernel.objects import SignalObj
-
         x = np.array(grp["x"])
         y = np.array(grp["y"])
         dx = np.array(grp["dx"]) if "dx" in grp else None
@@ -310,13 +302,6 @@ def _load_signal(self, grp, name: str) -> DataObject:
 
     def _load_image(self, grp, name: str) -> DataObject:
         """Load an ImageObj from an HDF5 group."""
-        # Conditional import: prefer sigima, fallback to local objects
-        # pylint: disable=import-outside-toplevel
-        try:
-            from sigima import ImageObj
-        except ImportError:
-            from datalab_kernel.objects import ImageObj
-
         data = np.array(grp["data"])
 
         obj = ImageObj()
@@ -486,8 +471,6 @@ def add(self, name: str, obj: DataObject, overwrite: bool = False) -> None:
         obj.title = name
 
         # Determine which panel the object will be added to
-        from sigima import SignalObj  # pylint: disable=import-outside-toplevel
-
         panel = "signal" if isinstance(obj, SignalObj) else "image"
 
         # add_object uses cross-thread Qt signals - it returns before the signal

datalab_kernel/workspace.py

@@ -16,10 +16,6 @@ scientific data processing in Jupyter notebooks.
     * - :mod:`datalab_kernel`
       - Main entry point with ``Workspace``, ``Plotter``, and ``WorkspaceMode``
 
-    * - :mod:`datalab_kernel.objects`
-      - Data objects (``SignalObj``, ``ImageObj``) and creation functions
-        (``create_signal``, ``create_image``) - re-exported from Sigima
-
     * - :mod:`datalab_kernel.workspace`
       - Workspace implementation with backend abstraction
 
@@ -29,5 +25,4 @@ scientific data processing in Jupyter notebooks.
    :caption: API Modules:
 
    workspace
-   objects
    plotter