Update app/main.py

app/main.py

@@ -3,12 +3,10 @@ import threading
 from pathlib import Path
 from typing import Optional
 
-from fastapi import FastAPI, Request
 from fastapi import FastAPI, Query, Response
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse
 from pydantic import BaseModel
-from app.google_oauth import build_flow, save_credentials, OAUTH_TEMP
 
 from .agent import ShoppingAgent
 from .feedback import caminho_feedback, google_sheets_habilitado, salvar_feedback
@@ -64,13 +62,16 @@ class ChatRequest(BaseModel):
 
 
 class FeedbackRequest(BaseModel):
+    search_id: str
     query: str
+    rank: int
     product_id: str
     product_name: str
+    categoria_produto: Optional[str] = None
+    categoria_inferida: Optional[str] = None
     rating: Optional[int] = None
     is_helpful: Optional[bool] = None
     note: Optional[str] = None
-    categoria_inferida: Optional[str] = None
     feedback: Optional[str] = None
     motivo: Optional[str] = None
     score_final: Optional[float] = None
@@ -104,45 +105,41 @@ def favicon():
     return Response(status_code=204)
 
 
-oauth_state = {}
-
 @app.get("/auth/google")
 def auth_google():
-    authorization_url, state = get_authorization_url()
-
-    oauth_state["state"] = state  # salva o state
-
-    return RedirectResponse(authorization_url)
+    try:
+        authorization_url, _state = get_authorization_url()
+        return RedirectResponse(url=authorization_url)
+    except Exception as exc:
+        return {
+            "ok": False,
+            "error": str(exc),
+            "message": "Nao foi possivel iniciar a autorizacao Google OAuth.",
+        }
 
 
 @app.get("/oauth2callback")
-def oauth2callback(request: Request):
+def oauth2callback(code: str = Query(...)):
     try:
-        code = request.query_params.get("code")
-
-        if not code:
-            return HTMLResponse("Erro: código OAuth não recebido.", status_code=400)
-
         flow = build_flow()
         flow.fetch_token(code=code)
-
         save_credentials(flow.credentials)
 
-        return HTMLResponse("""
-        <h2>✅ Google Sheets autorizado com sucesso!</h2>
-        <p>Agora o backend pode salvar feedbacks na planilha.</p>
-        """)
-
-    except Exception as e:
         return HTMLResponse(
-            f"<pre>{type(e).__name__}: {str(e)}</pre>",
-            status_code=500
+            """
+            <h3>Autorizacao concluida com sucesso.</h3>
+            <p>O backend ja pode salvar feedbacks no Google Sheets.</p>
+            <p>Voce ja pode fechar esta aba.</p>
+            """
         )
-
-    except Exception as e:
+    except Exception as exc:
         return HTMLResponse(
-            f"<h2>Erro no OAuth callback</h2><pre>{type(e).__name__}: {str(e)}</pre>",
-            status_code=500
+            f"""
+            <h3>Erro ao concluir autorizacao Google.</h3>
+            <p>{str(exc)}</p>
+            <p>Verifique GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET, GOOGLE_REDIRECT_URI e GOOGLE_SPREADSHEET_ID.</p>
+            """,
+            status_code=500,
         )
 
 
@@ -239,9 +236,12 @@ def feedback(request: FeedbackRequest):
 
     try:
         return salvar_feedback(
+            search_id=request.search_id,
             query=request.query,
+            rank=request.rank,
             product_id=request.product_id,
             product_name=request.product_name,
+            categoria_produto=request.categoria_produto,
             rating=request.rating,
             is_helpful=request.is_helpful,
             note=request.note,
@@ -263,4 +263,4 @@ def feedback(request: FeedbackRequest):
             "feedback_file": feedback_file,
             "logs_dir_exists": os.path.exists(LOGS_DIR),
             "google_sheets_enabled": google_sheets_habilitado(),
-        }
+        }