Update app.py

app.py

@@ -5,11 +5,12 @@ from gradio_client import Client
 
 # Keys
 VALID_API_KEY = os.getenv("APP_API_KEY")       # for your FastAPI security
-SPACE_API_KEY = os.getenv("SPACE_API_KEY")     # for your hosted HF Space - This is likely the API key for the Gradio space itself, not the user's unique API key.
+SPACE_API_KEY = os.getenv("SPACE_API_KEY")     # for your hosted HF Space
 
 # Connect to hosted space
-# The client initializes with the URL of the hosted Gradio space.
-client = Client("https://futuresony-mr-events.hf.space/") # Use the correct URL of your Gradio space
+client = Client("Futuresony/Mr.Events")
+#Futuresony/Mr.Events
+#Futuresony/ABSA_Test_Space
 
 app = FastAPI()
 
@@ -18,54 +19,27 @@ async def chat(request: Request):
     data = await request.json()
 
     # API key check from headers or JSON
-    # This api_key is the unique key provided by the user/device
     api_key = request.headers.get("X-API-Key") or data.get("api_key")
-
-    # Validate the user's unique API key against the valid key set in your environment
-    # This assumes VALID_API_KEY is the master key or a prefix validator.
-    # If you have multiple user keys, you would need a different validation mechanism here.
-    # Based on your Gradio code, it seems SECRET_API_KEY (loaded into VALID_API_KEY here) is
-    # used for validation *within* the Gradio app.
-    # So, this check might be redundant if the Gradio space handles validation,
-    # but we'll keep it if VALID_API_KEY is meant for the FastAPI endpoint itself.
-    # Let's assume the Gradio space handles the primary validation for now.
-    # if not api_key or api_key != VALID_API_KEY:
-    #     raise HTTPException(status_code=403, detail="Invalid API Key")
-
+    if api_key != VALID_API_KEY:
+        raise HTTPException(status_code=403, detail="Invalid API Key")
 
     user_message = data.get("message")
+    chat_history = data.get("chat_history", []) # Extract chat_history from request
+    user_id = data.get("user_id") # Extract user_id from request
+
     if not user_message:
         raise HTTPException(status_code=400, detail="Message is required")
 
-    # Call your hosted Space's chat function
-    # Pass the user's unique api_key received from the request
-    # The Gradio chat function expects query, chat_history, and api_key
-    # We need to pass the chat_history as well, even if empty initially for a new user.
-    # The Gradio space will manage the history based on the api_key.
-    try:
-        result = client.predict(
-            query=user_message,
-            # chat_history=[], # Initial chat_history from the client can be empty; the Space loads/saves. Removed as per error
-            api_key=api_key, # Pass the user's unique API key here
-            api_name="/chat"
-        )
-        # The result from the Gradio Space is the generated response string.
-        response_text = result
-
-    except Exception as e:
-        print(f"Error calling Gradio Space: {e}")
-        raise HTTPException(status_code=500, detail=f"Error processing request: {e}")
-
+    # Call your hosted Space, passing the user_id
+    result = client.predict(
+        query=user_message,
+        chat_history=chat_history, # Pass chat_history to the hosted space
+        api_key=api_key,  # Pass the validated api_key
+        user_id=user_id, # Pass the user_id
+        api_name="/chat"
+    )
 
-    return {"response": response_text}
+    return {"response": result}
 
 if __name__ == "__main__":
-    # To run this in a Colab environment or similar, you might need to use
-    # a tool like ngrok or expose the port if running on a dedicated server.
-    # For local testing within Colab, you can run it directly or use background tasks.
-    # Note: Running uvicorn directly like this will block the notebook.
-    # You might prefer using Colab's built-in features for hosting or running in a thread/process.
-    # For deployment on Hugging Face Spaces, the `app` object is typically used directly.
-    # If running locally for testing:
-    # uvicorn.run(app, host="0.0.0.0", port=7860)
-    print("FastAPI app defined. Run `uvicorn.run(app, host='0.0.0.0', port=7860)` to start the server.")
+    uvicorn.run(app, host="0.0.0.0", port=7860)