v0.1.393

PiperOrigin-RevId: 611240855
google · Mar 6, 2024 · 05f6a14 · 05f6a14
1 parent 53735ee
commit 05f6a14
Show file tree

Hide file tree

Showing 15 changed files with 1,098 additions and 715 deletions.
diff --git a/javascript/build/ee_api_js.js b/javascript/build/ee_api_js.js
diff --git a/javascript/build/ee_api_js_debug.js b/javascript/build/ee_api_js_debug.js
diff --git a/javascript/build/ee_api_js_npm.js b/javascript/build/ee_api_js_npm.js
diff --git a/javascript/package.json b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@google/earthengine",
-  "version": "0.1.392",
+  "version": "0.1.393",
   "description": "JavaScript client for Google Earth Engine API.",
   "author": "Google LLC",
   "license": "Apache-2.0",

diff --git a/javascript/src/apiclient.js b/javascript/src/apiclient.js
@@ -24,7 +24,7 @@ const {trustedResourceUrl} = goog.require('safevalues');
 /** @namespace */
 const apiclient = {};
 
-const API_CLIENT_VERSION = '0.1.392';
+const API_CLIENT_VERSION = '0.1.393';
 
 exports.VERSION = apiVersion.VERSION;
 exports.API_CLIENT_VERSION = API_CLIENT_VERSION;

diff --git a/javascript/src/batch.js b/javascript/src/batch.js
@@ -126,14 +126,14 @@ class ExportTask {
  * @param {!Array<number>|string=} opt_crsTransform
  * @param {number=} opt_maxPixels
  * @param {number=} opt_shardSize
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.image.toAsset = function(
     image, opt_description, opt_assetId, opt_pyramidingPolicy, opt_dimensions,
     opt_region, opt_scale, opt_crs, opt_crsTransform, opt_maxPixels,
-    opt_shardSize,
-) {
+    opt_shardSize, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.image.toAsset, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -158,15 +158,15 @@ Export.image.toAsset = function(
  * @param {boolean=} opt_skipEmptyTiles
  * @param {string=} opt_fileFormat
  * @param {?data.ImageExportFormatConfig=} opt_formatOptions
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.image.toCloudStorage = function(
     image, opt_description, opt_bucket, opt_fileNamePrefix, opt_dimensions,
     opt_region, opt_scale, opt_crs, opt_crsTransform, opt_maxPixels,
     opt_shardSize, opt_fileDimensions, opt_skipEmptyTiles, opt_fileFormat,
-    opt_formatOptions,
-) {
+    opt_formatOptions, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.image.toCloudStorage, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -191,15 +191,15 @@ Export.image.toCloudStorage = function(
  * @param {boolean=} opt_skipEmptyTiles
  * @param {string=} opt_fileFormat
  * @param {?data.ImageExportFormatConfig=} opt_formatOptions
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.image.toDrive = function(
     image, opt_description, opt_folder, opt_fileNamePrefix, opt_dimensions,
     opt_region, opt_scale, opt_crs, opt_crsTransform, opt_maxPixels,
     opt_shardSize, opt_fileDimensions, opt_skipEmptyTiles, opt_fileFormat,
-    opt_formatOptions,
-) {
+    opt_formatOptions, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.image.toDrive, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -222,14 +222,14 @@ Export.image.toDrive = function(
  * @param {boolean=} opt_skipEmptyTiles
  * @param {string=} opt_mapsApiKey
  * @param {?Array<string>=} opt_bucketCorsUris
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.map.toCloudStorage = function(
     image, opt_description, opt_bucket, opt_fileFormat, opt_path,
     opt_writePublicTiles, opt_scale, opt_maxZoom, opt_minZoom, opt_region,
-    opt_skipEmptyTiles, opt_mapsApiKey, opt_bucketCorsUris,
-) {
+    opt_skipEmptyTiles, opt_mapsApiKey, opt_bucketCorsUris, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.map.toCloudStorage, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -246,13 +246,13 @@ Export.map.toCloudStorage = function(
  * @param {string=} opt_fileFormat
  * @param {string|!Array<string>=} opt_selectors
  * @param {number=} opt_maxVertices
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.table.toCloudStorage = function(
     collection, opt_description, opt_bucket, opt_fileNamePrefix, opt_fileFormat,
-    opt_selectors, opt_maxVertices,
-) {
+    opt_selectors, opt_maxVertices, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.table.toCloudStorage, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -269,13 +269,13 @@ Export.table.toCloudStorage = function(
  * @param {string=} opt_fileFormat
  * @param {string|!Array<string>=} opt_selectors
  * @param {number=} opt_maxVertices
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.table.toDrive = function(
     collection, opt_description, opt_folder, opt_fileNamePrefix, opt_fileFormat,
-    opt_selectors, opt_maxVertices,
-) {
+    opt_selectors, opt_maxVertices, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.table.toDrive, arguments);
   clientConfig['type'] = ExportType.TABLE;
@@ -290,12 +290,12 @@ Export.table.toDrive = function(
  * @param {string=} opt_description
  * @param {string=} opt_assetId
  * @param {number=} opt_maxVertices
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.table.toAsset = function(
-    collection, opt_description, opt_assetId, opt_maxVertices,
-) {
+    collection, opt_description, opt_assetId, opt_maxVertices, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.table.toAsset, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -312,13 +312,14 @@ Export.table.toAsset = function(
  * @param {string=} opt_thinningStrategy
  * @param {string|!Array<string>=} opt_thinningRanking
  * @param {string|!Array<string>=} opt_zOrderRanking
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.table.toFeatureView = function(
     collection, opt_description, opt_assetId, opt_maxFeaturesPerTile,
     opt_thinningStrategy, opt_thinningRanking, opt_zOrderRanking,
-) {
+    opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.table.toFeatureView, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -335,13 +336,13 @@ Export.table.toFeatureView = function(
  * @param {boolean=} opt_append
  * @param {string|!Array<string>=} opt_selectors
  * @param {number=} opt_maxVertices
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.table.toBigQuery = function(
     collection, opt_description, opt_table, opt_overwrite, opt_append,
-    opt_selectors, opt_maxVertices,
-) {
+    opt_selectors, opt_maxVertices, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.table.toBigQuery, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -363,14 +364,14 @@ Export.table.toBigQuery = function(
  * @param {!Array<number>|string=} opt_crsTransform
  * @param {number=} opt_maxPixels
  * @param {number=} opt_maxFrames
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.video.toCloudStorage = function(
     collection, opt_description, opt_bucket, opt_fileNamePrefix,
     opt_framesPerSecond, opt_dimensions, opt_region, opt_scale, opt_crs,
-    opt_crsTransform, opt_maxPixels, opt_maxFrames,
-) {
+    opt_crsTransform, opt_maxPixels, opt_maxFrames, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.video.toCloudStorage, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -392,14 +393,14 @@ Export.video.toCloudStorage = function(
  * @param {!Array<number>|string=} opt_crsTransform
  * @param {number=} opt_maxPixels
  * @param {number=} opt_maxFrames
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
 Export.video.toDrive = function(
     collection, opt_description, opt_folder, opt_fileNamePrefix,
     opt_framesPerSecond, opt_dimensions, opt_region, opt_scale, opt_crs,
-    opt_crsTransform, opt_maxPixels, opt_maxFrames,
-) {
+    opt_crsTransform, opt_maxPixels, opt_maxFrames, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.video.toDrive, arguments);
   const serverConfig = Export.convertToServerParams(
@@ -411,11 +412,12 @@ Export.video.toDrive = function(
  * @param {!ComputedObject} classifier
  * @param {string=} opt_description
  * @param {string=} opt_assetId
+ * @param {number=} opt_priority
  * @return {!ExportTask}
  * @export
  */
-Export.classifier.toAsset = function(classifier, opt_description, opt_assetId,
-) {
+Export.classifier.toAsset = function(
+    classifier, opt_description, opt_assetId, opt_priority) {
   const clientConfig =
       eeArguments.extractFromFunction(Export.classifier.toAsset, arguments);
   const serverConfig = Export.convertToServerParams(

diff --git a/javascript/src/encodable_batch.js b/javascript/src/encodable_batch.js
@@ -45,6 +45,7 @@ ee.rpc_convert_batch.taskToExportImageRequest = function(params) {
     // Int64s are encoded as strings.
     maxPixels: stringOrNull_(params['maxPixels']),
     requestId: stringOrNull_(params['id']),
+    priority: numberOrNull_(params['priority']),
   });
 
   const destination = ee.rpc_convert_batch.guessDestination_(params);
@@ -94,6 +95,7 @@ ee.rpc_convert_batch.taskToExportTableRequest = function(params) {
     maxErrorMeters: numberOrNull_(params['maxErrorMeters']),
     requestId: stringOrNull_(params['id']),
     maxVertices: numberOrNull_(params['maxVertices']),
+    priority: numberOrNull_(params['priority']),
   });
 
   const destination = ee.rpc_convert_batch.guessDestination_(params);
@@ -144,6 +146,7 @@ ee.rpc_convert_batch.taskToExportVideoRequest = function(params) {
     videoOptions: ee.rpc_convert_batch.buildVideoOptions_(params),
     fileExportOptions: null,
     requestId: stringOrNull_(params['id']),
+    priority: numberOrNull_(params['priority']),
   });
 
   const destination = ee.rpc_convert_batch.guessDestination_(params);
@@ -172,6 +175,7 @@ ee.rpc_convert_batch.taskToExportMapRequest = function(params) {
         // Only Export to cloud storage is allow currently.
         params, ee.rpc_convert_batch.ExportDestination.GCS),
     requestId: stringOrNull_(params['id']),
+    priority: numberOrNull_(params['priority']),
   });
 };
 
@@ -196,6 +200,7 @@ ee.rpc_convert_batch.taskToExportVideoMapRequest = function(params) {
         params, ee.rpc_convert_batch.ExportDestination.GCS),
     requestId: stringOrNull_(params['id']),
     version: stringOrNull_(params['version']),
+    priority: numberOrNull_(params['priority']),
   });
 };
 
@@ -222,6 +227,7 @@ ee.rpc_convert_batch.taskToExportClassifierRequest = function(params) {
       earthEngineDestination:
           ee.rpc_convert_batch.buildEarthEngineDestination_(params)
     }),
+    priority: numberOrNull_(params['priority']),
   });
 };
 

diff --git a/python/ee/__init__.py b/python/ee/__init__.py
@@ -1,6 +1,6 @@
 """The EE Python library."""
 
-__version__ = '0.1.392'
+__version__ = '0.1.393'
 
 # Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name

diff --git a/python/ee/_cloud_api_utils.py b/python/ee/_cloud_api_utils.py
@@ -829,6 +829,7 @@ def convert_operation_to_task(operation: Dict[str, Any]) -> Dict[str, Any]:
           'type': 'task_type',
           'destinationUris': 'destination_uris',
           'batchEecuUsageSeconds': 'batch_eecu_usage_seconds',
+          'priority': 'priority',
           })
   if operation.get('done'):
     if 'error' in operation: