illuma-agents 1.0.8 → 1.0.9

package/src/tools/search/utils.ts

@@ -1,79 +1,79 @@
-/* eslint-disable no-console */
-
-import type * as t from './types';
-
-/**
- * Singleton instance of the default logger
- */
-let defaultLoggerInstance: t.Logger | null = null;
-
-/**
- * Creates a default logger that maps to console methods
- * Uses a singleton pattern to avoid creating multiple instances
- * @returns A default logger that implements the Logger interface
- */
-export const createDefaultLogger = (): t.Logger => {
-  if (!defaultLoggerInstance) {
-    defaultLoggerInstance = {
-      error: console.error,
-      warn: console.warn,
-      info: console.info,
-      debug: console.debug,
-    } as t.Logger;
-  }
-  return defaultLoggerInstance;
-};
-
-export const fileExtRegex =
-  /\.(pdf|jpe?g|png|gif|svg|webp|bmp|ico|tiff?|avif|heic|doc[xm]?|xls[xm]?|ppt[xm]?|zip|rar|mp[34]|mov|avi|wav)(?:\?.*)?$/i;
-
-export const getDomainName = (
-  link: string,
-  metadata?: t.ScrapeMetadata,
-  logger?: t.Logger
-): string | undefined => {
-  try {
-    const url = metadata?.sourceURL ?? metadata?.url ?? (link || '');
-    const domain = new URL(url).hostname.replace(/^www\./, '');
-    if (domain) {
-      return domain;
-    }
-  } catch (e) {
-    // URL parsing failed
-    if (logger) {
-      logger.error('Error parsing URL:', e);
-    } else {
-      console.error('Error parsing URL:', e);
-    }
-  }
-
-  return;
-};
-
-export function getAttribution(
-  link: string,
-  metadata?: t.ScrapeMetadata,
-  logger?: t.Logger
-): string | undefined {
-  if (!metadata) return getDomainName(link, metadata, logger);
-
-  const twitterSite = metadata['twitter:site'];
-  const twitterSiteFormatted =
-    typeof twitterSite === 'string' ? twitterSite.replace(/^@/, '') : undefined;
-
-  const possibleAttributions = [
-    metadata.ogSiteName,
-    metadata['og:site_name'],
-    metadata.title?.split('|').pop()?.trim(),
-    twitterSiteFormatted,
-  ];
-
-  const attribution = possibleAttributions.find(
-    (attr) => attr != null && typeof attr === 'string' && attr.trim() !== ''
-  );
-  if (attribution != null) {
-    return attribution;
-  }
-
-  return getDomainName(link, metadata, logger);
-}
+/* eslint-disable no-console */
+
+import type * as t from './types';
+
+/**
+ * Singleton instance of the default logger
+ */
+let defaultLoggerInstance: t.Logger | null = null;
+
+/**
+ * Creates a default logger that maps to console methods
+ * Uses a singleton pattern to avoid creating multiple instances
+ * @returns A default logger that implements the Logger interface
+ */
+export const createDefaultLogger = (): t.Logger => {
+  if (!defaultLoggerInstance) {
+    defaultLoggerInstance = {
+      error: console.error,
+      warn: console.warn,
+      info: console.info,
+      debug: console.debug,
+    } as t.Logger;
+  }
+  return defaultLoggerInstance;
+};
+
+export const fileExtRegex =
+  /\.(pdf|jpe?g|png|gif|svg|webp|bmp|ico|tiff?|avif|heic|doc[xm]?|xls[xm]?|ppt[xm]?|zip|rar|mp[34]|mov|avi|wav)(?:\?.*)?$/i;
+
+export const getDomainName = (
+  link: string,
+  metadata?: t.ScrapeMetadata,
+  logger?: t.Logger
+): string | undefined => {
+  try {
+    const url = metadata?.sourceURL ?? metadata?.url ?? (link || '');
+    const domain = new URL(url).hostname.replace(/^www\./, '');
+    if (domain) {
+      return domain;
+    }
+  } catch (e) {
+    // URL parsing failed
+    if (logger) {
+      logger.error('Error parsing URL:', e);
+    } else {
+      console.error('Error parsing URL:', e);
+    }
+  }
+
+  return;
+};
+
+export function getAttribution(
+  link: string,
+  metadata?: t.ScrapeMetadata,
+  logger?: t.Logger
+): string | undefined {
+  if (!metadata) return getDomainName(link, metadata, logger);
+
+  const twitterSite = metadata['twitter:site'];
+  const twitterSiteFormatted =
+    typeof twitterSite === 'string' ? twitterSite.replace(/^@/, '') : undefined;
+
+  const possibleAttributions = [
+    metadata.ogSiteName,
+    metadata['og:site_name'],
+    metadata.title?.split('|').pop()?.trim(),
+    twitterSiteFormatted,
+  ];
+
+  const attribution = possibleAttributions.find(
+    (attr) => attr != null && typeof attr === 'string' && attr.trim() !== ''
+  );
+  if (attribution != null) {
+    return attribution;
+  }
+
+  return getDomainName(link, metadata, logger);
+}

package/src/types/index.ts

@@ -1,6 +1,6 @@
-// src/types/index.ts
-export * from './graph';
-export * from './llm';
-export * from './run';
-export * from './stream';
-export * from './tools';
+// src/types/index.ts
+export * from './graph';
+export * from './llm';
+export * from './run';
+export * from './stream';
+export * from './tools';

package/src/types/llm.ts

@@ -1,7 +1,5 @@
 // src/types/llm.ts
-import { ChatOllama } from '@langchain/ollama';
 import { ChatMistralAI } from '@langchain/mistralai';
-import { ChatBedrockConverse } from '@langchain/aws';
 import type {
   BindToolsInput,
   BaseChatModelParams,
@@ -23,7 +21,6 @@ import type { RequestOptions } from '@google/generative-ai';
 import type { StructuredTool } from '@langchain/core/tools';
 import type { AnthropicInput } from '@langchain/anthropic';
 import type { Runnable } from '@langchain/core/runnables';
-import type { ChatOllamaInput } from '@langchain/ollama';
 import type { OpenAI as OpenAIClient } from 'openai';
 import type { ChatXAIInput } from '@langchain/xai';
 import {
@@ -33,6 +30,7 @@ import {
   ChatXAI,
 } from '@/llm/openai';
 import { CustomChatGoogleGenerativeAI } from '@/llm/google';
+import { CustomChatBedrockConverse } from '@/llm/bedrock';
 import { CustomAnthropic } from '@/llm/anthropic';
 import { ChatOpenRouter } from '@/llm/openrouter';
 import { ChatVertexAI } from '@/llm/vertexai';
@@ -57,7 +55,6 @@ export type AnthropicReasoning = {
   thinkingBudget?: number;
 };
 export type OpenAIClientOptions = ChatOpenAIFields;
-export type OllamaClientOptions = ChatOllamaInput;
 export type AnthropicClientOptions = AnthropicInput;
 export type MistralAIClientOptions = ChatMistralAIInput;
 export type VertexAIClientOptions = ChatVertexAIInput & {
@@ -80,7 +77,6 @@ export type XAIClientOptions = ChatXAIInput;
 export type ClientOptions =
   | OpenAIClientOptions
   | AzureClientOptions
-  | OllamaClientOptions
   | AnthropicClientOptions
   | MistralAIClientOptions
   | VertexAIClientOptions
@@ -103,7 +99,6 @@ export type LLMConfig = SharedLLMConfig &
 export type ProviderOptionsMap = {
   [Providers.AZURE]: AzureClientOptions;
   [Providers.OPENAI]: OpenAIClientOptions;
-  [Providers.OLLAMA]: OllamaClientOptions;
   [Providers.GOOGLE]: GoogleClientOptions;
   [Providers.VERTEXAI]: VertexAIClientOptions;
   [Providers.DEEPSEEK]: DeepSeekClientOptions;
@@ -118,7 +113,6 @@ export type ProviderOptionsMap = {
 export type ChatModelMap = {
   [Providers.XAI]: ChatXAI;
   [Providers.OPENAI]: ChatOpenAI;
-  [Providers.OLLAMA]: ChatOllama;
   [Providers.AZURE]: AzureChatOpenAI;
   [Providers.DEEPSEEK]: ChatDeepSeek;
   [Providers.VERTEXAI]: ChatVertexAI;
@@ -126,7 +120,7 @@ export type ChatModelMap = {
   [Providers.MISTRALAI]: ChatMistralAI;
   [Providers.MISTRAL]: ChatMistralAI;
   [Providers.OPENROUTER]: ChatOpenRouter;
-  [Providers.BEDROCK]: ChatBedrockConverse;
+  [Providers.BEDROCK]: CustomChatBedrockConverse;
   [Providers.GOOGLE]: CustomChatGoogleGenerativeAI;
 };
 

package/src/utils/graph.ts

@@ -1,11 +1,11 @@
-export const resetIfNotEmpty = <T>(value: T, resetValue: T): T => {
-  if (Array.isArray(value)) {
-    return value.length > 0 ? resetValue : value;
-  }
-  if (value instanceof Set || value instanceof Map) {
-    return value.size > 0 ? resetValue : value;
-  }
-  return value !== undefined ? resetValue : value;
-};
-
+export const resetIfNotEmpty = <T>(value: T, resetValue: T): T => {
+  if (Array.isArray(value)) {
+    return value.length > 0 ? resetValue : value;
+  }
+  if (value instanceof Set || value instanceof Map) {
+    return value.size > 0 ? resetValue : value;
+  }
+  return value !== undefined ? resetValue : value;
+};
+
 export const joinKeys = (args: (string | number | undefined)[]): string => args.join('_');

package/src/utils/llm.ts

@@ -1,27 +1,26 @@
-// src/utils/llm.ts
-import { Providers } from '@/common';
-
-export function isOpenAILike(provider?: string | Providers): boolean {
-  if (provider == null) {
-    return false;
-  }
-  return (
-    [
-      Providers.OPENAI,
-      Providers.AZURE,
-      Providers.OPENROUTER,
-      Providers.XAI,
-      Providers.DEEPSEEK,
-      Providers.OLLAMA,
-    ] as string[]
-  ).includes(provider);
-}
-
-export function isGoogleLike(provider?: string | Providers): boolean {
-  if (provider == null) {
-    return false;
-  }
-  return ([Providers.GOOGLE, Providers.VERTEXAI] as string[]).includes(
-    provider
-  );
-}
+// src/utils/llm.ts
+import { Providers } from '@/common';
+
+export function isOpenAILike(provider?: string | Providers): boolean {
+  if (provider == null) {
+    return false;
+  }
+  return (
+    [
+      Providers.OPENAI,
+      Providers.AZURE,
+      Providers.OPENROUTER,
+      Providers.XAI,
+      Providers.DEEPSEEK,
+    ] as string[]
+  ).includes(provider);
+}
+
+export function isGoogleLike(provider?: string | Providers): boolean {
+  if (provider == null) {
+    return false;
+  }
+  return ([Providers.GOOGLE, Providers.VERTEXAI] as string[]).includes(
+    provider
+  );
+}

package/src/utils/llmConfig.ts

@@ -78,12 +78,14 @@ export const llmConfigs: Record<string, t.LLMConfig | undefined> = {
     azureOpenAIApiVersion: process.env.AZURE_OPENAI_API_VERSION,
     model: process.env.AZURE_MODEL_NAME ?? 'gpt-4o',
   },
-  [Providers.OLLAMA]: {
-    provider: Providers.OLLAMA,
+  ollama: {
+    provider: Providers.OPENAI,
     model: 'gpt-oss:20b',
     streaming: true,
     streamUsage: true,
-    baseUrl: 'http://localhost:11434',
+    configuration: {
+      baseURL: 'http://localhost:11434/v1',
+    },
   },
   lmstudio: {
     provider: Providers.OPENAI,

package/src/utils/logging.ts

@@ -1,48 +1,48 @@
-// src/utils/logging.ts
-import fs from 'fs';
-import util from 'util';
-
-export function setupLogging(logFileName: string): void {
-  const logFile = fs.createWriteStream(logFileName, { flags: 'a' });
-
-  const originalConsoleLog = console.log;
-  const originalConsoleError = console.error;
-  const originalStdoutWrite = process.stdout.write;
-  const originalStderrWrite = process.stderr.write;
-
-  console.log = function(...args): void {
-    logFile.write(util.format.apply(null, args) + ' ');
-    originalConsoleLog.apply(console, args);
-  };
-
-  console.error = function(...args): void {
-    logFile.write(util.format.apply(null, args) + ' ');
-    originalConsoleError.apply(console, args);
-  };
-
-  process.stdout.write = function(
-    buffer: Uint8Array | string,
-    cb?: ((err?: Error) => void) | string,
-    fd?: ((err?: Error) => void)
-  ): boolean {
-    if (typeof buffer === 'string') {
-      logFile.write(buffer);
-    } else {
-      logFile.write(buffer.toString());
-    }
-    return originalStdoutWrite.call(process.stdout, buffer, cb as BufferEncoding | undefined, fd);
-  };
-
-  process.stderr.write = function(
-    buffer: Uint8Array | string,
-    cb?: ((err?: Error) => void) | string,
-    fd?: ((err?: Error) => void)
-  ): boolean {
-    if (typeof buffer === 'string') {
-      logFile.write(buffer);
-    } else {
-      logFile.write(buffer.toString());
-    }
-    return originalStderrWrite.call(process.stderr, buffer, cb as BufferEncoding | undefined, fd);
-  };
-}
+// src/utils/logging.ts
+import fs from 'fs';
+import util from 'util';
+
+export function setupLogging(logFileName: string): void {
+  const logFile = fs.createWriteStream(logFileName, { flags: 'a' });
+
+  const originalConsoleLog = console.log;
+  const originalConsoleError = console.error;
+  const originalStdoutWrite = process.stdout.write;
+  const originalStderrWrite = process.stderr.write;
+
+  console.log = function(...args): void {
+    logFile.write(util.format.apply(null, args) + ' ');
+    originalConsoleLog.apply(console, args);
+  };
+
+  console.error = function(...args): void {
+    logFile.write(util.format.apply(null, args) + ' ');
+    originalConsoleError.apply(console, args);
+  };
+
+  process.stdout.write = function(
+    buffer: Uint8Array | string,
+    cb?: ((err?: Error) => void) | string,
+    fd?: ((err?: Error) => void)
+  ): boolean {
+    if (typeof buffer === 'string') {
+      logFile.write(buffer);
+    } else {
+      logFile.write(buffer.toString());
+    }
+    return originalStdoutWrite.call(process.stdout, buffer, cb as BufferEncoding | undefined, fd);
+  };
+
+  process.stderr.write = function(
+    buffer: Uint8Array | string,
+    cb?: ((err?: Error) => void) | string,
+    fd?: ((err?: Error) => void)
+  ): boolean {
+    if (typeof buffer === 'string') {
+      logFile.write(buffer);
+    } else {
+      logFile.write(buffer.toString());
+    }
+    return originalStderrWrite.call(process.stderr, buffer, cb as BufferEncoding | undefined, fd);
+  };
+}

package/src/utils/misc.ts

@@ -1,57 +1,57 @@
-export function isPresent(value: string | null | undefined): value is string {
-  return value != null && value !== '';
-}
-
-/**
- * Unescapes a c-escaped string
- * @param str The string to unescape
- * @returns The unescaped string
- */
-const unescapeString = (string: string): string =>
-  string.replace(/\\(.)/g, (_, char) => {
-    switch (char) {
-    case 'n':
-      return '\n';
-    case 't':
-      return '\t';
-    case 'r':
-      return '\r';
-    case '"':
-      return '"';
-    case '\'':
-      return '\'';
-    case '\\':
-      return '\\';
-    default:
-      return char;
-    }
-  });
-
-/**
- * Recursively unescapes all string values in an object
- * @param obj The object to unescape
- * @returns The unescaped object
- */
-export function unescapeObject(obj: unknown, key?: string): unknown {
-  if (typeof obj === 'string') {
-    let unescaped = unescapeString(obj);
-    if (key === 'filePath' && unescaped.match(/^"(.+)"$/)) {
-      unescaped = unescaped.substring(1, unescaped.length - 1);
-    }
-    return unescaped;
-  }
-  if (Array.isArray(obj)) {
-    return obj.map((value) =>
-      unescapeObject(value, key === 'contextPaths' ? 'filePath' : '')
-    );
-  }
-  if (typeof obj === 'object' && obj !== null) {
-    return Object.fromEntries(
-      Object.entries(obj).map(([key, value]) => [
-        key,
-        unescapeObject(value, key),
-      ])
-    );
-  }
-  return obj;
-}
+export function isPresent(value: string | null | undefined): value is string {
+  return value != null && value !== '';
+}
+
+/**
+ * Unescapes a c-escaped string
+ * @param str The string to unescape
+ * @returns The unescaped string
+ */
+const unescapeString = (string: string): string =>
+  string.replace(/\\(.)/g, (_, char) => {
+    switch (char) {
+    case 'n':
+      return '\n';
+    case 't':
+      return '\t';
+    case 'r':
+      return '\r';
+    case '"':
+      return '"';
+    case '\'':
+      return '\'';
+    case '\\':
+      return '\\';
+    default:
+      return char;
+    }
+  });
+
+/**
+ * Recursively unescapes all string values in an object
+ * @param obj The object to unescape
+ * @returns The unescaped object
+ */
+export function unescapeObject(obj: unknown, key?: string): unknown {
+  if (typeof obj === 'string') {
+    let unescaped = unescapeString(obj);
+    if (key === 'filePath' && unescaped.match(/^"(.+)"$/)) {
+      unescaped = unescaped.substring(1, unescaped.length - 1);
+    }
+    return unescaped;
+  }
+  if (Array.isArray(obj)) {
+    return obj.map((value) =>
+      unescapeObject(value, key === 'contextPaths' ? 'filePath' : '')
+    );
+  }
+  if (typeof obj === 'object' && obj !== null) {
+    return Object.fromEntries(
+      Object.entries(obj).map(([key, value]) => [
+        key,
+        unescapeObject(value, key),
+      ])
+    );
+  }
+  return obj;
+}