daveadmin/dobetternorge-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tools): route quick/pro tiers to Haiku/Sonnet on Bedrock

Browse Source 
Tier engine strings (claude_haiku/claude_sonnet) were stripped back to
azure_mini by per-method whitelists, so both tiers ran gpt-4o-mini and Pro
charged 2x for the same model. Add a shared DbnBedrockModelRouter::
deploymentForEngine() helper and route the cloud path through it across
summarize, ask, barnevernet, discrepancy, deep-research, and korrespond.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
davegilligan
2026-06-15 17:35:22 +02:00
parent a8b1bb87a6
commit a4b5b6e3f2
6 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/korrespond.php
+1 -1
View File
@@ -173,7 +173,7 @@ try {
$ftUid = dbnToolsFreeTierCheck('korrespond'); $ftUid = dbnToolsFreeTierCheck('korrespond');
$engine = ToolModels::engineForUser($ftUid, 'azure_mini'); $engine = ToolModels::engineForUser($ftUid, 'azure_mini');
$inputEngine = (string)($input['engine'] ?? ''); $inputEngine = (string)($input['engine'] ?? '');
if (in_array($inputEngine, ['azure_mini', 'claude_sonnet'], true)) { if (in_array($inputEngine, ['azure_mini', 'claude_haiku', 'claude_sonnet'], true)) {
$engine = $inputEngine; $engine = $inputEngine;
} }
$run = ['credits' => null, 'metadata' => []]; $run = ['credits' => null, 'metadata' => []];
includes/BvjAnalyzerAgent.php
+4 -6
View File
@@ -75,7 +75,7 @@ final class DbnBvjAnalyzerAgent
string $additionalNotes = '', string $additionalNotes = '',
?callable $emit = null ?callable $emit = null
): array { ): array {
$engine = in_array($engine, ['azure_mini', 'azure_full', 'gpu'], true) $engine = in_array($engine, ['azure_mini', 'azure_full', 'gpu', 'claude_haiku', 'claude_sonnet'], true)
? $engine : 'azure_mini'; ? $engine : 'azure_mini';
$language = dbnToolsNormalizeUiLanguage($language); $language = dbnToolsNormalizeUiLanguage($language);
$controls = $this->normalizeControls($controls); $controls = $this->normalizeControls($controls);
@@ -941,11 +941,11 @@ PROMPT;
]; ];
$opts = ['json' => true, 'temperature' => $temperature, 'max_tokens' => 4500, 'timeout' => 240]; $opts = ['json' => true, 'temperature' => $temperature, 'max_tokens' => 4500, 'timeout' => 240];
$cloudDeploy = DbnBedrockModelRouter::deploymentForEngine($engine, $this->azure instanceof DbnBedrockGateway);
$deployLabel = match ($engine) { $deployLabel = match ($engine) {
'gpu' => 'GPU (cuttlefish)', 'gpu' => 'GPU (cuttlefish)',
'dbn_legal_v3' => 'dbn-legal-agent-v3', 'dbn_legal_v3' => 'dbn-legal-agent-v3',
'azure_full' => 'gpt-4o', default => $cloudDeploy,
default => $this->azure->chatDeployment(),
}; };
$raw = ''; $raw = '';
@@ -956,10 +956,8 @@ PROMPT;
} elseif ($engine === 'gpu') { } elseif ($engine === 'gpu') {
$response = dbnToolsCallGpuLlm($messages, $opts); $response = dbnToolsCallGpuLlm($messages, $opts);
$raw = (string)($response['choices'][0]['message']['content'] ?? ''); $raw = (string)($response['choices'][0]['message']['content'] ?? '');
} elseif ($engine === 'azure_full') {
$raw = $this->azure->withDeployment('gpt-4o')->chatText($messages, $opts);
} else { } else {
$raw = $this->azure->chatText($messages, $opts); $raw = $this->azure->withDeployment($cloudDeploy)->chatText($messages, $opts);
} }
} catch (Throwable $e) { } catch (Throwable $e) {
dbnToolsAbort('Synthesis LLM request failed: ' . $e->getMessage(), 502, 'llm_error'); dbnToolsAbort('Synthesis LLM request failed: ' . $e->getMessage(), 502, 'llm_error');
includes/DbnBedrockModelRouter.php
+16
View File
@@ -73,6 +73,22 @@ final class DbnBedrockModelRouter
return $route['model'] ?? self::LITELLM_SONNET; return $route['model'] ?? self::LITELLM_SONNET;
} }
/**
* Maps a quality-tier engine string to the LiteLLM deployment name passed to
* withDeployment(). claude_haiku/claude_sonnet route to Bedrock Claude when the
* active gateway is Bedrock; otherwise they degrade to the Azure GPT-4o family.
*/
public static function deploymentForEngine(string $engine, bool $isBedrock): string
{
switch ($engine) {
case 'claude_sonnet': return $isBedrock ? self::LITELLM_SONNET : 'gpt-4o';
case 'claude_haiku': return $isBedrock ? self::LITELLM_HAIKU : 'gpt-4o-mini';
case 'azure_full': return 'gpt-4o';
case 'azure_mini':
default: return 'gpt-4o-mini';
}
}
public static function supportsThinking(string $modelName): bool public static function supportsThinking(string $modelName): bool
{ {
return in_array($modelName, self::THINKING_MODELS, true); return in_array($modelName, self::THINKING_MODELS, true);
includes/DeepResearchAgent.php
+5 -5
View File
@@ -1167,11 +1167,11 @@ PROMPT;
} elseif ($engine === 'azure_full') { } elseif ($engine === 'azure_full') {
$raw = $this->azure->withDeployment('gpt-4o')->chatText($messages, $opts); $raw = $this->azure->withDeployment('gpt-4o')->chatText($messages, $opts);
$deployLabel = 'gpt-4o'; $deployLabel = 'gpt-4o';
} elseif ($engine === 'azure_mini' && $this->azure instanceof DbnBedrockGateway) { } elseif ($engine === 'claude_haiku' || ($engine === 'azure_mini' && $this->azure instanceof DbnBedrockGateway)) {
// When Bedrock enabled, azure_mini → Haiku (fast, ~20-50s synthesis) // Quick tier (claude_haiku) and azure_mini-under-Bedrock → Haiku (fast, ~20-50s synthesis)
$haiku = $this->azure->withDeployment(DbnBedrockModelRouter::LITELLM_HAIKU); $deploy = DbnBedrockModelRouter::deploymentForEngine('claude_haiku', $this->azure instanceof DbnBedrockGateway);
$raw = $haiku->chatText($messages, array_merge($opts, ['timeout' => 90])); $raw = $this->azure->withDeployment($deploy)->chatText($messages, array_merge($opts, ['timeout' => 90]));
$deployLabel = 'Claude Haiku 4.5 (AWS Bedrock)'; $deployLabel = $deploy;
$thinkingTrace = null; $thinkingTrace = null;
} elseif ($engine === 'claude_sonnet' || ($this->azure instanceof DbnBedrockGateway)) { } elseif ($engine === 'claude_sonnet' || ($this->azure instanceof DbnBedrockGateway)) {
if ( if (
includes/DiscrepancyAgent.php
+4 -6
View File
@@ -49,7 +49,7 @@ final class DbnDiscrepancyAgent
array $sliceSelection, array $sliceSelection,
?callable $emit = null ?callable $emit = null
): array { ): array {
$engine = in_array($engine, ['azure_mini', 'azure_full', 'gpu'], true) ? $engine : 'azure_mini'; $engine = in_array($engine, ['azure_mini', 'azure_full', 'gpu', 'claude_haiku', 'claude_sonnet'], true) ? $engine : 'azure_mini';
$language = dbnToolsNormalizeUiLanguage($language); $language = dbnToolsNormalizeUiLanguage($language);
$textA = mb_substr((string)($fileA['text'] ?? ''), 0, self::MAX_DOC_CHARS, 'UTF-8'); $textA = mb_substr((string)($fileA['text'] ?? ''), 0, self::MAX_DOC_CHARS, 'UTF-8');
@@ -754,11 +754,11 @@ PROMPT;
): array { ): array {
$locale = dbnToolsLanguageName($language); $locale = dbnToolsLanguageName($language);
$sourceCount = count($numberedSources); $sourceCount = count($numberedSources);
$cloudDeploy = DbnBedrockModelRouter::deploymentForEngine($engine, $this->azure instanceof DbnBedrockGateway);
$deployLabel = match ($engine) { $deployLabel = match ($engine) {
'gpu' => 'GPU (cuttlefish)', 'gpu' => 'GPU (cuttlefish)',
'dbn_legal_v3' => 'dbn-legal-agent-v3', 'dbn_legal_v3' => 'dbn-legal-agent-v3',
'azure_full' => 'gpt-4o', default => $cloudDeploy,
default => $this->azure->chatDeployment(),
}; };
if (empty($numberedSources)) { if (empty($numberedSources)) {
@@ -872,10 +872,8 @@ PROMPT;
} elseif ($engine === 'gpu') { } elseif ($engine === 'gpu') {
$response = dbnToolsCallGpuLlm($messages, $opts); $response = dbnToolsCallGpuLlm($messages, $opts);
$raw = (string)($response['choices'][0]['message']['content'] ?? ''); $raw = (string)($response['choices'][0]['message']['content'] ?? '');
} elseif ($engine === 'azure_full') {
$raw = $this->azure->withDeployment('gpt-4o')->chatText($messages, $opts);
} else { } else {
$raw = $this->azure->chatText($messages, $opts); $raw = $this->azure->withDeployment($cloudDeploy)->chatText($messages, $opts);
} }
} catch (Throwable $e) { } catch (Throwable $e) {
dbnToolsAbort('Synthesis LLM request failed: ' . $e->getMessage(), 502, 'llm_error'); dbnToolsAbort('Synthesis LLM request failed: ' . $e->getMessage(), 502, 'llm_error');
includes/LegalTools.php
+7 -9
View File
@@ -212,7 +212,7 @@ final class DbnLegalToolsService
public function ask(string $question, string $language = 'en', string $engine = 'azure_mini', ?string $persona = null): array public function ask(string $question, string $language = 'en', string $engine = 'azure_mini', ?string $persona = null): array
{ {
$engine = in_array($engine, ['azure_mini', 'azure_full'], true) ? $engine : 'azure_mini'; $engine = in_array($engine, ['azure_mini', 'azure_full', 'claude_haiku', 'claude_sonnet'], true) ? $engine : 'azure_mini';
$client = dbnToolsRequireClient(); $client = dbnToolsRequireClient();
$personaResolved = dbnToolsResolvePersona((int)$client['id'], $persona); $personaResolved = dbnToolsResolvePersona((int)$client['id'], $persona);
$search = $this->search($question, $language, 7, 'disabled', null, 'both', $personaResolved['slug']); $search = $this->search($question, $language, 7, 'disabled', null, 'both', $personaResolved['slug']);
@@ -1231,7 +1231,7 @@ PROMPT;
error_log('[dbn-persona] gateway init failed for model ' . $model . ': ' . $e->getMessage()); error_log('[dbn-persona] gateway init failed for model ' . $model . ': ' . $e->getMessage());
} }
} }
return [$this->azure, ($engine === 'azure_full') ? 'gpt-4o' : 'gpt-4o-mini']; return [$this->azure, DbnBedrockModelRouter::deploymentForEngine($engine, $this->azure instanceof DbnBedrockGateway)];
} }
/** /**
@@ -2060,7 +2060,7 @@ PROMPT;
string $depth = 'standard' string $depth = 'standard'
): array { ): array {
$text = $this->requirePasteText($text); $text = $this->requirePasteText($text);
$engine = in_array($engine, ['azure_mini', 'azure_full', 'gpu'], true) ? $engine : 'azure_mini'; $engine = in_array($engine, ['azure_mini', 'azure_full', 'gpu', 'claude_haiku', 'claude_sonnet'], true) ? $engine : 'azure_mini';
$locale = dbnToolsLanguageName($language); $locale = dbnToolsLanguageName($language);
@@ -2114,7 +2114,7 @@ PROMPT;
['role' => 'system', 'content' => $system], ['role' => 'system', 'content' => $system],
['role' => 'user', 'content' => $prompt], ['role' => 'user', 'content' => $prompt],
]; ];
$maxTok = ($engine === 'azure_full') ? 8000 : 4000; $maxTok = in_array($engine, ['azure_full', 'claude_sonnet'], true) ? 8000 : 4000;
$chatOpts = ['json' => true, 'temperature' => 0.1, 'max_tokens' => $maxTok, 'timeout' => 120]; $chatOpts = ['json' => true, 'temperature' => 0.1, 'max_tokens' => $maxTok, 'timeout' => 120];
$deployLabel = $this->azure->chatDeployment(); $deployLabel = $this->azure->chatDeployment();
@@ -2122,12 +2122,10 @@ PROMPT;
if ($engine === 'gpu') { if ($engine === 'gpu') {
$response = $this->callGpuLlm($messages, $chatOpts); $response = $this->callGpuLlm($messages, $chatOpts);
$deployLabel = 'GPU (local)'; $deployLabel = 'GPU (local)';
} elseif ($engine === 'azure_full') {
$response = $this->azure->withDeployment('gpt-4o')->chat($messages, $chatOpts);
$deployLabel = 'gpt-4o';
} else { } else {
$response = $this->azure->withDeployment('gpt-4o-mini')->chat($messages, $chatOpts); $deploy = DbnBedrockModelRouter::deploymentForEngine($engine, $this->azure instanceof DbnBedrockGateway);
$deployLabel = 'gpt-4o-mini'; $response = $this->azure->withDeployment($deploy)->chat($messages, $chatOpts);
$deployLabel = $deploy;
} }
} catch (Throwable $e) { } catch (Throwable $e) {
dbnToolsAbort('LLM request failed: ' . $e->getMessage(), 502, 'llm_error'); dbnToolsAbort('LLM request failed: ' . $e->getMessage(), 502, 'llm_error');