merge

dexaai · Oct 28, 2024 · ad185f4 · ad185f4
2 parents 554c398 + 955d3ae
commit ad185f4
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 0 deletions.
diff --git a/examples/abort-chat-completion.ts b/examples/abort-chat-completion.ts
@@ -1,6 +1,10 @@
 import 'dotenv/config';
 
+<<<<<<< HEAD
 import { ChatModel, type Msg, MsgUtil } from '../src/index.js';
+=======
+import { ChatModel, type Msg, MsgUtil } from '@dexaai/dexter';
+>>>>>>> origin/master
 
 /**
  * npx tsx examples/abort-chat-completion.ts

diff --git a/examples/ai-function.ts b/examples/ai-function.ts
@@ -1,5 +1,9 @@
 import 'dotenv/config';
 
+<<<<<<< HEAD
+=======
+import { ChatModel, createAIFunction, type Msg, MsgUtil } from '@dexaai/dexter';
+>>>>>>> origin/master
 import { z } from 'zod';
 
 import {

diff --git a/examples/ai-runner-with-error.ts b/examples/ai-runner-with-error.ts
@@ -7,7 +7,12 @@ import {
   createAIFunction,
   createAIRunner,
   MsgUtil,
+<<<<<<< HEAD
 } from '../src/index.js';
+=======
+} from '@dexaai/dexter';
+import { z } from 'zod';
+>>>>>>> origin/master
 
 /** Get the weather for a given location. */
 const getWeather = createAIFunction(

diff --git a/examples/ai-runner.ts b/examples/ai-runner.ts
@@ -7,7 +7,12 @@ import {
   createAIFunction,
   createAIRunner,
   MsgUtil,
+<<<<<<< HEAD
 } from '../src/index.js';
+=======
+} from '@dexaai/dexter';
+import { z } from 'zod';
+>>>>>>> origin/master
 
 /** Get the weather for a given location. */
 const getWeather = createAIFunction(

diff --git a/examples/caching-redis.ts b/examples/caching-redis.ts
@@ -1,5 +1,9 @@
 import 'dotenv/config';
 
+<<<<<<< HEAD
+=======
+import { EmbeddingModel } from '@dexaai/dexter';
+>>>>>>> origin/master
 import KeyvRedis from '@keyv/redis';
 import Keyv from 'keyv';
 

diff --git a/examples/extract-people-names.ts b/examples/extract-people-names.ts
@@ -1,5 +1,9 @@
 import 'dotenv/config';
 
+<<<<<<< HEAD
+=======
+import { ChatModel, createExtractFunction } from '@dexaai/dexter';
+>>>>>>> origin/master
 import { z } from 'zod';
 
 import { ChatModel, createExtractFunction } from '../src/index.js';

diff --git a/package.json b/package.json
@@ -1,7 +1,11 @@
 {
   "name": "@dexaai/dexter",
   "type": "module",
+<<<<<<< HEAD
   "version": "4.0.0-1",
+=======
+  "version": "4.0.0",
+>>>>>>> origin/master
   "description": "LLM tools used in production at Dexa, with a focus on real-world RAG.",
   "repository": "dexaai/dexter",
   "license": "MIT",
@@ -49,8 +53,12 @@
     "hash-object": "^5.0.1",
     "jsonrepair": "^3.8.1",
     "ky": "^1.7.2",
+<<<<<<< HEAD
     "ai-fetch": "../ai-fetch",
     "openai-fetch": "../openai-fetch",
+=======
+    "openai-fetch": "3.3.1",
+>>>>>>> origin/master
     "openai-zod-to-json-schema": "^1.0.3",
     "p-map": "^7.0.2",
     "p-throttle": "^6.2.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/ai-function/ai-runner.ts b/src/ai-function/ai-runner.ts
@@ -162,7 +162,11 @@ export function createAIRunner<Content = string>(args: {
 function getParams(args: {
   functions?: AIFunction[];
   mode: AIRunner.Mode;
+<<<<<<< HEAD
 }): Pick<Model.Chat.Config<Model.Chat.Client>, 'functions' | 'tools'> {
+=======
+}): Pick<Model.Chat.Config, 'functions' | 'tools'> {
+>>>>>>> origin/master
   const { functions } = args;
   // Return an empty object if there are no functions
   if (!functions?.length) {

diff --git a/src/ai-function/types.ts b/src/ai-function/types.ts
@@ -12,6 +12,7 @@ export type AIRunner<Content = string> = (
 ) => Promise<AIRunner.Response<Content>>;
 
 export namespace AIRunner {
+<<<<<<< HEAD
   export type Client = any;
 
   /** Parameters to execute a runner */
@@ -25,6 +26,13 @@ export namespace AIRunner {
       Model.Chat.Run & Model.Chat.Config<Client>,
       'messages' | 'functions' | 'tools'
     >
+=======
+  /** Parameters to execute a runner */
+  export type Params = SetOptional<Model.Chat.Run & Model.Chat.Config, 'model'>;
+
+  export type ModelParams = Partial<
+    Omit<Model.Chat.Run & Model.Chat.Config, 'messages' | 'functions' | 'tools'>
+>>>>>>> origin/master
   >;
 
   /** Response from executing a runner */

diff --git a/src/index.ts b/src/index.ts
@@ -12,7 +12,10 @@ export {
 export { createExtractFunction } from './extract/index.js';
 export type { ChatModelArgs } from './model/chat.js';
 export { ChatModel } from './model/chat.js';
+<<<<<<< HEAD
 export { createAnthropicClient } from './model/clients/anthropic.js';
+=======
+>>>>>>> origin/master
 export { createOpenAIClient } from './model/clients/openai.js';
 export type { CompletionModelArgs } from './model/completion.js';
 export { CompletionModel } from './model/completion.js';

diff --git a/src/model/types.ts b/src/model/types.ts
@@ -1,8 +1,11 @@
 /* eslint-disable no-use-before-define */
 import {
+<<<<<<< HEAD
   type AIChatClient,
   type AICompletionClient,
   type AIEmbeddingClient,
+=======
+>>>>>>> origin/master
   type ChatParams,
   type ChatResponse,
   type ChatStreamResponse,