Skip to content

Commit 1b349eb

Browse files
Revert "small fixed for agent and chat (#34)" (#35)
This reverts commit aa39dcc.
1 parent aa39dcc commit 1b349eb

File tree

3 files changed

+5
-25
lines changed

3 files changed

+5
-25
lines changed

assistant/core/agents.py

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
from pydantic_ai import Agent
88
from pydantic_ai.common_tools.tavily import tavily_search_tool
99
from pydantic_ai.messages import ModelMessage, ModelResponse, ThinkingPart
10-
from pydantic_ai.settings import ModelSettings
11-
from pydantic_ai.usage import UsageLimitExceeded, UsageLimits
1210

1311
from assistant.core.models import ModelFactory
1412
from assistant.core.schemas import Deps, ExperimentDefinition, OrchestrationResult, RouterOutput
@@ -73,7 +71,6 @@ def _create_experiment_creator_agent(self) -> Agent[Deps, ExperimentDefinition]:
7371
instructions=load_prompt("experiment_creator_instructions.md").render(),
7472
output_type=ExperimentDefinition,
7573
deps_type=Deps,
76-
model_settings=ModelSettings(max_tokens=10_000),
7774
tools=[
7875
retrieve_metrics_docs,
7976
],
@@ -92,7 +89,6 @@ def _create_internal_database_agent(self) -> Agent[Deps, str]:
9289
instructions=load_prompt("sql_expert_instructions.md").render(),
9390
output_type=str,
9491
deps_type=Deps,
95-
model_settings=ModelSettings(max_tokens=10_000),
9692
tools=[
9793
retrieve_internal_db,
9894
],
@@ -112,7 +108,6 @@ def _create_experiment_analyst_agent(self) -> Agent[Deps, str]:
112108
instructions=load_prompt("experiment_analyst_instructions.md").render(),
113109
output_type=str,
114110
deps_type=Deps,
115-
model_settings=ModelSettings(max_tokens=20_000),
116111
tools=[
117112
get_expanto_app_context,
118113
],
@@ -132,7 +127,6 @@ def _create_internet_search_agent(self) -> Agent[Deps, str]:
132127
instructions=load_prompt("internet_search_instructions.md").render(),
133128
output_type=str,
134129
deps_type=Deps,
135-
model_settings=ModelSettings(max_tokens=10_000),
136130
tools=[tavily_search_tool(self.tavily_api_key)],
137131
)
138132

@@ -145,7 +139,6 @@ def _create_expanto_assistant(self) -> Agent[Deps, str]:
145139
instructions="Use as many tool call as you needed",
146140
output_type=str,
147141
deps_type=Deps,
148-
model_settings=ModelSettings(max_tokens=20_000),
149142
tools=[
150143
retrieve_relevant_docs,
151144
retrieve_codebase_docs,
@@ -167,7 +160,6 @@ def _create_universal_agent(self) -> Agent[Deps, str]:
167160
"Use any tools if you need to answer user question or execute user task",
168161
output_type=str,
169162
deps_type=Deps,
170-
model_settings=ModelSettings(max_tokens=20_000),
171163
tools=[
172164
retrieve_metrics_docs,
173165
retrieve_relevant_docs,
@@ -255,17 +247,7 @@ async def process(self, user_input: str, deps: Deps, message_history: list[Any])
255247
selected_agent = self.agent_manager.get_agent(route_id=route_output.route_id)
256248
logger.info(f"Router decision: {route_output.route_id} → Selected: {selected_agent.name}")
257249
try:
258-
usage_limits = UsageLimits(
259-
request_limit=5,
260-
)
261-
response = await selected_agent.run(
262-
user_input, deps=deps, message_history=message_history, usage_limits=usage_limits
263-
)
264-
except UsageLimitExceeded:
265-
response = await selected_agent.run(
266-
"You working too long. Return final answer", deps=deps, message_history=message_history
267-
)
268-
250+
response = await selected_agent.run(user_input, deps=deps, message_history=message_history)
269251
except Exception as e:
270252
logger.error(f"Agent {selected_agent.name} failed: {e}")
271253
logger.info("Falling back to Multipurpose agent")

src/ui/chat/chat.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import streamlit as st
1313

1414
from src.settings import AssistantServiceCfg
15-
from src.ui.chat.elements import MessageHistoryContainer, TokenUsageBar, UserInputField
15+
from src.ui.chat.elements import MessageHistoryContainer, TokenUsageBar, UserInputField, chat_scroll
1616
from src.ui.chat.schemas import MessageType, Role
1717
from src.ui.chat.services import ChatController, HttpAssistantService
1818
from src.ui.resources import load_assistant_service_cfg
@@ -63,7 +63,7 @@ def render() -> None:
6363
UserInputField.render(controller) # if user input: save to chat state and rerun
6464

6565
# Handle input and response logic
66-
run_every = 1.5 if chat_state.future_result else None
66+
run_every = 0.5 if chat_state.future_result else None
6767

6868
@st.fragment(run_every=run_every)
6969
def handle_future_response(placeholder):
@@ -87,5 +87,6 @@ def handle_future_response(placeholder):
8787
st.rerun()
8888
else:
8989
placeholder.show_status()
90+
chat_scroll()
9091

9192
handle_future_response(agent_placeholder)

tests/assistant/test_agents.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
)
1717
from pydantic_ai.models.test import TestModel
1818
from pydantic_ai.result import StreamedRunResult
19-
from pydantic_ai.usage import UsageLimits
2019

2120
from assistant.core.agents import AgentManager, AgentOrchestrator
2221
from assistant.core.models import ModelFactory
@@ -339,6 +338,4 @@ def get_agent_side_effect(route_id):
339338
assert result.output == mock_output_content
340339
mock_agent_manager.get_agent.assert_any_call(route_id="route")
341340
mock_agent_manager.get_agent.assert_any_call(route_id="universal")
342-
mock_agent.run.assert_awaited_once_with(
343-
mock_user_input, deps=deps, message_history=[], usage_limits=UsageLimits(request_limit=5)
344-
)
341+
mock_agent.run.assert_awaited_once_with(mock_user_input, deps=deps, message_history=[])

0 commit comments

Comments
 (0)