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

cubevis/__version__.py

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

cubevis/bokeh/sources/transport/__init__.py

@@ -1,56 +1,91 @@
+from cubevis.utils import is_colab
 import websockets
 import http
-from websockets.http import Headers
+from websockets.http11 import Response # Available in newer versions
 
 log_path = "/content/package_debug.txt"
 
-class ColabWebSocketServerProtocol(websockets.WebSocketServerProtocol):
-    async def process_request(self, path, request_headers):
-        is_upgrade = "upgrade" in request_headers.get("Connection", "").lower()
+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)
+
+    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
 
-        # Get the request method
-        request_method = self.request_method
-        with open(log_file_path, "w") as f:
-            print(f"Handling request method: {request_method}", file=f)
+        with open(log_path, "a") as f:
+            print(f"ColabWebSocketServerProtocol.process_request: request_header={request_header} request_method={request_method}", file=f)
+
+        # Logic for CORS/OPTIONS remains similar, but response format differs
+        is_upgrade = "upgrade" in request_headers.get("Connection", "").lower()
 
         if not is_upgrade:
-            response_headers = Headers()
             origin = request_headers.get("Origin")
-
+            headers = {"Content-Type": "text/plain", "Connection": "close"}
             if origin:
-                response_headers["Access-Control-Allow-Origin"] = origin
-                response_headers["Access-Control-Allow-Credentials"] = "true"
-                # Add necessary headers for the OPTIONS preflight response
-                response_headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-                response_headers["Access-Control-Allow-Headers"] = "Content-Type, Authorization"
+                headers.update({
+                    "Access-Control-Allow-Origin": origin,
+                    "Access-Control-Allow-Credentials": "true",
+                })
 
-            response_headers["Content-Type"] = "text/plain"
-            response_headers["Connection"] = "close"
-
-            # If it is an OPTIONS request, return 204 No Content immediately
             if request_method == "OPTIONS":
-                return http.HTTPStatus.NO_CONTENT, response_headers, b"" # 204 Status and empty body
-
-            # If it is a GET request (the priming fetch), return 200 OK
+                return self._format_response(http.HTTPStatus.NO_CONTENT, headers, b"")
             if request_method == "GET":
-                 return http.HTTPStatus.OK, response_headers, b"OK"
+                return self._format_response(http.HTTPStatus.OK, headers, b"OK")
 
-        # Proceed with standard WS handshake
         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)
+
 def create_ws_server(callback, ip_address, port):
     """
-    Uniform wrapper for creating a WebSocket server.
+    Uniform wrapper for creating a WebSocket server supporting all versions.
     """
-    if is_colab( ):
-        with open(log_file_path, "w") as f:
-            print( f'''websocket startup: {ip_address}/{port} (bind IP 0.0.0.0)
-with websockets.serve( callback, "0.0.0.0", {port}, origins=None, create_protocol={ColabWebSocketServerProtocol} )"''' , file=f)
-        return websockets.serve( callback,
-                                 "0.0.0.0",
-                                 port,
-                                 origins=None,
-                                 create_protocol=ColabWebSocketServerProtocol # This bypasses the strict check
-                                )
+    # 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,
+        "port": port,
+        "origins": None
+    }
+
+    # Inject the custom protocol class using the correct version-specific key
+    if IS_LEGACY:
+        kwargs["create_protocol"] = ColabWebSocketServerProtocol
     else:
-        return websockets.serve( callback, ip_address, port )
+        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")
+
+    # Use **kwargs to bypass signature differences between library versions
+    return websockets.serve(**kwargs)

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

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

{cubevis-1.0.52.dist-info → cubevis-1.0.56.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=XqzCpN6zvwQGOE_Y7MvLIiZMElxZnxa3__ifhr5oE5I,2431
+cubevis/bokeh/sources/transport/__init__.py,sha256=uUGjgekjD5zpV4R3YiNO0q-txZb4OTjIaxL9vcq-XKE,3617
 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=vkQb1ceaEbldzWt1_XgBPzjkDQeeVWFlJPshnx5v1OQ,22
-cubevis-1.0.52.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-cubevis-1.0.52.dist-info/METADATA,sha256=1EOdvakK1r99OsUebAMHRGuv_oLdT_eXf7gIri0RQKY,2632
-cubevis-1.0.52.dist-info/licenses/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-cubevis-1.0.52.dist-info/RECORD,,
+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,,