PyPI - mapillary-tools - Versions diffs - 0.14.1__tar.gz → 0.14.2__tar.gz - Mend

@@ -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

@@ -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

@@ -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}"

@@ -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)

@@ -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__":

@@ -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,
         )
     )

@@ -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

@@ -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")

	@@ -0,0 +1 @@
1	+ VERSION = "0.14.2"

	@@ -1 +0,0 @@
1	- VERSION = "0.14.1"

mapillary-tools 0.14.1__tar.gz → 0.14.2__tar.gz