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
12 changes: 9 additions & 3 deletions openeogeotrellis/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import pkg_resources
import pystac
import requests
import reretry
import shapely.geometry.base
from deprecated import deprecated
from geopyspark import LayerType, Pyramid, TiledRasterLayer
Expand Down Expand Up @@ -2830,6 +2831,12 @@ def load_results_metadata(self, job_id: str, user_id: str) -> dict:

return {}

@staticmethod
@reretry.retry(exceptions=FileNotFoundError, tries=5, delay=1, backoff=2, logger=logger)
def _load_results_metadata_from_file(metadata_file: Path):
with open(metadata_file) as f:
return json.load(f)

@staticmethod
def _load_results_metadata_from_uri(results_metadata_uri: Optional[str], job_id: str) -> Optional[dict]:
# TODO: reduce code duplication with load_results_metadata
Expand All @@ -2843,10 +2850,9 @@ def _load_results_metadata_from_uri(results_metadata_uri: Optional[str], job_id:
uri_parts = urlparse(results_metadata_uri)

if uri_parts.scheme == "file":
file_path = uri_parts.path
file_path = Path(uri_parts.path)
try:
with open(file_path) as f:
return json.load(f)
return GpsBatchJobs._load_results_metadata_from_file(file_path)
except FileNotFoundError:
logger.debug(
f"File with results metadata {file_path} does not exist; this is expected and not "
Expand Down
3 changes: 2 additions & 1 deletion openeogeotrellis/job_registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import random
from datetime import datetime, timedelta
from decimal import Decimal
from pathlib import Path
from typing import Any, List, Dict, Callable, Union, Optional, Iterator, Tuple

import kazoo
Expand Down Expand Up @@ -900,7 +901,7 @@ def _load_results_metadata_from_uri(results_metadata_uri: Optional[str], job_id:
uri_parts = urlparse(results_metadata_uri)

if uri_parts.scheme == "file":
file_path = uri_parts.path
file_path = Path(uri_parts.path)
try:
with open(file_path) as f:
return json.load(f)
Expand Down