From 77061ac99541b4e31ac7a93ff3bf7764402bc82c Mon Sep 17 00:00:00 2001
From: JackTheGit <jack.47@gmail.com>
Date: Tue, 21 Apr 2026 01:56:47 -0700
Subject: [PATCH] Normalize FAL_KEY env handling (ignore whitespace-only
 values)

Treat whitespace-only FAL_KEY the same as unset so users who export
FAL_KEY="   " (or CI that leaves a blank token) get the expected
'not set' error path instead of a confusing downstream fal_client
failure.

Applied to the two direct FAL_KEY checks in image_generation_tool.py:
image_generate_tool's upfront credential check and check_fal_api_key().
Both keep the existing managed-gateway fallback intact.

Adapted the original whitespace/valid tests to pin the managed gateway
to None so the whitespace assertion exercises the direct-key path
rather than silently relying on gateway absence.
---
 tests/tools/test_image_generation_env.py | 39 ++++++++++++++++++++++++
 tools/image_generation_tool.py           |  8 +++--
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 tests/tools/test_image_generation_env.py

diff --git a/tests/tools/test_image_generation_env.py b/tests/tools/test_image_generation_env.py
new file mode 100644
index 000000000..fc4e65533
--- /dev/null
+++ b/tests/tools/test_image_generation_env.py
@@ -0,0 +1,39 @@
+"""FAL_KEY env var normalization (whitespace-only treated as unset)."""
+
+
+def test_fal_key_whitespace_is_unset(monkeypatch):
+    # Whitespace-only FAL_KEY must NOT register as configured, and the managed
+    # gateway fallback must be disabled for this assertion to be meaningful.
+    monkeypatch.setenv("FAL_KEY", "   ")
+
+    from tools import image_generation_tool
+
+    monkeypatch.setattr(
+        image_generation_tool, "_resolve_managed_fal_gateway", lambda: None
+    )
+
+    assert image_generation_tool.check_fal_api_key() is False
+
+
+def test_fal_key_valid(monkeypatch):
+    monkeypatch.setenv("FAL_KEY", "sk-test")
+
+    from tools import image_generation_tool
+
+    monkeypatch.setattr(
+        image_generation_tool, "_resolve_managed_fal_gateway", lambda: None
+    )
+
+    assert image_generation_tool.check_fal_api_key() is True
+
+
+def test_fal_key_empty_is_unset(monkeypatch):
+    monkeypatch.setenv("FAL_KEY", "")
+
+    from tools import image_generation_tool
+
+    monkeypatch.setattr(
+        image_generation_tool, "_resolve_managed_fal_gateway", lambda: None
+    )
+
+    assert image_generation_tool.check_fal_api_key() is False
diff --git a/tools/image_generation_tool.py b/tools/image_generation_tool.py
index 13f17abe3..e10b8453c 100644
--- a/tools/image_generation_tool.py
+++ b/tools/image_generation_tool.py
@@ -623,7 +623,9 @@ def image_generate_tool(
         if not prompt or not isinstance(prompt, str) or len(prompt.strip()) == 0:
             raise ValueError("Prompt is required and must be a non-empty string")
 
-        if not (os.getenv("FAL_KEY") or _resolve_managed_fal_gateway()):
+        fal_key_value = os.getenv("FAL_KEY")
+        fal_key_set = bool(fal_key_value and fal_key_value.strip())
+        if not (fal_key_set or _resolve_managed_fal_gateway()):
             message = "FAL_KEY environment variable not set"
             if managed_nous_tools_enabled():
                 message += " and managed FAL gateway is unavailable"
@@ -734,7 +736,9 @@ def image_generate_tool(
 
 def check_fal_api_key() -> bool:
     """True if the FAL.ai API key (direct or managed gateway) is available."""
-    return bool(os.getenv("FAL_KEY") or _resolve_managed_fal_gateway())
+    fal_key_value = os.getenv("FAL_KEY")
+    fal_key_set = bool(fal_key_value and fal_key_value.strip())
+    return bool(fal_key_set or _resolve_managed_fal_gateway())
 
 
 def check_image_generation_requirements() -> bool: