Skip to content

Commit ca2fb2e

Browse files
authored
import cads-adaptors at top level (#45)
1 parent 782fe02 commit ca2fb2e

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

cads_worker/worker.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from typing import Any
66

77
import cacholote
8+
import cads_adaptors
89
import cads_broker.database
910
import distributed.worker
1011
import structlog
@@ -170,8 +171,6 @@ def submit_workflow(
170171
form: dict[str, Any] = {},
171172
metadata: dict[str, Any] = {},
172173
):
173-
import cads_adaptors
174-
175174
job_id = distributed.worker.thread_state.key # type: ignore
176175
# send event with worker address and pid of the job
177176
worker = get_worker()
@@ -185,7 +184,9 @@ def submit_workflow(
185184
message=socket.gethostname(),
186185
session=session,
187186
)
188-
system_request = cads_broker.database.get_request(request_uid=job_id, session=session)
187+
system_request = cads_broker.database.get_request(
188+
request_uid=job_id, session=session
189+
)
189190
request = system_request.request_body.get("request", {})
190191
form = system_request.adaptor_properties.form
191192
config.update(system_request.adaptor_properties.config)
@@ -209,7 +210,9 @@ def submit_workflow(
209210
result = cacholote.cacheable(adaptor.retrieve)(request=request)
210211
except Exception as err:
211212
logger.exception(job_id=job_id, event_type="EXCEPTION")
212-
context.add_user_visible_error(f"The job failed with: {err.__class__.__name__}")
213+
context.add_user_visible_error(
214+
f"The job failed with: {err.__class__.__name__}"
215+
)
213216
context.error(f"{err.__class__.__name__}: {str(err)}")
214217
raise
215218
finally:

0 commit comments

Comments
 (0)