escobar 0.1.74__py3-none-any.whl → 0.1.76__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.74'
+__version__ = VERSION = '0.1.76'

escobar/handlers.py

@@ -159,12 +159,41 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
         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'):
+        # Enhanced Docker detection with multiple methods
+        docker_indicators = []
+        
+        # Method 1: Check for /.dockerenv file
+        dockerenv_exists = os.path.exists('/.dockerenv')
+        docker_indicators.append(f"/.dockerenv exists: {dockerenv_exists}")
+        
+        # Method 2: Check environment variable
+        docker_env = os.getenv('DOCKER_CONTAINER') == 'true'
+        docker_indicators.append(f"DOCKER_CONTAINER env: {docker_env}")
+        
+        # Method 3: Check /proc/1/cgroup for docker
+        cgroup_docker = False
+        try:
+            if os.path.exists('/proc/1/cgroup'):
+                with open('/proc/1/cgroup', 'r') as f:
+                    cgroup_content = f.read()
+                    cgroup_docker = 'docker' in cgroup_content or 'containerd' in cgroup_content
+                docker_indicators.append(f"/proc/1/cgroup contains docker/containerd: {cgroup_docker}")
+        except Exception as e:
+            docker_indicators.append(f"/proc/1/cgroup check failed: {e}")
+        
+        # Determine if we're in Docker
+        is_docker = dockerenv_exists or docker_env or cgroup_docker
+        
+        print(f"[ESCOBAR-WS] Docker detection indicators: {docker_indicators}")
+        print(f"[ESCOBAR-WS] Final Docker detection result: {is_docker}")
+        
+        if not is_docker:
             print(f"[ESCOBAR-WS] Not in Docker container, using original URL: {url}")
-            return url  # Not in Docker, return original URL
+            return url
         
         # Parse the URL to extract components
         parsed = urlparse(url)
+        print(f"[ESCOBAR-WS] Parsed URL - hostname: '{parsed.hostname}', netloc: '{parsed.netloc}'")
         
         # Check if hostname is localhost or 127.0.0.1
         if parsed.hostname in ['localhost', '127.0.0.1']:
@@ -193,13 +222,10 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
         except:
             print(f"[ESCOBAR-WS] Could not get hostname")
         
-        # Read target URL from environment variable
-        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}")
+        # Store raw target URL from environment variable (resolve per-connection)
+        self.raw_target_url = os.getenv('WEBSOCKET_PROXY_TARGET', 'ws://localhost:8777/ws')
+        print(f"[ESCOBAR-WS] Raw target URL stored: {self.raw_target_url}")
+        print(f"[ESCOBAR-WS] Docker resolution will be applied per-connection")
         
         # Debug all WebSocket-related environment variables
         websocket_env_vars = [(k, v) for k, v in os.environ.items() if 'WEBSOCKET' in k.upper()]
@@ -215,11 +241,15 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
         """Called when websocket connection is opened"""
         start_time = time.time()
         
+        # Apply Docker hostname resolution for this connection
+        target_url = self._resolve_target_url_for_docker(self.raw_target_url)
+        
         # Log which endpoint was accessed and path normalization
         request_path = self.request.path
         print(f"[ESCOBAR-WS] === CLIENT CONNECTION OPENED ===")
         print(f"[ESCOBAR-WS] Client connected via: {request_path}")
-        print(f"[ESCOBAR-WS] Target remains: {self.target_url}")
+        print(f"[ESCOBAR-WS] Raw target URL: {self.raw_target_url}")
+        print(f"[ESCOBAR-WS] Resolved target URL for this connection: {target_url}")
         if request_path != "/ws":
             print(f"[ESCOBAR-WS] Path normalization: {request_path} → /ws")
         
@@ -227,9 +257,9 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
         print(f"[ESCOBAR-WS] Client origin: {self.request.headers.get('Origin', 'NO_ORIGIN')}")
         print(f"[ESCOBAR-WS] Client remote IP: {self.request.remote_ip}")
         print(f"[ESCOBAR-WS] Request headers: {dict(self.request.headers)}")
-        print(f"[ESCOBAR-WS] Attempting to connect to target: {self.target_url}")
+        print(f"[ESCOBAR-WS] Attempting to connect to target: {target_url}")
         
-        logging.info(f"WebSocket connection opened, proxying to {self.target_url}")
+        logging.info(f"WebSocket connection opened, proxying to {target_url}")
         
         try:
             # Establish connection to target websocket server
@@ -247,15 +277,15 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
             print(f"[ESCOBAR-WS] Headers to forward: {headers}")
             
             # Determine if we need SSL based on URL scheme
-            use_ssl = self.target_url.startswith('wss://')
+            use_ssl = target_url.startswith('wss://')
             ssl_context = ssl.create_default_context() if use_ssl else None
             print(f"[ESCOBAR-WS] Using SSL: {use_ssl}")
             
-            print(f"[ESCOBAR-WS] Attempting websockets.connect() to {self.target_url}")
+            print(f"[ESCOBAR-WS] Attempting websockets.connect() to {target_url}")
             
             # Connect to target websocket (works with both ws:// and wss://)
             self.target_ws = await websockets.connect(
-                self.target_url,
+                target_url,
                 additional_headers=headers,
                 ssl=ssl_context,
                 ping_interval=20,
@@ -270,7 +300,7 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
             asyncio.create_task(self._forward_from_target())
             
             print(f"[ESCOBAR-WS] === CONNECTION SETUP COMPLETE ===")
-            logging.info(f"Successfully connected to target websocket server: {self.target_url}")
+            logging.info(f"Successfully connected to target websocket server: {target_url}")
             
         except Exception as e:
             end_time = time.time()
@@ -278,15 +308,15 @@ class WebSocketProxyHandler(tornado.websocket.WebSocketHandler):
             print(f"[ESCOBAR-WS] Connection failed after {end_time - start_time:.2f} seconds")
             print(f"[ESCOBAR-WS] Error: {str(e)}")
             print(f"[ESCOBAR-WS] Error type: {type(e).__name__}")
-            print(f"[ESCOBAR-WS] Target URL: {self.target_url}")
+            print(f"[ESCOBAR-WS] Target URL: {target_url}")
             if hasattr(e, 'errno'):
                 print(f"[ESCOBAR-WS] Errno: {e.errno}")
             if hasattr(e, 'strerror'):
                 print(f"[ESCOBAR-WS] Strerror: {e.strerror}")
             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=f"Failed to connect to target server: {self.target_url}")
+            logging.error(f"Failed to connect to target websocket {target_url}: {str(e)}")
+            self.close(code=1011, reason=f"Failed to connect to target server: {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.74",
+  "version": "0.1.76",
   "description": "AI CHAT EXTENSION",
   "keywords": [
     "jupyter",
@@ -123,7 +123,7 @@
     "outputDir": "escobar/labextension",
     "schemaDir": "schema",
     "_build": {
-      "load": "static/remoteEntry.ffdf5783302f3ef7c627.js",
+      "load": "static/remoteEntry.1ddb124918df1bafad93.js",
       "extension": "./extension",
       "style": "./style"
     }

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

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