Merge pull request #1289 from Agenta-AI/1283-sub-issue-forward-errors…

…-in-llm-app Update - modified agenta sdk handle_exception
Agenta-AI · Jan 27, 2024 · b367d71 · b367d71
2 parents 75154ac + 93cc642
commit b367d71
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 20 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-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.3"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <[email protected]>"]