* System plugin tier with mark/unmark fanout (schema v39)
Adds a mandatory plugin tier so admins can pin a small set of curated
plugins into every user's stack from day one. Marking a plugin via the
new toggle on /admin/marketplaces materializes resource_grants for every
group and user_plugin_optouts subscriptions for every user, so the
existing resolver pulls the plugin into every served set without a new
filter layer. Hooks on user-create (Google OAuth, magic-link, admin
POST, scheduler) and group-create propagate the same materialization to
new principals. UI locks: /admin/access disables the checkbox with a
SYSTEM pill; /marketplace cards swap the "In stack" green pill for an
amber "Required" badge with shield icon; the plugin detail install
button reads "Required by your org"; /my-ai-stack toggle is disabled.
Bypass paths return 409 (DELETE /api/admin/grants for system grants,
PUT /api/my-stack/curated/.../{enabled:false}, DELETE
/api/marketplace/curated/.../install). Unmark only flips the flag —
materialized rows persist so admins curate cleanup at their leisure
through the now-unlocked /admin/access checkboxes.
* Marketplace UX polish + drop legacy /store and /my-ai-stack pages
Two-part cleanup post-v39:
(1) Page deletion. /store and /my-ai-stack were already replaced by
/marketplace?tab=flea and /marketplace?tab=my respectively, but the
standalone routes lingered. Hard delete in dev mode — no redirects,
stale bookmarks 404. The /store/new upload wizard, the flea
detail/edit pages, the admin queue, and all /api/store/* +
/api/my-stack endpoints (CLI consumers) stay. Internal hardcoded
hrefs in the upload wizard's Cancel button and the advanced-setup
page repointed to the marketplace tabs.
(2) Detail-page install button rework. The single button that morphed
between "+ Add to my stack" and "✓ In your stack" did not
communicate uninstall affordance. The installed state now renders an
inline white status label *before* a separate red-bordered
"✕ Remove from stack" button on the same row, both at identical
height to avoid layout shift. System plugins keep their locked amber
"✓ Required by your org" pill (no Remove button — API refuses 409).
The post-action hint panel now fires on remove too with the title
flipped to "✓ Removed from your stack" — Claude Code needs the same
/update-agnes-plugins refresh either way.
Also: /admin/marketplaces Details modal "Mark as system" toggle
redesigned. The button was near-invisible (matched neutral row
metadata). It's now a balanced amber-toned chip with shield icon
and a structured confirm modal replacing the native confirm() dialog
that summarizes fanout consequences before commit.
* Move stack-hint inside hero with glass-on-gradient styling
The post-action hint card ("✓ Added to your stack" with the
/update-agnes-plugins recipe) used to live below the hero in
panel-what (gray card on white page body). Clicking add/remove
inserted/removed it between the hero and content, shifting the
panels below — a noticeable scroll jump.
The hint is now anchored inside the hero's top-right corner alongside
the install/remove buttons, both as flex children of an absolutely
positioned .actions container. The card uses a translucent
white-on-glass treatment that adopts the hero's kind color (blue for
plugin, green for skill, purple for agent) without per-kind branching.
Hero is always tall enough (160px photo) to contain the action+hint
stack without overflow, so toggling the hint visibility doesn't grow
the hero or shift body content.
The hero-head grid reserves a third 300px column for the absolute
actions overlay so meta gets the proper 1fr free space instead of
being squeezed by a padding-right hack. Responsive breakpoint at
1100px reflows the actions stack below hero-head when the viewport
isn't wide enough to keep meta + actions side-by-side comfortably.
* Add optional -DataPath bind mount to run-local-dev.ps1
When the operator wants to inspect DuckDB files (system.duckdb, extracts,
marketplaces, store/, …) directly from Windows Explorer, the named volume
inside the Docker Desktop WSL VM isn't reachable. The new -DataPath param
generates a transient compose override that rebinds /data on app, scheduler,
extract (and Caddy's /srv:ro mirror) to a Windows host folder.
Fully additive — when -DataPath is omitted everything behaves exactly as
before: no override file is generated, $composeFiles array is unchanged,
finally cleanup is a no-op. Existing positional invocations
(.\run-local-dev.ps1 up | down | logs) keep binding to $Action because
$DataPath is a named-only parameter with no Position attribute.
The override is written via [System.IO.File]::WriteAllText so the YAML is
BOM-less across PS 5.1 / 7+ — Compose rejects BOM-prefixed YAML on Windows.
The override file is unique per PID and removed in the script's finally
block so concurrent invocations and crashes don't leak files.
* factor mark_system fanout into UserCuratedSubscriptionsRepository
The endpoint imported UserCuratedSubscriptionsRepository, ignored it
(noqa: F841), then duplicated the user-side fanout SQL inline. Adds
fanout_system_for_plugin() symmetric to the existing
fanout_system_for_user() and routes mark_plugin_system through it —
removes the dead import + 14 lines of inline SQL, returns the same
`affected_users` delta count, no behavior change.
* drop customer-specific path from .ps1 example
Per CLAUDE.md vendor-agnostic OSS rule: replaced
C:\\Business\\Groupon\\Agnes\\agnes-data with the generic
C:\\Users\\<you>\\agnes-data placeholder so the docstring
example reads cleanly on any reviewer's box.
* release: 0.48.0 + parallelize Release-workflow pytest
Cuts the release shipped via #228 #230 #231 #232 #233 #234 #236 #237 #238
#239 #240 plus this PR (#241). Major changes:
- System plugin tier (schema v39) — admins mark a plugin mandatory; fans
out RBAC grants + subscriptions to every existing user/group plus
hooks for new principals
- BREAKING: removed standalone /store + /my-ai-stack page routes
(replaced by /marketplace?tab=flea + /marketplace?tab=my)
- Setup-prompt + bootstrap recovery fixes (#240)
- DuckDB CHECKPOINT-on-shutdown + 60s compose grace (#235)
- Marketplace + flea-market UX polish, agnes-metadata.json enrichment
Bonus: switch release.yml test step to `-n auto` (matches ci.yml).
Single-threaded was 15-20 min and frequently the bottleneck on PR
mergeability — now ~6 min.
---------
Co-authored-by: Minas Arustamyan <arustamyan.minas@gmail.com>
Co-authored-by: ZdenekSrotyr <zdenek.srotyr@keboola.com>
281 lines
11 KiB
Python
281 lines
11 KiB
Python
"""Resource types that can be granted to user groups.
|
|
|
|
A *resource type* identifies a class of entity admins can hand out access to
|
|
(e.g. marketplace plugins, datasets). Concrete instances live in their own
|
|
domain tables (`marketplace_plugins`, `table_registry`, …); access to a
|
|
specific instance is recorded as a row in `resource_grants` with this enum
|
|
value as ``resource_type`` and a module-defined path string as ``resource_id``.
|
|
|
|
Adding a new type — single place, no separate wiring step:
|
|
|
|
1. Add a member to :class:`ResourceType`.
|
|
2. Write a ``list_blocks(conn) -> list[Block]`` delegate that projects the
|
|
domain tables into the (block → items) tree the admin /access page
|
|
consumes. Each item must include ``resource_id`` matching the path
|
|
string used in ``resource_grants.resource_id``.
|
|
3. Register a :class:`ResourceTypeSpec` in :data:`RESOURCE_TYPES`. The
|
|
dataclass requires ``list_blocks`` — the type checker forces step 2.
|
|
4. Wire endpoints with
|
|
``Depends(require_resource_access(ResourceType.X, "<path>"))``.
|
|
|
|
No DB migration needed — this is application-level configuration. Membership
|
|
in the enum + registry is the source of truth; the DB just stores the string
|
|
value verbatim.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
from enum import StrEnum
|
|
from typing import TYPE_CHECKING, Any, Callable, List
|
|
|
|
if TYPE_CHECKING:
|
|
import duckdb
|
|
|
|
|
|
class ResourceType(StrEnum):
|
|
"""Resource categories that the access-control layer understands.
|
|
|
|
Values are persisted verbatim in ``resource_grants.resource_type``.
|
|
Renaming a member is a breaking change — existing grants reference the
|
|
string. Add a new member and migrate via SQL UPDATE if needed.
|
|
"""
|
|
|
|
MARKETPLACE_PLUGIN = "marketplace_plugin"
|
|
TABLE = "table"
|
|
MEMORY_DOMAIN = "memory_domain"
|
|
|
|
|
|
# Shape returned by ``list_blocks`` delegates. Kept as plain ``dict`` to keep
|
|
# the registry decoupled from any specific ORM/repo type — UI consumes JSON.
|
|
Block = dict[str, Any]
|
|
ListBlocksFn = Callable[["duckdb.DuckDBPyConnection"], List[Block]]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class ResourceTypeSpec:
|
|
"""Self-contained definition of a resource type.
|
|
|
|
Bundles UI copy with the projection delegate so that adding a new type
|
|
in :data:`RESOURCE_TYPES` is the single place that needs editing — no
|
|
forgotten branch in ``access-overview`` or the admin UI.
|
|
|
|
Attributes:
|
|
key: The enum member; ``key.value`` is what gets persisted.
|
|
display_name: Plural label rendered as a section header on the
|
|
admin /access page.
|
|
description: One-liner shown in the create-grant form's helper text.
|
|
id_format: Human-readable hint for ``resource_id`` shape — e.g.
|
|
``"<marketplace_slug>/<plugin_name>"``. Surfaced as input
|
|
placeholder.
|
|
list_blocks: Delegate that takes a system DB connection and returns
|
|
``[{id, name, items: [{resource_id, name, ...}]}]`` — one block
|
|
per parent entity (e.g. marketplace), one item per grantable
|
|
resource (e.g. plugin). Items must carry ``resource_id`` that
|
|
matches the path string written into ``resource_grants``.
|
|
"""
|
|
|
|
key: ResourceType
|
|
display_name: str
|
|
description: str
|
|
id_format: str
|
|
list_blocks: ListBlocksFn
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Marketplace plugin projection
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _marketplace_plugin_blocks(conn: "duckdb.DuckDBPyConnection") -> List[Block]:
|
|
"""Project marketplace_registry + marketplace_plugins into the
|
|
hierarchical (block → items) shape the admin UI renders.
|
|
|
|
One block per marketplace_registry row, ordered by registered_at.
|
|
Items inside are plugins; ``resource_id`` encodes the canonical path
|
|
``<marketplace_slug>/<plugin_name>`` that ``resource_grants.resource_id``
|
|
matches against.
|
|
"""
|
|
rows = conn.execute(
|
|
"""SELECT mr.id, mr.name, mr.registered_at,
|
|
mp.name AS plugin_name, mp.version, mp.category,
|
|
mp.description, mp.source_type, mp.is_system
|
|
FROM marketplace_registry mr
|
|
LEFT JOIN marketplace_plugins mp ON mp.marketplace_id = mr.id
|
|
ORDER BY mr.registered_at, mr.id, mp.name"""
|
|
).fetchall()
|
|
blocks: dict[str, Block] = {}
|
|
for mr_id, mr_name, _, p_name, p_ver, p_cat, p_desc, p_src, p_sys in rows:
|
|
block = blocks.setdefault(mr_id, {
|
|
"id": mr_id,
|
|
"name": mr_name,
|
|
"items": [],
|
|
})
|
|
if p_name:
|
|
block["items"].append({
|
|
"resource_id": f"{mr_id}/{p_name}",
|
|
"name": p_name,
|
|
"version": p_ver,
|
|
"category": p_cat,
|
|
"description": p_desc,
|
|
"source_type": p_src,
|
|
# v39: drives the SYSTEM pill + disabled checkbox in
|
|
# /admin/access. The grant row exists for every group on a
|
|
# system plugin (materialized by mark_system) — we just
|
|
# prevent admins from revoking it via the UI to keep the
|
|
# mandatory-tier semantic honest.
|
|
"is_system": bool(p_sys),
|
|
})
|
|
return list(blocks.values())
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Table projection
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _table_blocks(conn: "duckdb.DuckDBPyConnection") -> List[Block]:
|
|
"""Project table_registry into the (block → items) shape the admin UI
|
|
renders.
|
|
|
|
One block per ``bucket`` value, ordered by bucket then table name.
|
|
Items inside are tables; ``resource_id`` is the ``table_registry.id``
|
|
primary key — that is the path string that ``resource_grants.resource_id``
|
|
matches against. Bucket is purely a UI grouping and does not enter the
|
|
resource_id (mirrors the marketplace/plugin pattern).
|
|
|
|
Tables with NULL/empty bucket fall into a synthetic ``"(no bucket)"``
|
|
block so they are still grantable.
|
|
"""
|
|
rows = conn.execute(
|
|
"""SELECT id, name, bucket, source_type, query_mode, description
|
|
FROM table_registry
|
|
ORDER BY COALESCE(bucket, ''), name"""
|
|
).fetchall()
|
|
blocks: dict[str, Block] = {}
|
|
for tbl_id, name, bucket, source_type, query_mode, description in rows:
|
|
block_key = bucket if bucket else "(no bucket)"
|
|
block = blocks.setdefault(block_key, {
|
|
"id": block_key,
|
|
"name": block_key,
|
|
"items": [],
|
|
})
|
|
block["items"].append({
|
|
"resource_id": tbl_id,
|
|
"name": name,
|
|
"category": query_mode,
|
|
"source_type": source_type,
|
|
"description": description,
|
|
})
|
|
return list(blocks.values())
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Memory domain projection
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
# Mirrors VALID_DOMAINS in app/api/memory.py. Kept inline here to avoid
|
|
# importing the FastAPI module at registry-load time (circular import risk).
|
|
# If this list drifts from VALID_DOMAINS, add a runtime cross-check or merge
|
|
# the two sources — for now they're tiny and reviewed together.
|
|
_MEMORY_DOMAINS = (
|
|
"finance",
|
|
"engineering",
|
|
"product",
|
|
"data",
|
|
"operations",
|
|
"infrastructure",
|
|
)
|
|
|
|
|
|
def _memory_domain_blocks(conn: "duckdb.DuckDBPyConnection") -> List[Block]:
|
|
"""Project the (fixed) set of corporate-memory domains into the
|
|
(block → items) shape the admin UI renders.
|
|
|
|
Unlike marketplace plugins / tables, the grantable items are a fixed
|
|
enum, not a DB lookup — every deployment has the same 6 domains. One
|
|
synthetic block ``"Memory domains"`` holds them; ``resource_id`` is
|
|
the domain string (matches ``knowledge_items.domain``).
|
|
"""
|
|
return [{
|
|
"id": "memory_domains",
|
|
"name": "Memory domains",
|
|
"items": [
|
|
{
|
|
"resource_id": domain,
|
|
"name": domain,
|
|
"category": "domain",
|
|
"description": (
|
|
f"Members of granted groups see all knowledge_items "
|
|
f"with domain={domain!r}, in addition to the existing "
|
|
f"audience filter."
|
|
),
|
|
}
|
|
for domain in _MEMORY_DOMAINS
|
|
],
|
|
}]
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Registry — the one place that gets edited when adding a new resource type
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
RESOURCE_TYPES: dict[ResourceType, ResourceTypeSpec] = {
|
|
ResourceType.MARKETPLACE_PLUGIN: ResourceTypeSpec(
|
|
key=ResourceType.MARKETPLACE_PLUGIN,
|
|
display_name="Marketplace plugins",
|
|
description="A plugin from a registered marketplace.",
|
|
id_format="<marketplace_slug>/<plugin_name>",
|
|
list_blocks=_marketplace_plugin_blocks,
|
|
),
|
|
ResourceType.TABLE: ResourceTypeSpec(
|
|
key=ResourceType.TABLE,
|
|
display_name="Tables",
|
|
description="A registered data table.",
|
|
id_format="<table_id>",
|
|
list_blocks=_table_blocks,
|
|
),
|
|
ResourceType.MEMORY_DOMAIN: ResourceTypeSpec(
|
|
key=ResourceType.MEMORY_DOMAIN,
|
|
display_name="Memory domains",
|
|
description="A corporate-memory domain (knowledge_items.domain).",
|
|
id_format="<domain>",
|
|
list_blocks=_memory_domain_blocks,
|
|
),
|
|
}
|
|
|
|
|
|
def is_resource_type_enabled(rt: ResourceType) -> bool:
|
|
"""Whether a resource type is exposed to the admin UI + grant API.
|
|
|
|
All resource types are unconditionally enabled in v19. The
|
|
``AGNES_ENABLE_TABLE_GRANTS`` env-gate that previously held back
|
|
``ResourceType.TABLE`` was removed when ``can_access_table`` was
|
|
rewired onto ``app.auth.access.can_access``.
|
|
"""
|
|
return True
|
|
|
|
|
|
def enabled_resource_types() -> list[ResourceTypeSpec]:
|
|
"""The subset of RESOURCE_TYPES currently surfaced to admins."""
|
|
return [spec for rt, spec in RESOURCE_TYPES.items() if is_resource_type_enabled(rt)]
|
|
|
|
|
|
def list_resource_types() -> list[dict[str, str]]:
|
|
"""Flat projection for /api/admin/resource-types.
|
|
|
|
Shape: ``[{key, display_name, description, id_format}]``. The
|
|
``list_blocks`` delegate is intentionally omitted — the UI consumes
|
|
blocks via ``/api/admin/access-overview`` instead.
|
|
"""
|
|
return [
|
|
{
|
|
"key": spec.key.value,
|
|
"display_name": spec.display_name,
|
|
"description": spec.description,
|
|
"id_format": spec.id_format,
|
|
}
|
|
for spec in enabled_resource_types()
|
|
]
|