From 63f7e41df307c3347606c00d8e10316090a65efa Mon Sep 17 00:00:00 2001
From: bangonicdd <157843588+bangonicdd2@users.noreply.github.com>
Date: Tue, 25 Feb 2025 17:43:13 +0900
Subject: [PATCH] feat: aws sonnet 3.7 + legacy

---
 src/ts/model/modellist.ts | 51 ++++++++++++++++++++++++++++++++
 src/ts/process/request.ts | 62 +++++++++++++++++++++++++++++++--------
 2 files changed, 101 insertions(+), 12 deletions(-)

diff --git a/src/ts/model/modellist.ts b/src/ts/model/modellist.ts
index 5dd21248..a1bcd6f6 100644
--- a/src/ts/model/modellist.ts
+++ b/src/ts/model/modellist.ts
@@ -745,6 +745,20 @@ export const LLMModels: LLMModel[] = [
         parameters: ClaudeParameters,
         tokenizer: LLMTokenizer.Claude
     },
+    {
+        name: 'Claude 3.7 Sonnet (20250219) v1',
+        id: 'anthropic.claude-3-7-sonnet-20250219-v1:0',
+        provider: LLMProvider.AWS,
+        format: LLMFormat.AWSBedrockClaude,
+        flags: [
+            LLMFlags.hasPrefill,
+            LLMFlags.hasImageInput,
+            LLMFlags.hasFirstSystemPrompt,
+            LLMFlags.claudeThinking
+        ],
+        parameters: [...ClaudeParameters, 'thinking_tokens'],
+        tokenizer: LLMTokenizer.Claude
+    },
     {
         name: 'Claude 3.5 Sonnet (20241022) v2',
         id: 'anthropic.claude-3-5-sonnet-20241022-v2:0',
@@ -772,6 +786,43 @@ export const LLMModels: LLMModel[] = [
         parameters: ClaudeParameters,
         tokenizer: LLMTokenizer.Claude
     },
+    {
+        name: 'Claude 3 Sonnet (20240229) v1',
+        id: 'anthropic.claude-3-sonnet-20240229-v1:0',
+        provider: LLMProvider.AWS,
+        format: LLMFormat.AWSBedrockClaude,
+        flags: [
+            LLMFlags.hasPrefill,
+            LLMFlags.hasImageInput,
+            LLMFlags.hasFirstSystemPrompt
+        ],
+        parameters: ClaudeParameters,
+        tokenizer: LLMTokenizer.Claude
+    },
+    {
+        name: 'Claude 2.1',
+        id: 'anthropic.claude-v2:1',
+        provider: LLMProvider.AWS,
+        format: LLMFormat.AWSBedrockClaude,
+        flags: [
+            LLMFlags.hasPrefill,
+            LLMFlags.hasFirstSystemPrompt
+        ],
+        parameters: ClaudeParameters,
+        tokenizer: LLMTokenizer.Claude
+    },
+    {
+        name: 'Claude 2',
+        id: 'anthropic.claude-v2',
+        provider: LLMProvider.AWS,
+        format: LLMFormat.AWSBedrockClaude,
+        flags: [
+            LLMFlags.hasPrefill,
+            LLMFlags.hasFirstSystemPrompt
+        ],
+        parameters: ClaudeParameters,
+        tokenizer: LLMTokenizer.Claude
+    },
     {
         name: 'Ooba',
         id: 'ooba',
diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts
index 10575bf2..02f53e44 100644
--- a/src/ts/process/request.ts
+++ b/src/ts/process/request.ts
@@ -2594,18 +2594,17 @@ async function requestClaude(arg:RequestDataArgumentExtended):Promise<requestDat
         const host = AMZ_HOST.replace("%REGION%", region);
         const stream = false;   // todo?
         
-        const awsModel = "us." + arg.modelInfo.internalID;
+        const awsModel = !arg.modelInfo.internalID.includes("claude-v2") ? "us." + arg.modelInfo.internalID : arg.modelInfo.internalID;
         const url = `https://${host}/model/${awsModel}/invoke${stream ? "-with-response-stream" : ""}`
 
-        const params = {
-            messages : claudeChat,
-            system: systemPrompt.trim(),
-            max_tokens: maxTokens,
-            // stop_sequences: null,
-            temperature: arg.temperature,
-            top_p: db.top_p,
-            top_k: db.top_k,
-            anthropic_version: "bedrock-2023-05-31",
+        let params = {...body}
+        params.anthropic_version = "bedrock-2023-05-31"
+        delete params.model
+        delete params.stream
+        if (params.thinking?.type === "enabled"){
+            params.temperature = 1.0
+            delete params.top_k
+            delete params.top_p
         }
 
         const rq = new HttpRequest({
@@ -2650,10 +2649,49 @@ async function requestClaude(arg:RequestDataArgumentExtended):Promise<requestDat
                 result: JSON.stringify(res.data.error)
             }
         }
+        const contents = res?.data?.content
+        if(!contents || contents.length === 0){
+            return {
+                type: 'fail',
+                result: JSON.stringify(res.data)
+            }
+        }
+        let resText = ''
+        let thinking = false
+        for(const content of contents){
+            if(content.type === 'text'){
+                if(thinking){
+                    resText += "</Thoughts>\n\n"
+                    thinking = false
+                }
+                resText += content.text
+            }
+            if(content.type === 'thinking'){
+                if(!thinking){
+                    resText += "<Thoughts>\n"
+                    thinking = true
+                }
+                resText += content.thinking ?? ''
+            }
+            if(content.type === 'redacted_thinking'){
+                if(!thinking){
+                    resText += "<Thoughts>\n"
+                    thinking = true
+                }
+                resText += '\n{{redacted_thinking}}\n'
+            }
+        }
+    
+    
+        if(arg.extractJson && db.jsonSchemaEnabled){
+            return {
+                type: 'success',
+                result: extractJSON(resText, db.jsonSchema)
+            }
+        }
         return {
             type: 'success',
-            result: res.data.content[0].text
-        
+            result: resText
         }
     }