aap-utils 0.2.19__tar.gz → 0.3.0__tar.gz

{aap_utils-0.2.19 → aap_utils-0.3.0}/PKG-INFO

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

{aap_utils-0.2.19 → aap_utils-0.3.0}/aap_utils/cli.py

@@ -95,10 +95,5 @@ def main():
     import sys
     if len(sys.argv) > 2 and sys.argv[1] == "push" and sys.argv[2] == "env":
         publish_env()
-    elif len(sys.argv) > 1 and "password" in sys.argv[1]:
-        # Example: python aap_utils.py b "\raiplatform@172.20.0.11's password:\n"
-        print("aiplatform")
     else:
-        print("Usage:")
-        print("  aap_utils push env")
-        print("  aap_utils b \"<prompt_bytes>\"")
+        print("Usage: aap_utils push env")

{aap_utils-0.2.19 → aap_utils-0.3.0}/aap_utils/register.py

@@ -2,10 +2,37 @@ import socket
 import requests
 import time
 import os
+import re
 from hydra import initialize, compose, initialize_config_dir
 from omegaconf import OmegaConf, DictConfig
 
 def register_demo(debug=False):
+    # --- Research Container Check ---
+    # Check if any environment variable starts with RESEARCH_SVC
+    is_research = any(key.startswith("RESEARCH_SVC") for key in os.environ)
+    
+    if is_research:
+        vscode_proxy_uri = os.getenv("VSCODE_PROXY_URI", "")
+        if vscode_proxy_uri:
+            # Example transformation:
+            # From: https://appresearch34.aiplatform.vcntt.tech/proxy/{{port}}/
+            # To:   https://appresearchpublic34.aiplatform.vcntt.tech/
+            
+            # Logic: Replace 'appresearch' with 'appresearchpublic' 
+            # and strip everything after the domain
+            match = re.search(r"https://(appresearch\d+)\.", vscode_proxy_uri)
+            if match:
+                subdomain = match.group(1).replace("appresearch", "appresearchpublic")
+                domain = vscode_proxy_uri.split(match.group(1) + ".")[-1].split("/")[0]
+                demo_url = f"https://{subdomain}.{domain}/"
+                
+                print(f"Research environment detected. Demo service is at {demo_url}")
+                return True
+        
+        if debug:
+            print("Research environment detected but VSCODE_PROXY_URI is missing or invalid.")
+
+    # --- Standard Registration Logic ---
     for attempt in range(10):
         try:
             local_ip = socket.gethostbyname(socket.gethostname())
@@ -20,7 +47,6 @@ def register_demo(debug=False):
                 domain_name = argo_host.split("argowf.")[-1]
                 url, namespace = create_url(domain_name=domain_name)
                 
-                # print(f"The demo service is at {namespace}.your_custorm_domain/demo/. Eg: {url}")
                 print(f"The demo service is at {url}")
                 if debug:
                     print("IP registered successfully.")
@@ -29,10 +55,10 @@ def register_demo(debug=False):
                 if debug:
                     print(f"Attempt {attempt + 1}: Failed: {response.text}")
         except (socket.error, requests.exceptions.RequestException) as e:
-            if debug:  # Print errors only if debug is True
+            if debug:
                 print(f"Attempt {attempt + 1}: Error: {e}")
         
-        time.sleep(2)  # Wait for 2 seconds before retrying
+        time.sleep(2)
 
     if debug:
         print("Failed to register IP after 10 attempts.")    

{aap_utils-0.2.19 → aap_utils-0.3.0}/aap_utils.egg-info/PKG-INFO

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

{aap_utils-0.2.19 → aap_utils-0.3.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aap_utils",  # The name of your library
-    version="0.2.19",
+    version="0.3.0",
     description="A Python library for registering an IP address for AAP",
     author="Minh Dang",
     author_email="danghoangminh86@gmail.com",