dtoro
b02f94bfd4
Problem: relationship create/end existed as three drifted copies (HTTP CreateRelationship/EndRelationship, MCP create_relationship/ end_relationship) with inline SQL, no ontology edge validation on either path, and no audit on the MCP path. Change: - Internal/adapters/postgres/repositories.go: RelRepo implements ports.RelationshipRepository (Create/End/ListFor) over the pool, with in-tx upsert + audit/event side effects on Create. - Internal/core/app/relationships.go: RelationshipService validates edges against the cached ontology TypeTree (tree.ValidateEdge) and delegates the tx to the repository. The adapter resolves slug→entity and extracts types before calling the service. - HTTP CreateRelationship: resolves source/target via ReadModels, passes resolved types to RelationshipService for edge validation. EndRelationship calls the service directly (audit stays in the adapter for End — a simple toggle with no ontology check). - MCP create_relationship/end_relationship: rewired to the service (pool resolves entity IDs inline for the tool handlers; the service validates edges and writes audit). The MCP path now gets ontology validation and audit coverage for the first time. - Composition root: RelationshipService built with RelRepo + Ontology and wired through httpapi.NewHandler, ListenAndServe, and MCP constructors. Verification: go build/vet, full test suite (19 pkgs, DB integration postgres+mcp green).
87 lines
2.1 KiB
Go
87 lines
2.1 KiB
Go
package mcp
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/dtoro/oikos/internal/core/app"
|
|
"github.com/dtoro/oikos/internal/core/ports"
|
|
"github.com/dtoro/oikos/internal/adapters/postgres"
|
|
"github.com/google/uuid"
|
|
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
)
|
|
|
|
type toolReg struct {
|
|
tool *mcp.Tool
|
|
handler toolHandler
|
|
}
|
|
|
|
func allTools(pool *db.Pool, agentID uuid.UUID, sec ports.Secrets, entities *app.EntityService, relService *app.RelationshipService) []toolReg {
|
|
return append(append(append(append(
|
|
[]toolReg{},
|
|
EntityTools(pool, agentID, sec, entities, relService)...),
|
|
OpsTools(pool, agentID, sec)...),
|
|
KnowledgeTools(pool, agentID, sec)...),
|
|
AnalysisTools(pool, agentID, sec)...)
|
|
}
|
|
|
|
func formatCheckResult(res app.DeriveResult) string {
|
|
var b strings.Builder
|
|
if res.Created > 0 {
|
|
fmt.Fprintf(&b, " Derived %d check(s).", res.Created)
|
|
}
|
|
if res.Undeclared {
|
|
b.WriteString(" Type declares no monitoring — no checks derived (set the entity's `monitoring` attribute and call update_entity_attributes to regenerate).")
|
|
}
|
|
for _, s := range res.Skipped {
|
|
fmt.Fprintf(&b, " Skipped %s (%s).", s.Kind, s.Reason)
|
|
}
|
|
return b.String()
|
|
}
|
|
|
|
func formatCreateResult(slug, entityType string, res app.DeriveResult) string {
|
|
return fmt.Sprintf("Created %s (%s).%s", slug, entityType, formatCheckResult(res))
|
|
}
|
|
|
|
func rowsToMap(ctx context.Context, pool *db.Pool, query string, args ...any) map[string]any {
|
|
m := map[string]any{}
|
|
rows, err := pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return m
|
|
}
|
|
defer rows.Close()
|
|
for rows.Next() {
|
|
var key string
|
|
var val int
|
|
if rows.Scan(&key, &val) == nil {
|
|
m[key] = val
|
|
}
|
|
}
|
|
return m
|
|
}
|
|
|
|
func queryRowsJSONSingle(ctx context.Context, pool *db.Pool, query string, args ...any) []map[string]any {
|
|
rows, err := pool.Query(ctx, query, args...)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
defer rows.Close()
|
|
|
|
cols := rows.FieldDescriptions()
|
|
var items []map[string]any
|
|
for rows.Next() {
|
|
vals, err := rows.Values()
|
|
if err != nil {
|
|
continue
|
|
}
|
|
m := make(map[string]any)
|
|
for i, col := range cols {
|
|
m[string(col.Name)] = fmt.Sprintf("%v", vals[i])
|
|
}
|
|
items = append(items, m)
|
|
}
|
|
return items
|
|
}
|
|
|