Do not use CellWatcher outside of notebook env

Signed-off-by: Brianna Major <[email protected]>
InsightSoftwareConsortium · Dec 29, 2023 · ac60a45 · ac60a45
1 parent d20b17b
commit ac60a45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/itkwidgets/standalone_server.py b/itkwidgets/standalone_server.py
@@ -67,7 +67,7 @@ def standalone_viewer(url):
 
 def input_dict(viewer_options):
     user_input = read_files(viewer_options)
-    data = build_init_data(user_input)
+    data = build_init_data(user_input, {})
     ui = user_input.get("ui", "reference")
     data["config"] = build_config(ui)
 

diff --git a/itkwidgets/viewer.py b/itkwidgets/viewer.py
@@ -40,7 +40,8 @@
 
 _viewer_count = 1
 _codecs_registered = False
-CellWatcher() # Instantiate the singleton class right away
+if ENVIRONMENT is not Env.HYPHA:
+    CellWatcher() # Instantiate the singleton class right away
 
 
 class ViewerRPC:
@@ -63,11 +64,10 @@ def __init__(
         self.img = display(HTML(f'<div />'), display_id=str(uuid.uuid4()))
         self.wid = None
         self.parent = parent
-        if ENVIRONMENT is not Env.JUPYTERLITE:
+        if ENVIRONMENT is not Env.JUPYTERLITE and ENVIRONMENT is not Env.HYPHA:
             CellWatcher().add_viewer(self.parent)
-            if ENVIRONMENT is not Env.HYPHA:
-                self.viewer_event = threading.Event()
-                self.data_event = threading.Event()
+            self.viewer_event = threading.Event()
+            self.data_event = threading.Event()
 
     async def setup(self):
         pass
@@ -146,7 +146,8 @@ def set_event(self, event_data):
         if not self.data_event.is_set():
             # Once the data has been set the deferred queue requests can be run
             asyncio.get_running_loop().call_soon_threadsafe(self.data_event.set)
-        self.update_viewer_status()
+        if ENVIRONMENT is not Env.HYPHA:
+            self.update_viewer_status()
 
 
 class Viewer:
@@ -286,7 +287,8 @@ def set_image(self, image: Image, name: str = 'Image'):
                 svc.set_label_or_image('image')
             else:
                 self.queue_request('setImage', image, name)
-                CellWatcher().update_viewer_status(self.name, False)
+                if ENVIRONMENT is not Env.HYPHA:
+                    CellWatcher().update_viewer_status(self.name, False)
         elif render_type is RenderType.POINT_SET:
             image = _get_viewer_point_set(image)
             self.queue_request('setPointSets', image)
@@ -555,7 +557,8 @@ def compare_images(self, fixed_image: Union[str, Image], moving_image: Union[str
         if swap_image_order is not None:
             options['swapImageOrder'] = swap_image_order
         self.queue_request('compareImages', fixed_name, moving_name, options)
-        CellWatcher().update_viewer_status(self.name, False)
+        if ENVIRONMENT is not Env.HYPHA:
+            CellWatcher().update_viewer_status(self.name, False)
 
     @fetch_value
     def set_label_image(self, label_image: Image):
@@ -570,7 +573,8 @@ def set_label_image(self, label_image: Image):
                 svc.set_label_or_image('label_image')
             else:
                 self.queue_request('setLabelImage', label_image)
-                CellWatcher().update_viewer_status(self.name, False)
+                if ENVIRONMENT is not Env.HYPHA:
+                    CellWatcher().update_viewer_status(self.name, False)
         elif render_type is RenderType.POINT_SET:
             label_image = _get_viewer_point_set(label_image)
             self.queue_request('setPointSets', label_image)