diff --git a/nerfstudio/process_data/metashape_utils.py b/nerfstudio/process_data/metashape_utils.py index 8bea8707c..fad2445ed 100644 --- a/nerfstudio/process_data/metashape_utils.py +++ b/nerfstudio/process_data/metashape_utils.py @@ -17,7 +17,7 @@ import json import xml.etree.ElementTree as ET from pathlib import Path -from typing import Dict, List +from typing import Dict, List, Optional import numpy as np diff --git a/nerfstudio/process_data/process_data_utils.py b/nerfstudio/process_data/process_data_utils.py index c1946305b..76239d020 100644 --- a/nerfstudio/process_data/process_data_utils.py +++ b/nerfstudio/process_data/process_data_utils.py @@ -61,12 +61,12 @@ def list_images(data: Path) -> List[Path]: """Lists all supported images in a directory Args: - data: Path to the directory of images. + data: Path to the directory of images. Nested folders are searched as well. Returns: Paths to images contained in the directory """ allowed_exts = [".jpg", ".jpeg", ".png", ".tif", ".tiff"] + ALLOWED_RAW_EXTS - image_paths = sorted([p for p in data.glob("[!.]*") if p.suffix.lower() in allowed_exts]) + image_paths = sorted([p for p in data.glob("**/[!.]*") if p.suffix.lower() in allowed_exts]) return image_paths diff --git a/nerfstudio/scripts/process_data.py b/nerfstudio/scripts/process_data.py index 2c2cd7a38..bbe3b635a 100644 --- a/nerfstudio/scripts/process_data.py +++ b/nerfstudio/scripts/process_data.py @@ -20,7 +20,7 @@ import sys import zipfile from dataclasses import dataclass from pathlib import Path -from typing import Union +from typing import Optional, Union import numpy as np import tyro @@ -28,11 +28,11 @@ from typing_extensions import Annotated from nerfstudio.process_data import ( metashape_utils, + odm_utils, polycam_utils, process_data_utils, realitycapture_utils, record3d_utils, - odm_utils, ) from nerfstudio.process_data.colmap_converter_to_nerfstudio_dataset import BaseConverterToNerfstudioDataset from nerfstudio.process_data.images_to_nerfstudio_dataset import ImagesToNerfstudioDataset