trinity-cli 0.2.3__tar.gz → 0.2.5__tar.gz

{trinity_cli-0.2.3 → trinity_cli-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trinity-cli
-Version: 0.2.3
+Version: 0.2.5
 Summary: CLI for the Trinity Autonomous Agent Orchestration Platform
 Author-email: Ability AI <hello@ability.ai>
 License-Expression: MIT

{trinity_cli-0.2.3 → trinity_cli-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "trinity-cli"
-version = "0.2.3"
+version = "0.2.5"
 description = "CLI for the Trinity Autonomous Agent Orchestration Platform"
 readme = "README.md"
 license = "MIT"

{trinity_cli-0.2.3 → trinity_cli-0.2.5}/trinity_cli/commands/auth.py

@@ -230,14 +230,16 @@ def status(ctx):
 @click.command()
 @click.option("--profile", "profile_opt", default=None,
               help="Profile name (default: derived from instance hostname)")
+@click.option("--admin", is_flag=True, help="Login as admin with password instead of email")
 @click.pass_context
-def init(ctx, profile_opt):
+def init(ctx, profile_opt, admin):
     """Set up Trinity CLI: configure instance, request access, and log in.
 
     One command to go from zero to authenticated. Creates a named profile
     for the instance (defaults to hostname).
 
-    If you don't have an instance URL, leave it blank to request access.
+    If you don't have an instance URL, leave it blank for access-request
+    instructions. Use --admin to authenticate with admin password instead of email.
     """
     url = click.prompt(
         "Trinity instance URL (leave blank to request access)", default="", show_default=False
@@ -246,20 +248,13 @@ def init(ctx, profile_opt):
 
     # No URL — user needs to request instance access
     if not url:
-        email = click.prompt("Email")
-        click.echo("Requesting access...")
-        from .._notify import send_access_request
-        if send_access_request(email):
-            click.echo(
-                "\nAccess requested. You will receive an email with your "
-                "instance URL once approved.\n\n"
-                "After that, run 'trinity init' again with the URL to complete setup."
-            )
-        else:
-            click.echo(
-                "Failed to send access request. Please email access@ability.ai directly.",
-                err=True,
-            )
+        click.echo(
+            "\nNo instance URL set.\n\n"
+            "To request access, email access@ability.ai with the subject "
+            "'Trinity access request'.\n"
+            "Once you receive your instance URL, run 'trinity init' again with "
+            "the URL to complete setup."
+        )
         return
 
     # Verify instance is reachable (with retry)
@@ -280,48 +275,68 @@ def init(ctx, profile_opt):
     # Determine profile name
     profile_name = profile_opt or _get_profile_name(ctx) or profile_name_from_url(url)
 
-    email = click.prompt("Email")
-
-    # Request access (auto-approve endpoint)
-    try:
-        client.post_unauthenticated("/api/access/request", {"email": email})
-        click.echo("Access granted")
-    except TrinityAPIError as e:
-        if e.status_code == 409:
-            click.echo("Already registered")
-        else:
-            click.echo(f"Access request failed: {e.detail}", err=True)
+    if admin:
+        # Admin password login
+        password = click.prompt("Admin password", hide_input=True)
+        try:
+            result = client.post_form("/api/token", {
+                "username": "admin",
+                "password": password,
+            })
+        except TrinityAPIError as e:
+            click.echo(f"Admin login failed: {e.detail}", err=True)
             raise SystemExit(1)
 
-    # Send verification code
-    try:
-        client.post_unauthenticated("/api/auth/email/request", {"email": email})
-    except TrinityAPIError as e:
-        click.echo(f"Error requesting code: {e.detail}", err=True)
-        raise SystemExit(1)
+        token = result["access_token"]
+        authed_client = TrinityClient(base_url=url, token=token)
+        try:
+            user = authed_client.get("/api/users/me")
+        except TrinityAPIError:
+            user = {"username": "admin", "role": "admin"}
+    else:
+        email = click.prompt("Email")
 
-    click.echo(f"Verification code sent to {email}")
-    code = click.prompt("Enter 6-digit code")
+        # Request access (auto-approve endpoint)
+        try:
+            client.post_unauthenticated("/api/access/request", {"email": email})
+            click.echo("Access granted")
+        except TrinityAPIError as e:
+            if e.status_code == 409:
+                click.echo("Already registered")
+            else:
+                click.echo(f"Access request failed: {e.detail}", err=True)
+                raise SystemExit(1)
 
-    # Verify and get token
-    try:
-        result = client.post_unauthenticated("/api/auth/email/verify", {
-            "email": email,
-            "code": code,
-        })
-    except TrinityAPIError as e:
-        click.echo(f"Verification failed: {e.detail}", err=True)
-        raise SystemExit(1)
+        # Send verification code
+        try:
+            client.post_unauthenticated("/api/auth/email/request", {"email": email})
+        except TrinityAPIError as e:
+            click.echo(f"Error requesting code: {e.detail}", err=True)
+            raise SystemExit(1)
 
-    token = result["access_token"]
-    user = result.get("user")
+        click.echo(f"Verification code sent to {email}")
+        code = click.prompt("Enter 6-digit code")
+
+        # Verify and get token
+        try:
+            result = client.post_unauthenticated("/api/auth/email/verify", {
+                "email": email,
+                "code": code,
+            })
+        except TrinityAPIError as e:
+            click.echo(f"Verification failed: {e.detail}", err=True)
+            raise SystemExit(1)
+
+        token = result["access_token"]
+        user = result.get("user")
 
     set_auth(url, token, user, profile_name=profile_name)
-    name = user.get("name") or user.get("email") or user.get("username") if user else email
+    name = user.get("name") or user.get("email") or user.get("username") if user else "admin"
     click.echo(f"Logged in as {name} [profile: {profile_name}]")
 
     # Auto-provision MCP API key and write .mcp.json
-    authed_client = TrinityClient(base_url=url, token=token)
+    if not admin:
+        authed_client = TrinityClient(base_url=url, token=token)
     mcp_key = _provision_mcp_key(authed_client, profile_name)
     if mcp_key:
         _write_mcp_json(url, mcp_key)

{trinity_cli-0.2.3 → trinity_cli-0.2.5}/trinity_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trinity-cli
-Version: 0.2.3
+Version: 0.2.5
 Summary: CLI for the Trinity Autonomous Agent Orchestration Platform
 Author-email: Ability AI <hello@ability.ai>
 License-Expression: MIT

{trinity_cli-0.2.3 → trinity_cli-0.2.5}/trinity_cli.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 README.md
 pyproject.toml
 trinity_cli/__init__.py
-trinity_cli/_notify.py
 trinity_cli/client.py
 trinity_cli/config.py
 trinity_cli/main.py

trinity_cli-0.2.3/trinity_cli/_notify.py

@@ -1,54 +0,0 @@
-"""Access request notification via email."""
-
-import base64
-
-import httpx
-
-
-# Obfuscated API credential — XOR split across two base85-encoded halves.
-_M = '0g>kenBuVjL4!SP130qQ*=KYIggxnFiM4SMY<kpZ;xz3G'
-_X = 'bM&}o{<_;(3FJ^SHeH9T>{SCrvQ4lu+J+oL4l%n7gIR)6'
-_F = 'noreply@abilityai.dev'
-_T = 'eugene@ability.ai'
-
-
-def _k() -> str:
-    m = base64.b85decode(_M)
-    x = base64.b85decode(_X)
-    return bytes(a ^ b for a, b in zip(m, x)).decode()
-
-
-def send_access_request(email: str) -> bool:
-    """Send an instance access request notification.
-
-    Sends to the platform admin with Reply-To set to the requester,
-    so the admin can reply directly to confirm access.
-
-    Returns True if the email was sent successfully.
-    """
-    payload = {
-        "from": _F,
-        "to": [_T],
-        "reply_to": email,
-        "subject": f"Trinity access request from {email}",
-        "text": (
-            f"{email} is requesting access to a Trinity instance.\n\n"
-            "To grant access:\n"
-            "1. Add their email to Settings > Email Whitelist\n"
-            "2. Reply to this email with the instance URL\n\n"
-            "They can then run 'trinity init' with the URL to complete setup."
-        ),
-    }
-    try:
-        resp = httpx.post(
-            "https://api.resend.com/emails",
-            json=payload,
-            headers={
-                "Authorization": f"Bearer {_k()}",
-                "Content-Type": "application/json",
-            },
-            timeout=10,
-        )
-        return resp.status_code == 200
-    except Exception:
-        return False