support fireworks dev tier

eval_protocol/auth.py

@@ -6,10 +6,48 @@
 
 logger = logging.getLogger(__name__)
 
+# Default locations (used for tests and as fallback). Actual resolution is dynamic via _get_auth_ini_file().
 FIREWORKS_CONFIG_DIR = Path.home() / ".fireworks"
 AUTH_INI_FILE = FIREWORKS_CONFIG_DIR / "auth.ini"
 
 
+def _get_profile_base_dir() -> Path:
+    """
+    Resolve the Fireworks configuration base directory following firectl behavior:
+    - Default: ~/.fireworks
+    - If FIREWORKS_PROFILE is set and non-empty: ~/.fireworks/profiles/<profile>
+    """
+    profile_name = os.environ.get("FIREWORKS_PROFILE", "").strip()
+    base_dir = Path.home() / ".fireworks"
+    if profile_name:
+        base_dir = base_dir / "profiles" / profile_name
+    return base_dir
+
+
+def _get_auth_ini_file() -> Path:
+    """
+    Determine the auth.ini file path.
+    Priority:
+      1) FIREWORKS_AUTH_FILE env var when set
+      2) ~/.fireworks[/profiles/<profile>]/auth.ini (profile driven)
+    """
+    auth_file_env = os.environ.get("FIREWORKS_AUTH_FILE")
+    if auth_file_env:
+        return Path(auth_file_env)
+    return _get_profile_base_dir() / "auth.ini"
+
+
+def _is_profile_active() -> bool:
+    """
+    Returns True if a specific profile or explicit auth file is active.
+    In this case, profile-based credentials should take precedence over env vars.
+    """
+    if os.environ.get("FIREWORKS_AUTH_FILE"):
+        return True
+    prof = os.environ.get("FIREWORKS_PROFILE", "").strip()
+    return bool(prof)
+
+
 def _parse_simple_auth_file(file_path: Path) -> Dict[str, str]:
     """
     Parses an auth file with simple key=value lines.
@@ -20,7 +58,7 @@ def _parse_simple_auth_file(file_path: Path) -> Dict[str, str]:
     if not file_path.exists():
         return creds
     try:
-        with open(file_path, "r") as f:
+        with open(file_path, "r", encoding="utf-8") as f:
             for line in f:
                 line = line.strip()
                 if not line or line.startswith("#") or line.startswith(";"):
@@ -39,7 +77,7 @@ def _parse_simple_auth_file(file_path: Path) -> Dict[str, str]:
                     if key in ["api_key", "account_id"] and value:
                         creds[key] = value
     except Exception as e:
-        logger.warning(f"Error during simple parsing of {file_path}: {e}")
+        logger.warning("Error during simple parsing of %s: %s", str(file_path), e)
     return creds
 
 
@@ -48,44 +86,50 @@ def _get_credential_from_config_file(key_name: str) -> Optional[str]:
     Helper to get a specific credential (api_key or account_id) from auth.ini.
     Tries simple parsing first, then configparser.
     """
-    if not AUTH_INI_FILE.exists():
+    auth_ini_path = _get_auth_ini_file()
+    if not auth_ini_path.exists():
         return None
 
     # 1. Try simple key-value parsing first
-    simple_creds = _parse_simple_auth_file(AUTH_INI_FILE)
+    simple_creds = _parse_simple_auth_file(auth_ini_path)
     if key_name in simple_creds:
-        logger.debug(f"Using {key_name} from simple key-value parsing of {AUTH_INI_FILE}.")
+        logger.debug("Using %s from simple key-value parsing of %s.", key_name, str(auth_ini_path))
         return simple_creds[key_name]
 
     # 2. Fallback to configparser if not found via simple parsing or if simple parsing failed
     #    This path will also generate the "no section headers" warning if applicable,
     #    but only if simple parsing didn't yield the key.
     try:
         config = configparser.ConfigParser()
-        config.read(AUTH_INI_FILE)
+        config.read(auth_ini_path)
 
         # Try [fireworks] section
         if "fireworks" in config and config.has_option("fireworks", key_name):
             value_from_file = config.get("fireworks", key_name)
             if value_from_file:
-                logger.debug(f"Using {key_name} from [fireworks] section in {AUTH_INI_FILE}.")
+                logger.debug("Using %s from [fireworks] section in %s.", key_name, str(auth_ini_path))
                 return value_from_file
 
         # Try default section (configparser might place items without section header here)
         if config.has_option(config.default_section, key_name):
             value_from_default = config.get(config.default_section, key_name)
             if value_from_default:
-                logger.debug(f"Using {key_name} from default section [{config.default_section}] in {AUTH_INI_FILE}.")
+                logger.debug(
+                    "Using %s from default section [%s] in %s.",
+                    key_name,
+                    config.default_section,
+                    str(auth_ini_path),
+                )
                 return value_from_default
 
     except configparser.MissingSectionHeaderError:
         # This error implies the file is purely key-value, which simple parsing should have handled.
         # If simple parsing failed to get the key, then it's likely not there or malformed.
-        logger.debug(f"{AUTH_INI_FILE} has no section headers, and simple parsing did not find {key_name}.")
+        logger.debug("%s has no section headers, and simple parsing did not find %s.", str(auth_ini_path), key_name)
     except configparser.Error as e_config:
-        logger.warning(f"Configparser error reading {AUTH_INI_FILE} for {key_name}: {e_config}")
+        logger.warning("Configparser error reading %s for %s: %s", str(auth_ini_path), key_name, e_config)
     except Exception as e_general:
-        logger.warning(f"Unexpected error reading {AUTH_INI_FILE} for {key_name}: {e_general}")
+        logger.warning("Unexpected error reading %s for %s: %s", str(auth_ini_path), key_name, e_general)
 
     return None
 
@@ -101,14 +145,24 @@ def get_fireworks_api_key() -> Optional[str]:
     Returns:
         The API key if found, otherwise None.
     """
-    api_key = os.environ.get("FIREWORKS_API_KEY")
-    if api_key:
-        logger.debug("Using FIREWORKS_API_KEY from environment variable.")
-        return api_key
-
-    api_key_from_file = _get_credential_from_config_file("api_key")
-    if api_key_from_file:
-        return api_key_from_file
+    # If a profile is active, prefer profile file first, then env
+    if _is_profile_active():
+        api_key_from_file = _get_credential_from_config_file("api_key")
+        if api_key_from_file:
+            return api_key_from_file
+        api_key = os.environ.get("FIREWORKS_API_KEY")
+        if api_key:
+            logger.debug("Using FIREWORKS_API_KEY from environment variable (profile active but file missing).")
+            return api_key
+    else:
+        # Default behavior: env overrides file
+        api_key = os.environ.get("FIREWORKS_API_KEY")
+        if api_key:
+            logger.debug("Using FIREWORKS_API_KEY from environment variable.")
+            return api_key
+        api_key_from_file = _get_credential_from_config_file("api_key")
+        if api_key_from_file:
+            return api_key_from_file
 
     logger.debug("Fireworks API key not found in environment variables or auth.ini.")
     return None
@@ -125,14 +179,24 @@ def get_fireworks_account_id() -> Optional[str]:
     Returns:
         The Account ID if found, otherwise None.
     """
-    account_id = os.environ.get("FIREWORKS_ACCOUNT_ID")
-    if account_id:
-        logger.debug("Using FIREWORKS_ACCOUNT_ID from environment variable.")
-        return account_id
-
-    account_id_from_file = _get_credential_from_config_file("account_id")
-    if account_id_from_file:
-        return account_id_from_file
+    # If a profile is active, prefer profile file first, then env
+    if _is_profile_active():
+        account_id_from_file = _get_credential_from_config_file("account_id")
+        if account_id_from_file:
+            return account_id_from_file
+        account_id = os.environ.get("FIREWORKS_ACCOUNT_ID")
+        if account_id:
+            logger.debug("Using FIREWORKS_ACCOUNT_ID from environment variable (profile active but file missing).")
+            return account_id
+    else:
+        # Default behavior: env overrides file
+        account_id = os.environ.get("FIREWORKS_ACCOUNT_ID")
+        if account_id:
+            logger.debug("Using FIREWORKS_ACCOUNT_ID from environment variable.")
+            return account_id
+        account_id_from_file = _get_credential_from_config_file("account_id")
+        if account_id_from_file:
+            return account_id_from_file
 
     logger.debug("Fireworks Account ID not found in environment variables or auth.ini.")
     return None
@@ -152,5 +216,5 @@ def get_fireworks_api_base() -> str:
     if os.environ.get("FIREWORKS_API_BASE"):
         logger.debug("Using FIREWORKS_API_BASE from environment variable.")
     else:
-        logger.debug(f"FIREWORKS_API_BASE not set in environment, defaulting to {api_base}.")
+        logger.debug("FIREWORKS_API_BASE not set in environment, defaulting to %s.", api_base)
     return api_base