Skip to content

Commit b6fafc3

Browse files
authored
Merge pull request #4820 from Agenta-AI/release/v0.104.3
[release] v0.104.3
2 parents 93c1939 + 062d272 commit b6fafc3

127 files changed

Lines changed: 7163 additions & 8535 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

api/AGENTS.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,20 @@ OSS and EE relationship:
3939
- `ee.extend_app_schema(app)` for OpenAPI/security metadata.
4040
- EE is additive over OSS, not a separate API architecture.
4141

42+
RBAC / access enforcement:
43+
44+
- RBAC enforcement is an OSS feature and is always-on in both editions. The
45+
permission vocabulary, default role catalog, and enforcement service live in
46+
`api/oss/src/core/access/`. Handlers call `check_action_access(...)`
47+
unconditionally; there is no edition gate around the check itself.
48+
- The only edition difference is the EE plan gate: in EE, `check_entitlements(Flag.RBAC)`
49+
can grant allow-all when a plan is not RBAC-entitled. This is layered into the OSS
50+
enforcement service via a function-local `is_ee()`-guarded import — OSS never imports
51+
`ee.*` at module top.
52+
- Custom roles are an EE feature: `AGENTA_ACCESS_ROLES` / `AGENTA_ACCESS_ROLES_OVERLAY`
53+
are parsed/applied in `api/ee/src/core/access/permissions/role_overrides.py` and
54+
ignored in OSS (which enforces the code-default catalog).
55+
4256
Primary references:
4357
- `api/entrypoints/routers.py`
4458
- `api/ee/src/main.py`

api/ee/databases/postgres/migrations/core/data_migrations/api_keys.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from oss.src.models.db_models import APIKeyDB
1010
from oss.src.models.db_models import ProjectDB
11-
from ee.src.models.extended.deprecated_models import DeprecatedAPIKeyDB
11+
from ee.databases.postgres.migrations.core.deprecated_models import DeprecatedAPIKeyDB
1212

1313

1414
BATCH_SIZE = 200

api/ee/databases/postgres/migrations/core/data_migrations/applications.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from sqlalchemy.future import select
88
from sqlalchemy import delete, Connection, update, func
99

10-
from oss.src.models.deprecated_models import ( # type: ignore
10+
from oss.databases.postgres.migrations.core.deprecated_models import ( # type: ignore
1111
DeprecatedEvaluatorConfigDBwApp as DeprecatedEvaluatorConfigDB,
1212
DeprecatedAppDB,
1313
)

api/ee/databases/postgres/migrations/core/data_migrations/applications_workflow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
from sqlalchemy import func, text
1111
from sqlalchemy.ext.asyncio import AsyncConnection, create_async_engine
1212

13-
from ee.src.models.db_models import WorkspaceMemberDB as WorkspaceMemberDBE
13+
from oss.src.models.db_models import WorkspaceMemberDB as WorkspaceMemberDBE
1414
from oss.src.models.db_models import ProjectDB as ProjectDBE
15-
from oss.src.models.deprecated_models import (
15+
from oss.databases.postgres.migrations.core.deprecated_models import (
1616
AppDB,
1717
AppVariantDB,
1818
AppVariantRevisionsDB,

api/ee/databases/postgres/migrations/core/data_migrations/default_environments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from sqlalchemy.ext.asyncio import AsyncConnection, create_async_engine
99
from sqlalchemy.future import select
1010

11-
from ee.src.models.db_models import WorkspaceMemberDB as WorkspaceMemberDBE
11+
from oss.src.models.db_models import WorkspaceMemberDB as WorkspaceMemberDBE
1212
from oss.src.core.environments.dtos import (
1313
EnvironmentCreate,
1414
EnvironmentRevisionCommit,

api/ee/databases/postgres/migrations/core/data_migrations/demos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
ProjectDB,
1717
UserDB,
1818
)
19-
from ee.src.models.db_models import (
19+
from oss.src.models.db_models import (
2020
OrganizationMemberDB,
2121
WorkspaceMemberDB,
2222
ProjectMemberDB,

api/ee/databases/postgres/migrations/core/data_migrations/environments.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from sqlalchemy.ext.asyncio import AsyncConnection, create_async_engine
1313

1414
from oss.src.models.db_models import ProjectDB as ProjectDBE
15-
from oss.src.models.deprecated_models import (
15+
from oss.databases.postgres.migrations.core.deprecated_models import (
1616
AppDB,
1717
AppVariantDB,
1818
AppVariantRevisionsDB,
@@ -36,7 +36,7 @@
3636
EnvironmentRevisionData,
3737
)
3838
from oss.src.core.shared.dtos import Reference
39-
from ee.src.models.db_models import WorkspaceMemberDB as WorkspaceMemberDBE
39+
from oss.src.models.db_models import WorkspaceMemberDB as WorkspaceMemberDBE
4040

4141

4242
# Define constants

api/ee/databases/postgres/migrations/core/data_migrations/evaluators.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from sqlalchemy import func
1010
from sqlalchemy.ext.asyncio import AsyncConnection, create_async_engine
1111

12-
from ee.src.models.db_models import WorkspaceMemberDB as WorkspaceMemberDBE
12+
from oss.src.models.db_models import WorkspaceMemberDB as WorkspaceMemberDBE
1313
from oss.src.models.db_models import ProjectDB as ProjectDBE
14-
from oss.src.models.deprecated_models import EvaluatorConfigDB
14+
from oss.databases.postgres.migrations.core.deprecated_models import EvaluatorConfigDB
1515
from oss.src.dbs.postgres.workflows.dbes import (
1616
WorkflowArtifactDBE,
1717
WorkflowVariantDBE,
@@ -27,7 +27,7 @@
2727
SimpleEvaluatorFlags,
2828
)
2929
from oss.src.core.evaluators.utils import build_evaluator_data
30-
from oss.src.models.deprecated_models import (
30+
from oss.databases.postgres.migrations.core.deprecated_models import (
3131
DeprecatedAutoEvaluatorConfigDBwProject as DeprecatedEvaluatorConfigDBwProject,
3232
)
3333
from oss.src.core.workflows.service import WorkflowsService

api/ee/databases/postgres/migrations/core/data_migrations/export_records.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import click
33
from sqlalchemy.future import select
44
from sqlalchemy import Connection, insert, func
5-
from ee.src.models.db_models import OrganizationMemberDB # type: ignore
6-
from ee.src.models.extended.deprecated_models import UserOrganizationDB # type: ignore
5+
from oss.src.models.db_models import OrganizationMemberDB # type: ignore
6+
from ee.databases.postgres.migrations.core.deprecated_models import UserOrganizationDB # type: ignore
77

88
BATCH_SIZE = 200
99

api/ee/databases/postgres/migrations/core/data_migrations/invitations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from sqlalchemy import delete, Connection, insert, func
88

99
from oss.src.models.db_models import UserDB, InvitationDB, ProjectDB
10-
from ee.src.models.extended.deprecated_models import OldInvitationDB
10+
from ee.databases.postgres.migrations.core.deprecated_models import OldInvitationDB
1111

1212

1313
BATCH_SIZE = 200

0 commit comments

Comments
 (0)