|
28 | 28 | ToolCallReadyEvent, |
29 | 29 | ) |
30 | 30 | from simple_agent.agent import BridgedFunctionCall, SimpleAgent, ToolEvent, sanitize_text |
31 | | -from simple_agent.config import CODEX_PROXY_BASE_URL, CODEX_PROXY_PROVIDER_ID, DEFAULT_CODEX_PROXY_MODELS, Settings |
| 31 | +from simple_agent.config import ( |
| 32 | + CODEX_PROXY_BASE_URL, |
| 33 | + CODEX_PROXY_PROVIDER_ID, |
| 34 | + DEFAULT_CODEX_PROXY_MODELS, |
| 35 | + DEFAULT_CONTEXT_WORKBENCH_MODEL, |
| 36 | + DEFAULT_CONTEXT_WORKBENCH_PROVIDER_ID, |
| 37 | + Settings, |
| 38 | +) |
32 | 39 | from simple_agent.codex_tool_registry import ToolExecution |
33 | 40 | from simple_agent.provider_clients import ClaudeRESTClient, GeminiRESTClient |
34 | 41 | try: |
|
58 | 65 | ) |
59 | 66 |
|
60 | 67 | def context_workbench_settings_payload(settings: Settings) -> dict[str, object]: |
61 | | - default_context_model = sanitize_text(DEFAULT_CODEX_PROXY_MODELS[0].get("id") or "").strip() or "gpt-5.5" |
62 | 68 | return { |
63 | 69 | "context_workbench_model": sanitize_text(settings.context_workbench_model or "").strip() |
64 | | - or default_context_model, |
| 70 | + or DEFAULT_CONTEXT_WORKBENCH_MODEL, |
65 | 71 | "context_workbench_provider_id": sanitize_text( |
66 | 72 | settings.context_workbench_provider_id or "" |
67 | 73 | ).strip() |
68 | | - or CODEX_PROXY_PROVIDER_ID, |
| 74 | + or DEFAULT_CONTEXT_WORKBENCH_PROVIDER_ID, |
69 | 75 | "context_token_warning_threshold": int(settings.context_token_warning_threshold or 5000), |
70 | 76 | "context_token_critical_threshold": int(settings.context_token_critical_threshold or 10000), |
71 | 77 | "user_locale": sanitize_text(settings.user_locale or "").strip() or "en-US", |
@@ -155,8 +161,7 @@ def build_context_chat_runtime( |
155 | 161 | ) |
156 | 162 | ) |
157 | 163 |
|
158 | | - default_context_model = sanitize_text(DEFAULT_CODEX_PROXY_MODELS[0].get("id") or "").strip() or "gpt-5.5" |
159 | | - request_model = sanitize_text(settings.context_workbench_model or "").strip() or default_context_model |
| 164 | + request_model = sanitize_text(settings.context_workbench_model or "").strip() or DEFAULT_CONTEXT_WORKBENCH_MODEL |
160 | 165 | instructions = "\n".join( |
161 | 166 | [ |
162 | 167 | "You are a context-maintenance assistant for a Codex conversation.", |
@@ -358,12 +363,11 @@ def context_workbench_provider(settings: Settings) -> dict[str, Any]: |
358 | 363 | return provider |
359 | 364 |
|
360 | 365 | return { |
361 | | - "id": CODEX_PROXY_PROVIDER_ID, |
| 366 | + "id": DEFAULT_CONTEXT_WORKBENCH_PROVIDER_ID, |
362 | 367 | "name": "Codex", |
363 | 368 | "provider_type": "responses", |
364 | 369 | "api_base_url": CODEX_PROXY_BASE_URL, |
365 | | - "default_model": sanitize_text(DEFAULT_CODEX_PROXY_MODELS[0].get("id") or "").strip() |
366 | | - or "gpt-5.5", |
| 370 | + "default_model": DEFAULT_CONTEXT_WORKBENCH_MODEL, |
367 | 371 | } |
368 | 372 |
|
369 | 373 |
|
@@ -1313,8 +1317,7 @@ def context_workbench_provider_payloads(settings: Settings, *, refresh_models: b |
1313 | 1317 | "provider_type": "responses", |
1314 | 1318 | "enabled": True, |
1315 | 1319 | "api_base_url": CODEX_PROXY_BASE_URL, |
1316 | | - "default_model": sanitize_text(DEFAULT_CODEX_PROXY_MODELS[0].get("id") or "").strip() |
1317 | | - or "gpt-5.5", |
| 1320 | + "default_model": DEFAULT_CONTEXT_WORKBENCH_MODEL, |
1318 | 1321 | "models": DEFAULT_CODEX_PROXY_MODELS, |
1319 | 1322 | }, |
1320 | 1323 | settings, |
|
0 commit comments