@jaypie/llm 1.1.3 → 1.1.5
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/Llm.d.ts +3 -0
- package/dist/index.js +12 -6
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
package/dist/Llm.d.ts
CHANGED
|
@@ -7,5 +7,8 @@ declare class Llm implements LlmProvider {
|
|
|
7
7
|
constructor(providerName?: LlmProviderName);
|
|
8
8
|
private createProvider;
|
|
9
9
|
send(message: string, options?: LlmMessageOptions): Promise<string | JsonObject>;
|
|
10
|
+
static send(message: string, options?: LlmMessageOptions & {
|
|
11
|
+
llm?: LlmProviderName;
|
|
12
|
+
}): Promise<string | JsonObject>;
|
|
10
13
|
}
|
|
11
14
|
export default Llm;
|
package/dist/index.js
CHANGED
|
@@ -118,14 +118,15 @@ class OpenAiProvider {
|
|
|
118
118
|
const client = await this.getClient();
|
|
119
119
|
const messages = [];
|
|
120
120
|
if (options?.system) {
|
|
121
|
+
const content = options?.placeholders?.system === false
|
|
122
|
+
? options.system
|
|
123
|
+
: placeholders(options.system, options?.data);
|
|
121
124
|
const systemMessage = {
|
|
122
125
|
role: "developer",
|
|
123
|
-
content
|
|
124
|
-
? options.system
|
|
125
|
-
: placeholders(options.system, options?.data),
|
|
126
|
+
content,
|
|
126
127
|
};
|
|
127
128
|
messages.push(systemMessage);
|
|
128
|
-
this.log.
|
|
129
|
+
this.log.trace(`System message: ${content?.length} characters`);
|
|
129
130
|
}
|
|
130
131
|
const formattedMessage = options?.placeholders?.message === false
|
|
131
132
|
? message
|
|
@@ -135,7 +136,7 @@ class OpenAiProvider {
|
|
|
135
136
|
content: formattedMessage,
|
|
136
137
|
};
|
|
137
138
|
messages.push(userMessage);
|
|
138
|
-
this.log.
|
|
139
|
+
this.log.trace(`User message: ${formattedMessage?.length} characters`);
|
|
139
140
|
if (options?.response) {
|
|
140
141
|
this.log.trace("Using structured output");
|
|
141
142
|
const zodSchema = options.response instanceof z.ZodType
|
|
@@ -154,7 +155,7 @@ class OpenAiProvider {
|
|
|
154
155
|
messages,
|
|
155
156
|
model: options?.model || this.model,
|
|
156
157
|
});
|
|
157
|
-
this.log.
|
|
158
|
+
this.log.trace(`Assistant reply: ${completion.choices[0]?.message?.content?.length} characters`);
|
|
158
159
|
return completion.choices[0]?.message?.content || "";
|
|
159
160
|
}
|
|
160
161
|
}
|
|
@@ -187,6 +188,11 @@ class Llm {
|
|
|
187
188
|
async send(message, options) {
|
|
188
189
|
return this._llm.send(message, options);
|
|
189
190
|
}
|
|
191
|
+
static async send(message, options) {
|
|
192
|
+
const { llm, ...messageOptions } = options || {};
|
|
193
|
+
const instance = new Llm(llm);
|
|
194
|
+
return instance.send(message, messageOptions);
|
|
195
|
+
}
|
|
190
196
|
}
|
|
191
197
|
|
|
192
198
|
export { constants as LLM, Llm };
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../src/constants.ts","../src/util/naturalZodSchema.ts","../src/providers/OpenAiProvider.class.ts","../src/providers/AnthropicProvider.class.ts","../src/Llm.ts"],"sourcesContent":["export const PROVIDER = {\n ANTHROPIC: {\n MODEL: {\n CLAUDE_3_HAIKU: \"claude-3-5-haiku-latest\" as const,\n CLAUDE_3_OPUS: \"claude-3-opus-latest\" as const,\n CLAUDE_3_SONNET: \"claude-3-5-sonnet-latest\" as const,\n DEFAULT: \"claude-3-5-sonnet-latest\" as const,\n },\n NAME: \"anthropic\" as const,\n },\n OPENAI: {\n MODEL: {\n DEFAULT: \"gpt-4o\" as const,\n GPT_4: \"gpt-4\" as const,\n GPT_4_O: \"gpt-4o\" as const,\n },\n NAME: \"openai\" as const,\n },\n} as const;\n\nexport type LlmProviderName =\n | typeof PROVIDER.OPENAI.NAME\n | typeof PROVIDER.ANTHROPIC.NAME;\n\n// Last: Defaults\nexport const DEFAULT = {\n PROVIDER: PROVIDER.OPENAI,\n} as const;\n","import { z } from \"zod\";\nimport { NaturalSchema } from \"@jaypie/types\";\n\nexport default function naturalZodSchema(\n definition: NaturalSchema,\n): z.ZodTypeAny {\n if (Array.isArray(definition)) {\n if (definition.length === 0) {\n // Handle empty array - accept any[]\n return z.array(z.any());\n } else if (definition.length === 1) {\n // Handle array types\n const itemType = definition[0];\n switch (itemType) {\n case String:\n return z.array(z.string());\n case Number:\n return z.array(z.number());\n case Boolean:\n return z.array(z.boolean());\n default:\n if (typeof itemType === \"object\") {\n // Handle array of objects\n return z.array(naturalZodSchema(itemType));\n }\n // Handle enum arrays\n return z.enum(definition as [string, ...string[]]);\n }\n } else {\n // Handle enum arrays\n return z.enum(definition as [string, ...string[]]);\n }\n } else if (definition && typeof definition === \"object\") {\n if (Object.keys(definition).length === 0) {\n // Handle empty object - accept any key-value pairs\n return z.record(z.string(), z.any());\n } else {\n // Handle object with properties\n const schemaShape: Record<string, z.ZodTypeAny> = {};\n for (const [key, value] of Object.entries(definition)) {\n schemaShape[key] = naturalZodSchema(value);\n }\n return z.object(schemaShape);\n }\n } else {\n switch (definition) {\n case String:\n return z.string();\n case Number:\n return z.number();\n case Boolean:\n return z.boolean();\n case Object:\n return z.record(z.string(), z.any());\n case Array:\n return z.array(z.any());\n default:\n throw new Error(`Unsupported type: ${definition}`);\n }\n }\n}\n","import { getEnvSecret } from \"@jaypie/aws\";\nimport {\n ConfigurationError,\n JAYPIE,\n log as defaultLog,\n placeholders,\n} from \"@jaypie/core\";\nimport { JsonObject, NaturalSchema } from \"@jaypie/types\";\nimport { OpenAI } from \"openai\";\nimport { zodResponseFormat } from \"openai/helpers/zod\";\nimport { z } from \"zod\";\nimport { PROVIDER } from \"../constants.js\";\nimport {\n LlmProvider,\n LlmMessageOptions,\n} from \"../types/LlmProvider.interface.js\";\nimport naturalZodSchema from \"../util/naturalZodSchema.js\";\n\nexport class OpenAiProvider implements LlmProvider {\n private model: string;\n private _client?: OpenAI;\n private apiKey?: string;\n private log: typeof defaultLog;\n\n constructor(\n model: string = PROVIDER.OPENAI.MODEL.DEFAULT,\n { apiKey }: { apiKey?: string } = {},\n ) {\n this.model = model;\n this.apiKey = apiKey;\n this.log = defaultLog.lib({ lib: JAYPIE.LIB.LLM });\n }\n\n private async getClient(): Promise<OpenAI> {\n if (this._client) {\n return this._client;\n }\n\n const apiKey = this.apiKey || (await getEnvSecret(\"OPENAI_API_KEY\"));\n if (!apiKey) {\n throw new ConfigurationError(\n \"The application could not resolve the requested keys\",\n );\n }\n\n this._client = new OpenAI({ apiKey });\n this.log.trace(\"Initialized OpenAI client\");\n return this._client;\n }\n\n async send(\n message: string,\n options?: LlmMessageOptions,\n ): Promise<string | JsonObject> {\n const client = await this.getClient();\n const messages = [];\n\n if (options?.system) {\n const systemMessage = {\n role: \"developer\" as const,\n content:\n options?.placeholders?.system === false\n ? options.system\n : placeholders(options.system, options?.data),\n };\n messages.push(systemMessage);\n this.log.var({ systemMessage });\n }\n const formattedMessage =\n options?.placeholders?.message === false\n ? message\n : placeholders(message, options?.data);\n const userMessage = {\n role: \"user\" as const,\n content: formattedMessage,\n };\n messages.push(userMessage);\n this.log.var({ userMessage });\n\n if (options?.response) {\n this.log.trace(\"Using structured output\");\n const zodSchema =\n options.response instanceof z.ZodType\n ? options.response\n : naturalZodSchema(options.response as NaturalSchema);\n\n const completion = await client.beta.chat.completions.parse({\n messages,\n model: options?.model || this.model,\n response_format: zodResponseFormat(zodSchema, \"response\"),\n });\n this.log.var({ assistantReply: completion.choices[0].message.parsed });\n return completion.choices[0].message.parsed;\n }\n\n this.log.trace(\"Using text output (unstructured)\");\n const completion = await client.chat.completions.create({\n messages,\n model: options?.model || this.model,\n });\n this.log.var({ assistantReply: completion.choices[0].message.content });\n\n return completion.choices[0]?.message?.content || \"\";\n }\n}\n","import { JsonObject } from \"@jaypie/types\";\nimport { PROVIDER } from \"../constants.js\";\nimport { LlmProvider } from \"../types/LlmProvider.interface.js\";\n\nexport class AnthropicProvider implements LlmProvider {\n private model: string;\n\n constructor(model: string = PROVIDER.ANTHROPIC.MODEL.DEFAULT) {\n this.model = model;\n }\n\n async send(message: string): Promise<string | JsonObject> {\n // TODO: Implement Anthropic API call\n return `[anthropic ${this.model}] ${message}`;\n }\n}\n","import { JsonObject } from \"@jaypie/types\";\nimport { DEFAULT, LlmProviderName, PROVIDER } from \"./constants.js\";\nimport {\n LlmProvider,\n LlmMessageOptions,\n} from \"./types/LlmProvider.interface.js\";\nimport { OpenAiProvider } from \"./providers/OpenAiProvider.class.js\";\nimport { AnthropicProvider } from \"./providers/AnthropicProvider.class.js\";\n\nclass Llm implements LlmProvider {\n private _provider: LlmProviderName;\n private _llm: LlmProvider;\n\n constructor(providerName: LlmProviderName = DEFAULT.PROVIDER.NAME) {\n this._provider = providerName;\n this._llm = this.createProvider(providerName);\n }\n\n private createProvider(providerName: LlmProviderName): LlmProvider {\n switch (providerName) {\n case PROVIDER.OPENAI.NAME:\n return new OpenAiProvider();\n case PROVIDER.ANTHROPIC.NAME:\n return new AnthropicProvider();\n default:\n throw new Error(`Unsupported provider: ${providerName}`);\n }\n }\n\n async send(\n message: string,\n options?: LlmMessageOptions,\n ): Promise<string | JsonObject> {\n return this._llm.send(message, options);\n }\n}\n\nexport default Llm;\n"],"names":["defaultLog"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../src/constants.ts","../src/util/naturalZodSchema.ts","../src/providers/OpenAiProvider.class.ts","../src/providers/AnthropicProvider.class.ts","../src/Llm.ts"],"sourcesContent":["export const PROVIDER = {\n ANTHROPIC: {\n MODEL: {\n CLAUDE_3_HAIKU: \"claude-3-5-haiku-latest\" as const,\n CLAUDE_3_OPUS: \"claude-3-opus-latest\" as const,\n CLAUDE_3_SONNET: \"claude-3-5-sonnet-latest\" as const,\n DEFAULT: \"claude-3-5-sonnet-latest\" as const,\n },\n NAME: \"anthropic\" as const,\n },\n OPENAI: {\n MODEL: {\n DEFAULT: \"gpt-4o\" as const,\n GPT_4: \"gpt-4\" as const,\n GPT_4_O: \"gpt-4o\" as const,\n },\n NAME: \"openai\" as const,\n },\n} as const;\n\nexport type LlmProviderName =\n | typeof PROVIDER.OPENAI.NAME\n | typeof PROVIDER.ANTHROPIC.NAME;\n\n// Last: Defaults\nexport const DEFAULT = {\n PROVIDER: PROVIDER.OPENAI,\n} as const;\n","import { z } from \"zod\";\nimport { NaturalSchema } from \"@jaypie/types\";\n\nexport default function naturalZodSchema(\n definition: NaturalSchema,\n): z.ZodTypeAny {\n if (Array.isArray(definition)) {\n if (definition.length === 0) {\n // Handle empty array - accept any[]\n return z.array(z.any());\n } else if (definition.length === 1) {\n // Handle array types\n const itemType = definition[0];\n switch (itemType) {\n case String:\n return z.array(z.string());\n case Number:\n return z.array(z.number());\n case Boolean:\n return z.array(z.boolean());\n default:\n if (typeof itemType === \"object\") {\n // Handle array of objects\n return z.array(naturalZodSchema(itemType));\n }\n // Handle enum arrays\n return z.enum(definition as [string, ...string[]]);\n }\n } else {\n // Handle enum arrays\n return z.enum(definition as [string, ...string[]]);\n }\n } else if (definition && typeof definition === \"object\") {\n if (Object.keys(definition).length === 0) {\n // Handle empty object - accept any key-value pairs\n return z.record(z.string(), z.any());\n } else {\n // Handle object with properties\n const schemaShape: Record<string, z.ZodTypeAny> = {};\n for (const [key, value] of Object.entries(definition)) {\n schemaShape[key] = naturalZodSchema(value);\n }\n return z.object(schemaShape);\n }\n } else {\n switch (definition) {\n case String:\n return z.string();\n case Number:\n return z.number();\n case Boolean:\n return z.boolean();\n case Object:\n return z.record(z.string(), z.any());\n case Array:\n return z.array(z.any());\n default:\n throw new Error(`Unsupported type: ${definition}`);\n }\n }\n}\n","import { getEnvSecret } from \"@jaypie/aws\";\nimport {\n ConfigurationError,\n JAYPIE,\n log as defaultLog,\n placeholders,\n} from \"@jaypie/core\";\nimport { JsonObject, NaturalSchema } from \"@jaypie/types\";\nimport { OpenAI } from \"openai\";\nimport { zodResponseFormat } from \"openai/helpers/zod\";\nimport { z } from \"zod\";\nimport { PROVIDER } from \"../constants.js\";\nimport {\n LlmProvider,\n LlmMessageOptions,\n} from \"../types/LlmProvider.interface.js\";\nimport naturalZodSchema from \"../util/naturalZodSchema.js\";\n\nexport class OpenAiProvider implements LlmProvider {\n private model: string;\n private _client?: OpenAI;\n private apiKey?: string;\n private log: typeof defaultLog;\n\n constructor(\n model: string = PROVIDER.OPENAI.MODEL.DEFAULT,\n { apiKey }: { apiKey?: string } = {},\n ) {\n this.model = model;\n this.apiKey = apiKey;\n this.log = defaultLog.lib({ lib: JAYPIE.LIB.LLM });\n }\n\n private async getClient(): Promise<OpenAI> {\n if (this._client) {\n return this._client;\n }\n\n const apiKey = this.apiKey || (await getEnvSecret(\"OPENAI_API_KEY\"));\n if (!apiKey) {\n throw new ConfigurationError(\n \"The application could not resolve the requested keys\",\n );\n }\n\n this._client = new OpenAI({ apiKey });\n this.log.trace(\"Initialized OpenAI client\");\n return this._client;\n }\n\n async send(\n message: string,\n options?: LlmMessageOptions,\n ): Promise<string | JsonObject> {\n const client = await this.getClient();\n const messages = [];\n\n if (options?.system) {\n const content =\n options?.placeholders?.system === false\n ? options.system\n : placeholders(options.system, options?.data);\n const systemMessage = {\n role: \"developer\" as const,\n content,\n };\n messages.push(systemMessage);\n this.log.trace(`System message: ${content?.length} characters`);\n }\n const formattedMessage =\n options?.placeholders?.message === false\n ? message\n : placeholders(message, options?.data);\n const userMessage = {\n role: \"user\" as const,\n content: formattedMessage,\n };\n messages.push(userMessage);\n this.log.trace(`User message: ${formattedMessage?.length} characters`);\n\n if (options?.response) {\n this.log.trace(\"Using structured output\");\n const zodSchema =\n options.response instanceof z.ZodType\n ? options.response\n : naturalZodSchema(options.response as NaturalSchema);\n\n const completion = await client.beta.chat.completions.parse({\n messages,\n model: options?.model || this.model,\n response_format: zodResponseFormat(zodSchema, \"response\"),\n });\n this.log.var({ assistantReply: completion.choices[0].message.parsed });\n return completion.choices[0].message.parsed;\n }\n\n this.log.trace(\"Using text output (unstructured)\");\n const completion = await client.chat.completions.create({\n messages,\n model: options?.model || this.model,\n });\n this.log.trace(\n `Assistant reply: ${completion.choices[0]?.message?.content?.length} characters`,\n );\n\n return completion.choices[0]?.message?.content || \"\";\n }\n}\n","import { JsonObject } from \"@jaypie/types\";\nimport { PROVIDER } from \"../constants.js\";\nimport { LlmProvider } from \"../types/LlmProvider.interface.js\";\n\nexport class AnthropicProvider implements LlmProvider {\n private model: string;\n\n constructor(model: string = PROVIDER.ANTHROPIC.MODEL.DEFAULT) {\n this.model = model;\n }\n\n async send(message: string): Promise<string | JsonObject> {\n // TODO: Implement Anthropic API call\n return `[anthropic ${this.model}] ${message}`;\n }\n}\n","import { JsonObject } from \"@jaypie/types\";\nimport { DEFAULT, LlmProviderName, PROVIDER } from \"./constants.js\";\nimport {\n LlmProvider,\n LlmMessageOptions,\n} from \"./types/LlmProvider.interface.js\";\nimport { OpenAiProvider } from \"./providers/OpenAiProvider.class.js\";\nimport { AnthropicProvider } from \"./providers/AnthropicProvider.class.js\";\n\nclass Llm implements LlmProvider {\n private _provider: LlmProviderName;\n private _llm: LlmProvider;\n\n constructor(providerName: LlmProviderName = DEFAULT.PROVIDER.NAME) {\n this._provider = providerName;\n this._llm = this.createProvider(providerName);\n }\n\n private createProvider(providerName: LlmProviderName): LlmProvider {\n switch (providerName) {\n case PROVIDER.OPENAI.NAME:\n return new OpenAiProvider();\n case PROVIDER.ANTHROPIC.NAME:\n return new AnthropicProvider();\n default:\n throw new Error(`Unsupported provider: ${providerName}`);\n }\n }\n\n async send(\n message: string,\n options?: LlmMessageOptions,\n ): Promise<string | JsonObject> {\n return this._llm.send(message, options);\n }\n\n static async send(\n message: string,\n options?: LlmMessageOptions & { llm?: LlmProviderName },\n ): Promise<string | JsonObject> {\n const { llm, ...messageOptions } = options || {};\n const instance = new Llm(llm);\n return instance.send(message, messageOptions);\n }\n}\n\nexport default Llm;\n"],"names":["defaultLog"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jaypie/llm",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.5",
|
|
4
4
|
"description": "Large language model utilities",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Finlayson Studio",
|
|
@@ -35,5 +35,5 @@
|
|
|
35
35
|
"publishConfig": {
|
|
36
36
|
"access": "public"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "444299036d617cc9916c9b74cf48781680a98208"
|
|
39
39
|
}
|