From 7aa25b20403d6951588f985de24363f657e780c2 Mon Sep 17 00:00:00 2001
From: Google Earth Engine Authors <noreply@google.com>
Date: Thu, 24 Aug 2023 21:48:05 +0000
Subject: [PATCH] v0.1.367

PiperOrigin-RevId: 559876320
---
 javascript/build/ee_api_js.js       |  2 +-
 javascript/build/ee_api_js_debug.js | 12 +++++++-----
 javascript/build/ee_api_js_npm.js   | 12 +++++++-----
 javascript/package.json             |  2 +-
 javascript/src/apiclient.js         |  2 +-
 javascript/src/data.js              |  6 ++++--
 javascript/src/serializer.js        | 15 +++++++++++++++
 python/ee/__init__.py               |  2 +-
 python/ee/ee_types.py               |  4 ++--
 python/ee/featurecollection.py      |  4 ++--
 10 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/javascript/build/ee_api_js.js b/javascript/build/ee_api_js.js
index 2999c9593..0a22f5c16 100644
--- a/javascript/build/ee_api_js.js
+++ b/javascript/build/ee_api_js.js
@@ -440,7 +440,7 @@ Tc(q,f[m]))});return b?b(l):l};return this.callback?(tj(d,null,function(f,l){ret
 uj.prototype.send=function(a,b){var c=[a.B+" "+a.path+" HTTP/1.1"];c.push("Content-Type: application/json; charset=utf-8");var d=wj();null!=d&&c.push("Authorization: "+d);a=a.body?JSON.stringify(a.body):"";return[c.join("\r\n")+"\r\n\r\n"+a,b]};
 var xj=function(a,b,c){a=n(b.split("--"+a.split("; boundary=")[1]));for(b=a.next();!b.done;b=a.next())if(b=b.value.split("\r\n\r\n"),!(3>b.length)){var d=b[0].match(/\r\nContent-ID: <response-([^>]*)>/)[1],e=Number(b[1].match(/^HTTP\S*\s(\d+)\s/)[1]);c(d,e,b.slice(2).join("\r\n\r\n"))}},qj=function(){var a=yj.replace(/\/api$/,"");return"window"in r&&!a.match(/^https?:\/\/content-/)?a.replace(/^(https?:\/\/)(.*\.googleapis\.com)$/,"$1content-$2"):a},Aj=function(a,b,c){var d=[];a&&(d=d.concat(zj));
 b&&d.push("https://www.googleapis.com/auth/devstorage.read_write");a=d=d.concat(c);c=b=0;for(var e={};c<a.length;){var g=a[c++],f=t(g)?"o"+ya(g):(typeof g).charAt(0)+g;Object.prototype.hasOwnProperty.call(e,f)||(e[f]=!0,a[b++]=g)}a.length=b;return d},Gj=function(a,b,c){Bj&&Cj&&Bj({client_id:String(Cj),immediate:!0,scope:Dj.join(" ")},function(d){if("immediate_failed"==d.error&&c)c();else if("window"in r)try{Ej(function(){try{r.gapi.auth.setToken(d),Fj(a,b,d)}catch(e){b(e.toString())}})}catch(e){b(e.toString())}else Fj(a,
-b,d)})},wj=function(){Hj&&0<=Date.now()-Hj&&Ij();return Jj},Ij=function(){Hj=Jj=null},nj=function(a,b,c,d){null!=a?yj=a:Kj||(yj="https://earthengine.googleapis.com/api");null!=b?Lj=b:Kj||(Lj="https://earthengine.googleapis.com");void 0!==c&&(Mj=c);mj=null!=d?d:mj||"earthengine-legacy";Kj=!0},tj=function(a,b,c,d,e,g){nj();var f=Nj,l="application/x-www-form-urlencoded";e&&(l="application/json",d&&d.startsWith("multipart")&&(l=d,d="POST"));d=d||"POST";l={"Content-Type":l};var m="0.1.366";"0.1.366"===
+b,d)})},wj=function(){Hj&&0<=Date.now()-Hj&&Ij();return Jj},Ij=function(){Hj=Jj=null},nj=function(a,b,c,d){null!=a?yj=a:Kj||(yj="https://earthengine.googleapis.com/api");null!=b?Lj=b:Kj||(Lj="https://earthengine.googleapis.com");void 0!==c&&(Mj=c);mj=null!=d?d:mj||"earthengine-legacy";Kj=!0},tj=function(a,b,c,d,e,g){nj();var f=Nj,l="application/x-www-form-urlencoded";e&&(l="application/json",d&&d.startsWith("multipart")&&(l=d,d="POST"));d=d||"POST";l={"Content-Type":l};var m="0.1.367";"0.1.367"===
 m&&(m="latest");l["x-goog-api-client"]="ee-js/"+m;m=wj();if(null!=m)l.Authorization=m;else if(c&&Bj&&Cj)return Gj(function(){Oj(f,function(){tj(a,b,c,d)})}),null;b=b?b.clone():new Jd;null!=Pj&&b.add("key",Pj);f&&(l["X-Earth-Engine-Computation-Profiling"]="1");mj&&"earthengine-legacy"!==mj&&(l["X-Goog-User-Project"]=mj);b=Qj(b,a);null!=Mj&&(l["X-XSRF-Token"]=Mj);null!=Rj&&(l["X-Earth-Engine-App-ID-Token"]=Rj);m=e||null;var q=b?b.toString():"";"POST"===d&&void 0===e?m=q:/^[\s\xa0]*$/.test(q)||(a+=-1!=
 a.indexOf("?")?"&":"?",a+=q);e=a.startsWith("/")?yj+a:a;if(c)return Sj.push(Tj(e,c,d,m,l,g)),Uj.hf(),null;q=function(D,Q){this.setRequestHeader&&this.setRequestHeader(Q,D)};var v=0;for(g=null!=g?g:5;;){var B=Zi(Xi);B.open(d,e,!1);Cb(l,q,B);B.send(m);if(429!=B.status||v>g)break;v++}return Vj(B.status,function(D){try{return B.getResponseHeader(D)}catch(Q){return null}},B.responseText,f,void 0,e,d)},Tj=function(a,b,c,d,e,g){var f=0,l={url:a,method:c,content:d,headers:e},m=Nj,q=null!=g?g:10;l.callback=
 function(v){v=v.target;if(429==v.getStatus()&&f<q)return f++,setTimeout(function(){Sj.push(l);Uj.hf()},Math.min(12E4,1E3*Math.pow(2,f))),null;var B=Vj,D=v.getStatus(),Q=u(v.getResponseHeader,v);try{var Y=v.o?v.o.responseText:""}catch(T){Si(v.aa,"Can not get responseText: "+T.message),Y=""}return B(D,Q,Y,m,b,a,c)};return l},Oj=function(a,b){var c=Nj;try{Nj=a,b.call(void 0)}finally{Nj=c}},Vj=function(a,b,c,d,e,g,f){var l=d?b("X-Earth-Engine-Computation-Profile"):"";l&&d&&d(l);var m=function(Y){try{var T=
diff --git a/javascript/build/ee_api_js_debug.js b/javascript/build/ee_api_js_debug.js
index 1afcb7713..f1e77bc74 100644
--- a/javascript/build/ee_api_js_debug.js
+++ b/javascript/build/ee_api_js_debug.js
@@ -17372,7 +17372,7 @@ goog.debug.entryPointRegistry.register(function(transformer) {
 ee.apiclient = {};
 var module$contents$ee$apiclient_apiclient = {};
 ee.apiclient.VERSION = module$exports$ee$apiVersion.V1;
-ee.apiclient.API_CLIENT_VERSION = "0.1.366";
+ee.apiclient.API_CLIENT_VERSION = "0.1.367";
 ee.apiclient.NULL_VALUE = module$exports$eeapiclient$domain_object.NULL_VALUE;
 ee.apiclient.PromiseRequestService = module$exports$eeapiclient$promise_request_service.PromiseRequestService;
 ee.apiclient.MakeRequestParams = module$contents$eeapiclient$request_params_MakeRequestParams;
@@ -17653,8 +17653,8 @@ module$contents$ee$apiclient_apiclient.send = function(path, params, callback, m
   var profileHookAtCallTime = module$contents$ee$apiclient_apiclient.profileHook_, contentType = "application/x-www-form-urlencoded";
   body && (contentType = "application/json", method && method.startsWith("multipart") && (contentType = method, method = "POST"));
   method = method || "POST";
-  var headers = {"Content-Type":contentType}, version = "0.1.366";
-  "0.1.366" === version && (version = "latest");
+  var headers = {"Content-Type":contentType}, version = "0.1.367";
+  "0.1.367" === version && (version = "latest");
   headers[module$contents$ee$apiclient_apiclient.API_CLIENT_VERSION_HEADER] = "ee-js/" + version;
   var authToken = module$contents$ee$apiclient_apiclient.getAuthToken();
   if (null != authToken) {
@@ -18838,7 +18838,9 @@ ee.Serializer.encodeCloudApi = function(obj) {
 };
 goog.exportSymbol("ee.Serializer.encodeCloudApi", ee.Serializer.encodeCloudApi);
 ee.Serializer.encodeCloudApiExpression = function(obj, unboundName) {
-  var serializer = new ee.Serializer(!0);
+  return ee.Serializer.encodeCloudApiExpressionWithSerializer(new ee.Serializer(!0), obj, unboundName);
+};
+ee.Serializer.encodeCloudApiExpressionWithSerializer = function(serializer, obj, unboundName) {
   serializer.unboundName = unboundName;
   return serializer.encodeForCloudApi_(obj);
 };
@@ -19422,7 +19424,7 @@ ee.data.listFeatures = function(asset, params, opt_callback) {
 };
 goog.exportSymbol("ee.data.listFeatures", ee.data.listFeatures);
 ee.data.computeValue = function(obj, opt_callback) {
-  var request = {expression:ee.data.expressionAugmenter_(ee.Serializer.encodeCloudApiExpression(obj))}, workloadTag = ee.data.getWorkloadTag();
+  var request = {expression:ee.data.expressionAugmenter_(ee.Serializer.encodeCloudApiExpressionWithSerializer(new ee.Serializer(!0), obj, void 0))}, workloadTag = ee.data.getWorkloadTag();
   workloadTag && (request.workloadTag = workloadTag);
   var call = new module$contents$ee$apiclient_Call(opt_callback);
   return call.handle(call.value().compute(call.projectsPath(), new module$exports$eeapiclient$ee_api_client.ComputeValueRequest(request)).then(function(x) {
diff --git a/javascript/build/ee_api_js_npm.js b/javascript/build/ee_api_js_npm.js
index 341f50738..99813faab 100644
--- a/javascript/build/ee_api_js_npm.js
+++ b/javascript/build/ee_api_js_npm.js
@@ -17372,7 +17372,7 @@ goog.debug.entryPointRegistry.register(function(transformer) {
 ee.apiclient = {};
 var module$contents$ee$apiclient_apiclient = {};
 ee.apiclient.VERSION = module$exports$ee$apiVersion.V1;
-ee.apiclient.API_CLIENT_VERSION = "0.1.366";
+ee.apiclient.API_CLIENT_VERSION = "0.1.367";
 ee.apiclient.NULL_VALUE = module$exports$eeapiclient$domain_object.NULL_VALUE;
 ee.apiclient.PromiseRequestService = module$exports$eeapiclient$promise_request_service.PromiseRequestService;
 ee.apiclient.MakeRequestParams = module$contents$eeapiclient$request_params_MakeRequestParams;
@@ -17653,8 +17653,8 @@ module$contents$ee$apiclient_apiclient.send = function(path, params, callback, m
   var profileHookAtCallTime = module$contents$ee$apiclient_apiclient.profileHook_, contentType = "application/x-www-form-urlencoded";
   body && (contentType = "application/json", method && method.startsWith("multipart") && (contentType = method, method = "POST"));
   method = method || "POST";
-  var headers = {"Content-Type":contentType}, version = "0.1.366";
-  "0.1.366" === version && (version = "latest");
+  var headers = {"Content-Type":contentType}, version = "0.1.367";
+  "0.1.367" === version && (version = "latest");
   headers[module$contents$ee$apiclient_apiclient.API_CLIENT_VERSION_HEADER] = "ee-js/" + version;
   var authToken = module$contents$ee$apiclient_apiclient.getAuthToken();
   if (null != authToken) {
@@ -18838,7 +18838,9 @@ ee.Serializer.encodeCloudApi = function(obj) {
 };
 goog.exportSymbol("ee.Serializer.encodeCloudApi", ee.Serializer.encodeCloudApi);
 ee.Serializer.encodeCloudApiExpression = function(obj, unboundName) {
-  var serializer = new ee.Serializer(!0);
+  return ee.Serializer.encodeCloudApiExpressionWithSerializer(new ee.Serializer(!0), obj, unboundName);
+};
+ee.Serializer.encodeCloudApiExpressionWithSerializer = function(serializer, obj, unboundName) {
   serializer.unboundName = unboundName;
   return serializer.encodeForCloudApi_(obj);
 };
@@ -19422,7 +19424,7 @@ ee.data.listFeatures = function(asset, params, opt_callback) {
 };
 goog.exportSymbol("ee.data.listFeatures", ee.data.listFeatures);
 ee.data.computeValue = function(obj, opt_callback) {
-  var request = {expression:ee.data.expressionAugmenter_(ee.Serializer.encodeCloudApiExpression(obj))}, workloadTag = ee.data.getWorkloadTag();
+  var request = {expression:ee.data.expressionAugmenter_(ee.Serializer.encodeCloudApiExpressionWithSerializer(new ee.Serializer(!0), obj, void 0))}, workloadTag = ee.data.getWorkloadTag();
   workloadTag && (request.workloadTag = workloadTag);
   var call = new module$contents$ee$apiclient_Call(opt_callback);
   return call.handle(call.value().compute(call.projectsPath(), new module$exports$eeapiclient$ee_api_client.ComputeValueRequest(request)).then(function(x) {
diff --git a/javascript/package.json b/javascript/package.json
index 99df01bb0..5330eb922 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@google/earthengine",
-  "version": "0.1.366",
+  "version": "0.1.367",
   "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
index d42bf801f..be1edb545 100644
--- a/javascript/src/apiclient.js
+++ b/javascript/src/apiclient.js
@@ -25,7 +25,7 @@ const {PromiseRequestService} = goog.require('eeapiclient.promise_request_servic
 /** @namespace */
 const apiclient = {};
 
-const API_CLIENT_VERSION = '0.1.366';
+const API_CLIENT_VERSION = '0.1.367';
 
 exports.VERSION = apiVersion.VERSION;
 exports.API_CLIENT_VERSION = API_CLIENT_VERSION;
diff --git a/javascript/src/data.js b/javascript/src/data.js
index 3f66c2fe4..8049e46ec 100644
--- a/javascript/src/data.js
+++ b/javascript/src/data.js
@@ -555,8 +555,10 @@ ee.data.listFeatures = function(asset, params, opt_callback) {
  * @export
  */
 ee.data.computeValue = function(obj, opt_callback) {
-  const expression =
-      ee.data.expressionAugmenter_(ee.Serializer.encodeCloudApiExpression(obj));
+  const serializer = new ee.Serializer(true);
+  const expression = ee.data.expressionAugmenter_(
+      ee.Serializer.encodeCloudApiExpressionWithSerializer(
+          serializer, obj, /* unboundName= */ undefined));
   const request = {expression};
   const workloadTag = ee.data.getWorkloadTag();
   if (workloadTag) {
diff --git a/javascript/src/serializer.js b/javascript/src/serializer.js
index 8c62a8db9..b99147a0a 100644
--- a/javascript/src/serializer.js
+++ b/javascript/src/serializer.js
@@ -303,6 +303,21 @@ ee.Serializer.encodeCloudApi = function(obj) {
 ee.Serializer.encodeCloudApiExpression = function(
     obj, unboundName = undefined) {
   const serializer = new ee.Serializer(true);
+  return ee.Serializer.encodeCloudApiExpressionWithSerializer(
+      serializer, obj, unboundName);
+};
+
+
+/**
+ * Serializes an object into an Expression for Cloud API calls with a
+ * Serializer.
+ * @param {!ee.Serializer} serializer The Serializer.
+ * @param {*} obj The object to Serialize.
+ * @param {string=} unboundName Name for unbound variables in computed objects.
+ * @return {!ee.api.Expression} The encoded object.
+ */
+ee.Serializer.encodeCloudApiExpressionWithSerializer = function(
+    serializer, obj, unboundName = undefined) {
   serializer.unboundName = unboundName;
   return serializer.encodeForCloudApi_(obj);
 };
diff --git a/python/ee/__init__.py b/python/ee/__init__.py
index 3fcd0e5ff..1086a23da 100644
--- a/python/ee/__init__.py
+++ b/python/ee/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """The EE Python library."""
 
-__version__ = '0.1.366'
+__version__ = '0.1.367'
 
 # Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name
diff --git a/python/ee/ee_types.py b/python/ee/ee_types.py
index 12f50aa8a..fafc8150e 100644
--- a/python/ee/ee_types.py
+++ b/python/ee/ee_types.py
@@ -6,7 +6,7 @@
 
 import datetime
 import numbers
-from typing import Any
+from typing import Any, Type
 
 from ee import computedobject
 
@@ -25,7 +25,7 @@ def _registerClasses(classes) -> None:
   _registered_classes = classes
 
 
-def classToName(a_class: type[Any]) -> str:
+def classToName(a_class: Type[Any]) -> str:
   """Converts a class to the API-friendly type name.
 
   Args:
diff --git a/python/ee/featurecollection.py b/python/ee/featurecollection.py
index f6803a25b..5b32535d5 100644
--- a/python/ee/featurecollection.py
+++ b/python/ee/featurecollection.py
@@ -4,7 +4,7 @@
 # Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name
 
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Type, Union
 
 from ee import apifunction
 from ee import collection
@@ -216,5 +216,5 @@ def name() -> str:
     return 'FeatureCollection'
 
   @staticmethod
-  def elementType() -> type[feature.Feature]:
+  def elementType() -> Type[feature.Feature]:
     return feature.Feature