Merge branch 'main' into refactor

Author: nemozak1

README.md

@@ -18,31 +18,11 @@ You can also then run commands by first activating `poetry shell` which should a
 After installing poetry, install the poetry shell plugin with `poetry self add poetry-plugin-shell` and you should be good to go.
 
 
-### 2. Creating the vector database
-Create the 'data' folder by running 
-```bash
-mkdir src/data
-``` 
-Check the README.md in the `src/scripts` directory for more information on how to populate the vector database.
-
-Run the vector database population script to create the vector database collections:
-```bash
-python src/database/populate_vector_db.py
-```
+### 2. Setting up MCP tools
 
-#### Automatic Database Updates
-Opey II can automatically check for OBP data changes on startup and update the vector database when changes are detected. To enable this feature, set in your `.env`:
-
-```env
-UPDATE_DATABASE_ON_STARTUP="true"
-UPDATE_DATABASE_ENDPOINT_TYPE="all"  # Options: "static", "dynamic", "all"
-```
+`cp mcp_servers.example.json mcp_servers.json`
 
-When enabled, the system will:
-- Fetch current OBP glossary and endpoint data on startup
-- Compare with previously imported data using SHA-256 hashes
-- Rebuild the database only if changes are detected
-- Store hashes for future comparisons
+As a minimum, Opey should be connected to [OBP-MCP](https://github.com/OpenBankProject/OBP-MCP), or it won't know anything about the Open Bank Project except for what you put in the [system prompt](#5-changing-the-system-prompt). Instructions for setting up OBP-MCP as an internal, consent-based MCP server that works with OBP-Portal etc. can be found in [Appendix 1](https://github.com/OpenBankProject/OBP-MCP/blob/main/README.md#appendix-1---opey-setup) of the OBP-MCP readme. 
 
 ### 3. Setting up the environment 
 First you will need to rename the `.env.example` file to `.env` and change several parameters. You have options on which LLM provider you decide to use for the backend agent system. 

mcp_servers.example.json

@@ -4,14 +4,14 @@
       "name": "obp-mcp",
       "url": "http://localhost:9100/mcp",
       "transport": "streamable_http",
-      "requires_auth": true,
-      "_comment": "OBP-MCP server with bearer token auth (token from frontend OAuth flow)"
+      "forward_bearer_token": true,
+      "_comment": "OBP-MCP server - forwards the user's OAuth bearer token via Authorization header"
     },
     {
       "name": "local-tools",
       "url": "http://localhost:8001/mcp",
       "transport": "streamable_http",
-      "requires_auth": false,
+      "forward_bearer_token": false,
       "_comment": "Local MCP server without authentication"
     },
     {

src/agent/components/tools/mcp_integration.py

@@ -40,9 +40,9 @@ class MCPServerConfig:
     url: Optional[str] = None
     headers: Dict[str, str] = field(default_factory=dict)
 
-    # Whether this server requires bearer token authentication
-    # If True, the bearer token from the session will be added to requests
-    requires_auth: bool = False
+    # Whether to forward the user's bearer token to this server
+    # If True, the bearer token from the session will be added as an Authorization header
+    forward_bearer_token: bool = False
 
     # stdio transport
     command: Optional[str] = None
@@ -64,7 +64,7 @@ def __init__(self, servers: List[MCPServerConfig], bearer_token: Optional[str] =
         Args:
             servers: List of server configurations
             bearer_token: Optional bearer token for authenticated requests.
-                         If provided, adds Authorization header to servers with requires_auth=True.
+                         If provided, adds Authorization header to servers with forward_bearer_token=True.
         """
         self.servers = servers
         self.bearer_token = bearer_token
@@ -134,11 +134,11 @@ def _build_client_config(self) -> Dict[str, Any]:
 
                 # Build headers, injecting bearer token if needed
                 headers = dict(server.headers)  # Copy to avoid mutating config
-                if server.requires_auth and self.bearer_token:
+                if server.forward_bearer_token and self.bearer_token:
                     headers["Authorization"] = f"Bearer {self.bearer_token}"
                     logger.debug(f"Injecting bearer token for MCP server '{server.name}'")
-                elif server.requires_auth and not self.bearer_token:
-                    logger.warning(f"MCP server '{server.name}' requires auth but no bearer token provided")
+                elif server.forward_bearer_token and not self.bearer_token:
+                    logger.warning(f"MCP server '{server.name}' has forward_bearer_token=true but no bearer token provided")
 
                 if headers:
                     config["headers"] = headers

src/service/mcp_tools_cache.py

@@ -92,7 +92,8 @@ def _parse_mcp_config() -> List[MCPServerConfig]:
                 url=raw.get("url"),
                 transport=raw.get("transport", "streamable_http"),
                 headers=raw.get("headers", {}),
-                requires_auth=raw.get("requires_auth", False),
+                # Support both new "forward_bearer_token" and legacy "requires_auth"
+                forward_bearer_token=raw.get("forward_bearer_token", raw.get("requires_auth", False)),
                 command=raw.get("command"),
                 args=raw.get("args", []),
                 env=raw.get("env"),
@@ -124,8 +125,8 @@ async def initialize_mcp_tools() -> List[BaseTool]:
         return []
 
     # Split servers by auth requirement
-    no_auth_servers = [s for s in _server_configs if not s.requires_auth]
-    auth_servers = [s.name for s in _server_configs if s.requires_auth]
+    no_auth_servers = [s for s in _server_configs if not s.forward_bearer_token]
+    auth_servers = [s.name for s in _server_configs if s.forward_bearer_token]
 
     if auth_servers:
         logger.info(f"Servers requiring auth (loaded per-request): {auth_servers}")
@@ -178,7 +179,7 @@ def get_server_configs() -> List[MCPServerConfig]:
 def get_auth_required_servers() -> List[str]:
     """Get list of server names that require bearer token authentication."""
     configs = get_server_configs()
-    return [s.name for s in configs if s.requires_auth]
+    return [s.name for s in configs if s.forward_bearer_token]
 
 
 async def get_mcp_tools_with_auth(bearer_token: Optional[str] = None) -> List[BaseTool]: