Merge pull request #52 from edenartlab/staging

postprocessing

.github/workflows/prod.yaml

@@ -46,4 +46,4 @@ jobs:
 
       - name: Deploy to Modal
         working-directory: eve
-        run: rye run modal deploy ./eve/api.py
+        run: rye run modal deploy ./eve/api/api.py

.github/workflows/staging.yaml

@@ -46,4 +46,4 @@ jobs:
 
       - name: Deploy to Modal
         working-directory: eve
-        run: rye run modal deploy ./eve/api.py
+        run: rye run modal deploy ./eve/api/api.py

comfyui.py

@@ -66,6 +66,7 @@
 specific_test = os.getenv("SPECIFIC_TEST") if os.getenv("SPECIFIC_TEST") else ""
 skip_tests = os.getenv("SKIP_TESTS")
 
+# Run a bunch of checks to verify input args:
 if test_all and specific_test:
     print(f"WARNING: can't have both TEST_ALL and SPECIFIC_TEST at the same time...")
     print(f"Running TEST_ALL instead")
@@ -80,6 +81,11 @@
 print(f"skip_tests: {skip_tests}")
 print("========================================")
 
+if not test_workflows and workspace_name and not test_all:
+    print("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+    print("!!!! WARNING: You are deploying a workspace without TEST_ALL !!!!")
+    print("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n")
+
 def install_comfyui():
     snapshot = json.load(open("/root/workspace/snapshot.json", 'r'))
     comfyui_commit_sha = snapshot["comfyui"]
@@ -362,7 +368,8 @@ def test_workflows(self):
             else:
                 tests = [f"/root/workspace/workflows/{workflow}/test.json"]
             print(f"====> Running tests for {workflow}: ", tests)
-            for test in tests:
+            for i, test in enumerate(tests):
+                print(f"\n\n\n------------------ Running test {i+1} of {len(tests)} ------------------")
                 tool = Tool.from_yaml(f"/root/workspace/workflows/{workflow}/api.yaml")
                 if tool.status == "inactive":
                     print(f"{workflow} is inactive, skipping test")
@@ -691,7 +698,7 @@ def validate_url(url):
                 #print("found lora:\n", lora)
 
                 if not lora:
-                    raise Exception(f"Lora {key} with id: {lora_id} not found!")
+                    raise Exception(f"Lora {key} with id: {lora_id} not found in DB {db}!")
 
                 base_model = lora.get("base_model")
                 lora_url = lora.get("checkpoint")

eve/__init__.py

@@ -1,3 +1,4 @@
+import logging
 import sentry_sdk
 from dotenv import load_dotenv
 from pathlib import Path
@@ -6,17 +7,20 @@
 
 home_dir = str(Path.home())
 
-
 EDEN_API_KEY = None
 
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+
 
 def load_env(db):
     global EDEN_API_KEY
 
     db = db.upper()
     if db not in ["STAGE", "PROD"]:
         raise ValueError(f"Invalid database: {db}")
-    
+
     os.environ["DB"] = db
 
     # First try ~/.eve
@@ -37,7 +41,10 @@ def load_env(db):
 
     # start sentry
     sentry_dsn = os.getenv("SENTRY_DSN")
-    sentry_sdk.init(dsn=sentry_dsn, traces_sample_rate=1.0, profiles_sample_rate=1.0)
+    if sentry_dsn:
+        sentry_sdk.init(
+            dsn=sentry_dsn, traces_sample_rate=1.0, profiles_sample_rate=1.0
+        )
 
     # load api keys
     EDEN_API_KEY = SecretStr(os.getenv("EDEN_API_KEY", ""))

eve/agent.py

@@ -1,5 +1,4 @@
 import os
-import yaml
 import time
 import json
 import traceback