[Enhancement]: Add 'app_type' column for AppDB model with updated API responses

agenta-backend/agenta_backend/migrations/postgres/versions/1abfef8ed0ef_added_the_app_type_column_to_the_app_db_.py

@@ -0,0 +1,54 @@
+"""Added the 'app_type' column to the 'app_db' table
+
+Revision ID: 1abfef8ed0ef
+Revises: b80c708c21bb
+Create Date: 2024-08-14 19:44:23.707519
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = "1abfef8ed0ef"
+down_revision: Union[str, None] = "b80c708c21bb"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    # Create the enum type first
+    app_enumtype = sa.Enum(
+        "CHAT_PROMPT", "SINGLE_PROMPT", "RAG", "CUSTOM", name="app_enumtype"
+    )
+    app_enumtype.create(op.get_bind(), checkfirst=True)
+
+    # Then add the column using the enum type
+    op.add_column(
+        "app_db",
+        sa.Column(
+            "app_type",
+            app_enumtype,
+            nullable=True,
+        ),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+
+    # Drop the column first
+    op.drop_column("app_db", "app_type")
+
+    # Then drop the enum type
+    app_enumtype = sa.Enum(
+        "CHAT_PROMPT", "SINGLE_PROMPT", "RAG", "CUSTOM", name="app_enumtype"
+    )
+    app_enumtype.drop(op.get_bind(), checkfirst=True)
+    # ### end Alembic commands ###

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

@@ -211,6 +211,7 @@ class URI(BaseModel):
 class App(BaseModel):
     app_id: str
     app_name: str
+    app_type: Optional[str] = None
 
 
 class RemoveApp(BaseModel):

agenta-backend/agenta_backend/models/converters.py

@@ -466,7 +466,9 @@ def base_db_to_pydantic(base_db: VariantBaseDB) -> BaseOutput:
 
 
 def app_db_to_pydantic(app_db: AppDB) -> App:
-    return App(app_name=app_db.app_name, app_id=str(app_db.id))
+    return App(
+        app_name=app_db.app_name, app_id=str(app_db.id), app_type=app_db.app_type
+    )
 
 
 def image_db_to_pydantic(image_db: ImageDB) -> ImageExtended:

agenta-backend/agenta_backend/models/db_models.py

@@ -15,7 +15,7 @@
 from sqlalchemy.dialects.postgresql import UUID, JSONB
 
 from agenta_backend.models.base import Base
-from agenta_backend.models.shared_models import TemplateType
+from agenta_backend.models.shared_models import TemplateType, AppType
 
 
 class UserDB(Base):
@@ -76,6 +76,7 @@ class AppDB(Base):
         nullable=False,
     )
     app_name = Column(String)
+    app_type = Column(Enum(AppType, name="app_enumtype"), nullable=True)
     user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"))
     created_at = Column(
         DateTime(timezone=True), default=lambda: datetime.now(timezone.utc)

agenta-backend/agenta_backend/models/shared_models.py

@@ -65,3 +65,10 @@ class HumanEvaluationScenarioOutput(BaseModel):
 class TemplateType(enum.Enum):
     IMAGE = "image"
     ZIP = "zip"
+
+
+class AppType(enum.Enum):
+    CHAT_PROMPT = "chat_prompt"
+    SINGLE_PROMPT = "single_prompt"
+    RAG = "rag"
+    CUSTOM = "custom"

agenta-backend/agenta_backend/routers/app_router.py

@@ -277,6 +277,7 @@ async def create_app(
             request.state.user_id,
             organization_id if isCloudEE() else None,
             str(workspace.id) if isCloudEE() else None,
+            template_id=None,
         )
         return CreateAppOutput(app_id=str(app_db.id), app_name=str(app_db.app_name))
     except Exception as e:
@@ -503,32 +504,33 @@ async def create_app_and_variant_from_template(
             )
 
         logger.debug(
-            "Step 5: Creating new app and initializing environments"
+            "Step 5: Retrieve template from db"
             if isCloudEE()
-            else "Step 2: Creating new app and initializing environments"
+            else "Step 2: Retrieve template from db"
+        )
+        template_db = await db_manager.get_template(payload.template_id)
+
+        logger.debug(
+            "Step 6: Creating new app and initializing environments"
+            if isCloudEE()
+            else "Step 3: Creating new app and initializing environments"
         )
         if app is None:
             app = await db_manager.create_app_and_envs(
                 app_name,
                 request.state.user_id,
                 payload.organization_id if isCloudEE() else None,  # type: ignore
                 payload.workspace_id if isCloudEE() else None,  # type: ignore
+                str(template_db.id),
             )
 
-        logger.debug(
-            "Step 6: Retrieve template from db"
-            if isCloudEE()
-            else "Step 3: Retrieve template from db"
-        )
-        template_db = await db_manager.get_template(payload.template_id)
-        repo_name = os.environ.get("AGENTA_TEMPLATE_REPO", "agentaai/templates_v2")
-        image_name = f"{repo_name}:{template_db.name}"
-
         logger.debug(
             "Step 7: Creating image instance and adding variant based on image"
             if isCloudEE()
             else "Step 4: Creating image instance and adding variant based on image"
         )
+        repo_name = os.environ.get("AGENTA_TEMPLATE_REPO", "agentaai/templates_v2")
+        image_name = f"{repo_name}:{template_db.name}"
         app_variant_db = await app_manager.add_variant_based_on_image(
             app=app,
             variant_name="app.default",

agenta-backend/agenta_backend/services/db_manager.py

@@ -1,6 +1,7 @@
 import os
 import uuid
 import logging
+from enum import Enum
 from pathlib import Path
 from urllib.parse import urlparse
 from typing import Any, Dict, List, Optional
@@ -73,6 +74,7 @@
 
 from agenta_backend.models.shared_models import (
     Result,
+    AppType,
     ConfigDB,
     TemplateType,
     CorrectAnswer,
@@ -616,11 +618,35 @@ async def create_deployment(
             raise Exception(f"Error while creating deployment: {e}")
 
 
+async def get_app_type_from_template(template_id: Optional[str]) -> Enum:
+    """Get the application type from the specified template.
+
+    Args:
+        template_id (Optional[str]): The ID of the template
+
+    Returns:
+        AppType (Enum): The determined application type. Defaults to AppType.CUSTOM.
+    """
+
+    if template_id is None:
+        return AppType.CUSTOM
+
+    template_db = await get_template(template_id=template_id)
+    if "Single Prompt" in template_db.title:
+        return AppType.SINGLE_PROMPT
+    elif "Chat Application" in template_db.title:
+        return AppType.CHAT_PROMPT
+    elif "RAG" in template_db.title:
+        return AppType.RAG
+    return AppType.CUSTOM
+
+
 async def create_app_and_envs(
     app_name: str,
     user_uid: str,
     organization_id: Optional[str] = None,
     workspace_id: Optional[str] = None,
+    template_id: Optional[str] = None,
 ) -> AppDB:
     """
     Create a new app with the given name and organization ID.
@@ -630,6 +656,7 @@ async def create_app_and_envs(
         user_uid (str): The UID of the user that the app belongs to.
         organization_id (str): The ID of the organization that the app belongs to.
         workspace_id (str): The ID of the workspace that the app belongs to.
+        template_id (str): The ID of the template
 
     Returns:
         AppDB: The created app.
@@ -648,8 +675,9 @@ async def create_app_and_envs(
     if app is not None:
         raise ValueError("App with the same name already exists")
 
+    app_type = await get_app_type_from_template(template_id)
     async with db_engine.get_session() as session:
-        app = AppDB(app_name=app_name, user_id=user.id)
+        app = AppDB(app_name=app_name, user_id=user.id, app_type=app_type)
 
         if isCloudEE():
             # assert that if organization_id is provided, workspace_id is also provided, and vice versa