cubevis 1.0.21__py3-none-any.whl → 1.0.26__py3-none-any.whl

cubevis/__version__.py

@@ -1 +1 @@
-__version__ = '1.0.21'
+__version__ = '1.0.26'

cubevis/bokeh/__init__.py

@@ -30,6 +30,7 @@ provided by Bokeh'''
 
 from .state import order_bokeh_js as _order_bokeh_js
 from .state import register_model as _register_model
+from .state._initialize import get_bokeh_js_paths
 from .state import set_cubevis_lib
 
 class BokehInit:

cubevis/bokeh/models/_showable.py

@@ -5,6 +5,7 @@ from bokeh.core.properties import Instance, String
 
 from bokeh.io import curdoc
 from .. import BokehInit
+from ...utils import is_colab
 
 logger = logging.getLogger(__name__)
 
@@ -272,8 +273,11 @@ class Showable(LayoutDOM,BokehInit):
         Common logic for generating HTML in notebook environments.
         Returns the HTML string to display, or None if not in a notebook.
         """
-        from bokeh.embed import components
+        from bokeh.embed import components, json_item
         from bokeh.io.state import curstate
+        from bokeh.resources import CDN
+        import sys
+        import json as json_lib
 
         state = curstate()
 
@@ -284,31 +288,92 @@ class Showable(LayoutDOM,BokehInit):
             return '<div style="color: red; padding: 10px; border: 1px solid red;">Showable object with no UI set</div>'
 
         if self._display_context:
-            self._display_context.on_show( )
+            self._display_context.on_show()
 
         if self._notebook_rendering:
             # Return a lightweight reference instead of re-rendering the full GUI
             return f'''
             <div style="padding: 10px; background: #f0f8f0; border-left: 4px solid #4CAF50; margin: 5px 0;">
-                <strong>↑ iclean GUI active above</strong>
+                <strong>→ iclean GUI active above</strong>
                 <small style="color: #666; display: block; margin-top: 5px;">
                     Showable ID: {self.id[-8:]} | Backend: Running
                 </small>
             </div>
             '''
 
-        # Apply notebook sizing for Jupyter context
-        ###if self._notebook_sizing == 'fixed':
-        ###    self.sizing_mode = None
-        ###    self.width = self._notebook_width
-        ###    self.height = self._notebook_height
+        if is_colab( ):
+            # Get all JS paths from the existing function
+            # This returns paths in the correct order:
+            # [casalib, bokeh-core, bokeh-widgets, bokeh-tables, cubevisjs]
+            from cubevis.bokeh import get_bokeh_js_paths
+            js_paths = get_bokeh_js_paths( )
+
+            # Build script tags for all libraries in order
+            all_scripts = '\n'.join([
+                f'<script type="text/javascript" src="{url}"></script>'
+                for url in js_paths
+            ])
+
+            # Use json_item approach which is more reliable in iframes
+            item = json_item(self, target=f"bokeh-{self.id}")
+            item_json = json_lib.dumps(item)
+
+            # Build complete HTML with proper loading sequence
+            # get_bokeh_js_paths() already returns libs in the correct order:
+            # 1. casalib (third-party libs for CustomJS)
+            # 2. bokeh-core
+            # 3. bokeh-widgets
+            # 4. bokeh-tables
+            # 5. cubevisjs (custom Bokeh models)
+            html = f'''
+            {f'<link href="{CDN.css_files[0]}" rel="stylesheet" type="text/css">' if CDN.css_files else ""}
+            <div id="bokeh-{self.id}" class="bk-root"></div>
+            {all_scripts}
+            <script type="text/javascript">
+            (function() {{
+                var item = {item_json};
+
+                function embedWhenReady() {{
+                    // Check if all required libraries are loaded
+                    if (typeof Bokeh !== 'undefined' && Bokeh.embed) {{
+                        var target = document.getElementById("bokeh-{self.id}");
+                        if (target) {{
+                            try {{
+                                Bokeh.embed.embed_item(item);
+                                console.log("Bokeh plot embedded successfully");
+                            }} catch(e) {{
+                                console.error("Error embedding Bokeh plot:", e);
+                            }}
+                        }} else {{
+                            console.error("Target element not found");
+                            setTimeout(embedWhenReady, 50);
+                        }}
+                    }} else {{
+                        setTimeout(embedWhenReady, 50);
+                    }}
+                }}
+
+                if (document.readyState === 'loading') {{
+                    document.addEventListener('DOMContentLoaded', embedWhenReady);
+                }} else {{
+                    embedWhenReady();
+                }}
+            }})();
+            </script>
+            '''
 
-        script, div = components(self)
-        if start_backend:
-            self._start_backend()
+            if start_backend:
+                self._start_backend()
 
-        self._notebook_rendering = f'{script}\n{div}'
-        return self._notebook_rendering
+            self._notebook_rendering = html
+            return html
+        else:
+            # In Jupyter Lab/Classic, use components() as before
+            script, div = components(self)
+            if start_backend:
+                self._start_backend()
+            self._notebook_rendering = f'{script}\n{div}'
+            return self._notebook_rendering
 
     def _repr_mimebundle_(self, include=None, exclude=None):
         """

cubevis/bokeh/state/_initialize.py

@@ -321,6 +321,13 @@ def order_bokeh_js():
     resources.Resources.js_files = property(js_files)
     return
 
+#def get_bokeh_js_paths( ):
+#    modes = ['cdn','inline','server','server-dev','relative','relative-dev','absolute','absolute-dev']
+#    return { 'new': { mode: resources.Resources(mode=mode).js_files for mode in modes },
+#             'old': { mode: resources.Resources(mode=mode)._old_js_files for mode in modes } }
+def get_bokeh_js_paths( ):
+    return resources.Resources(mode='cdn').js_files
+
 def get_jupyter_state( ):
     """Get the package-level Jupyter state"""
     return _JUPYTER_STATE

cubevis/toolbox/_cube.py

@@ -1082,7 +1082,7 @@ class CubeMask:
                                  ### Firefox incorrectly sizes the colormap histogram plot resulting in the right
                                  ### side being outside of the browser window... this may have to be tweaked again
                                  ### when Jupyter notebooks are supported...
-                               ( [ Spacer( width=120 ) ] if have_firefox( ) else [ ] ), sizing_mode='stretch_both' ),
+                               ( [ Spacer( width=120 ) ] if not is_interactive_jupyter( ) and have_firefox( ) else [ ] ), sizing_mode='stretch_both' ),
                        row( Tip( self._cm_adjust['min input'],
                                   tooltip=Tooltip( content=HTML("set minimum clip here or drag the left red line above"),
                                                    position="top" ) ),

cubevis/utils/__init__.py

@@ -43,7 +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 ._jupyter import is_interactive_jupyter, is_colab
 from ._browser import have_firefox
 from ._git import max_git_version
 

cubevis/utils/_jupyter.py

@@ -1,3 +1,5 @@
+import os
+import sys
 import logging
 
 logger = logging.getLogger(__name__)
@@ -17,6 +19,15 @@ logger = logging.getLogger(__name__)
 #    except NameError:
 #        return False
 
+def is_colab():
+    """
+    Detects if the current environment is Google Colab.
+    Combines module check (process-level) and env-var check (VM-level).
+    """
+    # 1. Check for the Colab-specific environment variable (VM level)
+    # 2. Check for the google.colab module (Python process level)
+    return os.getenv("COLAB_RELEASE_TAG") is not None or 'google.colab' in sys.modules
+
 def is_interactive_jupyter( ) -> bool:
     """
     Detect if running in an interactive Jupyter notebook with frontend connection.
@@ -25,6 +36,7 @@ def is_interactive_jupyter( ) -> bool:
     - Interactive Jupyter notebook/lab with frontend (returns True)
     - Standalone Jupyter kernel without frontend (returns False)
     - Regular Python interpreter (returns False)
+    - Support Google Colab and legacy Jupyter versions.
 
     Returns:
         bool: True if running in interactive Jupyter with frontend, False otherwise
@@ -37,12 +49,21 @@ def is_interactive_jupyter( ) -> bool:
             logger.debug(f"\tis_interactive_jupyter<1>: False")
             return False
 
-        # Check if we're in a ZMQ-based shell (kernel)
-        if ipython.__class__.__name__ != 'ZMQInteractiveShell':
+        # Allow Colab's 'Shell' class in addition to standard 'ZMQInteractiveShell'
+        shell_class = ipython.__class__.__name__
+        is_colab = 'google.colab' in sys.modules
+
+        # Check if we're in a ZMQ-based shell (kernel) or Colab's 'Shell'
+        if shell_class not in ['ZMQInteractiveShell', 'Shell'] and not is_colab:
             logger.debug(f"\tis_interactive_jupyter<2>: False")
             return False
 
-        # Check for active frontend connection
+        # If we are in Colab, the existence of the shell itself implies
+        # an interactive frontend, as Colab sessions are inherently interactive.
+        if is_colab:
+            return True
+
+        # Check for active frontend connection (Standard Jupyter/Legacy)
         if hasattr(ipython, 'kernel') and ipython.kernel is not None:
             kernel = ipython.kernel
 
@@ -51,14 +72,15 @@ def is_interactive_jupyter( ) -> bool:
                 # For newer Jupyter versions, check connection count
                 if hasattr(kernel, 'connection_count'):
                     logger.debug(f"\tis_interactive_jupyter<3>: {kernel.connection_count > 0}")
-                    return kernel.connection_count > 0
+                    if kernel.connection_count > 0:
+                        return True
 
                 # 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
                     logger.debug(f"\tis_interactive_jupyter<4>: {not socket_state}")
-                    return not socket_state
+                    if not kernel.shell_socket.closed:
+                        return True
                 except AttributeError:
                     pass
 
@@ -68,7 +90,8 @@ def is_interactive_jupyter( ) -> bool:
                     parent = kernel.get_parent()
                     # If there's a parent message, we're likely in interactive mode
                     logger.debug(f"\tis_interactive_jupyter<5>: {parent is not None and len(parent) > 0}")
-                    return parent is not None and len(parent) > 0
+                    if parent is not None and len(parent) > 0:
+                        return True
                 except Exception:
                     pass
 
@@ -77,12 +100,12 @@ def is_interactive_jupyter( ) -> bool:
                 logger.debug(f"\tis_interactive_jupyter<6>: True")
                 return True
 
-        # Fallback: Check for common Jupyter notebook environment indicators
-        # This catches cases where kernel introspection doesn't work
-        import os
+        # Fallback: Check for environment indicators (Legacy/Containerized Jupyter)
         jupyter_indicators = [
-            'JPY_PARENT_PID',  # JupyterLab/Notebook sets this
+            'JPY_PARENT_PID',       # JupyterLab/Notebook sets this
             'JUPYTER_RUNTIME_DIR',
+            'COLAB_RELEASE_DEVICE', # Additional Colab-specific env check
+            'COLAB_GPU'             # Additional Colab-specific env check
         ]
 
         for indicator in jupyter_indicators:
@@ -99,6 +122,6 @@ def is_interactive_jupyter( ) -> bool:
         logger.debug(f"\tis_interactive_jupyter<8>: False")
         return False
 
-    except ImportError:
+    except (ImportError, Exception):
         logger.debug(f"\tis_interactive_jupyter<9>: False")
         return False

{cubevis-1.0.21.dist-info → cubevis-1.0.26.dist-info}/METADATA

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

{cubevis-1.0.21.dist-info → cubevis-1.0.26.dist-info}/RECORD

@@ -34,7 +34,7 @@ cubevis/__js__/bokeh-3.6/cubevisjs.min.js,sha256=bZ8IjciHZwcUMrrc_6a3n965WlPCMeQ
 cubevis/__js__/bokeh-3.7/cubevisjs.min.js,sha256=bZ8IjciHZwcUMrrc_6a3n965WlPCMeQedZjb4-0Ln34,42526
 cubevis/__js__/bokeh-3.8/cubevisjs.min.js,sha256=bZ8IjciHZwcUMrrc_6a3n965WlPCMeQedZjb4-0Ln34,42526
 cubevis/__js__/casalib.min.js,sha256=J9Uvlat_Vf6cjcvftOG5COk3YH6A371MJ7s5u_ZS2_4,91133
-cubevis/bokeh/__init__.py,sha256=b2Vgszi7sQPFyu2b4fnQzVXk5uX4B9vb59CilQpP31I,1835
+cubevis/bokeh/__init__.py,sha256=dDIV8jBZji-bD8TQQKBMaF5UuabaJ5NICWn6g_QHxvs,1885
 cubevis/bokeh/annotations/__init__.py,sha256=tjDIPKbg-rh7Iu3coFWvmX-j2yNj9KuKmRp1aTo71ww,50
 cubevis/bokeh/annotations/_ev_poly_annotation.py,sha256=RzP4E1_rII9z37uHX2nUnXhzfPSvw0noYpcjE7M0YCk,208
 cubevis/bokeh/components/__init__.py,sha256=BQOqgBtlDpu6ENrY42nYeS73n2ZSMogJgM2LtJibfVM,1314
@@ -46,7 +46,7 @@ cubevis/bokeh/models/_bokeh_app_context.py,sha256=iHCFAJzFinX8I6ty3Vdw6w0Za-5qpo
 cubevis/bokeh/models/_edit_span.py,sha256=7o59ZS0bF_Q_WtstvViWXP-2PiY_F7_zCecTqKcmz0E,196
 cubevis/bokeh/models/_ev_text_input.py,sha256=SGtefXkWK6jHEk4EneZ_hEUGwoIWwVGjwqLjGsAXMpY,158
 cubevis/bokeh/models/_shared_dict.py,sha256=AWjLMOKVAXWHSF4gcK2RbxF442QlzQ7hMR0oaODCqB0,901
-cubevis/bokeh/models/_showable.py,sha256=-X63iKaQgAI37cTB_23dvBgVPUrAq9KfLiKcxB-KCXo,15723
+cubevis/bokeh/models/_showable.py,sha256=uzLf8hhITweJnBB5Sm-XjLb1H-RGYfrSSuWVI1UekUc,18474
 cubevis/bokeh/models/_tip.py,sha256=yNoUWods0xxva1WOfh5It_Y8hbpVy8RVXUmm8p7a58M,1431
 cubevis/bokeh/models/_tip_button.py,sha256=mwk1C7BMVlZrAAyQLn45S4Q9GEQfU_wU2MWpO0Gwzj4,1610
 cubevis/bokeh/sources/__init__.py,sha256=4FsudFuVU4o7VG5OG3K1tiMoxIXcJWNz_K9yzMDE8ls,1581
@@ -57,7 +57,7 @@ cubevis/bokeh/sources/_spectra_data_source.py,sha256=qL1IOjSefWlycaqS4Pz5EHwg-1E
 cubevis/bokeh/sources/_updatable_data_source.py,sha256=Kib2DPPIA0abqOywzdme98GxI8KBukszbSC5K65wxv0,10961
 cubevis/bokeh/state/__init__.py,sha256=PZ2-7I5XHkMTc-vguYarYCYSJ1pKyEYnSAFa-n8AuTE,1826
 cubevis/bokeh/state/_current.py,sha256=owPMQTme5SBYvIVP3Q4y9hpWHPmyhLHsS2O0sCAAqqo,967
-cubevis/bokeh/state/_initialize.py,sha256=rdIP8wMHd3RtvnVNKbfpkybUl5ZLKqSyxUiOhq7a7Ss,12483
+cubevis/bokeh/state/_initialize.py,sha256=eX06VU1KyTEyoFiAdPBA_XucCKFEgNImv1qVXfXaIkE,12881
 cubevis/bokeh/state/_javascript.py,sha256=0n-kVFOpmo11fuOhASh71JAttwOzm9T2vm8KC5m6h1Y,5390
 cubevis/bokeh/state/_palette.py,sha256=lPLgpKvc23mpNcaVu5nBAGdA_WBUK1HcxFJLu3CTvtg,2463
 cubevis/bokeh/state/_session.py,sha256=5TK6pyQOUPZNwnyjd_XmkqE_qPNkQyXIKjpFsliBvgk,1761
@@ -106,13 +106,13 @@ cubevis/remote/_local.py,sha256=PcPCFcwttTFZd3O33-5pqDuGKQKK6CA0gz1MTIkTiNI,1032
 cubevis/remote/_remote_kernel.py,sha256=wfu7ZzKn-oCxZxzDIkC5puBvGf8WbCLYL3CzM56_FNc,2652
 cubevis/toolbox/__init__.py,sha256=sEN80BX91q_Z2zImDlT8oZ-0o8sE-iH7n3i4S1lmRLo,1450
 cubevis/toolbox/_app_context.py,sha256=rkjddiE4Ynf2HeyI0Hf8DOUt89bF67-2IlgD1uKSdOI,2908
-cubevis/toolbox/_cube.py,sha256=yNVeRFU3ZIM3FeOG4gsy2l6u7gnyqnFlQ6GzQ1fqIg4,308223
+cubevis/toolbox/_cube.py,sha256=ZqprhC7Ps9hGGcd3BLK3zp5wySy2QhnqyAXBkeMxtzY,308257
 cubevis/toolbox/_interactive_clean_ui.mustache,sha256=IVTcqkxIyw7SzfU92_70dG7bF9UapromDdmeukQ90cg,114113
 cubevis/toolbox/_interactive_clean_ui.py,sha256=98KnLZnDXqO5xl7Ie7WpirogtKL0a5myHejsC89CVSU,114024
 cubevis/toolbox/_interactiveclean_wrappers.py,sha256=XqyCGz33CMDhszTxnwZ_3-64GszUK1XYnGKUOxl9sas,5071
 cubevis/toolbox/_region_list.py,sha256=_1RvnXwqMoaAq8CPy-6IyhabLi_snXqO566onehI2y0,8957
 cubevis/utils/_ResourceManager.py,sha256=SaaR29etabRiKxmUK-aWvAm4v_OPFJH8CX7bNFm0Lgo,3410
-cubevis/utils/__init__.py,sha256=6u9bbkK_KY98qa6VJOGzjz0mwtKblbK63pxZ34OJ4mg,28048
+cubevis/utils/__init__.py,sha256=Xd5GYSBw_hsONqJaXIwi1TZ0hJQ8WsjwWX6Q9V8S4AU,28058
 cubevis/utils/_browser.py,sha256=rmJ8_wq6XqhXZmVdmWI4t736qB-zd7ZbzfjVdVz40eY,261
 cubevis/utils/_contextmgrchain.py,sha256=r5SrCBdgQIVH7zXKOmq5oWhDUSeHaZpgsIfWFHvb3cQ,2859
 cubevis/utils/_conversion.py,sha256=SziCU8sOGtG7djlY766-MeOvnQgvT9C737FEfJ4aYsE,3262
@@ -120,15 +120,15 @@ cubevis/utils/_copydoc.py,sha256=SI9DOUoTNg9M-Y4J1oci2Ba1jebGHsx_pFX24RSNg3o,191
 cubevis/utils/_docenum.py,sha256=D79BvxwW18DPUlIhBx5DnpZh76pDURC1Hqt1DfS7kG0,877
 cubevis/utils/_git.py,sha256=fLrwN40zm6fv3SKz3MSwj-wtUa9AslpwPPIYJNLzXik,1120
 cubevis/utils/_import_protected_module.py,sha256=AIISHPdiSzwgVzLXqHSWSHT-L7lcMWbYrsMlGlTFafE,1482
-cubevis/utils/_jupyter.py,sha256=37aNCGO52sOyklBQAR5eaAHkv-5NpmzCXPuTT7Euk0o,4214
+cubevis/utils/_jupyter.py,sha256=7itryScSkcej9ISvgItWaXhBRxCSaZagQYPvWYX_VAg,5256
 cubevis/utils/_logging.py,sha256=HqyoTib7QSuAUbzicPVMdhFtxWKo-Dv4GgD0AYDDXIY,2348
 cubevis/utils/_mutual_exclusion.py,sha256=fkVsHPrFfeXdLSoZGw49ObxsTfwAeeJQTAcOCM2LvC8,3879
 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=V8mcjgjAaALTQgu46QC6JsqtVhIuwUw8ouH3h3lkBi8,22
-cubevis-1.0.21.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-cubevis-1.0.21.dist-info/METADATA,sha256=CocE5gz6awIhYzmwtQys8x8sn1qM4Wg05D_fAuHELJQ,2632
-cubevis-1.0.21.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-cubevis-1.0.21.dist-info/RECORD,,
+cubevis/__version__.py,sha256=ipKUrUZQTYULPss2w4_lq_zOzzw-qCGgjOtgkLfSDAM,22
+cubevis-1.0.26.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+cubevis-1.0.26.dist-info/METADATA,sha256=M-Nz1skw2jnDx84DLs5rY_tjgQdJHiZuJrNW3xmV9d0,2632
+cubevis-1.0.26.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+cubevis-1.0.26.dist-info/RECORD,,