@equinor/fusion-framework-cli-plugin-ai-base 2.0.1 → 3.0.0

package/dist/esm/setup-framework.js

@@ -1,72 +1,82 @@
 import { enableAI } from '@equinor/fusion-framework-module-ai';
-import { AzureOpenAiEmbed, AzureOpenAIModel, AzureVectorStore, } from '@equinor/fusion-framework-module-ai/azure';
-import { ModulesConfigurator } from '@equinor/fusion-framework-module';
+import { initializeFramework, FusionEnv } from '@equinor/fusion-framework-cli/bin';
+import { execFileSync } from 'node:child_process';
 /**
- * Initializes and configures the Fusion Framework with AI module capabilities.
+ * Check whether an error (possibly wrapped in a cause chain) is an
+ * authentication-related failure that may be recoverable via interactive login.
  *
- * Sets up the framework with Azure OpenAI chat models, embedding services, and
- * optionally Azure Cognitive Search vector stores. The function handles the complete
- * initialization process including service registration and dependency injection.
+ * @internal
+ */
+const isAuthError = (error) => {
+    let current = error;
+    while (current) {
+        if (current instanceof Error) {
+            if (current.name === 'NoAccountsError' ||
+                current.name === 'SilentTokenAcquisitionError' ||
+                current.message.includes('No accounts found')) {
+                return true;
+            }
+        }
+        current = current.cause;
+    }
+    return false;
+};
+/**
+ * Creates a Fusion Framework instance with the AI module enabled.
  *
- * @param options - AI configuration options
- * @param options.openaiApiKey - Azure OpenAI API key for authentication
- * @param options.openaiApiVersion - Azure OpenAI API version (e.g., '2024-02-15-preview')
- * @param options.openaiInstance - Azure OpenAI instance name
- * @param options.openaiChatDeployment - Optional chat model deployment name
- * @param options.openaiEmbeddingDeployment - Optional embedding model deployment name
- * @param options.azureSearchEndpoint - Optional Azure Search service endpoint URL
- * @param options.azureSearchApiKey - Optional Azure Search API key
- * @param options.azureSearchIndexName - Optional Azure Search index name
- * @returns Promise resolving to an initialized framework instance with AI module configured
- * @throws {Error} If embedding deployment is required but not provided when configuring vector store
- * @throws {Error} If embedding service cannot be retrieved for vector store configuration
+ * Initialises the Fusion Framework with service discovery and MSAL auth,
+ * resolves the `'ai'` service endpoint, and pre-caches a bearer token.
+ * If MSAL has no cached credentials, the CLI's interactive `auth login`
+ * flow is spawned automatically before retrying.
+ *
+ * @param options - CLI options resolved by {@link withOptions}.
+ * @returns A fully initialised framework instance with the AI module.
+ * @throws {Error} When authentication fails after the interactive retry.
  */
 export const setupFramework = async (options) => {
-    // Create a new module configurator for the framework
-    const configurator = new ModulesConfigurator();
-    // Configure AI module with provided options
-    enableAI(configurator, (aiConfig) => {
-        // Configure chat model if deployment name is provided
-        if (options.openaiChatDeployment) {
-            aiConfig.setModel(options.openaiChatDeployment, new AzureOpenAIModel({
-                azureOpenAIApiKey: options.openaiApiKey,
-                azureOpenAIApiDeploymentName: options.openaiChatDeployment,
-                azureOpenAIApiInstanceName: options.openaiInstance,
-                azureOpenAIApiVersion: options.openaiApiVersion,
-            }));
-        }
-        // Configure embedding model if deployment name is provided
-        if (options.openaiEmbeddingDeployment) {
-            aiConfig.setEmbedding(options.openaiEmbeddingDeployment, new AzureOpenAiEmbed({
-                azureOpenAIApiKey: options.openaiApiKey,
-                azureOpenAIApiDeploymentName: options.openaiEmbeddingDeployment,
-                azureOpenAIApiInstanceName: options.openaiInstance,
-                azureOpenAIApiVersion: options.openaiApiVersion,
-            }));
-        }
-        // Configure vector store if Azure Search options are provided
-        // Vector store requires an embedding service to generate embeddings for documents
-        if (options.azureSearchEndpoint && options.azureSearchApiKey && options.azureSearchIndexName) {
-            if (!options.openaiEmbeddingDeployment) {
-                throw new Error('Embedding deployment is required to configure the vector store');
-            }
-            // Retrieve the embedding service to pass to the vector store
-            // The vector store uses embeddings to index and search documents
-            const embeddingService = aiConfig.getService('embeddings', options.openaiEmbeddingDeployment);
-            // Check that the embedding service was successfully retrieved
-            if (!embeddingService) {
-                throw new Error(`Embedding service '${options.openaiEmbeddingDeployment}' not found for vector store configuration`);
-            }
-            aiConfig.setVectorStore(options.azureSearchIndexName, new AzureVectorStore(embeddingService, {
-                endpoint: options.azureSearchEndpoint,
-                key: options.azureSearchApiKey,
-                indexName: options.azureSearchIndexName,
-            }));
+    // Service-discovery mode: resolve URL + scopes from Fusion service registry
+    const auth = options.token
+        ? { token: options.token }
+        : {
+            tenantId: options.tenantId ?? '3aa4a235-b6e2-48d5-9195-7fcf05b459b0',
+            clientId: options.clientId ?? 'a318b8e1-0295-4e17-98d5-35f67dfeba14',
+        };
+    const env = options.env ?? FusionEnv.ContinuesIntegration;
+    /** Initialise the framework, resolve the AI service, and pre-cache tokens. */
+    const initAndSetup = async () => {
+        const framework = await initializeFramework({ env, auth }, (configurator) => {
+            enableAI(configurator);
+        });
+        // resolveService makes an authenticated HTTP call — will throw
+        // NoAccountsError if the user has never logged in.
+        const service = await framework.serviceDiscovery.resolveService('ai');
+        const scopes = service.scopes ?? service.defaultScopes ?? [];
+        // Pre-cache a token for the AI service scopes so strategy callbacks
+        // don't attempt (and fail) a silent acquisition later.
+        const token = await framework.auth.acquireAccessToken({ request: { scopes } });
+        if (!token)
+            throw new Error('Failed to acquire access token for the AI service.');
+        return framework;
+    };
+    try {
+        return await initAndSetup();
+    }
+    catch (error) {
+        // If the failure is auth-related and we're not using a static token,
+        // spawn the CLI's own `auth login` (starts local server + browser)
+        // and retry the full init sequence.
+        if (!isAuthError(error) || options.token)
+            throw error;
+        const cliEntry = process.argv[1];
+        if (!cliEntry) {
+            throw new Error('Failed to acquire access token and could not determine CLI path for interactive login.');
         }
-    });
-    // Initialize the framework with all configured modules
-    const framework = await configurator.initialize();
-    return framework;
+        console.log('No cached credentials — launching interactive login…');
+        execFileSync(process.execPath, [cliEntry, 'auth', 'login'], {
+            stdio: 'inherit',
+        });
+        return await initAndSetup();
+    }
 };
 export default setupFramework;
 //# sourceMappingURL=setup-framework.js.map

package/dist/esm/setup-framework.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-framework.js","sourceRoot":"","sources":["../../src/setup-framework.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAuC,MAAM,qCAAqC,CAAC;AAEpG,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,2CAA2C,CAAC;AAGnD,OAAO,EAAE,mBAAmB,EAAwB,MAAM,kCAAkC,CAAC;AAW7F;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAAkB,EAA8B,EAAE;IACrF,qDAAqD;IACrD,MAAM,YAAY,GAAG,IAAI,mBAAmB,EAAc,CAAC;IAE3D,4CAA4C;IAC5C,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAyB,EAAE,EAAE;QACnD,sDAAsD;QACtD,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;YACjC,QAAQ,CAAC,QAAQ,CACf,OAAO,CAAC,oBAAoB,EAC5B,IAAI,gBAAgB,CAAC;gBACnB,iBAAiB,EAAE,OAAO,CAAC,YAAY;gBACvC,4BAA4B,EAAE,OAAO,CAAC,oBAAoB;gBAC1D,0BAA0B,EAAE,OAAO,CAAC,cAAc;gBAClD,qBAAqB,EAAE,OAAO,CAAC,gBAAgB;aAChD,CAAC,CACH,CAAC;QACJ,CAAC;QAED,2DAA2D;QAC3D,IAAI,OAAO,CAAC,yBAAyB,EAAE,CAAC;YACtC,QAAQ,CAAC,YAAY,CACnB,OAAO,CAAC,yBAAyB,EACjC,IAAI,gBAAgB,CAAC;gBACnB,iBAAiB,EAAE,OAAO,CAAC,YAAY;gBACvC,4BAA4B,EAAE,OAAO,CAAC,yBAAyB;gBAC/D,0BAA0B,EAAE,OAAO,CAAC,cAAc;gBAClD,qBAAqB,EAAE,OAAO,CAAC,gBAAgB;aAChD,CAAC,CACH,CAAC;QACJ,CAAC;QAED,8DAA8D;QAC9D,kFAAkF;QAClF,IAAI,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;YAC7F,IAAI,CAAC,OAAO,CAAC,yBAAyB,EAAE,CAAC;gBACvC,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;YACpF,CAAC;YAED,6DAA6D;YAC7D,iEAAiE;YACjE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC;YAE9F,8DAA8D;YAC9D,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CACb,sBAAsB,OAAO,CAAC,yBAAyB,4CAA4C,CACpG,CAAC;YACJ,CAAC;YAED,QAAQ,CAAC,cAAc,CACrB,OAAO,CAAC,oBAAoB,EAC5B,IAAI,gBAAgB,CAAC,gBAAgB,EAAE;gBACrC,QAAQ,EAAE,OAAO,CAAC,mBAAmB;gBACrC,GAAG,EAAE,OAAO,CAAC,iBAAiB;gBAC9B,SAAS,EAAE,OAAO,CAAC,oBAAoB;aACxC,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,uDAAuD;IACvD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAC;IAClD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"setup-framework.js","sourceRoot":"","sources":["../../src/setup-framework.ts"],"names":[],"mappings":"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"}

package/dist/esm/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '2.0.1';
+export const version = '3.0.0';
 //# sourceMappingURL=version.js.map