ocrd 3.8.1__py3-none-any.whl → 3.9.1__py3-none-any.whl

ocrd_network/cli/client.py

@@ -212,13 +212,17 @@ def workflow_cli():
 @workflow_cli.command('check-status')
 @click.option('--address', type=URL, help=ADDRESS_HELP)
 @click.option('-j', '--workflow-job-id', required=True)
-def check_workflow_job_status(address: Optional[str], workflow_job_id: str):
+@click.option('-v', '--verbose', default=False, is_flag=True)
+def check_workflow_job_status(address: Optional[str], workflow_job_id: str, verbose: bool = False):
     """
     Check the status of a previously submitted workflow job.
     """
     client = Client(server_addr_processing=address)
     try:
-        job_status = client.check_workflow_status(workflow_job_id)
+        if verbose:
+            job_status = client.check_workflow_status(workflow_job_id)
+        else:
+            job_status = client.check_workflow_status_simple(workflow_job_id)
     except RequestException as e:
         print(
             getattr(e, 'detail_message', str(e)),

ocrd_network/client.py

@@ -6,6 +6,7 @@ from .client_utils import (
     get_ps_processing_job_log,
     get_ps_processing_job_status,
     get_ps_workflow_job_status,
+    get_ps_workflow_job_status_simple,
     poll_job_status_till_timeout_fail_or_success,
     poll_wf_status_till_timeout_fail_or_success,
     post_ps_processing_request,
@@ -43,6 +44,9 @@ class Client:
     def check_job_status(self, job_id: str):
         return get_ps_processing_job_status(self.server_addr_processing, processing_job_id=job_id)
 
+    def check_workflow_status_simple(self, workflow_job_id: str):
+        return get_ps_workflow_job_status_simple(self.server_addr_processing, workflow_job_id=workflow_job_id)
+
     def check_workflow_status(self, workflow_job_id: str):
         return get_ps_workflow_job_status(self.server_addr_processing, workflow_job_id=workflow_job_id)
 

ocrd_network/client_utils.py

@@ -3,6 +3,7 @@ import os
 from requests import get as request_get, post as request_post, RequestException, Response
 from requests.exceptions import JSONDecodeError
 from time import sleep
+from typing import Any
 from .constants import JobState, NETWORK_PROTOCOLS
 
 
@@ -16,7 +17,7 @@ def _poll_endpoint_status(ps_server_host: str, job_id: str, job_type: str, tries
         if job_type == "processor":
             job_state = get_ps_processing_job_status(ps_server_host, job_id)
         if job_type == "workflow":
-            job_state = get_ps_workflow_job_status(ps_server_host, job_id)
+            job_state = get_ps_workflow_job_status_simple(ps_server_host, job_id)
         if print_state:
             print(f"State of the {job_type} job {job_id}: {job_state}")
         if job_state == JobState.success or job_state == JobState.failed:
@@ -77,7 +78,7 @@ def get_ps_processing_job_status(ps_server_host: str, processing_job_id: str) ->
     return getattr(JobState, job_state.lower())
 
 
-def get_ps_workflow_job_status(ps_server_host: str, workflow_job_id: str) -> JobState:
+def get_ps_workflow_job_status_simple(ps_server_host: str, workflow_job_id: str) -> JobState:
     request_url = f"{ps_server_host}/workflow/job-simple/{workflow_job_id}"
     response = request_get(url=request_url, headers={"accept": "application/json; charset=utf-8"})
     _raise_if_error(response)
@@ -86,6 +87,12 @@ def get_ps_workflow_job_status(ps_server_host: str, workflow_job_id: str) -> Job
     return getattr(JobState, job_state.lower())
 
 
+def get_ps_workflow_job_status(ps_server_host: str, workflow_job_id: str) -> Any:
+    request_url = f"{ps_server_host}/workflow/job/{workflow_job_id}"
+    response = request_get(url=request_url, headers={"accept": "application/json; charset=utf-8"})
+    _raise_if_error(response)
+    return response
+
 def post_ps_processing_request(ps_server_host: str, processor: str, job_input: dict) -> str:
     request_url = f"{ps_server_host}/processor/run/{processor}"
     response = request_post(

ocrd_network/constants.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 DOCKER_IMAGE_MONGO_DB = "mongo"
-DOCKER_IMAGE_RABBIT_MQ = "rabbitmq:3.12-management"
+DOCKER_IMAGE_RABBIT_MQ = "rabbitmq:4.2-management"
 # These feature flags are required by default to use the newer version
 DOCKER_RABBIT_MQ_FEATURES = "quorum_queue,implicit_default_bindings,classic_mirrored_queue_version"
 

ocrd_network/rabbitmq_utils/helpers.py

@@ -25,7 +25,7 @@ def __connect_rabbitmq_client(
     except ValueError as error:
         raise Exception("Failed to parse RabbitMQ connection data") from error
     logger.info(f"Connecting client to RabbitMQ server: {rmq_host}:{rmq_port}{rmq_vhost}")
-    logger.debug(f"RabbitMQ client authenticates with username: {rmq_username}, password: {rmq_password}")
+    # logger.debug(f"RabbitMQ client authenticates with username: {rmq_username}, password: {rmq_password}")
     while attempts > 0:
         try:
             if client_type == "consumer":