Feat - RBAC Implementation and Non-OSS Feature Removal

.gitignore

@@ -56,4 +56,7 @@ agenta-web/cypress/screenshots/
 agenta-web/cypress/videos/
 .nextjs_cache/
 
-rabbitmq_data
+rabbitmq_data
+
+# docker compose override
+docker-compose.*override.yaml

agenta-backend/agenta_backend/main.py

@@ -12,7 +12,6 @@
     human_evaluation_router,
     evaluators_router,
     observability_router,
-    organization_router,
     testset_router,
     user_profile,
     variants_router,
@@ -102,9 +101,6 @@ async def lifespan(application: FastAPI, cache=True):
 app.include_router(
     observability_router.router, prefix="/observability", tags=["Observability"]
 )
-app.include_router(
-    organization_router.router, prefix="/organizations", tags=["Organizations"]
-)
 app.include_router(bases_router.router, prefix="/bases", tags=["Bases"])
 app.include_router(configs_router.router, prefix="/configs", tags=["Configs"])
 

agenta-backend/agenta_backend/models/api/api_models.py

@@ -35,7 +35,6 @@ class VariantAction(BaseModel):
 
 class CreateApp(BaseModel):
     app_name: str
-    organization_id: Optional[str] = None
 
 
 class CreateAppOutput(BaseModel):
@@ -57,7 +56,6 @@ class AppVariant(BaseModel):
     variant_name: str
     parameters: Optional[Dict[str, Any]]
     previous_variant_name: Optional[str]
-    organization_id: Optional[str] = None
     base_name: Optional[str]
     config_name: Optional[str]
 
@@ -66,14 +64,13 @@ class AppVariantFromImagePayload(BaseModel):
     variant_name: str
 
 
-class AppVariantOutput(BaseModel):
+class AppVariantResponse(BaseModel):
     app_id: str
     app_name: str
     variant_id: str
     variant_name: str
     parameters: Optional[Dict[str, Any]]
     previous_variant_name: Optional[str]
-    organization_id: str
     user_id: str
     base_name: str
     base_id: str
@@ -106,7 +103,6 @@ class AppVariantFromImage(BaseModel):
     variant_name: str
     parameters: Optional[Dict[str, Any]]
     previous_variant_name: Optional[str]
-    organization_id: Optional[str] = None
 
 
 class RestartAppContainer(BaseModel):
@@ -117,7 +113,6 @@ class Image(BaseModel):
     type: Optional[str]
     docker_id: str
     tags: str
-    organization_id: Optional[str] = None
 
 
 class AddVariantFromImagePayload(BaseModel):
@@ -170,23 +165,13 @@ class CreateAppVariant(BaseModel):
     app_name: str
     template_id: str
     env_vars: Dict[str, str]
-    organization_id: Optional[str] = None
-
-
-class InviteRequest(BaseModel):
-    email: str
-
-
-class InviteToken(BaseModel):
-    token: str
 
 
 class Environment(BaseModel):
     name: str
     deployed_app_variant: Optional[str]
     deployed_base_name: Optional[str]
     deployed_config_name: Optional[str]
-    organization_id: Optional[str] = None
 
 
 class DeployToEnvironmentPayload(BaseModel):
@@ -210,13 +195,6 @@ class PostVariantConfigPayload(BaseModel):
     overwrite: bool
 
 
-class ListAPIKeysOutput(BaseModel):
-    prefix: str
-    created_at: datetime
-    last_used_at: datetime = None
-    expiration_date: datetime = None
-
-
 class BaseOutput(BaseModel):
     base_id: str
     base_name: str

agenta-backend/agenta_backend/models/converters.py

@@ -1,57 +1,86 @@
 """Converts db models to pydantic models
 """
+import os
 import json
+import logging
 from typing import List
 from agenta_backend.services import db_manager
 from agenta_backend.models.api.user_models import User
-from agenta_backend.models.db_models import (
-    AppVariantDB,
-    EvaluationScenarioResult,
-    EvaluatorConfigDB,
-    HumanEvaluationDB,
-    HumanEvaluationScenarioDB,
-    ImageDB,
-    TemplateDB,
-    AppDB,
-    AppEnvironmentDB,
-    TestSetDB,
-    SpanDB,
-    TraceDB,
-    Feedback as FeedbackDB,
-    EvaluationDB,
-    EvaluationScenarioDB,
-    VariantBaseDB,
-    UserDB,
-    AggregatedResult,
-)
-from agenta_backend.models.api.api_models import (
-    AppVariant,
-    ImageExtended,
-    Template,
-    TemplateImageInfo,
-    AppVariantOutput,
-    App,
-    EnvironmentOutput,
-    TestSetOutput,
-    BaseOutput,
-)
+
 from agenta_backend.models.api.observability_models import (
     Span,
     Trace,
     Feedback as FeedbackOutput,
 )
 from agenta_backend.models.api.evaluation_model import (
-    HumanEvaluation,
-    HumanEvaluationScenario,
-    SimpleEvaluationOutput,
-    EvaluationScenario,
     Evaluation,
+    HumanEvaluation,
     EvaluatorConfig,
+    EvaluationScenario,
+    SimpleEvaluationOutput,
     EvaluationScenarioInput,
+    HumanEvaluationScenario,
     EvaluationScenarioOutput,
 )
 
-import logging
+FEATURE_FLAG = os.environ["FEATURE_FLAG"]
+if FEATURE_FLAG in ["cloud", "ee"]:
+    from agenta_backend.commons.models.db_models import (
+        AppDB_ as AppDB,
+        UserDB_ as UserDB,
+        ImageDB_ as ImageDB,
+        TestSetDB_ as TestSetDB,
+        EvaluationDB_ as EvaluationDB,
+        AppVariantDB_ as AppVariantDB,
+        VariantBaseDB_ as VariantBaseDB,
+        AppEnvironmentDB_ as AppEnvironmentDB,
+        EvaluatorConfigDB_ as EvaluatorConfigDB,
+        HumanEvaluationDB_ as HumanEvaluationDB,
+        EvaluationScenarioDB_ as EvaluationScenarioDB,
+        HumanEvaluationScenarioDB_ as HumanEvaluationScenarioDB,
+    )
+    from agenta_backend.commons.models.api.api_models import (
+        AppVariant_ as AppVariant,
+        ImageExtended_ as ImageExtended,
+        AppVariantResponse_ as AppVariantResponse,
+    )
+else:
+    from agenta_backend.models.db_models import (
+        AppDB,
+        UserDB,
+        ImageDB,
+        TestSetDB,
+        EvaluationDB,
+        AppVariantDB,
+        VariantBaseDB,
+        AppEnvironmentDB,
+        EvaluatorConfigDB,
+        HumanEvaluationDB,
+        EvaluationScenarioDB,
+        HumanEvaluationScenarioDB,
+    )
+    from agenta_backend.models.api.api_models import (
+        AppVariant,
+        ImageExtended,
+        AppVariantResponse,
+    )
+
+from agenta_backend.models.db_models import (
+    SpanDB,
+    TraceDB,
+    TemplateDB,
+    AggregatedResult,
+    Feedback as FeedbackDB,
+    EvaluationScenarioResult,
+)
+from agenta_backend.models.api.api_models import (
+    App,
+    Template,
+    BaseOutput,
+    TestSetOutput,
+    TemplateImageInfo,
+    EnvironmentOutput,
+)
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
@@ -192,19 +221,24 @@ def evaluation_scenario_db_to_pydantic(
 def app_variant_db_to_pydantic(
     app_variant_db: AppVariantDB, previous_variant_name: str = None
 ) -> AppVariant:
-    return AppVariant(
+    app_variant = AppVariant(
         app_id=str(app_variant_db.app.id),
         app_name=app_variant_db.app.app_name,
         variant_name=app_variant_db.variant_name,
         parameters=app_variant_db.config.parameters,
         previous_variant_name=app_variant_db.previous_variant_name,
-        organization_id=str(app_variant_db.organization.id),
         base_name=app_variant_db.base_name,
         config_name=app_variant_db.config_name,
     )
 
+    if FEATURE_FLAG in ["cloud", "ee"]:
+        app_variant.organization_id = str(app_variant_db.organization.id)
+        app_variant.workspace_id = str(app_variant_db.workspace.id)
 
-async def app_variant_db_to_output(app_variant_db: AppVariantDB) -> AppVariantOutput:
+    return app_variant
+
+
+async def app_variant_db_to_output(app_variant_db: AppVariantDB) -> AppVariantResponse:
     if app_variant_db.base.deployment:
         deployment = await db_manager.get_deployment_by_objectid(
             app_variant_db.base.deployment
@@ -214,13 +248,12 @@ async def app_variant_db_to_output(app_variant_db: AppVariantDB) -> AppVariantOu
         deployment = None
         uri = None
     logger.info(f"uri: {uri} deployment: {app_variant_db.base.deployment} {deployment}")
-    return AppVariantOutput(
+    variant_response = AppVariantResponse(
         app_id=str(app_variant_db.app.id),
         app_name=str(app_variant_db.app.app_name),
         variant_name=app_variant_db.variant_name,
         variant_id=str(app_variant_db.id),
         user_id=str(app_variant_db.user.id),
-        organization_id=str(app_variant_db.organization.id),
         parameters=app_variant_db.config.parameters,
         previous_variant_name=app_variant_db.previous_variant_name,
         base_name=app_variant_db.base_name,
@@ -230,6 +263,12 @@ async def app_variant_db_to_output(app_variant_db: AppVariantDB) -> AppVariantOu
         uri=uri,
     )
 
+    if FEATURE_FLAG in ["cloud", "ee"]:
+        variant_response.organization_id = str(app_variant_db.organization.id)
+        variant_response.workspace_id = str(app_variant_db.workspace.id)
+
+    return variant_response
+
 
 async def environment_db_to_output(
     environment_db: AppEnvironmentDB,
@@ -262,13 +301,18 @@ def app_db_to_pydantic(app_db: AppDB) -> App:
 
 
 def image_db_to_pydantic(image_db: ImageDB) -> ImageExtended:
-    return ImageExtended(
-        organization_id=str(image_db.organization.id),
+    image = ImageExtended(
         docker_id=image_db.docker_id,
         tags=image_db.tags,
         id=str(image_db.id),
     )
 
+    if FEATURE_FLAG in ["cloud", "ee"]:
+        image.organization_id = str(image_db.organization.id)
+        image.workspace_id = str(image_db.workspace.id)
+
+    return image
+
 
 def templates_db_to_pydantic(templates_db: List[TemplateDB]) -> List[Template]:
     return [