Skip to content
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
3 changes: 2 additions & 1 deletion src/askui/chat/api/runs/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class RunCreate(BaseModel):

stream: bool = False
assistant_id: AssistantId
model: str | None = None


class RunStart(BaseModel):
Expand Down Expand Up @@ -146,7 +147,7 @@ def create(
thread_id=thread_id,
created_at=now(),
expires_at=now() + timedelta(minutes=10),
**params.model_dump(exclude={"stream"}),
**params.model_dump(exclude={"model", "stream"}),
)

@computed_field # type: ignore[prop-decorator]
Expand Down
11 changes: 8 additions & 3 deletions src/askui/chat/api/runs/runner/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import logging
from abc import ABC, abstractmethod
from datetime import datetime, timezone
from typing import Any

from anthropic.types.beta import BetaCacheControlEphemeralParam, BetaTextBlockParam
from anyio.abc import ObjectStream
Expand Down Expand Up @@ -34,7 +33,6 @@
)
from askui.chat.api.settings import Settings
from askui.custom_agent import CustomAgent
from askui.models.models import ModelName
from askui.models.shared.agent_message_param import MessageParam
from askui.models.shared.agent_on_message_cb import OnMessageCbParam
from askui.models.shared.settings import ActSettings, MessageSettings
Expand Down Expand Up @@ -67,6 +65,7 @@ def __init__(
mcp_client_manager_manager: McpClientManagerManager,
run_service: RunnerRunService,
settings: Settings,
model: str | None = None,
) -> None:
self._run_id = run_id
self._workspace_id = workspace_id
Expand All @@ -76,6 +75,7 @@ def __init__(
self._mcp_client_manager_manager = mcp_client_manager_manager
self._run_service = run_service
self._settings = settings
self._model: str | None = model

def _retrieve_run(self) -> Run:
return self._run_service.retrieve(
Expand Down Expand Up @@ -164,7 +164,7 @@ def _run_agent_inner() -> None:
)
betas = tools.retrieve_tool_beta_flags()
system = self._build_system()
model = self._settings.model
model = self._get_model()
messages = syncify(self._chat_history_manager.retrieve_message_params)(
workspace_id=self._workspace_id,
thread_id=self._thread_id,
Expand Down Expand Up @@ -269,3 +269,8 @@ async def run(

def _should_abort(self, run: Run) -> bool:
return run.status in ("cancelled", "cancelling", "expired")

def _get_model(self) -> str:
if self._model is not None:
return self._model
return self._settings.model
1 change: 1 addition & 0 deletions src/askui/chat/api/runs/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ async def create(
mcp_client_manager_manager=self._mcp_client_manager_manager,
run_service=self,
settings=self._settings,
model=params.model,
)

async def event_generator() -> AsyncGenerator[Event, None]:
Expand Down