mirror of
https://github.com/trustgraph-ai/trustgraph.git
synced 2026-06-02 11:25:14 +02:00
Release/v1.2 (#457)
* Bump setup.py versions for 1.1 * PoC MCP server (#419) * Very initial MCP server PoC for TrustGraph * Put service on port 8000 * Add MCP container and packages to buildout * Update docs for API/CLI changes in 1.0 (#421) * Update some API basics for the 0.23/1.0 API change * Add MCP container push (#425) * Add command args to the MCP server (#426) * Host and port parameters * Added websocket arg * More docs * MCP client support (#427) - MCP client service - Tool request/response schema - API gateway support for mcp-tool - Message translation for tool request & response - Make mcp-tool using configuration service for information about where the MCP services are. * Feature/react call mcp (#428) Key Features - MCP Tool Integration: Added core MCP tool support with ToolClientSpec and ToolClient classes - API Enhancement: New mcp_tool method for flow-specific tool invocation - CLI Tooling: New tg-invoke-mcp-tool command for testing MCP integration - React Agent Enhancement: Fixed and improved multi-tool invocation capabilities - Tool Management: Enhanced CLI for tool configuration and management Changes - Added MCP tool invocation to API with flow-specific integration - Implemented ToolClientSpec and ToolClient for tool call handling - Updated agent-manager-react to invoke MCP tools with configurable types - Enhanced CLI with new commands and improved help text - Added comprehensive documentation for new CLI commands - Improved tool configuration management Testing - Added tg-invoke-mcp-tool CLI command for isolated MCP integration testing - Enhanced agent capability to invoke multiple tools simultaneously * Test suite executed from CI pipeline (#433) * Test strategy & test cases * Unit tests * Integration tests * Extending test coverage (#434) * Contract tests * Testing embeedings * Agent unit tests * Knowledge pipeline tests * Turn on contract tests * Increase storage test coverage (#435) * Fixing storage and adding tests * PR pipeline only runs quick tests * Empty configuration is returned as empty list, previously was not in response (#436) * Update config util to take files as well as command-line text (#437) * Updated CLI invocation and config model for tools and mcp (#438) * Updated CLI invocation and config model for tools and mcp * CLI anomalies * Tweaked the MCP tool implementation for new model * Update agent implementation to match the new model * Fix agent tools, now all tested * Fixed integration tests * Fix MCP delete tool params * Update Python deps to 1.2 * Update to enable knowledge extraction using the agent framework (#439) * Implement KG extraction agent (kg-extract-agent) * Using ReAct framework (agent-manager-react) * ReAct manager had an issue when emitting JSON, which conflicts which ReAct manager's own JSON messages, so refactored ReAct manager to use traditional ReAct messages, non-JSON structure. * Minor refactor to take the prompt template client out of prompt-template so it can be more readily used by other modules. kg-extract-agent uses this framework. * Migrate from setup.py to pyproject.toml (#440) * Converted setup.py to pyproject.toml * Modern package infrastructure as recommended by py docs * Install missing build deps (#441) * Install missing build deps (#442) * Implement logging strategy (#444) * Logging strategy and convert all prints() to logging invocations * Fix/startup failure (#445) * Fix loggin startup problems * Fix logging startup problems (#446) * Fix logging startup problems (#447) * Fixed Mistral OCR to use current API (#448) * Fixed Mistral OCR to use current API * Added PDF decoder tests * Fix Mistral OCR ident to be standard pdf-decoder (#450) * Fix Mistral OCR ident to be standard pdf-decoder * Correct test * Schema structure refactor (#451) * Write schema refactor spec * Implemented schema refactor spec * Structure data mvp (#452) * Structured data tech spec * Architecture principles * New schemas * Updated schemas and specs * Object extractor * Add .coveragerc * New tests * Cassandra object storage * Trying to object extraction working, issues exist * Validate librarian collection (#453) * Fix token chunker, broken API invocation (#454) * Fix token chunker, broken API invocation (#455) * Knowledge load utility CLI (#456) * Knowledge loader * More tests
This commit is contained in:
parent
c85ba197be
commit
89be656990
509 changed files with 49632 additions and 5159 deletions
1
trustgraph-mcp/README.md
Normal file
1
trustgraph-mcp/README.md
Normal file
|
|
@ -0,0 +1 @@
|
|||
See https://trustgraph.ai/
|
||||
31
trustgraph-mcp/pyproject.toml
Normal file
31
trustgraph-mcp/pyproject.toml
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
[build-system]
|
||||
requires = ["setuptools>=61.0", "wheel"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "trustgraph-mcp"
|
||||
dynamic = ["version"]
|
||||
authors = [{name = "trustgraph.ai", email = "security@trustgraph.ai"}]
|
||||
description = "TrustGraph provides a means to run a pipeline of flexible AI processing components in a flexible means to achieve a processing pipeline."
|
||||
readme = "README.md"
|
||||
requires-python = ">=3.8"
|
||||
dependencies = [
|
||||
"mcp",
|
||||
"websockets",
|
||||
]
|
||||
classifiers = [
|
||||
"Programming Language :: Python :: 3",
|
||||
"Operating System :: OS Independent",
|
||||
]
|
||||
|
||||
[project.urls]
|
||||
Homepage = "https://github.com/trustgraph-ai/trustgraph"
|
||||
|
||||
[project.scripts]
|
||||
mcp-server = "trustgraph.mcp_server:run"
|
||||
|
||||
[tool.setuptools.packages.find]
|
||||
include = ["trustgraph*"]
|
||||
|
||||
[tool.setuptools.dynamic]
|
||||
version = {attr = "trustgraph.mcp_version.__version__"}
|
||||
3
trustgraph-mcp/trustgraph/mcp_server/__init__.py
Normal file
3
trustgraph-mcp/trustgraph/mcp_server/__init__.py
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
|
||||
from . mcp import *
|
||||
|
||||
7
trustgraph-mcp/trustgraph/mcp_server/__main__.py
Executable file
7
trustgraph-mcp/trustgraph/mcp_server/__main__.py
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
from . mcp import run
|
||||
|
||||
if __name__ == '__main__':
|
||||
run()
|
||||
|
||||
2056
trustgraph-mcp/trustgraph/mcp_server/mcp.py
Executable file
2056
trustgraph-mcp/trustgraph/mcp_server/mcp.py
Executable file
File diff suppressed because it is too large
Load diff
129
trustgraph-mcp/trustgraph/mcp_server/tg_socket.py
Normal file
129
trustgraph-mcp/trustgraph/mcp_server/tg_socket.py
Normal file
|
|
@ -0,0 +1,129 @@
|
|||
|
||||
from dataclasses import dataclass
|
||||
from websockets.asyncio.client import connect
|
||||
import asyncio
|
||||
import logging
|
||||
import json
|
||||
import uuid
|
||||
import time
|
||||
|
||||
class WebSocketManager:
|
||||
|
||||
def __init__(self, url):
|
||||
self.url = url
|
||||
self.socket = None
|
||||
|
||||
async def start(self):
|
||||
self.socket = await connect(self.url)
|
||||
self.pending_requests = {}
|
||||
self.running = True
|
||||
self.reader_task = asyncio.create_task(self.reader())
|
||||
|
||||
async def stop(self):
|
||||
self.running = False
|
||||
await self.reader_task
|
||||
|
||||
async def reader(self):
|
||||
"""
|
||||
Background task to read websocket responses and route to correct
|
||||
request
|
||||
"""
|
||||
|
||||
while self.running:
|
||||
try:
|
||||
|
||||
try:
|
||||
response_text = await asyncio.wait_for(
|
||||
self.socket.recv(), 0.5
|
||||
)
|
||||
except TimeoutError:
|
||||
continue
|
||||
|
||||
response = json.loads(response_text)
|
||||
|
||||
request_id = response.get("id")
|
||||
if request_id and request_id in self.pending_requests:
|
||||
# Put the response in the queue
|
||||
queue = self.pending_requests[request_id]
|
||||
await queue.put(response)
|
||||
else:
|
||||
logging.warning(
|
||||
f"Response for unknown request ID: {request_id}"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
|
||||
logging.error(f"Error in websocket reader: {e}")
|
||||
|
||||
# Put error in all pending queues
|
||||
for queue in self.pending_requests.values():
|
||||
try:
|
||||
await queue.put({"error": str(e)})
|
||||
except:
|
||||
pass
|
||||
|
||||
self.pending_requests.clear()
|
||||
break
|
||||
|
||||
await self.socket.close()
|
||||
self.socket = None
|
||||
|
||||
async def request(
|
||||
self, service, request_data, flow_id="default",
|
||||
):
|
||||
"""
|
||||
Send a request via websocket and handle single or streaming responses
|
||||
"""
|
||||
|
||||
# Generate unique request ID
|
||||
request_id = f"{uuid.uuid4()}"
|
||||
|
||||
# Determine if this service streams responses
|
||||
streaming_services = {"agent"}
|
||||
is_streaming = service in streaming_services
|
||||
|
||||
# Create a queue for all responses (streaming and single)
|
||||
response_queue = asyncio.Queue()
|
||||
self.pending_requests[request_id] = response_queue
|
||||
|
||||
try:
|
||||
|
||||
# Build request message
|
||||
message = {
|
||||
"id": request_id,
|
||||
"service": service,
|
||||
"request": request_data,
|
||||
}
|
||||
|
||||
if flow_id is not None:
|
||||
message["flow"] = flow_id
|
||||
|
||||
# Send request
|
||||
await self.socket.send(json.dumps(message))
|
||||
|
||||
while self.running:
|
||||
|
||||
try:
|
||||
response = await asyncio.wait_for(
|
||||
response_queue.get(), 0.5
|
||||
)
|
||||
except TimeoutError:
|
||||
continue
|
||||
|
||||
if "error" in response:
|
||||
if "message" in response["error"]:
|
||||
raise RuntimeError(response["error"]["text"])
|
||||
else:
|
||||
raise RuntimeError(str(response["error"]))
|
||||
|
||||
yield response["response"]
|
||||
|
||||
if "complete" in response:
|
||||
if response["complete"]:
|
||||
break
|
||||
|
||||
except Exception as e:
|
||||
# Clean up on error
|
||||
self.pending_requests.pop(request_id, None)
|
||||
raise e
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue