WIP refactor state in singleton

check_embed_widget.py

@@ -0,0 +1,17 @@
+import napari
+from skimage.data import astronaut
+from micro_sam.sam_annotator._state import SamState
+
+x = astronaut()
+
+v = napari.Viewer()
+v.add_image(x)
+
+
+@v.bind_key("p")
+def print_embed(v):
+    state = SamState()
+    print("Image Embeddings are None:", state.image_embeddings is None)
+
+
+napari.run()

micro_sam/sam_annotator/__init__.py

@@ -2,8 +2,8 @@
 The interactive annotation tools.
 """
 
-from .annotator import annotator
-from .annotator_2d import annotator_2d
-from .annotator_3d import annotator_3d
-from .annotator_tracking import annotator_tracking
-from .image_series_annotator import image_folder_annotator, image_series_annotator
+# from .annotator import annotator
+# from .annotator_2d import annotator_2d
+# from .annotator_3d import annotator_3d
+# from .annotator_tracking import annotator_tracking
+# from .image_series_annotator import image_folder_annotator, image_series_annotator

micro_sam/sam_annotator/_state.py

@@ -0,0 +1,20 @@
+
+
+# See
+# https://stackoverflow.com/questions/6760685/creating-a-singleton-in-python
+def singleton(class_):
+    instances = {}
+
+    def getinstance(*args, **kwargs):
+        if class_ not in instances:
+            instances[class_] = class_(*args, **kwargs)
+        return instances[class_]
+    return getinstance
+
+
+# we probably want this to be a data class
+# and I am not sure which singleton pattern to go with
+@singleton
+class SamState:
+    def __init__(self):
+        self.image_embeddings = None

micro_sam/sam_annotator/_widgets.py

@@ -13,6 +13,7 @@
     _DEFAULT_MODEL,
     _available_devices,
 )
+from ._state import SamState
 
 if TYPE_CHECKING:
     import napari
@@ -49,15 +50,17 @@ def embedding_widget(
     # Compute the image embeddings
     @thread_worker(connect={'started': pbar.show, 'returned': pbar.hide})
     def _compute_image_embedding(PREDICTOR, image_data, save_path, ndim=None):
+        print("Start")
         if save_path is not None:
             save_path = str(save_path)
-        global IMAGE_EMBEDDINGS
-        IMAGE_EMBEDDINGS = precompute_image_embeddings(
+        state = SamState()
+        state.image_embeddings = precompute_image_embeddings(
             predictor = PREDICTOR,
             input_ = image_data,
             save_path = save_path,
             ndim=ndim,
         )
-        return IMAGE_EMBEDDINGS  # returns napari._qt.qthreading.FunctionWorker
+        print("Done")
+        return state  # returns napari._qt.qthreading.FunctionWorker
 
     return _compute_image_embedding(PREDICTOR, image.data, save_path, ndim=ndim)

test/test_gui.py

@@ -1,8 +1,7 @@
 import numpy as np
 import pytest
 
-from micro_sam.sam_annotator import annotator_2d
-from micro_sam.sam_annotator.annotator_2d import _initialize_viewer
+from micro_sam.sam_annotator.annotator_2d import annotator_2d, _initialize_viewer
 
 
 def _check_layer_initialization(viewer):