Disable GCS loading by default

PiperOrigin-RevId: 696820685
tensorflow · Nov 15, 2024 · 6bcafe4 · 6bcafe4
1 parent 40cc288
commit 6bcafe4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/tensorflow_datasets/core/utils/gcs_utils.py b/tensorflow_datasets/core/utils/gcs_utils.py
@@ -31,7 +31,7 @@
 GCS_DATASET_INFO_DIR = 'dataset_info'
 GCS_DATASETS_DIR = 'datasets'
 
-_is_gcs_disabled = False
+_is_gcs_disabled = True
 
 
 # Exception raised when GCS isn't available

diff --git a/tensorflow_datasets/core/utils/gcs_utils_test.py b/tensorflow_datasets/core/utils/gcs_utils_test.py
@@ -19,16 +19,18 @@
 from tensorflow_datasets.core.utils import gcs_utils
 from tensorflow_datasets.testing import test_utils
 
-
 import os
 import tempfile
 import tensorflow_datasets as tfds
 class GcsUtilsTest(testing.TestCase):
   DO_NOT_APPLY_FIXTURES = [test_utils.disable_gcs_access]
   def test_is_dataset_accessible(self):
+    gcs_utils._is_gcs_disabled = False
     self.assertTrue(gcs_utils.is_dataset_on_gcs('mnist/1.0.0'))
     self.assertFalse(gcs_utils.is_dataset_on_gcs('non_dataset/1.0.0'))
+    gcs_utils._is_gcs_disabled = True
   def test_download_dataset(self):
+    gcs_utils._is_gcs_disabled = False
     files = [
         'gs://tfds-data/dataset_info/mnist/2.0.0/dataset_info.json',
         'gs://tfds-data/dataset_info/mnist/2.0.0/image.image.json',
@@ -50,6 +52,7 @@ def test_download_dataset(self):
               'image.image.json',
           ],
       )
+    gcs_utils._is_gcs_disabled = True
   def test_mnist(self):
     mnist = tfds.image_classification.MNIST(
         data_dir=gcs_utils.gcs_path('datasets')
@@ -65,7 +68,7 @@ class GcsUtilsDisabledTest(testing.TestCase):
 
   def test_is_dataset_accessible(self):
     is_ds_on_gcs = gcs_utils.is_dataset_on_gcs('mnist/1.0.0')
-    self.assertTrue(is_ds_on_gcs)
+    self.assertFalse(is_ds_on_gcs)
 
 
 if __name__ == '__main__':

diff --git a/tensorflow_datasets/testing/test_utils.py b/tensorflow_datasets/testing/test_utils.py
@@ -444,6 +444,9 @@ def disable_gcs_access() -> Iterator[None]:
   ), mock.patch(
       'tensorflow_datasets.core.utils.gcs_utils.is_dataset_on_gcs',
       _GCS_ACCESS_FNS['dummy_datasets'],
+  ), mock.patch(
+      'tensorflow_datasets.core.utils.gcs_utils._is_gcs_disabled',
+      True,
   ):
     yield
 
@@ -457,6 +460,9 @@ def enable_gcs_access() -> Iterator[None]:
   ), mock.patch(
       'tensorflow_datasets.core.utils.gcs_utils.is_dataset_on_gcs',
       _GCS_ACCESS_FNS['original_datasets'],
+  ), mock.patch(
+      'tensorflow_datasets.core.utils.gcs_utils._is_gcs_disabled',
+      False,
   ):
     yield