Add GPath.unlink to remove a file

PiperOrigin-RevId: 347998283

tensorflow_datasets/core/utils/gpath.py

@@ -145,6 +145,16 @@ def rmtree(self) -> None:
     """Remove the directory."""
     tf.io.gfile.rmtree(self._path_str)
 
+  def unlink(self, missing_ok: bool = False) -> None:
+    """Remove this file or symbolic link."""
+    try:
+      tf.io.gfile.remove(self._path_str)
+    except tf.errors.NotFoundError as e:
+      if missing_ok:
+        pass
+      else:
+        raise FileNotFoundError(str(e))
+
   def open(
       self,
       mode: str = 'r',

tensorflow_datasets/core/utils/gpath_test.py

@@ -46,7 +46,7 @@ def _norm_path(path: str):
       'listdir',
       'makedirs',
       'mkdir',
-      # 'remove',
+      'remove',
       'rename',
       'rmtree',
       # 'stat',
@@ -66,6 +66,7 @@ def _norm_path(path: str):
       listdir=lambda p: origin_gfile.listdir(_norm_path(p)),
       makedirs=lambda p: origin_gfile.makedirs(_norm_path(p)),
       mkdir=lambda p: origin_gfile.mkdir(_norm_path(p)),
+      remove=lambda p: origin_gfile.remove(_norm_path(p)),
       rename=lambda p1, p2, **kwargs: origin_gfile.rename(  # pylint: disable=g-long-lambda
           _norm_path(p1), _norm_path(p2), **kwargs
       ),
@@ -256,6 +257,24 @@ def test_read_write():
   assert gpath.read_bytes() == b'def'
 
 
+@pytest.mark.usefixtures('gcs_mocked_path')
+def test_unlink():
+  path = gpathlib.PosixGPath('gs://bucket')
+  path.mkdir()
+
+  path = path / 'text.txt'
+
+  with pytest.raises(FileNotFoundError):
+    path.unlink()
+
+  path.unlink(missing_ok=True)  # no-op if missing_ok=True
+
+  path.touch()  # Path created
+  assert path.exists()
+  path.unlink()  # Path deleted
+  assert not path.exists()
+
+
 def test_mkdir(gcs_mocked_path: pathlib.Path):
   g_path = gpathlib.PosixGPath('gs://bucket')
   assert not g_path.exists()

tensorflow_datasets/core/utils/type_utils.py

@@ -195,6 +195,10 @@ def rmdir(self) -> None:
   def rmtree(self) -> None:
     """Remove the directory, including all sub-files."""
 
+  @abc.abstractmethod
+  def unlink(self, missing_ok: bool = False) -> None:
+    """Remove this file or symbolic link."""
+
   def write_bytes(self, data: bytes) -> None:
     """Writes content as bytes."""
     with self.open('wb') as f: