Skip to content

Building AI agents, atomically

Require an http(s) URL with a host for results; cover key-pattern and URL edge cases

Juampi7a1bcff01929
diff --git a/atomic-forge/tools/firecrawl_search/tests/test_firecrawl_search.py b/atomic-forge/tools/firecrawl_search/tests/test_firecrawl_search.py
index 801866b..69f53a4 100644
--- a/atomic-forge/tools/firecrawl_search/tests/test_firecrawl_search.py
+++ b/atomic-forge/tools/firecrawl_search/tests/test_firecrawl_search.py
@@ -152,6 +152,10 @@ def test_to_item_drops_badly_typed_fields(field, value, attribute, expected):
assert getattr(item, attribute) == expected
+def test_to_item_accepts_uppercase_scheme():
+ assert FirecrawlSearchTool._to_item({"url": "HTTPS://Example.com/a"}, "q").url == "HTTPS://Example.com/a"
+
+
@pytest.mark.parametrize(
"hit",
[
@@ -166,6 +170,9 @@ def test_to_item_drops_badly_typed_fields(field, value, attribute, expected):
{"url": " https://example.com"},
{"url": "javascript:alert(1)"},
{"url": "ftp://example.com/file"},
+ {"url": "httpx://example.com"},
+ {"url": "https://"},
+ {"url": "http:///path-without-host"},
],
)
def test_to_item_without_usable_url_is_none(hit):
@@ -474,7 +481,7 @@ def test_key_kept_out_of_tool_and_config_state():
def test_redaction_does_not_mangle_ordinary_text():
"""A one-letter key is not redacted (it would hit every 'a'), and fc- words that are not keys are left alone."""
tool = FirecrawlSearchTool(config=FirecrawlSearchToolConfig(api_key="a"))
- text = "Firecrawl search failed for 'fc-barcelona-2024'"
+ text = "Firecrawl search failed for 'fc-barcelona-2024' and 'fc-0123abcd'"
assert tool._redact(text) == text
diff --git a/atomic-forge/tools/firecrawl_search/tool/firecrawl_search.py b/atomic-forge/tools/firecrawl_search/tool/firecrawl_search.py
index 4a5de9e..e0a98b0 100644
--- a/atomic-forge/tools/firecrawl_search/tool/firecrawl_search.py
+++ b/atomic-forge/tools/firecrawl_search/tool/firecrawl_search.py
@@ -111,6 +111,8 @@ class FirecrawlSearchTool(BaseTool[FirecrawlSearchToolInputSchema, FirecrawlSear
# when it is long enough that replacing it cannot mangle ordinary words.
KEY_PATTERN = re.compile(r"\bfc-[0-9a-f]{32}\b", re.IGNORECASE)
MIN_REDACTED_KEY_LENGTH = 8
+ # A result is only kept when its URL is http(s) with a host.
+ RESULT_URL_PATTERN = re.compile(r"https?://[^\s/?#]+", re.IGNORECASE)
def __init__(self, config: FirecrawlSearchToolConfig = FirecrawlSearchToolConfig()):
super().__init__(config)
@@ -130,7 +132,7 @@ class FirecrawlSearchTool(BaseTool[FirecrawlSearchToolInputSchema, FirecrawlSear
def _to_item(cls, hit: Any, query: str, max_content_chars: Optional[int] = None) -> Optional[FirecrawlSearchResultItem]:
"""Normalise one result, or return None when it has no http(s) URL."""
url = hit.get("url") if isinstance(hit, dict) else None
- if not str(url).startswith(("http://", "https://")):
+ if not cls.RESULT_URL_PATTERN.match(str(url)):
return None
content = cls._first_text(hit.get("markdown"))
return FirecrawlSearchResultItem(