agenta 0.1.18__tar.gz → 0.1.19__tar.gz

{agenta-0.1.18 → agenta-0.1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.1.18
+Version: 0.1.19
 Summary: Code for the SDK and CLI for the Agenta Lab platform
 Author: Mahmoud Mabrouk
 Author-email: mahmoudmabrouk.mail@gmail.com

{agenta-0.1.18 → agenta-0.1.19}/agenta/cli/main.py

@@ -37,7 +37,7 @@ def init(app_name: str):
     if not app_name:
         while True:
             app_name = questionary.text('Please enter the app name').ask()
-            if app_name and re.match('^[a-zA-Z0-9_]+$', app_name):
+            if app_name and re.match('^[a-zA-Z0-9_-]+$', app_name):
                 break
             else:
                 if app_name is None:  # User pressed Ctrl+C
@@ -93,6 +93,12 @@ def init(app_name: str):
                 shutil.copy(file, current_dir / file.name)
     elif init_option is None:  # User pressed Ctrl+C
         sys.exit(0)
+    
+    # Create a .gitignore file and add some default environment folder names to it
+    gitignore_content = "# Environments \nenv/\nvenv/\nENV/\nenv.bak/\nvenv.bak/"
+    with open('.gitignore', 'w') as gitignore_file:
+        gitignore_file.write(gitignore_content)
+        
     click.echo("App initialized successfully")
     if init_option == 'Start from template':
         click.echo("Please check the README.md for further instructions to setup the template.")

{agenta-0.1.18 → agenta-0.1.19}/agenta/cli/variant_commands.py

@@ -1,3 +1,4 @@
+import re
 import sys
 from pathlib import Path
 from typing import List
@@ -41,6 +42,7 @@ def add_variant(variant_name: str, app_folder: str, file_name: str, host: str) -
     if not app_file.exists():
         click.echo(click.style(f"No {file_name} exists! Please make sure you are in the right directory", fg='red'))
         return None
+    
     env_file = app_path / '.env'
     if not env_file.exists():
         continue_without_env = questionary.confirm(
@@ -48,9 +50,27 @@ def add_variant(variant_name: str, app_folder: str, file_name: str, host: str) -
         if not continue_without_env:
             click.echo("Operation cancelled.")
             sys.exit(0)
+            
+    requirements_file = app_path / 'requirements.txt'
+    if not requirements_file.exists():
+        continue_without_requirements = questionary.confirm(
+            'No requirements.txt file found! Are you sure you do not need it in your application?\n Do you want to continue without it?').ask()
+        if not continue_without_requirements:
+            click.echo("Operation cancelled.")
+            sys.exit(0)
 
+    # Ask for variant name and validate.
     if not variant_name:
-        variant_name = questionary.text('Please enter the variant name').ask()
+        while True:
+            variant_name = questionary.text('Please enter the variant name').ask()
+            if variant_name and re.match('^[a-zA-Z0-9_]+$', variant_name):
+                break
+            else:
+                if variant_name is None:  # User pressed Ctrl+C
+                    sys.exit(0)
+                else:
+                    print("Invalid input. Please use only alphanumeric characters without spaces.")
+
     # update the config file with the variant names from the backend
     overwrite = False
     if variant_name in config['variants']:

{agenta-0.1.18 → agenta-0.1.19}/agenta/client/client.py

@@ -14,7 +14,9 @@ class APIRequestError(Exception):
     """Exception to be raised when an API request fails."""
 
 
-def add_variant_to_server(app_name: str, variant_name: str, image: Image, host: str):
+def add_variant_to_server(
+    app_name: str, variant_name: str, image: Image, host: str
+):
     """Adds a variant to the server.
 
     Arguments:
@@ -23,32 +25,41 @@ def add_variant_to_server(app_name: str, variant_name: str, image: Image, host:
         image_name -- Name of the image
     """
     app_variant: AppVariant = AppVariant(
-        app_name=app_name, variant_name=variant_name)
-    response = requests.post(f"{host}/{BACKEND_URL_SUFFIX}/app_variant/add/from_image/",
-                             json={"app_variant": app_variant.dict(), "image": image.dict()}, timeout=600)
+        app_name=app_name, variant_name=variant_name
+    )
+    response = requests.post(
+        f"{host}/{BACKEND_URL_SUFFIX}/app_variant/add/from_image/",
+        json={"app_variant": app_variant.dict(), "image": image.dict()},
+        timeout=600,
+    )
     if response.status_code != 200:
         error_message = response.text
         raise APIRequestError(
-            f"Request to app_variant endpoint failed with status code {response.status_code} and error message: {error_message}.")
+            f"Request to app_variant endpoint failed with status code {response.status_code} and error message: {error_message}."
+        )
 
 
 def start_variant(app_name: str, variant_name: str, host: str) -> str:
     """Starts a container with the variant an expose its endpoint
 
     Arguments:
-        app_name -- 
+        app_name --
         variant_name -- _description_
 
     Returns:
         The endpoint of the container
     """
-    response = requests.post(f"{host}/{BACKEND_URL_SUFFIX}/app_variant/start/",
-                             json={"app_name": app_name, "variant_name": variant_name}, timeout=600)
+    response = requests.post(
+        f"{host}/{BACKEND_URL_SUFFIX}/app_variant/start/",
+        json={"app_name": app_name, "variant_name": variant_name},
+        timeout=600,
+    )
     if response.status_code != 200:
         error_message = response.text
         raise APIRequestError(
-            f"Request to start variant endpoint failed with status code {response.status_code} and error message: {error_message}.")
-    return response.json()['uri']
+            f"Request to start variant endpoint failed with status code {response.status_code} and error message: {error_message}."
+        )
+    return response.json()["uri"]
 
 
 def list_variants(app_name: str, host: str) -> List[AppVariant]:
@@ -60,13 +71,17 @@ def list_variants(app_name: str, host: str) -> List[AppVariant]:
     Returns:
         a list of the variants using the pydantic model
     """
-    response = requests.get(f"{host}/{BACKEND_URL_SUFFIX}/app_variant/list_variants/?app_name={app_name}", timeout=600)
+    response = requests.get(
+        f"{host}/{BACKEND_URL_SUFFIX}/app_variant/list_variants/?app_name={app_name}",
+        timeout=600,
+    )
 
     # Check for successful request
     if response.status_code != 200:
         error_message = response.text
         raise APIRequestError(
-            f"Request to list_variants endpoint failed with status code {response.status_code} and error message: {error_message}.")
+            f"Request to list_variants 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]
 
@@ -80,17 +95,24 @@ def remove_variant(app_name: str, variant_name: str, host: str):
     """
     app_variant = AppVariant(app_name=app_name, variant_name=variant_name)
     app_variant_json = app_variant.json()
-    response = requests.delete(f"{host}/{BACKEND_URL_SUFFIX}/app_variant/remove_variant/",
-                               data=app_variant_json, headers={'Content-Type': 'application/json'}, timeout=600)
+    response = requests.delete(
+        f"{host}/{BACKEND_URL_SUFFIX}/app_variant/remove_variant/",
+        data=app_variant_json,
+        headers={"Content-Type": "application/json"},
+        timeout=600,
+    )
 
     # Check for successful request
     if response.status_code != 200:
         error_message = response.text
         raise APIRequestError(
-            f"Request to remove_variant endpoint failed with status code {response.status_code} and error message: {error_message}")
+            f"Request to remove_variant endpoint failed with status code {response.status_code} and error message: {error_message}"
+        )
 
 
-def update_variant_image(app_name: str, variant_name: str, image: Image, host: str):
+def update_variant_image(
+    app_name: str, variant_name: str, image: Image, host: str
+):
     """Adds a variant to the server.
 
     Arguments:
@@ -99,25 +121,38 @@ def update_variant_image(app_name: str, variant_name: str, image: Image, host: s
         image_name -- Name of the image
     """
     app_variant: AppVariant = AppVariant(
-        app_name=app_name, variant_name=variant_name)
-    response = requests.put(f"{host}/{BACKEND_URL_SUFFIX}/app_variant/update_variant_image/",
-                            json={"app_variant": app_variant.dict(), "image": image.dict()}, timeout=600)
+        app_name=app_name, variant_name=variant_name
+    )
+    response = requests.put(
+        f"{host}/{BACKEND_URL_SUFFIX}/app_variant/update_variant_image/",
+        json={"app_variant": app_variant.dict(), "image": image.dict()},
+        timeout=600,
+    )
     if response.status_code != 200:
         error_message = response.text
         raise APIRequestError(
-            f"Request to update app_variant failed with status code {response.status_code} and error message: {error_message}.")
+            f"Request to update app_variant failed with status code {response.status_code} and error message: {error_message}."
+        )
 
 
-def send_docker_tar(app_name: str, variant_name: str, tar_path: Path, host: str) -> Image:
-    with tar_path.open('rb') as tar_file:
+def send_docker_tar(
+    app_name: str, variant_name: str, tar_path: Path, host: str
+) -> Image:
+    with tar_path.open("rb") as tar_file:
         response = requests.post(
             f"{host}/{BACKEND_URL_SUFFIX}/containers/build_image/?app_name={app_name}&variant_name={variant_name}",
             files={
-                'tar_file': tar_file,
+                "tar_file": tar_file,
             },
-            timeout=1200
+            timeout=1200,
         )
 
+    if response.status_code == 500:
+        error_msg = "Serving the variant failed. Here's how you can solve the issue:\n"
+        error_msg += "- First, make sure that the requirements.txt file has all the dependencies that you need.\n"
+        error_msg += "- Second, check the Docker logs for the backend image to see the error when running the Docker container."
+        raise Exception(error_msg)
+
     response.raise_for_status()
     image = Image.parse_obj(response.json())
     return image

{agenta-0.1.18 → agenta-0.1.19}/agenta/docker/docker_utils.py

@@ -1,5 +1,4 @@
 import logging
-import os
 import shutil
 import tarfile
 import tempfile
@@ -40,22 +39,45 @@ def build_tar_docker_container(folder: Path, file_name: Path) -> Path:
     tarfile_path = folder / "docker.tar.gz"  # output file
     if tarfile_path.exists():
         tarfile_path.unlink()
+        
     dockerfile_path = create_dockerfile(folder)
     shutil.copytree(Path(__file__).parent.parent / "sdk", folder / "agenta", dirs_exist_ok=True)
     shutil.copy(Path(__file__).parent /
                 "docker-assets" / "main.py", folder)
     shutil.copy(Path(__file__).parent /
                 "docker-assets" / "entrypoint.sh", folder)
-    # tar the directory
+            
+    # Read the contents of .gitignore file
+    gitignore_content = ""
+    gitignore_file_path = folder / ".gitignore"
+    if gitignore_file_path.exists():
+        with open(gitignore_file_path, 'r') as gitignore_file:
+            gitignore_content = gitignore_file.read()
+            
+    # Create a temporary directory
     with tempfile.TemporaryDirectory() as temp_dir:
         temp_path = Path(temp_dir)
-        shutil.copytree(folder, temp_path, dirs_exist_ok=True)
-        if (temp_path / "_app.py").exists():
-            raise ValueError(
-                "File _app.py already exists in the temp folder. You are not allowed to use this name in your code.")
+        
+        # Clean - remove '/' from every files and folders in the gitignore contents
+        sanitized_patterns = [
+            pattern.replace("/", "") 
+            for pattern in gitignore_content.splitlines()
+        ]
+
+        # Function to ignore files based on the patterns
+        def ignore_patterns(path, names):
+            return set(sanitized_patterns)
+
+        # Use a single copytree call with ignore_patterns
+        shutil.copytree(folder, temp_path, ignore=ignore_patterns, dirs_exist_ok=True)
+
+        # Rename the specified file to _app.py in the temporary directory
         shutil.copy(temp_path / file_name, temp_path / "_app.py")
+
+        # Create the tar.gz file
         with tarfile.open(tarfile_path, "w:gz") as tar:
             tar.add(temp_path, arcname=folder.name)
+            
     # dockerfile_path.unlink()
     return tarfile_path
 

{agenta-0.1.18 → agenta-0.1.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.1.18"
+version = "0.1.19"
 description = "Code for the SDK and CLI for the Agenta Lab platform"
 authors = ["Mahmoud Mabrouk <mahmoudmabrouk.mail@gmail.com>"]
 readme = "README.md"