Merge remote-tracking branch 'origin/devops' into devops

Author: Locatelli-Flor

.gitignore

@@ -1,3 +1,5 @@
+*.pdf
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

DocsManager/app/core/config.py

@@ -30,6 +30,7 @@ class Settings(BaseSettings):
     minio_secret_key: str
     minio_bucket: str = "documents"
     minio_use_ssl: bool = True
+    minio_folder: str = "rag-docs"  # Folder within bucket for RAG documents
 
     # Database Configuration (for SQLAlchemy)
     database_url: str = ""

DocsManager/app/models/__init__.py

@@ -1,8 +1,7 @@
-# Models package
+"""Models for the DocsManager application."""
+
 from app.models.document import Document
 from app.models.document_chunks import DocumentChunk
-from app.models.chat_session import ChatSession
-from app.models.chat_message import ChatMessage
 
-__all__ = ["Document", "DocumentChunk", "ChatSession", "ChatMessage"]
+__all__ = ["Document", "DocumentChunk"]
 

DocsManager/app/services/chatMessage.py

@@ -1,9 +1,11 @@
 import logging
 from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
 
 from app.api.routes import admin, base
-from app.api.routes.chatMessage import router as chat_router
 from app.core.db_connection import init_db
+# Import models to ensure SQLAlchemy can resolve relationships
+from app.models import Document, DocumentChunk  # noqa: F401
 
 # Configure logging
 logging.basicConfig(
@@ -13,10 +15,18 @@
 
 app = FastAPI(title="Docs Manager API", version="0.1.0")
 
+# Configure CORS - Allow any localhost or 127.0.0.1 with any port
+app.add_middleware(
+    CORSMiddleware,
+    allow_origin_regex=r"https?://(localhost|127\.0\.0\.1)(:\d+)?",
+    allow_credentials=True,
+    allow_methods=["*"],  # Includes OPTIONS
+    allow_headers=["*"],
+)
+
 # Include routers
 app.include_router(base.router)
 app.include_router(admin.router)
-app.include_router(chat_router)
 
 @app.on_event("startup")
 async def startup_event():

DocsManager/main.py

@@ -19,7 +19,6 @@ dependencies = [
     "pika>=1.3.0",
     "minio>=7.2.0",
     "python-multipart>=0.0.6",
-    "ag-ui-protocol>=0.1.10",
 ]
 
 [project.scripts]

DocsManager/pyproject.toml

@@ -0,0 +1,23 @@
+.venv
+__pycache__
+*.pyc
+*.pyo
+*.pyd
+.Python
+*.so
+*.egg
+*.egg-info
+dist
+build
+.git
+.gitignore
+.idea
+.vscode
+*.swp
+*.swo
+*~
+.DS_Store
+.env
+.env.local
+*.log
+

RAGManager/.dockerignore

@@ -19,21 +19,31 @@ COPY pyproject.toml uv.lock* ./
 
 RUN uv sync --no-dev --no-cache
 
-# Run the Guardrails configure command to create a .guardrailsrc file
-# Only configure if GUARDRAILS_API_KEY is provided
-RUN uv run guardrails configure --enable-metrics --enable-remote-inferencing --token "$GUARDRAILS_API_KEY"
-
-# Install required guardrails validators
-RUN uv run guardrails hub install hub://guardrails/detect_jailbreak --no-install-local-models
-RUN uv run guardrails hub install hub://guardrails/detect_pii --no-install-local-models
-RUN uv run guardrails hub install hub://guardrails/toxic_language>=0.0.2 --no-install-local-models
-
-# The ToxicLanguage Validator uses the punkt tokenizer, so we need to download that to a known directory
-# Set the directory for nltk data
-ENV NLTK_DATA=/opt/nltk_data
-
-# Download punkt data
-RUN uv run python -m nltk.downloader -d /opt/nltk_data punkt_tab
+# Guardrails disabled for now to speed up builds
+# # Run the Guardrails configure command to create a .guardrailsrc file
+# # Only configure if GUARDRAILS_API_KEY is provided
+# RUN if [ -n "$GUARDRAILS_API_KEY" ]; then \
+#         uv run guardrails configure --enable-metrics --enable-remote-inferencing --token "$GUARDRAILS_API_KEY"; \
+#     else \
+#         echo "Warning: GUARDRAILS_API_KEY not provided, skipping guardrails configuration"; \
+#     fi
+
+# # Install required guardrails validators
+# # Note: Removing --no-install-local-models to ensure Python packages are installed
+# RUN uv run guardrails hub install hub://guardrails/detect_jailbreak
+# RUN uv run guardrails hub install hub://guardrails/detect_pii
+# RUN uv run guardrails hub install hub://guardrails/toxic_language>=0.0.2
+
+# # Verify packages are accessible (this will fail the build if they're not found)
+# RUN uv run python -c "from guardrails.hub import DetectJailbreak, DetectPII, ToxicLanguage; print('Guardrails validators imported successfully')"
+
+# NLTK disabled - only needed for guardrails ToxicLanguage validator
+# # The ToxicLanguage Validator uses the punkt tokenizer, so we need to download that to a known directory
+# # Set the directory for nltk data
+# ENV NLTK_DATA=/opt/nltk_data
+#
+# # Download punkt data
+# RUN uv run python -m nltk.downloader -d /opt/nltk_data punkt_tab
 
 COPY . .
 

RAGManager/Dockerfile

@@ -4,7 +4,6 @@
 from app.agents.nodes.context_builder import context_builder
 from app.agents.nodes.fallback_final import fallback_final
 from app.agents.nodes.fallback_inicial import fallback_inicial
-from app.agents.nodes.generator import generator
 from app.agents.nodes.guard_final import guard_final
 from app.agents.nodes.guard_inicial import guard_inicial
 from app.agents.nodes.parafraseo import parafraseo
@@ -15,6 +14,7 @@
     "guard_inicial",
     "guard_final",
     "fallback_inicial",
+    "fallback_final",
     "parafraseo",
     "retriever",
     "context_builder",

RAGManager/app/agents/nodes/__init__.py

@@ -55,7 +55,7 @@ def context_builder(state: AgentState) -> AgentState:
         logger.warning("No relevant chunks found for context building")
 
     # Create enriched query combining paraphrased text and context
-   enriched_query = f"""Pregunta del usuario: {paraphrased}
+    enriched_query = f"""Pregunta del usuario: {paraphrased}
 
 Contexto relevante de la base de conocimiento:
 {context_section}