Update server.py

server.py

@@ -43,10 +43,9 @@ Settings.embed_model = embed_model
 
 # Configuración inicial
 DOCUMENTS_BASE_PATH = "./"
-SOURCES = {
-    "oms": "oms/",
-    #"fda": "fda/"
-}
+
+# Cargar automáticamente las fuentes desde el JSON
+SOURCES = {source: f"{source.lower()}/" for source in retrievers_metadata.keys()}
 
 indices: Dict[str, VectorStoreIndex] = {}
 
@@ -62,17 +61,8 @@ for source, rel_path in SOURCES.items():
             try:
                 storage_path = os.path.join(root, "storage_nodes")
                 storage_context = StorageContext.from_defaults(persist_dir=storage_path)
-                
-                # Usamos directamente el nombre de la carpeta (vec_who_1, etc.)
                 index_name = os.path.basename(root)
-                
-                index = load_index_from_storage(storage_context, index_id="vector_index")
-                indices[index_name] = index  # Guardamos con el nombre directo
-                
-                # Verificación opcional de metadatos
-                if index_name not in retrievers_metadata.get(source, {}):
-                    print(f"Advertencia: No hay metadatos para {index_name} en retrievers.json")
-                    
+                indices[index_name] = index  # Guardamos con nombre directo
             except Exception as e:
                 print(f"Error cargando índice en {root}: {str(e)}")
                 continue
@@ -91,36 +81,32 @@ mcp = FastMCP("OnBase", port=port)
 @mcp.resource(
     uri="info://available_retrievers",
     name="AvailableRetrievers",
-    description="Lista completa de retrievers con metadatos",
+    description="Lista completa de retrievers disponibles",
     mime_type="application/json"
 )
 def get_available_retrievers() -> dict:
+    # Generar automáticamente la lista desde el JSON
     available = []
     
-    for index_name in indices.keys():
-        # Determinar la fuente (oms/fda) basado en el prefijo
-        source = "oms" if index_name.startswith("vec_who") else "fda"
-        
-        # Obtener metadatos
-        metadata = retrievers_metadata.get(source, {}).get(index_name, {})
-        
-        available.append({
-            "name": index_name,  # Ej: "vec_who_1"
-            "source": source,
-            "description": metadata.get("description", "Descripción no disponible"),
-            "content_info": metadata.get("content_info", "Información no disponible"),
-            "last_updated": metadata.get("last_updated", "Desconocido")
-        })
+    for source, indexes in retrievers_metadata.items():
+        for index_name, metadata in indexes.items():
+            available.append({
+                "name": index_name,
+                "source": source,
+                "description": metadata.get("description", ""),
+                "content_info": metadata.get("content_info", "")
+            })
     
     return {
         "retrievers": available,
+        "sources": list(retrievers_metadata.keys()),
         "count": len(available)
     }
 
 @mcp.tool()
 def retrieve_docs(
     query: str,
-    retrievers: List[str],  # Nombres directos (vec_who_1, etc.)
+    retrievers: List[str],
     top_k: int = 3
 ) -> dict:
     results = {}
@@ -135,28 +121,41 @@ def retrieve_docs(
             retriever = indices[name].as_retriever(similarity_top_k=top_k)
             nodes = retriever.retrieve(query)
             
-            results[name] = [
-                {
-                    "content": node.get_content(),
-                    "metadata": node.metadata,
-                    "score": node.score
-                }
-                for node in nodes
-            ]
+            # Obtener metadatos del JSON si existen
+            metadata = {}
+            for source in retrievers_metadata.values():
+                if name in source:
+                    metadata = source[name]
+                    break
+            
+            results[name] = {
+                "documents": [
+                    {
+                        "content": node.get_content(),
+                        "metadata": node.metadata,
+                        "score": node.score
+                    }
+                    for node in nodes
+                ],
+                "description": metadata.get("description", ""),
+                "source": next((s for s, idx in retrievers_metadata.items() if name in idx), "unknown")
+            }
         except Exception as e:
             results[name] = {"error": str(e)}
     
+    response = {
+        "query": query,
+        "results": results,
+        "top_k": top_k
+    }
+    
     if invalid:
-        results["_warnings"] = {
+        response["warnings"] = {
             "invalid_retrievers": invalid,
             "valid_options": list(indices.keys())
         }
     
-    return {
-        "query": query,
-        "results": results,
-        "top_k": top_k
-    }
+    return response