cubevis 0.5.18__py3-none-any.whl → 0.5.19__py3-none-any.whl

cubevis/__version__.py

@@ -1 +1 @@
-__version__ = '0.5.18'
+__version__ = '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/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/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
@@ -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.

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
@@ -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.

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/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/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.18.dist-info → cubevis-0.5.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cubevis
-Version: 0.5.18
+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.18.dist-info → cubevis-0.5.19.dist-info}/RECORD

@@ -71,10 +71,10 @@ cubevis/data/__init__.py,sha256=_j5cRA9l9Nl0ycL_SsbeLP1Uil_q1ldiVKJk5IeRFx8,77
 cubevis/data/casaimage/__init__.py,sha256=55ebo9hReK8DdnVDiFK25wYDGizQoRvjcKCIQCdgEck,3606
 cubevis/private/_gclean.py,sha256=ExdR6cRxSa6Xne2veGNKhbTtx-tXUIWr2htzEmEZ9Z4,41107
 cubevis/private/apps/__init__.py,sha256=NIC0XCfjInbAmteORFWtohMvq3Nf8EZ5bsvvUpDYSig,2679
-cubevis/private/apps/_createmask.py,sha256=ErtBrOUq20_xZGXY4gw92lvs2D71SVxx5Osi-dNgW_I,23570
-cubevis/private/apps/_createregion.py,sha256=z8vYIHfFWjIqg5_CECVFtF7wLhN7qFY8L09QB8UMfmU,26702
-cubevis/private/apps/_interactiveclean.mustache,sha256=nDxeRB6DyyZ2L5-_5woh9fYVQXHs9n7KDMdgzZAu5b0,103878
-cubevis/private/apps/_interactiveclean.py,sha256=T6IPjq4FpcLDmpQxmEQrzUqUZ-fsTZwPmylcUL468n0,241529
+cubevis/private/apps/_createmask.py,sha256=kLwb138M3CyZWG2MIv0-1jdpxjpelmroY_85KlSJptA,23592
+cubevis/private/apps/_createregion.py,sha256=OHZzTUaQ8Ofl5xt2mCrhXEDkfED-B3TxL-TCi7EXVeo,26724
+cubevis/private/apps/_interactiveclean.mustache,sha256=i6fMwFJvv-fnXCLTVCgP51tE_CxWOnc2n-qkAcSTF5I,104179
+cubevis/private/apps/_interactiveclean.py,sha256=frQd4HGwed-HHS1jsRUroTbGs54fi9zpjOj2_ui3FzA,241830
 cubevis/private/apps/_interactiveclean_wrappers.py,sha256=XqyCGz33CMDhszTxnwZ_3-64GszUK1XYnGKUOxl9sas,5071
 cubevis/private/apps/_plotants.py,sha256=top6VWVd_sE48IVPH_sIg3_sQeDl5tadi5DL7r5tUEI,10823
 cubevis/private/apps/_plotbandpass.py,sha256=NwOgKSRnpLw9Pt3KIdBpoV78q1OnjCvj6lWFqeyICt8,185
@@ -91,22 +91,23 @@ cubevis/remote/_local.py,sha256=PcPCFcwttTFZd3O33-5pqDuGKQKK6CA0gz1MTIkTiNI,1032
 cubevis/remote/_remote_kernel.py,sha256=wfu7ZzKn-oCxZxzDIkC5puBvGf8WbCLYL3CzM56_FNc,2652
 cubevis/toolbox/__init__.py,sha256=VqxO5Izv0nEjhPbqTUH1jo8SQoyj5YrSbs7m42N8Rm0,1433
 cubevis/toolbox/_app_context.py,sha256=0tRY2SSbSCM6RKLFs_T707_ehWkJXPvnLlE1P9cLXJY,3024
-cubevis/toolbox/_cube.py,sha256=Qx0ZMfIq6Qw82DPGVeupEF0c4jCzcWIVN8OcSpfN0Ew,294187
+cubevis/toolbox/_cube.py,sha256=Thq7hZkcIjhlBf8nlYajyt-JZU1kkVG51VPTO1bHiqQ,294209
 cubevis/toolbox/_region_list.py,sha256=_1RvnXwqMoaAq8CPy-6IyhabLi_snXqO566onehI2y0,8957
 cubevis/utils/_ResourceManager.py,sha256=SaaR29etabRiKxmUK-aWvAm4v_OPFJH8CX7bNFm0Lgo,3410
-cubevis/utils/__init__.py,sha256=bVAMnKLIVmQM6ShL_deOuHW0Zi2wcDP8lh5agWRRDDc,23190
+cubevis/utils/__init__.py,sha256=B_2a0yTCurZWiZfg8dUprcNsqNh205thg7KmpcPRNfE,22705
 cubevis/utils/_contextmgrchain.py,sha256=r5SrCBdgQIVH7zXKOmq5oWhDUSeHaZpgsIfWFHvb3cQ,2859
 cubevis/utils/_conversion.py,sha256=SziCU8sOGtG7djlY766-MeOvnQgvT9C737FEfJ4aYsE,3262
 cubevis/utils/_copydoc.py,sha256=SI9DOUoTNg9M-Y4J1oci2Ba1jebGHsx_pFX24RSNg3o,1915
 cubevis/utils/_docenum.py,sha256=D79BvxwW18DPUlIhBx5DnpZh76pDURC1Hqt1DfS7kG0,877
 cubevis/utils/_import_protected_module.py,sha256=AIISHPdiSzwgVzLXqHSWSHT-L7lcMWbYrsMlGlTFafE,1482
+cubevis/utils/_jupyter.py,sha256=-vYl7UPdSIhrsRrM4ZOi7pY0IEF7Fkm7nAwNOvugU10,3487
 cubevis/utils/_logging.py,sha256=HqyoTib7QSuAUbzicPVMdhFtxWKo-Dv4GgD0AYDDXIY,2348
 cubevis/utils/_pkgs.py,sha256=mu2CCzndmJZYP81UkFhxveW_CisWLUvagJVolHOEVgM,2294
 cubevis/utils/_regions.py,sha256=TdAg4ZUUyhg3nFmX9_KLboqmc0LkyOdEW8M1WDR5Udk,1669
 cubevis/utils/_static.py,sha256=rN-sqXNqQ5R2M3wmPHU1GPP5OTyyWQlUPRuimCrht-g,2347
 cubevis/utils/_tiles.py,sha256=A9W1X61VOhBMTOKXVajzOIoiV2FBdO5N2SFB9SUpDOo,7336
-cubevis/__version__.py,sha256=x-LzH_lvwIvxQ01UgnkF9gRdwqZjvbOC5XzZ3R3DEIA,22
-cubevis-0.5.18.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-cubevis-0.5.18.dist-info/METADATA,sha256=jxZQ2g8XhAvvTMvkva_3LquivWPaMImR0zp4OQdPfWo,2629
-cubevis-0.5.18.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-cubevis-0.5.18.dist-info/RECORD,,
+cubevis/__version__.py,sha256=6Hymy5UWHVwqDeg7hv37CPePOtMP7gvK91kRL5s9EuU,22
+cubevis-0.5.19.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+cubevis-0.5.19.dist-info/METADATA,sha256=Xmn1KxiwOtU54OH62tKcHzwKcT0eDpUg5QVPXbR37ZM,2629
+cubevis-0.5.19.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+cubevis-0.5.19.dist-info/RECORD,,