Update app.py

app.py

@@ -1,4 +1,4 @@
-from fastapi import FastAPI, Request
+from fastapi import FastAPI, Request, HTTPException
 import httpx
 from starlette.responses import RedirectResponse
 
@@ -14,23 +14,38 @@ async def forward(request: Request):
     
     # Check if the forward URL is present
     if not forward_url:
-        return {"error": "param1 (forward URL) is required"}
+        raise HTTPException(status_code=400, detail="param1 (forward URL) is required")
+    
+    # Validate the forward URL (basic validation)
+    if not (forward_url.startswith('http://') or forward_url.startswith('https://')):
+        raise HTTPException(status_code=400, detail="Invalid URL. URL must start with http:// or https://")
     
     # Prepare the new URL with remaining query parameters
-    # This assumes that the forward URL does not already have query parameters.
     if query_params:  # If there are other parameters to forward
         params_as_str = "&".join([f"{key}={value}" for key, value in query_params.items()])
         forward_url_with_params = f"{forward_url}?{params_as_str}"
     else:
         forward_url_with_params = forward_url
     
-    # Forward the request to the new URL using httpx for asynchronous HTTP requests
-    async with httpx.AsyncClient() as client:
-        response = await client.get(forward_url_with_params)
+    try:
+        # Forward the request to the new URL using httpx for asynchronous HTTP requests
+        async with httpx.AsyncClient() as client:
+            response = await client.get(forward_url_with_params)
+            response.raise_for_status()  # Raises an exception for 4XX/5XX responses
+
+    except httpx.RequestError as e:
+        # Handle request errors (e.g., network issues)
+        raise HTTPException(status_code=500, detail=f"Request error: {str(e)}")
+    except httpx.HTTPStatusError as e:
+        # Handle responses with error status codes
+        raise HTTPException(status_code=e.response.status_code, detail=f"Error response from forwarded URL: {str(e)}")
     
-    # For simplicity, we're directly returning the response from the forwarded URL
-    # In a real application, you might want to handle different response scenarios
-    return response.json()
+    try:
+        # Attempt to return the JSON response
+        return response.json()
+    except ValueError:
+        # If the response is not JSON, return as plain text
+        return Response(content=response.text, media_type="text/plain")
 
 # To run the server:
 # uvicorn app:app --reload