@proteinjs/conversation 1.7.5 → 2.0.0

package/dist/src/OpenAiStreamProcessor.js

@@ -45,12 +45,15 @@ var stream_1 = require("stream");
  *   - When a response to the user is received, it writes to `outputStream`
  */
 var OpenAiStreamProcessor = /** @class */ (function () {
-    function OpenAiStreamProcessor(inputStream, onToolCalls, logLevel, abortSignal) {
+    function OpenAiStreamProcessor(inputStream, onToolCalls, usageDataAccumulator, logLevel, abortSignal, onUsageData) {
         this.onToolCalls = onToolCalls;
+        this.usageDataAccumulator = usageDataAccumulator;
         this.abortSignal = abortSignal;
+        this.onUsageData = onUsageData;
         this.accumulatedToolCalls = [];
         this.toolCallsExecuted = 0;
         this.currentToolCall = null;
+        this.outputStreamTerminated = false;
         this.logger = new logger_1.Logger({ name: this.constructor.name, logLevel: logLevel });
         this.inputStream = stream_1.Readable.from(inputStream);
         this.controlStream = this.createControlStream();
@@ -69,6 +72,7 @@ var OpenAiStreamProcessor = /** @class */ (function () {
      */
     OpenAiStreamProcessor.prototype.createControlStream = function () {
         var _this = this;
+        var finishedProcessingToolCallStream = false;
         return new stream_1.Transform({
             objectMode: true,
             transform: function (chunk, encoding, callback) {
@@ -90,24 +94,40 @@ var OpenAiStreamProcessor = /** @class */ (function () {
                         _this.handleToolCallDelta(chunk.choices[0].delta.tool_calls);
                     }
                     else if (((_e = chunk.choices[0]) === null || _e === void 0 ? void 0 : _e.finish_reason) === 'tool_calls') {
-                        _this.handleToolCalls();
+                        finishedProcessingToolCallStream = true;
                     }
                     else if (((_f = chunk.choices[0]) === null || _f === void 0 ? void 0 : _f.finish_reason) === 'stop') {
                         _this.outputStream.push({ finishReason: 'stop' });
                         _this.outputStream.push(null);
-                        _this.destroyStreams();
+                        _this.outputStreamTerminated = true;
                     }
                     else if (((_g = chunk.choices[0]) === null || _g === void 0 ? void 0 : _g.finish_reason) === 'length') {
                         _this.logger.info({ message: "The maximum number of output tokens was reached" });
                         _this.outputStream.push({ finishReason: 'length' });
                         _this.outputStream.push(null);
-                        _this.destroyStreams();
+                        _this.outputStreamTerminated = true;
                     }
                     else if (((_h = chunk.choices[0]) === null || _h === void 0 ? void 0 : _h.finish_reason) === 'content_filter') {
                         _this.logger.warn({ message: "Content was omitted due to a flag from OpenAI's content filters" });
                         _this.outputStream.push({ finishReason: 'content_filter' });
                         _this.outputStream.push(null);
-                        _this.destroyStreams();
+                        _this.outputStreamTerminated = true;
+                    }
+                    else if (chunk.usage) {
+                        _this.usageDataAccumulator.addTokenUsage({
+                            promptTokens: chunk.usage.prompt_tokens,
+                            completionTokens: chunk.usage.completion_tokens,
+                            totalTokens: chunk.usage.total_tokens,
+                        });
+                        if (finishedProcessingToolCallStream) {
+                            _this.handleToolCalls();
+                        }
+                        else if (_this.outputStreamTerminated) {
+                            if (_this.onUsageData) {
+                                _this.onUsageData(_this.usageDataAccumulator.usageData);
+                            }
+                            _this.destroyStreams();
+                        }
                     }
                     callback();
                 }

package/dist/src/OpenAiStreamProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenAiStreamProcessor.js","sourceRoot":"","sources":["../../src/OpenAiStreamProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OpenAiStreamProcessor.js","sourceRoot":"","sources":["../../src/OpenAiStreamProcessor.ts"],"names":[],"mappings":"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"}

package/dist/src/UsageData.d.ts

@@ -0,0 +1,38 @@
+import { TiktokenModel } from 'tiktoken';
+export type TokenUsage = {
+    promptTokens: number;
+    completionTokens: number;
+    totalTokens: number;
+};
+/**
+ * Usage data accumulated throughout the lifecycle of a single call to
+ * `OpenAi.generateResponse` or `OpenAi.generateStreamingResponse`.
+ */
+export type UsageData = {
+    /** The model used by the assistant */
+    model: TiktokenModel;
+    /** The token usage of the initial request sent to the assistant */
+    initialRequestTokenUsage: TokenUsage;
+    /** The total token usage of all requests sent to the assistant (ie. initial request + all subsequent tool call requests) */
+    totalTokenUsage: TokenUsage;
+    /** The number of requests sent to the assistant */
+    totalRequestsToAssistant: number;
+    /** The number of times each tool was called by the assistant */
+    callsPerTool: {
+        [toolName: string]: number;
+    };
+    /** The total number of tool calls made by the assistant */
+    totalToolCalls: number;
+};
+type UsageDataAccumulatorParams = {
+    model: TiktokenModel;
+};
+export declare class UsageDataAccumulator {
+    private processedInitialRequest;
+    usageData: UsageData;
+    constructor({ model }: UsageDataAccumulatorParams);
+    addTokenUsage(tokenUsage: TokenUsage): void;
+    recordToolCall(toolName: string): void;
+}
+export {};
+//# sourceMappingURL=UsageData.d.ts.map

package/dist/src/UsageData.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UsageData.d.ts","sourceRoot":"","sources":["../../src/UsageData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,MAAM,UAAU,GAAG;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,sCAAsC;IACtC,KAAK,EAAE,aAAa,CAAC;IACrB,mEAAmE;IACnE,wBAAwB,EAAE,UAAU,CAAC;IACrC,4HAA4H;IAC5H,eAAe,EAAE,UAAU,CAAC;IAC5B,mDAAmD;IACnD,wBAAwB,EAAE,MAAM,CAAC;IACjC,gEAAgE;IAChE,YAAY,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,2DAA2D;IAC3D,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC;AAEF,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,uBAAuB,CAAS;IACjC,SAAS,EAAE,SAAS,CAAC;gBAEhB,EAAE,KAAK,EAAE,EAAE,0BAA0B;IAmBjD,aAAa,CAAC,UAAU,EAAE,UAAU;IAapC,cAAc,CAAC,QAAQ,EAAE,MAAM;CAQhC"}

package/dist/src/UsageData.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UsageDataAccumulator = void 0;
+var UsageDataAccumulator = /** @class */ (function () {
+    function UsageDataAccumulator(_a) {
+        var model = _a.model;
+        this.processedInitialRequest = false;
+        this.usageData = {
+            model: model,
+            initialRequestTokenUsage: {
+                promptTokens: 0,
+                completionTokens: 0,
+                totalTokens: 0,
+            },
+            totalTokenUsage: {
+                promptTokens: 0,
+                completionTokens: 0,
+                totalTokens: 0,
+            },
+            totalRequestsToAssistant: 0,
+            callsPerTool: {},
+            totalToolCalls: 0,
+        };
+    }
+    UsageDataAccumulator.prototype.addTokenUsage = function (tokenUsage) {
+        this.usageData.totalRequestsToAssistant++;
+        if (!this.processedInitialRequest) {
+            this.usageData.initialRequestTokenUsage = tokenUsage;
+            this.processedInitialRequest = true;
+        }
+        this.usageData.totalTokenUsage = {
+            promptTokens: this.usageData.totalTokenUsage.promptTokens + tokenUsage.promptTokens,
+            completionTokens: this.usageData.totalTokenUsage.completionTokens + tokenUsage.completionTokens,
+            totalTokens: this.usageData.totalTokenUsage.totalTokens + tokenUsage.totalTokens,
+        };
+    };
+    UsageDataAccumulator.prototype.recordToolCall = function (toolName) {
+        if (!this.usageData.callsPerTool[toolName]) {
+            this.usageData.callsPerTool[toolName] = 0;
+        }
+        this.usageData.callsPerTool[toolName]++;
+        this.usageData.totalToolCalls++;
+    };
+    return UsageDataAccumulator;
+}());
+exports.UsageDataAccumulator = UsageDataAccumulator;
+//# sourceMappingURL=UsageData.js.map

package/dist/src/UsageData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UsageData.js","sourceRoot":"","sources":["../../src/UsageData.ts"],"names":[],"mappings":";;;AA+BA;IAIE,8BAAY,EAAqC;YAAnC,KAAK,WAAA;QAHX,4BAAuB,GAAG,KAAK,CAAC;QAItC,IAAI,CAAC,SAAS,GAAG;YACf,KAAK,OAAA;YACL,wBAAwB,EAAE;gBACxB,YAAY,EAAE,CAAC;gBACf,gBAAgB,EAAE,CAAC;gBACnB,WAAW,EAAE,CAAC;aACf;YACD,eAAe,EAAE;gBACf,YAAY,EAAE,CAAC;gBACf,gBAAgB,EAAE,CAAC;gBACnB,WAAW,EAAE,CAAC;aACf;YACD,wBAAwB,EAAE,CAAC;YAC3B,YAAY,EAAE,EAAE;YAChB,cAAc,EAAE,CAAC;SAClB,CAAC;IACJ,CAAC;IAED,4CAAa,GAAb,UAAc,UAAsB;QAClC,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE;YACjC,IAAI,CAAC,SAAS,CAAC,wBAAwB,GAAG,UAAU,CAAC;YACrD,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;SACrC;QACD,IAAI,CAAC,SAAS,CAAC,eAAe,GAAG;YAC/B,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY;YACnF,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,gBAAgB,GAAG,UAAU,CAAC,gBAAgB;YAC/F,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW;SACjF,CAAC;IACJ,CAAC;IAED,6CAAc,GAAd,UAAe,QAAgB;QAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;YAC1C,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC3C;QAED,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;IAClC,CAAC;IACH,2BAAC;AAAD,CAAC,AA5CD,IA4CC;AA5CY,oDAAoB"}

package/dist/src/code_template/Code.js

@@ -50,7 +50,7 @@ var Code = /** @class */ (function () {
                         if (this.args.imports) {
                             this.addImports(this.args.imports, this.args.conversation);
                         }
-                        return [4 /*yield*/, this.args.conversation.generateCode(this.args.description, 'gpt-4')];
+                        return [4 /*yield*/, this.args.conversation.generateCode({ description: this.args.description, model: 'gpt-4' })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });

package/dist/src/code_template/Code.js.map

@@ -1 +1 @@
-{"version":3,"file":"Code.js","sourceRoot":"","sources":["../../../src/code_template/Code.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmD;AAqBnD;IAGE,cAAY,IAAc;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEK,uBAAQ,GAAd;;;;;wBACE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;4BACrB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;yBAC5D;wBAEM,qBAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,EAAA;4BAAhF,sBAAO,SAAyE,EAAC;;;;KAClF;IAEO,yBAAU,GAAlB,UAAmB,OAAiB,EAAE,YAA0B;QAC9D,YAAY,CAAC,0BAA0B,CAAC;YACtC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,cAAc,EAAhB,CAAgB,CAAC,CAAC;YAC7D,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;SAC5B,CAAC,CAAC;IACL,CAAC;IAEO,iCAAkB,GAA1B,UAA2B,WAAqB;QAC9C,IAAM,cAAc,GAAG,uBAAW,CAAC,8BAA8B,CAAC;YAChE,WAAW,aAAA;YACX,6BAA6B,EAAE,IAAI;SACpC,CAAC,CAAC;QACH,IAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,OAAO,4DAAqD,YAAY,CAAE,CAAC;IAC7E,CAAC;IAEO,4BAAa,GAArB,UAAsB,OAAmC;QACvD,IAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAClC,UAAC,CAAC,IAAK,OAAA,mBAAY,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAY,CAAC,CAAC,2BAA2B,MAAG,EAAhF,CAAgF,CACxF,CAAC;QACF,OAAO,sCAA+B,gBAAgB,CAAE,CAAC;IAC3D,CAAC;IACH,WAAC;AAAD,CAAC,AArCD,IAqCC;AArCY,oBAAI"}
+{"version":3,"file":"Code.js","sourceRoot":"","sources":["../../../src/code_template/Code.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmD;AAqBnD;IAGE,cAAY,IAAc;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEK,uBAAQ,GAAd;;;;;wBACE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;4BACrB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;yBAC5D;wBAEM,qBAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAA;4BAAxG,sBAAO,SAAiG,EAAC;;;;KAC1G;IAEO,yBAAU,GAAlB,UAAmB,OAAiB,EAAE,YAA0B;QAC9D,YAAY,CAAC,0BAA0B,CAAC;YACtC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,cAAc,EAAhB,CAAgB,CAAC,CAAC;YAC7D,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;SAC5B,CAAC,CAAC;IACL,CAAC;IAEO,iCAAkB,GAA1B,UAA2B,WAAqB;QAC9C,IAAM,cAAc,GAAG,uBAAW,CAAC,8BAA8B,CAAC;YAChE,WAAW,aAAA;YACX,6BAA6B,EAAE,IAAI;SACpC,CAAC,CAAC;QACH,IAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,OAAO,4DAAqD,YAAY,CAAE,CAAC;IAC7E,CAAC;IAEO,4BAAa,GAArB,UAAsB,OAAmC;QACvD,IAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAClC,UAAC,CAAC,IAAK,OAAA,mBAAY,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAY,CAAC,CAAC,2BAA2B,MAAG,EAAhF,CAAgF,CACxF,CAAC;QACF,OAAO,sCAA+B,gBAAgB,CAAE,CAAC;IAC3D,CAAC;IACH,WAAC;AAAD,CAAC,AArCD,IAqCC;AArCY,oBAAI"}

package/dist/test/openai/openai.generateList.test.js

@@ -44,7 +44,7 @@ test('generateList should return an array of numbers, counting to 10', function
             case 0:
                 numbers = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten'];
                 _a = expect;
-                return [4 /*yield*/, OpenAi_1.OpenAi.generateList(["Create a list of numbers spelled out, from 1 to 10"])];
+                return [4 /*yield*/, new OpenAi_1.OpenAi().generateList({ messages: ["Create a list of numbers spelled out, from 1 to 10"] })];
             case 1:
                 _a.apply(void 0, [(_b.sent()).join(' ')]).toBe(numbers.join(' '));
                 return [2 /*return*/];

package/dist/test/openai/openai.generateList.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai.generateList.test.js","sourceRoot":"","sources":["../../../test/openai/openai.generateList.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0C;AAE1C,IAAI,CAAC,gEAAgE,EAAE;;;;;gBAC/D,OAAO,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBAChG,KAAA,MAAM,CAAA;gBAAE,qBAAM,eAAM,CAAC,YAAY,CAAC,CAAC,oDAAoD,CAAC,CAAC,EAAA;;gBAAzF,kBAAO,CAAC,SAAiF,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAC,CAAC,IAAI,CACxG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAClB,CAAC;;;;KACH,CAAC,CAAC"}
+{"version":3,"file":"openai.generateList.test.js","sourceRoot":"","sources":["../../../test/openai/openai.generateList.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0C;AAE1C,IAAI,CAAC,gEAAgE,EAAE;;;;;gBAC/D,OAAO,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBAChG,KAAA,MAAM,CAAA;gBACH,qBAAM,IAAI,eAAM,EAAE,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE,CAAC,oDAAoD,CAAC,EAAE,CAAC,EAAA;;gBADxG,kBACE,CAAC,SAAqG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAClH,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;;;;KAC3B,CAAC,CAAC"}

package/index.ts

@@ -11,3 +11,4 @@ export * from './src/history/MessageModerator';
 export * from './src/history/MessageHistory';
 export * from './src/ChatCompletionMessageParamFactory';
 export { AssistantResponseStreamChunk } from './src/OpenAiStreamProcessor';
+export { UsageData } from './src/UsageData';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proteinjs/conversation",
-  "version": "1.7.5",
+  "version": "2.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {
@@ -36,5 +36,6 @@
     "readline-sync": "1.4.10",
     "tiktoken": "1.0.15",
     "typescript": "5.2.2"
-  }
+  },
+  "gitHead": "244af0406c34b582f0f81c9a7d11cfb3e62ec255"
 }

package/src/CodegenConversation.ts

@@ -26,11 +26,14 @@ export class CodegenConversation {
     const conversation = await this.createConversation();
     conversation.addAssistantMessagesToHistory([CodegenConversation.INITIAL_QUESTION]);
     const initialUserInput = this.respondToUser(CodegenConversation.INITIAL_QUESTION);
-    let response = await conversation.generateResponse([initialUserInput], CodegenConversation.MODEL);
+    let responseObject = await conversation.generateResponse({
+      messages: [initialUserInput],
+      model: CodegenConversation.MODEL,
+    });
     // eslint-disable-next-line no-constant-condition
     while (true) {
-      const userInput = this.respondToUser(response);
-      response = await conversation.generateResponse([userInput], CodegenConversation.MODEL);
+      const userInput = this.respondToUser(responseObject.message);
+      responseObject = await conversation.generateResponse({ messages: [userInput], model: CodegenConversation.MODEL });
     }
   }
 

package/src/Conversation.ts

@@ -8,6 +8,7 @@ import { MessageModerator } from './history/MessageModerator';
 import { ConversationModule } from './ConversationModule';
 import { TiktokenModel, encoding_for_model } from 'tiktoken';
 import { searchLibrariesFunctionName } from './fs/package/PackageFunctions';
+import { UsageData } from './UsageData';
 
 export type ConversationParams = {
   name: string;
@@ -135,23 +136,19 @@ export class Conversation {
     }
 
     const summarizeConversationRequest = `First, call the ${summarizeConversationHistoryFunctionName} function`;
-    await OpenAi.generateResponse(
-      [summarizeConversationRequest],
-      model,
-      this.history,
-      this.functions,
-      this.messageModerators,
-      this.params.logLevel
-    );
+    await new OpenAi({
+      history: this.history,
+      functions: this.functions,
+      messageModerators: this.messageModerators,
+      logLevel: this.params.logLevel,
+    }).generateResponse({ messages: [summarizeConversationRequest], model });
     const referenceSummaryRequest = `If there's a file mentioned in the conversation summary, find and read the file to better respond to my next request. If that doesn't find anything, call the ${searchLibrariesFunctionName} function on other keywords in the conversation summary to find a file to read`;
-    await OpenAi.generateResponse(
-      [referenceSummaryRequest],
-      model,
-      this.history,
-      this.functions,
-      this.messageModerators,
-      this.params.logLevel
-    );
+    await new OpenAi({
+      history: this.history,
+      functions: this.functions,
+      messageModerators: this.messageModerators,
+      logLevel: this.params.logLevel,
+    }).generateResponse({ messages: [referenceSummaryRequest], model });
   }
 
   summarizeConversationHistory(summary: string) {
@@ -197,57 +194,69 @@ export class Conversation {
     }
   }
 
-  async generateResponse(messages: (string | ChatCompletionMessageParam)[], model?: TiktokenModel) {
+  async generateResponse({
+    messages,
+    model,
+  }: {
+    messages: (string | ChatCompletionMessageParam)[];
+    model?: TiktokenModel;
+  }) {
     await this.enforceTokenLimit(messages, model);
-    return await OpenAi.generateResponse(
-      messages,
-      model,
-      this.history,
-      this.functions,
-      this.messageModerators,
-      this.params.logLevel
-    );
+    return await new OpenAi({
+      history: this.history,
+      functions: this.functions,
+      messageModerators: this.messageModerators,
+      logLevel: this.params.logLevel,
+    }).generateResponse({ messages, model });
   }
 
-  async generateStreamingResponse(
-    messages: (string | ChatCompletionMessageParam)[],
-    model?: TiktokenModel,
-    abortSignal?: AbortSignal
-  ) {
+  async generateStreamingResponse({
+    messages,
+    model,
+    ...rest
+  }: {
+    messages: (string | ChatCompletionMessageParam)[];
+    model?: TiktokenModel;
+    abortSignal?: AbortSignal;
+    onUsageData?: (usageData: UsageData) => Promise<void>;
+  }) {
     await this.enforceTokenLimit(messages, model);
-    return await OpenAi.generateStreamingResponse(
-      messages,
-      model,
-      this.history,
-      this.functions,
-      this.messageModerators,
-      abortSignal,
-      this.params.logLevel
-    );
+    return await new OpenAi({
+      history: this.history,
+      functions: this.functions,
+      messageModerators: this.messageModerators,
+      logLevel: this.params.logLevel,
+    }).generateStreamingResponse({ messages, model, ...rest });
   }
 
-  async generateCode(description: string[], model?: TiktokenModel) {
-    this.logger.info({ message: `Generating code for description:\n${description.join('\n')}` });
-    const code = await OpenAi.generateCode(
-      description,
+  async generateCode({ description, model }: { description: string[]; model?: TiktokenModel }) {
+    this.logger.debug({ message: `Generating code`, obj: { description } });
+    const code = await new OpenAi({
+      history: this.history,
+      functions: this.functions,
+      messageModerators: this.messageModerators,
+      logLevel: this.params.logLevel,
+    }).generateCode({
+      messages: description,
       model,
-      this.history,
-      this.functions,
-      this.messageModerators,
-      !this.generatedCode,
-      this.params.logLevel
-    );
-    this.logger.info({ message: `Generated code:\n${code.slice(0, 150)}${code.length > 150 ? '...' : ''}` });
+      includeSystemMessages: !this.generatedCode,
+    });
+    this.logger.debug({ message: `Generated code`, obj: { code } });
     this.generatedCode = true;
     return code;
   }
 
-  async updateCodeFromFile(
-    codeToUpdateFilePath: string,
-    dependencyCodeFilePaths: string[],
-    description: string,
-    model?: TiktokenModel
-  ) {
+  async updateCodeFromFile({
+    codeToUpdateFilePath,
+    dependencyCodeFilePaths,
+    description,
+    model,
+  }: {
+    codeToUpdateFilePath: string;
+    dependencyCodeFilePaths: string[];
+    description: string;
+    model?: TiktokenModel;
+  }) {
     const codeToUpdate = await Fs.readFile(codeToUpdateFilePath);
     let dependencyDescription = `Assume the following exists:\n`;
     for (const dependencyCodeFilePath of dependencyCodeFilePaths) {
@@ -255,41 +264,39 @@ export class Conversation {
       dependencyDescription += dependencCode + '\n\n';
     }
 
-    this.logger.info({ message: `Updating code from file: ${codeToUpdateFilePath}` });
-    return await this.updateCode(codeToUpdate, dependencyDescription + description, model);
+    this.logger.debug({ message: `Updating code from file`, obj: { codeToUpdateFilePath } });
+    return await this.updateCode({ code: codeToUpdate, description: dependencyDescription + description, model });
   }
 
-  async updateCode(code: string, description: string, model?: TiktokenModel) {
-    this.logger.info({
-      message: `Updating code:\n${code.slice(0, 150)}${code.length > 150 ? '...' : ''}\nFrom description: ${description}`,
-    });
-    const updatedCode = await OpenAi.updateCode(
+  async updateCode({ code, description, model }: { code: string; description: string; model?: TiktokenModel }) {
+    this.logger.debug({ message: `Updating code`, obj: { description, code } });
+    const updatedCode = await new OpenAi({
+      history: this.history,
+      functions: this.functions,
+      messageModerators: this.messageModerators,
+      logLevel: this.params.logLevel,
+    }).updateCode({
       code,
       description,
       model,
-      this.history,
-      this.functions,
-      this.messageModerators,
-      !this.generatedCode,
-      this.params.logLevel
-    );
-    this.logger.info({
-      message: `Updated code:\n${updatedCode.slice(0, 150)}${updatedCode.length > 150 ? '...' : ''}`,
+      includeSystemMessages: !this.generatedCode,
     });
+    this.logger.debug({ message: `Updated code`, obj: { updatedCode } });
     this.generatedCode = true;
     return updatedCode;
   }
 
-  async generateList(description: string[], model?: TiktokenModel) {
-    const list = await OpenAi.generateList(
-      description,
+  async generateList({ description, model }: { description: string[]; model?: TiktokenModel }) {
+    const list = await new OpenAi({
+      history: this.history,
+      functions: this.functions,
+      messageModerators: this.messageModerators,
+      logLevel: this.params.logLevel,
+    }).generateList({
+      messages: description,
       model,
-      this.history,
-      this.functions,
-      this.messageModerators,
-      !this.generatedList,
-      this.params.logLevel
-    );
+      includeSystemMessages: !this.generatedList,
+    });
     this.generatedList = true;
     return list;
   }