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>
110 lines
4.4 KiB
Python
110 lines
4.4 KiB
Python
from typing import Annotated, Any
|
|
|
|
from arcade_tdk import ToolContext, tool
|
|
|
|
from arcade_search.enums import GoogleFlightsMaxStops, GoogleFlightsSortBy, GoogleFlightsTravelClass
|
|
from arcade_search.utils import call_serpapi, parse_flight_results, prepare_params
|
|
|
|
|
|
@tool(requires_secrets=["SERP_API_KEY"])
|
|
async def search_roundtrip_flights(
|
|
context: ToolContext,
|
|
departure_airport_code: Annotated[
|
|
str, "The departure airport code. An uppercase 3-letter code"
|
|
],
|
|
arrival_airport_code: Annotated[str, "The arrival airport code. An uppercase 3-letter code"],
|
|
outbound_date: Annotated[str, "Flight outbound date in YYYY-MM-DD format"],
|
|
return_date: Annotated[str | None, "Flight return date in YYYY-MM-DD format"],
|
|
currency_code: Annotated[
|
|
str | None, "Currency of the returned prices. Defaults to 'USD'"
|
|
] = "USD",
|
|
travel_class: Annotated[
|
|
GoogleFlightsTravelClass,
|
|
"Travel class of the flight. Defaults to 'ECONOMY'",
|
|
] = GoogleFlightsTravelClass.ECONOMY,
|
|
num_adults: Annotated[int | None, "Number of adult passengers. Defaults to 1"] = 1,
|
|
num_children: Annotated[int | None, "Number of child passengers. Defaults to 0"] = 0,
|
|
max_stops: Annotated[
|
|
GoogleFlightsMaxStops,
|
|
"Maximum number of stops (layovers) for the flight. Defaults to any number of stops",
|
|
] = GoogleFlightsMaxStops.ANY,
|
|
sort_by: Annotated[
|
|
GoogleFlightsSortBy,
|
|
"The sorting order of the results. Defaults to TOP_FLIGHTS.",
|
|
] = GoogleFlightsSortBy.TOP_FLIGHTS,
|
|
) -> Annotated[dict[str, Any], "Flight search results from the Google Flights API"]:
|
|
"""Retrieve flight search results using Google Flights"""
|
|
# Prepare the request
|
|
params = prepare_params(
|
|
"google_flights",
|
|
departure_id=departure_airport_code,
|
|
arrival_id=arrival_airport_code,
|
|
outbound_date=outbound_date,
|
|
return_date=return_date,
|
|
currency=currency_code,
|
|
travel_class=travel_class.to_api_value(),
|
|
adults=num_adults,
|
|
children=num_children,
|
|
stops=max_stops.to_api_value(),
|
|
sort_by=sort_by.to_api_value(),
|
|
deep_search=True, # Same search depth of the Google Flights page in the browser
|
|
)
|
|
|
|
# Execute the request
|
|
results = call_serpapi(context, params)
|
|
|
|
# Parse the results
|
|
flights = parse_flight_results(results)
|
|
|
|
return flights
|
|
|
|
|
|
@tool(requires_secrets=["SERP_API_KEY"])
|
|
async def search_one_way_flights(
|
|
context: ToolContext,
|
|
departure_airport_code: Annotated[
|
|
str, "The departure airport code. An uppercase 3-letter code"
|
|
],
|
|
arrival_airport_code: Annotated[str, "The arrival airport code. An uppercase 3-letter code"],
|
|
outbound_date: Annotated[str, "Flight departure date in YYYY-MM-DD format"],
|
|
currency_code: Annotated[
|
|
str | None, "Currency of the returned prices. Defaults to 'USD'"
|
|
] = "USD",
|
|
travel_class: Annotated[
|
|
GoogleFlightsTravelClass,
|
|
"Travel class of the flight. Defaults to 'ECONOMY'",
|
|
] = GoogleFlightsTravelClass.ECONOMY,
|
|
num_adults: Annotated[int | None, "Number of adult passengers. Defaults to 1"] = 1,
|
|
num_children: Annotated[int | None, "Number of child passengers. Defaults to 0"] = 0,
|
|
max_stops: Annotated[
|
|
GoogleFlightsMaxStops,
|
|
"Maximum number of stops (layovers) for the flight. Defaults to any number of stops",
|
|
] = GoogleFlightsMaxStops.ANY,
|
|
sort_by: Annotated[
|
|
GoogleFlightsSortBy,
|
|
"The sorting order of the results. Defaults to TOP_FLIGHTS.",
|
|
] = GoogleFlightsSortBy.TOP_FLIGHTS,
|
|
) -> Annotated[dict[str, Any], "Flight search results from the Google Flights API"]:
|
|
"""Retrieve flight search results for a one-way flight using Google Flights"""
|
|
params = prepare_params(
|
|
"google_flights",
|
|
departure_id=departure_airport_code,
|
|
arrival_id=arrival_airport_code,
|
|
outbound_date=outbound_date,
|
|
currency=currency_code,
|
|
travel_class=travel_class.to_api_value(),
|
|
adults=num_adults,
|
|
children=num_children,
|
|
stops=max_stops.to_api_value(),
|
|
sort_by=sort_by.to_api_value(),
|
|
type=2, # indicates one-way
|
|
deep_search=True, # Same search depth as the Google Flights page in the browser
|
|
)
|
|
|
|
# Execute the request
|
|
results = call_serpapi(context, params)
|
|
|
|
# Parse the results
|
|
flights = parse_flight_results(results)
|
|
|
|
return flights
|