gitarsenal-cli 1.9.95 → 1.9.97

package/python/fetch_modal_tokens.py

@@ -17,9 +17,9 @@ def fetch_default_tokens_from_gitarsenal():
     Fetch default Modal tokens and OpenAI API key from gitarsenal.dev API.
     
     Returns:
-        tuple: (token_id, token_secret, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key) if successful, (None, None, None, None, None, None) otherwise
+        tuple: (token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key) if successful, (None, None, None, None, None, None, None) otherwise
     """
-    endpoint = "https://gitarsenal.dev/api/credentials"
+    endpoint = "https://www.gitarsenal.dev/api/credentials"  # Updated to use www subdomain
     
     try:
         headers = {
@@ -27,44 +27,45 @@ def fetch_default_tokens_from_gitarsenal():
             'Accept': 'application/json'
         }
         
-        # print(f"🔗 Fetching default tokens from: {endpoint}")
+        print(f"🔗 Fetching default tokens from: {endpoint}")
         
         response = requests.get(endpoint, headers=headers, timeout=30)
         
-        # print(f"📊 Status: {response.status_code}")
+        print(f"📊 Status: {response.status_code}")
         
         if response.status_code == 200:
             try:
                 data = response.json()
+                
                 token_id = data.get("modalTokenId")
                 token_secret = data.get("modalTokenSecret")
+                e2b_api_key = data.get("e2bApiKey")  # This is the key from the server
                 openai_api_key = data.get("openaiApiKey")
                 anthropic_api_key = data.get("anthropicApiKey")
                 openrouter_api_key = data.get("openrouterApiKey")
                 groq_api_key = data.get("groqApiKey")
                 
                 if token_id and token_secret:
-                    # print("✅ Successfully fetched default tokens from gitarsenal.dev")
-                    return token_id, token_secret, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key
+                    return token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key
                 else:
                     print("❌ Modal tokens not found in gitarsenal.dev response")
-                    return None, None, None, None, None, None
+                    return None, None, None, None, None, None, None
             except json.JSONDecodeError:
                 print("❌ Invalid JSON response from gitarsenal.dev")
-                return None, None, None, None, None, None
+                return None, None, None, None, None, None, None
         else:
             print(f"❌ Failed to fetch from gitarsenal.dev: {response.status_code} - {response.text[:200]}")
-            return None, None, None, None, None, None
+            return None, None, None, None, None, None, None
             
     except requests.exceptions.Timeout:
         print("❌ Request timeout when fetching from gitarsenal.dev")
-        return None, None, None, None, None, None
+        return None, None, None, None, None, None, None
     except requests.exceptions.ConnectionError:
         print("❌ Connection failed to gitarsenal.dev")
-        return None, None, None, None, None, None
+        return None, None, None, None, None, None, None
     except requests.exceptions.RequestException as e:
         print(f"❌ Request failed to gitarsenal.dev: {e}")
-        return None, None, None, None, None, None
+        return None, None, None, None, None, None, None
 
 def fetch_tokens_from_proxy(proxy_url=None, api_key=None):
     """
@@ -75,7 +76,7 @@ def fetch_tokens_from_proxy(proxy_url=None, api_key=None):
         api_key: API key for authentication
         
     Returns:
-        tuple: (token_id, token_secret, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key) if successful, (None, None, None, None, None, None) otherwise
+        tuple: (token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key) if successful, (None, None, None, None, None, None, None) otherwise
     """
     # Use environment variables if not provided
     if not proxy_url:
@@ -92,12 +93,12 @@ def fetch_tokens_from_proxy(proxy_url=None, api_key=None):
     if not proxy_url:
         # print("❌ No proxy URL provided or found in environment")
         # print("💡 Set MODAL_PROXY_URL environment variable or use --proxy-url argument")
-        return None, None, None, None, None, None
+        return None, None, None, None, None, None, None
         
     if not api_key:
         print("❌ No API key provided or found in environment")
         print("💡 Set MODAL_PROXY_API_KEY environment variable or use --proxy-api-key argument")
-        return None, None, None, None, None, None
+        return None, None, None, None, None, None, None
     
     # Ensure the URL ends with a slash
     if not proxy_url.endswith("/"):
@@ -119,22 +120,23 @@ def fetch_tokens_from_proxy(proxy_url=None, api_key=None):
             data = response.json()
             token_id = data.get("token_id")
             token_secret = data.get("token_secret")
+            e2b_api_key = data.get("e2b_api_key")
             openai_api_key = data.get("openai_api_key")
             anthropic_api_key = data.get("anthropic_api_key")
             openrouter_api_key = data.get("openrouter_api_key")
             groq_api_key = data.get("groq_api_key")
             if token_id and token_secret:
                 print("✅ Successfully fetched tokens from proxy server")
-                return token_id, token_secret, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key
+                return token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key
             else:
                 print("❌ Tokens not found in response")
-                return None, None, None, None, None, None
+                return None, None, None, None, None, None, None
         else:
             print(f"❌ Failed to fetch tokens: {response.status_code} - {response.text}")
-            return None, None, None, None, None, None
+            return None, None, None, None, None, None, None
     except Exception as e:
         print(f"❌ Error fetching tokens: {e}")
-        return None, None, None, None, None, None
+        return None, None, None, None, None, None, None
 
 def get_tokens():
     """
@@ -142,27 +144,31 @@ def get_tokens():
     Also sets the tokens in environment variables.
     
     Returns:
-        tuple: (token_id, token_secret, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key)
+        tuple: (token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key)
     """
     # Try to fetch from the proxy server
-    token_id, token_secret, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key = fetch_tokens_from_proxy()
+    token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key = fetch_tokens_from_proxy()
     
     # If we couldn't fetch from the server, try to get default tokens from gitarsenal.dev
     if not token_id or not token_secret:
         # print("⚠️ Proxy server failed, trying to fetch default tokens from gitarsenal.dev")
-        token_id, token_secret, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key = fetch_default_tokens_from_gitarsenal()
+        token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key = fetch_default_tokens_from_gitarsenal()
     
     # If we still don't have tokens, we can't proceed
     if not token_id or not token_secret:
         print("❌ Failed to fetch tokens from both proxy server and gitarsenal.dev")
         print("💡 Please check your network connection and API endpoints")
-        return None, None, None, None, None, None
+        return None, None, None, None, None, None, None
     
     # Set the tokens in environment variables
     os.environ["MODAL_TOKEN_ID"] = token_id
     os.environ["MODAL_TOKEN_SECRET"] = token_secret
     # print(f"✅ Set MODAL_TOKEN_ID and MODAL_TOKEN_SECRET environment variables")
     
+    # Set E2B API key if available
+    if e2b_api_key:
+        os.environ["E2B_API_KEY"] = e2b_api_key
+    
     # Set OpenAI API key if available
     if openai_api_key:
         os.environ["OPENAI_API_KEY"] = openai_api_key
@@ -179,7 +185,7 @@ def get_tokens():
     if groq_api_key:
         os.environ["GROQ_API_KEY"] = groq_api_key
     
-    return token_id, token_secret, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key
+    return token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key
 
 if __name__ == "__main__":
     # Parse command-line arguments if run directly
@@ -200,9 +206,10 @@ if __name__ == "__main__":
         print(f"✅ Set MODAL_PROXY_API_KEY from command line")
     
     # Get tokens
-    token_id, token_secret, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key = get_tokens()
+    token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key = get_tokens()
     print(f"Token ID: {token_id}")
     print(f"Token Secret: {token_secret}")
+    print(f"E2B API Key: {e2b_api_key[:5] + '...' if e2b_api_key else None}")
     print(f"OpenAI API Key: {openai_api_key[:5] + '...' if openai_api_key else None}")
     print(f"Anthropic API Key: {anthropic_api_key[:5] + '...' if anthropic_api_key else None}")
     print(f"OpenRouter API Key: {openrouter_api_key[:5] + '...' if openrouter_api_key else None}")
@@ -212,6 +219,7 @@ if __name__ == "__main__":
     # print(f"\n🔍 DEBUG: Checking environment variables")
     print(f"🔍 MODAL_TOKEN_ID exists: {'Yes' if os.environ.get('MODAL_TOKEN_ID') else 'No'}")
     print(f"🔍 MODAL_TOKEN_SECRET exists: {'Yes' if os.environ.get('MODAL_TOKEN_SECRET') else 'No'}")
+    print(f"🔍 E2B_API_KEY exists: {'Yes' if os.environ.get('E2B_API_KEY') else 'No'}")
     print(f"🔍 OPENAI_API_KEY exists: {'Yes' if os.environ.get('OPENAI_API_KEY') else 'No'}")
     print(f"🔍 ANTHROPIC_API_KEY exists: {'Yes' if os.environ.get('ANTHROPIC_API_KEY') else 'No'}")
     print(f"🔍 OPENROUTER_API_KEY exists: {'Yes' if os.environ.get('OPENROUTER_API_KEY') else 'No'}")
@@ -220,6 +228,8 @@ if __name__ == "__main__":
         print(f"🔍 MODAL_TOKEN_ID length: {len(os.environ.get('MODAL_TOKEN_ID'))}")
     if os.environ.get('MODAL_TOKEN_SECRET'):
         print(f"🔍 MODAL_TOKEN_SECRET length: {len(os.environ.get('MODAL_TOKEN_SECRET'))}")
+    if os.environ.get('E2B_API_KEY'):
+        print(f"🔍 E2B_API_KEY length: {len(os.environ.get('E2B_API_KEY'))}")
     if os.environ.get('OPENAI_API_KEY'):
         print(f"🔍 OPENAI_API_KEY length: {len(os.environ.get('OPENAI_API_KEY'))}")
     if os.environ.get('ANTHROPIC_API_KEY'):
@@ -235,6 +245,7 @@ if __name__ == "__main__":
         json.dump({
             "token_id": token_id,
             "token_secret": token_secret,
+            "e2b_api_key": e2b_api_key,
             "openai_api_key": openai_api_key,
             "anthropic_api_key": anthropic_api_key,
             "openrouter_api_key": openrouter_api_key,
@@ -266,6 +277,17 @@ if __name__ == "__main__":
         with open(env_file, 'r') as f:
             env_content = f.read()
     
+    # Update or add E2B_API_KEY
+    if e2b_api_key:
+        if "E2B_API_KEY" in env_content:
+            import re
+            env_content = re.sub(r'E2B_API_KEY=.*\n', f'E2B_API_KEY={e2b_api_key}\n', env_content)
+        else:
+            env_content += f'\nE2B_API_KEY={e2b_api_key}\n'
+        with open(env_file, 'w') as f:
+            f.write(env_content)
+        print(f"✅ Updated E2B API key in {env_file}")
+    
     # Update or add OPENAI_API_KEY
     if openai_api_key:
         if "OPENAI_API_KEY" in env_content:

package/python/requirements.txt

@@ -7,4 +7,5 @@ flask-cors
 pexpect
 anthropic
 gitingest
-exa-py
+exa-py
+e2b-code-interpreter