fix invalid filetypes and exit code for HTTP errors

Author: ptpt

mapillary_tools/commands/__main__.py

@@ -164,6 +164,8 @@ def main():
         args.func(argvars)
     except requests.HTTPError as ex:
         LOG.error("%s: %s", ex.__class__.__name__, api_v4.readable_http_error(ex))
+        # TODO: standardize exit codes as exceptions.MapillaryUserError
+        sys.exit(16)
 
     except exceptions.MapillaryUserError as ex:
         LOG.error(

mapillary_tools/geotag/geotag_videos_from_exiftool_video.py

@@ -55,10 +55,12 @@ def extract(self) -> types.VideoMetadataOrError:
                 "No GPS data found from the video"
             )
 
+        filetype = types.FileType.GOPRO if is_gopro else types.FileType.VIDEO
+
         video_metadata = types.VideoMetadata(
             self.video_path,
             filesize=utils.get_file_size(self.video_path),
-            filetype=types.FileType.VIDEO,
+            filetype=filetype,
             points=points,
             make=make,
             model=model,
@@ -92,11 +94,11 @@ def _generate_video_extractors(
             )
             if rdf_description is None:
                 exc = exceptions.MapillaryEXIFNotFoundError(
-                    f"The {exiftool_read._DESCRIPTION_TAG} XML element for the image not found"
+                    f"The {exiftool_read._DESCRIPTION_TAG} XML element for the video not found"
                 )
                 results.append(
                     types.describe_error_metadata(
-                        exc, path, filetype=types.FileType.IMAGE
+                        exc, path, filetype=types.FileType.VIDEO
                     )
                 )
             else:
@@ -140,7 +142,7 @@ def _generate_video_extractors(
                 )
                 results.append(
                     types.describe_error_metadata(
-                        exc, path, filetype=types.FileType.IMAGE
+                        exc, path, filetype=types.FileType.VIDEO
                     )
                 )
             else:

mapillary_tools/process_geotag_properties.py

@@ -9,10 +9,14 @@
 
 from tqdm import tqdm
 
-from mapillary_tools.geotag.options import InterpolationOption, SourcePathOption
-
 from . import constants, exceptions, exif_write, types, utils
-from .geotag.factory import parse_source_option, process, SourceOption, SourceType
+from .geotag.factory import parse_source_option, process
+from .geotag.options import (
+    InterpolationOption,
+    SourceOption,
+    SourcePathOption,
+    SourceType,
+)
 
 LOG = logging.getLogger(__name__)
 DEFAULT_GEOTAG_SOURCE_OPTIONS = [

mapillary_tools/upload.py

@@ -250,9 +250,9 @@ def upload_progress(payload: uploader.Progress):
         type: uploader.EventName = "upload_progress"
 
         if LOG.getEffectiveLevel() <= logging.DEBUG:
-            # In debug mode, we want to see the progress every 10 seconds
+            # In debug mode, we want to see the progress every 30 seconds
             # instead of every chunk (which is too verbose)
-            INTERVAL_SECONDS = 10
+            INTERVAL_SECONDS = 30
             now = time.time()
             last_upload_progress_debug_at: float | None = T.cast(T.Dict, payload).get(
                 "_last_upload_progress_debug_at"
@@ -425,11 +425,7 @@ def _load_descs(
     metadatas: list[types.Metadata]
 
     if _metadatas_from_process is not None:
-        metadatas = [
-            metadata
-            for metadata in _metadatas_from_process
-            if not isinstance(metadata, types.ErrorMetadata)
-        ]
+        metadatas, _ = types.separate_errors(_metadatas_from_process)
     else:
         metadatas = _load_validate_metadatas_from_desc_path(desc_path, import_paths)