b6b4cd0a4c
### Overview Major restructuring from monolithic `arcade-ai` package to modular library architecture with standardized uv-based dependency management.  ### New Package Structure - **`arcade-tdk`** - Lightweight toolkit development kit (core decorators, auth) - **`arcade-core`** - Core execution engine and catalog functionality - **`arcade-serve`** - FastAPI/MCP server components - **`arcade-ai`** - Meta package that includes CLI functionality. Optionally include evals via the `evals` extra. Optionally include all packages via the `all` extra. ### Key Benefits - **Lighter Dependencies**: Toolkits now depend only on `arcade-tdk` (~2 deps) vs full `arcade-ai` (~30+ deps) - **Faster Builds**: uv provides 10-100x faster dependency resolution and installation - **Better Modularity**: Clear separation of concerns, consumers import only what they need - **Standard Tooling**: Eliminates custom poetry scripts, uses standard Python packaging ### Migration Impact - All 20 toolkits converted from poetry → uv with `arcade-tdk` dependencies plus `arcade-ai[evals]` and `arcade-serve` dev dependencies. When developing locally, devs should install toolkits via `make install-local`. - Modern Python 3.10+ type hints throughout - Standardized build system with hatchling backend - Enhanced Makefile with robust toolkit management commands - Removed `arcade dev` CLI command - Reduce the number of files created by `arcade new` and add an option to not generate a tests and evals folder. This foundation enables faster development cycles and cleaner dependency chains for the growing toolkit ecosystem. ### Todo After this PR is merged - [ ] Post-merge workflow(s) (release & publish containers, etc) - [ ] Release order plan. @EricGustin suggests releasing in the following order: 1. `arcade-core` version 0.1.0 2. `arcade-serve` version 0.1.0 and `arcade-tdk` version 0.1.0 3. `arcade-ai` version 2.0.0 4. Patch release for all toolkits (all changes in toolkits are internal refactors) - [ ] [Update docs](https://github.com/ArcadeAI/docs/pull/318) --------- Co-authored-by: Eric Gustin <eric@arcade.dev> Co-authored-by: Eric Gustin <34000337+EricGustin@users.noreply.github.com>
66 lines
2.2 KiB
Python
66 lines
2.2 KiB
Python
from typing import Annotated, Any
|
|
|
|
from arcade_tdk import ToolContext, tool
|
|
from arcade_tdk.errors import ToolExecutionError
|
|
|
|
from arcade_search.constants import (
|
|
DEFAULT_GOOGLE_SHOPPING_COUNTRY,
|
|
DEFAULT_GOOGLE_SHOPPING_LANGUAGE,
|
|
)
|
|
from arcade_search.google_data import GOOGLE_DOMAIN_BY_COUNTRY_CODE
|
|
from arcade_search.utils import (
|
|
call_serpapi,
|
|
extract_shopping_results,
|
|
prepare_params,
|
|
resolve_country_code,
|
|
resolve_language_code,
|
|
)
|
|
|
|
|
|
@tool(requires_secrets=["SERP_API_KEY"])
|
|
async def search_shopping_products(
|
|
context: ToolContext,
|
|
keywords: Annotated[
|
|
str,
|
|
"Keywords to search for products in Google Shopping. E.g. 'Apple iPhone'.",
|
|
],
|
|
country_code: Annotated[
|
|
str | None,
|
|
"2-character country code to search for products in Google Shopping. "
|
|
f"E.g. 'us' (United States). Defaults to '{DEFAULT_GOOGLE_SHOPPING_COUNTRY or 'us'}'.",
|
|
] = DEFAULT_GOOGLE_SHOPPING_COUNTRY,
|
|
language_code: Annotated[
|
|
str | None,
|
|
"2-character language code to search for products on Google Shopping. E.g. 'en' (English). "
|
|
f"Defaults to '{DEFAULT_GOOGLE_SHOPPING_LANGUAGE or 'en'}'.",
|
|
] = DEFAULT_GOOGLE_SHOPPING_LANGUAGE,
|
|
) -> Annotated[dict[str, list[dict[str, Any]]], "Products on Google Shopping."]:
|
|
"""Search for products on Google Shopping related to a given query."""
|
|
country_code = resolve_country_code(country_code, DEFAULT_GOOGLE_SHOPPING_COUNTRY)
|
|
language_code = resolve_language_code(language_code, DEFAULT_GOOGLE_SHOPPING_LANGUAGE)
|
|
|
|
if not isinstance(country_code, str):
|
|
country_code = "us"
|
|
|
|
if not isinstance(language_code, str):
|
|
language_code = "en"
|
|
|
|
google_domain = GOOGLE_DOMAIN_BY_COUNTRY_CODE.get(country_code, "google.com")
|
|
|
|
params = prepare_params(
|
|
"google_shopping",
|
|
q=keywords,
|
|
gl=country_code,
|
|
hl=language_code,
|
|
google_domain=google_domain,
|
|
)
|
|
|
|
response = call_serpapi(context, params)
|
|
|
|
if response.get("error"):
|
|
error_msg = response.get("error") or "Unknown Google Shopping Error"
|
|
raise ToolExecutionError(error_msg)
|
|
|
|
return {
|
|
"products": extract_shopping_results(response.get("shopping_results", [])),
|
|
}
|