cmpnd 0.85.2__tar.gz → 0.86.0__tar.gz

{cmpnd-0.85.2 → cmpnd-0.86.0}/PKG-INFO

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

{cmpnd-0.85.2 → cmpnd-0.86.0}/cmpnd/cli/commands/admin.py

@@ -10,8 +10,8 @@ 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 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
+for one org, `cmpnd admin plans …` edits a plan's draft, publishes it as a new
+version, moves orgs between versions and pins a plan's 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
 /api/v1/admin/* and require an API key carrying the admin:* scopes — the server
@@ -259,24 +259,55 @@ def _register_user(sub: _SubParsersAction[ArgumentParser]) -> None:
     set_scopes.set_defaults(func=handle_user_set_scopes)
 
 
+def _positive_version(raw: str) -> int:
+    """A plan version is a whole number of 1 or more."""
+    try:
+        version = int(raw)
+    except ValueError:
+        version = 0
+    if version < 1:
+        raise ArgumentTypeError(f"{raw!r} is not a version: give a whole number of 1 or more")
+    return version
+
+
 def _register_plans(sub: _SubParsersAction[ArgumentParser]) -> None:
-    plans = sub.add_parser("plans", help="Each plan's default limits and feature flags")
+    plans = sub.add_parser("plans", help="Each plan's versions, draft and feature flags")
     psub = plans.add_subparsers(dest="plans_action")
 
-    ls = psub.add_parser("list", help="List every plan's limits and feature flags")
+    ls = psub.add_parser(
+        "list", help="List every plan's versions with their values and org counts, its draft and its feature flags"
+    )
     ls.set_defaults(func=handle_plans_list)
 
-    limits = psub.add_parser("limits", help="A plan's default limits")
-    lsub = limits.add_subparsers(dest="plans_limits_action")
-    limit_update = lsub.add_parser("update", help="Set a plan's default for a limit; 'none' means no limit")
-    limit_update.add_argument("plan", help=PLAN_HELP)
-    limit_update.add_argument("name", help="Limit name, such as optimizations.concurrent")
-    limit_update.add_argument("value", type=_limit_value, help="A whole number, or 'none' for no limit")
-    limit_update.set_defaults(func=handle_plans_limits_update)
-    limit_delete = lsub.add_parser("delete", help="Delete a plan's default for a limit")
-    limit_delete.add_argument("plan", help=PLAN_HELP)
-    limit_delete.add_argument("name", help="Limit name")
-    limit_delete.set_defaults(func=handle_plans_limits_delete)
+    # A published version never changes, so every value write goes to the plan's
+    # draft, which serve opens from the current version on the first write.
+    draft = psub.add_parser("draft", help="A plan's draft, the next version before it is published")
+    dsub = draft.add_subparsers(dest="plans_draft_action")
+    draft_update = dsub.add_parser(
+        "update", help="Set a value in the plan's draft, opening one if needed; 'none' means no limit"
+    )
+    draft_update.add_argument("plan", help=PLAN_HELP)
+    draft_update.add_argument("name", help="Limit name, such as optimizations.concurrent")
+    draft_update.add_argument("value", type=_limit_value, help="A whole number, or 'none' for no limit")
+    draft_update.set_defaults(func=handle_plans_draft_update)
+    draft_delete = dsub.add_parser("delete", help="Delete a value from the plan's draft, so it sets no limit")
+    draft_delete.add_argument("plan", help=PLAN_HELP)
+    draft_delete.add_argument("name", help="Limit name")
+    draft_delete.set_defaults(func=handle_plans_draft_delete)
+    draft_publish = dsub.add_parser("publish", help="Publish the plan's draft as its current version; it moves no org")
+    draft_publish.add_argument("plan", help=PLAN_HELP)
+    draft_publish.add_argument("--note", default="", help="Why this version exists")
+    draft_publish.set_defaults(func=handle_plans_draft_publish)
+
+    move = psub.add_parser("move", help="Move orgs to a published version of their plan; their overrides stay")
+    move.add_argument("plan", help=PLAN_HELP)
+    move.add_argument("version", type=_positive_version, help="The published version to move to")
+    who = move.add_mutually_exclusive_group(required=True)
+    who.add_argument(
+        "--from-version", dest="from_version", type=_positive_version, help="Move every org on this version"
+    )
+    who.add_argument("--org", dest="org_id", help="Move this one org")
+    move.set_defaults(func=handle_plans_move)
 
     flags = psub.add_parser("flags", help="A plan's feature flags")
     fsub = flags.add_subparsers(dest="plans_flags_action")
@@ -430,12 +461,21 @@ def handle_plans_list(client: api_client.ApiClient, _args: Any) -> Any:
     return client.get("/api/v1/admin/plans")
 
 
-def handle_plans_limits_update(client: api_client.ApiClient, args: Any) -> Any:
-    return client.put(f"/api/v1/admin/plans/{args.plan}/limits/{args.name}", json={"value": args.value})
+def handle_plans_draft_update(client: api_client.ApiClient, args: Any) -> Any:
+    return client.put(f"/api/v1/admin/plans/{args.plan}/draft/limits/{args.name}", json={"value": args.value})
+
+
+def handle_plans_draft_delete(client: api_client.ApiClient, args: Any) -> Any:
+    return client.delete(f"/api/v1/admin/plans/{args.plan}/draft/limits/{args.name}")
+
+
+def handle_plans_draft_publish(client: api_client.ApiClient, args: Any) -> Any:
+    return client.post(f"/api/v1/admin/plans/{args.plan}/draft/publish", json={"note": args.note})
 
 
-def handle_plans_limits_delete(client: api_client.ApiClient, args: Any) -> Any:
-    return client.delete(f"/api/v1/admin/plans/{args.plan}/limits/{args.name}")
+def handle_plans_move(client: api_client.ApiClient, args: Any) -> Any:
+    body: dict[str, Any] = {"org_id": args.org_id} if args.org_id is not None else {"from_version": args.from_version}
+    return client.post(f"/api/v1/admin/plans/{args.plan}/versions/{args.version}/move", json=body)
 
 
 def handle_plans_flags_update(client: api_client.ApiClient, args: Any) -> Any:

{cmpnd-0.85.2 → cmpnd-0.86.0}/cmpnd/cli/verbs.py

@@ -168,6 +168,8 @@ DOMAIN_VERBS: dict[str, str] = {
     "restore": "returns a program from the Trash with its history, which create would not",
     "purge": "deletes a program in the Trash for good, the irreversible step after trash",
     "rename": "gives a program a new current name and frees the old one for any program, which update would hide",
+    "publish": "freezes a plan's draft as its next version, which no write changes again and update would not say",
+    "move": "puts orgs on another version of their plan; the version and its values stay as they are",
 }
 
 #: Leaves naming a related collection or sub-record rather than an action.

{cmpnd-0.85.2 → cmpnd-0.86.0}/docs/cli.md

@@ -944,15 +944,17 @@ 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
-default limits and feature flags. An org's own override beats its plan.
-`cmpnd admin org list` shows each org's plan, and `--plan free` keeps only the
-orgs on Free. `cmpnd admin org plan show ORG_ID` shows the org's plan and every
-limit, with the layer that set it. `cmpnd admin org plan update ORG_ID PLAN` moves the
-org. `cmpnd admin org overrides update ORG_ID NAME VALUE` overrides one limit,
-and a value of `none` lifts the plan's limit for that org.
-`cmpnd admin org overrides delete ORG_ID NAME` deletes the override, so the org
-follows its plan again.
+Every org has a plan, `free`, `pro` or `enterprise`, and follows one published
+version of it. A version sets the org's limits and never changes. An org's own
+override beats its version. `cmpnd admin org list` shows each org's plan, and
+`--plan free` keeps only the orgs on Free. `cmpnd admin org plan show ORG_ID`
+shows the org's plan, `plan_version`, the plan's `current_version` and every
+limit, with the layer that set it. `cmpnd admin org plan update ORG_ID PLAN`
+moves the org to that plan's current version, and leaves an org already on the
+plan where it is. `cmpnd admin org overrides update ORG_ID NAME VALUE`
+overrides one limit, and a value of `none` lifts the version's limit for that
+org. `cmpnd admin org overrides delete ORG_ID NAME` deletes the override, so
+the org follows its version again. Overrides stay through every move.
 
 `cmpnd admin org usage ORG_ID` shows what each limit bounds now, in `in_use`,
 and the org's activity in the last 24 hours, 7 days and 30 days, in `windows`.
@@ -971,11 +973,24 @@ their date survives only while a membership keeps it. `oldest_key_at` and
 the user still holds, because leaving an org deletes the user's keys there.
 Sign-ins are not recorded, and deployment keys do not count as the user's keys.
 
-`cmpnd admin plans list` shows every plan's limits and feature flags.
-`cmpnd admin plans limits update PLAN NAME VALUE` and `limits delete PLAN NAME`
-change a plan's default for every org on it. `cmpnd admin plans flags update
-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
+`cmpnd admin plans list` shows each plan's current version and its values,
+every published version with its values, publisher, note and org count, the
+draft, and the plan's feature flags. A change to a plan's limits takes three
+steps, and no org moves until the last:
+
+1. `cmpnd admin plans draft update PLAN NAME VALUE` sets a value in the plan's
+   draft, and `draft delete PLAN NAME` removes one, so the draft sets no limit
+   for it. The first edit opens the draft as a copy of the current version.
+2. `cmpnd admin plans draft publish PLAN --note TEXT` publishes the draft as the
+   plan's current version. New orgs land on it.
+3. `cmpnd admin plans move PLAN VERSION --from-version N` moves every org on
+   version N to VERSION, and `--org ORG_ID` moves one org. It answers `moved`,
+   the number of orgs it moved, and refuses a draft or a version the plan
+   lacks.
+
+`cmpnd admin plans flags update PLAN NAME [--disabled]` pins a flag for the
+plan, and `flags delete` hands the plan back to the global default. Flags have
+no versions. 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,

{cmpnd-0.85.2 → cmpnd-0.86.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.85.2"
+version = "0.86.0"
 description = "DSPy observability and deployment SDK for cmpnd"
 readme = "README.md"
 requires-python = ">=3.11"

{cmpnd-0.85.2 → cmpnd-0.86.0}/tests/test_cli/test_admin.py

@@ -360,20 +360,61 @@ class TestAdminPlans:
         assert args.func(mock_client, args) == {"plans": []}
         mock_client.get.assert_called_once_with("/api/v1/admin/plans")
 
-    def test_set_limit_and_none(self, mock_client):
-        args = _parse("plans", "limits", "update", "pro", "optimizations.concurrent", "5")
+    def test_draft_update_writes_the_draft_and_none_sends_null(self, mock_client):
+        args = _parse("plans", "draft", "update", "pro", "optimizations.concurrent", "5")
         args.func(mock_client, args)
-        mock_client.put.assert_called_with("/api/v1/admin/plans/pro/limits/optimizations.concurrent", json={"value": 5})
-        args = _parse("plans", "limits", "update", "free", "optimizations.concurrent", "none")
+        mock_client.put.assert_called_with(
+            "/api/v1/admin/plans/pro/draft/limits/optimizations.concurrent", json={"value": 5}
+        )
+        args = _parse("plans", "draft", "update", "free", "optimizations.concurrent", "none")
         args.func(mock_client, args)
         mock_client.put.assert_called_with(
-            "/api/v1/admin/plans/free/limits/optimizations.concurrent", json={"value": None}
+            "/api/v1/admin/plans/free/draft/limits/optimizations.concurrent", json={"value": None}
         )
 
-    def test_clear_limit(self, mock_client):
-        args = _parse("plans", "limits", "delete", "pro", "optimizations.concurrent")
+    def test_draft_delete(self, mock_client):
+        args = _parse("plans", "draft", "delete", "pro", "optimizations.concurrent")
+        args.func(mock_client, args)
+        mock_client.delete.assert_called_once_with("/api/v1/admin/plans/pro/draft/limits/optimizations.concurrent")
+
+    def test_draft_publish_sends_the_note(self, mock_client):
+        mock_client.post.return_value = {"plan": "pro", "version": 2}
+        args = _parse("plans", "draft", "publish", "pro", "--note", "Five at a time")
+        assert args.func(mock_client, args) == {"plan": "pro", "version": 2}
+        mock_client.post.assert_called_once_with(
+            "/api/v1/admin/plans/pro/draft/publish", json={"note": "Five at a time"}
+        )
+        args = _parse("plans", "draft", "publish", "free")
+        args.func(mock_client, args)
+        mock_client.post.assert_called_with("/api/v1/admin/plans/free/draft/publish", json={"note": ""})
+
+    def test_move_by_version_or_by_org(self, mock_client):
+        mock_client.post.return_value = {"plan": "pro", "version": 2, "moved": 3}
+        args = _parse("plans", "move", "pro", "2", "--from-version", "1")
+        assert args.func(mock_client, args)["moved"] == 3
+        mock_client.post.assert_called_with("/api/v1/admin/plans/pro/versions/2/move", json={"from_version": 1})
+        args = _parse("plans", "move", "pro", "2", "--org", "o_1")
         args.func(mock_client, args)
-        mock_client.delete.assert_called_once_with("/api/v1/admin/plans/pro/limits/optimizations.concurrent")
+        mock_client.post.assert_called_with("/api/v1/admin/plans/pro/versions/2/move", json={"org_id": "o_1"})
+
+    def test_move_needs_exactly_one_source_and_a_whole_version(self):
+        import pytest
+
+        for argv in (
+            ("plans", "move", "pro", "2"),
+            ("plans", "move", "pro", "2", "--from-version", "1", "--org", "o_1"),
+            ("plans", "move", "pro", "two", "--org", "o_1"),
+            ("plans", "move", "pro", "0", "--org", "o_1"),
+            ("plans", "move", "pro", "2", "--from-version", "zero"),
+        ):
+            with pytest.raises(SystemExit):
+                _parse(*argv)
+
+    def test_the_in_place_limit_commands_are_gone(self):
+        import pytest
+
+        with pytest.raises(SystemExit):
+            _parse("plans", "limits", "update", "pro", "optimizations.concurrent", "5")
 
     def test_set_flag_enables_by_default_and_disables_with_the_flag(self, mock_client):
         args = _parse("plans", "flags", "update", "free", "beta")
@@ -389,10 +430,10 @@ class TestAdminPlans:
         mock_client.delete.assert_called_once_with("/api/v1/admin/plans/free/feature-flags/beta")
 
     def test_plan_names_are_serves_to_check(self, mock_client):
-        args = _parse("plans", "limits", "update", "platinum", "optimizations.concurrent", "5")
+        args = _parse("plans", "draft", "update", "platinum", "optimizations.concurrent", "5")
         args.func(mock_client, args)
         mock_client.put.assert_called_once_with(
-            "/api/v1/admin/plans/platinum/limits/optimizations.concurrent", json={"value": 5}
+            "/api/v1/admin/plans/platinum/draft/limits/optimizations.concurrent", json={"value": 5}
         )
 
 

{cmpnd-0.85.2 → cmpnd-0.86.0}/uv.lock

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