mapillary-tools 0.14.1__py3-none-any.whl → 0.14.2__py3-none-any.whl

mapillary_tools/__init__.py

@@ -1 +1 @@
-VERSION = "0.14.1"
+VERSION = "0.14.2"

mapillary_tools/authenticate.py

@@ -165,7 +165,7 @@ def _prompt(message: str) -> str:
 
 def _validate_profile(user_items: config.UserItem) -> config.UserItem:
     try:
-        jsonschema.validate(user_items, config.UserItemSchema)
+        config.UserItemSchemaValidator.validate(user_items)
     except jsonschema.ValidationError as ex:
         raise exceptions.MapillaryBadParameterError(
             f"Invalid profile format: {ex.message}"

mapillary_tools/config.py

@@ -6,6 +6,8 @@ import sys
 import typing as T
 from typing import TypedDict
 
+import jsonschema
+
 if sys.version_info >= (3, 11):
     from typing import Required
 else:
@@ -50,6 +52,9 @@ UserItemSchema = {
 }
 
 
+UserItemSchemaValidator = jsonschema.Draft202012Validator(UserItemSchema)
+
+
 def _load_config(config_path: str) -> configparser.ConfigParser:
     config = configparser.ConfigParser()
     # Override to not change option names (by default it will lower them)

mapillary_tools/geotag/options.py

@@ -173,8 +173,11 @@ SourceOptionSchema = {
 }
 
 
+SourceOptionSchemaValidator = jsonschema.Draft202012Validator(SourceOptionSchema)
+
+
 def validate_option(instance):
-    jsonschema.validate(instance=instance, schema=SourceOptionSchema)
+    SourceOptionSchemaValidator.validate(instance=instance)
 
 
 if __name__ == "__main__":

mapillary_tools/process_geotag_properties.py

@@ -304,19 +304,12 @@ def _validate_metadatas(
     # TypeError: __init__() missing 3 required positional arguments: 'image_time', 'gpx_start_time', and 'gpx_end_time'
     # See https://stackoverflow.com/a/61432070
     good_metadatas, error_metadatas = types.separate_errors(metadatas)
-    map_results = utils.mp_map_maybe(
-        validate_and_fail_metadata,
-        T.cast(T.Iterable[types.Metadata], good_metadatas),
-        num_processes=num_processes,
-    )
 
     validated_metadatas = list(
-        tqdm(
-            map_results,
-            desc="Validating metadatas",
-            unit="metadata",
-            disable=LOG.getEffectiveLevel() <= logging.DEBUG,
-            total=len(good_metadatas),
+        utils.mp_map_maybe(
+            validate_and_fail_metadata,
+            T.cast(T.Iterable[types.Metadata], good_metadatas),
+            num_processes=num_processes,
         )
     )
 

mapillary_tools/serializer/description.py

@@ -259,6 +259,11 @@ ImageDescriptionFileSchema = _merge_schema(
 )
 
 
+ImageDescriptionFileSchemaValidator = jsonschema.Draft202012Validator(
+    ImageDescriptionFileSchema
+)
+
+
 VideoDescriptionFileSchema = _merge_schema(
     VideoDescriptionSchema,
     {
@@ -295,6 +300,11 @@ VideoDescriptionFileSchema = _merge_schema(
 )
 
 
+VideoDescriptionFileSchemaValidator = jsonschema.Draft202012Validator(
+    VideoDescriptionFileSchema
+)
+
+
 ImageVideoDescriptionFileSchema = {
     "oneOf": [VideoDescriptionFileSchema, ImageDescriptionFileSchema]
 }
@@ -520,7 +530,7 @@ def parse_capture_time(time: str) -> datetime.datetime:
 
 def validate_image_desc(desc: T.Any) -> None:
     try:
-        jsonschema.validate(instance=desc, schema=ImageDescriptionFileSchema)
+        ImageDescriptionFileSchemaValidator.validate(desc)
     except jsonschema.ValidationError as ex:
         # do not use str(ex) which is more verbose
         raise exceptions.MapillaryMetadataValidationError(ex.message) from ex
@@ -533,7 +543,7 @@ def validate_image_desc(desc: T.Any) -> None:
 
 def validate_video_desc(desc: T.Any) -> None:
     try:
-        jsonschema.validate(instance=desc, schema=VideoDescriptionFileSchema)
+        VideoDescriptionFileSchemaValidator.validate(desc)
     except jsonschema.ValidationError as ex:
         # do not use str(ex) which is more verbose
         raise exceptions.MapillaryMetadataValidationError(ex.message) from ex

mapillary_tools/upload.py

@@ -10,7 +10,6 @@ import uuid
 from pathlib import Path
 
 import humanize
-import jsonschema
 import requests
 from tqdm import tqdm
 
@@ -57,7 +56,7 @@ def upload(
 
     metadatas = _load_descs(_metadatas_from_process, import_paths, desc_path)
 
-    jsonschema.validate(instance=user_items, schema=config.UserItemSchema)
+    config.UserItemSchemaValidator.validate(user_items)
 
     # Setup the emitter -- the order matters here
 

mapillary_tools/uploader.py

@@ -36,6 +36,7 @@ from . import (
     types,
     upload_api_v4,
     utils,
+    VERSION,
 )
 from .camm import camm_builder, camm_parser
 from .gpmf import gpmf_parser
@@ -799,8 +800,14 @@ class SingleImageUploader:
             LOG.debug("Dry-run mode enabled, skipping caching upload file handles")
             return None
 
+        # Different python/CLI versions use different cache (dbm) formats.
+        # Separate them to avoid conflicts
+        py_version_parts = [str(part) for part in sys.version_info[:3]]
+        version = f"py_{'_'.join(py_version_parts)}_{VERSION}"
+
         cache_path_dir = (
             Path(constants.UPLOAD_CACHE_DIR)
+            .joinpath(version)
             .joinpath(api_v4.MAPILLARY_CLIENT_TOKEN.replace("|", "_"))
             .joinpath(
                 user_items.get("MAPSettingsUserKey", user_items["user_upload_token"])
@@ -812,6 +819,7 @@ class SingleImageUploader:
         # Sanitize sensitive segments for logging
         sanitized_cache_path = (
             Path(constants.UPLOAD_CACHE_DIR)
+            .joinpath(version)
             .joinpath("***")
             .joinpath("***")
             .joinpath("cached_file_handles")

{mapillary_tools-0.14.1.dist-info → mapillary_tools-0.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapillary_tools
-Version: 0.14.1
+Version: 0.14.2
 Summary: Mapillary Image/Video Import Pipeline
 Author-email: Mapillary <support@mapillary.com>
 License: BSD

{mapillary_tools-0.14.1.dist-info → mapillary_tools-0.14.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-mapillary_tools/__init__.py,sha256=91RNgd9bTuNlioixZy3CssJc8LG26WWwcNDinmjqx20,19
+mapillary_tools/__init__.py,sha256=qdi1NvyXrEYAkFGfNSU2jMM-Ua-ehuWizcwvW341obw,19
 mapillary_tools/api_v4.py,sha256=bckAU_atUs0pSuqySeY4W0Rs011a21ClJHo_mbbcXXw,4864
-mapillary_tools/authenticate.py,sha256=JXmoTPcAyv9difceKIupXz7vyuLcNZ_AnxLrUVdtPPs,11745
+mapillary_tools/authenticate.py,sha256=mmaOwjQ444DcX4lRw2ms3naBg5Y_xwIJAIWeVdsQfqM,11742
 mapillary_tools/blackvue_parser.py,sha256=ea2JtU9MWU6yB0bQlF970_Of0bJVofSTRq1P30WKW-0,5623
-mapillary_tools/config.py,sha256=97zsyPnZXGincEkM__c6UNWH25EMTtRKZGsp6vBpHy8,3326
+mapillary_tools/config.py,sha256=LDxQoL2StjLGPefCN0y67nhIDN3xSE6Qn8G-tWC-oGA,3421
 mapillary_tools/constants.py,sha256=fk5HBczTBGyDOKQy-grzlf0SafiGwggdF8Ota13Rk0k,6235
 mapillary_tools/exceptions.py,sha256=uxTgBEfXgGxT0XNGRIAZ5mjtdqsCYfP6gnaXAK_ewBM,2483
 mapillary_tools/exif_read.py,sha256=nAbZDYAIBx3g4n6QIGKXX3s-A3SkfuvZQBInDrXMlKk,32220
@@ -15,14 +15,14 @@ mapillary_tools/geo.py,sha256=mWaESfDf_zHmyvnt5aVFro4FGrjiULNsuZ6HfGUWvSA,11009
 mapillary_tools/history.py,sha256=LP6e0zEYVBwRGUbFaGoE_AaBIEdpB4XrZsg9qwJVvRI,5344
 mapillary_tools/http.py,sha256=-df_oGyImO2AOmPnXcKMcztlL4LOZLArE6ki81NMGUA,6411
 mapillary_tools/ipc.py,sha256=DwWQb9hNshx0bg0Fo5NjY0mXjs-FkbR6tIQmjMgMtmg,1089
-mapillary_tools/process_geotag_properties.py,sha256=lF2Po83BAGWlLTtS5AFf6MLLTm-kiImD8SW-tWIbyZ0,14419
+mapillary_tools/process_geotag_properties.py,sha256=3EaVvjfKB-O38OjopBcxeEdP6qI5IPIxqmO6isjcXKM,14205
 mapillary_tools/process_sequence_properties.py,sha256=n4VjQHrgVjksIr3WoBviRhrQIBBDHGXMClolfyz6tu4,24057
 mapillary_tools/sample_video.py,sha256=pKSj1Vc8e5p1XGjykBuKY9XieTOskc-9L3F4L407jDM,13935
 mapillary_tools/telemetry.py,sha256=lL6qQbtOZft4DZZrCNK3njlwHT_30zLyYS_YRN5pgHY,1568
 mapillary_tools/types.py,sha256=pIU2wcxiOUWT5Pd05pgNzY9EVEDlwoldtlF2IIYYvE0,5909
-mapillary_tools/upload.py,sha256=yLunE66mZqTOiefN47KwO6auuyL5augbODyf5EafKeA,24084
+mapillary_tools/upload.py,sha256=XejAgmVW4Y33MiQ2g-shvHZA_zXTekEsOUHUHNx2AE4,24047
 mapillary_tools/upload_api_v4.py,sha256=VgOf7RhfUuzmlSBUp5CpekKIJ0xQrC0r-r0Ds9-wU4I,7344
-mapillary_tools/uploader.py,sha256=gsXMyNriaFPFzCmtw9wpFSh6tDe4nrYe1agzwiVVehE,39484
+mapillary_tools/uploader.py,sha256=Rw-1AkxE4TnddJNU6EW--9wmKYRqHbcTeheujdaluiM,39813
 mapillary_tools/utils.py,sha256=cP9idKt4EJqfC0qqOGneSoPNpPiYhaW8VjQ9CLYjESc,8092
 mapillary_tools/camm/camm_builder.py,sha256=ub6Z9ijep8zAo1NOlU51Gxk95kQ2vfN58YgVCLmNMRk,9211
 mapillary_tools/camm/camm_parser.py,sha256=aNHP65hNXYQBWBTfhaj_S5XYzmAHhjwcAfGhbm83__o,18043
@@ -48,7 +48,7 @@ mapillary_tools/geotag/geotag_images_from_video.py,sha256=3NV3-NfSkxT0n_n8Ajqjab
 mapillary_tools/geotag/geotag_videos_from_exiftool.py,sha256=Splhtv21JvrbFPVuKycf5wen0wOJ0zqOWk8d4aSw-ys,5345
 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/options.py,sha256=AgINCSBlxT9Etfu05zuzunWgcCHVWdFjWVL7oBduL4g,5166
 mapillary_tools/geotag/utils.py,sha256=tixXiN3uda2HuMnuXVu4xapgoSzZ86kNlJJQ66QERk0,1588
 mapillary_tools/geotag/image_extractors/base.py,sha256=XoNrLCbJtd-MN-snbhv6zyr6zBfJRoJkntV0ptrh6qg,358
 mapillary_tools/geotag/image_extractors/exif.py,sha256=cCUegbFqWxjAP4oOP1nZmwoJISWeKgjGO8h_t7nucHs,2079
@@ -66,11 +66,11 @@ mapillary_tools/mp4/io_utils.py,sha256=KZaJTlgFS27Oh3pcA5MKXYFoCifqgFaEZJyU6lb1j
 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=FB-DawgHVW5M2e81Uo921bY7DQv9fogXF3QMilpmEhQ,18473
+mapillary_tools/serializer/description.py,sha256=ECnQxC-1LOgkAKE5qFi9Y2KuCeH8KPUjjNFDiwebjvo,18647
 mapillary_tools/serializer/gpx.py,sha256=_xx6gHjaWHrlXaUpB5GGBrbRKzbExFyIzWWAH-CvksI,4383
-mapillary_tools-0.14.1.dist-info/licenses/LICENSE,sha256=l2D8cKfFmmJq_wcVq_JElPJrlvWQOzNWx7gMLINucxc,1292
-mapillary_tools-0.14.1.dist-info/METADATA,sha256=NmnszTprFtSwwR7VYc2kwUl3SYOiE9ClmQ5TWMPyA80,22200
-mapillary_tools-0.14.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mapillary_tools-0.14.1.dist-info/entry_points.txt,sha256=A3f3LP-BO_P-U8Y29QfpT4jx6Mjk3sXjTi2Yew4bvj8,75
-mapillary_tools-0.14.1.dist-info/top_level.txt,sha256=FbDkMgOrt1S70ho1WSBrOwzKOSkJFDwwqFOoY5-527s,16
-mapillary_tools-0.14.1.dist-info/RECORD,,
+mapillary_tools-0.14.2.dist-info/licenses/LICENSE,sha256=l2D8cKfFmmJq_wcVq_JElPJrlvWQOzNWx7gMLINucxc,1292
+mapillary_tools-0.14.2.dist-info/METADATA,sha256=rEmF5Twbh9m-zYNF1klQjGLOIrmiv5mCAQnbOb1Z8GE,22200
+mapillary_tools-0.14.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mapillary_tools-0.14.2.dist-info/entry_points.txt,sha256=A3f3LP-BO_P-U8Y29QfpT4jx6Mjk3sXjTi2Yew4bvj8,75
+mapillary_tools-0.14.2.dist-info/top_level.txt,sha256=FbDkMgOrt1S70ho1WSBrOwzKOSkJFDwwqFOoY5-527s,16
+mapillary_tools-0.14.2.dist-info/RECORD,,