fix conflicts

Author: Fr4nc3

docs/DeploymentGuide.md

@@ -206,43 +206,9 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain
 
 5. Once the deployment has completed successfully, open the [Azure Portal](https://portal.azure.com/), go to the deployed resource group, find the App Service, and get the app URL from `Default domain`.
 
-6. If you are done trying out the application, you can delete the resources by running `azd down`.
+6. When Deployment is complete, follow steps in [Set Up Authentication in Azure App Service](../docs/azure_app_service_auth_setup.md) to add app authentication to your web app running on Azure App Service
 
-### Publishing Local Build Container to Azure Container Registry
-
-If you need to rebuild the source code and push the updated container to the deployed Azure Container Registry, follow these steps:
-
-1. Set the environment variable `USE_LOCAL_BUILD` to `True`:
-
-   - **Linux/macOS**:
-
-     ```bash
-     export USE_LOCAL_BUILD=True
-     ```
-
-   - **Windows (PowerShell)**:
-     ```powershell
-     $env:USE_LOCAL_BUILD = $true
-     ```
-
-2. Run the `az login` command
-
-   ```bash
-   az login
-   ```
-
-3. Run the `azd up` command again to rebuild and push the updated container:
-   ```bash
-   azd up
-   ```
-
-This will rebuild the source code, package it into a container, and push it to the Azure Container Registry associated with your deployment.
-
-This guide provides step-by-step instructions for deploying your application using Azure Container Registry (ACR) and Azure Container Apps.
-
-There are several ways to deploy the solution. You can deploy to run in Azure in one click, or manually, or you can deploy locally.
-
-When Deployment is complete, follow steps in [Set Up Authentication in Azure App Service](../docs/azure_app_service_auth_setup.md) to add app authentication to your web app running on Azure App Service
+7. If you are done trying out the application, you can delete the resources by running `azd down`.
 
 # Local setup
 

src/backend/app_kernel.py

@@ -79,7 +79,9 @@
 # Add this near the top of your app.py, after initializing the app
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=[frontend_url],
+    allow_origins=[
+        frontend_url
+    ],  # Allow all origins for development; restrict in production
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
@@ -277,9 +279,7 @@ async def input_task_endpoint(input_task: InputTask, request: Request):
                 r"Rate limit is exceeded\. Try again in (\d+) seconds?\.", error_msg
             )
             if match:
-                error_msg = (
-                    f"Rate limit is exceeded. Try again in {match.group(1)} seconds."
-                )
+                error_msg = "Application temporarily unavailable due to quota limits. Please try again later."
 
         track_event_if_configured(
             "InputTaskError",
@@ -298,7 +298,7 @@ async def input_task_endpoint(input_task: InputTask, request: Request):
 async def create_plan_endpoint(input_task: InputTask, request: Request):
     """
     Create a new plan without full processing.
-    
+
     ---
     tags:
       - Plans
@@ -355,8 +355,8 @@ async def create_plan_endpoint(input_task: InputTask, request: Request):
             },
         )
         raise HTTPException(
-            status_code=400, 
-            detail="Task description failed safety validation. Please revise your request."
+            status_code=400,
+            detail="Task description failed safety validation. Please revise your request.",
         )
 
     # Get authenticated user
@@ -385,7 +385,7 @@ async def create_plan_endpoint(input_task: InputTask, request: Request):
             user_id=user_id,
             initial_goal=input_task.description,
             overall_status=PlanStatus.in_progress,
-            source=AgentType.PLANNER.value
+            source=AgentType.PLANNER.value,
         )
 
         # Save the plan to the database