langchain 0.0.44 → 0.0.45
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/chat_models/openai.d.ts +5 -0
- package/dist/chat_models/openai.js +12 -2
- package/dist/chat_models/openai.js.map +1 -1
- package/dist/llms/openai-chat.d.ts +5 -0
- package/dist/llms/openai-chat.js +9 -1
- package/dist/llms/openai-chat.js.map +1 -1
- package/dist/llms/openai.d.ts +5 -0
- package/dist/llms/openai.js +9 -2
- package/dist/llms/openai.js.map +1 -1
- package/dist/memory/index.d.ts +1 -1
- package/dist/memory/index.js +1 -1
- package/dist/memory/index.js.map +1 -1
- package/dist/output_parsers/structured.d.ts +2 -2
- package/dist/output_parsers/structured.js +23 -13
- package/dist/output_parsers/structured.js.map +1 -1
- package/dist/output_parsers/tests/structured.test.js +73 -30
- package/dist/output_parsers/tests/structured.test.js.map +1 -1
- package/dist/retrievers/index.d.ts +1 -0
- package/dist/retrievers/index.js +1 -0
- package/dist/retrievers/index.js.map +1 -1
- package/dist/retrievers/remote-retriever.d.ts +23 -0
- package/dist/retrievers/remote-retriever.js +81 -0
- package/dist/retrievers/remote-retriever.js.map +1 -0
- package/dist/util/async_caller.js +1 -0
- package/dist/util/async_caller.js.map +1 -1
- package/dist/vectorstores/base.js +1 -1
- package/dist/vectorstores/base.js.map +1 -1
- package/dist/vectorstores/tests/pinecone.test.js +21 -1
- package/dist/vectorstores/tests/pinecone.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -45,6 +45,10 @@ interface OpenAIInput extends ModelParams {
|
|
|
45
45
|
modelKwargs?: Kwargs;
|
|
46
46
|
/** List of stop words to use when generating */
|
|
47
47
|
stop?: string[];
|
|
48
|
+
/**
|
|
49
|
+
* Timeout to use when making requests to OpenAI.
|
|
50
|
+
*/
|
|
51
|
+
timeout?: number;
|
|
48
52
|
}
|
|
49
53
|
type Kwargs = Record<string, any>;
|
|
50
54
|
/**
|
|
@@ -72,6 +76,7 @@ export declare class ChatOpenAI extends BaseChatModel implements OpenAIInput {
|
|
|
72
76
|
modelName: string;
|
|
73
77
|
modelKwargs?: Kwargs;
|
|
74
78
|
stop?: string[];
|
|
79
|
+
timeout?: number;
|
|
75
80
|
streaming: boolean;
|
|
76
81
|
maxTokens?: number;
|
|
77
82
|
private client;
|
|
@@ -98,6 +98,12 @@ export class ChatOpenAI extends BaseChatModel {
|
|
|
98
98
|
writable: true,
|
|
99
99
|
value: void 0
|
|
100
100
|
});
|
|
101
|
+
Object.defineProperty(this, "timeout", {
|
|
102
|
+
enumerable: true,
|
|
103
|
+
configurable: true,
|
|
104
|
+
writable: true,
|
|
105
|
+
value: void 0
|
|
106
|
+
});
|
|
101
107
|
Object.defineProperty(this, "streaming", {
|
|
102
108
|
enumerable: true,
|
|
103
109
|
configurable: true,
|
|
@@ -110,7 +116,6 @@ export class ChatOpenAI extends BaseChatModel {
|
|
|
110
116
|
writable: true,
|
|
111
117
|
value: void 0
|
|
112
118
|
});
|
|
113
|
-
// Used for non-streaming requests
|
|
114
119
|
Object.defineProperty(this, "client", {
|
|
115
120
|
enumerable: true,
|
|
116
121
|
configurable: true,
|
|
@@ -129,6 +134,7 @@ export class ChatOpenAI extends BaseChatModel {
|
|
|
129
134
|
}
|
|
130
135
|
this.modelName = fields?.modelName ?? this.modelName;
|
|
131
136
|
this.modelKwargs = fields?.modelKwargs ?? {};
|
|
137
|
+
this.timeout = fields?.timeout;
|
|
132
138
|
this.temperature = fields?.temperature ?? this.temperature;
|
|
133
139
|
this.topP = fields?.topP ?? this.topP;
|
|
134
140
|
this.frequencyPenalty = fields?.frequencyPenalty ?? this.frequencyPenalty;
|
|
@@ -293,7 +299,11 @@ export class ChatOpenAI extends BaseChatModel {
|
|
|
293
299
|
if (!this.client) {
|
|
294
300
|
const clientConfig = new Configuration({
|
|
295
301
|
...this.clientConfig,
|
|
296
|
-
baseOptions: {
|
|
302
|
+
baseOptions: {
|
|
303
|
+
timeout: this.timeout,
|
|
304
|
+
adapter: fetchAdapter,
|
|
305
|
+
...this.clientConfig.baseOptions,
|
|
306
|
+
},
|
|
297
307
|
});
|
|
298
308
|
this.client = new OpenAIApi(clientConfig);
|
|
299
309
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/chat_models/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,SAAS,GAKV,MAAM,QAAQ,CAAC;AAEhB,OAAO,YAAY,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAC;AAC/D,OAAO,EACL,aAAa,EAGb,WAAW,EAEX,gBAAgB,EAEhB,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAY5B,SAAS,uBAAuB,CAC9B,IAAiB;IAEjB,QAAQ,IAAI,EAAE;QACZ,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,IAAI;YACP,OAAO,WAAW,CAAC;QACrB,KAAK,OAAO;YACV,OAAO,MAAM,CAAC;QAChB;YACE,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAC;KACpD;AACH,CAAC;AAED,SAAS,2BAA2B,CAClC,IAAuD,EACvD,IAAY;IAEZ,QAAQ,IAAI,EAAE;QACZ,KAAK,MAAM;YACT,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACpC,KAAK,WAAW;YACd,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;QACjC,KAAK,QAAQ;YACX,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrC;YACE,OAAO,IAAI,WAAW,CAAC,IAAI,EAAE,IAAI,IAAI,SAAS,CAAC,CAAC;KACnD;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/chat_models/openai.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,10 @@ interface OpenAIInput extends ModelParams {
|
|
|
33
33
|
modelKwargs?: Kwargs;
|
|
34
34
|
/** List of stop words to use when generating */
|
|
35
35
|
stop?: string[];
|
|
36
|
+
/**
|
|
37
|
+
* Timeout to use when making requests to OpenAI.
|
|
38
|
+
*/
|
|
39
|
+
timeout?: number;
|
|
36
40
|
/**
|
|
37
41
|
* Maximum number of tokens to generate in the completion. If not specified,
|
|
38
42
|
* defaults to the maximum number of tokens allowed by the model.
|
|
@@ -66,6 +70,7 @@ export declare class OpenAIChat extends LLM implements OpenAIInput {
|
|
|
66
70
|
modelName: string;
|
|
67
71
|
prefixMessages?: ChatCompletionRequestMessage[];
|
|
68
72
|
modelKwargs?: Kwargs;
|
|
73
|
+
timeout?: number;
|
|
69
74
|
stop?: string[];
|
|
70
75
|
streaming: boolean;
|
|
71
76
|
private client;
|
package/dist/llms/openai-chat.js
CHANGED
|
@@ -79,6 +79,12 @@ export class OpenAIChat extends LLM {
|
|
|
79
79
|
writable: true,
|
|
80
80
|
value: void 0
|
|
81
81
|
});
|
|
82
|
+
Object.defineProperty(this, "timeout", {
|
|
83
|
+
enumerable: true,
|
|
84
|
+
configurable: true,
|
|
85
|
+
writable: true,
|
|
86
|
+
value: void 0
|
|
87
|
+
});
|
|
82
88
|
Object.defineProperty(this, "stop", {
|
|
83
89
|
enumerable: true,
|
|
84
90
|
configurable: true,
|
|
@@ -110,6 +116,7 @@ export class OpenAIChat extends LLM {
|
|
|
110
116
|
this.modelName = fields?.modelName ?? this.modelName;
|
|
111
117
|
this.prefixMessages = fields?.prefixMessages ?? this.prefixMessages;
|
|
112
118
|
this.modelKwargs = fields?.modelKwargs ?? {};
|
|
119
|
+
this.timeout = fields?.timeout;
|
|
113
120
|
this.temperature = fields?.temperature ?? this.temperature;
|
|
114
121
|
this.topP = fields?.topP ?? this.topP;
|
|
115
122
|
this.frequencyPenalty = fields?.frequencyPenalty ?? this.frequencyPenalty;
|
|
@@ -258,8 +265,9 @@ export class OpenAIChat extends LLM {
|
|
|
258
265
|
const clientConfig = new Configuration({
|
|
259
266
|
...this.clientConfig,
|
|
260
267
|
baseOptions: {
|
|
261
|
-
|
|
268
|
+
timeout: this.timeout,
|
|
262
269
|
adapter: fetchAdapter,
|
|
270
|
+
...this.clientConfig.baseOptions,
|
|
263
271
|
},
|
|
264
272
|
});
|
|
265
273
|
this.client = new OpenAIApi(clientConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chat.js","sourceRoot":"","sources":["../../src/llms/openai-chat.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,SAAS,GAMV,MAAM,QAAQ,CAAC;AAEhB,OAAO,YAAY,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAiB,GAAG,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-chat.js","sourceRoot":"","sources":["../../src/llms/openai-chat.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,SAAS,GAMV,MAAM,QAAQ,CAAC;AAEhB,OAAO,YAAY,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAiB,GAAG,EAAE,MAAM,WAAW,CAAC;AA4D/C;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,UAAW,SAAQ,GAAG;IA+BjC,YACE,MAGG,EACH,aAAuC;QAEvC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QArCtB;;;;mBAAc,CAAC;WAAC;QAEhB;;;;mBAAO,CAAC;WAAC;QAET;;;;mBAAmB,CAAC;WAAC;QAErB;;;;mBAAkB,CAAC;WAAC;QAEpB;;;;mBAAI,CAAC;WAAC;QAEN;;;;;WAAmC;QAEnC;;;;;WAAmB;QAEnB;;;;mBAAY,eAAe;WAAC;QAE5B;;;;;WAAgD;QAEhD;;;;;WAAqB;QAErB;;;;;WAAiB;QAEjB;;;;;WAAgB;QAEhB;;;;mBAAY,KAAK;WAAC;QAElB;;;;;WAA0B;QAE1B;;;;;WAA8C;QAW5C,MAAM,MAAM,GAAG,MAAM,EAAE,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;QAClE,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;QACrD,IAAI,CAAC,cAAc,GAAG,MAAM,EAAE,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC;QACpE,IAAI,CAAC,WAAW,GAAG,MAAM,EAAE,WAAW,IAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,CAAC;QAE/B,IAAI,CAAC,WAAW,GAAG,MAAM,EAAE,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC;QAC3D,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,gBAAgB,GAAG,MAAM,EAAE,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,CAAC;QAC1E,IAAI,CAAC,eAAe,GAAG,MAAM,EAAE,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC;QACvE,IAAI,CAAC,CAAC,GAAG,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,SAAS,CAAC;QACnC,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,SAAS,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,IAAI,CAAC;QAEzB,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,SAAS,IAAI,KAAK,CAAC;QAE5C,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACrD;QAED,IAAI,CAAC,YAAY,GAAG;YAClB,MAAM;YACN,GAAG,aAAa;SACjB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,iBAAiB,EAAE,IAAI,CAAC,gBAAgB;YACxC,gBAAgB,EAAE,IAAI,CAAC,eAAe;YACtC,CAAC,EAAE,IAAI,CAAC,CAAC;YACT,UAAU,EAAE,IAAI,CAAC,SAAS;YAC1B,UAAU,EAAE,IAAI,CAAC,SAAS;YAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,SAAS;YACtB,GAAG,IAAI,CAAC,WAAW;SACpB,CAAC;IACJ,CAAC;IAED,kBAAkB;QAChB,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,SAAS;YAC1B,GAAG,IAAI,CAAC,gBAAgB,EAAE;YAC1B,GAAG,IAAI,CAAC,YAAY;SACrB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,iBAAiB;QACf,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,SAAS;YAC1B,GAAG,IAAI,CAAC,gBAAgB,EAAE;YAC1B,GAAG,IAAI,CAAC,YAAY;SACrB,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,MAAc;QACnC,MAAM,OAAO,GAAiC;YAC5C,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,MAAM;SAChB,CAAC;QACF,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,KAAK,CAAC,MAAc,EAAE,IAAe;QACzC,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvC,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC;QAElC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM;YACxB,CAAC,CAAC,MAAM,IAAI,OAAO,CAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAClE,IAAI,QAAsC,CAAC;gBAC3C,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,IAAI,CAAC,mBAAmB,CACtB;oBACE,GAAG,MAAM;oBACT,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;iBACtC,EACD;oBACE,YAAY,EAAE,QAAQ;oBACtB,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;wBACnB,IAAI,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,KAAK,QAAQ,EAAE;4BACrC,OAAO,CAAC,QAAQ,CAAC,CAAC;yBACnB;6BAAM;4BACL,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAUpC,CAAC;4BAEF,mDAAmD;4BACnD,IAAI,CAAC,QAAQ,EAAE;gCACb,QAAQ,GAAG;oCACT,EAAE,EAAE,OAAO,CAAC,EAAE;oCACd,MAAM,EAAE,OAAO,CAAC,MAAM;oCACtB,OAAO,EAAE,OAAO,CAAC,OAAO;oCACxB,KAAK,EAAE,OAAO,CAAC,KAAK;oCACpB,OAAO,EAAE,EAAE;iCACZ,CAAC;6BACH;4BAED,iCAAiC;4BACjC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;4BAChC,IAAI,IAAI,IAAI,IAAI,EAAE;gCAChB,IAAI,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAChC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAC9B,CAAC;gCAEF,IAAI,CAAC,MAAM,EAAE;oCACX,MAAM,GAAG;wCACP,KAAK,EAAE,IAAI,CAAC,KAAK;wCACjB,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,SAAS;qCAC/C,CAAC;oCACF,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iCAC/B;gCAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;oCACnB,MAAM,CAAC,OAAO,GAAG;wCACf,IAAI,EAAE,IAAI,CAAC,KAAK;4CACd,EAAE,IAA6C;wCACjD,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE;qCACnC,CAAC;iCACH;gCAED,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC;gCACpD,mCAAmC;gCACnC,KAAK,IAAI,CAAC,eAAe,CAAC,iBAAiB,CACzC,IAAI,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,EACzB,IAAI,CACL,CAAC;6BACH;yBACF;oBACH,CAAC;iBACF,CACF,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBAChB,IAAI,CAAC,QAAQ,EAAE;wBACb,QAAQ,GAAG,IAAI,CAAC;wBAChB,MAAM,CAAC,KAAK,CAAC,CAAC;qBACf;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC;YACJ,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBAC7B,GAAG,MAAM;gBACT,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;aACtC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,CAAC;IAChD,CAAC;IAED,cAAc;IACd,KAAK,CAAC,mBAAmB,CACvB,OAAoC,EACpC,OAAqC;QAErC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,YAAY,GAAG,IAAI,aAAa,CAAC;gBACrC,GAAG,IAAI,CAAC,YAAY;gBACpB,WAAW,EAAE;oBACX,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,OAAO,EAAE,YAAY;oBACrB,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW;iBACjC;aACF,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,CAAC;SAC3C;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CACrB,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAClD,OAAO,EACP,OAAO,CACR,CAAC;IACJ,CAAC;IAED,QAAQ;QACN,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
|
package/dist/llms/openai.d.ts
CHANGED
|
@@ -41,6 +41,10 @@ interface OpenAIInput extends ModelParams {
|
|
|
41
41
|
batchSize: number;
|
|
42
42
|
/** List of stop words to use when generating */
|
|
43
43
|
stop?: string[];
|
|
44
|
+
/**
|
|
45
|
+
* Timeout to use when making requests to OpenAI.
|
|
46
|
+
*/
|
|
47
|
+
timeout?: number;
|
|
44
48
|
}
|
|
45
49
|
type Kwargs = Record<string, any>;
|
|
46
50
|
/**
|
|
@@ -70,6 +74,7 @@ export declare class OpenAI extends BaseLLM implements OpenAIInput {
|
|
|
70
74
|
modelName: string;
|
|
71
75
|
modelKwargs?: Kwargs;
|
|
72
76
|
batchSize: number;
|
|
77
|
+
timeout?: number;
|
|
73
78
|
stop?: string[];
|
|
74
79
|
streaming: boolean;
|
|
75
80
|
private client;
|
package/dist/llms/openai.js
CHANGED
|
@@ -93,6 +93,12 @@ export class OpenAI extends BaseLLM {
|
|
|
93
93
|
writable: true,
|
|
94
94
|
value: 20
|
|
95
95
|
});
|
|
96
|
+
Object.defineProperty(this, "timeout", {
|
|
97
|
+
enumerable: true,
|
|
98
|
+
configurable: true,
|
|
99
|
+
writable: true,
|
|
100
|
+
value: void 0
|
|
101
|
+
});
|
|
96
102
|
Object.defineProperty(this, "stop", {
|
|
97
103
|
enumerable: true,
|
|
98
104
|
configurable: true,
|
|
@@ -105,7 +111,6 @@ export class OpenAI extends BaseLLM {
|
|
|
105
111
|
writable: true,
|
|
106
112
|
value: false
|
|
107
113
|
});
|
|
108
|
-
// Used for non-streaming requests
|
|
109
114
|
Object.defineProperty(this, "client", {
|
|
110
115
|
enumerable: true,
|
|
111
116
|
configurable: true,
|
|
@@ -125,6 +130,7 @@ export class OpenAI extends BaseLLM {
|
|
|
125
130
|
this.modelName = fields?.modelName ?? this.modelName;
|
|
126
131
|
this.modelKwargs = fields?.modelKwargs ?? {};
|
|
127
132
|
this.batchSize = fields?.batchSize ?? this.batchSize;
|
|
133
|
+
this.timeout = fields?.timeout;
|
|
128
134
|
this.temperature = fields?.temperature ?? this.temperature;
|
|
129
135
|
this.maxTokens = fields?.maxTokens ?? this.maxTokens;
|
|
130
136
|
this.topP = fields?.topP ?? this.topP;
|
|
@@ -294,8 +300,9 @@ export class OpenAI extends BaseLLM {
|
|
|
294
300
|
const clientConfig = new Configuration({
|
|
295
301
|
...this.clientConfig,
|
|
296
302
|
baseOptions: {
|
|
297
|
-
|
|
303
|
+
timeout: this.timeout,
|
|
298
304
|
adapter: fetchAdapter,
|
|
305
|
+
...this.clientConfig.baseOptions,
|
|
299
306
|
},
|
|
300
307
|
});
|
|
301
308
|
this.client = new OpenAIApi(clientConfig);
|
package/dist/llms/openai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/llms/openai.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EAKb,SAAS,GACV,MAAM,QAAQ,CAAC;AAChB,OAAO,YAAY,MAAM,gCAAgC,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAiB,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/llms/openai.ts"],"names":[],"mappings":"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"}
|
package/dist/memory/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { BufferMemory } from "./buffer_memory.js";
|
|
2
2
|
export { BaseMemory } from "./base.js";
|
|
3
3
|
export { BufferWindowMemory } from "./buffer_window_memory.js";
|
|
4
|
-
export { BaseChatMemory } from "./chat_memory.js";
|
|
4
|
+
export { BaseChatMemory, ChatMessageHistory } from "./chat_memory.js";
|
package/dist/memory/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { BufferMemory } from "./buffer_memory.js";
|
|
2
2
|
export { BaseMemory } from "./base.js";
|
|
3
3
|
export { BufferWindowMemory } from "./buffer_window_memory.js";
|
|
4
|
-
export { BaseChatMemory } from "./chat_memory.js";
|
|
4
|
+
export { BaseChatMemory, ChatMessageHistory } from "./chat_memory.js";
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
package/dist/memory/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/memory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/memory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
2
|
import { BaseOutputParser } from "../schema/index.js";
|
|
3
|
-
export declare class StructuredOutputParser<T extends z.
|
|
3
|
+
export declare class StructuredOutputParser<T extends z.ZodTypeAny> extends BaseOutputParser {
|
|
4
4
|
schema: T;
|
|
5
5
|
constructor(schema: T);
|
|
6
|
-
static fromZodSchema<T extends z.
|
|
6
|
+
static fromZodSchema<T extends z.ZodTypeAny>(schema: T): StructuredOutputParser<T>;
|
|
7
7
|
static fromNamesAndDescriptions<S extends {
|
|
8
8
|
[key: string]: string;
|
|
9
9
|
}>(schemas: S): StructuredOutputParser<z.ZodObject<{
|
|
@@ -1,30 +1,40 @@
|
|
|
1
|
-
/* eslint-disable no-else-return */
|
|
2
1
|
import { z } from "zod";
|
|
3
2
|
import { BaseOutputParser, OutputParserException } from "../schema/index.js";
|
|
4
3
|
function printSchema(schema, depth = 0) {
|
|
4
|
+
if (schema instanceof z.ZodString &&
|
|
5
|
+
schema._def.checks.some((check) => check.kind === "datetime")) {
|
|
6
|
+
return "datetime";
|
|
7
|
+
}
|
|
5
8
|
if (schema instanceof z.ZodString) {
|
|
6
9
|
return "string";
|
|
7
10
|
}
|
|
8
|
-
|
|
11
|
+
if (schema instanceof z.ZodNumber) {
|
|
12
|
+
return "number";
|
|
13
|
+
}
|
|
14
|
+
if (schema instanceof z.ZodBoolean) {
|
|
15
|
+
return "boolean";
|
|
16
|
+
}
|
|
17
|
+
if (schema instanceof z.ZodDate) {
|
|
18
|
+
return "date";
|
|
19
|
+
}
|
|
20
|
+
if (schema instanceof z.ZodOptional) {
|
|
21
|
+
return `${printSchema(schema._def.innerType, depth)} // Optional`;
|
|
22
|
+
}
|
|
23
|
+
if (schema instanceof z.ZodArray) {
|
|
9
24
|
return `${printSchema(schema._def.type, depth)}[]`;
|
|
10
25
|
}
|
|
11
|
-
|
|
26
|
+
if (schema instanceof z.ZodObject) {
|
|
12
27
|
const indent = "\t".repeat(depth);
|
|
13
28
|
const indentIn = "\t".repeat(depth + 1);
|
|
14
29
|
return `{${schema._def.description ? ` // ${schema._def.description}` : ""}
|
|
15
30
|
${Object.entries(schema.shape)
|
|
16
|
-
.map(([key, value]) =>
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
(value._def.description
|
|
20
|
-
? ` // ${value._def.description}`
|
|
21
|
-
: ""))
|
|
31
|
+
.map(([key, value]) => `${indentIn}"${key}": ${printSchema(value, depth + 1)}${value._def.description
|
|
32
|
+
? ` // ${value._def.description}`
|
|
33
|
+
: ""}`)
|
|
22
34
|
.join("\n")}
|
|
23
35
|
${indent}}`;
|
|
24
36
|
}
|
|
25
|
-
|
|
26
|
-
throw new Error(`Unsupported type: ${schema}`);
|
|
27
|
-
}
|
|
37
|
+
throw new Error(`Unsupported type: ${schema._def.innerType}`);
|
|
28
38
|
}
|
|
29
39
|
export class StructuredOutputParser extends BaseOutputParser {
|
|
30
40
|
constructor(schema) {
|
|
@@ -48,7 +58,7 @@ export class StructuredOutputParser extends BaseOutputParser {
|
|
|
48
58
|
|
|
49
59
|
\`\`\`json
|
|
50
60
|
${printSchema(this.schema)}
|
|
51
|
-
\`\`\`
|
|
61
|
+
\`\`\`
|
|
52
62
|
`;
|
|
53
63
|
}
|
|
54
64
|
async parse(text) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structured.js","sourceRoot":"","sources":["../../src/output_parsers/structured.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"structured.js","sourceRoot":"","sources":["../../src/output_parsers/structured.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,15 +9,15 @@ test("StructuredOutputParser.fromNamesAndDescriptions", async () => {
|
|
|
9
9
|
url: "value",
|
|
10
10
|
});
|
|
11
11
|
expect(parser.getFormatInstructions()).toMatchInlineSnapshot(`
|
|
12
|
-
|
|
12
|
+
"The output should be a markdown code snippet formatted in the following schema:
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
14
|
+
\`\`\`json
|
|
15
|
+
{
|
|
16
|
+
"url": string // A link to the resource
|
|
17
|
+
}
|
|
18
|
+
\`\`\`
|
|
19
|
+
"
|
|
20
|
+
`);
|
|
21
21
|
});
|
|
22
22
|
test("StructuredOutputParser.fromZodSchema", async () => {
|
|
23
23
|
const parser = StructuredOutputParser.fromZodSchema(z.object({ url: z.string().describe("A link to the resource") }));
|
|
@@ -25,46 +25,89 @@ test("StructuredOutputParser.fromZodSchema", async () => {
|
|
|
25
25
|
url: "value",
|
|
26
26
|
});
|
|
27
27
|
expect(parser.getFormatInstructions()).toMatchInlineSnapshot(`
|
|
28
|
-
|
|
28
|
+
"The output should be a markdown code snippet formatted in the following schema:
|
|
29
29
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
30
|
+
\`\`\`json
|
|
31
|
+
{
|
|
32
|
+
"url": string // A link to the resource
|
|
33
|
+
}
|
|
34
|
+
\`\`\`
|
|
35
|
+
"
|
|
36
|
+
`);
|
|
37
|
+
});
|
|
38
|
+
test("StructuredOutputParser.fromZodSchema", async () => {
|
|
39
|
+
const parser = StructuredOutputParser.fromZodSchema(z.object({
|
|
40
|
+
answer: z.string().describe("answer to the user's question"),
|
|
41
|
+
sources: z
|
|
42
|
+
.array(z.string())
|
|
43
|
+
.describe("sources used to answer the question, should be websites."),
|
|
44
|
+
}));
|
|
45
|
+
expect(await parser.parse('```json\n{"answer": "value", "sources": ["this-source"]}```')).toEqual({
|
|
46
|
+
answer: "value",
|
|
47
|
+
sources: ["this-source"],
|
|
48
|
+
});
|
|
49
|
+
expect(parser.getFormatInstructions()).toMatchInlineSnapshot(`
|
|
50
|
+
"The output should be a markdown code snippet formatted in the following schema:
|
|
51
|
+
|
|
52
|
+
\`\`\`json
|
|
53
|
+
{
|
|
54
|
+
"answer": string // answer to the user's question
|
|
55
|
+
"sources": string[] // sources used to answer the question, should be websites.
|
|
56
|
+
}
|
|
57
|
+
\`\`\`
|
|
58
|
+
"
|
|
59
|
+
`);
|
|
37
60
|
});
|
|
38
61
|
test("StructuredOutputParser.fromZodSchema", async () => {
|
|
39
62
|
const parser = StructuredOutputParser.fromZodSchema(z
|
|
40
63
|
.object({
|
|
41
64
|
url: z.string().describe("A link to the resource"),
|
|
42
65
|
title: z.string().describe("A title for the resource"),
|
|
66
|
+
year: z.number().describe("The year the resource was created"),
|
|
67
|
+
createdAt: z
|
|
68
|
+
.string()
|
|
69
|
+
.datetime()
|
|
70
|
+
.describe("The date and time the resource was created"),
|
|
71
|
+
createdAtDate: z.coerce
|
|
72
|
+
.date()
|
|
73
|
+
.describe("The date the resource was created")
|
|
74
|
+
.optional(),
|
|
43
75
|
authors: z.array(z.object({
|
|
44
76
|
name: z.string().describe("The name of the author"),
|
|
45
77
|
email: z.string().describe("The email of the author"),
|
|
78
|
+
address: z
|
|
79
|
+
.string()
|
|
80
|
+
.optional()
|
|
81
|
+
.describe("The address of the author"),
|
|
46
82
|
})),
|
|
47
83
|
})
|
|
48
84
|
.describe("Only One object"));
|
|
49
|
-
expect(await parser.parse('```json\n{"url": "value", "title": "value", "authors": [{"name": "value", "email": "value"}]}```')).toEqual({
|
|
85
|
+
expect(await parser.parse('```json\n{"url": "value", "title": "value", "year": 2011, "createdAt": "2023-03-29T16:07:09.600Z", "createdAtDate": "2023-03-29", "authors": [{"name": "value", "email": "value"}]}```')).toEqual({
|
|
50
86
|
url: "value",
|
|
51
87
|
title: "value",
|
|
88
|
+
year: 2011,
|
|
89
|
+
createdAt: "2023-03-29T16:07:09.600Z",
|
|
90
|
+
createdAtDate: new Date("2023-03-29T00:00:00.000Z"),
|
|
52
91
|
authors: [{ name: "value", email: "value" }],
|
|
53
92
|
});
|
|
54
93
|
expect(parser.getFormatInstructions()).toMatchInlineSnapshot(`
|
|
55
|
-
|
|
94
|
+
"The output should be a markdown code snippet formatted in the following schema:
|
|
56
95
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
96
|
+
\`\`\`json
|
|
97
|
+
{ // Only One object
|
|
98
|
+
"url": string // A link to the resource
|
|
99
|
+
"title": string // A title for the resource
|
|
100
|
+
"year": number // The year the resource was created
|
|
101
|
+
"createdAt": datetime // The date and time the resource was created
|
|
102
|
+
"createdAtDate": date // Optional // The date the resource was created
|
|
103
|
+
"authors": {
|
|
104
|
+
"name": string // The name of the author
|
|
105
|
+
"email": string // The email of the author
|
|
106
|
+
"address": string // Optional // The address of the author
|
|
107
|
+
}[]
|
|
108
|
+
}
|
|
109
|
+
\`\`\`
|
|
110
|
+
"
|
|
111
|
+
`);
|
|
69
112
|
});
|
|
70
113
|
//# sourceMappingURL=structured.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structured.test.js","sourceRoot":"","sources":["../../../src/output_parsers/tests/structured.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,IAAI,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;IACjE,MAAM,MAAM,GAAG,sBAAsB,CAAC,wBAAwB,CAAC;QAC7D,GAAG,EAAE,wBAAwB;KAC9B,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC,OAAO,CAAC;QACjE,GAAG,EAAE,OAAO;KACb,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"structured.test.js","sourceRoot":"","sources":["../../../src/output_parsers/tests/structured.test.ts"],"names":[],"mappings":"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"}
|
package/dist/retrievers/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/retrievers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/retrievers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { Document } from "../document.js";
|
|
2
|
+
import { BaseRetriever } from "../schema/index.js";
|
|
3
|
+
import { AsyncCaller, AsyncCallerParams } from "../util/async_caller.js";
|
|
4
|
+
interface RemoteRetrieverParams extends AsyncCallerParams {
|
|
5
|
+
url: string;
|
|
6
|
+
auth?: Record<string, string>;
|
|
7
|
+
inputKey?: string;
|
|
8
|
+
responseKey?: string;
|
|
9
|
+
pageContentKey?: string;
|
|
10
|
+
metadataKey?: string;
|
|
11
|
+
}
|
|
12
|
+
export declare class RemoteLangChainRetriever extends BaseRetriever {
|
|
13
|
+
url: string;
|
|
14
|
+
auth?: Record<string, string>;
|
|
15
|
+
inputKey: string;
|
|
16
|
+
responseKey: string;
|
|
17
|
+
asyncCaller: AsyncCaller;
|
|
18
|
+
pageContentKey: string;
|
|
19
|
+
metadataKey: string;
|
|
20
|
+
constructor({ url, auth, inputKey, responseKey, pageContentKey, metadataKey, ...rest }: RemoteRetrieverParams);
|
|
21
|
+
getRelevantDocuments(query: string): Promise<Document[]>;
|
|
22
|
+
}
|
|
23
|
+
export {};
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { Document } from "../document.js";
|
|
2
|
+
import { BaseRetriever } from "../schema/index.js";
|
|
3
|
+
import { AsyncCaller } from "../util/async_caller.js";
|
|
4
|
+
export class RemoteLangChainRetriever extends BaseRetriever {
|
|
5
|
+
constructor({ url, auth = undefined, inputKey = "message", responseKey = "response", pageContentKey = "page_content", metadataKey = "metadata", ...rest }) {
|
|
6
|
+
super();
|
|
7
|
+
Object.defineProperty(this, "url", {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
configurable: true,
|
|
10
|
+
writable: true,
|
|
11
|
+
value: void 0
|
|
12
|
+
});
|
|
13
|
+
Object.defineProperty(this, "auth", {
|
|
14
|
+
enumerable: true,
|
|
15
|
+
configurable: true,
|
|
16
|
+
writable: true,
|
|
17
|
+
value: void 0
|
|
18
|
+
});
|
|
19
|
+
Object.defineProperty(this, "inputKey", {
|
|
20
|
+
enumerable: true,
|
|
21
|
+
configurable: true,
|
|
22
|
+
writable: true,
|
|
23
|
+
value: void 0
|
|
24
|
+
});
|
|
25
|
+
Object.defineProperty(this, "responseKey", {
|
|
26
|
+
enumerable: true,
|
|
27
|
+
configurable: true,
|
|
28
|
+
writable: true,
|
|
29
|
+
value: void 0
|
|
30
|
+
});
|
|
31
|
+
Object.defineProperty(this, "asyncCaller", {
|
|
32
|
+
enumerable: true,
|
|
33
|
+
configurable: true,
|
|
34
|
+
writable: true,
|
|
35
|
+
value: void 0
|
|
36
|
+
});
|
|
37
|
+
Object.defineProperty(this, "pageContentKey", {
|
|
38
|
+
enumerable: true,
|
|
39
|
+
configurable: true,
|
|
40
|
+
writable: true,
|
|
41
|
+
value: void 0
|
|
42
|
+
});
|
|
43
|
+
Object.defineProperty(this, "metadataKey", {
|
|
44
|
+
enumerable: true,
|
|
45
|
+
configurable: true,
|
|
46
|
+
writable: true,
|
|
47
|
+
value: void 0
|
|
48
|
+
});
|
|
49
|
+
this.url = url;
|
|
50
|
+
this.auth = auth;
|
|
51
|
+
this.inputKey = inputKey;
|
|
52
|
+
this.responseKey = responseKey;
|
|
53
|
+
this.pageContentKey = pageContentKey;
|
|
54
|
+
this.metadataKey = metadataKey;
|
|
55
|
+
this.asyncCaller = new AsyncCaller(rest);
|
|
56
|
+
}
|
|
57
|
+
async getRelevantDocuments(query) {
|
|
58
|
+
const res = await this.asyncCaller.call(fetch, this.url, {
|
|
59
|
+
method: "POST",
|
|
60
|
+
body: JSON.stringify({
|
|
61
|
+
[this.inputKey]: query,
|
|
62
|
+
}),
|
|
63
|
+
headers: {
|
|
64
|
+
Accept: "application/json",
|
|
65
|
+
"Content-Type": "application/json",
|
|
66
|
+
...(this.auth ? this.auth : {}),
|
|
67
|
+
},
|
|
68
|
+
});
|
|
69
|
+
if (!res.ok) {
|
|
70
|
+
throw new Error(`Error calling RemoteLangChainRetriever: ${res.status}: ${res.statusText}`);
|
|
71
|
+
}
|
|
72
|
+
const body = await res.json();
|
|
73
|
+
return body[this.responseKey].map(
|
|
74
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
75
|
+
(r) => new Document({
|
|
76
|
+
pageContent: r[this.pageContentKey],
|
|
77
|
+
metadata: r[this.metadataKey],
|
|
78
|
+
}));
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=remote-retriever.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-retriever.js","sourceRoot":"","sources":["../../src/retrievers/remote-retriever.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAqB,MAAM,yBAAyB,CAAC;AAazE,MAAM,OAAO,wBAAyB,SAAQ,aAAa;IAezD,YAAY,EACV,GAAG,EACH,IAAI,GAAG,SAAS,EAChB,QAAQ,GAAG,SAAS,EACpB,WAAW,GAAG,UAAU,EACxB,cAAc,GAAG,cAAc,EAC/B,WAAW,GAAG,UAAU,EACxB,GAAG,IAAI,EACe;QACtB,KAAK,EAAE,CAAC;QAvBV;;;;;WAAY;QAEZ;;;;;WAA8B;QAE9B;;;;;WAAiB;QAEjB;;;;;WAAoB;QAEpB;;;;;WAAyB;QAEzB;;;;;WAAuB;QAEvB;;;;;WAAoB;QAYlB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,KAAa;QACtC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;YACvD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK;aACvB,CAAC;YACF,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,cAAc,EAAE,kBAAkB;gBAClC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;aAChC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YACX,MAAM,IAAI,KAAK,CACb,2CAA2C,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,UAAU,EAAE,CAC3E,CAAC;SACH;QAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG;QAC/B,8DAA8D;QAC9D,CAAC,CAAM,EAAE,EAAE,CACT,IAAI,QAAQ,CAAC;YACX,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC;YACnC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;SAC9B,CAAC,CACL,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -41,6 +41,7 @@ export class AsyncCaller {
|
|
|
41
41
|
call(callable, ...args) {
|
|
42
42
|
return this.queue.add(() => backOff(() => callable(...args), {
|
|
43
43
|
numOfAttempts: this.maxRetries,
|
|
44
|
+
jitter: "full",
|
|
44
45
|
// If needed we can change some of the defaults here,
|
|
45
46
|
// but they're quite sensible.
|
|
46
47
|
}), { throwOnTimeout: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async_caller.js","sourceRoot":"","sources":["../../src/util/async_caller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,MAAM,MAAM,SAAS,CAAC;AAe7B;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,WAAW;IAOtB,YAAY,MAAyB;QANrC;;;;;WAA8D;QAE9D;;;;;WAAsD;QAEtD;;;;;WAAwB;QAGtB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,QAAQ,CAAC;QACxD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,8DAA8D;IAC9D,IAAI,CACF,QAAW,EACX,GAAG,IAAmB;QAEtB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CACnB,GAAG,EAAE,CACH,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,EAAE;YAC/B,aAAa,EAAE,IAAI,CAAC,UAAU;YAC9B,qDAAqD;YACrD,8BAA8B;SAC/B,CAAC,EACJ,EAAE,cAAc,EAAE,IAAI,EAAE,CACzB,CAAC;IACJ,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"async_caller.js","sourceRoot":"","sources":["../../src/util/async_caller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,MAAM,MAAM,SAAS,CAAC;AAe7B;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,WAAW;IAOtB,YAAY,MAAyB;QANrC;;;;;WAA8D;QAE9D;;;;;WAAsD;QAEtD;;;;;WAAwB;QAGtB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,QAAQ,CAAC;QACxD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,8DAA8D;IAC9D,IAAI,CACF,QAAW,EACX,GAAG,IAAmB;QAEtB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CACnB,GAAG,EAAE,CACH,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,EAAE;YAC/B,aAAa,EAAE,IAAI,CAAC,UAAU;YAC9B,MAAM,EAAE,MAAM;YACd,qDAAqD;YACrD,8BAA8B;SAC/B,CAAC,EACJ,EAAE,cAAc,EAAE,IAAI,EAAE,CACzB,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -18,7 +18,7 @@ export class VectorStoreRetriever extends BaseRetriever {
|
|
|
18
18
|
this.k = fields.k ?? this.k;
|
|
19
19
|
}
|
|
20
20
|
async getRelevantDocuments(query) {
|
|
21
|
-
const results = await this.vectorStore.similaritySearch(query,
|
|
21
|
+
const results = await this.vectorStore.similaritySearch(query, this.k);
|
|
22
22
|
return results;
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/vectorstores/base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,OAAO,oBAAqB,SAAQ,aAAa;IAKrD,YAAY,MAAgD;QAC1D,KAAK,EAAE,CAAC;QALV;;;;;WAAyB;QAEzB;;;;mBAAI,CAAC;WAAC;QAIJ,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,KAAa;QACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/vectorstores/base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,OAAO,oBAAqB,SAAQ,aAAa;IAKrD,YAAY,MAAgD;QAC1D,KAAK,EAAE,CAAC;QALV;;;;;WAAyB;QAEzB;;;;mBAAI,CAAC;WAAC;QAIJ,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,KAAa;QACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QACvE,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAED,MAAM,OAAgB,WAAW;IAG/B,8DAA8D;IAC9D,YAAY,UAAsB,EAAE,SAA8B;QAHlE;;;;;WAAuB;QAIrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAeD,KAAK,CAAC,gBAAgB,CACpB,KAAa,EACb,CAAC,GAAG,CAAC,EACL,SAA6B,SAAS;QAEtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,+BAA+B,CACxD,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EACvC,CAAC,EACD,MAAM,CACP,CAAC;QAEF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC7B,KAAa,EACb,CAAC,GAAG,CAAC,EACL,SAA6B,SAAS;QAEtC,OAAO,IAAI,CAAC,+BAA+B,CACzC,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,EACvC,CAAC,EACD,MAAM,CACP,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,SAAS,CACd,MAAgB,EAChB,UAA6B,EAC7B,WAAuB;IACvB,8DAA8D;IAC9D,SAA8B;QAE9B,MAAM,IAAI,KAAK,CACb,qGAAqG,CACtG,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,aAAa,CAClB,KAAiB,EACjB,WAAuB;IACvB,8DAA8D;IAC9D,SAA8B;QAE9B,MAAM,IAAI,KAAK,CACb,qGAAqG,CACtG,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,CAAU;QACpB,OAAO,IAAI,oBAAoB,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;CACF;AAED,MAAM,OAAgB,mBAAoB,SAAQ,WAAW;IAG3D,MAAM,CAAC,IAAI,CACT,UAAkB,EAClB,WAAuB;QAEvB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;CACF"}
|
|
@@ -12,8 +12,28 @@ test("PineconeStore with external ids", async () => {
|
|
|
12
12
|
const embeddings = new FakeEmbeddings();
|
|
13
13
|
const store = new PineconeStore(embeddings, { pineconeIndex: client });
|
|
14
14
|
expect(store).toBeDefined();
|
|
15
|
-
await store.addDocuments([
|
|
15
|
+
await store.addDocuments([
|
|
16
|
+
{
|
|
17
|
+
pageContent: "hello",
|
|
18
|
+
metadata: {
|
|
19
|
+
a: 1,
|
|
20
|
+
b: { nested: [1, { a: 4 }] },
|
|
21
|
+
},
|
|
22
|
+
},
|
|
23
|
+
], ["id1"]);
|
|
16
24
|
expect(client.upsert).toHaveBeenCalledTimes(1);
|
|
25
|
+
expect(client.upsert).toHaveBeenCalledWith({
|
|
26
|
+
upsertRequest: {
|
|
27
|
+
namespace: undefined,
|
|
28
|
+
vectors: [
|
|
29
|
+
{
|
|
30
|
+
id: "id1",
|
|
31
|
+
metadata: { a: 1, "b.nested.0": 1, "b.nested.1.a": 4, text: "hello" },
|
|
32
|
+
values: [0.1, 0.2, 0.3, 0.4],
|
|
33
|
+
},
|
|
34
|
+
],
|
|
35
|
+
},
|
|
36
|
+
});
|
|
17
37
|
const results = await store.similaritySearch("hello", 1);
|
|
18
38
|
expect(results).toHaveLength(0);
|
|
19
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pinecone.test.js","sourceRoot":"","sources":["../../../src/vectorstores/tests/pinecone.test.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,IAAI,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;IACjD,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;QACjB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAO,CAAC,iBAAiB,CAAC;YACtC,OAAO,EAAE,EAAE;SACZ,CAAC;KACH,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,cAAc,EAAE,CAAC;IAExC,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,MAAa,EAAE,CAAC,CAAC;IAE9E,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAE5B,MAAM,KAAK,CAAC,YAAY,CACtB,
|
|
1
|
+
{"version":3,"file":"pinecone.test.js","sourceRoot":"","sources":["../../../src/vectorstores/tests/pinecone.test.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,IAAI,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;IACjD,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;QACjB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAO,CAAC,iBAAiB,CAAC;YACtC,OAAO,EAAE,EAAE;SACZ,CAAC;KACH,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,cAAc,EAAE,CAAC;IAExC,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,MAAa,EAAE,CAAC,CAAC;IAE9E,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAE5B,MAAM,KAAK,CAAC,YAAY,CACtB;QACE;YACE,WAAW,EAAE,OAAO;YACpB,QAAQ,EAAE;gBACR,CAAC,EAAE,CAAC;gBACJ,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;aAC7B;SACF;KACF,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAE/C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC;QACzC,aAAa,EAAE;YACb,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE;gBACP;oBACE,EAAE,EAAE,KAAK;oBACT,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;oBACrE,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;iBAC7B;aACF;SACF;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAEzD,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;IAClD,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;QACjB,KAAK,EAAE,IAAI,CAAC,EAAE,EAAO,CAAC,iBAAiB,CAAC;YACtC,OAAO,EAAE,EAAE;SACZ,CAAC;KACH,CAAC;IACF,MAAM,UAAU,GAAG,IAAI,cAAc,EAAE,CAAC;IAExC,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,MAAa,EAAE,CAAC,CAAC;IAE9E,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IAE5B,MAAM,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAEzE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAE/C,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAEzD,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC"}
|