design(frontend): AGE-513 Implement Overview and App management view

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

@@ -107,6 +107,9 @@ class AppVariantResponse(BaseModel):
     config_name: str
     uri: Optional[str]
     revision: int
+    created_at: Optional[str] = None
+    updated_at: Optional[str] = None
+    modified_by_id: Optional[str] = None
 
 
 class AppVariantRevision(BaseModel):

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

@@ -12,8 +12,9 @@ class TimestampModel(BaseModel):
 class User(TimestampModel):
     id: Optional[str] = None
     uid: str
-    username: str
     email: str
+    username: str
+    profile_picture: Optional[str] = None
     organizations: Optional[List[str]] = None
 
 

agenta-backend/agenta_backend/models/converters.py

@@ -331,6 +331,9 @@ async def app_variant_db_to_output(app_variant_db: AppVariantDB) -> AppVariantRe
         config_name=app_variant_db.config_name,  # type: ignore
         uri=uri,
         revision=app_variant_db.revision,  # type: ignore
+        created_at=str(app_variant_db.updated_at),
+        updated_at=str(app_variant_db.created_at),
+        modified_by_id=str(app_variant_db.modified_by_id),
     )
 
     if isCloudEE():

agenta-backend/agenta_backend/routers/user_profile.py

@@ -1,26 +1,33 @@
-import os
+from typing import Optional
+
 from fastapi import HTTPException, Request
+
 from agenta_backend.services import db_manager
 from agenta_backend.utils.common import APIRouter
 from agenta_backend.models.api.user_models import User
 
 router = APIRouter()
 
 
-@router.get("/", operation_id="user_profile")
-async def user_profile(
-    request: Request,
-):
+@router.get("/", operation_id="fetch_user_profile")
+async def user_profile(request: Request, user_id: Optional[str] = None):
     try:
-        user = await db_manager.get_user(request.state.user_id)
+        if user_id is not None:
+            user = await db_manager.get_user_with_id(user_id=user_id)
+        else:
+            user = await db_manager.get_user(request.state.user_id)
+
+        assert (
+            user is not None
+        ), "User not found. Please ensure that the user_id is specified correctly."
         return User(
             id=str(user.id),
             uid=str(user.uid),
-            username=str(user.username),
             email=str(user.email),
+            username=str(user.username),
             created_at=str(user.created_at),
             updated_at=str(user.updated_at),
-        ).dict(exclude_unset=True)
+        ).model_dump(exclude_unset=True)
 
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))

agenta-backend/agenta_backend/services/db_manager.py

@@ -209,7 +209,8 @@ async def fetch_app_variant_by_id(
     assert app_variant_id is not None, "app_variant_id cannot be None"
     async with db_engine.get_session() as session:
         base_query = select(AppVariantDB).options(
-            joinedload(AppVariantDB.base), joinedload(AppVariantDB.app)
+            joinedload(AppVariantDB.base),
+            joinedload(AppVariantDB.app),
         )
         if isCloudEE():
             query = base_query.options(
@@ -852,7 +853,7 @@ async def get_user_with_id(user_id: str):
         user = result.scalars().first()
         if user is None:
             logger.error("Failed to get user with id")
-            raise Exception("Error while getting user")
+            raise NoResultFound(f"User with id {user_id} not found")
         return user
 
 
@@ -1145,7 +1146,10 @@ async def list_app_variants(app_id: str):
     async with db_engine.get_session() as session:
         result = await session.execute(
             select(AppVariantDB)
-            .options(joinedload(AppVariantDB.app), joinedload(AppVariantDB.base))
+            .options(
+                joinedload(AppVariantDB.app),
+                joinedload(AppVariantDB.base),
+            )
             .filter_by(app_id=uuid.UUID(app_uuid))
         )
         app_variants = result.scalars().all()
@@ -1842,7 +1846,10 @@ async def get_app_variant_instance_by_id(variant_id: str) -> AppVariantDB:
     async with db_engine.get_session() as session:
         result = await session.execute(
             select(AppVariantDB)
-            .options(joinedload(AppVariantDB.base), joinedload(AppVariantDB.app))
+            .options(
+                joinedload(AppVariantDB.base),
+                joinedload(AppVariantDB.app),
+            )
             .filter_by(id=uuid.UUID(variant_id))
         )
         app_variant_db = result.scalars().first()

agenta-backend/agenta_backend/tests/variants_user_profile_router/test_user_profile.py

@@ -1,4 +1,5 @@
 import os
+from uuid import uuid4
 
 import httpx
 import pytest
@@ -22,7 +23,7 @@
 
 
 @pytest.mark.asyncio
-async def test_user_profile():
+async def test_fetch_user_profile_without_user_id():
     async with db_engine.get_session() as session:
         result = await session.execute(select(UserDB).filter_by(uid="0"))
         user_db = result.scalars().first()
@@ -36,7 +37,7 @@ async def test_user_profile():
             email=str(user_db.email),
             created_at=str(user_db.created_at),
             updated_at=str(user_db.updated_at),
-        ).dict(exclude_unset=True)
+        ).model_dump(exclude_unset=True)
 
         response = await test_client.get(f"{BACKEND_API_HOST}/profile/")
 
@@ -45,3 +46,40 @@ async def test_user_profile():
         assert response.json()["uid"] == user_db_dict["uid"]
         assert response.json()["email"] == user_db_dict["email"]
         assert response.json()["username"] == user_db_dict["username"]
+
+
+async def test_fetch_user_profile_with_valid_user_id():
+    async with db_engine.get_session() as session:
+        result = await session.execute(select(UserDB).filter_by(uid="0"))
+        user_db = result.scalars().first()
+        if not user_db:
+            assert False
+
+        user_db_dict = User(
+            id=str(user_db.id),
+            uid=str(user_db.uid),
+            username=str(user_db.username),
+            email=str(user_db.email),
+            created_at=str(user_db.created_at),
+            updated_at=str(user_db.updated_at),
+        ).model_dump(exclude_unset=True)
+
+        response = await test_client.get(
+            f"{BACKEND_API_HOST}/profile/?user_id={str(user_db.id)}"
+        )
+
+        assert response.status_code == 200
+        assert response.json()["id"] == user_db_dict["id"]
+        assert response.json()["uid"] == user_db_dict["uid"]
+        assert response.json()["email"] == user_db_dict["email"]
+        assert response.json()["username"] == user_db_dict["username"]
+
+
+async def test_fetch_user_profile_with_non_existent_user_id_error():
+    user_non_existent_id = str(uuid4())
+    response = await test_client.get(
+        f"{BACKEND_API_HOST}/profile/?user_id={user_non_existent_id}"
+    )
+
+    assert response.status_code == 500
+    assert response.json()["detail"] == f"User with id {user_non_existent_id} not found"

agenta-cli/agenta/client/backend/types/app_variant_response.py

@@ -26,6 +26,9 @@ class AppVariantResponse(pydantic.BaseModel):
     revision: int
     organization_id: typing.Optional[str]
     workspace_id: typing.Optional[str]
+    created_at: typing.Optional[dt.datetime] = None
+    updated_at: typing.Optional[dt.datetime] = None
+    modified_by_id: typing.Optional[str] = None
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {

agenta-web/cypress.config.ts

@@ -9,8 +9,12 @@ export default defineConfig({
     screenshotOnRunFailure: false,
     e2e: {
         baseUrl: "http://localhost:3000",
-        defaultCommandTimeout: 30000,
-        requestTimeout: 10000,
+        defaultCommandTimeout: 120000,
+        requestTimeout: 120000,
+        pageLoadTimeout: 120000,
+        responseTimeout: 120000,
+        taskTimeout: 120000,
+        execTimeout: 120000,
         setupNodeEvents(on) {
             on("task", {
                 log(message) {

agenta-web/cypress/e2e/eval.comparison.cy.ts

@@ -8,7 +8,6 @@ describe("Evaluation Comparison Test", function () {
         cy.get("@app_id").then((appId) => {
             app_id = appId
         })
-        cy.get('[data-cy="playground-save-changes-button"]').eq(0).click()
     })
 
     context("When creating an app variant", () => {

agenta-web/cypress/e2e/eval.evaluations.cy.ts

@@ -5,7 +5,6 @@ describe("Evaluations CRUD Operations Test", function () {
         cy.get("@app_id").then((appId) => {
             app_id = appId
         })
-        cy.get('[data-cy="playground-save-changes-button"]').eq(0).click()
     })
 
     context("Executing Evaluations CRUD operations", () => {

agenta-web/cypress/e2e/eval.scenarios.cy.ts

@@ -5,7 +5,6 @@ describe("Evaluation Scenarios Test", function () {
         cy.get("@app_id").then((appId) => {
             app_id = appId
         })
-        cy.get('[data-cy="playground-save-changes-button"]').eq(0).click()
     })
 
     context("Executing Evaluation Scenarios Workflow", () => {

agenta-web/cypress/e2e/playground.cy.ts

@@ -1,9 +1,15 @@
 describe("Playground Prompt Test", function () {
+    let app_id
     before(() => {
         cy.createVariant()
+        cy.get("@app_id").then((appId) => {
+            app_id = appId
+        })
     })
-
     it("Should test prompt functionality in the Playground", () => {
+        cy.visit(`/apps/${app_id}/playground`)
+        cy.url().should("include", "/playground")
+        cy.contains(/modify parameters/i)
         cy.get('[data-cy^="testview-input-parameters"]').eq(0).type("Germany")
         cy.get('[data-cy="testview-input-parameters-run-button"]').click()
         cy.intercept("POST", "**/demo/app/generate", {

agenta-web/cypress/support/commands/evaluations.ts

@@ -28,7 +28,7 @@ Cypress.Commands.add("createVariant", () => {
         }
     })
 
-    cy.contains("Single Prompt")
+    cy.contains("Single Prompt OpenAI")
         .parentsUntil('[data-cy^="app-template-card"]')
         .last()
         .contains("create app", {matchCase: false})
@@ -51,7 +51,6 @@ Cypress.Commands.add("createVariant", () => {
 
         cy.wrap(app_id).as("app_id")
     })
-    cy.contains(/modify parameters/i)
     cy.removeLlmProviderKey()
 })
 

agenta-web/package.json

@@ -31,6 +31,7 @@
         "@mdx-js/react": "^2.3.0",
         "@monaco-editor/react": "^4.5.2",
         "@next/mdx": "^13.4.13",
+        "@phosphor-icons/react": "^2.1.7",
         "@remixicon/react": "^4.1.1",
         "@sentry/nextjs": "^8.18.0",
         "@tailwindcss/forms": "^0.5.7",