cubevis 0.5.17__tar.gz → 0.5.19__tar.gz

{cubevis-0.5.17 → cubevis-0.5.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cubevis
-Version: 0.5.17
+Version: 0.5.19
 Summary: visualization toolkit and apps for casa
 License: LGPL
 Author-email: Darrell Schiebel <darrell@schiebel.us>,Pam Harris <pharris@nrao.edu>

{cubevis-0.5.17 → cubevis-0.5.19}/cubevis/private/apps/_createmask.py

@@ -41,7 +41,7 @@ from bokeh.io import reset_output as reset_bokeh_output
 from bokeh.io import output_notebook
 from bokeh.models.dom import HTML
 from bokeh.models.ui.tooltips import Tooltip
-from cubevis.utils import resource_manager, reset_resource_manager, is_notebook
+from cubevis.utils import resource_manager, reset_resource_manager, is_interactive_jupyter
 from cubevis.data import casaimage
 from cubevis.bokeh.models import TipButton, Tip
 from cubevis.utils import ContextMgrChain as CMC
@@ -395,7 +395,7 @@ class CreateMask:
                                                              itergroups[document._casa_image_name].active = document._casa_last_control_tab''' ) )
 
         # Change display type depending on runtime environment
-        if is_notebook( ):
+        if is_interactive_jupyter( ):
             output_notebook()
         else:
             ### Directory is created when an HTTP server is running

{cubevis-0.5.17 → cubevis-0.5.19}/cubevis/private/apps/_createregion.py

@@ -41,7 +41,7 @@ from bokeh.io import curdoc
 from bokeh.io import reset_output as reset_bokeh_output
 from bokeh.models.dom import HTML
 from bokeh.models.ui.tooltips import Tooltip
-from cubevis.utils import resource_manager, reset_resource_manager, is_notebook
+from cubevis.utils import resource_manager, reset_resource_manager, is_interactive_jupyter
 from cubevis.data import casaimage
 from cubevis.bokeh.models import TipButton, Tip
 from cubevis.utils import ContextMgrChain as CMC
@@ -448,7 +448,7 @@ class CreateRegion:
                                                              itergroups[document._casa_image_name].active = document._casa_last_control_tab''' ) )
 
         # Change display type depending on runtime environment
-        if is_notebook( ):
+        if is_interactive_jupyter( ):
             output_notebook()
         else:
             ### Directory is created when an HTTP server is running

{cubevis-0.5.17 → cubevis-0.5.19}/cubevis/private/apps/_interactiveclean.mustache

@@ -54,7 +54,7 @@ from bokeh.models.dom import HTML
 
 from bokeh.models.ui.tooltips import Tooltip
 from cubevis.bokeh.models import TipButton, Tip, EvTextInput
-from cubevis.utils import resource_manager, reset_resource_manager, is_notebook, find_pkg, load_pkg
+from cubevis.utils import resource_manager, reset_resource_manager, is_interactive_jupyter, find_pkg, load_pkg
 from cubevis.utils import ContextMgrChain as CMC
 
 # pylint: disable=no-name-in-module
@@ -106,6 +106,12 @@ class InteractiveClean:
         ###
         self._error_result = None
 
+        ###
+        ### iclean results
+        ###
+        self.__result = None
+        self.__result_from_gui = None
+
     '''
         _gen_port_fwd_cmd()
 
@@ -193,7 +199,7 @@ class InteractiveClean:
         ###
         ### whether or not the session is being run from a jupyter notebook or script
         ###
-        self._is_notebook = is_notebook()
+        self._is_notebook = is_interactive_jupyter()
 
         ##
         ## the http port for serving GUI in webpage if not running in script
@@ -476,7 +482,7 @@ class InteractiveClean:
                 iteration_limit = int(msg['value']['iteration']['niter'])
                 stopdesc, stopcode, majordone, majorleft, iterleft, self._convergence_data = await self._clean['gclean'].__anext__( )
 
-                clean_cmds = self._clean['gclean'].cmds( )
+                clean_cmds = self._clean['gclean']._log( )
 
                 for key, value in self._convergence_data.items( ):
 
@@ -833,7 +839,7 @@ class InteractiveClean:
                                                                              body {
                                                                                  counter-reset: section;
                                                                              }
-                                                                             p:not([data-skip]):before {
+                                                                             p:not([no-num]):before {
                                                                                  font-weight: bold;
                                                                                  counter-increment: section;
                                                                                  content: "" counter(section) ": ";
@@ -842,7 +848,7 @@ class InteractiveClean:
                                                                      </head>
                                                                      <body>
                                                                          <h1>Interactive Clean History</h1>
-                                                                     ` + elem.map((x) => x.startsWith('#') ? `<p data-skip>${x}</p>` : `<p>${x}</p>`).join('\\n') + '</body>\\n</html>'
+                                                                     ` + elem.map((x) => x.startsWith('#') ? `<p no-num>${x}</p>` : `<p>${x}</p>`).join('\\n') + '</body>\\n</html>'
                                                          }
                                                          let b = cb_obj.origin
                                                          if ( ! b._window || b._window.closed ) {
@@ -855,7 +861,7 @@ class InteractiveClean:
         ### Setup script that will be called when the user closes the
         ### browser tab that is running interactive clean
         ###
-        initial_log = self._clean['gclean'].cmds( )
+        initial_log = self._clean['gclean']._log( )
 
         self._pipe['control'].init_script=CustomJS( args=dict( ctrl_pipe=self._pipe['control'],
                                                                ids=self._clean_ids,
@@ -1044,7 +1050,7 @@ class InteractiveClean:
                     ###
                     raise RuntimeError(f'''gclean failure "%s" not returned: {imdetails["converge"]}''' % ('major' if imdetails['converge']['major'] is None else 'chan'))
 
-            self._clean['cmds'].extend(self._clean['gclean'].cmds( ))
+            self._clean['cmds'].extend(self._clean['gclean']._log( ))
 
             self._initial_clean_params['nmajor'] = majorleft
             self._initial_clean_params['niter'] = iterleft
@@ -1152,9 +1158,12 @@ class InteractiveClean:
         if self.__result_future is None:
             raise RuntimeError( 'no interactive clean result is available' )
 
-        self._clean['gclean'].restore( )
+        if self.__result is None:
+            ### restore returns full return dictionary
+            self.__result_from_gui = self.__result_future.result( )
+            self.__result = self._clean['gclean'].restore( )
 
-        return self.__result_future.result( )
+        return self.__result
 
     def masks( self ):
         '''Retrieves the masks which were used with interactive clean.
@@ -1187,7 +1196,7 @@ class InteractiveClean:
         -------
         list[str]  tclean calls made during the interactive clean session.
         '''
-        return self._clean.cmds( True )
+        return self._clean['gclean']._log( True )
 
     def _initialize_javascript( self ):
         self._js = { ### initialize state

{cubevis-0.5.17 → cubevis-0.5.19}/cubevis/private/apps/_interactiveclean.py

@@ -53,7 +53,7 @@ from bokeh.models.dom import HTML
 
 from bokeh.models.ui.tooltips import Tooltip
 from cubevis.bokeh.models import TipButton, Tip, EvTextInput
-from cubevis.utils import resource_manager, reset_resource_manager, is_notebook, find_pkg, load_pkg
+from cubevis.utils import resource_manager, reset_resource_manager, is_interactive_jupyter, find_pkg, load_pkg
 from cubevis.utils import ContextMgrChain as CMC
 
 # pylint: disable=no-name-in-module
@@ -1868,6 +1868,12 @@ class InteractiveClean:
         ###
         self._error_result = None
 
+        ###
+        ### iclean results
+        ###
+        self.__result = None
+        self.__result_from_gui = None
+
     '''
         _gen_port_fwd_cmd()
 
@@ -1955,7 +1961,7 @@ class InteractiveClean:
         ###
         ### whether or not the session is being run from a jupyter notebook or script
         ###
-        self._is_notebook = is_notebook()
+        self._is_notebook = is_interactive_jupyter()
 
         ##
         ## the http port for serving GUI in webpage if not running in script
@@ -2238,7 +2244,7 @@ class InteractiveClean:
                 iteration_limit = int(msg['value']['iteration']['niter'])
                 stopdesc, stopcode, majordone, majorleft, iterleft, self._convergence_data = await self._clean['gclean'].__anext__( )
 
-                clean_cmds = self._clean['gclean'].cmds( )
+                clean_cmds = self._clean['gclean']._log( )
 
                 for key, value in self._convergence_data.items( ):
 
@@ -2595,7 +2601,7 @@ class InteractiveClean:
                                                                              body {
                                                                                  counter-reset: section;
                                                                              }
-                                                                             p:not([data-skip]):before {
+                                                                             p:not([no-num]):before {
                                                                                  font-weight: bold;
                                                                                  counter-increment: section;
                                                                                  content: "" counter(section) ": ";
@@ -2604,7 +2610,7 @@ class InteractiveClean:
                                                                      </head>
                                                                      <body>
                                                                          <h1>Interactive Clean History</h1>
-                                                                     ` + elem.map((x) => x.startsWith('#') ? `<p data-skip>${x}</p>` : `<p>${x}</p>`).join('\\n') + '</body>\\n</html>'
+                                                                     ` + elem.map((x) => x.startsWith('#') ? `<p no-num>${x}</p>` : `<p>${x}</p>`).join('\\n') + '</body>\\n</html>'
                                                          }
                                                          let b = cb_obj.origin
                                                          if ( ! b._window || b._window.closed ) {
@@ -2617,7 +2623,7 @@ class InteractiveClean:
         ### Setup script that will be called when the user closes the
         ### browser tab that is running interactive clean
         ###
-        initial_log = self._clean['gclean'].cmds( )
+        initial_log = self._clean['gclean']._log( )
 
         self._pipe['control'].init_script=CustomJS( args=dict( ctrl_pipe=self._pipe['control'],
                                                                ids=self._clean_ids,
@@ -2806,7 +2812,7 @@ class InteractiveClean:
                     ###
                     raise RuntimeError(f'''gclean failure "%s" not returned: {imdetails["converge"]}''' % ('major' if imdetails['converge']['major'] is None else 'chan'))
 
-            self._clean['cmds'].extend(self._clean['gclean'].cmds( ))
+            self._clean['cmds'].extend(self._clean['gclean']._log( ))
 
             self._initial_clean_params['nmajor'] = majorleft
             self._initial_clean_params['niter'] = iterleft
@@ -2914,9 +2920,12 @@ class InteractiveClean:
         if self.__result_future is None:
             raise RuntimeError( 'no interactive clean result is available' )
 
-        self._clean['gclean'].restore( )
+        if self.__result is None:
+            ### restore returns full return dictionary
+            self.__result_from_gui = self.__result_future.result( )
+            self.__result = self._clean['gclean'].restore( )
 
-        return self.__result_future.result( )
+        return self.__result
 
     def masks( self ):
         '''Retrieves the masks which were used with interactive clean.
@@ -2949,7 +2958,7 @@ class InteractiveClean:
         -------
         list[str]  tclean calls made during the interactive clean session.
         '''
-        return self._clean.cmds( True )
+        return self._clean['gclean']._log( True )
 
     def _initialize_javascript( self ):
         self._js = { ### initialize state

{cubevis-0.5.17 → cubevis-0.5.19}/cubevis/toolbox/_cube.py

@@ -54,7 +54,7 @@ from cubevis.bokeh.sources import ImageDataSource, ImagePipe, DataPipe
 from cubevis.bokeh.format import WcsTicks
 from cubevis.bokeh.models import EditSpan
 from ..data import casaimage
-from ..utils import pack_arrays, find_ws_address, set_attributes, resource_manager, polygon_indexes, is_notebook
+from ..utils import pack_arrays, find_ws_address, set_attributes, resource_manager, polygon_indexes, is_interactive_jupyter
 from ..bokeh.models import EvTextInput
 from ..bokeh.tools import CBResetTool
 from ..bokeh.state import available_palettes, find_palette, default_palette
@@ -100,7 +100,7 @@ class CubeMask:
         self.COUNT = 1
         self.CCOUNT = 1
 
-        self._is_notebook = is_notebook()
+        self._is_notebook = is_interactive_jupyter()
         #self._color = '#00FF00'                               # anti-green user feedback (issue #40 2024-05-02 13:08:32)
         self._region_style=dict( fill_alpha=0, hover_fill_alpha=0.3,
                                  fill_color='white', hover_fill_color='white',

{cubevis-0.5.17 → cubevis-0.5.19}/cubevis/utils/__init__.py

@@ -43,6 +43,7 @@ from ._regions import polygon_indexes
 from ._docenum import DocEnum
 from ._copydoc import copydoc
 from ._pkgs import find_pkg, load_pkg
+from ._jupyter import is_interactive_jupyter
 
 from astropy import units
 from regions import PixCoord
@@ -604,17 +605,3 @@ def set_attributes(obj, **kw):
     return obj
 
 
-def is_notebook() -> bool:
-    try:
-        shell = get_ipython().__class__.__name__
-        if shell == 'ZMQInteractiveShell':
-            return True   # Jupyter notebook or qtconsole
-        elif shell == 'TerminalInteractiveShell':
-            return False  # Terminal running IPython
-        else:
-            if get_ipython().__class__.__module__ == 'google.colab._shell':
-                return True   # Google Colab
-            else:
-              return False  # Other type (?)
-    except NameError:
-        return False

cubevis-0.5.19/cubevis/utils/_jupyter.py

@@ -0,0 +1,92 @@
+
+#def is_notebook() -> bool:
+#    try:
+#        shell = get_ipython().__class__.__name__
+#        if shell == 'ZMQInteractiveShell':
+#            return True   # Jupyter notebook or qtconsole
+#        elif shell == 'TerminalInteractiveShell':
+#            return False  # Terminal running IPython
+#        else:
+#            if get_ipython().__class__.__module__ == 'google.colab._shell':
+#                return True   # Google Colab
+#            else:
+#              return False  # Other type (?)
+#    except NameError:
+#        return False
+
+def is_interactive_jupyter( ) -> bool:
+    """
+    Detect if running in an interactive Jupyter notebook with frontend connection.
+
+    This function distinguishes between:
+    - Interactive Jupyter notebook/lab with frontend (returns True)
+    - Standalone Jupyter kernel without frontend (returns False)
+    - Regular Python interpreter (returns False)
+
+    Returns:
+        bool: True if running in interactive Jupyter with frontend, False otherwise
+    """
+    try:
+        from IPython import get_ipython
+        ipython = get_ipython()
+
+        if ipython is None:
+            return False
+
+        # Check if we're in a ZMQ-based shell (kernel)
+        if ipython.__class__.__name__ != 'ZMQInteractiveShell':
+            return False
+
+        # Check for active frontend connection
+        if hasattr(ipython, 'kernel') and ipython.kernel is not None:
+            kernel = ipython.kernel
+
+            # Method 1: Check if there are active connections
+            if hasattr(kernel, 'shell_socket') and kernel.shell_socket is not None:
+                # For newer Jupyter versions, check connection count
+                if hasattr(kernel, 'connection_count'):
+                    return kernel.connection_count > 0
+
+                # For older versions, check if socket is connected
+                try:
+                    # Try to get socket state - if it fails, likely no frontend
+                    socket_state = kernel.shell_socket.closed
+                    return not socket_state
+                except AttributeError:
+                    pass
+
+            # Method 2: Check parent message (indicates interactive execution)
+            if hasattr(kernel, 'get_parent') and callable(kernel.get_parent):
+                try:
+                    parent = kernel.get_parent()
+                    # If there's a parent message, we're likely in interactive mode
+                    return parent is not None and len(parent) > 0
+                except Exception:
+                    pass
+
+            # Method 3: Check for execution context
+            if hasattr(kernel, '_parent_ident') and kernel._parent_ident:
+                return True
+
+        # Fallback: Check for common Jupyter notebook environment indicators
+        # This catches cases where kernel introspection doesn't work
+        import os
+        jupyter_indicators = [
+            'JPY_PARENT_PID',  # JupyterLab/Notebook sets this
+            'JUPYTER_RUNTIME_DIR',
+        ]
+
+        for indicator in jupyter_indicators:
+            if indicator in os.environ:
+                # Additional check: see if we can import notebook-specific modules
+                try:
+                    import IPython.display
+                    # If we can import display and have env indicators, likely interactive
+                    return True
+                except ImportError:
+                    pass
+
+        return False
+
+    except ImportError:
+        return False

{cubevis-0.5.17 → cubevis-0.5.19}/pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
 ]
 requires-python = ">=3.10"
 readme = "readme.rst"
-version = "0.5.17"
+version = "0.5.19"
 
 [project.license]
 text = "LGPL"