batch.py: Use !r in the f-string for exceptions to use the repr of the variables

PiperOrigin-RevId: 863443403

Author: schwehr

python/ee/batch.py

@@ -1990,12 +1990,11 @@ def _canonicalize_parameters(config: dict[str, Any], destination: str) -> None:
     config.update(config['kwargs'])
     del config['kwargs']
 
-
   def canonicalize_name(a: str, b: str) -> None:
     """Renames config[a] to config[b]."""
     if a in config:
       if b in config:
-        raise ee_exception.EEException(f'Both {a} and {b} are specified.')
+        raise ee_exception.EEException(f'Both {a!r} and {b!r} are specified.')
       config[b] = config.pop(a)
 
   canonicalize_name('crsTransform', 'crs_transform')
@@ -2036,7 +2035,7 @@ def canonicalize_name(a: str, b: str) -> None:
         remapped_key = remapped_key[:1].lower() + remapped_key[1:]
         if remapped_key in format_options:
           raise ee_exception.EEException(
-              f'Both {key} and {remapped_key} are specified.'
+              f'Both {key!r} and {remapped_key!r} are specified.'
           )
         format_options[remapped_key] = value
         keys_to_delete.append(key)

python/ee/tests/batch_test.py

@@ -397,6 +397,27 @@ def test_export_image_with_tf_record_cloud_api(self):
           task.config,
       )
 
+  def test_canonicalize_parameters_collision(self):
+    """Verifies canonicalize_name collision raises an error."""
+    config = {'crsTransform': 1, 'crs_transform': 2}
+    with self.assertRaisesRegex(
+        ee.EEException, "Both 'crsTransform' and 'crs_transform' are specified."
+    ):
+      batch._canonicalize_parameters(config, batch.Task.ExportDestination.DRIVE)
+
+  def test_canonicalize_parameters_tiff_collision(self):
+    """Verifies formatOptions collision raises an error."""
+    config = {
+        'fileFormat': 'GeoTIFF',
+        'tiffCloudOptimized': True,
+        'formatOptions': {'cloudOptimized': True},
+    }
+    with self.assertRaisesRegex(
+        ee.EEException,
+        "Both 'tiffCloudOptimized' and 'cloudOptimized' are specified.",
+    ):
+      batch._canonicalize_parameters(config, batch.Task.ExportDestination.GCS)
+
   def test_export_image_to_asset_cloud_api(self):
     """Verifies the Asset export task created by Export.image.toAsset()."""
     with apitestcase.UsingCloudApi():