Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
220 changes: 76 additions & 144 deletions openapi/ga/individual/platform.openapi.yaml

Large diffs are not rendered by default.

220 changes: 76 additions & 144 deletions openapi/ga/openapi.yaml

Large diffs are not rendered by default.

220 changes: 76 additions & 144 deletions openapi/openapi.yaml

Large diffs are not rendered by default.

69 changes: 55 additions & 14 deletions services/core/auth/src/nmp/core/auth/assets/static-authz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@ authz:
description: "Read intake annotations"
delete:
description: "Delete intake annotations"
experiment-groups:
experiments:
create:
description: "Create intake experiment groups"
description: "Create intake experiments"
delete:
description: "Delete intake experiment groups"
description: "Delete intake experiments"
read:
description: "Read intake experiment groups"
description: "Read intake experiments"
update:
description: "Update intake experiment groups"
description: "Update intake experiments"
evaluations:
create:
description: "Create intake evaluations"
Expand Down Expand Up @@ -308,7 +308,7 @@ authz:
- intake.evaluations.read
- intake.evaluator-results.list
- intake.evaluator-results.read
- intake.experiment-groups.read
- intake.experiments.read
- intake.sessions.read
- intake.spans.list
- intake.spans.read
Expand Down Expand Up @@ -357,9 +357,9 @@ authz:
- intake.evaluations.delete
- intake.evaluations.update
- intake.evaluator-results.create
- intake.experiment-groups.create
- intake.experiment-groups.delete
- intake.experiment-groups.update
- intake.experiments.create
- intake.experiments.delete
- intake.experiments.update
- intake.ingest.create
- jobs.cancel
- jobs.create
Expand Down Expand Up @@ -971,35 +971,76 @@ authz:
scopes:
- intake:read
- platform:read
/apis/intake/v2/workspaces/{workspace}/experiments:
get:
permissions:
- intake.experiments.read
scopes:
- intake:read
- platform:read
post:
permissions:
- intake.experiments.create
scopes:
- intake:write
- platform:write
/apis/intake/v2/workspaces/{workspace}/experiments/{name}:
delete:
permissions:
- intake.experiments.delete
scopes:
- intake:write
- platform:write
get:
permissions:
- intake.experiments.read
scopes:
- intake:read
- platform:read
put:
permissions:
- intake.experiments.update
scopes:
- intake:write
- platform:write
# Deprecated /experiment-groups aliases: the parent resource moved to /experiments, but the old
# paths are kept as hidden back-compat routes (include_in_schema=False), so they are absent from
# the OpenAPI-derived bundle. Map them to the intake.experiments.* permissions and mark
# x-not-in-openapi so the orphan check skips them. Remove alongside the router aliases.
/apis/intake/v2/workspaces/{workspace}/experiment-groups:
get:
x-not-in-openapi: true
permissions:
- intake.experiment-groups.read
- intake.experiments.read
scopes:
- intake:read
- platform:read
post:
x-not-in-openapi: true
permissions:
- intake.experiment-groups.create
- intake.experiments.create
scopes:
- intake:write
- platform:write
/apis/intake/v2/workspaces/{workspace}/experiment-groups/{name}:
delete:
x-not-in-openapi: true
permissions:
- intake.experiment-groups.delete
- intake.experiments.delete
scopes:
- intake:write
- platform:write
get:
x-not-in-openapi: true
permissions:
- intake.experiment-groups.read
- intake.experiments.read
scopes:
- intake:read
- platform:read
put:
x-not-in-openapi: true
permissions:
- intake.experiment-groups.update
- intake.experiments.update
scopes:
- intake:write
- platform:write
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ def _preflight(base_url: str) -> None:

def _upsert_group(client: httpx.Client, base_url: str, workspace: str) -> str:
body = {"name": DEFAULT_GROUP, "description": "Smoke-test group for the rollup script."}
url = _intake_url(base_url, workspace, "/experiment-groups")
url = _intake_url(base_url, workspace, "/experiments")
response = client.post(url, json=body)
if response.status_code == 409:
response = client.put(_intake_url(base_url, workspace, f"/experiment-groups/{DEFAULT_GROUP}"), json=body)
response = client.put(_intake_url(base_url, workspace, f"/experiments/{DEFAULT_GROUP}"), json=body)
response.raise_for_status()
return response.json()["id"]

Expand Down
6 changes: 3 additions & 3 deletions services/intake/scripts/spans/seed_experiments_demo.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ def _create_group_if_missing(
client: httpx.Client, base_url: str, workspace: str, spec: GroupSpec
) -> tuple[str | None, bool]:
"""Returns (group_id, created). On 409, returns (None, False) and leaves the existing group alone."""
url = _intake_url(base_url, workspace, "/experiment-groups")
url = _intake_url(base_url, workspace, "/experiments")
body = {"name": spec.name, "description": spec.description}
response = client.post(url, json=body)
if response.status_code == 409:
Expand Down Expand Up @@ -651,8 +651,8 @@ def _wipe_workspace(client: httpx.Client, base_url: str, workspace: str) -> None
if _delete(client, base_url, workspace, f"/evaluations/{name}"):
deleted_evaluations += 1
deleted_groups = 0
for name in _list_all_names(client, base_url, workspace, "/experiment-groups"):
if _delete(client, base_url, workspace, f"/experiment-groups/{name}"):
for name in _list_all_names(client, base_url, workspace, "/experiments"):
if _delete(client, base_url, workspace, f"/experiments/{name}"):
deleted_groups += 1
print(f"deleted {deleted_evaluations} evaluation(s) and {deleted_groups} group(s)\n")

Expand Down
Loading