Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update search airport tool #148

Merged
merged 2 commits into from
Dec 21, 2023
Merged

fix: update search airport tool #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87f9084
fix: update search airport tool
averikitsch Dec 20, 2023
b2c3a77
Merge branch 'main' into akitsch-agent
averikitsch Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions langchain_tools_demo/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,6 @@ def get_id_token(url: str) -> str:
)


def convert_date(date_string: str) -> str:
Yuan325 marked this conversation as resolved.
Show resolved Hide resolved
"""Convert date into appropriate date string"""
if date_string == "tomorrow":
converted = date.today() + timedelta(1)
elif date_string == "yesterday":
converted = date.today() - timedelta(1)
elif date_string != "null" and date_string != "today" and date_string is not None:
converted = dparser.parse(date_string, fuzzy=True).date()
else:
converted = date.today()

return converted.strftime("%Y-%m-%d")


def get_header() -> Optional[dict]:
if "http://" in BASE_URL:
return None
Expand Down Expand Up @@ -139,8 +125,8 @@ async def init_agent() -> UserAgent:
format_instructions = FORMAT_INSTRUCTIONS.format(
tool_names=tool_names,
)
date = convert_date("today")
today = f"Today is {date}."
today_date = date.today().strftime("%Y-%m-%d")
today = f"Today is {today_date}."
template = "\n\n".join([PREFIX, tool_strings, format_instructions, SUFFIX, today])
human_message_template = "{input}\n\n{agent_scratchpad}"
prompt = ChatPromptTemplate.from_messages(
Expand Down
23 changes: 12 additions & 11 deletions langchain_tools_demo/tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ class AirportSearchInput(BaseModel):

async def generate_search_airports(client: aiohttp.ClientSession):
async def search_airports(country: str, city: str, name: str):
params = {
"country": country,
"city": city,
"name": name,
}
response = await client.get(
url=f"{BASE_URL}/airports/search",
params={
"country": country,
"city": city,
"name": name,
},
url=f"{BASE_URL}/airports/search", params=filter_none_values(params)
)

num = 2
Expand Down Expand Up @@ -118,9 +118,9 @@ class ListFlights(BaseModel):

async def generate_list_flights(client: aiohttp.ClientSession):
async def list_flights(
departure_airport: Optional[str],
arrival_airport: Optional[str],
date: Optional[str],
departure_airport: str,
arrival_airport: str,
date: str,
):
params = {
"departure_airport": departure_airport,
Expand Down Expand Up @@ -176,7 +176,8 @@ async def search_amenities(query: str):
B1 B2 B3 C1 C2 C3. Gate A3 is close to A2 and B1.
"""
response = await client.get(
url=f"{BASE_URL}/amenities/search", params={"top_k": "5", "query": query}
url=f"{BASE_URL}/amenities/search",
params={"top_k": "5", "query": query},
)

response = await response.json()
Expand All @@ -198,7 +199,7 @@ async def initialize_tools(client: aiohttp.ClientSession):
args_schema=AirportIdInput,
),
StructuredTool.from_function(
coroutine=generate_search_airports,
coroutine=await generate_search_airports(client),
name="Search Airport",
description="""
Use this tool to list all airports matching search criteria.
Expand Down