@google/genai 1.24.0 → 1.25.0

package/dist/node/node.d.ts

@@ -467,7 +467,6 @@ export declare class Batches extends BaseModule {
      */
     list: (params?: types.ListBatchJobsParameters) => Promise<Pager<types.BatchJob>>;
     private createInlinedGenerateContentRequest;
-    private createInlinedEmbedContentRequest;
     private getGcsUri;
     private getBigqueryUri;
     private formatDestination;

package/dist/web/index.mjs

@@ -193,6 +193,98 @@ function getValueByPath(data, keys, defaultValue = undefined) {
         throw error;
     }
 }
+/**
+ * Moves values from source paths to destination paths.
+ *
+ * Examples:
+ *   moveValueByPath(
+ *     {'requests': [{'content': v1}, {'content': v2}]},
+ *     {'requests[].*': 'requests[].request.*'}
+ *   )
+ *     -> {'requests': [{'request': {'content': v1}}, {'request': {'content': v2}}]}
+ */
+function moveValueByPath(data, paths) {
+    for (const [sourcePath, destPath] of Object.entries(paths)) {
+        const sourceKeys = sourcePath.split('.');
+        const destKeys = destPath.split('.');
+        // Determine keys to exclude from wildcard to avoid cyclic references
+        const excludeKeys = new Set();
+        let wildcardIdx = -1;
+        for (let i = 0; i < sourceKeys.length; i++) {
+            if (sourceKeys[i] === '*') {
+                wildcardIdx = i;
+                break;
+            }
+        }
+        if (wildcardIdx !== -1 && destKeys.length > wildcardIdx) {
+            // Extract the intermediate key between source and dest paths
+            // Example: source=['requests[]', '*'], dest=['requests[]', 'request', '*']
+            // We want to exclude 'request'
+            for (let i = wildcardIdx; i < destKeys.length; i++) {
+                const key = destKeys[i];
+                if (key !== '*' && !key.endsWith('[]') && !key.endsWith('[0]')) {
+                    excludeKeys.add(key);
+                }
+            }
+        }
+        _moveValueRecursive(data, sourceKeys, destKeys, 0, excludeKeys);
+    }
+}
+/**
+ * Recursively moves values from source path to destination path.
+ */
+function _moveValueRecursive(data, sourceKeys, destKeys, keyIdx, excludeKeys) {
+    if (keyIdx >= sourceKeys.length) {
+        return;
+    }
+    if (typeof data !== 'object' || data === null) {
+        return;
+    }
+    const key = sourceKeys[keyIdx];
+    if (key.endsWith('[]')) {
+        const keyName = key.slice(0, -2);
+        const dataRecord = data;
+        if (keyName in dataRecord && Array.isArray(dataRecord[keyName])) {
+            for (const item of dataRecord[keyName]) {
+                _moveValueRecursive(item, sourceKeys, destKeys, keyIdx + 1, excludeKeys);
+            }
+        }
+    }
+    else if (key === '*') {
+        // wildcard - move all fields
+        if (typeof data === 'object' && data !== null && !Array.isArray(data)) {
+            const dataRecord = data;
+            const keysToMove = Object.keys(dataRecord).filter((k) => !k.startsWith('_') && !excludeKeys.has(k));
+            const valuesToMove = {};
+            for (const k of keysToMove) {
+                valuesToMove[k] = dataRecord[k];
+            }
+            // Set values at destination
+            for (const [k, v] of Object.entries(valuesToMove)) {
+                const newDestKeys = [];
+                for (const dk of destKeys.slice(keyIdx)) {
+                    if (dk === '*') {
+                        newDestKeys.push(k);
+                    }
+                    else {
+                        newDestKeys.push(dk);
+                    }
+                }
+                setValueByPath(dataRecord, newDestKeys, v);
+            }
+            for (const k of keysToMove) {
+                delete dataRecord[k];
+            }
+        }
+    }
+    else {
+        // Navigate to next level
+        const dataRecord = data;
+        if (key in dataRecord) {
+            _moveValueRecursive(dataRecord[key], sourceKeys, destKeys, keyIdx + 1, excludeKeys);
+        }
+    }
+}
 
 /**
  * @license
@@ -334,7 +426,7 @@ function generateVideosResponseFromVertex$1(fromObject) {
 }
 function generatedVideoFromMldev$1(fromObject) {
     const toObject = {};
-    const fromVideo = getValueByPath(fromObject, ['_self']);
+    const fromVideo = getValueByPath(fromObject, ['video']);
     if (fromVideo != null) {
         setValueByPath(toObject, ['video'], videoFromMldev$1(fromVideo));
     }
@@ -370,14 +462,11 @@ function getOperationParametersToVertex(fromObject) {
 }
 function videoFromMldev$1(fromObject) {
     const toObject = {};
-    const fromUri = getValueByPath(fromObject, ['video', 'uri']);
+    const fromUri = getValueByPath(fromObject, ['uri']);
     if (fromUri != null) {
         setValueByPath(toObject, ['uri'], fromUri);
     }
-    const fromVideoBytes = getValueByPath(fromObject, [
-        'video',
-        'encodedVideo',
-    ]);
+    const fromVideoBytes = getValueByPath(fromObject, ['encodedVideo']);
     if (fromVideoBytes != null) {
         setValueByPath(toObject, ['videoBytes'], tBytes$1(fromVideoBytes));
     }
@@ -3510,6 +3599,7 @@ function embedContentBatchToMldev(apiClient, fromObject) {
     const fromConfig = getValueByPath(fromObject, ['config']);
     if (fromConfig != null) {
         setValueByPath(toObject, ['_self'], embedContentConfigToMldev$1(fromConfig, toObject));
+        moveValueByPath(toObject, { 'requests[].*': 'requests[].request.*' });
     }
     return toObject;
 }
@@ -4291,38 +4381,11 @@ class Batches extends BaseModule {
          * ```
          */
         this.createEmbeddings = async (params) => {
-            var _a, _b;
             console.warn('batches.createEmbeddings() is experimental and may change without notice.');
             if (this.apiClient.isVertexAI()) {
                 throw new Error('Vertex AI does not support batches.createEmbeddings.');
             }
-            // MLDEV
-            const src = params.src;
-            const is_inlined = src.inlinedRequests !== undefined;
-            if (!is_inlined) {
-                return this.createEmbeddingsInternal(params); // Fixed typo here
-            }
-            // Inlined embed content requests handling
-            const result = this.createInlinedEmbedContentRequest(params);
-            const path = result.path;
-            const requestBody = result.body;
-            const queryParams = createEmbeddingsBatchJobParametersToMldev(this.apiClient, params)['_query'] || {};
-            const response = this.apiClient
-                .request({
-                path: path,
-                queryParams: queryParams,
-                body: JSON.stringify(requestBody),
-                httpMethod: 'POST',
-                httpOptions: (_a = params.config) === null || _a === void 0 ? void 0 : _a.httpOptions,
-                abortSignal: (_b = params.config) === null || _b === void 0 ? void 0 : _b.abortSignal,
-            })
-                .then((httpResponse) => {
-                return httpResponse.json();
-            });
-            return response.then((apiResponse) => {
-                const resp = batchJobFromMldev(apiResponse);
-                return resp;
-            });
+            return this.createEmbeddingsInternal(params);
         };
         /**
          * Lists batch job configurations.
@@ -4370,35 +4433,6 @@ class Batches extends BaseModule {
         delete body['_query'];
         return { path, body };
     }
-    // Helper function to handle inlined embedding requests
-    createInlinedEmbedContentRequest(params) {
-        const body = createEmbeddingsBatchJobParametersToMldev(this.apiClient, // Use instance apiClient
-        params);
-        const urlParams = body['_url'];
-        const path = formatMap('{model}:asyncBatchEmbedContent', urlParams);
-        const batch = body['batch'];
-        const inputConfig = batch['inputConfig'];
-        const requestsWrapper = inputConfig['requests'];
-        const requests = requestsWrapper['requests'];
-        const newRequests = [];
-        delete requestsWrapper['config']; // Remove top-level config
-        for (const request of requests) {
-            const requestDict = Object.assign({}, request); // Clone
-            const innerRequest = requestDict['request'];
-            for (const key in requestDict) {
-                if (key !== 'request') {
-                    innerRequest[key] = requestDict[key];
-                    delete requestDict[key];
-                }
-            }
-            newRequests.push(requestDict);
-        }
-        requestsWrapper['requests'] = newRequests;
-        delete body['config'];
-        delete body['_url'];
-        delete body['_query'];
-        return { path, body };
-    }
     // Helper function to get the first GCS URI
     getGcsUri(src) {
         if (typeof src === 'string') {
@@ -9273,7 +9307,7 @@ function generatedImageMaskFromVertex(fromObject) {
 }
 function generatedVideoFromMldev(fromObject) {
     const toObject = {};
-    const fromVideo = getValueByPath(fromObject, ['_self']);
+    const fromVideo = getValueByPath(fromObject, ['video']);
     if (fromVideo != null) {
         setValueByPath(toObject, ['video'], videoFromMldev(fromVideo));
     }
@@ -10419,14 +10453,11 @@ function upscaleImageResponseFromVertex(fromObject) {
 }
 function videoFromMldev(fromObject) {
     const toObject = {};
-    const fromUri = getValueByPath(fromObject, ['video', 'uri']);
+    const fromUri = getValueByPath(fromObject, ['uri']);
     if (fromUri != null) {
         setValueByPath(toObject, ['uri'], fromUri);
     }
-    const fromVideoBytes = getValueByPath(fromObject, [
-        'video',
-        'encodedVideo',
-    ]);
+    const fromVideoBytes = getValueByPath(fromObject, ['encodedVideo']);
     if (fromVideoBytes != null) {
         setValueByPath(toObject, ['videoBytes'], tBytes(fromVideoBytes));
     }
@@ -10498,11 +10529,11 @@ function videoToMldev(fromObject) {
     const toObject = {};
     const fromUri = getValueByPath(fromObject, ['uri']);
     if (fromUri != null) {
-        setValueByPath(toObject, ['video', 'uri'], fromUri);
+        setValueByPath(toObject, ['uri'], fromUri);
     }
     const fromVideoBytes = getValueByPath(fromObject, ['videoBytes']);
     if (fromVideoBytes != null) {
-        setValueByPath(toObject, ['video', 'encodedVideo'], tBytes(fromVideoBytes));
+        setValueByPath(toObject, ['encodedVideo'], tBytes(fromVideoBytes));
     }
     const fromMimeType = getValueByPath(fromObject, ['mimeType']);
     if (fromMimeType != null) {
@@ -10536,7 +10567,7 @@ const CONTENT_TYPE_HEADER = 'Content-Type';
 const SERVER_TIMEOUT_HEADER = 'X-Server-Timeout';
 const USER_AGENT_HEADER = 'User-Agent';
 const GOOGLE_API_CLIENT_HEADER = 'x-goog-api-client';
-const SDK_VERSION = '1.24.0'; // x-release-please-version
+const SDK_VERSION = '1.25.0'; // x-release-please-version
 const LIBRARY_LABEL = `google-genai-sdk/${SDK_VERSION}`;
 const VERTEX_AI_API_DEFAULT_VERSION = 'v1beta1';
 const GOOGLE_AI_API_DEFAULT_VERSION = 'v1beta';
@@ -12314,9 +12345,26 @@ class Models extends BaseModule {
          * ```
          */
         this.generateVideos = async (params) => {
+            var _a, _b, _c, _d, _e, _f;
             if ((params.prompt || params.image || params.video) && params.source) {
                 throw new Error('Source and prompt/image/video are mutually exclusive. Please only use source.');
             }
+            // Gemini API does not support video bytes.
+            if (!this.apiClient.isVertexAI()) {
+                if (((_a = params.video) === null || _a === void 0 ? void 0 : _a.uri) && ((_b = params.video) === null || _b === void 0 ? void 0 : _b.videoBytes)) {
+                    params.video = {
+                        uri: params.video.uri,
+                        mimeType: params.video.mimeType,
+                    };
+                }
+                else if (((_d = (_c = params.source) === null || _c === void 0 ? void 0 : _c.video) === null || _d === void 0 ? void 0 : _d.uri) &&
+                    ((_f = (_e = params.source) === null || _e === void 0 ? void 0 : _e.video) === null || _f === void 0 ? void 0 : _f.videoBytes)) {
+                    params.source.video = {
+                        uri: params.source.video.uri,
+                        mimeType: params.source.video.mimeType,
+                    };
+                }
+            }
             return await this.generateVideosInternal(params);
         };
     }