trinity-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{trinity_cli-0.2.0 → trinity_cli-0.2.2}/PKG-INFO

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

{trinity_cli-0.2.0 → trinity_cli-0.2.2}/pyproject.toml

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

trinity_cli-0.2.2/trinity_cli/_notify.py

@@ -0,0 +1,54 @@
+"""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@ability.ai'
+_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

{trinity_cli-0.2.0 → trinity_cli-0.2.2}/trinity_cli/client.py

@@ -84,10 +84,7 @@ class TrinityClient:
     def post_form(self, path: str, data: dict) -> Any:
         """POST with form-encoded body (for OAuth2 token endpoint)."""
         with httpx.Client(timeout=30) as c:
-            headers = {}
-            if self.token:
-                headers["Authorization"] = f"Bearer {self.token}"
-            resp = c.post(f"{self.base_url}{path}", data=data, headers=headers)
+            resp = c.post(f"{self.base_url}{path}", data=data)
             return self._handle_response(resp)
 
     def post_unauthenticated(self, path: str, json: Optional[dict] = None) -> Any:

{trinity_cli-0.2.0 → trinity_cli-0.2.2}/trinity_cli/commands/auth.py

@@ -90,9 +90,13 @@ def _get_profile_name(ctx: click.Context) -> str | None:
 @click.option("--instance", help="Trinity instance URL (e.g. https://trinity.example.com)")
 @click.option("--profile", "profile_opt", default=None,
               help="Profile name to store credentials under (default: hostname)")
+@click.option("--admin", is_flag=True, help="Login as admin with password instead of email")
 @click.pass_context
-def login(ctx, instance, profile_opt):
-    """Log in to a Trinity instance with email verification."""
+def login(ctx, instance, profile_opt, admin):
+    """Log in to a Trinity instance.
+
+    By default, uses email verification. With --admin, uses password login.
+    """
     profile_name = profile_opt or _get_profile_name(ctx)
     url = instance or get_instance_url(profile_name)
     if not url:
@@ -113,6 +117,34 @@ def login(ctx, instance, profile_opt):
                 click.echo("Giving up after 3 attempts.", err=True)
                 raise SystemExit(1)
 
+    if admin:
+        # Admin password login via /api/token (form-encoded OAuth2)
+        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)
+
+        token = result["access_token"]
+
+        # Fetch user info with the new token
+        authed_client = TrinityClient(base_url=url, token=token)
+        try:
+            user = authed_client.get("/api/users/me")
+        except TrinityAPIError:
+            user = {"username": "admin", "role": "admin"}
+
+        target_profile = profile_name or profile_name_from_url(url)
+        set_auth(url, token, user, profile_name=target_profile)
+        click.echo(f"Logged in as admin [profile: {target_profile}]")
+
+        _provision_mcp_key(authed_client, target_profile)
+        return
+
     email = click.prompt("Email")
 
     # Request verification code
@@ -204,10 +236,32 @@ def init(ctx, profile_opt):
 
     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.
     """
-    url = click.prompt("Trinity instance URL", default="http://localhost:8000")
+    url = click.prompt(
+        "Trinity instance URL (leave blank to request access)", default="", show_default=False
+    )
     url = _normalize_url(url)
 
+    # 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,
+            )
+        return
+
     # Verify instance is reachable (with retry)
     for attempt in range(3):
         client = TrinityClient(base_url=url, token="none")

{trinity_cli-0.2.0 → trinity_cli-0.2.2}/trinity_cli.egg-info/PKG-INFO

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

{trinity_cli-0.2.0 → trinity_cli-0.2.2}/trinity_cli.egg-info/SOURCES.txt

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