agenta 0.5.4__tar.gz → 0.5.6__tar.gz

{agenta-0.5.4 → agenta-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.5.4
+Version: 0.5.6
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Home-page: https://agenta.ai
 Keywords: LLMOps,LLM,evaluation,prompt engineering
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: docker (>=6.1.1,<7.0.0)

{agenta-0.5.4 → agenta-0.5.6}/agenta/__init__.py

@@ -7,6 +7,7 @@ from .sdk.types import (
     InFile,
     IntParam,
     MultipleChoiceParam,
+    MessagesInput,
     TextParam,
 )
 from .sdk.utils.preinit import PreInitObject

{agenta-0.5.4 → agenta-0.5.6}/agenta/cli/helper.py

@@ -83,16 +83,18 @@ def get_api_key() -> str:
             return api_key
         elif confirm_api_key is None:  # User pressed Ctrl+C
             sys.exit(0)
-    else:
-        api_key = questionary.text(
-            "(You can get your API Key here: https://demo.agenta.ai/settings?tab=apiKeys) "
-            "Please provide your API key:"
-        ).ask()
 
-        if api_key:
-            set_global_config("api_key", api_key)
-        elif api_key is None:  # User pressed Ctrl+C
-            sys.exit(0)
+    api_key = questionary.text(
+        "(You can get your API Key here: https://cloud.agenta.ai/settings?tab=apiKeys) "
+        "Please provide your API key:"
+    ).ask()
+
+    if api_key:
+        set_global_config("api_key", api_key)
+
+        return api_key
+    elif api_key is None:  # User pressed Ctrl+C
+        sys.exit(0)
 
 
 def init_telemetry_config() -> None:
@@ -122,7 +124,6 @@ def update_variants_from_backend(
     Returns:
         a new config object later to be saved using toml.dump(config, config_file.open('w'))
     """
-
     try:
         variants: List[AppVariant] = client.list_variants(app_id, host, api_key)
     except Exception as ex:

{agenta-0.5.4 → agenta-0.5.6}/agenta/cli/main.py

@@ -91,7 +91,7 @@ def init(app_name: str):
     try:
         where_question = questionary.select(
             "Where are you running agenta?",
-            choices=["On my local machine", "On a remote machine", "On agenta cloud"],
+            choices=["On agenta cloud", "On my local machine", "On a remote machine"],
         ).ask()
 
         if where_question == "On my local machine":
@@ -101,7 +101,7 @@ def init(app_name: str):
                 "Please provide the IP or URL of your remote host"
             ).ask()
         elif where_question == "On agenta cloud":
-            backend_host = "https://demo.agenta.ai"
+            backend_host = "https://cloud.agenta.ai"
 
             api_key = helper.get_api_key()
             client.validate_api_key(api_key, backend_host)

{agenta-0.5.4 → agenta-0.5.6}/agenta/cli/variant_commands.py

@@ -119,6 +119,9 @@ def add_variant(
         image: Image = client.send_docker_tar(
             app_id, base_name, tar_path, host, api_key
         )
+        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:

{agenta-0.5.4 → agenta-0.5.6}/agenta/client/client.py

@@ -203,17 +203,21 @@ def list_variants(app_id: str, host: str, api_key: str = None) -> List[AppVarian
         headers={"Authorization": api_key} if api_key is not None else None,
         timeout=600,
     )
-
     # Check for successful request
     if response.status_code == 403:
         raise APIRequestError(
             f"No app by id {app_id} exists or you do not have access to it."
         )
+    elif response.status_code == 404:
+        raise APIRequestError(
+            f"No app by id {app_id} exists or you do not have access to it."
+        )
     elif response.status_code != 200:
         error_message = response.json()
         raise APIRequestError(
             f"Request to apps endpoint failed with status code {response.status_code} and error message: {error_message}."
         )
+
     app_variants = response.json()
     return [AppVariant(**variant) for variant in app_variants]
 

{agenta-0.5.4 → agenta-0.5.6}/agenta/config.toml

@@ -2,4 +2,4 @@ docker_registry_url="127.0.0.1:5001"
 database_url="localhost:5432"
 registry="agenta-server"
 backend_url_suffix="api"
-allow_origins="http://localhost:3000,http://localhost:3001,http://demo.agenta.ai"
+allow_origins="http://localhost:3000,http://localhost:3001,http://cloud.agenta.ai,https://cloud.agenta.ai"

agenta-0.5.6/agenta/docker/docker-assets/Dockerfile.cloud.template

@@ -0,0 +1,8 @@
+FROM public.ecr.aws/s2t9a1r1/agentaai/lambda_templates_public:main
+
+COPY requirements.txt ${LAMBDA_TASK_ROOT}
+RUN pip install --no-cache-dir --disable-pip-version-check -r requirements.txt
+RUN pip install --no-cache-dir --disable-pip-version-check mangum
+COPY . ${LAMBDA_TASK_ROOT}
+
+CMD [ "lambda_function.handler" ]

agenta-0.5.6/agenta/docker/docker-assets/lambda_function.py

@@ -0,0 +1,6 @@
+import agenta
+import _app
+from mangum import Mangum
+
+
+handler = Mangum(agenta.app)

{agenta-0.5.4 → agenta-0.5.6}/agenta/docker/docker_utils.py

@@ -12,6 +12,8 @@ from docker.models.images import Image
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 
+DEBUG = False
+
 
 def create_dockerfile(out_folder: Path):
     """Creates a dockerfile based on the template in the out_folder.
@@ -25,6 +27,12 @@ def create_dockerfile(out_folder: Path):
     )
     dockerfile_path = out_folder / "Dockerfile"
     shutil.copy(dockerfile_template, dockerfile_path)
+    dockerfile_template = (
+        Path(__file__).parent / "docker-assets" / "Dockerfile.cloud.template"
+    )
+    dockerfile_path = out_folder / "Dockerfile.cloud"
+    shutil.copy(dockerfile_template, dockerfile_path)
+
     return dockerfile_path
 
 
@@ -41,9 +49,10 @@ def build_tar_docker_container(folder: Path, file_name: Path) -> Path:
     if tarfile_path.exists():
         tarfile_path.unlink()
 
-    dockerfile_path = create_dockerfile(folder)
+    create_dockerfile(folder)
     shutil.copytree(Path(__file__).parent.parent, folder / "agenta", dirs_exist_ok=True)
     shutil.copy(Path(__file__).parent / "docker-assets" / "main.py", folder)
+    shutil.copy(Path(__file__).parent / "docker-assets" / "lambda_function.py", folder)
     shutil.copy(Path(__file__).parent / "docker-assets" / "entrypoint.sh", folder)
 
     # Read the contents of .gitignore file
@@ -75,6 +84,18 @@ def build_tar_docker_container(folder: Path, file_name: Path) -> Path:
         # Create the tar.gz file
         with tarfile.open(tarfile_path, "w:gz") as tar:
             tar.add(temp_path, arcname=folder.name)
+    if not DEBUG:
+        # Clean up - remove specified files and folders
+        for item in ["agenta", "main.py", "lambda_function.py", "entrypoint.sh"]:
+            path = folder / item
+            if path.exists():
+                if path.is_dir():
+                    shutil.rmtree(path)
+                else:
+                    path.unlink()
+
+        for dockerfile in folder.glob("Dockerfile*"):
+            dockerfile.unlink()
 
     # dockerfile_path.unlink()
     return tarfile_path

{agenta-0.5.4 → agenta-0.5.6}/agenta/sdk/__init__.py

@@ -10,6 +10,7 @@ from .types import (
     IntParam,
     MultipleChoiceParam,
     TextParam,
+    MessagesInput,
 )
 from .agenta_init import Config, init
 

{agenta-0.5.4 → agenta-0.5.6}/agenta/sdk/agenta_decorator.py

@@ -25,6 +25,7 @@ from .types import (
     IntParam,
     MultipleChoiceParam,
     TextParam,
+    MessagesInput,
 )
 
 app = FastAPI()
@@ -313,6 +314,7 @@ def override_schema(openapi_schema: dict, func_name: str, endpoint: str, params:
     - The min and max values for each FloatParam instance
     - The min and max values for each IntParam instance
     - The default value for DictInput instance
+    - The default value for MessagesParam instance
     - ... [PLEASE ADD AT EACH CHANGE]
 
     Args:
@@ -374,3 +376,9 @@ def override_schema(openapi_schema: dict, func_name: str, endpoint: str, params:
         if isinstance(param_val, TextParam):
             subschema = find_in_schema(schema_to_override, param_name, "text")
             subschema["default"] = param_val
+        if (
+            isinstance(param_val, inspect.Parameter)
+            and param_val.annotation is MessagesInput
+        ):
+            subschema = find_in_schema(schema_to_override, param_name, "messages")
+            subschema["default"] = param_val.default

{agenta-0.5.4 → agenta-0.5.6}/agenta/sdk/types.py

@@ -98,6 +98,36 @@ class MultipleChoiceParam(str):
         )
 
 
+class Message(BaseModel):
+    role: str
+    content: str
+
+
+class MessagesInput(list):
+    """Messages Input for Chat-completion.
+
+    Parameters:
+        messages (List[Dict[str, str]]): The list of messages inputs.
+        Required. Each message should be a dictionary with "role" and "content" keys.
+
+    Raises:
+        ValueError: If `messages` is not specified or empty.
+
+    """
+
+    def __new__(cls, messages: List[Dict[str, str]] = None):
+        if not messages:
+            raise ValueError("Missing required parameter in MessagesInput")
+
+        instance = super().__new__(cls, messages)
+        instance.messages = messages
+        return instance
+
+    @classmethod
+    def __modify_schema__(cls, field_schema: dict[str, Any]):
+        field_schema.update({"x-parameter": "messages", "type": "array"})
+
+
 class Context(BaseModel):
     class Config:
         extra = Extra.allow

{agenta-0.5.4 → agenta-0.5.6}/agenta/templates/extract_data_to_json/app.py

@@ -1,5 +1,7 @@
 import agenta as ag
-import openai
+from openai import OpenAI
+
+client = OpenAI()
 import json
 
 default_prompt = """You are a world class algorithm for extracting information in structured formats. Extract information and create a valid JSON from the following input: {text}"""
@@ -40,7 +42,7 @@ def generate(
 
     function = json.loads(ag.config.function_json)
 
-    response = openai.ChatCompletion.create(
+    response = client.chat.completions.create(
         model="gpt-3.5-turbo-0613",
         messages=messages,
         temperature=ag.config.temperature,

{agenta-0.5.4 → agenta-0.5.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.5.4"
+version = "0.5.6"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <mahmoud@agenta.ai>"]