From b0f50b8998a281d67253068894189526136208a6 Mon Sep 17 00:00:00 2001 From: Gabor Torok Date: Wed, 4 Mar 2026 13:57:24 -0800 Subject: [PATCH 1/2] on_task bugfix. Refs https://github.com/doe-iri/iri-facility-api-python/issues/52 --- app/routers/task/facility_adapter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routers/task/facility_adapter.py b/app/routers/task/facility_adapter.py index afec203a..c0dd7757 100644 --- a/app/routers/task/facility_adapter.py +++ b/app/routers/task/facility_adapter.py @@ -38,7 +38,7 @@ async def on_task(resource: status_models.Resource, user: account_models.User, t # Handle a task from the facility message queue. # Returns: (result, status) def _extractNull(ind): - data = {k: v for k, v in ind.items() if v is not None} + data = {k: v for k, v in ind.model_dump().items() if v is not None} return data try: r = None From 623e207c13f7b7c1f27a949c7415c5daca05f069 Mon Sep 17 00:00:00 2001 From: Gabor Torok Date: Wed, 4 Mar 2026 14:14:32 -0800 Subject: [PATCH 2/2] handle both dict and BaseModel --- app/routers/task/facility_adapter.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/routers/task/facility_adapter.py b/app/routers/task/facility_adapter.py index c0dd7757..ed119eb6 100644 --- a/app/routers/task/facility_adapter.py +++ b/app/routers/task/facility_adapter.py @@ -38,8 +38,11 @@ async def on_task(resource: status_models.Resource, user: account_models.User, t # Handle a task from the facility message queue. # Returns: (result, status) def _extractNull(ind): - data = {k: v for k, v in ind.model_dump().items() if v is not None} - return data + if hasattr(ind, "model_dump"): + data = ind.model_dump() + else: + data = ind + return {k: v for k, v in data.items() if v is not None} try: r = None logger.info(f"Received task: {task.router}:{task.command} with args: {task.args}")