@yourgpt/llm-sdk 2.0.1 → 2.0.2-beta.2

package/dist/adapters/index.js

@@ -361,29 +361,60 @@ var OpenAIAdapter = class {
         request.systemPrompt
       );
     }
-    const tools = request.actions?.length ? formatTools(request.actions) : void 0;
+    const tools = request.actions?.length ? formatTools(request.actions) : [];
+    const webSearchConfig = request.webSearch ?? this.config.webSearch;
+    if (webSearchConfig) {
+      const webSearchTool = {
+        type: "web_search_preview"
+      };
+      const wsConfig = typeof webSearchConfig === "object" ? webSearchConfig : {};
+      if (wsConfig.userLocation) {
+        webSearchTool.search_context_size = "medium";
+      }
+      tools.push(webSearchTool);
+    }
     const messageId = generateMessageId();
     yield { type: "message:start", id: messageId };
     try {
       const stream = await client.chat.completions.create({
         model: request.config?.model || this.model,
         messages,
-        tools,
+        tools: tools.length > 0 ? tools : void 0,
         temperature: request.config?.temperature ?? this.config.temperature,
         max_tokens: request.config?.maxTokens ?? this.config.maxTokens,
         stream: true,
         stream_options: { include_usage: true }
       });
       let currentToolCall = null;
+      const collectedCitations = [];
+      let citationIndex = 0;
       let usage;
       for await (const chunk of stream) {
         if (request.signal?.aborted) {
           break;
         }
         const delta = chunk.choices[0]?.delta;
+        const choice = chunk.choices[0];
         if (delta?.content) {
           yield { type: "message:delta", content: delta.content };
         }
+        const annotations = delta?.annotations;
+        if (annotations && annotations.length > 0) {
+          for (const annotation of annotations) {
+            if (annotation.type === "url_citation" && annotation.url_citation?.url) {
+              citationIndex++;
+              const url = annotation.url_citation.url;
+              const domain = extractDomain(url);
+              collectedCitations.push({
+                index: citationIndex,
+                url,
+                title: annotation.url_citation.title || domain,
+                domain,
+                favicon: domain ? `https://www.google.com/s2/favicons?domain=${domain}&sz=32` : void 0
+              });
+            }
+          }
+        }
         if (delta?.tool_calls) {
           for (const toolCall of delta.tool_calls) {
             if (toolCall.id) {
@@ -416,7 +447,7 @@ var OpenAIAdapter = class {
             total_tokens: chunk.usage.total_tokens
           };
         }
-        if (chunk.choices[0]?.finish_reason) {
+        if (choice?.finish_reason) {
           if (currentToolCall) {
             yield {
               type: "action:args",
@@ -426,6 +457,10 @@ var OpenAIAdapter = class {
           }
         }
       }
+      if (collectedCitations.length > 0) {
+        const uniqueCitations = deduplicateCitations(collectedCitations);
+        yield { type: "citation", citations: uniqueCitations };
+      }
       yield { type: "message:end" };
       yield { type: "done", usage };
     } catch (error) {
@@ -437,6 +472,25 @@ var OpenAIAdapter = class {
     }
   }
 };
+function extractDomain(url) {
+  try {
+    const parsed = new URL(url);
+    return parsed.hostname;
+  } catch {
+    return "";
+  }
+}
+function deduplicateCitations(citations) {
+  const seen = /* @__PURE__ */ new Map();
+  let index = 0;
+  for (const citation of citations) {
+    if (!seen.has(citation.url)) {
+      index++;
+      seen.set(citation.url, { ...citation, index });
+    }
+  }
+  return Array.from(seen.values());
+}
 function createOpenAIAdapter(config) {
   return new OpenAIAdapter(config);
 }
@@ -635,14 +689,45 @@ var AnthropicAdapter = class {
         ) : {},
         required: action.parameters ? Object.entries(action.parameters).filter(([, param]) => param.required).map(([key]) => key) : []
       }
-    }));
+    })) || [];
+    const webSearchConfig = request.webSearch ?? this.config.webSearch;
+    let serverToolConfiguration;
+    if (webSearchConfig) {
+      tools.push({
+        type: "web_search_20260209",
+        name: "web_search",
+        allowed_callers: ["direct"]
+      });
+      const wsConfig = typeof webSearchConfig === "object" ? webSearchConfig : {};
+      const webSearchToolConfig = {};
+      if (wsConfig.maxUses !== void 0) {
+        webSearchToolConfig.max_uses = wsConfig.maxUses;
+      }
+      if (wsConfig.allowedDomains && wsConfig.allowedDomains.length > 0) {
+        webSearchToolConfig.allowed_domains = wsConfig.allowedDomains;
+      }
+      if (wsConfig.blockedDomains && wsConfig.blockedDomains.length > 0) {
+        webSearchToolConfig.blocked_domains = wsConfig.blockedDomains;
+      }
+      if (wsConfig.userLocation) {
+        webSearchToolConfig.user_location = wsConfig.userLocation;
+      }
+      if (Object.keys(webSearchToolConfig).length > 0) {
+        serverToolConfiguration = {
+          web_search: webSearchToolConfig
+        };
+      }
+    }
     const options = {
       model: request.config?.model || this.model,
       max_tokens: request.config?.maxTokens || this.config.maxTokens || 4096,
       system: systemMessage,
       messages,
-      tools: tools?.length ? tools : void 0
+      tools: tools.length ? tools : void 0
     };
+    if (serverToolConfiguration) {
+      options.server_tool_configuration = serverToolConfiguration;
+    }
     if (this.config.thinking?.type === "enabled") {
       options.thinking = {
         type: "enabled",
@@ -698,6 +783,8 @@ var AnthropicAdapter = class {
       const stream = await client.messages.stream(options);
       let currentToolUse = null;
       let isInThinkingBlock = false;
+      const collectedCitations = [];
+      let citationIndex = 0;
       let usage;
       for await (const event of stream) {
         if (request.signal?.aborted) {
@@ -726,11 +813,30 @@ var AnthropicAdapter = class {
                 name: event.content_block.name,
                 input: ""
               };
-              yield {
-                type: "action:start",
-                id: currentToolUse.id,
-                name: currentToolUse.name
-              };
+              if (currentToolUse.name !== "web_search") {
+                yield {
+                  type: "action:start",
+                  id: currentToolUse.id,
+                  name: currentToolUse.name
+                };
+              }
+            } else if (event.content_block.type === "web_search_tool_result") {
+              const webSearchResult = event.content_block;
+              if (webSearchResult.content && Array.isArray(webSearchResult.content)) {
+                for (const result of webSearchResult.content) {
+                  if (result.type === "web_search_result" && result.url) {
+                    citationIndex++;
+                    const domain = extractDomain2(result.url);
+                    collectedCitations.push({
+                      index: citationIndex,
+                      url: result.url,
+                      title: result.title || domain,
+                      domain,
+                      favicon: domain ? `https://www.google.com/s2/favicons?domain=${domain}&sz=32` : void 0
+                    });
+                  }
+                }
+              }
             } else if (event.content_block.type === "thinking") {
               isInThinkingBlock = true;
               yield { type: "thinking:start" };
@@ -739,6 +845,20 @@ var AnthropicAdapter = class {
           case "content_block_delta":
             if (event.delta.type === "text_delta") {
               yield { type: "message:delta", content: event.delta.text };
+            } else if (event.delta.type === "citations_delta") {
+              const citationsDelta = event.delta;
+              if (citationsDelta.citation?.url) {
+                citationIndex++;
+                const domain = extractDomain2(citationsDelta.citation.url);
+                collectedCitations.push({
+                  index: citationIndex,
+                  url: citationsDelta.citation.url,
+                  title: citationsDelta.citation.title || domain,
+                  citedText: citationsDelta.citation.cited_text,
+                  domain,
+                  favicon: domain ? `https://www.google.com/s2/favicons?domain=${domain}&sz=32` : void 0
+                });
+              }
             } else if (event.delta.type === "thinking_delta") {
               yield { type: "thinking:delta", content: event.delta.thinking };
             } else if (event.delta.type === "input_json_delta" && currentToolUse) {
@@ -747,11 +867,18 @@ var AnthropicAdapter = class {
             break;
           case "content_block_stop":
             if (currentToolUse) {
-              yield {
-                type: "action:args",
-                id: currentToolUse.id,
-                args: currentToolUse.input
-              };
+              if (currentToolUse.name !== "web_search") {
+                yield {
+                  type: "action:args",
+                  id: currentToolUse.id,
+                  args: currentToolUse.input
+                };
+                yield {
+                  type: "action:end",
+                  id: currentToolUse.id,
+                  name: currentToolUse.name
+                };
+              }
               currentToolUse = null;
             }
             if (isInThinkingBlock) {
@@ -763,6 +890,10 @@ var AnthropicAdapter = class {
             break;
         }
       }
+      if (collectedCitations.length > 0) {
+        const uniqueCitations = deduplicateCitations2(collectedCitations);
+        yield { type: "citation", citations: uniqueCitations };
+      }
       yield { type: "message:end" };
       yield { type: "done", usage };
     } catch (error) {
@@ -774,11 +905,136 @@ var AnthropicAdapter = class {
     }
   }
 };
+function extractDomain2(url) {
+  try {
+    const parsed = new URL(url);
+    return parsed.hostname;
+  } catch {
+    return "";
+  }
+}
+function deduplicateCitations2(citations) {
+  const seen = /* @__PURE__ */ new Map();
+  let index = 0;
+  for (const citation of citations) {
+    if (!seen.has(citation.url)) {
+      index++;
+      seen.set(citation.url, { ...citation, index });
+    }
+  }
+  return Array.from(seen.values());
+}
 function createAnthropicAdapter(config) {
   return new AnthropicAdapter(config);
 }
 
 // src/adapters/ollama.ts
+function extractBase64Data(data) {
+  if (data.startsWith("data:")) {
+    const commaIndex = data.indexOf(",");
+    if (commaIndex !== -1) {
+      return data.slice(commaIndex + 1);
+    }
+  }
+  return data;
+}
+async function downloadImageAsBase64(url) {
+  try {
+    const response = await fetch(url);
+    if (!response.ok) return null;
+    const buffer = await response.arrayBuffer();
+    const base64 = Buffer.from(buffer).toString("base64");
+    return base64;
+  } catch {
+    return null;
+  }
+}
+async function extractImagesFromAttachments(attachments) {
+  if (!attachments) return [];
+  const images = [];
+  for (const attachment of attachments) {
+    if (attachment.type !== "image") continue;
+    if (attachment.data) {
+      images.push(extractBase64Data(attachment.data));
+    } else if (attachment.url) {
+      const base64 = await downloadImageAsBase64(attachment.url);
+      if (base64) {
+        images.push(base64);
+      }
+    }
+  }
+  return images;
+}
+async function formatMessagesForOllama(messages, systemPrompt) {
+  const formatted = [];
+  if (systemPrompt) {
+    formatted.push({ role: "system", content: systemPrompt });
+  }
+  for (const msg of messages) {
+    const baseMessage = {
+      role: msg.role,
+      content: msg.content ?? ""
+    };
+    if (msg.role === "user" && msg.metadata?.attachments) {
+      const images = await extractImagesFromAttachments(
+        msg.metadata.attachments
+      );
+      if (images.length > 0) {
+        baseMessage.images = images;
+      }
+    }
+    if (msg.role === "assistant" && msg.tool_calls && msg.tool_calls.length > 0) {
+      baseMessage.tool_calls = msg.tool_calls.map((tc) => ({
+        id: tc.id,
+        function: {
+          name: tc.function.name,
+          arguments: JSON.parse(tc.function.arguments)
+        }
+      }));
+    }
+    if (msg.role === "tool" && msg.tool_call_id) {
+      baseMessage.tool_call_id = msg.tool_call_id;
+    }
+    formatted.push(baseMessage);
+  }
+  return formatted;
+}
+async function processRawMessagesForOllama(rawMessages, systemPrompt) {
+  const processed = [];
+  if (systemPrompt) {
+    const hasSystem = rawMessages.some((m) => m.role === "system");
+    if (!hasSystem) {
+      processed.push({ role: "system", content: systemPrompt });
+    }
+  }
+  for (const msg of rawMessages) {
+    const baseMessage = {
+      role: msg.role,
+      content: msg.content ?? ""
+    };
+    if (msg.role === "user" && msg.attachments && Array.isArray(msg.attachments)) {
+      const attachments = msg.attachments;
+      const images = await extractImagesFromAttachments(attachments);
+      if (images.length > 0) {
+        baseMessage.images = images;
+      }
+    }
+    if (msg.tool_calls && Array.isArray(msg.tool_calls)) {
+      baseMessage.tool_calls = msg.tool_calls.map((tc) => ({
+        id: tc.id,
+        function: {
+          name: tc.function.name,
+          arguments: typeof tc.function.arguments === "string" ? JSON.parse(tc.function.arguments) : tc.function.arguments
+        }
+      }));
+    }
+    if (msg.tool_call_id) {
+      baseMessage.tool_call_id = msg.tool_call_id;
+    }
+    processed.push(baseMessage);
+  }
+  return processed;
+}
 var OllamaAdapter = class {
   constructor(config = {}) {
     this.provider = "ollama";
@@ -787,10 +1043,32 @@ var OllamaAdapter = class {
     this.baseUrl = config.baseUrl || "http://localhost:11434";
   }
   async *stream(request) {
-    const messages = formatMessages(request.messages, request.systemPrompt);
+    let messages;
+    if (request.rawMessages && request.rawMessages.length > 0) {
+      messages = await processRawMessagesForOllama(
+        request.rawMessages,
+        request.systemPrompt
+      );
+    } else {
+      messages = await formatMessagesForOllama(
+        request.messages,
+        request.systemPrompt
+      );
+    }
+    const tools = request.actions?.length ? formatTools(request.actions) : void 0;
     const messageId = generateMessageId();
     yield { type: "message:start", id: messageId };
     try {
+      const ollamaOptions = {
+        temperature: request.config?.temperature ?? this.config.temperature
+      };
+      const maxTokens = request.config?.maxTokens ?? this.config.maxTokens;
+      if (maxTokens !== void 0) {
+        ollamaOptions.num_predict = maxTokens;
+      }
+      if (this.config.options) {
+        Object.assign(ollamaOptions, this.config.options);
+      }
       const response = await fetch(`${this.baseUrl}/api/chat`, {
         method: "POST",
         headers: {
@@ -799,16 +1077,15 @@ var OllamaAdapter = class {
         body: JSON.stringify({
           model: request.config?.model || this.model,
           messages,
+          tools,
           stream: true,
-          options: {
-            temperature: request.config?.temperature ?? this.config.temperature,
-            num_predict: request.config?.maxTokens ?? this.config.maxTokens
-          }
+          options: ollamaOptions
         }),
         signal: request.signal
       });
       if (!response.ok) {
-        throw new Error(`Ollama API error: ${response.status}`);
+        const errorText = await response.text().catch(() => "Unknown error");
+        throw new Error(`Ollama API error: ${response.status} - ${errorText}`);
       }
       if (!response.body) {
         throw new Error("No response body");
@@ -816,6 +1093,8 @@ var OllamaAdapter = class {
       const reader = response.body.getReader();
       const decoder = new TextDecoder();
       let buffer = "";
+      let hasEmittedToolCalls = false;
+      const toolCallsInProgress = /* @__PURE__ */ new Map();
       while (true) {
         const { done, value } = await reader.read();
         if (done) break;
@@ -829,6 +1108,28 @@ var OllamaAdapter = class {
             if (chunk.message?.content) {
               yield { type: "message:delta", content: chunk.message.content };
             }
+            if (chunk.message?.tool_calls && !hasEmittedToolCalls) {
+              for (let i = 0; i < chunk.message.tool_calls.length; i++) {
+                const toolCall = chunk.message.tool_calls[i];
+                const toolCallId = toolCall.id || generateToolCallId();
+                toolCallsInProgress.set(i, {
+                  id: toolCallId,
+                  name: toolCall.function?.name || "",
+                  arguments: toolCall.function?.arguments || {}
+                });
+                yield {
+                  type: "action:start",
+                  id: toolCallId,
+                  name: toolCall.function?.name || ""
+                };
+                yield {
+                  type: "action:args",
+                  id: toolCallId,
+                  args: JSON.stringify(toolCall.function?.arguments || {})
+                };
+              }
+              hasEmittedToolCalls = true;
+            }
             if (chunk.done) {
               break;
             }
@@ -842,10 +1143,20 @@ var OllamaAdapter = class {
       if (error.name === "AbortError") {
         yield { type: "done" };
       } else {
+        const errorMessage = error instanceof Error ? error.message : "Unknown error";
+        let code = "OLLAMA_ERROR";
+        let message = errorMessage;
+        if (errorMessage.includes("ECONNREFUSED") || errorMessage.includes("fetch failed")) {
+          message = `Cannot connect to Ollama at ${this.baseUrl}. Make sure Ollama is running (ollama serve).`;
+          code = "OLLAMA_CONNECTION_ERROR";
+        } else if (errorMessage.includes("model") && errorMessage.includes("not found")) {
+          message = `Model "${this.model}" not found. Pull it with: ollama pull ${this.model}`;
+          code = "OLLAMA_MODEL_NOT_FOUND";
+        }
         yield {
           type: "error",
-          message: error instanceof Error ? error.message : "Unknown error",
-          code: "OLLAMA_ERROR"
+          message,
+          code
         };
       }
     }
@@ -986,6 +1297,7 @@ var GoogleAdapter = class {
   async *stream(request) {
     const client = await this.getClient();
     const modelId = request.config?.model || this.model;
+    const webSearchConfig = request.webSearch ?? this.config.webSearch;
     const model = client.getGenerativeModel({
       model: modelId,
       safetySettings: this.config.safetySettings
@@ -1033,7 +1345,16 @@ var GoogleAdapter = class {
         mergedContents.push({ ...content, parts: [...content.parts] });
       }
     }
-    const tools = formatToolsForGemini(request.actions);
+    const functionTools = formatToolsForGemini(request.actions);
+    const toolsArray = [];
+    if (functionTools) {
+      toolsArray.push(functionTools);
+    }
+    if (webSearchConfig) {
+      toolsArray.push({
+        google_search: {}
+      });
+    }
     const messageId = generateMessageId();
     yield { type: "message:start", id: messageId };
     try {
@@ -1041,7 +1362,7 @@ var GoogleAdapter = class {
         history: mergedContents.slice(0, -1),
         // All but the last message
         systemInstruction: systemInstruction ? { parts: [{ text: systemInstruction }] } : void 0,
-        tools: tools ? [tools] : void 0,
+        tools: toolsArray.length > 0 ? toolsArray : void 0,
         generationConfig: {
           temperature: request.config?.temperature ?? this.config.temperature,
           maxOutputTokens: request.config?.maxTokens ?? this.config.maxTokens
@@ -1050,6 +1371,7 @@ var GoogleAdapter = class {
       const lastMessage = mergedContents[mergedContents.length - 1];
       const result = await chat.sendMessageStream(lastMessage.parts);
       let currentToolCall = null;
+      const collectedCitations = [];
       for await (const chunk of result.stream) {
         if (request.signal?.aborted) {
           break;
@@ -1091,6 +1413,24 @@ var GoogleAdapter = class {
             };
           }
         }
+        const groundingMetadata = candidate?.groundingMetadata;
+        if (groundingMetadata?.groundingChunks) {
+          for (const chunk2 of groundingMetadata.groundingChunks) {
+            if (chunk2.web?.uri) {
+              const url = chunk2.web.uri;
+              const domain = extractDomain3(url);
+              if (!collectedCitations.some((c) => c.url === url)) {
+                collectedCitations.push({
+                  index: collectedCitations.length + 1,
+                  url,
+                  title: chunk2.web.title || domain,
+                  domain,
+                  favicon: domain ? `https://www.google.com/s2/favicons?domain=${domain}&sz=32` : void 0
+                });
+              }
+            }
+          }
+        }
       }
       let usage;
       try {
@@ -1102,8 +1442,30 @@ var GoogleAdapter = class {
             total_tokens: response.usageMetadata.totalTokenCount || 0
           };
         }
+        const finalCandidate = response.candidates?.[0];
+        const finalGrounding = finalCandidate?.groundingMetadata;
+        if (finalGrounding?.groundingChunks) {
+          for (const chunk of finalGrounding.groundingChunks) {
+            if (chunk.web?.uri) {
+              const url = chunk.web.uri;
+              const domain = extractDomain3(url);
+              if (!collectedCitations.some((c) => c.url === url)) {
+                collectedCitations.push({
+                  index: collectedCitations.length + 1,
+                  url,
+                  title: chunk.web.title || domain,
+                  domain,
+                  favicon: domain ? `https://www.google.com/s2/favicons?domain=${domain}&sz=32` : void 0
+                });
+              }
+            }
+          }
+        }
       } catch {
       }
+      if (collectedCitations.length > 0) {
+        yield { type: "citation", citations: collectedCitations };
+      }
       yield { type: "message:end" };
       yield { type: "done", usage };
     } catch (error) {
@@ -1191,6 +1553,14 @@ var GoogleAdapter = class {
 function createGoogleAdapter(config) {
   return new GoogleAdapter(config);
 }
+function extractDomain3(url) {
+  try {
+    const parsed = new URL(url);
+    return parsed.hostname;
+  } catch {
+    return "";
+  }
+}
 
 // src/adapters/xai.ts
 var XAI_BASE_URL = "https://api.x.ai/v1";