unitlab 2.3.39__py3-none-any.whl → 2.3.41__py3-none-any.whl

unitlab/persistent_tunnel.py

@@ -14,7 +14,7 @@ from fastapi import FastAPI
 import uvicorn
 import threading
 import psutil
-
+import secrets
 
 api = FastAPI()
 
@@ -56,24 +56,7 @@ class PersistentTunnel:
         self.jupyter_process = None
         self.tunnel_process = None
     
-    def get_zone_id(self):
-        """Get Zone ID for unitlab-ai.com"""
-        print("🔍 Getting Zone ID for {}...".format(self.domain))
-        
-        url = "https://api.cloudflare.com/client/v4/zones"
-        headers = self._get_headers()
-        params = {"name": self.domain}
-        
-        response = requests.get(url, headers=headers, params=params)
-        if response.status_code == 200:
-            data = response.json()
-            if data["result"]:
-                self.cf_zone_id = data["result"][0]["id"]
-                print("✅ Zone ID: {}".format(self.cf_zone_id))
-                return self.cf_zone_id
-        
-        print("❌ Could not get Zone ID")
-        return None
+    
     
     def _get_headers(self):
         """Get API headers for Global API Key"""
@@ -84,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)
@@ -124,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))
@@ -142,9 +126,7 @@ class PersistentTunnel:
         
         print("🔧 Creating DNS records...")
         
-        # Get zone ID if we don't have it
-        if self.cf_zone_id == "NEED_ZONE_ID_FOR_1SCAN_UZ":
-            self.get_zone_id()
+        # self.get_zone_id()
         
         url = "https://api.cloudflare.com/client/v4/zones/{}/dns_records".format(self.cf_zone_id)
         headers = self._get_headers()
@@ -168,7 +150,32 @@ class PersistentTunnel:
             print("❌ Failed to create main DNS: {}".format(response.text[:200]))
             return False
         
-        # Create SSH subdomain record (s{deviceid}.unitlab-ai.com)
+        # 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]))
+        
+        # Wait a moment for DNS deletion to propagate
+        time.sleep(2)
+        
+        # Create new SSH subdomain record pointing to new tunnel
         ssh_data = {
             "type": "CNAME",
             "name": self.ssh_subdomain,
@@ -177,31 +184,22 @@ class PersistentTunnel:
             "ttl": 1
         }
         
+        print("📝 Creating SSH DNS record: {} -> {}".format(self.ssh_subdomain, self.tunnel_id))
         ssh_response = requests.post(url, headers=headers, json=ssh_data)
         
         if ssh_response.status_code in [200, 201]:
             print("✅ SSH DNS record created: {}.{}".format(self.ssh_subdomain, self.domain))
-        elif "already exists" in ssh_response.text:
-            print("⚠️  SSH DNS record already exists, deleting and recreating...")
-            # Delete the old record and create new one
-            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", [])
-                if records:
-                    record_id = records[0]["id"]
-                    delete_url = "{}/{}".format(url, record_id)
-                    requests.delete(delete_url, headers=headers)
-                    print("Deleted old SSH DNS record")
-                    # Try again
-                    ssh_response = requests.post(url, headers=headers, json=ssh_data)
-                    if ssh_response.status_code in [200, 201]:
-                        print("✅ SSH DNS record recreated: {}.{}".format(self.ssh_subdomain, self.domain))
-                    else:
-                        print("❌ Failed to recreate SSH DNS: {}".format(ssh_response.text[:200]))
+            print("   Points to: {}.cfargotunnel.com".format(self.tunnel_id))
         else:
-            print("❌ Could not create SSH DNS: {}".format(ssh_response.text[:200]))
-            # SSH is optional, so we continue even if SSH DNS fails
+            print("❌ Failed to create SSH DNS: Status {} - {}".format(ssh_response.status_code, ssh_response.text))
+            # Try to parse error
+            try:
+                error_data = ssh_response.json()
+                if "errors" in error_data:
+                    for error in error_data["errors"]:
+                        print("   Error: {}".format(error.get("message", error)))
+            except:
+                pass
         
         return True
     
@@ -243,6 +241,7 @@ class PersistentTunnel:
             
             policy_response = requests.post(policy_url, headers=headers, json=policy_data)
             
+            
             if policy_response.status_code in [200, 201]:
                 print("✅ Bypass policy created - SSH is publicly accessible")
                 return True
@@ -442,7 +441,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
@@ -492,6 +491,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.39.dist-info → unitlab-2.3.41.dist-info}/METADATA

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

{unitlab-2.3.39.dist-info → unitlab-2.3.41.dist-info}/RECORD

@@ -3,11 +3,11 @@ unitlab/__main__.py,sha256=6Hs2PV7EYc5Tid4g4OtcLXhqVHiNYTGzSBdoOnW2HXA,29
 unitlab/client.py,sha256=wqREtDuYc5ixeloPEGm0hp1sdUtB59sB1bIJjBcO1y0,25983
 unitlab/exceptions.py,sha256=68Tr6LreEzjQ3Vns8HAaWdtewtkNUJOvPazbf6NSnXU,950
 unitlab/main.py,sha256=RbuCUaExvOEoA33T9O0hnr94R-L70RXyMjQshxRWR-o,4421
-unitlab/persistent_tunnel.py,sha256=CcZYD3fBN6WP_PzvBIomTMakfsR4GtlsfBarUWflBi0,22366
+unitlab/persistent_tunnel.py,sha256=Ed_hRCsRT1I7UfpcAKfyVInNLfupk_hpgzFAz1GDUe8,22596
 unitlab/utils.py,sha256=9gPRu-d6pbhSoVdll1GXe4eoz_uFYOSbYArFDQdlUZs,1922
-unitlab-2.3.39.dist-info/licenses/LICENSE.md,sha256=Gn7RRvByorAcAaM-WbyUpsgi5ED1-bKFFshbWfYYz2Y,1069
-unitlab-2.3.39.dist-info/METADATA,sha256=3Y0CIEPDzVkfL3dcfpbND4dy3QWzNZo00Ir45YBKDmk,1046
-unitlab-2.3.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unitlab-2.3.39.dist-info/entry_points.txt,sha256=ig-PjKEqSCj3UTdyANgEi4tsAU84DyXdaOJ02NHX4bY,45
-unitlab-2.3.39.dist-info/top_level.txt,sha256=Al4ZlTYE3fTJK2o6YLCDMH5_DjuQkffRBMxgmWbKaqQ,8
-unitlab-2.3.39.dist-info/RECORD,,
+unitlab-2.3.41.dist-info/licenses/LICENSE.md,sha256=Gn7RRvByorAcAaM-WbyUpsgi5ED1-bKFFshbWfYYz2Y,1069
+unitlab-2.3.41.dist-info/METADATA,sha256=DIzDm3lxsOVqI1STlrGcDf7pZybOCrqnCCyJ1BNVMoU,1046
+unitlab-2.3.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unitlab-2.3.41.dist-info/entry_points.txt,sha256=ig-PjKEqSCj3UTdyANgEi4tsAU84DyXdaOJ02NHX4bY,45
+unitlab-2.3.41.dist-info/top_level.txt,sha256=Al4ZlTYE3fTJK2o6YLCDMH5_DjuQkffRBMxgmWbKaqQ,8
+unitlab-2.3.41.dist-info/RECORD,,