agenta 0.24.1__py3-none-any.whl → 0.24.2__py3-none-any.whl

agenta/cli/variant_commands.py

@@ -16,7 +16,7 @@ from agenta.client.backend.client import AgentaApi
 from agenta.client.api import add_variant_to_server
 from agenta.client.api_models import AppVariant, Image
 from agenta.docker.docker_utils import build_tar_docker_container
-from agenta.client.backend.types.variant_action import VariantActionEnum, VariantAction
+from agenta.client.backend.types.variant_action import VariantAction
 
 
 BACKEND_URL_SUFFIX = os.environ.get("BACKEND_URL_SUFFIX", "api")
@@ -151,12 +151,18 @@ def add_variant(
             variant_id = config["variant_ids"][config["variants"].index(variant_name)]
             client.variants.update_variant_image(
                 variant_id=variant_id,
-                request=image,  # because Fern code uses "request: Image" instead of "image: Image"
+                docker_id=image.docker_id,
+                tags=image.tags,
+                type=image.type,
             )  # this automatically restarts
         else:
             click.echo(click.style(f"Adding {variant_name} to server...", fg="yellow"))
             response = add_variant_to_server(
-                app_id, base_name, image, f"{host}/{BACKEND_URL_SUFFIX}", api_key
+                app_id,
+                base_name,
+                image,
+                f"{host}/{BACKEND_URL_SUFFIX}",
+                api_key,
             )
             variant_id = response["variant_id"]
             config["variants"].append(variant_name)
@@ -174,7 +180,7 @@ def add_variant(
     if overwrite:
         # Track a deployment event
         if tracking_enabled:
-            get_user_id = client.user_profile()
+            get_user_id = client.fetch_user_profile()
             user_id = get_user_id["id"]
             event_track.capture_event(
                 "app_deployment",
@@ -196,7 +202,7 @@ def add_variant(
     else:
         # Track a deployment event
         if tracking_enabled:
-            get_user_id = client.user_profile()
+            get_user_id = client.fetch_user_profile()
             user_id = get_user_id["id"]
             event_track.capture_event(
                 "app_deployment",
@@ -261,12 +267,11 @@ def start_variant(variant_id: str, app_folder: str, host: str):
         api_key=api_key,
     )
 
-    endpoint = client.variants.start_variant(
+    variant = client.variants.start_variant(
         variant_id=variant_id,
-        action=VariantAction(
-            action=VariantActionEnum.START,
-        ),
-    ).uri
+        action=VariantAction(action="START"),
+    )
+    endpoint = variant.uri
     click.echo("\n" + click.style("Congratulations! 🎉", bold=True, fg="green"))
     click.echo(
         click.style("Your app has been deployed locally as an API. 🚀", fg="cyan")

agenta/client/Readme.md

@@ -7,90 +7,98 @@ Currently the models are manually copied from the backend code. This needs to ch
 To generate the client code using Fern, follow the steps below. 
 
 1. Open a Terminal and navigate to the folder where this Readme.md file is. For example;
-    ```
-    $ cd agenta/agenta-cli/agenta/client
-    ```
+```bash
+cd agenta/agenta-cli/agenta/client
+```
 
 2. Next ensure you have installed Fern by executing the command;
-    ```
-    $ npm install -g fern-api
-    ```
+```bash
+npm install -g fern-api
+```
+
 3. Execute this command to initialize Fern to import and use the OpenAPI spec;
 
 > To use an OpenAPI spec, you can pass in the filepath or URL.
-> We'll be using a url to the openapi.json for [Agenta Cloud](https://cloud.agenta.ai)
+> We'll need to log in to use fern.
+> We'll be using a url to the openapi.json for [Agenta Cloud](https://cloud.agenta.ai).
+> Alternatively, for `cloud-dev` we could use [Cloud Local](http://localhost).
 
-```
+```bash
 fern init --openapi https://cloud.agenta.ai/api/openapi.json
+# fern init --openapi http://localhost/api/openapi.json
 ```    
    
 4. Add the Fern Python SDK;
-   ```bash
-   fern add fern-python-sdk
-   ```
+```bash
+fern add fern-python-sdk
+```
 
 5. Go to the generators.yml, which would look like this;
-
-    ```yaml
-    default-group: local
-    groups:
-      local:
-        generators:
-          - name: fernapi/fern-typescript-node-sdk
-            version: 0.7.2
-            output:
-              location: local-file-system
-              path: ../generated/typescript
-          - name: fernapi/fern-python-sdk
-            version: 0.6.0
-    ```
-
-    Replace the following;
-
-    ```yaml
+```yaml
+default-group: local
+groups:
+  local:
+    generators:
       - name: fernapi/fern-typescript-node-sdk
-        version: 0.7.2
-    ```
-
-    with this and delete it from the bottom of the file after;
-
-    ```yaml
+        version: 0.9.5
+        output:
+          location: local-file-system
+          path: ../sdks/typescript
       - name: fernapi/fern-python-sdk
         version: 0.6.0
-    ```
+```
 
-6. Change the path from this `path: ../generated/typescript` to this path: `../backend`
+6. Remove `fernapi/fern-typescript-node-sdk`;
+```yaml
+default-group: local
+groups:
+  local:
+    generators:
+      - name: fernapi/fern-python-sdk
+        version: 3.10.6
+```
 
-    Now your generators.yml should look like this;
-    ```yaml
-    default-group: local
-    groups:
-      local:
-        generators:
-          - name: fernapi/fern-python-sdk
-            version: 0.6.0
-            output:
-              location: local-file-system
-              path: ../backend
-    ```
-    <img width="1001" alt="image" src="https://github.com/Agenta-AI/agenta/assets/56418363/f537691d-8dbb-4363-b7c0-ecef9f464053">
+7. Update `fernapi/fern-python-sdk`, which would look like this;
+```yaml
+default-group: local
+groups:
+  local:
+    generators:
+      - name: fernapi/fern-python-sdk
+        version: 3.10.6
+        output:
+          location: local-file-system
+          path: ../backend
+```
+<img width="1001" alt="image" src="https://github.com/Agenta-AI/agenta/assets/56418363/f537691d-8dbb-4363-b7c0-ecef9f464053">
 
 
-7.  Go to the fern.config.json file and change the value of "organization" to `agenta`
-    <img width="593" alt="image" src="https://github.com/Agenta-AI/agenta/assets/56418363/0f44255e-50b5-4d78-863b-d33a3ec2eea0">
+8. Go to the fern.config.json file and change the value of "organization" to `agenta`
+<img width="593" alt="image" src="https://github.com/Agenta-AI/agenta/assets/56418363/0f44255e-50b5-4d78-863b-d33a3ec2eea0">
 
    
-9.  Generate the client code
-   
-    ```bash
-        fern generate
-    ```
-
-10.  Change the timeout for the build_image function endpoint
-    Go to the client.py in the generated code folder search for the `build_image` function in the AgentaApi class and change the timeout to 600.
-    When done, it should look like this;
-    <img width="995" alt="image" src="https://github.com/Agenta-AI/agenta/assets/56418363/8fab19e3-5226-405b-8a6f-4dcb6df588c9">
-
+9. Generate the client code
+```bash
+    fern generate
+```
 
+10. Go to `./backend/containers/client.py`, search for the `build_image` function in the AgentaApi class and update `timeout_in_seconds` to `600` in `request_options'. It should now look like this;
+```python
+_response = self._client_wrapper.httpx_client.request(
+    "containers/build_image",
+    method="POST",
+    params={
+        "app_id": app_id,
+        "base_name": base_name,
+    },
+    data={},
+    files={
+        "tar_file": tar_file,
+    },
+    request_options={**request_options, "timeout_in_seconds": 600},
+    omit=OMIT,
+)
+```
+<img width="995" alt="image" src="https://github.com/Agenta-AI/agenta/assets/56418363/8fab19e3-5226-405b-8a6f-4dcb6df588c9">
 
-11. Delete the fern folder.
+11. Delete the `./fern` folder.

agenta/client/api.py

@@ -55,7 +55,7 @@ def add_variant_to_server(
                 docker_id=image.docker_id,
                 tags=image.tags,
             )
-            click.echo(click.style("\nVariant added successfully.", fg="green"))
+            click.echo(click.style("\nVariant added successfully!", fg="green"))
             return response
         except RequestException as e:
             if attempt < retries - 1:

agenta/client/backend/__init__.py

@@ -9,6 +9,7 @@ from .types import (
     BaseOutput,
     BodyImportTestset,
     ConfigDb,
+    CorrectAnswer,
     CreateAppOutput,
     CreateSpan,
     CreateTraceResponse,
@@ -25,10 +26,8 @@ from .types import (
     EvaluationScenarioScoreUpdate,
     EvaluationStatusEnum,
     EvaluationType,
-    EvaluationWebhook,
     Evaluator,
     EvaluatorConfig,
-    Feedback,
     GetConfigResponse,
     HttpValidationError,
     HumanEvaluation,
@@ -42,17 +41,18 @@ from .types import (
     ListApiKeysResponse,
     LlmRunRateLimit,
     LlmTokens,
+    LmProvidersEnum,
     NewHumanEvaluation,
     NewTestset,
     Organization,
     OrganizationOutput,
+    Outputs,
     Permission,
     Result,
     Score,
     SimpleEvaluationOutput,
     Span,
     SpanDetail,
-    SpanKind,
     SpanStatusCode,
     SpanVariant,
     Template,
@@ -60,6 +60,7 @@ from .types import (
     TestSetOutputResponse,
     TestSetSimpleResponse,
     TraceDetail,
+    UpdateAppOutput,
     Uri,
     ValidationError,
     ValidationErrorLocItem,
@@ -73,9 +74,7 @@ from .types import (
     WorkspaceRoleResponse,
 )
 from .errors import UnprocessableEntityError
-from .resources import (
-    AddVariantFromBaseAndConfigResponse,
-    ContainerTemplatesResponse,
+from . import (
     apps,
     bases,
     configs,
@@ -87,18 +86,24 @@ from .resources import (
     testsets,
     variants,
 )
+from .client import AgentaApi, AsyncAgentaApi
+from .containers import ContainerTemplatesResponse
+from .variants import AddVariantFromBaseAndConfigResponse
 
 __all__ = [
     "AddVariantFromBaseAndConfigResponse",
+    "AgentaApi",
     "AggregatedResult",
     "AggregatedResultEvaluatorConfig",
     "App",
     "AppVariantResponse",
     "AppVariantRevision",
+    "AsyncAgentaApi",
     "BaseOutput",
     "BodyImportTestset",
     "ConfigDb",
     "ContainerTemplatesResponse",
+    "CorrectAnswer",
     "CreateAppOutput",
     "CreateSpan",
     "CreateTraceResponse",
@@ -115,10 +120,8 @@ __all__ = [
     "EvaluationScenarioScoreUpdate",
     "EvaluationStatusEnum",
     "EvaluationType",
-    "EvaluationWebhook",
     "Evaluator",
     "EvaluatorConfig",
-    "Feedback",
     "GetConfigResponse",
     "HttpValidationError",
     "HumanEvaluation",
@@ -132,17 +135,18 @@ __all__ = [
     "ListApiKeysResponse",
     "LlmRunRateLimit",
     "LlmTokens",
+    "LmProvidersEnum",
     "NewHumanEvaluation",
     "NewTestset",
     "Organization",
     "OrganizationOutput",
+    "Outputs",
     "Permission",
     "Result",
     "Score",
     "SimpleEvaluationOutput",
     "Span",
     "SpanDetail",
-    "SpanKind",
     "SpanStatusCode",
     "SpanVariant",
     "Template",
@@ -151,6 +155,7 @@ __all__ = [
     "TestSetSimpleResponse",
     "TraceDetail",
     "UnprocessableEntityError",
+    "UpdateAppOutput",
     "Uri",
     "ValidationError",
     "ValidationErrorLocItem",