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.

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

More Agent Utils #36

Merged
merged 11 commits into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion examples/demo_committee.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ async def vote_on_jokes(joke_a: str, joke_b: str) -> Dict[str, int]:
},
]
tasks = [
model(noop_callback, [flat_messages(messages)])
model(noop_callback, [flat_messages('input', messages)])
for model in COMMITTEE_MODELS
]
outputs = await asyncio.gather(*tasks)
Expand Down
13 changes: 9 additions & 4 deletions examples/demo_layered_agents.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from lasagna import (
known_models,
build_simple_agent,
build_standard_message_extractor,
)

from lasagna.tui import (
Expand Down Expand Up @@ -35,17 +36,21 @@ async def main() -> None:
tools = [
evaluate_math_expression,
],
message_extractor = build_standard_message_extractor(
strip_tool_messages = True,
system_prompt_override = "You are a math assistant.",
),
doc = "Use this tool if the user asks a math question.",
system_prompt_override = "You are a math assistant.",
strip_old_tool_use_messages = True,
)
health_agent = known_models.BIND_ANTHROPIC_claude_35_sonnet()(
build_simple_agent(
name = 'health_agent',
tools = [],
message_extractor = build_standard_message_extractor(
strip_tool_messages = True,
system_prompt_override = "You are a health coach who motivates through fear.",
),
doc = "Use this tool if the user asks a health question.",
system_prompt_override = "You are a health coach who motivates through fear.",
strip_old_tool_use_messages = True,
),
)
my_bound_agent = known_models.BIND_OPENAI_gpt_4o_mini()(
Expand Down
22 changes: 15 additions & 7 deletions examples/demo_structured_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,22 @@ class ExtractionModel(BaseModel):

async def main() -> None:
my_bound_agent = MODEL_BINDER(
build_extraction_agent(ExtractionModel),
build_extraction_agent(
name = 'extraction_agent',
extraction_type = ExtractionModel,
),
)
prev_runs = [flat_messages([
{
'role': 'human',
'text': PROMPT,
},
])]
prev_runs = [
flat_messages(
'input',
[
{
'role': 'human',
'text': PROMPT,
},
],
),
]

agent_run = await my_bound_agent(tui_event_callback, prev_runs)
print('DONE!')
Expand Down
9 changes: 8 additions & 1 deletion examples/demo_vision.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
known_models,
build_simple_agent,
flat_messages,
AgentRun,
Message,
)

Expand Down Expand Up @@ -35,7 +36,13 @@ async def main() -> None:
bound_agent = MODEL_BINDER(
build_simple_agent(name='agent'),
)
await bound_agent(tui_event_callback, [flat_messages(messages)])
prev_runs: List[AgentRun] = [
flat_messages(
'input',
messages,
),
]
await bound_agent(tui_event_callback, prev_runs)
print()


Expand Down
28 changes: 23 additions & 5 deletions src/lasagna/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,41 @@

from .agent_util import (
bind_model,
partial_bind_model,
recursive_extract_messages,
extract_last_message,
flat_messages,
override_system_prompt,
strip_tool_calls_and_results,
strip_all_but_last_human_message,
noop_callback,
MessageExtractor,
build_standard_message_extractor,
default_message_extractor,
build_simple_agent,
build_extraction_agent,
noop_callback,
extract_last_message,
build_agent_chainer,
build_agent_router,
)

__all__ = [
'run',
'bind_model',
'partial_bind_model',
'recursive_extract_messages',
'extract_last_message',
'flat_messages',
'override_system_prompt',
'strip_tool_calls_and_results',
'strip_all_but_last_human_message',
'noop_callback',
'MessageExtractor',
'build_standard_message_extractor',
'default_message_extractor',
'build_simple_agent',
'build_extraction_agent',
'noop_callback',
'extract_last_message',
'build_agent_chainer',
'build_agent_router',
]

__version__ = "0.9.1"
__version__ = "0.10.0"
2 changes: 0 additions & 2 deletions src/lasagna/agent_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ async def run(
prev_runs,
)

if 'agent' not in agent_run:
agent_run['agent'] = agent_name
if 'provider' not in agent_run:
agent_run['provider'] = provider_str
if 'model' not in agent_run:
Expand Down
Loading