notdiamond 0.3.12 → 1.0.2

package/dist/index.cjs

@@ -30,7 +30,7 @@ const axios__default = /*#__PURE__*/_interopDefaultCompat(axios);
 
 const name = "notdiamond";
 const type = "module";
-const version = "1.0.0";
+const version = "1.0.2";
 const author = "not-diamond";
 const license = "MIT";
 const description = "TS/JS client for the NotDiamond API";
@@ -231,7 +231,7 @@ const SupportedProvider = {
   MISTRAL: "mistral",
   PERPLEXITY: "perplexity",
   COHERE: "cohere",
-  TOGETHER: "together"
+  TOGETHERAI: "togetherai"
 };
 const SupportedModel = {
   GPT_3_5_TURBO: "gpt-3.5-turbo",
@@ -339,7 +339,7 @@ const SupportedModel = {
     SupportedModel.COMMAND_R,
     SupportedModel.COMMAND_R_PLUS
   ],
-  [SupportedProvider.TOGETHER]: [
+  [SupportedProvider.TOGETHERAI]: [
     SupportedModel.MISTRAL_7B_INSTRUCT_V0_2,
     SupportedModel.MIXTRAL_8X7B_INSTRUCT_V0_1,
     SupportedModel.MIXTRAL_8X22B_INSTRUCT_V0_1,
@@ -353,7 +353,7 @@ const SupportedModel = {
 });
 
 function getLangChainModel(provider, llmKeys, responseModel) {
-  const { OPENAI, ANTHROPIC, GOOGLE, MISTRAL, PERPLEXITY, COHERE, TOGETHER } = SupportedProvider;
+  const { OPENAI, ANTHROPIC, GOOGLE, MISTRAL, PERPLEXITY, COHERE, TOGETHERAI } = SupportedProvider;
   switch (provider.provider) {
     case OPENAI:
       if (responseModel) {
@@ -421,29 +421,29 @@ function getLangChainModel(provider, llmKeys, responseModel) {
         apiKey: process.env.COHERE_API_KEY || llmKeys.cohere,
         model: provider.model
       });
-    case TOGETHER:
+    case TOGETHERAI:
       if (responseModel) {
         return new togetherai.ChatTogetherAI({
-          apiKey: process.env.TOGETHER_API_KEY || llmKeys.together,
+          apiKey: process.env.TOGETHERAI_API_KEY || llmKeys.togetherai,
           model: provider.model
         }).withStructuredOutput(responseModel);
       }
       return new togetherai.ChatTogetherAI({
-        apiKey: process.env.TOGETHER_API_KEY || llmKeys.together,
+        apiKey: process.env.TOGETHERAI_API_KEY || llmKeys.togetherai,
         model: provider.model
       });
     default:
       throw new Error(`Unsupported provider: ${provider.provider}`);
   }
 }
-async function callLLM(provider, options, llmKeys) {
+async function callLLM(provider, options, llmKeys, runtimeArgs) {
   const model = getLangChainModel(provider, llmKeys, options.responseModel);
   const langChainMessages = extendProviderSystemPrompt(
     options.messages.map(convertToLangChainMessage),
     options,
     provider
   );
-  const response = await model.invoke(langChainMessages);
+  const response = await model.invoke(langChainMessages, runtimeArgs);
   return extractContent(response);
 }
 function extendProviderSystemPrompt(messages$1, options, provider) {
@@ -467,14 +467,14 @@ function convertToLangChainMessage(msg) {
       return new messages.HumanMessage(msg.content);
   }
 }
-async function* callLLMStream(provider, options, llmKeys) {
+async function* callLLMStream(provider, options, llmKeys, runtimeArgs) {
   const model = getLangChainModel(provider, llmKeys, options.responseModel);
   const langChainMessages = extendProviderSystemPrompt(
     options.messages.map(convertToLangChainMessage),
     options,
     provider
   );
-  const stream = await model.stream(langChainMessages);
+  const stream = await model.stream(langChainMessages, runtimeArgs);
   for await (const chunk of stream) {
     yield extractContent(chunk);
   }
@@ -625,10 +625,15 @@ class NotDiamond {
    * @param options The options for the model.
    * @returns A promise that resolves to the results of the model.
    */
-  async acreate(options) {
+  async acreate(options, runtimeArgs = {}) {
     const selectedModel = await this.modelSelect(options);
     const { providers } = selectedModel;
-    const content = await callLLM(providers[0], options, this.llmKeys);
+    const content = await callLLM(
+      providers[0],
+      options,
+      this.llmKeys,
+      runtimeArgs
+    );
     return { content, providers };
   }
   /**
@@ -637,8 +642,8 @@ class NotDiamond {
    * @param callback Optional callback function to handle the result.
    * @returns A promise that resolves to the results of the model or a callback function
    */
-  create(options, callback) {
-    const promise = this.acreate(options);
+  create(options, runtimeArgs = {}, callback) {
+    const promise = this.acreate(options, runtimeArgs);
     if (callback) {
       promise.then((result) => callback(null, result)).catch((error) => callback(error));
     } else {
@@ -650,7 +655,7 @@ class NotDiamond {
    * @param options The options for the model.
    * @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings.
    */
-  async astream(options) {
+  async astream(options, runtimeArgs = {}) {
     const selectedModel = await this.modelSelect(options);
     const { providers } = selectedModel;
     const stream = await Promise.resolve(
@@ -660,7 +665,8 @@ class NotDiamond {
           model: "gpt-3.5-turbo"
         },
         options,
-        this.llmKeys
+        this.llmKeys,
+        runtimeArgs
       )
     );
     return {
@@ -677,11 +683,11 @@ class NotDiamond {
    * @param callback Optional callback function to handle each chunk of the stream.
    * @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
    */
-  stream(options, callback) {
+  stream(options, runtimeArgs = {}, callback) {
     if (!options.llmProviders || options.llmProviders.length === 0) {
       throw new Error("No LLM providers specified");
     }
-    const promise = this.astream(options);
+    const promise = this.astream(options, runtimeArgs);
     if (callback) {
       promise.then(async ({ provider, stream }) => {
         for await (const chunk of stream) {

package/dist/index.d.cts

@@ -7,7 +7,7 @@ declare const SupportedProvider: {
     readonly MISTRAL: "mistral";
     readonly PERPLEXITY: "perplexity";
     readonly COHERE: "cohere";
-    readonly TOGETHER: "together";
+    readonly TOGETHERAI: "togetherai";
 };
 declare const SupportedModel: {
     readonly GPT_3_5_TURBO: "gpt-3.5-turbo";
@@ -68,7 +68,7 @@ declare const ProviderModelMap: {
     readonly mistral: readonly ["mistral-large-latest", "mistral-large-2407", "mistral-large-2402", "mistral-medium-latest", "mistral-small-latest", "codestral-latest", "open-mistral-7b", "open-mixtral-8x7b", "open-mixtral-8x22b", "open-mistral-nemo"];
     readonly perplexity: readonly ["llama-3.1-sonar-large-128k-online"];
     readonly cohere: readonly ["command-r", "command-r-plus"];
-    readonly together: readonly ["Mistral-7B-Instruct-v0.2", "Mixtral-8x7B-Instruct-v0.1", "Mixtral-8x22B-Instruct-v0.1", "Llama-3-70b-chat-hf", "Llama-3-8b-chat-hf", "Qwen2-72B-Instruct", "Meta-Llama-3.1-8B-Instruct-Turbo", "Meta-Llama-3.1-70B-Instruct-Turbo", "Meta-Llama-3.1-405B-Instruct-Turbo"];
+    readonly togetherai: readonly ["Mistral-7B-Instruct-v0.2", "Mixtral-8x7B-Instruct-v0.1", "Mixtral-8x22B-Instruct-v0.1", "Llama-3-70b-chat-hf", "Llama-3-8b-chat-hf", "Qwen2-72B-Instruct", "Meta-Llama-3.1-8B-Instruct-Turbo", "Meta-Llama-3.1-70B-Instruct-Turbo", "Meta-Llama-3.1-405B-Instruct-Turbo"];
 };
 type ProviderModelMapType = typeof ProviderModelMap;
 type SupportedProviderType = keyof ProviderModelMapType;
@@ -176,12 +176,12 @@ declare class NotDiamond {
      * @param callback Optional callback function to handle the result.
      * @returns A promise that resolves to the results of the model or a callback function
      */
-    create(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
+    create(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
         content: string;
         providers: Provider[];
     }) => void): Promise<{
         content: string;
-        providers: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "together">[];
+        providers: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "togetherai">[];
     }> | undefined;
     /**
      * Streams the results of the model asynchronously.
@@ -195,11 +195,11 @@ declare class NotDiamond {
      * @param callback Optional callback function to handle each chunk of the stream.
      * @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
      */
-    stream(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
+    stream(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
         provider: Provider;
         chunk?: string;
     }) => void): Promise<{
-        provider: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "together">;
+        provider: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "togetherai">;
         stream: AsyncIterable<string>;
     }> | undefined;
 }

package/dist/index.d.mts

@@ -7,7 +7,7 @@ declare const SupportedProvider: {
     readonly MISTRAL: "mistral";
     readonly PERPLEXITY: "perplexity";
     readonly COHERE: "cohere";
-    readonly TOGETHER: "together";
+    readonly TOGETHERAI: "togetherai";
 };
 declare const SupportedModel: {
     readonly GPT_3_5_TURBO: "gpt-3.5-turbo";
@@ -68,7 +68,7 @@ declare const ProviderModelMap: {
     readonly mistral: readonly ["mistral-large-latest", "mistral-large-2407", "mistral-large-2402", "mistral-medium-latest", "mistral-small-latest", "codestral-latest", "open-mistral-7b", "open-mixtral-8x7b", "open-mixtral-8x22b", "open-mistral-nemo"];
     readonly perplexity: readonly ["llama-3.1-sonar-large-128k-online"];
     readonly cohere: readonly ["command-r", "command-r-plus"];
-    readonly together: readonly ["Mistral-7B-Instruct-v0.2", "Mixtral-8x7B-Instruct-v0.1", "Mixtral-8x22B-Instruct-v0.1", "Llama-3-70b-chat-hf", "Llama-3-8b-chat-hf", "Qwen2-72B-Instruct", "Meta-Llama-3.1-8B-Instruct-Turbo", "Meta-Llama-3.1-70B-Instruct-Turbo", "Meta-Llama-3.1-405B-Instruct-Turbo"];
+    readonly togetherai: readonly ["Mistral-7B-Instruct-v0.2", "Mixtral-8x7B-Instruct-v0.1", "Mixtral-8x22B-Instruct-v0.1", "Llama-3-70b-chat-hf", "Llama-3-8b-chat-hf", "Qwen2-72B-Instruct", "Meta-Llama-3.1-8B-Instruct-Turbo", "Meta-Llama-3.1-70B-Instruct-Turbo", "Meta-Llama-3.1-405B-Instruct-Turbo"];
 };
 type ProviderModelMapType = typeof ProviderModelMap;
 type SupportedProviderType = keyof ProviderModelMapType;
@@ -176,12 +176,12 @@ declare class NotDiamond {
      * @param callback Optional callback function to handle the result.
      * @returns A promise that resolves to the results of the model or a callback function
      */
-    create(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
+    create(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
         content: string;
         providers: Provider[];
     }) => void): Promise<{
         content: string;
-        providers: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "together">[];
+        providers: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "togetherai">[];
     }> | undefined;
     /**
      * Streams the results of the model asynchronously.
@@ -195,11 +195,11 @@ declare class NotDiamond {
      * @param callback Optional callback function to handle each chunk of the stream.
      * @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
      */
-    stream(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
+    stream(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
         provider: Provider;
         chunk?: string;
     }) => void): Promise<{
-        provider: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "together">;
+        provider: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "togetherai">;
         stream: AsyncIterable<string>;
     }> | undefined;
 }

package/dist/index.d.ts

@@ -7,7 +7,7 @@ declare const SupportedProvider: {
     readonly MISTRAL: "mistral";
     readonly PERPLEXITY: "perplexity";
     readonly COHERE: "cohere";
-    readonly TOGETHER: "together";
+    readonly TOGETHERAI: "togetherai";
 };
 declare const SupportedModel: {
     readonly GPT_3_5_TURBO: "gpt-3.5-turbo";
@@ -68,7 +68,7 @@ declare const ProviderModelMap: {
     readonly mistral: readonly ["mistral-large-latest", "mistral-large-2407", "mistral-large-2402", "mistral-medium-latest", "mistral-small-latest", "codestral-latest", "open-mistral-7b", "open-mixtral-8x7b", "open-mixtral-8x22b", "open-mistral-nemo"];
     readonly perplexity: readonly ["llama-3.1-sonar-large-128k-online"];
     readonly cohere: readonly ["command-r", "command-r-plus"];
-    readonly together: readonly ["Mistral-7B-Instruct-v0.2", "Mixtral-8x7B-Instruct-v0.1", "Mixtral-8x22B-Instruct-v0.1", "Llama-3-70b-chat-hf", "Llama-3-8b-chat-hf", "Qwen2-72B-Instruct", "Meta-Llama-3.1-8B-Instruct-Turbo", "Meta-Llama-3.1-70B-Instruct-Turbo", "Meta-Llama-3.1-405B-Instruct-Turbo"];
+    readonly togetherai: readonly ["Mistral-7B-Instruct-v0.2", "Mixtral-8x7B-Instruct-v0.1", "Mixtral-8x22B-Instruct-v0.1", "Llama-3-70b-chat-hf", "Llama-3-8b-chat-hf", "Qwen2-72B-Instruct", "Meta-Llama-3.1-8B-Instruct-Turbo", "Meta-Llama-3.1-70B-Instruct-Turbo", "Meta-Llama-3.1-405B-Instruct-Turbo"];
 };
 type ProviderModelMapType = typeof ProviderModelMap;
 type SupportedProviderType = keyof ProviderModelMapType;
@@ -176,12 +176,12 @@ declare class NotDiamond {
      * @param callback Optional callback function to handle the result.
      * @returns A promise that resolves to the results of the model or a callback function
      */
-    create(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
+    create(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
         content: string;
         providers: Provider[];
     }) => void): Promise<{
         content: string;
-        providers: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "together">[];
+        providers: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "togetherai">[];
     }> | undefined;
     /**
      * Streams the results of the model asynchronously.
@@ -195,11 +195,11 @@ declare class NotDiamond {
      * @param callback Optional callback function to handle each chunk of the stream.
      * @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
      */
-    stream(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
+    stream(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
         provider: Provider;
         chunk?: string;
     }) => void): Promise<{
-        provider: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "together">;
+        provider: Provider<"openai" | "anthropic" | "perplexity" | "google" | "mistral" | "cohere" | "togetherai">;
         stream: AsyncIterable<string>;
     }> | undefined;
 }

package/dist/index.mjs

@@ -11,7 +11,7 @@ import { ChatTogetherAI } from '@langchain/community/chat_models/togetherai';
 
 const name = "notdiamond";
 const type = "module";
-const version = "1.0.0";
+const version = "1.0.2";
 const author = "not-diamond";
 const license = "MIT";
 const description = "TS/JS client for the NotDiamond API";
@@ -212,7 +212,7 @@ const SupportedProvider = {
   MISTRAL: "mistral",
   PERPLEXITY: "perplexity",
   COHERE: "cohere",
-  TOGETHER: "together"
+  TOGETHERAI: "togetherai"
 };
 const SupportedModel = {
   GPT_3_5_TURBO: "gpt-3.5-turbo",
@@ -320,7 +320,7 @@ const SupportedModel = {
     SupportedModel.COMMAND_R,
     SupportedModel.COMMAND_R_PLUS
   ],
-  [SupportedProvider.TOGETHER]: [
+  [SupportedProvider.TOGETHERAI]: [
     SupportedModel.MISTRAL_7B_INSTRUCT_V0_2,
     SupportedModel.MIXTRAL_8X7B_INSTRUCT_V0_1,
     SupportedModel.MIXTRAL_8X22B_INSTRUCT_V0_1,
@@ -334,7 +334,7 @@ const SupportedModel = {
 });
 
 function getLangChainModel(provider, llmKeys, responseModel) {
-  const { OPENAI, ANTHROPIC, GOOGLE, MISTRAL, PERPLEXITY, COHERE, TOGETHER } = SupportedProvider;
+  const { OPENAI, ANTHROPIC, GOOGLE, MISTRAL, PERPLEXITY, COHERE, TOGETHERAI } = SupportedProvider;
   switch (provider.provider) {
     case OPENAI:
       if (responseModel) {
@@ -402,29 +402,29 @@ function getLangChainModel(provider, llmKeys, responseModel) {
         apiKey: process.env.COHERE_API_KEY || llmKeys.cohere,
         model: provider.model
       });
-    case TOGETHER:
+    case TOGETHERAI:
       if (responseModel) {
         return new ChatTogetherAI({
-          apiKey: process.env.TOGETHER_API_KEY || llmKeys.together,
+          apiKey: process.env.TOGETHERAI_API_KEY || llmKeys.togetherai,
           model: provider.model
         }).withStructuredOutput(responseModel);
       }
       return new ChatTogetherAI({
-        apiKey: process.env.TOGETHER_API_KEY || llmKeys.together,
+        apiKey: process.env.TOGETHERAI_API_KEY || llmKeys.togetherai,
         model: provider.model
       });
     default:
       throw new Error(`Unsupported provider: ${provider.provider}`);
   }
 }
-async function callLLM(provider, options, llmKeys) {
+async function callLLM(provider, options, llmKeys, runtimeArgs) {
   const model = getLangChainModel(provider, llmKeys, options.responseModel);
   const langChainMessages = extendProviderSystemPrompt(
     options.messages.map(convertToLangChainMessage),
     options,
     provider
   );
-  const response = await model.invoke(langChainMessages);
+  const response = await model.invoke(langChainMessages, runtimeArgs);
   return extractContent(response);
 }
 function extendProviderSystemPrompt(messages, options, provider) {
@@ -448,14 +448,14 @@ function convertToLangChainMessage(msg) {
       return new HumanMessage(msg.content);
   }
 }
-async function* callLLMStream(provider, options, llmKeys) {
+async function* callLLMStream(provider, options, llmKeys, runtimeArgs) {
   const model = getLangChainModel(provider, llmKeys, options.responseModel);
   const langChainMessages = extendProviderSystemPrompt(
     options.messages.map(convertToLangChainMessage),
     options,
     provider
   );
-  const stream = await model.stream(langChainMessages);
+  const stream = await model.stream(langChainMessages, runtimeArgs);
   for await (const chunk of stream) {
     yield extractContent(chunk);
   }
@@ -606,10 +606,15 @@ class NotDiamond {
    * @param options The options for the model.
    * @returns A promise that resolves to the results of the model.
    */
-  async acreate(options) {
+  async acreate(options, runtimeArgs = {}) {
     const selectedModel = await this.modelSelect(options);
     const { providers } = selectedModel;
-    const content = await callLLM(providers[0], options, this.llmKeys);
+    const content = await callLLM(
+      providers[0],
+      options,
+      this.llmKeys,
+      runtimeArgs
+    );
     return { content, providers };
   }
   /**
@@ -618,8 +623,8 @@ class NotDiamond {
    * @param callback Optional callback function to handle the result.
    * @returns A promise that resolves to the results of the model or a callback function
    */
-  create(options, callback) {
-    const promise = this.acreate(options);
+  create(options, runtimeArgs = {}, callback) {
+    const promise = this.acreate(options, runtimeArgs);
     if (callback) {
       promise.then((result) => callback(null, result)).catch((error) => callback(error));
     } else {
@@ -631,7 +636,7 @@ class NotDiamond {
    * @param options The options for the model.
    * @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings.
    */
-  async astream(options) {
+  async astream(options, runtimeArgs = {}) {
     const selectedModel = await this.modelSelect(options);
     const { providers } = selectedModel;
     const stream = await Promise.resolve(
@@ -641,7 +646,8 @@ class NotDiamond {
           model: "gpt-3.5-turbo"
         },
         options,
-        this.llmKeys
+        this.llmKeys,
+        runtimeArgs
       )
     );
     return {
@@ -658,11 +664,11 @@ class NotDiamond {
    * @param callback Optional callback function to handle each chunk of the stream.
    * @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
    */
-  stream(options, callback) {
+  stream(options, runtimeArgs = {}, callback) {
     if (!options.llmProviders || options.llmProviders.length === 0) {
       throw new Error("No LLM providers specified");
     }
-    const promise = this.astream(options);
+    const promise = this.astream(options, runtimeArgs);
     if (callback) {
       promise.then(async ({ provider, stream }) => {
         for await (const chunk of stream) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "notdiamond",
   "type": "module",
-  "version": "0.3.12",
+  "version": "1.0.2",
   "author": "not-diamond",
   "license": "MIT",
   "description": "TS/JS client for the NotDiamond API",