agenta 0.12.5__py3-none-any.whl → 0.12.7__py3-none-any.whl

agenta/__init__.py

@@ -7,6 +7,7 @@ from .sdk.types import (
     InFile,
     IntParam,
     MultipleChoiceParam,
+    GroupedMultipleChoiceParam,
     MessagesInput,
     TextParam,
     FileInputURL,

agenta/cli/main.py

@@ -153,18 +153,21 @@ def init(app_name: str, backend_host: str):
             try:
                 key_prefix = api_key.split(".")[0]
                 client.validate_api_key(key_prefix=key_prefix)
-
-                # Make request to fetch user organizations after api key validation
+            except Exception as ex:
+                click.echo(
+                    click.style(
+                        f"Error: Unable to validate API key.\nError: {ex}", fg="red"
+                    )
+                )
+                sys.exit(1)
+            # Make request to fetch user organizations after api key validation
+            try:
                 organizations = client.list_organizations()
                 if len(organizations) >= 1:
                     user_organizations = organizations
             except Exception as ex:
-                if ex.status_code == 401:
-                    click.echo(click.style("Error: Invalid API key", fg="red"))
-                    sys.exit(1)
-                else:
-                    click.echo(click.style(f"Error: {ex}", fg="red"))
-                    sys.exit(1)
+                click.echo(click.style(f"Error: {ex}", fg="red"))
+                sys.exit(1)
 
         filtered_org = None
         if where_question == "On agenta cloud":

agenta/sdk/__init__.py

@@ -9,6 +9,7 @@ from .types import (
     InFile,
     IntParam,
     MultipleChoiceParam,
+    GroupedMultipleChoiceParam,
     TextParam,
     MessagesInput,
     FileInputURL,

agenta/sdk/agenta_decorator.py

@@ -25,6 +25,7 @@ from .types import (
     InFile,
     IntParam,
     MultipleChoiceParam,
+    GroupedMultipleChoiceParam,
     TextParam,
     MessagesInput,
     FileInputURL,
@@ -396,6 +397,13 @@ def override_schema(openapi_schema: dict, func_name: str, endpoint: str, params:
         f"Body_{func_name}_{endpoint}_post"
     ]["properties"]
     for param_name, param_val in params.items():
+        if isinstance(param_val, GroupedMultipleChoiceParam):
+            subschema = find_in_schema(schema_to_override, param_name, "grouped_choice")
+            assert (
+                subschema
+            ), f"GroupedMultipleChoiceParam '{param_name}' is in the parameters but could not be found in the openapi.json"
+            subschema["choices"] = param_val.choices
+            subschema["default"] = param_val.default
         if isinstance(param_val, MultipleChoiceParam):
             subschema = find_in_schema(schema_to_override, param_name, "choice")
             default = str(param_val)

agenta/sdk/types.py

@@ -127,6 +127,44 @@ class MultipleChoiceParam(str):
         )
 
 
+class GroupedMultipleChoiceParam(str):
+    def __new__(cls, default: str = None, choices: Dict[str, List[str]] = None):
+        if choices is None:
+            choices = {}
+
+        if default and not any(default in choices for choices in choices.values()):
+            if not choices:
+                print(
+                    f"Warning: Default value {default} provided but choices are empty."
+                )
+            else:
+                raise ValueError(
+                    f"Default value {default} is not in the provided choices"
+                )
+
+        if not default:
+            for choices in choices.values():
+                if choices:
+                    default = choices[0]
+                    break
+
+        instance = super().__new__(cls, default)
+        instance.choices = choices
+        instance.default = default
+        return instance
+
+    @classmethod
+    def __modify_schema__(cls, field_schema: dict[str, Any], **kwargs):
+        choices = kwargs.get("choices", {})
+        field_schema.update(
+            {
+                "x-parameter": "grouped_choice",
+                "type": "string",
+                "choices": choices,
+            }
+        )
+
+
 class Message(BaseModel):
     role: str
     content: str

{agenta-0.12.5.dist-info → agenta-0.12.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.12.5
+Version: 0.12.7
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Home-page: https://agenta.ai
 Keywords: LLMOps,LLM,evaluation,prompt engineering

{agenta-0.12.5.dist-info → agenta-0.12.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
-agenta/__init__.py,sha256=Sg_4PW8MM-r9p96FeqTdu1h7fcQzN4nF7KPuQD7lgIc,493
+agenta/__init__.py,sha256=o3aVn9zE9mtZtxZi8xAA98OuHg-Jd7yth4yK5dsR-hA,525
 agenta/cli/evaluation_commands.py,sha256=fs6492tprPId9p8eGO02Xy-NCBm2RZNJLZWcUxugwd8,474
 agenta/cli/helper.py,sha256=X_0GtjugLQiM_f53_l3AF3uPS8if96ejTh2nThYqLuE,6199
-agenta/cli/main.py,sha256=kSWLxVnjvpd_bqT-vMMHFRXRc53zUS_k5pLcvnVxaF4,9409
+agenta/cli/main.py,sha256=jeTI0U1xeRwFv3QkJRwOXWVK13V9t3JEoApAk5VbAtA,9487
 agenta/cli/telemetry.py,sha256=GaFFRsE_NtrcSSJ10r2jhgFs5Sk8gf2C09Ox3gOr3eU,1317
 agenta/cli/variant_commands.py,sha256=wJCfTp1uNQwSadg4rraxZF5NUVfpfg_0RAK76qD5xDo,16858
 agenta/cli/variant_configs.py,sha256=PLiuMKadVzs6Gi2uYaT0pZzyULNHDXaTMDWboqpwWdU,1293
@@ -84,12 +84,12 @@ agenta/docker/docker-assets/entrypoint.sh,sha256=29XK8VQjQsx4hN2j-4JDy-6kQb5y4LC
 agenta/docker/docker-assets/lambda_function.py,sha256=h4UZSSfqwpfsCgERv6frqwm_4JrYu9rLz3I-LxCfeEg,83
 agenta/docker/docker-assets/main.py,sha256=7MI-21n81U7N7A0GxebNi0cmGWtJKcR2sPB6FcH2QfA,251
 agenta/docker/docker_utils.py,sha256=gtwD0XZ_1Vk-rzNUYctlnRjZPpn01mX7tYvaNK7o7OQ,3542
-agenta/sdk/__init__.py,sha256=TUTEndClnM2SKeQsC7Swv_K3uWkBZTd7jYKvp2-tQeY,565
-agenta/sdk/agenta_decorator.py,sha256=B0tQCBsbSUFfdo1Ibadd0MPQCN7xdGtBcTurmsclL6U,15429
+agenta/sdk/__init__.py,sha256=xTh1aVoSGPFBgSf_lnALaE1rt-G3eomxF5ijB3DdobM,597
+agenta/sdk/agenta_decorator.py,sha256=ARCTFmzOvvRXPE_fSK_4JRDxyfF91NxEX2Kf-KwH9hI,15889
 agenta/sdk/agenta_init.py,sha256=67THCATEW_oC8juCzdS-AouirksuXouyrRPyuUkLFxw,8025
 agenta/sdk/context.py,sha256=q-PxL05-I84puunUAs9LGsffEXcYhDxhQxjuOz2vK90,901
 agenta/sdk/router.py,sha256=0sbajvn5C7t18anH6yNo7-oYxldHnYfwcbmQnIXBePw,269
-agenta/sdk/types.py,sha256=GiUiXDkbM2pMx1-mldzQT8uDUcm9sRqVUytThEkbjj4,4658
+agenta/sdk/types.py,sha256=Mn0yBlHh_Yr_5oQXUfsYI3V7sJAVWkJgkxEOBDOOMS0,5852
 agenta/sdk/utils/globals.py,sha256=lpgflY8xovZJtHfJf41dbNCZGwx07YNkG9ldruv6xoI,360
 agenta/sdk/utils/helper/openai_cost.py,sha256=1VkgvucDnNZm1pTfcVLz9icWunntp1d7zwMmnviy3Uw,5877
 agenta/sdk/utils/preinit.py,sha256=YlJL7RLfel0R7DFp-jK7OV-z4ZIQJM0oupYlk7g8b5o,1278
@@ -108,7 +108,7 @@ agenta/templates/simple_prompt/app.py,sha256=kODgF6lhzsaJPdgL5b21bUki6jkvqjWZzWR
 agenta/templates/simple_prompt/env.example,sha256=g9AE5bYcGPpxawXMJ96gh8oenEPCHTabsiOnfQo3c5k,70
 agenta/templates/simple_prompt/requirements.txt,sha256=ywRglRy7pPkw8bljmMEJJ4aOOQKrt9FGKULZ-DGkoBU,23
 agenta/templates/simple_prompt/template.toml,sha256=DQBtRrF4GU8LBEXOZ-GGuINXMQDKGTEG5y37tnvIUIE,60
-agenta-0.12.5.dist-info/METADATA,sha256=YIhDd9UjBwKXoR9RRoSFnHt3cJxXZffhx22VZ93BGX8,27336
-agenta-0.12.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-agenta-0.12.5.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
-agenta-0.12.5.dist-info/RECORD,,
+agenta-0.12.7.dist-info/METADATA,sha256=wijR1Y4DB7r3pSHKy3cpiuI8-Y8tef_7dMxFMkzzm6o,27336
+agenta-0.12.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+agenta-0.12.7.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
+agenta-0.12.7.dist-info/RECORD,,