GeoDataset: allow a mix of str and pathlib paths (#2270)

* GeoDataset: allow a mix of str and pathlib paths

* Update type hints

* Simpler str conversion

tests/datasets/test_geo.py

@@ -205,6 +205,14 @@ def test_files_property_deterministic(self) -> None:
             CustomGeoDataset(paths=paths1).files == CustomGeoDataset(paths=paths2).files
         )
 
+    def test_files_property_mix_str_and_pathlib(self, tmp_path: Path) -> None:
+        foo = tmp_path / 'foo.txt'
+        bar = tmp_path / 'bar.txt'
+        foo.touch()
+        bar.touch()
+        ds = CustomGeoDataset(paths=[str(foo), bar])
+        assert ds.files == [str(bar), str(foo)]
+
 
 class TestRasterDataset:
     naip_dir = os.path.join('tests', 'data', 'naip')

torchgeo/datasets/geo.py

@@ -291,7 +291,7 @@ def res(self, new_res: float) -> None:
         self._res = new_res
 
     @property
-    def files(self) -> list[Path]:
+    def files(self) -> list[str]:
         """A list of all files in the dataset.
 
         Returns:
@@ -306,15 +306,15 @@ def files(self) -> list[Path]:
             paths = self.paths
 
         # Using set to remove any duplicates if directories are overlapping
-        files: set[Path] = set()
+        files: set[str] = set()
         for path in paths:
             if os.path.isdir(path):
                 pathname = os.path.join(path, '**', self.filename_glob)
                 files |= set(glob.iglob(pathname, recursive=True))
             elif (os.path.isfile(path) or path_is_vsi(path)) and fnmatch.fnmatch(
                 str(path), f'*{self.filename_glob}'
             ):
-                files.add(path)
+                files.add(str(path))
             elif not hasattr(self, 'download'):
                 warnings.warn(
                     f"Could not find any relevant files for provided path '{path}'. "