Update app.py

app.py

@@ -125,8 +125,8 @@ def install_bot_integration(bot_id, workspace_id):
         return False
 
 
-def delete_bot(bot_id, workspace_id):
-    """Delete a bot from the specified workspace"""
+def try_delete_bot(bot_id, workspace_id):
+    """Attempt to delete a bot from the specified workspace but continue if it fails"""
     if not bot_id or not workspace_id:
         print("Cannot delete bot: Missing bot ID or workspace ID")
         return False
@@ -151,8 +151,8 @@ def delete_bot(bot_id, workspace_id):
         return False
 
 
-def delete_workspace(workspace_id):
-    """Delete a workspace"""
+def try_delete_workspace(workspace_id):
+    """Attempt to delete a workspace but continue if it fails"""
     if not workspace_id:
         print("Cannot delete workspace: No workspace ID provided")
         return False
@@ -223,7 +223,7 @@ def chat_with_assistant(user_input, chat_history, bot_id, workspace_id, temperat
             "systemPrompt": system_prompt,
             "messages": messages,
             "temperature": temperature,
-            
+
             "debug": False,
         }
     }
@@ -236,9 +236,6 @@ def chat_with_assistant(user_input, chat_history, bot_id, workspace_id, temperat
     max_retries = 3
     timeout = 120  # Increased timeout for long messages
 
-    # Flag to track if we need to create new IDs due to quota exceeded
-    quota_exceeded = False
-
     # Attempt to send the request
     for attempt in range(max_retries):
         try:
@@ -252,23 +249,72 @@ def chat_with_assistant(user_input, chat_history, bot_id, workspace_id, temperat
                 print(f"Successfully received response from Botpress API")
                 return assistant_content, bot_id, workspace_id
 
-            # Check for quota exceeded error specifically
-            elif response.status_code == 403:
-                error_data = response.json()
-                error_message = error_data.get('message', '')
+            # Check for authentication or permission errors (401, 403)
+            elif response.status_code in [401, 403]:
+                error_message = "Authentication error"
+                try:
+                    error_data = response.json()
+                    error_message = error_data.get('message', 'Authentication error')
+                except:
+                    pass
+
+                print(f"Authentication error detected: {error_message}")
+
+                # We need to create new resources immediately
+                print("Creating new workspace and bot...")
+                new_workspace_id = create_workspace()
+                if not new_workspace_id:
+                    print("Failed to create a new workspace")
+                    if attempt < max_retries - 1:
+                        time.sleep(3)
+                        continue
+                    else:
+                        return "Unable to create new resources. Please try again later.", bot_id, workspace_id
 
-                # Check if this is the specific quota exceeded error
-                if "has reached its usage limit for ai spend" in error_message:
-                    print(f"Quota exceeded error detected: {error_message}")
-                    quota_exceeded = True
-                    break
-                else:
-                    print(f"Received 403 error but not quota exceeded: {error_message}")
+                new_bot_id = create_bot(new_workspace_id)
+                if not new_bot_id:
+                    print("Failed to create a new bot")
+                    if attempt < max_retries - 1:
+                        time.sleep(3)
+                        continue
+                    else:
+                        return "Unable to create new bot. Please try again later.", new_workspace_id, workspace_id
+
+                print(f"Created new workspace: {new_workspace_id} and bot: {new_bot_id}")
+
+                # Try again with new IDs
+                headers["x-bot-id"] = new_bot_id
+                try:
+                    print(f"Retrying with new bot_id={new_bot_id}")
+                    retry_response = requests.post(botpress_url, json=payload, headers=headers, timeout=timeout)
+
+                    if retry_response.status_code == 200:
+                        data = retry_response.json()
+                        assistant_content = data.get('output', {}).get('choices', [{}])[0].get('content', '')
+                        print(f"Successfully received response with new IDs")
+
+                        # Try to clean up old resources in the background, but don't wait for result
+                        if bot_id and workspace_id:
+                            print(f"Attempting to clean up old resources in the background")
+                            try_delete_bot(bot_id, workspace_id)
+                            try_delete_workspace(workspace_id)
+
+                        return assistant_content, new_bot_id, new_workspace_id
+                    else:
+                        print(f"Failed with new IDs: {retry_response.status_code}")
+                        if attempt < max_retries - 1:
+                            time.sleep(2)
+                            continue
+                        else:
+                            return f"Unable to get a response even with new credentials.", new_bot_id, new_workspace_id
+
+                except Exception as e:
+                    print(f"Error with new IDs: {str(e)}")
                     if attempt < max_retries - 1:
                         time.sleep(2)
                         continue
                     else:
-                        return f"Unable to get a response from the assistant (Error 403).", bot_id, workspace_id
+                        return f"Error with new credentials: {str(e)}", new_bot_id, new_workspace_id
 
             # Handle network errors or timeouts (just retry)
             elif response.status_code in [404, 408, 502, 503, 504]:
@@ -301,61 +347,6 @@ def chat_with_assistant(user_input, chat_history, bot_id, workspace_id, temperat
             else:
                 return f"Unable to get a response from the assistant: {str(e)}", bot_id, workspace_id
 
-    # If quota exceeded, we need to create new resources
-    if quota_exceeded:
-        print("Quota exceeded. Creating new workspace and bot...")
-
-        # First delete the bot, then the workspace (in that order)
-        if bot_id and workspace_id:
-            print(f"Deleting bot {bot_id} first...")
-            delete_success = delete_bot(bot_id, workspace_id)
-            if delete_success:
-                print(f"Successfully deleted bot {bot_id}")
-            else:
-                print(f"Failed to delete bot {bot_id}")
-
-            # Wait 3 seconds before deleting the workspace
-            print("Waiting 3 seconds before deleting workspace...")
-            time.sleep(3)
-
-            print(f"Now deleting workspace {workspace_id}...")
-            ws_delete_success = delete_workspace(workspace_id)
-            if ws_delete_success:
-                print(f"Successfully deleted workspace {workspace_id}")
-            else:
-                print(f"Failed to delete workspace {workspace_id}")
-
-        # Create new workspace
-        new_workspace_id = create_workspace()
-        if not new_workspace_id:
-            return "Failed to create a new workspace after quota exceeded. Please try again later.", bot_id, workspace_id
-
-        # Create new bot in the new workspace
-        new_bot_id = create_bot(new_workspace_id)
-        if not new_bot_id:
-            return "Failed to create a new bot after quota exceeded. Please try again later.", new_workspace_id, workspace_id
-
-        # Update headers with new bot ID
-        headers["x-bot-id"] = new_bot_id
-
-        # Try one more time with the new IDs
-        try:
-            print(f"Retrying with new bot_id={new_bot_id}, workspace_id={new_workspace_id}")
-            retry_response = requests.post(botpress_url, json=payload, headers=headers, timeout=timeout)
-
-            if retry_response.status_code == 200:
-                data = retry_response.json()
-                assistant_content = data.get('output', {}).get('choices', [{}])[0].get('content', '')
-                print(f"Successfully received response with new IDs")
-                return assistant_content, new_bot_id, new_workspace_id
-            else:
-                print(f"Failed with new IDs: {retry_response.status_code}, {retry_response.text}")
-                return f"Unable to get a response from the assistant with new credentials.", new_bot_id, new_workspace_id
-
-        except Exception as e:
-            print(f"Error with new IDs: {str(e)}")
-            return f"Unable to get a response from the assistant with new credentials: {str(e)}", new_bot_id, new_workspace_id
-
     # Should not reach here due to the handling in the loop
     return "Unable to get a response from the assistant.", bot_id, workspace_id