unitlab 2.3.17__py3-none-any.whl → 2.3.20__py3-none-any.whl

unitlab/cloudflare_api_tunnel.py

@@ -206,7 +206,7 @@ class CloudflareAPITunnel:
             print("   Assuming routes are configured in dashboard.")
             return True
 
-    def create_device_tunnel(self):
+    def create_device_tunnel(self, retry_on_fail=True):
         """
         Create a unique tunnel for this device if it doesn't exist
         """
@@ -372,11 +372,26 @@ class CloudflareAPITunnel:
                 self.create_dns_records()
                 self.update_tunnel_config()
             
+            # Check if we need to recreate the tunnel
+            if device_tunnel and device_tunnel.get('needs_recreation'):
+                print("🔄 Recreating tunnel due to access issues...")
+                # Delete the old tunnel
+                tunnel_id = device_tunnel['id']
+                delete_url = f"{self.api_base}/accounts/{self.account_id}/tunnels/{tunnel_id}"
+                delete_response = requests.delete(delete_url, headers=self.headers)
+                if delete_response.status_code in [200, 204, 404]:
+                    print(f"   ✅ Deleted old tunnel")
+                    # Try creating a new one with a timestamp suffix
+                    self.clean_device_id = f"{self.device_id.replace(' ', '').replace('-', '').replace('.', '').replace('_', '')[:24]}-{int(time.time())}"
+                    device_tunnel = self.create_device_tunnel(retry_on_fail=False)
+                    if device_tunnel:
+                        print(f"   ✅ Created new tunnel")
+            
             if not device_tunnel:
                 print("❌ Could not create/find device tunnel")
                 # Fallback to shared tunnel if API fails
                 print("⚠️  Falling back to shared tunnel...")
-                service_token = "eyJhIjoiYzkxMTkyYWUyMGE1ZDQzZjY1ZTA4NzU1MGQ4ZGM4OWIiLCJ0IjoiMDc3N2ZjMTAtNDljNC00NzJkLTg2NjEtZjYwZDgwZDYxODRkIiwicyI6Ik9XRTNaak5tTVdVdE1tWTRaUzAwTmpoakLTazBaalF0WXpjek1tSm1ZVGt4WlRRMCJ9"
+                service_token = "eyJhIjoiYzkxMTkyYWUyMGE1ZDQzZjY1ZTA4NzU1MGQ4ZGM4OWIiLCJ0IjoiMDc3N2ZjMTAtNDljNC00NzJkLTg2NjEtZjYwZDgwZDYxODRkIiwicyI6Ik9XRTNaak5tTVdVdE1tWTRaUzAwTmpoakLTazBmalF0WXpjek1tSm1ZVGt4WlRRMCJ9"
                 cmd = [
                     cloudflared_path,
                     "tunnel",
@@ -402,12 +417,22 @@ class CloudflareAPITunnel:
                         self._save_tunnel_credentials(device_tunnel)
                         # Continue to use credentials below
                     else:
-                        print("⚠️  No stored credentials, using tunnel token...")
+                        print("⚠️  No stored credentials, requesting tunnel token...")
                         # Get token for this tunnel
                         token_url = f"{self.api_base}/accounts/{self.account_id}/tunnels/{tunnel_id}/token"
+                        print(f"   Token URL: {token_url}")
+                        
                         token_response = requests.get(token_url, headers=self.headers)
+                        print(f"   Token response status: {token_response.status_code}")
+                        
                         if token_response.status_code == 200:
-                            token = token_response.json()['result']
+                            result = token_response.json()
+                            if 'result' in result:
+                                token = result['result']
+                                print(f"   ✅ Got tunnel token")
+                            else:
+                                print(f"   ❌ No token in response: {result}")
+                                return None
                             
                             # Check if config file exists with ingress rules
                             if config_file.exists():
@@ -432,8 +457,21 @@ class CloudflareAPITunnel:
                                     "--token", token
                                 ]
                         else:
-                            print("❌ Could not get tunnel token")
-                            return None
+                            print(f"❌ Could not get tunnel token: {token_response.status_code}")
+                            if token_response.text:
+                                print(f"   Error: {token_response.text}")
+                            
+                            # If 404, tunnel doesn't exist or we don't have access
+                            if token_response.status_code == 404:
+                                print(f"🔄 Tunnel not accessible (404), will recreate...")
+                                # Mark for recreation and continue
+                                device_tunnel['needs_recreation'] = True
+                                # Set cmd to None to skip the rest of this block
+                                cmd = None
+                            else:
+                                print(f"   ℹ️  Token endpoint returned {token_response.status_code}")
+                                print(f"   This might mean the tunnel needs to be recreated manually")
+                                return None
                 
                 # Only use credentials if we haven't already set cmd with token
                 if cmd is None and creds_file.exists():
@@ -458,27 +496,37 @@ class CloudflareAPITunnel:
                             tunnel_id
                         ]
             
-            self.tunnel_process = subprocess.Popen(
-                cmd,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.STDOUT,
-                text=True,
-                bufsize=1
-            )
-            
-            print("⏳ Waiting for tunnel to connect...")
-            time.sleep(5)
-            
-            if self.tunnel_process.poll() is None:
-                print("✅ Tunnel is running!")
-                print(f"📌 Device ID: {self.clean_device_id}")
-                print(f"📌 Jupyter URL: {self.jupyter_url}")
-                print(f"📌 SSH hostname: {self.ssh_hostname}")
-                print(f"📌 SSH command: ssh -o ProxyCommand='cloudflared access ssh --hostname {self.ssh_hostname}' user@localhost")
-                return self.tunnel_process
+            # Only start the tunnel if we have a valid command
+            if cmd:
+                self.tunnel_process = subprocess.Popen(
+                    cmd,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.STDOUT,
+                    text=True,
+                    bufsize=1
+                )
+                
+                print("⏳ Waiting for tunnel to connect...")
+                time.sleep(5)
+                
+                if self.tunnel_process.poll() is None:
+                    print("✅ Tunnel is running!")
+                    print(f"📌 Device ID: {self.clean_device_id}")
+                    print(f"📌 Jupyter URL: {self.jupyter_url}")
+                    print(f"📌 SSH hostname: {self.ssh_hostname}")
+                    print(f"📌 SSH command: ssh -o ProxyCommand='cloudflared access ssh --hostname {self.ssh_hostname}' user@localhost")
+                    return self.tunnel_process
+                else:
+                    output = self.tunnel_process.stdout.read() if self.tunnel_process.stdout else ""
+                    print(f"❌ Tunnel failed to start: {output}")
+                    return None
             else:
-                output = self.tunnel_process.stdout.read() if self.tunnel_process.stdout else ""
-                print(f"❌ Tunnel failed to start: {output}")
+                # If no cmd, it means we need to handle recreation or other error
+                if device_tunnel and device_tunnel.get('needs_recreation'):
+                    # The recreation happens above before this point
+                    print("❌ Failed to start tunnel after recreation attempt")
+                else:
+                    print("❌ No valid command to start tunnel")
                 return None
                 
         except Exception as e:

{unitlab-2.3.17.dist-info → unitlab-2.3.20.dist-info}/METADATA

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

{unitlab-2.3.17.dist-info → unitlab-2.3.20.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=yVovEvLsjNFOv02pv9KU76Q8kZSf-IGe_G9ghkF2n64,25495
+unitlab/cloudflare_api_tunnel.py,sha256=RyjjV3jeterHtWGnNZe7ABJhFH1cYlweWE53-n29OF8,28600
 unitlab/exceptions.py,sha256=68Tr6LreEzjQ3Vns8HAaWdtewtkNUJOvPazbf6NSnXU,950
 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.17.dist-info/LICENSE.md,sha256=Gn7RRvByorAcAaM-WbyUpsgi5ED1-bKFFshbWfYYz2Y,1069
-unitlab-2.3.17.dist-info/METADATA,sha256=vwinORqbWDCEvNcS-fekSwMoly9rnyhzcKK2OWdAYDA,844
-unitlab-2.3.17.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-unitlab-2.3.17.dist-info/entry_points.txt,sha256=ig-PjKEqSCj3UTdyANgEi4tsAU84DyXdaOJ02NHX4bY,45
-unitlab-2.3.17.dist-info/top_level.txt,sha256=Al4ZlTYE3fTJK2o6YLCDMH5_DjuQkffRBMxgmWbKaqQ,8
-unitlab-2.3.17.dist-info/RECORD,,
+unitlab-2.3.20.dist-info/LICENSE.md,sha256=Gn7RRvByorAcAaM-WbyUpsgi5ED1-bKFFshbWfYYz2Y,1069
+unitlab-2.3.20.dist-info/METADATA,sha256=ZeA9clkXoaXSJgOKLXwJuXVLIPm0flHf0D6aTdFRDcY,844
+unitlab-2.3.20.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+unitlab-2.3.20.dist-info/entry_points.txt,sha256=ig-PjKEqSCj3UTdyANgEi4tsAU84DyXdaOJ02NHX4bY,45
+unitlab-2.3.20.dist-info/top_level.txt,sha256=Al4ZlTYE3fTJK2o6YLCDMH5_DjuQkffRBMxgmWbKaqQ,8
+unitlab-2.3.20.dist-info/RECORD,,