mirror of
https://github.com/trustgraph-ai/trustgraph.git
synced 2026-05-15 18:35:15 +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.
519 lines
No EOL
20 KiB
Python
519 lines
No EOL
20 KiB
Python
"""
|
|
Structured Data Diagnosis Service - analyzes structured data and generates descriptors.
|
|
Supports three operations: detect-type, generate-descriptor, and diagnose (combined).
|
|
"""
|
|
|
|
import json
|
|
import logging
|
|
from typing import Dict, Any, Optional
|
|
|
|
from ...schema import StructuredDataDiagnosisRequest, StructuredDataDiagnosisResponse
|
|
from ...schema import PromptRequest, Error, RowSchema, Field as SchemaField
|
|
|
|
from ...base import FlowProcessor, ConsumerSpec, ProducerSpec, PromptClientSpec
|
|
|
|
from .type_detector import detect_data_type, detect_csv_options
|
|
|
|
# Module logger
|
|
logger = logging.getLogger(__name__)
|
|
|
|
default_ident = "structured-diag"
|
|
default_csv_prompt = "diagnose-csv"
|
|
default_json_prompt = "diagnose-json"
|
|
default_xml_prompt = "diagnose-xml"
|
|
default_schema_selection_prompt = "schema-selection"
|
|
|
|
|
|
class Processor(FlowProcessor):
|
|
|
|
def __init__(self, **params):
|
|
|
|
id = params.get("id", default_ident)
|
|
|
|
# Config key for schemas
|
|
self.config_key = params.get("config_type", "schema")
|
|
|
|
# Configurable prompt template names
|
|
self.csv_prompt = params.get("csv_prompt", default_csv_prompt)
|
|
self.json_prompt = params.get("json_prompt", default_json_prompt)
|
|
self.xml_prompt = params.get("xml_prompt", default_xml_prompt)
|
|
self.schema_selection_prompt = params.get("schema_selection_prompt", default_schema_selection_prompt)
|
|
|
|
super(Processor, self).__init__(
|
|
**params | {
|
|
"id": id,
|
|
"config_type": self.config_key,
|
|
}
|
|
)
|
|
|
|
self.register_specification(
|
|
ConsumerSpec(
|
|
name = "request",
|
|
schema = StructuredDataDiagnosisRequest,
|
|
handler = self.on_message
|
|
)
|
|
)
|
|
|
|
self.register_specification(
|
|
ProducerSpec(
|
|
name = "response",
|
|
schema = StructuredDataDiagnosisResponse,
|
|
)
|
|
)
|
|
|
|
# Client spec for calling prompt service
|
|
self.register_specification(
|
|
PromptClientSpec(
|
|
request_name = "prompt-request",
|
|
response_name = "prompt-response",
|
|
)
|
|
)
|
|
|
|
# Register config handler for schema updates
|
|
self.register_config_handler(self.on_schema_config, types=["schema"])
|
|
|
|
# Per-workspace schema storage: {workspace: {name: RowSchema}}
|
|
self.schemas: Dict[str, Dict[str, RowSchema]] = {}
|
|
|
|
logger.info("Structured Data Diagnosis service initialized")
|
|
|
|
async def on_schema_config(self, workspace, config, version):
|
|
"""Handle schema configuration updates"""
|
|
logger.info(
|
|
f"Loading schema configuration version {version} "
|
|
f"for workspace {workspace}"
|
|
)
|
|
|
|
# Replace existing schemas for this workspace
|
|
ws_schemas: Dict[str, RowSchema] = {}
|
|
self.schemas[workspace] = ws_schemas
|
|
|
|
# Check if our config type exists
|
|
if self.config_key not in config:
|
|
logger.warning(
|
|
f"No '{self.config_key}' type in configuration "
|
|
f"for {workspace}"
|
|
)
|
|
return
|
|
|
|
# Get the schemas dictionary for our type
|
|
schemas_config = config[self.config_key]
|
|
|
|
# Process each schema in the schemas config
|
|
for schema_name, schema_json in schemas_config.items():
|
|
try:
|
|
# Parse the JSON schema definition
|
|
schema_def = json.loads(schema_json)
|
|
|
|
# Create Field objects
|
|
fields = []
|
|
for field_def in schema_def.get("fields", []):
|
|
field = SchemaField(
|
|
name=field_def["name"],
|
|
type=field_def["type"],
|
|
size=field_def.get("size", 0),
|
|
primary=field_def.get("primary_key", False),
|
|
description=field_def.get("description", ""),
|
|
required=field_def.get("required", False),
|
|
enum_values=field_def.get("enum", []),
|
|
indexed=field_def.get("indexed", False)
|
|
)
|
|
fields.append(field)
|
|
|
|
# Create RowSchema
|
|
row_schema = RowSchema(
|
|
name=schema_def.get("name", schema_name),
|
|
description=schema_def.get("description", ""),
|
|
fields=fields
|
|
)
|
|
|
|
ws_schemas[schema_name] = row_schema
|
|
logger.info(
|
|
f"Loaded schema: {schema_name} with "
|
|
f"{len(fields)} fields for {workspace}"
|
|
)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to parse schema {schema_name}: {e}", exc_info=True)
|
|
|
|
logger.info(
|
|
f"Schema configuration loaded for {workspace}: "
|
|
f"{len(ws_schemas)} schemas"
|
|
)
|
|
|
|
async def on_message(self, msg, consumer, flow):
|
|
"""Handle incoming structured data diagnosis request"""
|
|
|
|
try:
|
|
request = msg.value()
|
|
|
|
# Sender-produced ID
|
|
id = msg.properties()["id"]
|
|
|
|
logger.info(f"Handling structured data diagnosis request {id}: operation={request.operation}")
|
|
|
|
if request.operation == "detect-type":
|
|
response = await self.detect_type_operation(request, flow)
|
|
elif request.operation == "generate-descriptor":
|
|
response = await self.generate_descriptor_operation(request, flow)
|
|
elif request.operation == "diagnose":
|
|
response = await self.diagnose_operation(request, flow)
|
|
elif request.operation == "schema-selection":
|
|
response = await self.schema_selection_operation(request, flow)
|
|
else:
|
|
error = Error(
|
|
type="InvalidOperation",
|
|
message=f"Unknown operation: {request.operation}. Supported: detect-type, generate-descriptor, diagnose, schema-selection"
|
|
)
|
|
response = StructuredDataDiagnosisResponse(
|
|
error=error,
|
|
operation=request.operation
|
|
)
|
|
|
|
# Send response
|
|
await flow("response").send(
|
|
response, properties={"id": id}
|
|
)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error processing diagnosis request: {e}", exc_info=True)
|
|
|
|
error = Error(
|
|
type="ProcessingError",
|
|
message=f"Failed to process diagnosis request: {str(e)}"
|
|
)
|
|
|
|
response = StructuredDataDiagnosisResponse(
|
|
error=error,
|
|
operation=request.operation if request else "unknown"
|
|
)
|
|
|
|
await flow("response").send(
|
|
response, properties={"id": id}
|
|
)
|
|
|
|
async def detect_type_operation(self, request: StructuredDataDiagnosisRequest, flow) -> StructuredDataDiagnosisResponse:
|
|
"""Handle detect-type operation"""
|
|
logger.info("Processing detect-type operation")
|
|
|
|
detected_type, confidence = detect_data_type(request.sample)
|
|
|
|
metadata = {}
|
|
if detected_type == "csv":
|
|
csv_options = detect_csv_options(request.sample)
|
|
metadata["csv_options"] = json.dumps(csv_options)
|
|
|
|
return StructuredDataDiagnosisResponse(
|
|
error=None,
|
|
operation=request.operation,
|
|
detected_type=detected_type or "",
|
|
confidence=confidence,
|
|
metadata=metadata
|
|
)
|
|
|
|
async def generate_descriptor_operation(self, request: StructuredDataDiagnosisRequest, flow) -> StructuredDataDiagnosisResponse:
|
|
"""Handle generate-descriptor operation"""
|
|
logger.info(f"Processing generate-descriptor operation for type: {request.type}")
|
|
|
|
if not request.type:
|
|
error = Error(
|
|
type="MissingParameter",
|
|
message="Type parameter is required for generate-descriptor operation"
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
if not request.schema_name:
|
|
error = Error(
|
|
type="MissingParameter",
|
|
message="Schema name parameter is required for generate-descriptor operation"
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
# Get target schema from this workspace's schemas
|
|
ws_schemas = self.schemas.get(flow.workspace, {})
|
|
if request.schema_name not in ws_schemas:
|
|
error = Error(
|
|
type="SchemaNotFound",
|
|
message=(
|
|
f"Schema '{request.schema_name}' not found "
|
|
f"in configuration for workspace {flow.workspace}"
|
|
)
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
target_schema = ws_schemas[request.schema_name]
|
|
|
|
# Generate descriptor using prompt service
|
|
descriptor = await self.generate_descriptor_with_prompt(
|
|
request.sample, request.type, target_schema, request.options, flow
|
|
)
|
|
|
|
if descriptor is None:
|
|
error = Error(
|
|
type="DescriptorGenerationFailed",
|
|
message="Failed to generate descriptor using prompt service"
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
return StructuredDataDiagnosisResponse(
|
|
error=None,
|
|
operation=request.operation,
|
|
descriptor=json.dumps(descriptor),
|
|
metadata={"schema_name": request.schema_name, "type": request.type}
|
|
)
|
|
|
|
async def diagnose_operation(self, request: StructuredDataDiagnosisRequest, flow) -> StructuredDataDiagnosisResponse:
|
|
"""Handle combined diagnose operation"""
|
|
logger.info("Processing combined diagnose operation")
|
|
|
|
# Step 1: Detect type
|
|
detected_type, confidence = detect_data_type(request.sample)
|
|
|
|
if not detected_type:
|
|
error = Error(
|
|
type="TypeDetectionFailed",
|
|
message="Unable to detect data type from sample"
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
# Step 2: Use provided schema name or auto-select first available
|
|
ws_schemas = self.schemas.get(flow.workspace, {})
|
|
schema_name = request.schema_name
|
|
if not schema_name and ws_schemas:
|
|
schema_name = list(ws_schemas.keys())[0]
|
|
logger.info(f"Auto-selected schema: {schema_name}")
|
|
|
|
if not schema_name:
|
|
error = Error(
|
|
type="NoSchemaAvailable",
|
|
message=(
|
|
f"No schema specified and no schemas available "
|
|
f"in configuration for workspace {flow.workspace}"
|
|
)
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
if schema_name not in ws_schemas:
|
|
error = Error(
|
|
type="SchemaNotFound",
|
|
message=(
|
|
f"Schema '{schema_name}' not found in "
|
|
f"configuration for workspace {flow.workspace}"
|
|
)
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
target_schema = ws_schemas[schema_name]
|
|
|
|
# Step 3: Generate descriptor
|
|
descriptor = await self.generate_descriptor_with_prompt(
|
|
request.sample, detected_type, target_schema, request.options, flow
|
|
)
|
|
|
|
if descriptor is None:
|
|
error = Error(
|
|
type="DescriptorGenerationFailed",
|
|
message="Failed to generate descriptor using prompt service"
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
metadata = {
|
|
"schema_name": schema_name,
|
|
"auto_selected_schema": request.schema_name != schema_name
|
|
}
|
|
|
|
if detected_type == "csv":
|
|
csv_options = detect_csv_options(request.sample)
|
|
metadata["csv_options"] = json.dumps(csv_options)
|
|
|
|
return StructuredDataDiagnosisResponse(
|
|
error=None,
|
|
operation=request.operation,
|
|
detected_type=detected_type,
|
|
confidence=confidence,
|
|
descriptor=json.dumps(descriptor),
|
|
metadata=metadata
|
|
)
|
|
|
|
async def schema_selection_operation(self, request: StructuredDataDiagnosisRequest, flow) -> StructuredDataDiagnosisResponse:
|
|
"""Handle schema-selection operation"""
|
|
logger.info("Processing schema-selection operation")
|
|
|
|
# Prepare all schemas for the prompt - match the original config format
|
|
ws_schemas = self.schemas.get(flow.workspace, {})
|
|
all_schemas = []
|
|
for schema_name, row_schema in ws_schemas.items():
|
|
schema_info = {
|
|
"name": row_schema.name,
|
|
"description": row_schema.description,
|
|
"fields": [
|
|
{
|
|
"name": f.name,
|
|
"type": f.type,
|
|
"description": f.description,
|
|
"required": f.required,
|
|
"primary_key": f.primary,
|
|
"indexed": f.indexed,
|
|
"enum": f.enum_values if f.enum_values else [],
|
|
"size": f.size if hasattr(f, 'size') else 0
|
|
}
|
|
for f in row_schema.fields
|
|
]
|
|
}
|
|
all_schemas.append(schema_info)
|
|
|
|
# Create prompt variables - schemas array contains ALL schemas
|
|
# Note: The prompt expects 'question' not 'sample'
|
|
variables = {
|
|
"question": request.sample, # The prompt template expects 'question'
|
|
"schemas": all_schemas,
|
|
"options": request.options or {}
|
|
}
|
|
|
|
# Call prompt service with configurable template
|
|
terms = {k: json.dumps(v) for k, v in variables.items()}
|
|
prompt_request = PromptRequest(
|
|
id=self.schema_selection_prompt,
|
|
terms=terms
|
|
)
|
|
|
|
try:
|
|
logger.info(f"Calling prompt service for schema selection with template: {self.schema_selection_prompt}")
|
|
response = await flow("prompt-request").request(prompt_request)
|
|
|
|
if response.error:
|
|
logger.error(f"Prompt service error: {response.error.message}")
|
|
error = Error(
|
|
type="PromptServiceError",
|
|
message="Failed to select schemas using prompt service"
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
# Check both text and object fields for response
|
|
response_data = None
|
|
if response.object and response.object.strip():
|
|
response_data = response.object.strip()
|
|
logger.debug(f"Using response from 'object' field: {response_data}")
|
|
elif response.text and response.text.strip():
|
|
response_data = response.text.strip()
|
|
logger.debug(f"Using response from 'text' field: {response_data}")
|
|
else:
|
|
logger.error("Empty response from prompt service (checked both text and object fields)")
|
|
error = Error(
|
|
type="PromptServiceError",
|
|
message="Empty response from prompt service"
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
# Parse the response as JSON array of schema IDs
|
|
try:
|
|
schema_matches = json.loads(response_data)
|
|
if not isinstance(schema_matches, list):
|
|
raise ValueError("Response must be an array")
|
|
except (json.JSONDecodeError, ValueError) as e:
|
|
logger.error(f"Failed to parse schema matches response: {e}")
|
|
error = Error(
|
|
type="ParseError",
|
|
message="Failed to parse schema selection response as JSON array"
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
return StructuredDataDiagnosisResponse(
|
|
error=None,
|
|
operation=request.operation,
|
|
schema_matches=schema_matches
|
|
)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error calling prompt service: {e}", exc_info=True)
|
|
error = Error(
|
|
type="PromptServiceError",
|
|
message="Failed to select schemas using prompt service"
|
|
)
|
|
return StructuredDataDiagnosisResponse(error=error, operation=request.operation)
|
|
|
|
async def generate_descriptor_with_prompt(
|
|
self, sample: str, data_type: str, target_schema: RowSchema,
|
|
options: Dict[str, str], flow
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""Generate descriptor using appropriate prompt service"""
|
|
|
|
# Select prompt template based on data type
|
|
prompt_templates = {
|
|
"csv": self.csv_prompt,
|
|
"json": self.json_prompt,
|
|
"xml": self.xml_prompt
|
|
}
|
|
|
|
prompt_id = prompt_templates.get(data_type)
|
|
if not prompt_id:
|
|
logger.error(f"No prompt template defined for data type: {data_type}")
|
|
return None
|
|
|
|
# Prepare schema information for prompt
|
|
schema_info = {
|
|
"name": target_schema.name,
|
|
"description": target_schema.description,
|
|
"fields": [
|
|
{
|
|
"name": f.name,
|
|
"type": f.type,
|
|
"description": f.description,
|
|
"required": f.required,
|
|
"primary_key": f.primary,
|
|
"indexed": f.indexed,
|
|
"enum_values": f.enum_values if f.enum_values else []
|
|
}
|
|
for f in target_schema.fields
|
|
]
|
|
}
|
|
|
|
# Create prompt variables
|
|
variables = {
|
|
"sample": sample,
|
|
"schemas": [schema_info], # Array with single target schema
|
|
"options": options or {}
|
|
}
|
|
|
|
# Call prompt service
|
|
terms = {k: json.dumps(v) for k, v in variables.items()}
|
|
prompt_request = PromptRequest(
|
|
id=prompt_id,
|
|
terms=terms
|
|
)
|
|
|
|
try:
|
|
logger.info(f"Calling prompt service with template: {prompt_id}")
|
|
response = await flow("prompt-request").request(prompt_request)
|
|
|
|
if response.error:
|
|
logger.error(f"Prompt service error: {response.error.message}")
|
|
return None
|
|
|
|
# Parse response
|
|
if response.object:
|
|
try:
|
|
return json.loads(response.object)
|
|
except json.JSONDecodeError as e:
|
|
logger.error(f"Failed to parse prompt response as JSON: {e}")
|
|
logger.debug(f"Response object: {response.object}")
|
|
return None
|
|
elif response.text:
|
|
try:
|
|
return json.loads(response.text)
|
|
except json.JSONDecodeError as e:
|
|
logger.error(f"Failed to parse prompt text response as JSON: {e}")
|
|
logger.debug(f"Response text: {response.text}")
|
|
return None
|
|
else:
|
|
logger.error("Empty response from prompt service")
|
|
return None
|
|
|
|
except Exception as e:
|
|
logger.error(f"Error calling prompt service: {e}", exc_info=True)
|
|
return None
|
|
|
|
|
|
def run():
|
|
"""Entry point for structured-diag command"""
|
|
Processor.launch(default_ident, __doc__) |