Skip to content

Commit 598e83d

Browse files
authored
Merge pull request #56 from zhujian0805/main
Normalize Droid model defaults
2 parents e396234 + e97b015 commit 598e83d

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

code_assistant_manager/tools/droid.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,19 +211,19 @@ def _build_models_json(self, entries: List[str]) -> List[dict]:
211211
parts = entry.split("|")
212212
if len(parts) < 5:
213213
continue
214-
display, base_url, api_key, provider, max_tokens = parts[:5]
214+
display, base_url, api_key, provider, *_ = parts
215215
model_id = display.split("[")[0].strip()
216-
try:
217-
max_tokens_val = int(max_tokens)
218-
except ValueError:
219-
max_tokens_val = 0
216+
provider_value = (provider or "").strip() or "generic-chat-completion-api"
217+
if "claude" in model_id.lower():
218+
provider_value = "anthropic"
219+
max_tokens_val = 64000
220220
models.append(
221221
{
222222
"displayName": display,
223223
"model": model_id,
224224
"baseUrl": base_url,
225225
"apiKey": api_key,
226-
"provider": provider or "generic-chat-completion-api",
226+
"provider": provider_value,
227227
"maxOutputTokens": max_tokens_val,
228228
}
229229
)

tests/test_tools.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,17 @@ def test_droid_build_models_json(self, config_manager):
186186
"""Test building models JSON for Droid."""
187187
tool = DroidTool(config_manager)
188188
entries = [
189-
"model1 [ep1]|https://api.com|key|provider|16384",
190-
"model2 [ep2]|https://api2.com|key2|provider|65536",
189+
"model1 [ep1]|https://api.com|key||16384",
190+
"claude-3 [ep2]|https://api2.com|key2|provider|65536",
191191
]
192192
models = tool._build_models_json(entries)
193193
assert len(models) == 2
194194
assert models[0]["model"] == "model1"
195195
assert models[0]["baseUrl"] == "https://api.com"
196-
assert models[1]["maxOutputTokens"] == 65536
196+
assert models[0]["maxOutputTokens"] == 64000
197+
assert models[1]["maxOutputTokens"] == 64000
198+
assert models[0]["provider"] == "generic-chat-completion-api"
199+
assert models[1]["provider"] == "anthropic"
197200

198201
@patch.dict(os.environ, {"CODE_ASSISTANT_MANAGER_NONINTERACTIVE": "1"})
199202
def test_droid_process_endpoint_prefers_api_key_env_reference(self, config_manager):

0 commit comments

Comments
 (0)