unitlab 2.3.40__tar.gz → 2.3.42__tar.gz

{unitlab-2.3.40/src/unitlab.egg-info → unitlab-2.3.42}/PKG-INFO

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

{unitlab-2.3.40 → unitlab-2.3.42}/setup.py

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

{unitlab-2.3.40 → unitlab-2.3.42}/src/unitlab/main.py

@@ -122,7 +122,7 @@ def dataset_download(
 def run_agent(
     api_key: API_KEY,
     device_id: Annotated[str, typer.Option(help="Device ID")] = None,
-    base_domain: Annotated[str, typer.Option(help="Base domain for tunnels")] = "1scan.uz",
+    base_domain: Annotated[str, typer.Option(help="Base domain for tunnels")] = "api-dev.unitlab.ai",
   
 ):
 

{unitlab-2.3.40 → unitlab-2.3.42}/src/unitlab/persistent_tunnel.py

@@ -14,7 +14,7 @@ from fastapi import FastAPI
 import uvicorn
 import threading
 import psutil
-
+import secrets
 
 api = FastAPI()
 
@@ -38,7 +38,7 @@ class PersistentTunnel:
         
         # Clean device ID for subdomain
         if device_id:
-            self.device_id = device_id.replace('-', '').replace('_', '').replace('.', '').lower()[:20]
+            self.device_id = device_id.replace('_', '').replace('.', '').lower()[:30]
         else:
             import uuid
             self.device_id = str(uuid.uuid4())[:8]
@@ -67,23 +67,23 @@ class PersistentTunnel:
             "Content-Type": "application/json"                                                                                          
         } 
     
-    def get_or_create_tunnel(self):
-        """Always create a new tunnel with unique name to avoid conflicts"""
-        # Generate unique tunnel name to avoid conflicts
-        import uuid
-        unique_suffix = str(uuid.uuid4())[:8]
-        self.tunnel_name = "agent-{}-{}".format(self.device_id, unique_suffix)
-        print("🔧 Creating tunnel: {}...".format(self.tunnel_name))
-        
-        # Always create new tunnel
-        return self.create_new_tunnel()
-    
+    # def get_or_create_tunnel(self):
+    #     """Always create a new tunnel with unique name to avoid conflicts"""
+    #     # Generate unique tunnel name to avoid conflicts
+    #     import uuid
+    #     unique_suffix = str(uuid.uuid4())[:8]
+    #     self.tunnel_name = "agent-{}-{}".format(self.device_id, unique_suffix)
+    #     print("🔧 Creating tunnel: {}...".format(self.tunnel_name))
+        
+    #     # Always create new tunnel
+    #     return self.create_new_tunnel()
+
+
     def create_new_tunnel(self):
-        """Create a brand new tunnel"""
+        """Create a new tunnel via Cloudflare API"""
         print("🔧 Creating new tunnel: {}...".format(self.tunnel_name))
         
         # Generate random tunnel secret (32 bytes)
-        import secrets
         tunnel_secret = base64.b64encode(secrets.token_bytes(32)).decode()
         
         url = "https://api.cloudflare.com/client/v4/accounts/{}/cfd_tunnel".format(self.cf_account_id)
@@ -107,12 +107,13 @@ class PersistentTunnel:
                 "TunnelID": self.tunnel_id
             }
             
-            # Save credentials to file with tunnel name (not ID) for consistency
+            # Save credentials to file
             cred_file = "/tmp/tunnel-{}.json".format(self.tunnel_name)
             with open(cred_file, 'w') as f:
                 json.dump(self.tunnel_credentials, f)
             
             print("✅ Tunnel created: {}".format(self.tunnel_id))
+            print("✅ Credentials saved to: {}".format(cred_file))
             return cred_file
         else:
             print("❌ Failed to create tunnel: {}".format(response.text))
@@ -150,26 +151,26 @@ class PersistentTunnel:
             return False
         
         # First, check if SSH DNS record exists and delete it
-        print("🔍 Checking for existing SSH DNS record: {}.{}".format(self.ssh_subdomain, self.domain))
-        list_url = "{}?name={}.{}".format(url, self.ssh_subdomain, self.domain)
-        list_response = requests.get(list_url, headers=headers)
-        
-        if list_response.status_code == 200:
-            records = list_response.json().get("result", [])
-            print("Found {} existing DNS records".format(len(records)))
-            print('this is new version')
-            for record in records:
-                if record["name"] == "{}.{}".format(self.ssh_subdomain, self.domain):
-                    record_id = record["id"]
-                    print("🗑️  Deleting old SSH DNS record: {}".format(record_id))
-                    delete_url = "{}/{}".format(url, record_id)
-                    delete_response = requests.delete(delete_url, headers=headers)
-                    if delete_response.status_code in [200, 204]:
-                        print("✅ Deleted old SSH DNS record")
-                    else:
-                        print("⚠️  Could not delete old SSH DNS record: {}".format(delete_response.text[:200]))
-        else:
-            print("⚠️  Could not list DNS records: {}".format(list_response.text[:200]))
+        # print("🔍 Checking for existing SSH DNS record: {}.{}".format(self.ssh_subdomain, self.domain))
+        # list_url = "{}?name={}.{}".format(url, self.ssh_subdomain, self.domain)
+        # list_response = requests.get(list_url, headers=headers)
+        
+        # if list_response.status_code == 200:
+        #     records = list_response.json().get("result", [])
+        #     print("Found {} existing DNS records".format(len(records)))
+        #     print('this is new version')
+        #     for record in records:
+        #         if record["name"] == "{}.{}".format(self.ssh_subdomain, self.domain):
+        #             record_id = record["id"]
+        #             print("🗑️  Deleting old SSH DNS record: {}".format(record_id))
+        #             delete_url = "{}/{}".format(url, record_id)
+        #             delete_response = requests.delete(delete_url, headers=headers)
+        #             if delete_response.status_code in [200, 204]:
+        #                 print("✅ Deleted old SSH DNS record")
+        #             else:
+        #                 print("⚠️  Could not delete old SSH DNS record: {}".format(delete_response.text[:200]))
+        # else:
+        #     print("⚠️  Could not list DNS records: {}".format(list_response.text[:200]))
         
         # Wait a moment for DNS deletion to propagate
         time.sleep(2)
@@ -262,15 +263,20 @@ class PersistentTunnel:
             f.write("credentials-file: {}\n\n".format(cred_file))
             f.write("ingress:\n")
 
-            # SSH service on dedicated subdomain (s{deviceid}.unitlab-ai.com)
+                  # SSH service on dedicated subdomain (s{deviceid}.unitlab-ai.com)
             f.write("  - hostname: {}.{}\n".format(self.ssh_subdomain, self.domain))
             f.write("    service: ssh://localhost:22\n")
 
+      
+
+
             # API (more specific path goes first)
             f.write("  - hostname: {}.{}\n".format(self.subdomain, self.domain))
             f.write("    path: /api-agent/*\n")
             f.write("    service: http://localhost:8001\n")
 
+      
+
             # Jupyter (general hostname for HTTP)
             f.write("  - hostname: {}.{}\n".format(self.subdomain, self.domain))
             f.write("    service: http://localhost:8888\n")
@@ -440,7 +446,7 @@ class PersistentTunnel:
             # API credentials are hardcoded, so we're ready to go
             
             # 1. Get existing or create new tunnel via API
-            cred_file = self.get_or_create_tunnel()
+            cred_file = self.create_new_tunnel()
         
             
             # 2. Create DNS record
@@ -490,6 +496,12 @@ class PersistentTunnel:
             self.jupyter_process.terminate()
         if self.tunnel_process:
             self.tunnel_process.terminate()
+            try:
+                self.tunnel_process.wait(timeout=5)
+            except subprocess.TimeoutExpired:
+                self.tunnel_process.kill()
+                self.tunnel_process.wait()
+            print("✅ Tunnel stopped")
         
     #     # Optionally delete tunnel when stopping
     #     if self.tunnel_id:

{unitlab-2.3.40 → unitlab-2.3.42/src/unitlab.egg-info}/PKG-INFO

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