aap-utils 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

aap_utils/cli.py

@@ -1,36 +1,70 @@
 import os
+import re
+import requests
+
+API_URL = "http://commit-svc.aiplatform/publish"
 
 def extract_default_image():
-    """Extracts the image name from KERNEL_IMAGE if available."""
+    """Extracts the image name from KERNEL_IMAGE if available and formats it."""
     kernel_image = os.getenv("KERNEL_IMAGE", "admin/base_kernel_gpu@sha256:3024")
-    return kernel_image.split("/")[1].split("@")[0]  # Extract "base_kernel_gpu"
+    image_name = kernel_image.split("/")[1].split("@")[0]  # Extract "base_kernel_gpu"
+    return format_name(image_name)
+
+def format_name(name):
+    """Ensure the name is lowercase and contains only valid characters."""
+    return re.sub(r'[^a-z0-9_]', '_', name.lower())
 
 def validate_image_name(image_name):
-    """Validate image name format."""
-    return bool(image_name and image_name.strip())
+    """Validate image name format: lowercase, only alphanumeric and underscores."""
+    return bool(re.fullmatch(r'[a-z0-9_]+', image_name))
 
 def validate_tags(tags):
-    """Ensure tags are non-empty and separated by semicolon."""
-    tag_list = [tag.strip() for tag in tags.split(";") if tag.strip()]
-    return len(tag_list) > 0
+    """Ensure tags are non-empty, lowercase, contain only valid characters, and no spaces."""
+    tag_list = [format_name(tag.strip()) for tag in tags.split(";") if tag.strip()]
+    return all(re.fullmatch(r'[a-z0-9_]+', tag) for tag in tag_list) and len(tag_list) > 0
+
+def get_username():
+    """Retrieve the username from the environment variable KERNEL_AP_USER or prompt for it."""
+    username = os.getenv("KERNEL_AP_USER")
+    if not username:
+        username = input("Enter username (KERNEL_AP_USER not set): ").strip()
+    return format_name(username)
 
 def publish_env():
-    """Handles the 'aap_utils publish env' command."""
+    """Handles the 'aap_utils publish env' command and sends a POST request."""
+    username = get_username()
     default_image = extract_default_image()
     
     while True:
         image_name = input(f"Enter image name [{default_image}]: ").strip() or default_image
+        image_name = format_name(image_name)
         if validate_image_name(image_name):
             break
-        print("Invalid image name. Please try again.")
+        print("Invalid image name. Use only lowercase letters, numbers, or underscores (_).")
 
     while True:
         tags = input("Enter tags (separated by ';'): ").strip()
-        if validate_tags(tags):
+        formatted_tags = [format_name(tag) for tag in tags.split(";") if tag.strip()]
+        if validate_tags(";".join(formatted_tags)):
             break
-        print("Invalid tags. Please enter at least one tag, separated by ';'.")
+        print("Invalid tags. Each tag must be lowercase, contain only letters, numbers, or underscores (_), and no spaces.")
+
+    data = {
+        "username": username,
+        "imagename": image_name,
+        "tags": formatted_tags
+    }
+
+    print(f"Publishing environment: {data}")
 
-    print(f"Publishing environment with Image: {image_name}, Tags: {tags}")
+    try:
+        response = requests.post(API_URL, json=data)
+        if response.status_code == 200:
+            print("✅ Successfully published the environment!")
+        else:
+            print(f"❌ Failed to publish. Server responded with: {response.status_code}, {response.text}")
+    except requests.RequestException as e:
+        print(f"❌ Error connecting to the server: {e}")
 
 def main():
     import sys

{aap_utils-0.2.0.dist-info → aap_utils-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aap_utils
-Version: 0.2.0
+Version: 0.2.1
 Summary: A Python library for registering an IP address for AAP
 Author: Minh Dang
 Author-email: danghoangminh86@gmail.com

aap_utils-0.2.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+aap_utils/__init__.py,sha256=g6G3i3a5ANDJWqFX2oPsLpP93aTaoTj0gkMQzeqQIJw,172
+aap_utils/cli.py,sha256=ifnQcXX6KbzL-Dm9v-SoLVl_63uXsW70Juq6qeWQhMo,2905
+aap_utils/register.py,sha256=J9tukByU1mcy4SoaJOoGY8jjzL9JMuNTZGtCBSwwon0,3823
+aap_utils-0.2.1.dist-info/METADATA,sha256=boJ_XinydvKnjW3oOZTsEYfA9KOFp6kphvNyGCou6fw,346
+aap_utils-0.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+aap_utils-0.2.1.dist-info/entry_points.txt,sha256=K-h2toLoqFxAg4Bx2r7FWggKgYnAX9zp9s4Ms4r-d6s,49
+aap_utils-0.2.1.dist-info/top_level.txt,sha256=Qt5xmL8_0_jhMl9uA3lg-xnvs4nCEyVj1tBE4vnp36M,10
+aap_utils-0.2.1.dist-info/RECORD,,

aap_utils-0.2.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-aap_utils/__init__.py,sha256=g6G3i3a5ANDJWqFX2oPsLpP93aTaoTj0gkMQzeqQIJw,172
-aap_utils/cli.py,sha256=TSh2o6CpkiVodF4t88RA3LrAj_aymmb8szl5t7CWMT4,1410
-aap_utils/register.py,sha256=J9tukByU1mcy4SoaJOoGY8jjzL9JMuNTZGtCBSwwon0,3823
-aap_utils-0.2.0.dist-info/METADATA,sha256=SOAQ8YL8coe3-28zEDp7izDbgB5UcLd7GeLSEBnoLFo,346
-aap_utils-0.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-aap_utils-0.2.0.dist-info/entry_points.txt,sha256=K-h2toLoqFxAg4Bx2r7FWggKgYnAX9zp9s4Ms4r-d6s,49
-aap_utils-0.2.0.dist-info/top_level.txt,sha256=Qt5xmL8_0_jhMl9uA3lg-xnvs4nCEyVj1tBE4vnp36M,10
-aap_utils-0.2.0.dist-info/RECORD,,