@promptbook/openai 0.112.0-62 → 0.112.0-63

package/esm/index.es.js

@@ -23,7 +23,7 @@ const BOOK_LANGUAGE_VERSION = '2.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.112.0-62';
+const PROMPTBOOK_ENGINE_VERSION = '0.112.0-63';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -7891,8 +7891,8 @@ class OpenAiAgentKitExecutionTools extends OpenAiVectorStoreHandler {
      * Prepares an AgentKit agent with optional knowledge sources and tool definitions.
      */
     async prepareAgentKitAgent(options) {
-        var _a, _b, _c;
-        const { name, instructions, knowledgeSources, tools, nativeAgentKitTools, vectorStoreId: cachedVectorStoreId, storeAsPrepared, } = options;
+        var _a, _b;
+        const { name, instructions, knowledgeSources, tools, vectorStoreId: cachedVectorStoreId, storeAsPrepared, } = options;
         await this.ensureAgentKitDefaults();
         if (this.options.isVerbose) {
             console.info('[🤰]', 'Preparing OpenAI AgentKit agent', {
@@ -7900,11 +7900,10 @@ class OpenAiAgentKitExecutionTools extends OpenAiVectorStoreHandler {
                 instructionsLength: instructions.length,
                 knowledgeSourcesCount: (_a = knowledgeSources === null || knowledgeSources === void 0 ? void 0 : knowledgeSources.length) !== null && _a !== void 0 ? _a : 0,
                 toolsCount: (_b = tools === null || tools === void 0 ? void 0 : tools.length) !== null && _b !== void 0 ? _b : 0,
-                nativeAgentKitToolsCount: (_c = nativeAgentKitTools === null || nativeAgentKitTools === void 0 ? void 0 : nativeAgentKitTools.length) !== null && _c !== void 0 ? _c : 0,
             });
         }
         let vectorStoreId = cachedVectorStoreId;
-        if (!vectorStoreId && knowledgeSources && knowledgeSources.length > 0) {
+        if (this.isNativeKnowledgeSearchEnabled && !vectorStoreId && knowledgeSources && knowledgeSources.length > 0) {
             const vectorStoreResult = await this.createVectorStoreWithKnowledgeSources({
                 client: await this.getClient(),
                 name,
@@ -7913,13 +7912,19 @@ class OpenAiAgentKitExecutionTools extends OpenAiVectorStoreHandler {
             });
             vectorStoreId = vectorStoreResult.vectorStoreId;
         }
-        else if (vectorStoreId && this.options.isVerbose) {
+        else if (this.isNativeKnowledgeSearchEnabled && vectorStoreId && this.options.isVerbose) {
             console.info('[🤰]', 'Using cached vector store for AgentKit agent', {
                 name,
                 vectorStoreId,
             });
         }
-        const agentKitTools = this.buildAgentKitTools({ tools, nativeAgentKitTools, vectorStoreId });
+        if (!this.isNativeKnowledgeSearchEnabled) {
+            vectorStoreId = undefined;
+        }
+        const agentKitTools = this.buildAgentKitTools({
+            tools,
+            vectorStoreId,
+        });
         const openAiAgentKitAgent = new Agent({
             name,
             model: this.agentKitModelName,
@@ -7938,7 +7943,7 @@ class OpenAiAgentKitExecutionTools extends OpenAiVectorStoreHandler {
                 name,
                 model: this.agentKitModelName,
                 toolCount: agentKitTools.length,
-                hasVectorStore: Boolean(vectorStoreId),
+                hasVectorStore: this.isNativeKnowledgeSearchEnabled && Boolean(vectorStoreId),
             });
         }
         return preparedAgent;
@@ -7958,14 +7963,11 @@ class OpenAiAgentKitExecutionTools extends OpenAiVectorStoreHandler {
      * Builds the tool list for AgentKit, including hosted file search when applicable.
      */
     buildAgentKitTools(options) {
-        const { tools, nativeAgentKitTools, vectorStoreId } = options;
+        const { tools, vectorStoreId } = options;
         const agentKitTools = [];
         if (vectorStoreId) {
             agentKitTools.push(fileSearchTool(vectorStoreId));
         }
-        if (nativeAgentKitTools && nativeAgentKitTools.length > 0) {
-            agentKitTools.push(...nativeAgentKitTools);
-        }
         if (tools && tools.length > 0) {
             let scriptTools = null;
             for (const toolDefinition of tools) {
@@ -8440,6 +8442,12 @@ class OpenAiAgentKitExecutionTools extends OpenAiVectorStoreHandler {
     get agentKitOptions() {
         return this.options;
     }
+    /**
+     * Returns true when hosted OpenAI vector-store search should back `knowledgeSources`.
+     */
+    get isNativeKnowledgeSearchEnabled() {
+        return this.agentKitOptions.isNativeKnowledgeSearchEnabled !== false;
+    }
     /**
      * Discriminant for type guards.
      */