mapillary-tools 0.14.0a1__py3-none-any.whl → 0.14.0b1__py3-none-any.whl

mapillary_tools/utils.py

@@ -9,9 +9,7 @@ from pathlib import Path
 
 # Use "hashlib._Hash" instead of hashlib._Hash because:
 # AttributeError: module 'hashlib' has no attribute '_Hash'
-def md5sum_fp(
-    fp: T.IO[bytes], md5: T.Optional["hashlib._Hash"] = None
-) -> "hashlib._Hash":
+def md5sum_fp(fp: T.IO[bytes], md5: "hashlib._Hash | None" = None) -> "hashlib._Hash":
     if md5 is None:
         md5 = hashlib.md5()
     while True:
@@ -93,12 +91,12 @@ def filter_video_samples(
 
 
 def find_all_image_samples(
-    image_paths: T.Sequence[Path], video_paths: T.Sequence[Path]
-) -> T.Dict[Path, T.List[Path]]:
+    image_paths: T.Iterable[Path], video_paths: T.Iterable[Path]
+) -> dict[Path, list[Path]]:
     # TODO: not work with the same filenames, e.g. foo/hello.mp4 and bar/hello.mp4
     video_basenames = {path.name: path for path in video_paths}
 
-    image_samples_by_video_path: T.Dict[Path, T.List[Path]] = {}
+    image_samples_by_video_path: dict[Path, list[Path]] = {}
     for image_path in image_paths:
         # If you want to walk an arbitrary filesystem path upwards,
         # it is recommended to first call Path.resolve() so as to resolve symlinks and eliminate “..” components.
@@ -115,7 +113,7 @@ def find_all_image_samples(
 
 
 def deduplicate_paths(paths: T.Iterable[Path]) -> T.Generator[Path, None, None]:
-    resolved_paths: T.Set[Path] = set()
+    resolved_paths: set[Path] = set()
     for p in paths:
         resolved = p.resolve()
         if resolved not in resolved_paths:
@@ -124,10 +122,10 @@ def deduplicate_paths(paths: T.Iterable[Path]) -> T.Generator[Path, None, None]:
 
 
 def find_images(
-    import_paths: T.Sequence[Path],
+    import_paths: T.Iterable[Path],
     skip_subfolders: bool = False,
-) -> T.List[Path]:
-    image_paths: T.List[Path] = []
+) -> list[Path]:
+    image_paths: list[Path] = []
     for path in import_paths:
         if path.is_dir():
             image_paths.extend(
@@ -142,10 +140,10 @@ def find_images(
 
 
 def find_videos(
-    import_paths: T.Sequence[Path],
+    import_paths: T.Iterable[Path],
     skip_subfolders: bool = False,
-) -> T.List[Path]:
-    video_paths: T.List[Path] = []
+) -> list[Path]:
+    video_paths: list[Path] = []
     for path in import_paths:
         if path.is_dir():
             video_paths.extend(
@@ -160,10 +158,10 @@ def find_videos(
 
 
 def find_zipfiles(
-    import_paths: T.Sequence[Path],
+    import_paths: T.Iterable[Path],
     skip_subfolders: bool = False,
-) -> T.List[Path]:
-    zip_paths: T.List[Path] = []
+) -> list[Path]:
+    zip_paths: list[Path] = []
     for path in import_paths:
         if path.is_dir():
             zip_paths.extend(
@@ -177,8 +175,8 @@ def find_zipfiles(
     return list(deduplicate_paths(zip_paths))
 
 
-def find_xml_files(import_paths: T.Sequence[Path]) -> T.List[Path]:
-    xml_paths: T.List[Path] = []
+def find_xml_files(import_paths: T.Iterable[Path]) -> list[Path]:
+    xml_paths: list[Path] = []
     for path in import_paths:
         if path.is_dir():
             # XML could be hidden in hidden folders

{mapillary_tools-0.14.0a1.dist-info → mapillary_tools-0.14.0b1.dist-info}/METADATA

@@ -1,32 +1,37 @@
 Metadata-Version: 2.4
 Name: mapillary_tools
-Version: 0.14.0a1
+Version: 0.14.0b1
 Summary: Mapillary Image/Video Import Pipeline
-Home-page: https://github.com/mapillary/mapillary_tools
-Author: Mapillary
+Author-email: Mapillary <support@mapillary.com>
 License: BSD
-Requires-Python: >=3.8
+Project-URL: Homepage, https://github.com/mapillary/mapillary_tools
+Project-URL: Repository, https://github.com/mapillary/mapillary_tools
+Project-URL: Issues, https://github.com/mapillary/mapillary_tools/issues
+Keywords: mapillary,gis,computer vision,street view
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: appdirs<2.0.0,>=1.4.4
 Requires-Dist: construct<3.0.0,>=2.10.0
 Requires-Dist: exifread==2.3.2
-Requires-Dist: piexif==1.1.3
 Requires-Dist: gpxpy<1.6.0,>=1.5.0
+Requires-Dist: jsonschema~=4.17.3
+Requires-Dist: piexif==1.1.3
 Requires-Dist: pynmea2<2.0.0,>=1.12.0
 Requires-Dist: requests[socks]<3.0.0,>=2.20.0
 Requires-Dist: tqdm<5.0,>=4.0
-Requires-Dist: typing_extensions
-Requires-Dist: jsonschema~=4.17.3
-Dynamic: author
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
+Requires-Dist: typing-extensions>=4.12.2
 Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 <p align="center">
   <a href="https://github.com/mapillary/mapillary_tools/">
@@ -58,18 +63,40 @@ mapillary_tools --help
 <!--ts-->
 
 - [Supported File Formats](#supported-file-formats)
+  - [Image Formats](#image-formats)
+  - [Video Formats](#video-formats)
 - [Installation](#installation)
+  - [Standalone Executable](#standalone-executable)
+  - [Installing via pip](#installing-via-pip)
+    - [Installing on Android Devices](#installing-on-android-devices)
 - [Usage](#usage)
   - [Process and Upload](#process-and-upload)
   - [Process](#process)
   - [Upload](#upload)
 - [Advanced Usage](#advanced-usage)
   - [Local Video Processing](#local-video-processing)
+    - [Install FFmpeg](#install-ffmpeg)
+    - [Video Processing](#video-processing)
   - [Geotagging with GPX](#geotagging-with-gpx)
+  - [New video geotagging features (experimental)](#new-video-geotagging-features-experimental)
+    - [Usage](#usage-1)
+    - [Examples](#examples)
+      - [Generic supported videos](#generic-supported-videos)
+      - [External GPX](#external-gpx)
+      - [Insta360 stitched videos](#insta360-stitched-videos)
+    - [Limitations of `--video_geotag_source`](#limitations-of---video_geotag_source)
   - [Authenticate](#authenticate)
+    - [Examples](#examples-1)
   - [Image Description](#image-description)
   - [Zip Images](#zip-images)
 - [Development](#development)
+  - [Setup](#setup)
+    - [Option 1: Using uv (Recommended)](#option-1-using-uv-recommended)
+    - [Option 2: Using pip with virtual environment](#option-2-using-pip-with-virtual-environment)
+  - [Running the code](#running-the-code)
+  - [Tests](#tests)
+  - [Code Quality](#code-quality)
+  - [Release and Build](#release-and-build)
 
 <!--te-->
 
@@ -495,29 +522,49 @@ git clone git@github.com:mapillary/mapillary_tools.git
 cd mapillary_tools
 ```
 
-Set up the virtual environment. It is optional but recommended:
+### Option 1: Using uv (Recommended)
+
+Use [uv](https://docs.astral.sh/uv/) - a fast Python package manager.
+
+Install the project in development mode with all dependencies:
 
 ```sh
-pip install pipenv
+# Install the project and development dependencies
+uv sync --group dev
+
+# Activate the virtual environment
+source .venv/bin/activate  # On Windows: .venv\Scripts\activate
 ```
 
-Install dependencies:
+### Option 2: Using pip with virtual environment
+
+Set up a virtual environment (recommended):
 
 ```sh
-pipenv install -r requirements.txt
-pipenv install -r requirements-dev.txt
+python -m venv .venv
+source .venv/bin/activate  # On Windows: .venv\Scripts\activate
 ```
 
-Enter the virtualenv shell:
+Install the project in development mode:
 
 ```sh
-pipenv shell
+# Install the project and all dependencies in editable mode
+pip install -e .
+
+# Install development dependencies
+pip install --group dev
 ```
 
+## Running the code
+
 Run the code from the repository:
 
 ```sh
-python3 -m mapillary_tools.commands --version
+# If you have mapillary_tools installed in editable mode
+mapillary_tools --version
+
+# Alternatively
+python -m mapillary_tools.commands --version
 ```
 
 ## Tests
@@ -525,19 +572,28 @@ python3 -m mapillary_tools.commands --version
 Run tests:
 
 ```sh
-# test all cases
-python3 -m pytest -s -vv tests
-# or test a single case specifically
-python3 -m pytest -s -vv tests/unit/test_camm_parser.py::test_build_and_parse
+# Test all cases
+pytest -s -vv tests
+# Or test a single case specifically
+pytest -s -vv tests/unit/test_camm_parser.py::test_build_and_parse
 ```
 
-Run linting:
+## Code Quality
+
+Run code formatting and linting:
 
 ```sh
-# format code
-black mapillary_tools tests
-# sort imports
+# Format code with ruff
+ruff format mapillary_tools tests
+
+# Lint code with ruff
+ruff check mapillary_tools tests
+
+# Sort imports with usort
 usort format mapillary_tools tests
+
+# Type checking with mypy
+mypy mapillary_tools
 ```
 
 ## Release and Build

mapillary_tools-0.14.0b1.dist-info/RECORD

@@ -0,0 +1,75 @@
+mapillary_tools/__init__.py,sha256=BXYNPTo5QIOW_UpAqv3arB1SDKpH8qZZAzzNEEAG4Io,21
+mapillary_tools/api_v4.py,sha256=2Xb72FcddR0KEohH_zulRlHaGzb1BgqYt84r0IiHr4c,10139
+mapillary_tools/authenticate.py,sha256=rO39j--CSGTXnYWOKOgkXKvK7l7p7Nnh1bnbihDyQ_U,11094
+mapillary_tools/blackvue_parser.py,sha256=ea2JtU9MWU6yB0bQlF970_Of0bJVofSTRq1P30WKW-0,5623
+mapillary_tools/config.py,sha256=97zsyPnZXGincEkM__c6UNWH25EMTtRKZGsp6vBpHy8,3326
+mapillary_tools/constants.py,sha256=KvTizvc4PLQhU7RDB3Eabgr2B4cIvRfV4mCM05YeB9Y,3859
+mapillary_tools/exceptions.py,sha256=P8vEh3pfOqyzJgOiQiRAcWsZTrcawjic7i4v3k335tM,2411
+mapillary_tools/exif_read.py,sha256=gagyRv06RkZPRHQhyV-5-uQzxHgxOsVqUX2aC8QmCyM,32145
+mapillary_tools/exif_write.py,sha256=Ue0ngLKCfuLQM7X4h5ETjSInUDcyEBWOR6v8ko7DJ1o,8769
+mapillary_tools/exiftool_read.py,sha256=5uatYE9mgbg2d9NAnPfX22nSRBjXhJ9ayMqNMd4QwGM,15779
+mapillary_tools/exiftool_read_video.py,sha256=23O_bjUOVq6j7i3xMz6fY-XIEsjinsCejK_0nrbFyOM,16084
+mapillary_tools/exiftool_runner.py,sha256=g4gSyqeh3D6EnMJ-c3s-RnO2EP_jD354Qkaz0Y-4D04,1658
+mapillary_tools/ffmpeg.py,sha256=akpvvsjAR-Iiv-hOrUoJvPM9vUU3JqMQ5HJL1_NgwB8,22908
+mapillary_tools/geo.py,sha256=MSfkjSAgTAeuBqncQ8-QXvDuJ7ar7bTt5P_e9HDIgVs,10604
+mapillary_tools/history.py,sha256=5Zk4iXSXny9kImzOKrnZmZ3sDjXtCcnJC5pzqHcf-Vk,1753
+mapillary_tools/ipc.py,sha256=DwWQb9hNshx0bg0Fo5NjY0mXjs-FkbR6tIQmjMgMtmg,1089
+mapillary_tools/process_geotag_properties.py,sha256=ND4Mz8NIIhbiD0aFk4Eo33WRpt3VYwCBbOBaxmP-rbU,14246
+mapillary_tools/process_sequence_properties.py,sha256=XqddHPsj5EjIKbu8omqPcufWdEbrMS_MNf8se5DXL1M,23480
+mapillary_tools/sample_video.py,sha256=gViQQ4CSHihzk42kGq_Rx4sr9sBPsGvPXXx2Bgj5grU,13980
+mapillary_tools/telemetry.py,sha256=lL6qQbtOZft4DZZrCNK3njlwHT_30zLyYS_YRN5pgHY,1568
+mapillary_tools/types.py,sha256=pIU2wcxiOUWT5Pd05pgNzY9EVEDlwoldtlF2IIYYvE0,5909
+mapillary_tools/upload.py,sha256=s29bRwYuaZuTuy3TIBspgCwA8ueYN-RiDvOFkWI-kfY,24411
+mapillary_tools/upload_api_v4.py,sha256=4aw0uMkKL-zhQ-jPv0GgDvnYSX1DA8zRk4TOFyU9EJA,7753
+mapillary_tools/uploader.py,sha256=KUEwHdIZ8xN2JMUvUG--T_S_VgREJuvARqNWsnPpKsk,23202
+mapillary_tools/utils.py,sha256=ft-TrqgwWq1a-HpQqnCWIortZbjjTOywllPi8HBA3FU,6642
+mapillary_tools/camm/camm_builder.py,sha256=ub6Z9ijep8zAo1NOlU51Gxk95kQ2vfN58YgVCLmNMRk,9211
+mapillary_tools/camm/camm_parser.py,sha256=aNHP65hNXYQBWBTfhaj_S5XYzmAHhjwcAfGhbm83__o,18043
+mapillary_tools/commands/__init__.py,sha256=41CFrPLGlG3566uhxssEF3TGAtSpADFPPcDMHbViU0E,171
+mapillary_tools/commands/__main__.py,sha256=5gwngScbvrSNF2S1CA5w_qZgxW_kFevu5NQ89U9u1ZE,5046
+mapillary_tools/commands/authenticate.py,sha256=yqtpHMYzkyBrrchj6MARxB0ywUTfqCEOPkMbkyaO9Ks,1344
+mapillary_tools/commands/process.py,sha256=Japc6_P0B_8HzoM8_82P3_YAiyBBaQZXS9TZF46pbMM,9771
+mapillary_tools/commands/process_and_upload.py,sha256=-RB_86a5xKfQ7Ye79dh6yyJQpZg2xnJZAWOJsUNbUtQ,1041
+mapillary_tools/commands/sample_video.py,sha256=jtnrZrsqqv5eYV1chNTas7RhfbeKBqbAUDUNRFjF01w,3253
+mapillary_tools/commands/upload.py,sha256=YnA1iSvNcFeV7kMs1p4TdaPBUWUFYb7X-vFhQeSz0eI,2005
+mapillary_tools/commands/video_process.py,sha256=-wQeeIwWXPmy81HQHam5A0huMLRHknkEFa_V1OwElU4,890
+mapillary_tools/commands/video_process_and_upload.py,sha256=hOyq9L9TuD0JcqFSOOxdCdgsBA1iJ6fu1TtDbsUr8sI,1088
+mapillary_tools/commands/zip.py,sha256=DVQuMLpbstwiy5o4pU_fBvM6eORuFjLeySd80AhHKU0,991
+mapillary_tools/geotag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mapillary_tools/geotag/base.py,sha256=19-3P5nbFehOxacTT042nQUITzGnXndgnW_mXLO5q9s,4948
+mapillary_tools/geotag/factory.py,sha256=Yn8bf0_uA_ukF1Od_yrFIkBYnO0EFq-uvsVrbO2FUrM,9967
+mapillary_tools/geotag/geotag_images_from_exif.py,sha256=a5fDOp4tlEoVNwrOCJBrvSPzu1LbyxL4RNrNDD0tPP0,608
+mapillary_tools/geotag/geotag_images_from_exiftool.py,sha256=TTJb9tq1kYSPn_gwDDAcviueYwoUIbIEoLl-abAB8T8,5716
+mapillary_tools/geotag/geotag_images_from_gpx.py,sha256=xh7lqQT-e3PMIisdRIkkfbWP-GrCRZF0KAo03V0ixEI,6401
+mapillary_tools/geotag/geotag_images_from_gpx_file.py,sha256=HYQkwak32YBDuRrTNiIZOmE3iImCRc22HWWb485WRS4,1121
+mapillary_tools/geotag/geotag_images_from_nmea_file.py,sha256=J8xj6ch9bMPRubJtsRGeb3sb9LyB0ZYy65NPEOVkUe8,1597
+mapillary_tools/geotag/geotag_images_from_video.py,sha256=3NV3-NfSkxT0n_n8Ajqjab24x29H2vL98DpwJqnIvT8,4411
+mapillary_tools/geotag/geotag_videos_from_exiftool.py,sha256=ge29zKj9jLQFLmmzb0IyE69wenuwJ3XGmMyANT0UIAI,4288
+mapillary_tools/geotag/geotag_videos_from_gpx.py,sha256=IoV7asxl7dojF1lftvohm1jK_LboFg_mBz25GiV_CsY,1653
+mapillary_tools/geotag/geotag_videos_from_video.py,sha256=T8XS4lVF2Wz4eDXNi5Vt076M5dxjxJXibVrWhqVvErs,863
+mapillary_tools/geotag/options.py,sha256=0CSQUuhVE-WdAVQXWXjwMtxujW1yB6yxRkFmVKH8LkQ,5092
+mapillary_tools/geotag/utils.py,sha256=0DenLVCLP-GZdk0rCFP0V1tjMGK4XAvYro3I_1RKgCA,1733
+mapillary_tools/geotag/image_extractors/base.py,sha256=XoNrLCbJtd-MN-snbhv6zyr6zBfJRoJkntV0ptrh6qg,358
+mapillary_tools/geotag/image_extractors/exif.py,sha256=cCUegbFqWxjAP4oOP1nZmwoJISWeKgjGO8h_t7nucHs,2079
+mapillary_tools/geotag/image_extractors/exiftool.py,sha256=zokJmf-D2rPvASRJs3dZzEu7j82igpMOr4SE6Z1nsVg,497
+mapillary_tools/geotag/video_extractors/base.py,sha256=KxyKxoh_mV-XBnJq3dSzNEt2rQqZAKjmS3GazsdYbnc,350
+mapillary_tools/geotag/video_extractors/exiftool.py,sha256=mH9arsWBaArYhNMxnrRpoEa3YrMjSpCiZaz-baJRMCo,2305
+mapillary_tools/geotag/video_extractors/gpx.py,sha256=jE3UQs6rTzIElPBvS7eKgR83JAZnbteXM1V5TbNCdyY,3753
+mapillary_tools/geotag/video_extractors/native.py,sha256=4I0Vjo3xCaYuJktxUGHalEv-eW5h-4fHzgwhjImEuWs,4572
+mapillary_tools/gpmf/gpmf_gps_filter.py,sha256=7cg8wEjC1DrujKY76FZguXsaPqTRkG9-t32OeuOJQIc,2755
+mapillary_tools/gpmf/gpmf_parser.py,sha256=uOVXkwJxC3Y2YfTdzUDpt7Bh0pdVqa5u0WUuv7pEJEs,24670
+mapillary_tools/gpmf/gps_filter.py,sha256=zhXkuvr0Dd1bxGTYBwvk6P7xasY_RLuWjHaX7CdBayc,3796
+mapillary_tools/mp4/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mapillary_tools/mp4/construct_mp4_parser.py,sha256=ArJ5C8iWJhHNPFkN048DXh6EwQ8LMfnTMwoNlKV9NoI,17191
+mapillary_tools/mp4/io_utils.py,sha256=KZaJTlgFS27Oh3pcA5MKXYFoCifqgFaEZJyU6lb1jc4,5416
+mapillary_tools/mp4/mp4_sample_parser.py,sha256=0ILTq8M6mXFTI3agKgljpvO9uYa7HXGUGZpdHT8a6ac,11547
+mapillary_tools/mp4/simple_mp4_builder.py,sha256=9TUGk1hzI6mQFN1P30jwHL3dCYz3Zz7rsm8UBvMAqMc,12734
+mapillary_tools/mp4/simple_mp4_parser.py,sha256=g3vvPhBoNu7anhVzC5_XQCV7IwfRWro1vJ6d6GyDkHE,6315
+mapillary_tools/serializer/description.py,sha256=ZYg68FoA1oA6PPXRMx9RyxUCoCh3mKpG7cYTlcO3xKk,18368
+mapillary_tools/serializer/gpx.py,sha256=fwnJ0KF8d8IWRoIGM70NrYDmS89akC3tyRnY3fYc-R8,4344
+mapillary_tools-0.14.0b1.dist-info/licenses/LICENSE,sha256=l2D8cKfFmmJq_wcVq_JElPJrlvWQOzNWx7gMLINucxc,1292
+mapillary_tools-0.14.0b1.dist-info/METADATA,sha256=jz6asGlxY7OFZbmqSHQ1_SxATrzJWMnPsElBl618HkE,22188
+mapillary_tools-0.14.0b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mapillary_tools-0.14.0b1.dist-info/entry_points.txt,sha256=A3f3LP-BO_P-U8Y29QfpT4jx6Mjk3sXjTi2Yew4bvj8,75
+mapillary_tools-0.14.0b1.dist-info/top_level.txt,sha256=FbDkMgOrt1S70ho1WSBrOwzKOSkJFDwwqFOoY5-527s,16
+mapillary_tools-0.14.0b1.dist-info/RECORD,,

{mapillary_tools-0.14.0a1.dist-info → mapillary_tools-0.14.0b1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

mapillary_tools/geotag/geotag_images_from_exiftool_both_image_and_video.py

@@ -1,77 +0,0 @@
-from __future__ import annotations
-
-import logging
-import typing as T
-from pathlib import Path
-
-from .. import exiftool_read, types, utils
-from . import (
-    geotag_images_from_exiftool,
-    geotag_images_from_video,
-    geotag_videos_from_exiftool_video,
-)
-from .geotag_from_generic import GeotagImagesFromGeneric
-
-
-LOG = logging.getLogger(__name__)
-
-
-class GeotagImagesFromExifToolBothImageAndVideo(GeotagImagesFromGeneric):
-    def __init__(
-        self,
-        image_paths: T.Sequence[Path],
-        xml_path: Path,
-        offset_time: float = 0.0,
-        num_processes: int | None = None,
-    ):
-        super().__init__(image_paths, num_processes=num_processes)
-        self.xml_path = xml_path
-        self.offset_time = offset_time
-
-    def geotag_samples(self) -> list[types.ImageMetadataOrError]:
-        # Find all video paths in self.xml_path
-        rdf_description_by_path = exiftool_read.index_rdf_description_by_path(
-            [self.xml_path]
-        )
-        video_paths = utils.find_videos(
-            [Path(pathstr) for pathstr in rdf_description_by_path.keys()],
-            skip_subfolders=True,
-        )
-        # Find all video paths that have sample images
-        samples_by_video = utils.find_all_image_samples(self.image_paths, video_paths)
-
-        video_metadata_or_errors = (
-            geotag_videos_from_exiftool_video.GeotagVideosFromExifToolVideo(
-                list(samples_by_video.keys()),
-                self.xml_path,
-                num_processes=self.num_processes,
-            ).to_description()
-        )
-        sample_paths = sum(samples_by_video.values(), [])
-        sample_metadata_or_errors = geotag_images_from_video.GeotagImagesFromVideo(
-            sample_paths,
-            video_metadata_or_errors,
-            offset_time=self.offset_time,
-            num_processes=self.num_processes,
-        ).to_description()
-
-        return sample_metadata_or_errors
-
-    def to_description(self) -> list[types.ImageMetadataOrError]:
-        sample_metadata_or_errors = self.geotag_samples()
-
-        sample_paths = set(metadata.filename for metadata in sample_metadata_or_errors)
-
-        non_sample_paths = [
-            path for path in self.image_paths if path not in sample_paths
-        ]
-
-        non_sample_metadata_or_errors = (
-            geotag_images_from_exiftool.GeotagImagesFromExifTool(
-                non_sample_paths,
-                self.xml_path,
-                num_processes=self.num_processes,
-            ).to_description()
-        )
-
-        return sample_metadata_or_errors + non_sample_metadata_or_errors

mapillary_tools/geotag/geotag_videos_from_exiftool_video.py

@@ -1,151 +0,0 @@
-from __future__ import annotations
-
-import logging
-import typing as T
-import xml.etree.ElementTree as ET
-from pathlib import Path
-
-from .. import constants, exceptions, exiftool_read, geo, types, utils
-from ..exiftool_read_video import ExifToolReadVideo
-from ..exiftool_runner import ExiftoolRunner
-from ..gpmf import gpmf_gps_filter
-from ..telemetry import GPSPoint
-from .geotag_from_generic import GenericVideoExtractor, GeotagVideosFromGeneric
-
-LOG = logging.getLogger(__name__)
-
-
-class VideoExifToolExtractor(GenericVideoExtractor):
-    def __init__(self, video_path: Path, element: ET.Element):
-        super().__init__(video_path)
-        self.element = element
-
-    def extract(self) -> types.VideoMetadataOrError:
-        exif = ExifToolReadVideo(ET.ElementTree(self.element))
-
-        make = exif.extract_make()
-        model = exif.extract_model()
-
-        is_gopro = make is not None and make.upper() in ["GOPRO"]
-
-        points = exif.extract_gps_track()
-
-        # ExifTool has no idea if GPS is not found or found but empty
-        if is_gopro:
-            if not points:
-                raise exceptions.MapillaryGPXEmptyError("Empty GPS data found")
-
-            # ExifTool (since 13.04) converts GPSSpeed for GoPro to km/h, so here we convert it back to m/s
-            for p in points:
-                if isinstance(p, GPSPoint) and p.ground_speed is not None:
-                    p.ground_speed = p.ground_speed / 3.6
-
-            if isinstance(points[0], GPSPoint):
-                points = T.cast(
-                    T.List[geo.Point],
-                    gpmf_gps_filter.remove_noisy_points(
-                        T.cast(T.List[GPSPoint], points)
-                    ),
-                )
-                if not points:
-                    raise exceptions.MapillaryGPSNoiseError("GPS is too noisy")
-
-        if not points:
-            raise exceptions.MapillaryVideoGPSNotFoundError(
-                "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=filetype,
-            points=points,
-            make=make,
-            model=model,
-        )
-
-        return video_metadata
-
-
-class GeotagVideosFromExifToolVideo(GeotagVideosFromGeneric):
-    def __init__(
-        self,
-        video_paths: T.Sequence[Path],
-        xml_path: Path,
-        num_processes: int | None = None,
-    ):
-        super().__init__(video_paths, num_processes=num_processes)
-        self.xml_path = xml_path
-
-    def _generate_video_extractors(
-        self,
-    ) -> T.Sequence[GenericVideoExtractor | types.ErrorMetadata]:
-        rdf_description_by_path = exiftool_read.index_rdf_description_by_path(
-            [self.xml_path]
-        )
-
-        results: list[VideoExifToolExtractor | types.ErrorMetadata] = []
-
-        for path in self.video_paths:
-            rdf_description = rdf_description_by_path.get(
-                exiftool_read.canonical_path(path)
-            )
-            if rdf_description is None:
-                exc = exceptions.MapillaryEXIFNotFoundError(
-                    f"The {exiftool_read._DESCRIPTION_TAG} XML element for the video not found"
-                )
-                results.append(
-                    types.describe_error_metadata(
-                        exc, path, filetype=types.FileType.VIDEO
-                    )
-                )
-            else:
-                results.append(VideoExifToolExtractor(path, rdf_description))
-
-        return results
-
-
-class GeotagVideosFromExifToolRunner(GeotagVideosFromGeneric):
-    def _generate_video_extractors(
-        self,
-    ) -> T.Sequence[GenericVideoExtractor | types.ErrorMetadata]:
-        runner = ExiftoolRunner(constants.EXIFTOOL_PATH)
-
-        LOG.debug(
-            "Extracting XML from %d videos with exiftool command: %s",
-            len(self.video_paths),
-            " ".join(runner._build_args_read_stdin()),
-        )
-
-        try:
-            xml = runner.extract_xml(self.video_paths)
-        except FileNotFoundError as ex:
-            raise exceptions.MapillaryExiftoolNotFoundError(ex) from ex
-
-        rdf_description_by_path = (
-            exiftool_read.index_rdf_description_by_path_from_xml_element(
-                ET.fromstring(xml)
-            )
-        )
-
-        results: list[VideoExifToolExtractor | types.ErrorMetadata] = []
-
-        for path in self.video_paths:
-            rdf_description = rdf_description_by_path.get(
-                exiftool_read.canonical_path(path)
-            )
-            if rdf_description is None:
-                exc = exceptions.MapillaryEXIFNotFoundError(
-                    f"The {exiftool_read._DESCRIPTION_TAG} XML element for the video not found"
-                )
-                results.append(
-                    types.describe_error_metadata(
-                        exc, path, filetype=types.FileType.VIDEO
-                    )
-                )
-            else:
-                results.append(VideoExifToolExtractor(path, rdf_description))
-
-        return results

mapillary_tools/video_data_extraction/cli_options.py

@@ -1,22 +0,0 @@
-import typing as T
-from pathlib import Path
-
-
-known_parser_options = ["source", "pattern", "exiftool_path"]
-
-
-class CliParserOptions(T.TypedDict, total=False):
-    source: str
-    pattern: T.Optional[str]
-    exiftool_path: T.Optional[Path]
-
-
-class CliOptions(T.TypedDict, total=False):
-    paths: T.Sequence[Path]
-    recursive: bool
-    geotag_sources_options: T.Sequence[CliParserOptions]
-    geotag_source_path: Path
-    exiftool_path: Path
-    num_processes: int
-    device_make: T.Optional[str]
-    device_model: T.Optional[str]