Merge branch 'main' of https://github.com/Agenta-AI/agenta-core

Agenta-AI · Jan 27, 2024 · 303702e · 303702e
2 parents f493061 + a659d89
commit 303702e
Show file tree

Hide file tree

Showing 15 changed files with 646 additions and 679 deletions.
diff --git a/...igrations/17_01_24_pydantic_and_evaluations/20240112120721_evaluation_scenarios_revamp.py b/...igrations/17_01_24_pydantic_and_evaluations/20240112120721_evaluation_scenarios_revamp.py
@@ -272,15 +272,23 @@ async def migrate_old_auto_evaluation_scenario_to_new_auto_evaluation_scenario(
                         EvaluationScenarioResult(
                             evaluator_config=PydanticObjectId(evaluator_config),
                             result=Result(
-                                type="number"
-                                if isinstance(old_scenario.score, int)
-                                else "number"
-                                if isinstance(old_scenario.score, float)
-                                else "string"
-                                if isinstance(old_scenario.score, str)
-                                else "boolean"
-                                if isinstance(old_scenario.score, bool)
-                                else "any",
+                                type=(
+                                    "number"
+                                    if isinstance(old_scenario.score, int)
+                                    else (
+                                        "number"
+                                        if isinstance(old_scenario.score, float)
+                                        else (
+                                            "string"
+                                            if isinstance(old_scenario.score, str)
+                                            else (
+                                                "boolean"
+                                                if isinstance(old_scenario.score, bool)
+                                                else "any"
+                                            )
+                                        )
+                                    )
+                                ),
                                 value=old_scenario.score,
                             ),
                         )

diff --git a/agenta-backend/agenta_backend/models/converters.py b/agenta-backend/agenta_backend/models/converters.py
@@ -1,5 +1,6 @@
 """Converts db models to pydantic models
 """
+
 import json
 from typing import List
 from agenta_backend.services import db_manager

diff --git a/agenta-backend/agenta_backend/routers/app_router.py b/agenta-backend/agenta_backend/routers/app_router.py
@@ -378,12 +378,16 @@ async def create_app_and_variant_from_template(
         app_variant_db = await app_manager.add_variant_based_on_image(
             app=app,
             variant_name="app.default",
-            docker_id_or_template_uri=template_db.template_uri
-            if os.environ["FEATURE_FLAG"] in ["cloud", "ee"]
-            else template_db.digest,
-            tags=f"{image_name}"
-            if os.environ["FEATURE_FLAG"] not in ["cloud", "ee"]
-            else None,
+            docker_id_or_template_uri=(
+                template_db.template_uri
+                if os.environ["FEATURE_FLAG"] in ["cloud", "ee"]
+                else template_db.digest
+            ),
+            tags=(
+                f"{image_name}"
+                if os.environ["FEATURE_FLAG"] not in ["cloud", "ee"]
+                else None
+            ),
             base_name="app",
             config_name="default",
             is_template_image=True,

diff --git a/agenta-backend/agenta_backend/services/app_manager.py b/agenta-backend/agenta_backend/services/app_manager.py
@@ -1,5 +1,6 @@
 """Main Business logic
 """
+
 import os
 import logging
 from urllib.parse import urlparse

diff --git a/agenta-backend/agenta_backend/tasks/evaluations.py b/agenta-backend/agenta_backend/tasks/evaluations.py
@@ -129,9 +129,11 @@ def evaluate(
                     name=input_item["name"],
                     type="text",
                     value=data_point[
-                        input_item["name"]
-                        if input_item["type"] != "messages"
-                        else "chat"
+                        (
+                            input_item["name"]
+                            if input_item["type"] != "messages"
+                            else "chat"
+                        )
                     ],  # TODO: We need to remove the hardcoding of chat as name for chat inputs from the FE
                 )
                 for input_item in list_inputs

diff --git a/agenta-backend/poetry.lock b/agenta-backend/poetry.lock
diff --git a/agenta-backend/pyproject.toml b/agenta-backend/pyproject.toml
@@ -33,7 +33,7 @@ sentry-sdk = {extras = ["fastapi"], version = "^1.34.0"}
 kubernetes = "^28.1.0"
 celery = "^5.3.6"
 watchdog = {extras = ["watchmedo"], version = "^3.0.0"}
-beanie = {git = "https://github.com/mmabrouk/beanie"}
+beanie = "^1.25.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.3.1"

diff --git a/agenta-cli/agenta/cli/variant_commands.py b/agenta-cli/agenta/cli/variant_commands.py
@@ -135,8 +135,6 @@ def add_variant(
         if tar_path.exists():
             tar_path.unlink()
 
-        # docker_image: DockerImage = build_and_upload_docker_image(
-        #     folder=app_path, app_name=app_name, variant_name=variant_name)
     except Exception as ex:
         click.echo(click.style(f"Error while building image: {ex}", fg="red"))
         return None

diff --git a/agenta-cli/agenta/docker/docker_utils.py b/agenta-cli/agenta/docker/docker_utils.py
@@ -99,64 +99,3 @@ def ignore_patterns(path, names):
 
     # dockerfile_path.unlink()
     return tarfile_path
-
-
-def build_and_upload_docker_image(
-    folder: Path, variant_name: str, app_name: str
-) -> Image:
-    """
-    DEPRECATED
-    Builds an image from the folder and returns the path
-
-    Arguments:
-        folder -- The folder containg the app code
-
-    Returns:
-        The image object
-    TODO: Check that the variant name does not exist
-    TODO: Deal with different app names (probably we need to look then at multiple tags)
-    TODO: Error handling
-    """
-    # Initialize Docker client
-    client = docker.from_env()
-
-    with TemporaryDirectory() as temp_dir:
-        # Create a Dockerfile for the app
-        # TODO: Later do this in the temp dir
-        dockerfile_path = create_dockerfile(folder)
-        shutil.copytree(
-            Path(__file__).parent.parent / "sdk",
-            folder / "agenta",
-        )
-        shutil.copy(Path(__file__).parent / "docker-assets" / "main.py", folder)
-        shutil.copy(Path(__file__).parent / "docker-assets" / "entrypoint.sh", folder)
-
-        # Copy the app files to a temporary directory
-        shutil.copytree(folder, temp_dir, dirs_exist_ok=True)
-
-        # Build the Docker image
-        registry = settings.registry
-        tag = f"{registry}/{app_name.lower()}_{variant_name.lower()}:latest"
-        print("Building Docker image...")
-        try:
-            image, build_log = client.images.build(
-                path=temp_dir,
-                tag=tag,
-                buildargs={"ROOT_PATH": f"/{app_name}/{variant_name}"},
-                rm=True,  # Remove intermediate containers after a successful build
-            )
-
-        except docker.errors.BuildError as ex:
-            logger.error("Error building Docker image:\n")
-            # Print the build log
-            for line in ex.build_log:
-                logger.error(line)
-            raise ex
-        # Upload the Docker image to the Agenta registry
-        print("Uploading Docker image...")
-        client.images.push(repository=f"{registry}", tag="latest")
-        print("Docker image uploaded successfully.")
-
-        # Clean up the temporary Dockerfile
-        dockerfile_path.unlink()
-    return image
diff --git a/agenta-cli/agenta/sdk/agenta_decorator.py b/agenta-cli/agenta/sdk/agenta_decorator.py
@@ -1,4 +1,5 @@
 """The code for the Agenta SDK"""
+
 import os
 import sys
 import time
@@ -184,9 +185,10 @@ async def execute_function(
 def handle_exception(e: Exception) -> JSONResponse:
     """Handle exceptions and return a JSONResponse."""
 
+    status_code: int = e.status_code if hasattr(e, "status_code") else 500
     traceback_str = traceback.format_exception(e, value=e, tb=e.__traceback__)
     return JSONResponse(
-        status_code=500,
+        status_code=status_code,
         content={"error": str(e), "traceback": "".join(traceback_str)},
     )
 

diff --git a/agenta-cli/pyproject.toml b/agenta-cli/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.8.2"
+version = "0.8.4"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <[email protected]>"]

diff --git a/agenta-web/public/assets/favicon.ico b/agenta-web/public/assets/favicon.ico
diff --git a/agenta-web/src/components/Sidebar/Sidebar.tsx b/agenta-web/src/components/Sidebar/Sidebar.tsx
@@ -25,6 +25,7 @@ import {useProfileData} from "@/contexts/profile.context"
 import {getColorFromStr} from "@/lib/helpers/colors"
 import {getInitials, isDemo} from "@/lib/helpers/utils"
 import {useSession} from "@/hooks/useSession"
+import {useLocalStorage} from "usehooks-ts"
 
 type StyleProps = {
     themeMode: "system" | "dark" | "light"
@@ -138,7 +139,7 @@ const Sidebar: React.FC = () => {
     }
     const [selectedKeys, setSelectedKeys] = useState(initialSelectedKeys)
     const {user, orgs, selectedOrg, changeSelectedOrg, reset} = useProfileData()
-    const [collapsed, setCollapsed] = useState(false)
+    const [collapsed, setCollapsed] = useLocalStorage("sidebarCollapsed", false)
 
     useEffect(() => {
         setSelectedKeys(initialSelectedKeys)

diff --git a/docs/logo/favicon.png b/docs/logo/favicon.png
diff --git a/docs/mint.json b/docs/mint.json
@@ -8,9 +8,9 @@
   },
   "favicon": "/logo/favicon.png",
   "colors": {
-    "primary": "#34d399",
-    "light": "#34d399",
-    "dark": "#34d399"
+    "primary": "#4AA081",
+    "light": "#4AA081",
+    "dark": "#4AA081"
   },
   "modeToggle": {
     "default": "light",