refactor: move and rename utils

Azure-Samples · Sep 4, 2023 · c0c2ba5 · c0c2ba5
1 parent 2b0e4ca
commit c0c2ba5
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/packages/api/src/lib/approaches/ask-read-retrieve-read.ts b/packages/api/src/lib/approaches/ask-read-retrieve-read.ts
@@ -6,7 +6,7 @@ import { initializeAgentExecutorWithOptions } from 'langchain/agents';
 import { CallbackManager, ConsoleCallbackHandler } from 'langchain/callbacks';
 import { OpenAiService } from '../../plugins/openai.js';
 import { LangchainService } from '../../plugins/langchain.js';
-import { CsvLookupTool, HtmlCallbackHandler } from '../util/index.js';
+import { CsvLookupTool, HtmlCallbackHandler } from '../langchain/index.js';
 import { AskApproach } from './approach.js';
 import { ApproachBase } from './approach-base.js';
 

diff --git a/packages/api/src/lib/approaches/chat-read-retrieve-read.ts b/packages/api/src/lib/approaches/chat-read-retrieve-read.ts
@@ -4,7 +4,7 @@ import { ChatApproach, ApproachResponse } from './approach.js';
 import { ApproachBase } from './approach-base.js';
 import { HistoryMessage, Message, messagesToString } from '../message.js';
 import { MessageBuilder } from '../message-builder.js';
-import { getTokenLimit } from '../model-helpers.js';
+import { getTokenLimit } from '../tokens.js';
 
 const SYSTEM_MESSAGE_CHAT_CONVERSATION = `Assistant helps the company employees with their healthcare plan questions, and questions about the employee handbook. Be brief in your answers.
 Answer ONLY with the facts listed in the list of sources below. If there isn't enough information below, say you don't know. Do not generate answers that don't use the sources below. If asking a clarifying question to the user would help, ask the question.

diff --git a/packages/api/src/lib/index.ts b/packages/api/src/lib/index.ts
@@ -2,4 +2,4 @@ export * from './approaches/index.js';
 export * from './util/index.js';
 export * from './message-builder.js';
 export * from './message.js';
-export * from './model-helpers.js';
+export * from './tokens.js';
diff --git a/packages/api/src/lib/util/csv-lookup-tool.ts → .../api/src/lib/langchain/csv-lookup-tool.ts b/packages/api/src/lib/util/csv-lookup-tool.ts → .../api/src/lib/langchain/csv-lookup-tool.ts
diff --git a/...api/src/lib/util/html-callback-handler.ts → ...rc/lib/langchain/html-callback-handler.ts b/...api/src/lib/util/html-callback-handler.ts → ...rc/lib/langchain/html-callback-handler.ts
diff --git a/packages/api/src/lib/langchain/index.ts b/packages/api/src/lib/langchain/index.ts
@@ -0,0 +1,2 @@
+export * from './csv-lookup-tool.js';
+export * from './html-callback-handler.js';
diff --git a/packages/api/src/lib/message-builder.ts b/packages/api/src/lib/message-builder.ts
@@ -1,4 +1,4 @@
-import { getTokenCountFromMessages } from './model-helpers.js';
+import { getTokenCountFromMessages } from './tokens.js';
 import { Message, MessageRole } from './message.js';
 
 export class MessageBuilder {

diff --git a/packages/api/src/lib/model-helpers.ts → packages/api/src/lib/tokens.ts b/packages/api/src/lib/model-helpers.ts → packages/api/src/lib/tokens.ts
diff --git a/packages/api/src/lib/util/index.ts b/packages/api/src/lib/util/index.ts
@@ -1,3 +1 @@
-export * from './csv-lookup-tool.js';
-export * from './html-callback-handler.js';
 export * from './string.js';