cmpnd 0.78.0__tar.gz → 0.80.0__tar.gz

{cmpnd-0.78.0 → cmpnd-0.80.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: cmpnd
-Version: 0.78.0
+Version: 0.80.0
 Summary: DSPy observability and deployment SDK for cmpnd
 Project-URL: Homepage, https://cmpnd.ai
 Author-email: cmpnd <hello@cmpnd.ai>

{cmpnd-0.78.0 → cmpnd-0.80.0}/cmpnd/cli/commands/admin.py

@@ -9,7 +9,8 @@ queue. `cmpnd admin user …` is the operator's user-lifecycle surface (list,
 inspect, create, approve/reject the pending-signup queue, promote/demote admin,
 disable/enable, reset a password, and manage a user's API-key scopes). `cmpnd
 admin org plan …` and `cmpnd admin org overrides …` move an org between plans
-and override one of its limits, `cmpnd admin plans …` edits each plan's
+and override one of its limits, `cmpnd admin org flags …` pins a feature flag
+for one org, `cmpnd admin plans …` edits each plan's
 default limits and feature flags, and `cmpnd admin signup …` sets who may sign up
 and the plan a new account's org lands on. `cmpnd admin feature-flags …` reads and
 toggles the server's runtime flags. These hit
@@ -153,6 +154,25 @@ def _register_org(sub: _SubParsersAction[ArgumentParser]) -> None:
     override_delete.add_argument("name", help="Limit name")
     override_delete.set_defaults(func=handle_org_overrides_delete)
 
+    flags = osub.add_parser("flags", help="An org's own feature flags")
+    fsub = flags.add_subparsers(dest="org_flags_action")
+    flags_list = fsub.add_parser(
+        "list", help="List every flag with the org's, its plan's and the global value, and what serve resolves"
+    )
+    _org_id_arg(flags_list)
+    flags_list.set_defaults(func=handle_org_flags_list)
+    flag_update = fsub.add_parser("update", help="Pin a feature flag on (or, with --disabled, off) for the org")
+    _org_id_arg(flag_update)
+    flag_update.add_argument("name", help="Flag name; the flag must already exist")
+    flag_update.add_argument("--disabled", action="store_true", help="Pin the flag off (default is on)")
+    flag_update.set_defaults(func=handle_org_flags_update)
+    flag_delete = fsub.add_parser(
+        "delete", help="Delete the org's row for a flag so it follows its plan and the global value"
+    )
+    _org_id_arg(flag_delete)
+    flag_delete.add_argument("name", help="Flag name")
+    flag_delete.set_defaults(func=handle_org_flags_delete)
+
 
 def _register_user(sub: _SubParsersAction[ArgumentParser]) -> None:
     user = sub.add_parser("user", help="User lifecycle management")
@@ -182,8 +202,14 @@ def _register_user(sub: _SubParsersAction[ArgumentParser]) -> None:
     create.add_argument("--admin", dest="admin", action="store_true", help="Grant platform-admin")
     create.set_defaults(func=handle_user_create)
 
-    approve = usub.add_parser("approve", help="Approve a pending signup")
+    approve = usub.add_parser("approve", help="Approve a pending membership")
     approve.add_argument("id", help="User id")
+    approve.add_argument(
+        "--org-id",
+        dest="org_id",
+        default="",
+        help="Org whose membership to approve (default: the user's active org)",
+    )
     approve.set_defaults(func=handle_user_approve)
 
     promote = usub.add_parser("promote", help="Grant platform-admin")
@@ -382,6 +408,21 @@ def handle_org_overrides_delete(client: api_client.ApiClient, args: Any) -> Any:
     return client.delete(f"/api/v1/admin/organizations/{args.org_id}/limits/{args.name}")
 
 
+def handle_org_flags_list(client: api_client.ApiClient, args: Any) -> Any:
+    return client.get(f"/api/v1/admin/organizations/{args.org_id}/feature-flags")
+
+
+def handle_org_flags_update(client: api_client.ApiClient, args: Any) -> Any:
+    return client.put(
+        f"/api/v1/admin/organizations/{args.org_id}/feature-flags/{args.name}",
+        json={"enabled": not args.disabled},
+    )
+
+
+def handle_org_flags_delete(client: api_client.ApiClient, args: Any) -> Any:
+    return client.delete(f"/api/v1/admin/organizations/{args.org_id}/feature-flags/{args.name}")
+
+
 # --- plan handlers --------------------------------------------------------
 
 
@@ -457,7 +498,30 @@ def handle_user_create(client: api_client.ApiClient, args: Any) -> Any:
 
 
 def handle_user_approve(client: api_client.ApiClient, args: Any) -> Any:
-    return client.patch(f"/api/v1/admin/users/{args.id}", json={"is_approved": True})
+    user_path = f"/api/v1/admin/users/{args.id}"
+    org_id = args.org_id or client.get(user_path)["org_id"]
+    try:
+        return client.post(f"{user_path}/approve", json={"org_id": org_id})
+    except api_client.CliError as err:
+        if not _route_unmounted(err):
+            raise
+        # A server older than the approve route approves only the active org,
+        # through PATCH.
+        if args.org_id:
+            raise api_client.CliError(
+                "This server cannot approve a membership in a named org. Upgrade it, or omit --org-id "
+                "to approve the membership in the user's active org."
+            ) from err
+        return client.patch(user_path, json={"is_approved": True})
+
+
+def _route_unmounted(err: api_client.CliError) -> bool:
+    """Whether a 404 came from a server that has no such route.
+
+    Go's ServeMux answers an unmounted route with plain text. A mounted route's
+    own 404 is JSON, such as an approval for a membership that does not exist.
+    """
+    return err.status_code == 404 and "404 page not found" in str(err)
 
 
 def handle_user_promote(client: api_client.ApiClient, args: Any) -> Any:

{cmpnd-0.78.0 → cmpnd-0.80.0}/docs/cli.md

@@ -494,6 +494,8 @@ stores one key per org per endpoint in `~/.config/cmpnd/credentials.json`, or
 `$CMPND_CONFIG_DIR/credentials.json` when that variable is set. The file has
 mode 0600. An active pointer names the org whose key commands use.
 `cmpnd login` stores a new key beside the others and makes its org active.
+When you belong to more than one org, the approval page asks which org the
+key is for and starts on your active org in the web app.
 
 - `cmpnd login --org <slug-or-id>` mints a key for that org instead of the
   active one. The approval page names the org, and serve refuses an org where
@@ -891,6 +893,14 @@ EMAIL` withdraws the open owner invites sent to that address, and the links
 stop working. `cmpnd admin org show` lists pending addresses under
 `seed.pending_owner_emails`.
 
+`cmpnd admin user approve USER_ID --org-id ORG_ID` approves the user's pending
+membership in that org, which need not be their active org. Without
+`--org-id` it approves the membership in their active org, and a server
+older than the approve route approves it the way older releases did. Serve applies the
+operator queue's rules. A member waiting to join an org that has its own owner
+belongs to that owner's queue, so serve refuses it with 400. `cmpnd admin user
+reject USER_ID --org-id ORG_ID` declines a pending membership.
+
 ### Plans, limits and signups
 
 Every org has a plan, `free`, `pro` or `enterprise`, and each plan sets
@@ -927,6 +937,13 @@ PLAN NAME [--disabled]` pins a flag for the plan, and `flags delete` hands the
 plan back to the global default. A plan's flag must already exist, so create
 it first with `cmpnd admin feature-flags set`.
 
+`cmpnd admin org flags list ORG_ID` shows every flag with the org's own row,
+its plan's row and the global row, each `null` when absent, and `enabled`, the
+value serve resolves for the org. `cmpnd admin org flags update ORG_ID NAME
+[--disabled]` pins a flag for that org alone, which beats its plan and the
+global value. `flags delete ORG_ID NAME` hands the org back to its plan and the
+global value. The operator org page writes the same rows.
+
 `cmpnd admin signup show` reports who may sign up and the plan a new account's
 org lands on. `cmpnd admin signup update --mode closed|invite|open` overrides
 the installation's `CMPND_SERVE_SIGNUP_MODE`, and `--mode installation` follows

{cmpnd-0.78.0 → cmpnd-0.80.0}/pyproject.toml

@@ -5,7 +5,7 @@ name = "cmpnd"
 # it's new) — no git tags. Bump with `uv version --bump {minor,patch}` or by
 # hand. Runtime `cmpnd.__version__` reads installed metadata, so it tracks
 # this automatically. See docs/plans/2026-07-02-sdk-pypi-tag-free-publish.md.
-version = "0.78.0"
+version = "0.80.0"
 description = "DSPy observability and deployment SDK for cmpnd"
 readme = "README.md"
 requires-python = ">=3.11"

{cmpnd-0.78.0 → cmpnd-0.80.0}/tests/test_cli/test_admin.py

@@ -2,8 +2,15 @@
 
 from __future__ import annotations
 
+import json
 from argparse import Namespace
+from collections.abc import Callable
+from unittest import mock
 
+import httpx
+import pytest
+
+from cmpnd.cli import api_client
 from cmpnd.cli.commands import admin
 
 
@@ -183,11 +190,15 @@ class TestAdminUser:
             },
         )
 
-    def test_approve_patches_is_approved(self, mock_client):
-        mock_client.patch.return_value = {"id": "u_1", "is_approved": True}
-        result = admin.handle_user_approve(mock_client, Namespace(id="u_1"))
-        mock_client.patch.assert_called_once_with("/api/v1/admin/users/u_1", json={"is_approved": True})
-        assert result["is_approved"] is True
+    def test_approve_parser_takes_an_optional_org(self):
+        from argparse import ArgumentParser
+
+        parser = ArgumentParser()
+        admin.register(parser.add_subparsers())
+        args = parser.parse_args(["admin", "user", "approve", "u_1", "--org-id", "o_2"])
+        assert args.org_id == "o_2"
+        assert args.func is admin.handle_user_approve
+        assert parser.parse_args(["admin", "user", "approve", "u_1"]).org_id == ""
 
     def test_promote_patches_is_admin_true(self, mock_client):
         mock_client.patch.return_value = {"id": "u_1", "is_admin": True}
@@ -413,3 +424,105 @@ class TestAdminSignup:
         with pytest.raises(SystemExit):
             args.func(mock_client, args)
         mock_client.patch.assert_not_called()
+
+
+def _serve(answer: Callable[[httpx.Request], httpx.Response]):
+    """A real ApiClient over a captured transport: `sent` collects each request."""
+    sent: list[httpx.Request] = []
+
+    def handle(request: httpx.Request) -> httpx.Response:
+        sent.append(request)
+        return answer(request)
+
+    real = httpx.Client
+    patch = mock.patch("httpx.Client", lambda **kwargs: real(**kwargs, transport=httpx.MockTransport(handle)))
+    return api_client.ApiClient("k", "http://serve.test"), sent, patch
+
+
+def _wire(sent: list[httpx.Request]) -> list[tuple[str, str, object]]:
+    return [(r.method, r.url.path, json.loads(r.content) if r.content else None) for r in sent]
+
+
+# Go's ServeMux answers an unmounted route with this plain-text 404.
+_UNMOUNTED = httpx.Response(404, text="404 page not found\n")
+
+
+class TestAdminUserApproveWire:
+    def test_approve_posts_the_named_org(self):
+        client, sent, patch = _serve(lambda _r: httpx.Response(200, json={"newly_approved": True}))
+        with patch:
+            result = admin.handle_user_approve(client, _parse("user", "approve", "u_1", "--org-id", "o_2"))
+        assert _wire(sent) == [("POST", "/api/v1/admin/users/u_1/approve", {"org_id": "o_2"})]
+        assert result["newly_approved"] is True
+
+    def test_approve_without_org_approves_the_active_org(self):
+        def answer(request: httpx.Request) -> httpx.Response:
+            if request.method == "GET":
+                return httpx.Response(200, json={"id": "u_1", "org_id": "o_1"})
+            return httpx.Response(200, json={"newly_approved": True})
+
+        client, sent, patch = _serve(answer)
+        with patch:
+            admin.handle_user_approve(client, _parse("user", "approve", "u_1"))
+        assert _wire(sent) == [
+            ("GET", "/api/v1/admin/users/u_1", None),
+            ("POST", "/api/v1/admin/users/u_1/approve", {"org_id": "o_1"}),
+        ]
+
+    def test_approve_without_org_falls_back_to_patch_on_a_server_without_the_route(self):
+        def answer(request: httpx.Request) -> httpx.Response:
+            if request.method == "GET":
+                return httpx.Response(200, json={"id": "u_1", "org_id": "o_1"})
+            if request.method == "POST":
+                return _UNMOUNTED
+            return httpx.Response(200, json={"id": "u_1", "is_approved": True})
+
+        client, sent, patch = _serve(answer)
+        with patch:
+            result = admin.handle_user_approve(client, _parse("user", "approve", "u_1"))
+        assert _wire(sent)[-1] == ("PATCH", "/api/v1/admin/users/u_1", {"is_approved": True})
+        assert result["is_approved"] is True
+
+    def test_approve_with_org_on_a_server_without_the_route_says_so(self):
+        client, sent, patch = _serve(lambda _r: _UNMOUNTED)
+        with patch, pytest.raises(api_client.CliError, match="--org-id"):
+            admin.handle_user_approve(client, _parse("user", "approve", "u_1", "--org-id", "o_2"))
+        assert [r.method for r in sent] == ["POST"]
+
+    def test_a_missing_membership_is_not_mistaken_for_an_old_server(self):
+        def answer(request: httpx.Request) -> httpx.Response:
+            if request.method == "GET":
+                return httpx.Response(200, json={"id": "u_1", "org_id": "o_1"})
+            return httpx.Response(404, json={"error": "no membership for that user in that org"})
+
+        client, sent, patch = _serve(answer)
+        with patch, pytest.raises(api_client.CliError, match="no membership"):
+            admin.handle_user_approve(client, _parse("user", "approve", "u_1"))
+        assert [r.method for r in sent] == ["GET", "POST"]
+
+
+class TestAdminOrgFlagsWire:
+    def _run(self, *argv: str) -> list[tuple[str, str, object]]:
+        client, sent, patch = _serve(lambda _r: httpx.Response(200, json={"org_id": "o_1", "flags": []}))
+        args = _parse("org", "flags", *argv)
+        with patch:
+            args.func(client, args)
+        return _wire(sent)
+
+    def test_list_reads_every_flag_as_it_resolves_for_the_org(self):
+        assert self._run("list", "o_1") == [("GET", "/api/v1/admin/organizations/o_1/feature-flags", None)]
+
+    def test_update_pins_the_flag_on_by_default(self):
+        assert self._run("update", "o_1", "beta") == [
+            ("PUT", "/api/v1/admin/organizations/o_1/feature-flags/beta", {"enabled": True})
+        ]
+
+    def test_update_disabled_pins_the_flag_off(self):
+        assert self._run("update", "o_1", "beta", "--disabled") == [
+            ("PUT", "/api/v1/admin/organizations/o_1/feature-flags/beta", {"enabled": False})
+        ]
+
+    def test_delete_removes_the_orgs_row(self):
+        assert self._run("delete", "o_1", "beta") == [
+            ("DELETE", "/api/v1/admin/organizations/o_1/feature-flags/beta", None)
+        ]

{cmpnd-0.78.0 → cmpnd-0.80.0}/uv.lock

@@ -505,7 +505,7 @@ wheels = [
 
 [[package]]
 name = "cmpnd"
-version = "0.78.0"
+version = "0.80.0"
 source = { editable = "." }
 default-groups = ["dspy-3-4-1"]
 dependencies = [