escobar 0.1.72__py3-none-any.whl → 0.1.74__py3-none-any.whl

escobar/_version.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = VERSION = '0.1.72'
+__version__ = VERSION = '0.1.74'

escobar/handlers.py

@@ -6,6 +6,7 @@ import websockets
 import ssl
 import logging
 import time
+from urllib.parse import urlparse, urlunparse
 from jupyter_server.base.handlers import JupyterHandler
 from jupyter_server.utils import url_path_join
 import tornado
@@ -153,6 +154,32 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
     WebSocket proxy handler that forwards connections from /ws to target server
     """
     
+    def _resolve_target_url_for_docker(self, url):
+        """
+        Resolve target URL for Docker environment.
+        Replace localhost/127.0.0.1 with Docker host IP when running in container.
+        """
+        if not os.path.exists('/.dockerenv'):
+            print(f"[ESCOBAR-WS] Not in Docker container, using original URL: {url}")
+            return url  # Not in Docker, return original URL
+        
+        # Parse the URL to extract components
+        parsed = urlparse(url)
+        
+        # Check if hostname is localhost or 127.0.0.1
+        if parsed.hostname in ['localhost', '127.0.0.1']:
+            # Replace with Docker host IP
+            new_netloc = parsed.netloc.replace(parsed.hostname, '172.17.0.1')
+            new_parsed = parsed._replace(netloc=new_netloc)
+            new_url = urlunparse(new_parsed)
+            
+            print(f"[ESCOBAR-WS] Docker hostname resolution: {url} → {new_url}")
+            return new_url
+        else:
+            print(f"[ESCOBAR-WS] Docker container detected, but hostname '{parsed.hostname}' is not localhost/127.0.0.1, keeping original: {url}")
+        
+        return url
+    
     def __init__(self, *args, **kwargs):
         print(f"[ESCOBAR-WS] WebSocketProxyHandler.__init__ called")
         super().__init__(*args, **kwargs)
@@ -167,8 +194,12 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
             print(f"[ESCOBAR-WS] Could not get hostname")
         
         # Read target URL from environment variable
-        self.target_url = os.getenv('WEBSOCKET_PROXY_TARGET', 'ws://localhost:8777/ws')
-        print(f"[ESCOBAR-WS] Target URL will be: {self.target_url}")
+        raw_target_url = os.getenv('WEBSOCKET_PROXY_TARGET', 'ws://localhost:8777/ws')
+        print(f"[ESCOBAR-WS] Raw target URL from environment: {raw_target_url}")
+        
+        # Apply Docker hostname resolution
+        self.target_url = self._resolve_target_url_for_docker(raw_target_url)
+        print(f"[ESCOBAR-WS] Resolved target URL: {self.target_url}")
         
         # Debug all WebSocket-related environment variables
         websocket_env_vars = [(k, v) for k, v in os.environ.items() if 'WEBSOCKET' in k.upper()]
@@ -255,7 +286,7 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
             print(f"[ESCOBAR-WS] === END CONNECTION FAILED ===")
             
             logging.error(f"Failed to connect to target websocket {self.target_url}: {str(e)}")
-            self.close(code=1011, reason="Failed to connect to target server")
+            self.close(code=1011, reason=f"Failed to connect to target server: {self.target_url}")
     
     async def on_message(self, message):
         """Called when a message is received from the client"""

escobar/labextension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escobar",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "description": "AI CHAT EXTENSION",
   "keywords": [
     "jupyter",
@@ -123,7 +123,7 @@
     "outputDir": "escobar/labextension",
     "schemaDir": "schema",
     "_build": {
-      "load": "static/remoteEntry.80aa6ea7f9c9223ec4b3.js",
+      "load": "static/remoteEntry.ffdf5783302f3ef7c627.js",
       "extension": "./extension",
       "style": "./style"
     }

escobar/labextension/schemas/escobar/package.json.orig

@@ -1,6 +1,6 @@
 {
   "name": "escobar",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "description": "AI CHAT EXTENSION",
   "keywords": [
     "jupyter",