unitlab 2.3.13__py3-none-any.whl → 2.3.15__py3-none-any.whl

unitlab/cloudflare_api_tunnel.py

@@ -64,6 +64,7 @@ class CloudflareAPITunnel:
         
         self.tunnel_process = None
         self.created_dns_records = []
+        self.tunnel_config_file = None
         
         # Try to initialize binary manager, but don't fail if it doesn't work
         try:
@@ -252,6 +253,13 @@ class CloudflareAPITunnel:
                 else:
                     print(f"❌ Failed to create tunnel: {create_response.text}")
                     return None
+            else:
+                # Tunnel exists - update config file in case settings changed
+                print(f"♻️  Updating configuration for existing tunnel")
+                self._configure_tunnel_routes(existing_tunnel['id'])
+                
+                # Ensure DNS records exist
+                self.create_dns_records()
             
             return existing_tunnel
         
@@ -260,28 +268,42 @@ class CloudflareAPITunnel:
     def _configure_tunnel_routes(self, tunnel_id):
         """
         Configure ingress routes for the device tunnel
+        The tunnel needs to be configured with a config file, not via API
+        So we'll create a config file for it
         """
-        config_url = f"{self.api_base}/accounts/{self.account_id}/tunnels/{tunnel_id}/configurations"
-        
-        config_data = {
-            "config": {
-                "ingress": [
-                    {
-                        "hostname": f"{self.jupyter_subdomain}.{self.base_domain}",
-                        "service": "http://localhost:8888"
-                    },
-                    {
-                        "service": "http_status:404"
+        import yaml
+        
+        # Create config file for this tunnel
+        config_dir = Path.home() / '.cloudflared'
+        config_dir.mkdir(exist_ok=True)
+        config_file = config_dir / f'config-{tunnel_id}.yml'
+        
+        config = {
+            "tunnel": tunnel_id,
+            "credentials-file": str(config_dir / f"{tunnel_id}.json"),
+            "ingress": [
+                {
+                    "hostname": f"{self.jupyter_subdomain}.{self.base_domain}",
+                    "service": "http://localhost:8888",
+                    "originRequest": {
+                        "noTLSVerify": True
                     }
-                ]
-            }
+                },
+                {
+                    "hostname": f"{self.ssh_subdomain}.{self.base_domain}",
+                    "service": "ssh://localhost:22"
+                },
+                {
+                    "service": "http_status:404"
+                }
+            ]
         }
         
-        response = requests.put(config_url, headers=self.headers, json=config_data)
-        if response.status_code == 200:
-            print(f"✅ Configured tunnel routes")
-        else:
-            print(f"⚠️  Could not configure routes: {response.status_code}")
+        with open(config_file, 'w') as f:
+            yaml.dump(config, f)
+        
+        print(f"✅ Created tunnel config: {config_file}")
+        self.tunnel_config_file = config_file
     
     def _save_tunnel_credentials(self, tunnel_info):
         """
@@ -372,15 +394,27 @@ class CloudflareAPITunnel:
                             return None
                 
                 if creds_file.exists():
-                    # Run tunnel with credentials file
-                    cmd = [
-                        cloudflared_path,
-                        "tunnel",
-                        "--no-autoupdate",
-                        "--credentials-file", str(creds_file),
-                        "run",
-                        tunnel_id
-                    ]
+                    # Check if config file exists
+                    config_file = Path.home() / '.cloudflared' / f'config-{tunnel_id}.yml'
+                    if config_file.exists():
+                        # Run tunnel with config file (includes routes)
+                        cmd = [
+                            cloudflared_path,
+                            "tunnel",
+                            "--no-autoupdate",
+                            "--config", str(config_file),
+                            "run"
+                        ]
+                    else:
+                        # Fallback to credentials file only
+                        cmd = [
+                            cloudflared_path,
+                            "tunnel",
+                            "--no-autoupdate",
+                            "--credentials-file", str(creds_file),
+                            "run",
+                            tunnel_id
+                        ]
             
             self.tunnel_process = subprocess.Popen(
                 cmd,
@@ -418,12 +452,17 @@ class CloudflareAPITunnel:
     def stop(self):
         """
         Stop the tunnel if running
+        Note: We keep the tunnel configuration for next run
         """
         if self.tunnel_process and self.tunnel_process.poll() is None:
             print("Stopping tunnel...")
             self.tunnel_process.terminate()
-            self.tunnel_process.wait(timeout=5)
+            try:
+                self.tunnel_process.wait(timeout=5)
+            except subprocess.TimeoutExpired:
+                self.tunnel_process.kill()
             print("Tunnel stopped")
+            print("ℹ️  Tunnel configuration preserved for next run")
 
     def _ensure_cloudflared(self):
         """

unitlab/main.py

@@ -146,13 +146,27 @@ def run_agent(
     if not device_id:
         import uuid
         import platform
+        from pathlib import Path
+        
         # Try environment variable first
         device_id = os.getenv('DEVICE_ID')
         if not device_id:
-            # 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}"
+            # 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}")
           
     
     # Create client and initialize device agent

{unitlab-2.3.13.dist-info → unitlab-2.3.15.dist-info}/METADATA

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

{unitlab-2.3.13.dist-info → unitlab-2.3.15.dist-info}/RECORD

@@ -2,15 +2,15 @@ unitlab/__init__.py,sha256=Wtk5kQ_MTlxtd3mxJIn2qHVK5URrVcasMMPjD3BtrVM,214
 unitlab/__main__.py,sha256=6Hs2PV7EYc5Tid4g4OtcLXhqVHiNYTGzSBdoOnW2HXA,29
 unitlab/binary_manager.py,sha256=Q1v2Odm0hk_3g7jfDUJQfkjEbUbSjtuyo2JDUyWjDrk,5468
 unitlab/client.py,sha256=V5fTgbprmMsnMwD_FPn7oZh0KK6hdnqB4BYuY4D-JRw,24558
-unitlab/cloudflare_api_tunnel.py,sha256=2rIGFAP9TMtOLGstqVUpVj5C0vCDdhkVRVHH41O5_MA,21624
+unitlab/cloudflare_api_tunnel.py,sha256=b3qYgI5mWuU3yiFZLNRPBk1iu27P0xq36eEqGzaeays,23309
 unitlab/exceptions.py,sha256=68Tr6LreEzjQ3Vns8HAaWdtewtkNUJOvPazbf6NSnXU,950
-unitlab/main.py,sha256=h1WG6up6STt-2fJZAkqnxenwJ7kmkqnkfq5Zs4xLSeI,5257
+unitlab/main.py,sha256=7gPZ_2n90sxDnq9oGZVKOkuifr-k7w2Tq3ZIldAUE8I,5877
 unitlab/tunnel_config.py,sha256=7CiAqasfg26YQfJYXapCBQPSoqw4jIx6yR64saybLLo,8312
 unitlab/tunnel_service_token.py,sha256=ji96a4s4W2cFJrHZle0zBD85Ac_T862-gCKzBUomrxM,3125
 unitlab/utils.py,sha256=83ekAxxfXecFTg76Z62BGDybC_skKJHYoLyawCD9wGM,1920
-unitlab-2.3.13.dist-info/LICENSE.md,sha256=Gn7RRvByorAcAaM-WbyUpsgi5ED1-bKFFshbWfYYz2Y,1069
-unitlab-2.3.13.dist-info/METADATA,sha256=P46YSXOduMWVweKtJd5AfIJUq7sqNjHFgN_qd3o7Bh8,844
-unitlab-2.3.13.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-unitlab-2.3.13.dist-info/entry_points.txt,sha256=ig-PjKEqSCj3UTdyANgEi4tsAU84DyXdaOJ02NHX4bY,45
-unitlab-2.3.13.dist-info/top_level.txt,sha256=Al4ZlTYE3fTJK2o6YLCDMH5_DjuQkffRBMxgmWbKaqQ,8
-unitlab-2.3.13.dist-info/RECORD,,
+unitlab-2.3.15.dist-info/LICENSE.md,sha256=Gn7RRvByorAcAaM-WbyUpsgi5ED1-bKFFshbWfYYz2Y,1069
+unitlab-2.3.15.dist-info/METADATA,sha256=yXLtmCrwoxTtnXz8Fdglewuokmnm9ylEPjcbbTCcrkw,844
+unitlab-2.3.15.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+unitlab-2.3.15.dist-info/entry_points.txt,sha256=ig-PjKEqSCj3UTdyANgEi4tsAU84DyXdaOJ02NHX4bY,45
+unitlab-2.3.15.dist-info/top_level.txt,sha256=Al4ZlTYE3fTJK2o6YLCDMH5_DjuQkffRBMxgmWbKaqQ,8
+unitlab-2.3.15.dist-info/RECORD,,