notdiamond 0.3.12 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +19 -13
- package/dist/index.d.cts +2 -2
- package/dist/index.d.mts +2 -2
- package/dist/index.d.ts +2 -2
- package/dist/index.mjs +19 -13
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -30,7 +30,7 @@ const axios__default = /*#__PURE__*/_interopDefaultCompat(axios);
|
|
|
30
30
|
|
|
31
31
|
const name = "notdiamond";
|
|
32
32
|
const type = "module";
|
|
33
|
-
const version = "1.0.
|
|
33
|
+
const version = "1.0.1";
|
|
34
34
|
const author = "not-diamond";
|
|
35
35
|
const license = "MIT";
|
|
36
36
|
const description = "TS/JS client for the NotDiamond API";
|
|
@@ -436,14 +436,14 @@ function getLangChainModel(provider, llmKeys, responseModel) {
|
|
|
436
436
|
throw new Error(`Unsupported provider: ${provider.provider}`);
|
|
437
437
|
}
|
|
438
438
|
}
|
|
439
|
-
async function callLLM(provider, options, llmKeys) {
|
|
439
|
+
async function callLLM(provider, options, llmKeys, runtimeArgs) {
|
|
440
440
|
const model = getLangChainModel(provider, llmKeys, options.responseModel);
|
|
441
441
|
const langChainMessages = extendProviderSystemPrompt(
|
|
442
442
|
options.messages.map(convertToLangChainMessage),
|
|
443
443
|
options,
|
|
444
444
|
provider
|
|
445
445
|
);
|
|
446
|
-
const response = await model.invoke(langChainMessages);
|
|
446
|
+
const response = await model.invoke(langChainMessages, runtimeArgs);
|
|
447
447
|
return extractContent(response);
|
|
448
448
|
}
|
|
449
449
|
function extendProviderSystemPrompt(messages$1, options, provider) {
|
|
@@ -467,14 +467,14 @@ function convertToLangChainMessage(msg) {
|
|
|
467
467
|
return new messages.HumanMessage(msg.content);
|
|
468
468
|
}
|
|
469
469
|
}
|
|
470
|
-
async function* callLLMStream(provider, options, llmKeys) {
|
|
470
|
+
async function* callLLMStream(provider, options, llmKeys, runtimeArgs) {
|
|
471
471
|
const model = getLangChainModel(provider, llmKeys, options.responseModel);
|
|
472
472
|
const langChainMessages = extendProviderSystemPrompt(
|
|
473
473
|
options.messages.map(convertToLangChainMessage),
|
|
474
474
|
options,
|
|
475
475
|
provider
|
|
476
476
|
);
|
|
477
|
-
const stream = await model.stream(langChainMessages);
|
|
477
|
+
const stream = await model.stream(langChainMessages, runtimeArgs);
|
|
478
478
|
for await (const chunk of stream) {
|
|
479
479
|
yield extractContent(chunk);
|
|
480
480
|
}
|
|
@@ -625,10 +625,15 @@ class NotDiamond {
|
|
|
625
625
|
* @param options The options for the model.
|
|
626
626
|
* @returns A promise that resolves to the results of the model.
|
|
627
627
|
*/
|
|
628
|
-
async acreate(options) {
|
|
628
|
+
async acreate(options, runtimeArgs = {}) {
|
|
629
629
|
const selectedModel = await this.modelSelect(options);
|
|
630
630
|
const { providers } = selectedModel;
|
|
631
|
-
const content = await callLLM(
|
|
631
|
+
const content = await callLLM(
|
|
632
|
+
providers[0],
|
|
633
|
+
options,
|
|
634
|
+
this.llmKeys,
|
|
635
|
+
runtimeArgs
|
|
636
|
+
);
|
|
632
637
|
return { content, providers };
|
|
633
638
|
}
|
|
634
639
|
/**
|
|
@@ -637,8 +642,8 @@ class NotDiamond {
|
|
|
637
642
|
* @param callback Optional callback function to handle the result.
|
|
638
643
|
* @returns A promise that resolves to the results of the model or a callback function
|
|
639
644
|
*/
|
|
640
|
-
create(options, callback) {
|
|
641
|
-
const promise = this.acreate(options);
|
|
645
|
+
create(options, runtimeArgs = {}, callback) {
|
|
646
|
+
const promise = this.acreate(options, runtimeArgs);
|
|
642
647
|
if (callback) {
|
|
643
648
|
promise.then((result) => callback(null, result)).catch((error) => callback(error));
|
|
644
649
|
} else {
|
|
@@ -650,7 +655,7 @@ class NotDiamond {
|
|
|
650
655
|
* @param options The options for the model.
|
|
651
656
|
* @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings.
|
|
652
657
|
*/
|
|
653
|
-
async astream(options) {
|
|
658
|
+
async astream(options, runtimeArgs = {}) {
|
|
654
659
|
const selectedModel = await this.modelSelect(options);
|
|
655
660
|
const { providers } = selectedModel;
|
|
656
661
|
const stream = await Promise.resolve(
|
|
@@ -660,7 +665,8 @@ class NotDiamond {
|
|
|
660
665
|
model: "gpt-3.5-turbo"
|
|
661
666
|
},
|
|
662
667
|
options,
|
|
663
|
-
this.llmKeys
|
|
668
|
+
this.llmKeys,
|
|
669
|
+
runtimeArgs
|
|
664
670
|
)
|
|
665
671
|
);
|
|
666
672
|
return {
|
|
@@ -677,11 +683,11 @@ class NotDiamond {
|
|
|
677
683
|
* @param callback Optional callback function to handle each chunk of the stream.
|
|
678
684
|
* @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
|
|
679
685
|
*/
|
|
680
|
-
stream(options, callback) {
|
|
686
|
+
stream(options, runtimeArgs = {}, callback) {
|
|
681
687
|
if (!options.llmProviders || options.llmProviders.length === 0) {
|
|
682
688
|
throw new Error("No LLM providers specified");
|
|
683
689
|
}
|
|
684
|
-
const promise = this.astream(options);
|
|
690
|
+
const promise = this.astream(options, runtimeArgs);
|
|
685
691
|
if (callback) {
|
|
686
692
|
promise.then(async ({ provider, stream }) => {
|
|
687
693
|
for await (const chunk of stream) {
|
package/dist/index.d.cts
CHANGED
|
@@ -176,7 +176,7 @@ declare class NotDiamond {
|
|
|
176
176
|
* @param callback Optional callback function to handle the result.
|
|
177
177
|
* @returns A promise that resolves to the results of the model or a callback function
|
|
178
178
|
*/
|
|
179
|
-
create(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
|
|
179
|
+
create(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
|
|
180
180
|
content: string;
|
|
181
181
|
providers: Provider[];
|
|
182
182
|
}) => void): Promise<{
|
|
@@ -195,7 +195,7 @@ declare class NotDiamond {
|
|
|
195
195
|
* @param callback Optional callback function to handle each chunk of the stream.
|
|
196
196
|
* @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
|
|
197
197
|
*/
|
|
198
|
-
stream(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
|
|
198
|
+
stream(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
|
|
199
199
|
provider: Provider;
|
|
200
200
|
chunk?: string;
|
|
201
201
|
}) => void): Promise<{
|
package/dist/index.d.mts
CHANGED
|
@@ -176,7 +176,7 @@ declare class NotDiamond {
|
|
|
176
176
|
* @param callback Optional callback function to handle the result.
|
|
177
177
|
* @returns A promise that resolves to the results of the model or a callback function
|
|
178
178
|
*/
|
|
179
|
-
create(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
|
|
179
|
+
create(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
|
|
180
180
|
content: string;
|
|
181
181
|
providers: Provider[];
|
|
182
182
|
}) => void): Promise<{
|
|
@@ -195,7 +195,7 @@ declare class NotDiamond {
|
|
|
195
195
|
* @param callback Optional callback function to handle each chunk of the stream.
|
|
196
196
|
* @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
|
|
197
197
|
*/
|
|
198
|
-
stream(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
|
|
198
|
+
stream(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
|
|
199
199
|
provider: Provider;
|
|
200
200
|
chunk?: string;
|
|
201
201
|
}) => void): Promise<{
|
package/dist/index.d.ts
CHANGED
|
@@ -176,7 +176,7 @@ declare class NotDiamond {
|
|
|
176
176
|
* @param callback Optional callback function to handle the result.
|
|
177
177
|
* @returns A promise that resolves to the results of the model or a callback function
|
|
178
178
|
*/
|
|
179
|
-
create(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
|
|
179
|
+
create(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
|
|
180
180
|
content: string;
|
|
181
181
|
providers: Provider[];
|
|
182
182
|
}) => void): Promise<{
|
|
@@ -195,7 +195,7 @@ declare class NotDiamond {
|
|
|
195
195
|
* @param callback Optional callback function to handle each chunk of the stream.
|
|
196
196
|
* @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
|
|
197
197
|
*/
|
|
198
|
-
stream(options: ModelSelectOptions, callback?: (error: Error | null, result?: {
|
|
198
|
+
stream(options: ModelSelectOptions, runtimeArgs?: Record<string, string>, callback?: (error: Error | null, result?: {
|
|
199
199
|
provider: Provider;
|
|
200
200
|
chunk?: string;
|
|
201
201
|
}) => void): Promise<{
|
package/dist/index.mjs
CHANGED
|
@@ -11,7 +11,7 @@ import { ChatTogetherAI } from '@langchain/community/chat_models/togetherai';
|
|
|
11
11
|
|
|
12
12
|
const name = "notdiamond";
|
|
13
13
|
const type = "module";
|
|
14
|
-
const version = "1.0.
|
|
14
|
+
const version = "1.0.1";
|
|
15
15
|
const author = "not-diamond";
|
|
16
16
|
const license = "MIT";
|
|
17
17
|
const description = "TS/JS client for the NotDiamond API";
|
|
@@ -417,14 +417,14 @@ function getLangChainModel(provider, llmKeys, responseModel) {
|
|
|
417
417
|
throw new Error(`Unsupported provider: ${provider.provider}`);
|
|
418
418
|
}
|
|
419
419
|
}
|
|
420
|
-
async function callLLM(provider, options, llmKeys) {
|
|
420
|
+
async function callLLM(provider, options, llmKeys, runtimeArgs) {
|
|
421
421
|
const model = getLangChainModel(provider, llmKeys, options.responseModel);
|
|
422
422
|
const langChainMessages = extendProviderSystemPrompt(
|
|
423
423
|
options.messages.map(convertToLangChainMessage),
|
|
424
424
|
options,
|
|
425
425
|
provider
|
|
426
426
|
);
|
|
427
|
-
const response = await model.invoke(langChainMessages);
|
|
427
|
+
const response = await model.invoke(langChainMessages, runtimeArgs);
|
|
428
428
|
return extractContent(response);
|
|
429
429
|
}
|
|
430
430
|
function extendProviderSystemPrompt(messages, options, provider) {
|
|
@@ -448,14 +448,14 @@ function convertToLangChainMessage(msg) {
|
|
|
448
448
|
return new HumanMessage(msg.content);
|
|
449
449
|
}
|
|
450
450
|
}
|
|
451
|
-
async function* callLLMStream(provider, options, llmKeys) {
|
|
451
|
+
async function* callLLMStream(provider, options, llmKeys, runtimeArgs) {
|
|
452
452
|
const model = getLangChainModel(provider, llmKeys, options.responseModel);
|
|
453
453
|
const langChainMessages = extendProviderSystemPrompt(
|
|
454
454
|
options.messages.map(convertToLangChainMessage),
|
|
455
455
|
options,
|
|
456
456
|
provider
|
|
457
457
|
);
|
|
458
|
-
const stream = await model.stream(langChainMessages);
|
|
458
|
+
const stream = await model.stream(langChainMessages, runtimeArgs);
|
|
459
459
|
for await (const chunk of stream) {
|
|
460
460
|
yield extractContent(chunk);
|
|
461
461
|
}
|
|
@@ -606,10 +606,15 @@ class NotDiamond {
|
|
|
606
606
|
* @param options The options for the model.
|
|
607
607
|
* @returns A promise that resolves to the results of the model.
|
|
608
608
|
*/
|
|
609
|
-
async acreate(options) {
|
|
609
|
+
async acreate(options, runtimeArgs = {}) {
|
|
610
610
|
const selectedModel = await this.modelSelect(options);
|
|
611
611
|
const { providers } = selectedModel;
|
|
612
|
-
const content = await callLLM(
|
|
612
|
+
const content = await callLLM(
|
|
613
|
+
providers[0],
|
|
614
|
+
options,
|
|
615
|
+
this.llmKeys,
|
|
616
|
+
runtimeArgs
|
|
617
|
+
);
|
|
613
618
|
return { content, providers };
|
|
614
619
|
}
|
|
615
620
|
/**
|
|
@@ -618,8 +623,8 @@ class NotDiamond {
|
|
|
618
623
|
* @param callback Optional callback function to handle the result.
|
|
619
624
|
* @returns A promise that resolves to the results of the model or a callback function
|
|
620
625
|
*/
|
|
621
|
-
create(options, callback) {
|
|
622
|
-
const promise = this.acreate(options);
|
|
626
|
+
create(options, runtimeArgs = {}, callback) {
|
|
627
|
+
const promise = this.acreate(options, runtimeArgs);
|
|
623
628
|
if (callback) {
|
|
624
629
|
promise.then((result) => callback(null, result)).catch((error) => callback(error));
|
|
625
630
|
} else {
|
|
@@ -631,7 +636,7 @@ class NotDiamond {
|
|
|
631
636
|
* @param options The options for the model.
|
|
632
637
|
* @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings.
|
|
633
638
|
*/
|
|
634
|
-
async astream(options) {
|
|
639
|
+
async astream(options, runtimeArgs = {}) {
|
|
635
640
|
const selectedModel = await this.modelSelect(options);
|
|
636
641
|
const { providers } = selectedModel;
|
|
637
642
|
const stream = await Promise.resolve(
|
|
@@ -641,7 +646,8 @@ class NotDiamond {
|
|
|
641
646
|
model: "gpt-3.5-turbo"
|
|
642
647
|
},
|
|
643
648
|
options,
|
|
644
|
-
this.llmKeys
|
|
649
|
+
this.llmKeys,
|
|
650
|
+
runtimeArgs
|
|
645
651
|
)
|
|
646
652
|
);
|
|
647
653
|
return {
|
|
@@ -658,11 +664,11 @@ class NotDiamond {
|
|
|
658
664
|
* @param callback Optional callback function to handle each chunk of the stream.
|
|
659
665
|
* @returns A promise that resolves to an object containing the provider and an AsyncIterable of strings or a callback function
|
|
660
666
|
*/
|
|
661
|
-
stream(options, callback) {
|
|
667
|
+
stream(options, runtimeArgs = {}, callback) {
|
|
662
668
|
if (!options.llmProviders || options.llmProviders.length === 0) {
|
|
663
669
|
throw new Error("No LLM providers specified");
|
|
664
670
|
}
|
|
665
|
-
const promise = this.astream(options);
|
|
671
|
+
const promise = this.astream(options, runtimeArgs);
|
|
666
672
|
if (callback) {
|
|
667
673
|
promise.then(async ({ provider, stream }) => {
|
|
668
674
|
for await (const chunk of stream) {
|