Update app.py

app.py

@@ -34,6 +34,7 @@ class EzvizTuyaAutomation:
         if response.status_code == 200:
             devices = response.json().get("devices", [])
             return [{"name": dev["name"], "id": dev["deviceSerial"]} for dev in devices]
+        print(f"EZVIZ API Response: {response.text}")  # Debugging
         return []
 
     def get_tuya_devices(self):
@@ -50,8 +51,16 @@ class EzvizTuyaAutomation:
         if response.status_code == 200:
             devices = response.json().get("devices", [])
             return [{"name": dev["name"], "id": dev["id"]} for dev in devices]
+        print(f"Tuya API Response: {response.text}")  # Debugging
         return []
 
+    def validate_tokens(self):
+        if not self.ezviz_access_token:
+            return "EZVIZ access token is missing or invalid."
+        if not self.tuya_access_token:
+            return "Tuya access token is missing or invalid."
+        return "Tokens validated successfully."
+
     def check_motion(self):
         """Check for motion events from selected EZVIZ camera"""
         if not self.ezviz_access_token or not self.selected_camera:
@@ -123,14 +132,26 @@ def create_ui():
         return "Credentials updated"
 
     def get_devices():
-        # Get and refresh device lists
-        ezviz_devices = automation.get_ezviz_devices()
-        tuya_devices = automation.get_tuya_devices()
+        # Attempt to fetch devices
+        try:
+            ezviz_devices = automation.get_ezviz_devices()
+            tuya_devices = automation.get_tuya_devices()
+            
+            if not ezviz_devices:
+                ezviz_choices = ["No devices found or invalid credentials."]
+            else:
+                ezviz_choices = [f"{dev['name']} ({dev['id']})" for dev in ezviz_devices]
+            
+            if not tuya_devices:
+                tuya_choices = ["No devices found or invalid credentials."]
+            else:
+                tuya_choices = [f"{dev['name']} ({dev['id']})" for dev in tuya_devices]
+            
+            return ezviz_choices, tuya_choices
         
-        ezviz_choices = [f"{dev['name']} ({dev['id']})" for dev in ezviz_devices]
-        tuya_choices = [f"{dev['name']} ({dev['id']})" for dev in tuya_devices]
-        
-        return ezviz_choices, tuya_choices
+        except Exception as e:
+            print(f"Error fetching devices: {e}")
+            return ["Error fetching EZVIZ devices"], ["Error fetching Tuya devices"]
 
     def start_automation(camera_choice, light_choice):
         if not camera_choice or not light_choice:
@@ -166,6 +187,8 @@ def create_ui():
                 tuya_id = gr.Textbox(label="Tuya Client ID")
                 tuya_secret = gr.Textbox(label="Tuya Secret", type="password")
                 save_btn = gr.Button("Save Credentials")
+                validate_btn = gr.Button("Validate Tokens")
+                validate_status = gr.Textbox(label="Token Validation Status", interactive=False)
 
         with gr.Row():
             refresh_btn = gr.Button("Refresh Device Lists")
@@ -186,6 +209,8 @@ def create_ui():
                       inputs=[ezviz_key, ezviz_secret, tuya_id, tuya_secret],
                       outputs=gr.Textbox(label="Status"))
         
+        validate_btn.click(automation.validate_tokens, None, validate_status)
+        
         refresh_btn.click(get_devices, 
                          None, 
                          outputs=[camera_dropdown, light_dropdown])