diff --git a/backend/packages/harness/deerflow/community/image_search/tools.py b/backend/packages/harness/deerflow/community/image_search/tools.py index 4b300b230..6754307e9 100644 --- a/backend/packages/harness/deerflow/community/image_search/tools.py +++ b/backend/packages/harness/deerflow/community/image_search/tools.py @@ -79,8 +79,10 @@ def image_search_tool( query: str, max_results: int = 5, size: str | None = None, + color: str | None = None, type_image: str | None = None, layout: str | None = None, + license_image: str | None = None, ) -> str: """Search for images online. Use this tool BEFORE image generation to find reference images for characters, portraits, objects, scenes, or any content requiring visual accuracy. @@ -96,8 +98,13 @@ def image_search_tool( query: Search keywords describing the images you want to find. Be specific for better results (e.g., "Japanese woman street photography 1990s" instead of just "woman"). max_results: Maximum number of images to return. Default is 5. size: Image size filter. Options: "Small", "Medium", "Large", "Wallpaper". Use "Large" for reference images. + color: Color filter. Options: "color", "Monochrome", "Red", "Orange", "Yellow", "Green", "Blue", "Purple", "Pink", "Brown", "Black", "Gray", "Teal", "White". + Note that "color" means full-color (as opposed to "Monochrome"), not a meta-parameter. + Match the dominant palette of the image you plan to generate; omit it for unrestricted results. type_image: Image type filter. Options: "photo", "clipart", "gif", "transparent", "line". Use "photo" for realistic references. layout: Layout filter. Options: "Square", "Tall", "Wide". Choose based on your generation needs. + license_image: License filter. Options: "any", "Public", "Share", "ShareCommercially", "Modify", "ModifyCommercially". + Use this when the reference image will be redistributed, so the results are already license-cleared. """ config = get_app_config().get_tool_config("image_search") @@ -109,8 +116,10 @@ def image_search_tool( query=query, max_results=max_results, size=size, + color=color, type_image=type_image, layout=layout, + license_image=license_image, ) if not results: diff --git a/backend/tests/test_image_search.py b/backend/tests/test_image_search.py index 12f5f0501..77c8f449f 100644 --- a/backend/tests/test_image_search.py +++ b/backend/tests/test_image_search.py @@ -26,3 +26,47 @@ def test_image_search_uses_full_image_url_not_thumbnail(): result = output["results"][0] assert result["image_url"] == "https://example.com/full.jpg" assert result["thumbnail_url"] == "https://example.com/thumb.jpg" + + +def _search_kwargs(query="a cat", **kwargs): + """Invoke image_search_tool and return the kwargs handed to _search_images.""" + fake_results = [{"title": "a cat", "image": "https://example.com/full.jpg", "thumbnail": "https://example.com/thumb.jpg"}] + cfg = MagicMock() + cfg.get_tool_config.return_value = None + + with ( + patch("deerflow.community.image_search.tools._search_images", return_value=fake_results) as mock_search, + patch("deerflow.community.image_search.tools.get_app_config", return_value=cfg), + ): + image_search_tool.invoke({"query": query, **kwargs}) + + return mock_search.call_args.kwargs + + +def test_image_search_passes_color_and_license_filters(): + """`color` / `license_image` reach the DDGS call. + + `_search_images` accepts both and forwards them into the `f` filter payload + that duckduckgo_images builds, but `image_search_tool` never exposed or + passed them, so they were unreachable: DDGS supports them and the provider + already declared support for them, yet no caller could set one. + """ + kwargs = _search_kwargs(color="Monochrome", license_image="ModifyCommercially") + + assert kwargs["color"] == "Monochrome" + assert kwargs["license_image"] == "ModifyCommercially" + + +def test_image_search_omits_unset_filters(): + """An unset filter is absent/None, so _search_images leaves it out of the DDGS call. + + `_search_images` only forwards truthy filters, so this pins that the default + request is unchanged by the newly exposed parameters. + """ + kwargs = _search_kwargs(size="Large", type_image="photo", layout="Square") + + assert kwargs["size"] == "Large" + assert kwargs["type_image"] == "photo" + assert kwargs["layout"] == "Square" + assert kwargs.get("color") is None + assert kwargs.get("license_image") is None