From ecb07fa1f2a97c3c48c7e7ecc7d62d7523edac37 Mon Sep 17 00:00:00 2001 From: Tilman Griesel Date: Sun, 2 Feb 2025 12:12:35 +0100 Subject: [PATCH] Pass generate route trough RAG pipeline --- services/api/src/api/ollama_routes.py | 20 ++++++++++---------- services/api/src/api/routes.py | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/services/api/src/api/ollama_routes.py b/services/api/src/api/ollama_routes.py index a8a6eb5..f71f3c6 100644 --- a/services/api/src/api/ollama_routes.py +++ b/services/api/src/api/ollama_routes.py @@ -15,16 +15,6 @@ def __init__(self, app, proxy: OllamaProxy): self.register_bypass_routes() def register_bypass_routes(self): - @self.app.route("/api/chat", methods=["POST"]) - @require_api_key - def chat(): - try: - return self.proxy.chat() - except Exception as e: - logger.error(f"Error in chat endpoint: {e}") - return {"error": str(e)}, 500 - - def register_routes(self): # Generation endpoints @self.app.route("/api/generate", methods=["POST"]) @require_api_key @@ -35,6 +25,16 @@ def generate(): logger.error(f"Error in generate endpoint: {e}") return {"error": str(e)}, 500 + @self.app.route("/api/chat", methods=["POST"]) + @require_api_key + def chat(): + try: + return self.proxy.chat() + except Exception as e: + logger.error(f"Error in chat endpoint: {e}") + return {"error": str(e)}, 500 + + def register_routes(self): @self.app.route("/api/embeddings", methods=["POST"]) @require_api_key def embeddings(): diff --git a/services/api/src/api/routes.py b/services/api/src/api/routes.py index 717684f..68451e9 100644 --- a/services/api/src/api/routes.py +++ b/services/api/src/api/routes.py @@ -52,6 +52,7 @@ def log_request_info(request): def register_rag_chat_route(app: Flask): @app.route("/api/chat", methods=["POST"]) + @app.route("/api/generate", methods=["POST"]) @require_api_key def chat(): try: