mirror of
https://github.com/trustgraph-ai/trustgraph.git
synced 2026-05-20 21:05:13 +02:00
feat: workspace-based multi-tenancy, replacing user as tenancy axis (#840)
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.
This commit is contained in:
parent
9332089b3d
commit
d35473f7f7
377 changed files with 6868 additions and 5785 deletions
|
|
@ -33,6 +33,7 @@ class ConfigClient(BaseClient):
|
|||
subscriber=None,
|
||||
input_queue=None,
|
||||
output_queue=None,
|
||||
workspace="default",
|
||||
**pubsub_config,
|
||||
):
|
||||
|
||||
|
|
@ -51,10 +52,13 @@ class ConfigClient(BaseClient):
|
|||
**pubsub_config,
|
||||
)
|
||||
|
||||
self.workspace = workspace
|
||||
|
||||
def get(self, keys, timeout=300):
|
||||
|
||||
resp = self.call(
|
||||
operation="get",
|
||||
workspace=self.workspace,
|
||||
keys=[
|
||||
ConfigKey(
|
||||
type = k["type"],
|
||||
|
|
@ -78,6 +82,7 @@ class ConfigClient(BaseClient):
|
|||
|
||||
resp = self.call(
|
||||
operation="list",
|
||||
workspace=self.workspace,
|
||||
type=type,
|
||||
timeout=timeout
|
||||
)
|
||||
|
|
@ -88,6 +93,7 @@ class ConfigClient(BaseClient):
|
|||
|
||||
resp = self.call(
|
||||
operation="getvalues",
|
||||
workspace=self.workspace,
|
||||
type=type,
|
||||
timeout=timeout
|
||||
)
|
||||
|
|
@ -101,10 +107,31 @@ class ConfigClient(BaseClient):
|
|||
for v in resp.values
|
||||
]
|
||||
|
||||
def getvalues_all_ws(self, type, timeout=300):
|
||||
"""Fetch all values of a given type across all workspaces.
|
||||
Returns a list of dicts including a 'workspace' field."""
|
||||
|
||||
resp = self.call(
|
||||
operation="getvalues-all-ws",
|
||||
type=type,
|
||||
timeout=timeout
|
||||
)
|
||||
|
||||
return [
|
||||
{
|
||||
"workspace": v.workspace,
|
||||
"type": v.type,
|
||||
"key": v.key,
|
||||
"value": v.value,
|
||||
}
|
||||
for v in resp.values
|
||||
]
|
||||
|
||||
def delete(self, keys, timeout=300):
|
||||
|
||||
resp = self.call(
|
||||
operation="delete",
|
||||
workspace=self.workspace,
|
||||
keys=[
|
||||
ConfigKey(
|
||||
type = k["type"],
|
||||
|
|
@ -121,6 +148,7 @@ class ConfigClient(BaseClient):
|
|||
|
||||
resp = self.call(
|
||||
operation="put",
|
||||
workspace=self.workspace,
|
||||
values=[
|
||||
ConfigValue(
|
||||
type = v["type"],
|
||||
|
|
@ -138,6 +166,7 @@ class ConfigClient(BaseClient):
|
|||
|
||||
resp = self.call(
|
||||
operation="config",
|
||||
workspace=self.workspace,
|
||||
timeout=timeout
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -35,11 +35,11 @@ class DocumentEmbeddingsClient(BaseClient):
|
|||
)
|
||||
|
||||
def request(
|
||||
self, vector, user="trustgraph", collection="default",
|
||||
self, vector, collection="default",
|
||||
limit=10, timeout=300
|
||||
):
|
||||
return self.call(
|
||||
user=user, collection=collection,
|
||||
collection=collection,
|
||||
vector=vector, limit=limit, timeout=timeout
|
||||
).chunks
|
||||
|
||||
|
|
|
|||
|
|
@ -33,14 +33,13 @@ class DocumentRagClient(BaseClient):
|
|||
output_schema=DocumentRagResponse,
|
||||
)
|
||||
|
||||
def request(self, query, user="trustgraph", collection="default",
|
||||
def request(self, query, collection="default",
|
||||
chunk_callback=None, explain_callback=None, timeout=300):
|
||||
"""
|
||||
Request a document RAG query with optional streaming callbacks.
|
||||
|
||||
Args:
|
||||
query: The question to ask
|
||||
user: User identifier
|
||||
collection: Collection identifier
|
||||
chunk_callback: Optional callback(text, end_of_stream) for text chunks
|
||||
explain_callback: Optional callback(explain_id, explain_graph, explain_triples) for explain notifications
|
||||
|
|
@ -71,7 +70,7 @@ class DocumentRagClient(BaseClient):
|
|||
return False # Continue receiving
|
||||
|
||||
self.call(
|
||||
query=query, user=user, collection=collection,
|
||||
query=query, collection=collection,
|
||||
inspect=inspect, timeout=timeout
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -35,11 +35,11 @@ class GraphEmbeddingsClient(BaseClient):
|
|||
)
|
||||
|
||||
def request(
|
||||
self, vector, user="trustgraph", collection="default",
|
||||
self, vector, collection="default",
|
||||
limit=10, timeout=300
|
||||
):
|
||||
return self.call(
|
||||
user=user, collection=collection,
|
||||
collection=collection,
|
||||
vector=vector, limit=limit, timeout=timeout
|
||||
).entities
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class GraphRagClient(BaseClient):
|
|||
)
|
||||
|
||||
def request(
|
||||
self, query, user="trustgraph", collection="default",
|
||||
self, query, collection="default",
|
||||
chunk_callback=None,
|
||||
explain_callback=None,
|
||||
timeout=500
|
||||
|
|
@ -44,7 +44,6 @@ class GraphRagClient(BaseClient):
|
|||
|
||||
Args:
|
||||
query: The question to ask
|
||||
user: User identifier
|
||||
collection: Collection identifier
|
||||
chunk_callback: Optional callback(text, end_of_stream) for text chunks
|
||||
explain_callback: Optional callback(explain_id, explain_graph, explain_triples) for explain notifications
|
||||
|
|
@ -76,7 +75,7 @@ class GraphRagClient(BaseClient):
|
|||
return False # Continue receiving
|
||||
|
||||
self.call(
|
||||
user=user, collection=collection, query=query,
|
||||
collection=collection, query=query,
|
||||
inspect=inspect, timeout=timeout
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -35,11 +35,11 @@ class RowEmbeddingsClient(BaseClient):
|
|||
)
|
||||
|
||||
def request(
|
||||
self, vector, schema_name, user="trustgraph", collection="default",
|
||||
self, vector, schema_name, collection="default",
|
||||
index_name=None, limit=10, timeout=300
|
||||
):
|
||||
kwargs = dict(
|
||||
user=user, collection=collection,
|
||||
collection=collection,
|
||||
vector=vector, schema_name=schema_name,
|
||||
limit=limit, timeout=timeout
|
||||
)
|
||||
|
|
|
|||
|
|
@ -45,16 +45,15 @@ class TriplesQueryClient(BaseClient):
|
|||
return Term(type=LITERAL, value=ent)
|
||||
|
||||
def request(
|
||||
self,
|
||||
self,
|
||||
s, p, o,
|
||||
user="trustgraph", collection="default",
|
||||
collection="default",
|
||||
limit=10, timeout=120,
|
||||
):
|
||||
return self.call(
|
||||
s=self.create_value(s),
|
||||
p=self.create_value(p),
|
||||
o=self.create_value(o),
|
||||
user=user,
|
||||
collection=collection,
|
||||
limit=limit,
|
||||
timeout=timeout,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue