Feat: Ability to invite users to organizations

agenta-backend/agenta_backend/__init__.py

@@ -3,7 +3,7 @@
 from agenta_backend.models.api.user_models import User
 from agenta_backend.models.api.organization_models import Organization
 from agenta_backend.services.user_service import create_new_user
-from agenta_backend.services.organization_service import (
+from agenta_backend.ee.services.organization_service import (
     create_new_organization,
 )
 from agenta_backend.config import settings

agenta-backend/agenta_backend/main.py

@@ -5,6 +5,7 @@
 from agenta_backend.config import settings
 from agenta_backend.routers import (
     app_variant,
+    user_profile,
     container_router,
     environment_router,
     evaluation_router,
@@ -80,6 +81,7 @@ async def lifespan(application: FastAPI, cache=True):
 
 
 app = FastAPI(lifespan=lifespan)
+app.include_router(user_profile.router, prefix="/profile")
 app.include_router(app_variant.router, prefix="/app_variant")
 app.include_router(evaluation_router.router, prefix="/evaluations")
 app.include_router(testset_router.router, prefix="/testsets")
@@ -90,7 +92,9 @@ async def lifespan(application: FastAPI, cache=True):
 
 if os.environ["FEATURE_FLAG"] in ["cloud", "ee", "demo"]:
     import agenta_backend.ee.main as ee
+    from agenta_backend.ee.routers import organization_router
 
+    app.include_router(organization_router.router, prefix="/organizations")
     app, allow_headers = ee.extend_main(app)
 # this is the prefix in which we are reverse proxying the api
 #

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

@@ -9,6 +9,7 @@ class AppVariant(BaseModel):
     variant_name: str
     parameters: Optional[Dict[str, Any]]
     previous_variant_name: Optional[str]
+    organization_id: Optional[str]
 
 
 class RestartAppContainer(BaseModel):
@@ -62,6 +63,12 @@ class CreateAppVariant(BaseModel):
     image_tag: str
     env_vars: Dict[str, str]
 
+class InviteRequest(BaseModel):
+    email: str
+
+
+class InviteToken(BaseModel):
+    token: str
 
 class Environment(BaseModel):
     name: str

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

@@ -1,5 +1,6 @@
-from typing import Optional
 from datetime import datetime
+from bson import ObjectId
+from typing import Optional, List
 from pydantic import BaseModel, Field
 
 
@@ -8,9 +9,14 @@ class TimestampModel(BaseModel):
     updated_at: datetime = Field(datetime.utcnow())
 
 
-class Organization(TimestampModel):
+class Organization(BaseModel):
+    id: Optional[str]
     name: str
     description: Optional[str]
+    type: Optional[str]
+    owner: str
+    members: Optional[List[str]]
+    invitations: Optional[List]
 
 
 class OrganizationUpdate(BaseModel):

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

@@ -1,5 +1,5 @@
-from typing import Optional
 from datetime import datetime
+from typing import Optional, List
 from pydantic import BaseModel, Field
 
 
@@ -9,10 +9,11 @@ class TimestampModel(BaseModel):
 
 
 class User(TimestampModel):
+    id: Optional[str]
     uid: str
     username: str
     email: str  # switch to EmailStr when langchain support pydantic>=2.1
-    organization_id: str
+    organizations: Optional[List[str]]
 
 
 class UserUpdate(BaseModel):

agenta-backend/agenta_backend/models/db_models.py

@@ -1,12 +1,23 @@
-from datetime import datetime
-from typing import Any, Dict, List, Optional
+from bson import ObjectId
+from datetime import datetime, timedelta
+from typing import Optional, Dict, Any, List
+from odmantic import Field, Model, Reference, EmbeddedModel
 
-from odmantic import EmbeddedModel, Field, Model, Reference
+
+class InvitationDB(EmbeddedModel):
+    token: str = Field(unique=True)
+    email: str
+    expiration_date: datetime = Field(default="0")
+    used: bool = False
 
 
 class OrganizationDB(Model):
     name: str = Field(default="agenta")
     description: str = Field(default="")
+    type: Optional[str]
+    owner: str
+    members: Optional[List[ObjectId]]
+    invitations: Optional[List[InvitationDB]] = []
 
     class Config:
         collection = "organizations"
@@ -16,7 +27,7 @@ class UserDB(Model):
     uid: str = Field(default="0", unique=True, index=True)
     username: str = Field(default="agenta")
     email: str = Field(default="[email protected]", unique=True)
-    organization_id: OrganizationDB = Reference(key_name="org")
+    organizations: Optional[List[ObjectId]] = []
 
     class Config:
         collection = "users"
@@ -42,6 +53,7 @@ class AppVariantDB(Model):
     user_id: UserDB = Reference(key_name="user")
     parameters: Dict[str, Any] = Field(default=dict)
     previous_variant_name: Optional[str]
+    organization_id: Optional[str]
     is_deleted: bool = Field(
         default=False
     )  # soft deletion for using the template variants
@@ -104,6 +116,7 @@ class EvaluationDB(Model):
     app_name: str
     testset: Dict[str, str]
     user: UserDB = Reference(key_name="user")
+    organization_id: Optional[str]
     created_at: Optional[datetime] = Field(default=datetime.utcnow())
     updated_at: Optional[datetime] = Field(default=datetime.utcnow())
 
@@ -119,6 +132,7 @@ class EvaluationScenarioDB(Model):
     evaluation: Optional[str]
     evaluation_id: str
     user: UserDB = Reference(key_name="user")
+    organization_id: Optional[str]
     correct_answer: Optional[str]
     created_at: Optional[datetime] = Field(default=datetime.utcnow())
     updated_at: Optional[datetime] = Field(default=datetime.utcnow())
@@ -144,6 +158,7 @@ class TestSetDB(Model):
     app_name: str
     csvdata: List[Dict[str, str]]
     user: UserDB = Reference(key_name="user")
+    organization_id: Optional[str]
     created_at: Optional[datetime] = Field(default=datetime.utcnow())
     updated_at: Optional[datetime] = Field(default=datetime.utcnow())
 

agenta-backend/agenta_backend/routers/app_variant.py

@@ -135,6 +135,7 @@ async def get_variant_by_env(
 
 @router.get("/list_apps/", response_model=List[App])
 async def list_apps(
+    org_id: Optional[str] = None,
     stoken_session: SessionContainer = Depends(verify_session()),
 ) -> List[App]:
     """Lists the apps from our repository.
@@ -147,7 +148,7 @@ async def list_apps(
     """
     try:
         kwargs: dict = await get_user_and_org_id(stoken_session)
-        apps = await db_manager.list_apps(**kwargs)
+        apps = await db_manager.list_apps(org_id, **kwargs)
         return apps
     except Exception as e:
         logger.error(f"list_apps exception ===> {e}")

agenta-backend/agenta_backend/routers/evaluation_router.py

@@ -47,7 +47,8 @@
     create_custom_code_evaluation,
     execute_custom_code_evaluation,
 )
-from agenta_backend.services.db_manager import engine, query, get_user_object
+from agenta_backend.utills.common import engine
+from agenta_backend.services.db_manager import query, get_user_object
 from agenta_backend.models.db_models import EvaluationDB, EvaluationScenarioDB
 from agenta_backend.config import settings
 

agenta-backend/agenta_backend/routers/testset_router.py

@@ -16,8 +16,9 @@
     TestSetOutputResponse,
 )
 from agenta_backend.config import settings
+from agenta_backend.utills.common import engine
 from agenta_backend.models.db_models import TestSetDB
-from agenta_backend.services.db_manager import engine, query, get_user_object
+from agenta_backend.services.db_manager import query, get_user_object
 
 
 upload_folder = "./path/to/upload/folder"

agenta-backend/agenta_backend/routers/user_profile.py

@@ -0,0 +1,40 @@
+import os
+from agenta_backend.utills.common import engine
+from agenta_backend.services.db_manager import UserDB
+from fastapi import APIRouter, HTTPException, Depends
+from agenta_backend.models.api.user_models import User
+
+router = APIRouter()
+
+if os.environ["FEATURE_FLAG"] in ["cloud", "ee", "demo"]:
+    from agenta_backend.ee.services.auth_helper import (
+        SessionContainer,
+        verify_session,
+    )
+    from agenta_backend.ee.services.selectors import get_user_and_org_id
+else:
+    from agenta_backend.services.auth_helper import (
+        SessionContainer,
+        verify_session,
+    )
+    from agenta_backend.services.selectors import get_user_and_org_id
+
+@router.get("/")
+async def user_profile(
+    stoken_session: SessionContainer = Depends(verify_session()),
+):
+
+    try:
+
+        kwargs: dict = await get_user_and_org_id(stoken_session)
+        user = await engine.find_one(UserDB, UserDB.uid == kwargs["uid"])
+        return User(
+            id=str(user.id),
+            uid=str(user.uid),
+            username=str(user.username),
+            email=str(user.email)
+        ).dict(exclude_unset=True)
+
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+