proper account detection

Author: benjibc

eval_protocol/auth.py

@@ -200,7 +200,18 @@ def get_fireworks_account_id() -> Optional[str]:
         if account_id_from_file:
             return account_id_from_file
 
-    logger.debug("Fireworks Account ID not found in environment variables or auth.ini.")
+    # 3) Fallback: if API key is present, attempt to resolve via verifyApiKey
+    try:
+        api_key_for_verify = get_fireworks_api_key()
+        if api_key_for_verify:
+            resolved = verify_api_key_and_get_account_id(api_key=api_key_for_verify, api_base=get_fireworks_api_base())
+            if resolved:
+                logger.debug("Using FIREWORKS_ACCOUNT_ID resolved via verifyApiKey: %s", resolved)
+                return resolved
+    except Exception as e:
+        logger.debug("Failed to resolve FIREWORKS_ACCOUNT_ID via verifyApiKey: %s", e)
+
+    logger.debug("Fireworks Account ID not found in environment variables, auth.ini, or via verifyApiKey.")
     return None
 
 

eval_protocol/evaluation.py

@@ -595,7 +595,9 @@ def _ensure_requirements_present(source_dir: str) -> None:
             logger.error("Missing requirements.txt in upload directory: %s", source_dir)
             raise ValueError(
                 "Upload requires requirements.txt in the project root. "
-                "Please add requirements.txt and re-run ep upload."
+                "Create a requirements.txt (it can be empty) and rerun 'eval-protocol upload' "
+                "or 'eval-protocol create rft'. If you're running in a notebook (e.g., Colab), "
+                f"create the file in your working directory (e.g., {source_dir}/requirements.txt)."
             )
 
     @staticmethod

eval_protocol/pytest/handle_persist_flow.py

@@ -11,6 +11,12 @@
 from eval_protocol.directory_utils import find_eval_protocol_dir
 from eval_protocol.models import EvaluationRow
 from eval_protocol.pytest.store_experiment_link import store_experiment_link
+from eval_protocol.auth import (
+    get_fireworks_api_key,
+    get_fireworks_account_id,
+    verify_api_key_and_get_account_id,
+    get_fireworks_api_base,
+)
 
 import requests
 
@@ -90,22 +96,16 @@ def handle_persist_flow(all_results: list[list[EvaluationRow]], test_func_name:
                     if not should_upload:
                         continue
 
-                    def get_auth_value(key: str) -> str | None:
-                        """Get auth value from config file or environment."""
+                    # Resolve credentials using centralized auth helpers with verification fallback
+                    fireworks_api_key = get_fireworks_api_key()
+                    fireworks_account_id = get_fireworks_account_id()
+                    if not fireworks_account_id and fireworks_api_key:
                         try:
-                            config_path = Path.home() / ".fireworks" / "auth.ini"
-                            if config_path.exists():
-                                config = configparser.ConfigParser()  # noqa: F821
-                                config.read(config_path)
-                                for section in ["DEFAULT", "auth"]:
-                                    if config.has_section(section) and config.has_option(section, key):
-                                        return config.get(section, key)
+                            fireworks_account_id = verify_api_key_and_get_account_id(
+                                api_key=fireworks_api_key, api_base=get_fireworks_api_base()
+                            )
                         except Exception:
-                            pass
-                        return os.getenv(key)
-
-                    fireworks_api_key = get_auth_value("FIREWORKS_API_KEY")
-                    fireworks_account_id = get_auth_value("FIREWORKS_ACCOUNT_ID")
+                            fireworks_account_id = None
 
                     if not fireworks_api_key and not fireworks_account_id:
                         store_experiment_link(
@@ -129,7 +129,7 @@ def get_auth_value(key: str) -> str | None:
                         )
                         continue
 
-                    api_base = "https://api.fireworks.ai"
+                    api_base = get_fireworks_api_base()
                     headers = {
                         "Authorization": f"Bearer {fireworks_api_key}",
                         "Content-Type": "application/json",