mirror of
https://github.com/trustgraph-ai/trustgraph.git
synced 2026-05-07 06:12:38 +02:00
Introduces `workspace` as the isolation boundary for config, flows,
library, and knowledge data. Removes `user` as a schema-level field
throughout the code, API specs, and tests; workspace provides the
same separation more cleanly at the trusted flow.workspace layer
rather than through client-supplied message fields.
Design
------
- IAM tech spec (docs/tech-specs/iam.md) documents current state,
proposed auth/access model, and migration direction.
- Data ownership model (docs/tech-specs/data-ownership-model.md)
captures the workspace/collection/flow hierarchy.
Schema + messaging
------------------
- Drop `user` field from AgentRequest/Step, GraphRagQuery,
DocumentRagQuery, Triples/Graph/Document/Row EmbeddingsRequest,
Sparql/Rows/Structured QueryRequest, ToolServiceRequest.
- Keep collection/workspace routing via flow.workspace at the
service layer.
- Translators updated to not serialise/deserialise user.
API specs
---------
- OpenAPI schemas and path examples cleaned of user fields.
- Websocket async-api messages updated.
- Removed the unused parameters/User.yaml.
Services + base
---------------
- Librarian, collection manager, knowledge, config: all operations
scoped by workspace. Config client API takes workspace as first
positional arg.
- `flow.workspace` set at flow start time by the infrastructure;
no longer pass-through from clients.
- Tool service drops user-personalisation passthrough.
CLI + SDK
---------
- tg-init-workspace and workspace-aware import/export.
- All tg-* commands drop user args; accept --workspace.
- Python API/SDK (flow, socket_client, async_*, explainability,
library) drop user kwargs from every method signature.
MCP server
----------
- All tool endpoints drop user parameters; socket_manager no longer
keyed per user.
Flow service
------------
- Closure-based topic cleanup on flow stop: only delete topics
whose blueprint template was parameterised AND no remaining
live flow (across all workspaces) still resolves to that topic.
Three scopes fall out naturally from template analysis:
* {id} -> per-flow, deleted on stop
* {blueprint} -> per-blueprint, kept while any flow of the
same blueprint exists
* {workspace} -> per-workspace, kept while any flow in the
workspace exists
* literal -> global, never deleted (e.g. tg.request.librarian)
Fixes a bug where stopping a flow silently destroyed the global
librarian exchange, wedging all library operations until manual
restart.
RabbitMQ backend
----------------
- heartbeat=60, blocked_connection_timeout=300. Catches silently
dead connections (broker restart, orphaned channels, network
partitions) within ~2 heartbeat windows, so the consumer
reconnects and re-binds its queue rather than sitting forever
on a zombie connection.
Tests
-----
- Full test refresh: unit, integration, contract, provenance.
- Dropped user-field assertions and constructor kwargs across
~100 test files.
- Renamed user-collection isolation tests to workspace-collection.
146 lines
No EOL
3.9 KiB
Python
146 lines
No EOL
3.9 KiB
Python
"""
|
|
Configures and registers MCP (Model Context Protocol) tools in the
|
|
TrustGraph system.
|
|
|
|
MCP tools are external services that follow the Model Context Protocol
|
|
specification. This script stores MCP tool configurations with:
|
|
- id: Unique identifier for the tool
|
|
- remote-name: Name used by the MCP server (defaults to id)
|
|
- url: MCP server endpoint URL
|
|
- auth-token: Optional bearer token for authentication
|
|
|
|
Configurations are stored in the 'mcp' configuration group and can be
|
|
referenced by agent tools using the 'mcp-tool' type.
|
|
"""
|
|
|
|
import argparse
|
|
import os
|
|
from trustgraph.api import Api, ConfigValue
|
|
import textwrap
|
|
import json
|
|
|
|
default_url = os.getenv("TRUSTGRAPH_URL", 'http://localhost:8088/')
|
|
default_token = os.getenv("TRUSTGRAPH_TOKEN", None)
|
|
default_workspace = os.getenv("TRUSTGRAPH_WORKSPACE", "default")
|
|
|
|
def set_mcp_tool(
|
|
url : str,
|
|
id : str,
|
|
remote_name : str,
|
|
tool_url : str,
|
|
auth_token : str = None,
|
|
token : str = None,
|
|
workspace : str = "default",
|
|
):
|
|
|
|
api = Api(url, token=token, workspace=workspace).config()
|
|
|
|
# Build the MCP tool configuration
|
|
config = {
|
|
"remote-name": remote_name,
|
|
"url": tool_url,
|
|
}
|
|
|
|
if auth_token:
|
|
config["auth-token"] = auth_token
|
|
|
|
# Store the MCP tool configuration in the 'mcp' group
|
|
values = api.put([
|
|
ConfigValue(
|
|
type="mcp", key=id, value=json.dumps(config)
|
|
)
|
|
])
|
|
|
|
def main():
|
|
|
|
parser = argparse.ArgumentParser(
|
|
prog='tg-set-mcp-tool',
|
|
description=__doc__,
|
|
epilog=textwrap.dedent('''
|
|
MCP tools are configured with a name and URL. The URL should point
|
|
to the MCP server endpoint that provides the tool functionality.
|
|
Optionally, an auth-token can be provided for secured endpoints.
|
|
|
|
Examples:
|
|
%(prog)s --id weather --tool-url "http://localhost:3000/weather"
|
|
%(prog)s --id calculator --tool-url "http://mcp-tools.example.com/calc"
|
|
%(prog)s --id secure-tool --tool-url "https://api.example.com/mcp" \\
|
|
--auth-token "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9..."
|
|
''').strip(),
|
|
formatter_class=argparse.RawDescriptionHelpFormatter
|
|
)
|
|
|
|
parser.add_argument(
|
|
'-u', '--api-url',
|
|
default=default_url,
|
|
help=f'API URL (default: {default_url})',
|
|
)
|
|
|
|
parser.add_argument(
|
|
'-t', '--token',
|
|
default=default_token,
|
|
help='Authentication token (default: $TRUSTGRAPH_TOKEN)',
|
|
)
|
|
|
|
parser.add_argument(
|
|
'-w', '--workspace',
|
|
default=default_workspace,
|
|
help=f'Workspace (default: {default_workspace})',
|
|
)
|
|
|
|
parser.add_argument(
|
|
'-i', '--id',
|
|
required=True,
|
|
help='MCP tool identifier',
|
|
)
|
|
|
|
parser.add_argument(
|
|
'-r', '--remote-name',
|
|
required=False,
|
|
help='Remote MCP tool name (defaults to --id if not specified)',
|
|
)
|
|
|
|
parser.add_argument(
|
|
'--tool-url',
|
|
required=True,
|
|
help='MCP tool URL endpoint',
|
|
)
|
|
|
|
parser.add_argument(
|
|
'--auth-token',
|
|
required=False,
|
|
help='Bearer token for authentication (optional)',
|
|
)
|
|
|
|
args = parser.parse_args()
|
|
|
|
try:
|
|
|
|
if not args.id:
|
|
raise RuntimeError("Must specify --id for MCP tool")
|
|
|
|
if not args.tool_url:
|
|
raise RuntimeError("Must specify --tool-url for MCP tool")
|
|
|
|
if args.remote_name:
|
|
remote_name = args.remote_name
|
|
else:
|
|
remote_name = args.id
|
|
|
|
set_mcp_tool(
|
|
url=args.api_url,
|
|
id=args.id,
|
|
remote_name=remote_name,
|
|
tool_url=args.tool_url,
|
|
auth_token=args.auth_token,
|
|
token=args.token,
|
|
|
|
workspace=args.workspace,
|
|
)
|
|
|
|
except Exception as e:
|
|
|
|
print("Exception:", e, flush=True)
|
|
|
|
if __name__ == "__main__":
|
|
main() |