Update app.py

app.py

@@ -209,55 +209,28 @@ def chat_with_assistant(user_input, chat_history, bot_id, workspace_id):
                 if new_workspace_id:
                     new_bot_id = create_bot(new_workspace_id)
 
-                    # Step 3: Install integration for the new bot
-                    if new_bot_id:
-                        install_bot_integration(new_bot_id, new_workspace_id)
-
-                        # Step 4: Retry with the new IDs
-                        headers["x-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', '')
-                            return assistant_content, new_bot_id, new_workspace_id
-                        else:
-                            return f"Unable to get a response from the assistant.", new_bot_id, new_workspace_id
+                    # Step 3: Retry with the new IDs
+                    headers["x-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', '')
+                        return assistant_content, new_bot_id, new_workspace_id
+                    else:
+                        return f"Unable to get a response from the assistant.", new_bot_id, new_workspace_id
 
             # Any other error status code
             else:
-                raise Exception("Invalid or expired bot ID.")
+                raise Exception("Unexpected error occurred.")
 
         except Exception as e:
-            # If invalid/expired bot or any other error, regenerate workspace/bot
-            if attempt == max_retries - 1:  # Last attempt
-                # Attempt to delete old IDs if they exist
-                if bot_id and workspace_id:
-                    delete_bot(bot_id, workspace_id)
-                    delete_workspace(workspace_id)
+            # If this is not the last attempt, retry the same request
+            if attempt < max_retries - 1:
+                time.sleep(2)  # Wait before retrying
+                continue
 
-                # Create fresh IDs
-                new_workspace = create_workspace()
-                if new_workspace:
-                    new_bot = create_bot(new_workspace)
-                    if new_bot:
-                        # Update headers with the new bot ID
-                        headers["x-bot-id"] = new_bot
-                        # Retry with new IDs
-                        try:
-                            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', '')
-                                return assistant_content, new_bot, new_workspace
-                            else:
-                                return f"Unable to get a response from the assistant.", new_bot, new_workspace
-                        except Exception as retry_error:
-                            return f"Unable to get a response from the assistant.", new_bot, new_workspace
-                # If we get here, all regeneration attempts failed
-                return "Unable to get a response from the assistant.", None, None
-
-            # Not the last attempt, wait and retry
-            time.sleep(2)
+            # If this is the last attempt, handle it gracefully
+            return f"Unable to get a response from the assistant after multiple attempts.", bot_id, 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