cubevis 1.0.56__py3-none-any.whl → 1.0.57__py3-none-any.whl

cubevis/__version__.py

@@ -1 +1 @@
-__version__ = '1.0.56'
+__version__ = '1.0.57'

cubevis/bokeh/sources/transport/__init__.py

@@ -1,91 +1,80 @@
 from cubevis.utils import is_colab
 import websockets
 import http
-from websockets.http11 import Response # Available in newer versions
+import asyncio
+try:
+    from websockets.http11 import Response
+except ImportError:
+    Response = None # Fallback for very old versions
 
 log_path = "/content/package_debug.txt"
 
 try:
-    # Modern implementation (v14+)
     from websockets.server import ServerConnection as BaseConnection
     IS_LEGACY = False
 except ImportError:
-    # Legacy implementation (<v14)
     from websockets.server import WebSocketServerProtocol as BaseConnection
     IS_LEGACY = True
 
-class ColabWebSocketServerProtocol(BaseConnection):
-    def __init__(self, *args, **kwargs):
-        with open(log_path, "a") as f:
-            print(f"ColabWebSocketServerProtocol.__init__ Initializing Protocol with args={args} kwargs={kwargs}", file=f)
-        super().__init__(*args, **kwargs)
+def universal_process_request(*args):
+    """
+    Handles CORS priming.
+    Legacy signature: (path, request_headers)
+    Modern signature: (request)
+    """
+    if IS_LEGACY:
+        # Legacy passes: (path, headers)
+        path, headers = args[0], args[1]
+        method = "GET"
+    else:
+        request = args[0]
+        path, headers, method = request.path, request.headers, request.method
 
-    async def process_request(self, *args):
-        """Handle both old (path, headers) and new (request) signatures."""
-        if IS_LEGACY:
-            path, request_headers = args
-            request_method = getattr(self, "request_method", "GET")
-        else:
-            # Modern version passes (request) as the only arg
-            request = args[0]
-            path = request.path
-            request_headers = request.headers
-            request_method = request.method
+    with open(log_path, "a") as f:
+        f.write(f"Top-level process_request: {method} {path}\n")
 
-        with open(log_path, "a") as f:
-            print(f"ColabWebSocketServerProtocol.process_request: request_header={request_header} request_method={request_method}", file=f)
+    is_upgrade = "upgrade" in headers.get("Connection", "").lower()
 
-        # Logic for CORS/OPTIONS remains similar, but response format differs
-        is_upgrade = "upgrade" in request_headers.get("Connection", "").lower()
+    if not is_upgrade:
+        origin = headers.get("Origin", "*")
+        resp_headers = {
+            "Content-Type": "text/plain",
+            "Connection": "close",
+            "Access-Control-Allow-Origin": origin,
+            "Access-Control-Allow-Credentials": "true",
+            "Access-Control-Allow-Methods": "GET, OPTIONS, POST",
+            "Access-Control-Allow-Headers": "Content-Type, Authorization, X-Requested-With",
+        }
 
-        if not is_upgrade:
-            origin = request_headers.get("Origin")
-            headers = {"Content-Type": "text/plain", "Connection": "close"}
-            if origin:
-                headers.update({
-                    "Access-Control-Allow-Origin": origin,
-                    "Access-Control-Allow-Credentials": "true",
-                })
+        if method == "OPTIONS":
+            return (http.HTTPStatus.NO_CONTENT, resp_headers, b"") if IS_LEGACY else Response(http.HTTPStatus.NO_CONTENT, "No Content", resp_headers)
 
-            if request_method == "OPTIONS":
-                return self._format_response(http.HTTPStatus.NO_CONTENT, headers, b"")
-            if request_method == "GET":
-                return self._format_response(http.HTTPStatus.OK, headers, b"OK")
+        if method == "GET":
+            return (http.HTTPStatus.OK, resp_headers, b"OK") if IS_LEGACY else Response(http.HTTPStatus.OK, "OK", resp_headers)
 
-        return None
+    return None
 
-    def _format_response(self, status, headers, body):
-        """Helper to return the correct type based on version."""
-        if IS_LEGACY:
-            # Legacy expects (status, headers, body)
-            return status, headers, body
-        else:
-            # Modern expects a Response object or self.respond call
-            return self.respond(status, body, headers)
+class ColabWebSocketServerProtocol(BaseConnection):
+    def __init__(self, *args, **kwargs):
+        with open(log_path, "a") as f:
+            f.write(f"ColabWebSocketServerProtocol.__init__ constructed\n")
+        super().__init__(*args, **kwargs)
 
 def create_ws_server(callback, ip_address, port):
-    """
-    Uniform wrapper for creating a WebSocket server supporting all versions.
-    """
-    # Prepare base arguments
-    kwargs = {
-        "ws_handler": callback, # In newer versions 'callback' is the first positional or 'ws_handler'
-        "host": "0.0.0.0" if is_colab() else ip_address,
+    host = "0.0.0.0" if is_colab() else ip_address
+
+    # Pass everything. websockets.serve ignores unknown kwargs.
+    conf = {
+        "host": host,
         "port": port,
-        "origins": None
+        "origins": None,
+        "process_request": universal_process_request,
+        "create_connection": ColabWebSocketServerProtocol,
+        "create_protocol": ColabWebSocketServerProtocol
     }
 
-    # Inject the custom protocol class using the correct version-specific key
-    if IS_LEGACY:
-        kwargs["create_protocol"] = ColabWebSocketServerProtocol
-    else:
-        kwargs["create_connection"] = ColabWebSocketServerProtocol
-
     if is_colab():
         with open(log_path, "a") as f:
-            f.write(f"Websocket startup: {kwargs['host']}:{port}\n")
-            f.write(f"Using class: {ColabWebSocketServerProtocol.__name__}\n")
-            f.write(f"Version mode: {'Legacy' if IS_LEGACY else 'Modern'}\n")
+            f.write(f"Websocket startup: {host}:{port} | Mode: {'Legacy' if IS_LEGACY else 'Modern'}\n")
 
-    # Use **kwargs to bypass signature differences between library versions
-    return websockets.serve(**kwargs)
+    return websockets.serve(callback, **conf)

{cubevis-1.0.56.dist-info → cubevis-1.0.57.dist-info}/METADATA

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

{cubevis-1.0.56.dist-info → cubevis-1.0.57.dist-info}/RECORD

@@ -55,7 +55,7 @@ cubevis/bokeh/sources/_image_data_source.py,sha256=5sEWdfqoMk08HQ0JWg6bHJ34dWmph
 cubevis/bokeh/sources/_image_pipe.py,sha256=pQ05VynLuJbedGja7aXDbVXFkOYbdMceOuOEj-QuluQ,28692
 cubevis/bokeh/sources/_spectra_data_source.py,sha256=qL1IOjSefWlycaqS4Pz5EHwg-1EwCVmNwxysP9lxDeM,2451
 cubevis/bokeh/sources/_updatable_data_source.py,sha256=mjV1u3ZpRE5KCHtZA4tV1JxMf09Ifh4elSWlf6jNXQo,10985
-cubevis/bokeh/sources/transport/__init__.py,sha256=uUGjgekjD5zpV4R3YiNO0q-txZb4OTjIaxL9vcq-XKE,3617
+cubevis/bokeh/sources/transport/__init__.py,sha256=3GndkyA6IjBpzmyTdWcv57wjIhaWbwdw4S7YRCmPf_g,2711
 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=eX06VU1KyTEyoFiAdPBA_XucCKFEgNImv1qVXfXaIkE,12881
@@ -128,8 +128,8 @@ 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=lqlVQQ_gocyEuutkglCnPPwmDKRFeMb8iiOua0uSROg,22
-cubevis-1.0.56.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-cubevis-1.0.56.dist-info/METADATA,sha256=XSNwuSVQWfJiNvGq-XeMzZcaAyr84PRQOC0sIBCGRtY,2632
-cubevis-1.0.56.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-cubevis-1.0.56.dist-info/RECORD,,
+cubevis/__version__.py,sha256=EUC4hHKVVCOux1CoHox94dqZjOBLxEP5FyomwB3-pmo,22
+cubevis-1.0.57.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+cubevis-1.0.57.dist-info/METADATA,sha256=p1UD-wQzS8TN3K6wX6jc-oQIDVPJI4TMy5tclx16IrE,2632
+cubevis-1.0.57.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+cubevis-1.0.57.dist-info/RECORD,,