Skip to content

fix: update library_client for workspace-based tenancy #951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cybermaggedon merged 1 commit into from
May 26, 2026
Merged

fix: update library_client for workspace-based tenancy #951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions dev-tools/library_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
INDEX_URL = f"{BUCKET_URL}/index.json"

default_url = os.getenv("TRUSTGRAPH_URL", "http://localhost:8088/")
default_user = "trustgraph"
default_workspace = os.getenv("TRUSTGRAPH_WORKSPACE", "default")
default_token = os.getenv("TRUSTGRAPH_TOKEN", None)


Expand Down Expand Up @@ -113,7 +113,7 @@ def convert_metadata(metadata_json):
return triples


def load_document(api, user, doc_entry):
def load_document(api, doc_entry):
"""Fetch metadata and content for a document, then load into TrustGraph."""
doc_id = doc_entry["id"]
title = doc_entry["title"]
Expand All @@ -133,7 +133,6 @@ def load_document(api, user, doc_entry):
api.add_document(
id=doc["id"],
metadata=metadata,
user=user,
kind=doc["kind"],
title=doc["title"],
comments=doc["comments"],
Expand All @@ -144,12 +143,12 @@ def load_document(api, user, doc_entry):
print(f" done.")


def load_documents(api, user, docs):
def load_documents(api, docs):
"""Load a list of documents."""
print(f"Loading {len(docs)} document(s)...\n")
for doc in docs:
try:
load_document(api, user, doc)
load_document(api, doc)
except Exception as e:
print(f" FAILED: {e}", file=sys.stderr)
print()
Expand All @@ -166,8 +165,8 @@ def main():
help=f"TrustGraph API URL (default: {default_url})",
)
parser.add_argument(
"-U", "--user", default=default_user,
help=f"User ID (default: {default_user})",
"-w", "--workspace", default=default_workspace,
help=f"Workspace (default: {default_workspace})",
)
parser.add_argument(
"-t", "--token", default=default_token,
Expand Down Expand Up @@ -212,22 +211,22 @@ def main():
return

# Load commands need the API
api = Api(args.url, token=args.token).library()
api = Api(args.url, token=args.token, workspace=args.workspace).library()

if args.command == "load-all":
load_documents(api, args.user, index)
load_documents(api, index)

elif args.command == "load-doc":
matches = [d for d in index if str(d.get("id")) == args.id]
if not matches:
print(f"No document with ID '{args.id}' found.", file=sys.stderr)
sys.exit(1)
load_documents(api, args.user, matches)
load_documents(api, matches)

elif args.command == "load-match":
results = search_index(index, args.query)
if results:
load_documents(api, args.user, results)
load_documents(api, results)
else:
print("No matches found.", file=sys.stderr)
sys.exit(1)
Expand Down
Loading