unitlab 2.3.29__tar.gz → 2.3.33__tar.gz

{unitlab-2.3.29/src/unitlab.egg-info → unitlab-2.3.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.3.29
+Version: 2.3.33
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai

{unitlab-2.3.29 → unitlab-2.3.33}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="unitlab",
-    version="2.3.29",
+    version="2.3.33",
     license="MIT",
     author="Unitlab Inc.",
     author_email="team@unitlab.ai",

{unitlab-2.3.29 → unitlab-2.3.33}/src/unitlab/client.py

@@ -286,21 +286,14 @@ class UnitlabClient:
             from .persistent_tunnel import PersistentTunnel
             logger.info("Using Persistent Tunnel with Cloudflare API")
             self.tunnel_manager = PersistentTunnel(device_id=self.device_id)
-            # URLs will be set after tunnel starts
-            self.jupyter_url = self.tunnel_manager.jupyter_url
-            self.ssh_url = self.jupyter_url
+            # Don't call run() here - it has infinite loop. Call start() in setup_tunnels()
+            self.jupyter_url = None
+            self.ssh_url = None
+            
         except ImportError as e:
             logger.warning(f"Could not import PersistentTunnel: {e}")
             # Fallback to easy tunnel
-            try:
-                from .easy_tunnel import EasyTunnelAdapter
-                logger.info("Using Easy Dynamic Tunnel (random URL)")
-                self.tunnel_manager = EasyTunnelAdapter(device_id=self.device_id)
-                self.jupyter_url = None
-                self.ssh_url = None
-            except ImportError:
-                logger.error("No tunnel implementation available!")
-                raise
+            
         
         # Setup signal handlers
         signal.signal(signal.SIGINT, self._handle_shutdown)
@@ -410,6 +403,10 @@ class UnitlabClient:
             if self.tunnel_manager.start():
                 # Store the processes for monitoring
                 self.jupyter_proc = self.tunnel_manager.jupyter_process
+                # Update URLs after tunnel starts successfully
+                self.jupyter_url = self.tunnel_manager.jupyter_url
+                self.ssh_url = self.tunnel_manager.jupyter_url
+                logger.info(f"Tunnel started successfully at {self.jupyter_url}")
                 self.tunnel_proc = self.tunnel_manager.tunnel_process
                 self.jupyter_port = "8888"  # Both use fixed port
                 

{unitlab-2.3.29 → unitlab-2.3.33}/src/unitlab/main.py

@@ -151,22 +151,11 @@ def run_agent(
         # Try environment variable first
         device_id = os.getenv('DEVICE_ID')
         if not device_id:
-            # Try to load saved device ID
-            device_id_file = Path.home() / '.unitlab' / 'device_id'
-            device_id_file.parent.mkdir(exist_ok=True, parents=True)
-            
-            if device_id_file.exists():
-                device_id = device_id_file.read_text().strip()
-                print(f"📌 Using saved device ID: {device_id}")
-            else:
-                # Generate a unique ID based on hostname and random UUID
-                hostname = platform.node().replace('.', '-').replace(' ', '-')[:20]
-                random_suffix = str(uuid.uuid4())[:8]
-                device_id = f"{hostname}-{random_suffix}"
-                
-                # Save for future runs
-                device_id_file.write_text(device_id)
-                print(f"📝 Generated and saved device ID: {device_id}")
+            # Always generate a unique device ID (no saving/reusing)
+            hostname = platform.node().replace('.', '-').replace(' ', '-')[:20]
+            random_suffix = str(uuid.uuid4())[:8]
+            device_id = f"{hostname}-{random_suffix}"
+            print(f"📝 Generated unique device ID: {device_id}")
           
     
     # Create client and initialize device agent

{unitlab-2.3.29 → unitlab-2.3.33}/src/unitlab/persistent_tunnel.py

@@ -67,9 +67,38 @@ class PersistentTunnel:
             "Content-Type": "application/json"
         }
     
-    def create_tunnel(self):
-        """Create a new tunnel via API"""
-        print("🔧 Creating tunnel: {}...".format(self.tunnel_name))
+    def get_or_create_tunnel(self):
+        """Get existing tunnel or create a new one"""
+        # First, check if tunnel already exists
+        print("🔍 Checking for existing tunnel: {}...".format(self.tunnel_name))
+        
+        list_url = "https://api.cloudflare.com/client/v4/accounts/{}/cfd_tunnel".format(self.cf_account_id)
+        headers = self._get_headers()
+        
+        # Check if tunnel exists
+        response = requests.get(list_url, headers=headers)
+        if response.status_code == 200:
+            tunnels = response.json().get("result", [])
+            for tunnel in tunnels:
+                if tunnel["name"] == self.tunnel_name:
+                    print("✅ Found existing tunnel: {}".format(tunnel["id"]))
+                    self.tunnel_id = tunnel["id"]
+                    
+                    # Tunnel exists, create a new one with unique name
+                    print("⚠️  Tunnel with this name already exists")
+                    import uuid
+                    unique_suffix = str(uuid.uuid4())[:8]
+                    self.tunnel_name = "agent-{}-{}".format(self.device_id, unique_suffix)
+                    print("🔄 Creating new tunnel with unique name: {}".format(self.tunnel_name))
+                    # Don't break, let it continue to create new tunnel
+                    return self.create_new_tunnel()
+        
+        # Create new tunnel
+        return self.create_new_tunnel()
+    
+    def create_new_tunnel(self):
+        """Create a brand new tunnel"""
+        print("🔧 Creating new tunnel: {}...".format(self.tunnel_name))
         
         # Generate random tunnel secret (32 bytes)
         import secrets
@@ -96,8 +125,8 @@ class PersistentTunnel:
                 "TunnelID": self.tunnel_id
             }
             
-            # Save credentials to file
-            cred_file = "/tmp/tunnel-{}.json".format(self.tunnel_id)
+            # Save credentials to file with tunnel name (not ID) for consistency
+            cred_file = "/tmp/tunnel-{}.json".format(self.tunnel_name)
             with open(cred_file, 'w') as f:
                 json.dump(self.tunnel_credentials, f)
             
@@ -143,19 +172,7 @@ class PersistentTunnel:
     
     def create_tunnel_config(self, cred_file):
         """Create tunnel config file"""
-        config = {
-            "ingress": [
-                {
-                    "hostname": "{}.{}".format(self.subdomain, self.domain),
-                    "service": "http://localhost:8888"
-                },
-                {
-                    "service": "http_status:404"
-                }
-            ]
-        }
-        
-        config_file = "/tmp/tunnel-config-{}.yml".format(self.tunnel_id)
+        config_file = "/tmp/tunnel-config-{}.yml".format(self.tunnel_name)
         with open(config_file, 'w') as f:
             f.write("tunnel: {}\n".format(self.tunnel_id))
             f.write("credentials-file: {}\n\n".format(cred_file))
@@ -167,25 +184,75 @@ class PersistentTunnel:
         return config_file
     
     def get_cloudflared_path(self):
-        """Get or download cloudflared"""
+        """Get or download cloudflared for any platform"""
         import shutil
+        import platform
+        
+        # Check if already in system PATH
         if shutil.which("cloudflared"):
             return "cloudflared"
         
-        local_bin = os.path.expanduser("~/.local/bin/cloudflared")
+        # Determine binary location based on OS
+        system = platform.system().lower()
+        machine = platform.machine().lower()
+        
+        if system == "windows":
+            local_bin = os.path.expanduser("~/cloudflared/cloudflared.exe")
+        else:
+            local_bin = os.path.expanduser("~/.local/bin/cloudflared")
+        
+        # Check if already downloaded
         if os.path.exists(local_bin):
             return local_bin
         
-        # Download
-        print("📦 Downloading cloudflared...")
-        import platform
-        system = platform.system().lower()
-        arch = "amd64" if "x86" in platform.machine() else "arm64"
-        url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-{}".format(arch)
+        # Download based on platform
+        print("📦 Downloading cloudflared for {}...".format(system))
+        
+        if system == "linux":
+            # Linux: detect architecture
+            if "arm" in machine or "aarch64" in machine:
+                arch = "arm64"
+            elif "386" in machine or "i686" in machine:
+                arch = "386"
+            else:
+                arch = "amd64"
+            url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-{}".format(arch)
+            
+            os.makedirs(os.path.dirname(local_bin), exist_ok=True)
+            subprocess.run("curl -L {} -o {}".format(url, local_bin), shell=True, capture_output=True)
+            subprocess.run("chmod +x {}".format(local_bin), shell=True)
+            
+        elif system == "darwin":
+            # macOS: supports both Intel and Apple Silicon
+            if "arm" in machine:
+                url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-darwin-arm64.tgz"
+            else:
+                url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-darwin-amd64.tgz"
+            
+            os.makedirs(os.path.dirname(local_bin), exist_ok=True)
+            # Download and extract tar.gz
+            subprocess.run("curl -L {} | tar xz -C {}".format(url, os.path.dirname(local_bin)), shell=True, capture_output=True)
+            subprocess.run("chmod +x {}".format(local_bin), shell=True)
+            
+        elif system == "windows":
+            # Windows: typically amd64
+            if "arm" in machine:
+                arch = "arm64"
+            elif "386" in machine:
+                arch = "386"
+            else:
+                arch = "amd64"
+            url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-{}.exe".format(arch)
+            
+            os.makedirs(os.path.dirname(local_bin), exist_ok=True)
+            # Use PowerShell on Windows to download
+            subprocess.run("powershell -Command \"Invoke-WebRequest -Uri {} -OutFile {}\"".format(url, local_bin), shell=True, capture_output=True)
+        
+        else:
+            print("❌ Unsupported platform: {}".format(system))
+            raise Exception("Platform {} not supported".format(system))
         
-        os.makedirs(os.path.dirname(local_bin), exist_ok=True)
-        subprocess.run("curl -L {} -o {}".format(url, local_bin), shell=True, capture_output=True)
-        subprocess.run("chmod +x {}".format(local_bin), shell=True)
+        print("✅ cloudflared downloaded successfully")
         return local_bin
     
     def start_jupyter(self):
@@ -198,7 +265,10 @@ class PersistentTunnel:
             "--no-browser",
             "--ip", "0.0.0.0",
             "--NotebookApp.token=''",
-            "--NotebookApp.password=''"
+            "--NotebookApp.password=''",
+            "--NotebookApp.allow_origin='*'"
+
+            
         ]
         
         self.jupyter_process = subprocess.Popen(
@@ -241,8 +311,8 @@ class PersistentTunnel:
             
             # API credentials are hardcoded, so we're ready to go
             
-            # 1. Create tunnel via API
-            cred_file = self.create_tunnel()
+            # 1. Get existing or create new tunnel via API
+            cred_file = self.get_or_create_tunnel()
             if not cred_file:
                 print("⚠️  Falling back to quick tunnel")
                 return self.start_quick_tunnel()
@@ -316,7 +386,7 @@ class PersistentTunnel:
                 )
                 requests.delete(url, headers=self._get_headers())
                 print("🗑️  Tunnel deleted")
-            except Exception as e:
+            except Exception:
                 pass  # Ignore cleanup errors
     
     def run(self):

{unitlab-2.3.29 → unitlab-2.3.33/src/unitlab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.3.29
+Version: 2.3.33
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai