Skip to content

Commit 3e1912e

Browse files
committed
Minor DoubleJobRegistry/JobRegistryInterface alignment tweaks
refs: #863, #1123
1 parent e2678e7 commit 3e1912e

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

openeogeotrellis/job_registry.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ def set_status(
650650
updated: Optional[str] = None,
651651
started: Optional[str] = None,
652652
finished: Optional[str] = None,
653-
) -> JobDict:
653+
) -> None:
654654
self._update(
655655
job_id=job_id,
656656
status=status,
@@ -660,7 +660,6 @@ def set_status(
660660
self._update(job_id=job_id, started=rfc3339.datetime(started))
661661
if finished:
662662
self._update(job_id=job_id, finished=rfc3339.datetime(finished))
663-
return self.db[job_id]
664663

665664
def set_dependencies(
666665
self, job_id: str, *, user_id: Optional[str] = None, dependencies: List[Dict[str, str]]
@@ -676,15 +675,16 @@ def set_dependency_status(self, job_id: str, *, user_id: Optional[str] = None, d
676675
def set_dependency_usage(self, job_id: str, *, user_id: Optional[str] = None, dependency_usage: Decimal) -> None:
677676
self._update(job_id, dependency_usage=str(dependency_usage))
678677

679-
def set_proxy_user(self, job_id: str, proxy_user: str) -> JobDict:
680-
return self._update(job_id=job_id, proxy_user=proxy_user)
678+
def set_proxy_user(self, job_id: str, proxy_user: str) -> None:
679+
self._update(job_id=job_id, proxy_user=proxy_user)
681680

682681
def set_application_id(self, job_id: str, application_id: str) -> JobDict:
683682
return self._update(job_id=job_id, application_id=application_id)
684683

685-
def set_results_metadata(self, job_id: str, costs: Optional[float], usage: dict,
686-
results_metadata: Dict[str, Any]) -> JobDict:
687-
return self._update(job_id=job_id, costs=costs, usage=usage, results_metadata=results_metadata)
684+
def set_results_metadata(
685+
self, job_id: str, costs: Optional[float], usage: dict, results_metadata: Dict[str, Any]
686+
) -> None:
687+
self._update(job_id=job_id, costs=costs, usage=usage, results_metadata=results_metadata)
688688

689689
def list_user_jobs(
690690
self,
@@ -825,7 +825,7 @@ def create_job(
825825
raise DoubleJobRegistryException(f"None of ZK/EJR registered {job_id=}")
826826
return zk_job_info or ejr_job_info
827827

828-
def get_job(self, job_id: str, *, user_id: Optional[str] = None) -> dict:
828+
def get_job(self, job_id: str, *, user_id: Optional[str] = None) -> JobDict:
829829
# TODO: eliminate get_job/get_job_metadata duplication?
830830
zk_job = ejr_job = None
831831
if self.zk_job_registry:
@@ -922,7 +922,7 @@ def set_dependency_usage(self, job_id: str, *, user_id: Optional[str] = None, de
922922
job_id=job_id, user_id=user_id, dependency_usage=dependency_usage
923923
)
924924

925-
def set_proxy_user(self, job_id: str, user_id: str, proxy_user: str):
925+
def set_proxy_user(self, job_id: str, user_id: str, proxy_user: str) -> None:
926926
# TODO: add dedicated method
927927
if self.zk_job_registry:
928928
self.zk_job_registry.patch(job_id=job_id, user_id=user_id, proxy_user=proxy_user)

0 commit comments

Comments
 (0)