From b16da583cfdd7738f11533f6cd5efea48e60087e Mon Sep 17 00:00:00 2001 From: DerekFurstPitt Date: Wed, 4 Mar 2026 15:07:30 -0500 Subject: [PATCH 1/3] refactored job_id to reference_id --- search-api-spec.yaml | 4 ++-- src/hubmap_translator.py | 4 ++-- src/search-adaptor | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/search-api-spec.yaml b/search-api-spec.yaml index 79dc29eb..3f74b39c 100644 --- a/search-api-spec.yaml +++ b/search-api-spec.yaml @@ -1141,11 +1141,11 @@ paths: '/reindex-status/{identifier}': get: summary: Retrieves a json containing information about a particularitem in the queue including its priority level, and its position in the queue. - description: To retrieve infomration about an individual entity in the queue, include either the id used when submitting the reindex request (uuid or hubmap_id) or the job_id (returned when submitting the request) as a path variable. + description: To retrieve infomration about an individual entity in the queue, include either the id used when submitting the reindex request (uuid or hubmap_id) or the reference_id (returned when submitting the request) as a path variable. parameters: - name: identifier in: path - description: The id of the chosen entity. Either the original id used during reindex submission (uuid or HuBMAP ID, whichever was used) or the job_id returned when the reindex was submitted. + description: The id of the chosen entity. Either the original id used during reindex submission (uuid or HuBMAP ID, whichever was used) or the reference_id returned when the reindex was submitted. responses: '200': description: Returns the status data as a json describing the current state of the chosen entity. diff --git a/src/hubmap_translator.py b/src/hubmap_translator.py index e0a6af29..ac2b0976 100644 --- a/src/hubmap_translator.py +++ b/src/hubmap_translator.py @@ -703,7 +703,7 @@ def enqueue_reindex(self, entity_id, reindex_queue, priority): logger.info(f"Enqueueing reindex for {entity['entity_type']} of uuid: {entity_id}") subsequent_priority = max(priority, 2) - job_id = reindex_queue.enqueue( + reference_id = reindex_queue.enqueue( job_metadata = {"uuid": entity.get('uuid'), "hubmap_id": entity.get('hubmap_id')}, task_func=reindex_entity_queued_wrapper, entity_id=entity_id, @@ -815,7 +815,7 @@ def enqueue_reindex(self, entity_id, reindex_queue, priority): priority=subsequent_priority ) logger.info(f"Finished executing translate() on {entity['entity_type']} of uuid: {entity_id}") - return job_id + return reference_id except ValueError as e: raise ValueError(e) except RedisError as e: diff --git a/src/search-adaptor b/src/search-adaptor index 6687ae73..81de7200 160000 --- a/src/search-adaptor +++ b/src/search-adaptor @@ -1 +1 @@ -Subproject commit 6687ae735f610b20e3ea86d0d268d879a73a9ec9 +Subproject commit 81de7200d1d0f6c4946404d0a1cc60df5eff4765 From 453ad93083d0edd0f09c8d7cadf7ee9a24e517ae Mon Sep 17 00:00:00 2001 From: DerekFurstPitt Date: Wed, 4 Mar 2026 16:22:09 -0500 Subject: [PATCH 2/3] updated error handling to accommodate malformed or missing ids --- src/search-adaptor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search-adaptor b/src/search-adaptor index 81de7200..b0b4ad87 160000 --- a/src/search-adaptor +++ b/src/search-adaptor @@ -1 +1 @@ -Subproject commit 81de7200d1d0f6c4946404d0a1cc60df5eff4765 +Subproject commit b0b4ad87def413581222772670d6ddfef87602d5 From b664df2ce4f5d06ed20f387e0360bda2dcd5167f Mon Sep 17 00:00:00 2001 From: DerekFurstPitt Date: Mon, 9 Mar 2026 10:16:49 -0400 Subject: [PATCH 3/3] updated 'job id' to 'reference id' --- src/search-adaptor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/search-adaptor b/src/search-adaptor index b0b4ad87..386a117d 160000 --- a/src/search-adaptor +++ b/src/search-adaptor @@ -1 +1 @@ -Subproject commit b0b4ad87def413581222772670d6ddfef87602d5 +Subproject commit 386a117dc361d3aae55004a07e6d5b101a6ecc92