Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions mapillary_tools/uploader.py
Original file line number Diff line number Diff line change
Expand Up @@ -983,8 +983,15 @@ def finish_upload(
)

body = api_v4.jsonify_response(resp)
# TODO: Validate cluster_id
cluster_id = body.get("cluster_id")
if not isinstance(body, dict) or not body.get("cluster_id"):
# Without a cluster ID nothing was created. Fail before the
# upload is counted and written to the upload history, or it
# would be skipped as already uploaded from then on
raise api_v4.HTTPContentError(
"Cluster ID not found in the response, so the upload was not finished",
resp,
)
cluster_id = body["cluster_id"]

progress["cluster_id"] = cluster_id
self.emitter.emit("upload_finished", progress)
Expand Down
48 changes: 48 additions & 0 deletions tests/unit/test_uploader.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import py.path
import pytest
import requests
from mapillary_tools import api_v4, geo, types, upload, uploader
from mapillary_tools.mp4 import construct_mp4_parser as cparser
from mapillary_tools.serializer import description
Expand Down Expand Up @@ -228,6 +229,53 @@ def test_upload_blackvue(tmpdir: py.path.local, setup_upload: py.path.local):
assert fp.read() == b"this is a fake video"


def _finish_upload_with_response(
monkeypatch, body: bytes, finished: T.List[dict]
) -> str:
resp = requests.Response()
resp.status_code = 200
resp.reason = "OK"
resp._content = body
resp.url = "https://graph.mapillary.com/finish_upload"
resp.request = requests.Request("POST", resp.url).prepare()
monkeypatch.setattr(api_v4, "finish_upload", lambda *args, **kwargs: resp)

user_items: T.Dict[str, str] = {"user_upload_token": "YOUR_USER_ACCESS_TOKEN"}
emitter = uploader.EventEmitter()
emitter.on("upload_finished")(finished.append)
mly_uploader = uploader.Uploader(
uploader.UploadOptions(T.cast(T.Any, user_items)), emitter=emitter
)
return mly_uploader.finish_upload(
"file_handle", api_v4.ClusterFileType.ZIP, progress={}
)


def test_finish_upload_returns_cluster_id(monkeypatch):
finished: T.List[dict] = []
cluster_id = _finish_upload_with_response(
monkeypatch, b'{"cluster_id": "123"}', finished
)
assert cluster_id == "123"
assert finished == [{"cluster_id": "123"}]


@pytest.mark.parametrize(
"body", [b"{}", b'{"cluster_id": null, "organization_id": null}', b"[]"]
)
def test_finish_upload_without_cluster_id_fails(monkeypatch, body: bytes):
# Not finished: nothing may be counted as uploaded or written to the
# upload history, which hooks on upload_finished, or the files would be
# skipped as already uploaded from then on
finished: T.List[dict] = []
with pytest.raises(api_v4.HTTPContentError) as exc_info:
_finish_upload_with_response(monkeypatch, body, finished)
assert str(exc_info.value) == (
"Cluster ID not found in the response, so the upload was not finished"
)
assert finished == []


def _write_empty_mp4(path: Path, timescale: int) -> None:
mvhd: cparser.BoxDict = {
"type": b"mvhd",
Expand Down
Loading