From 0c31359ec5015bd8e5b32b6976e7793332cfc088 Mon Sep 17 00:00:00 2001 From: Admin User Date: Tue, 25 Feb 2025 13:16:47 +0000 Subject: [PATCH] Update block_wrapper.py --- block_wrapper.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/block_wrapper.py b/block_wrapper.py index 711cb3c..743f5e5 100644 --- a/block_wrapper.py +++ b/block_wrapper.py @@ -6,7 +6,7 @@ import os import re import sys from temporalio import activity -from temporalio.exceptions import ApplicationError, ActivityError +from temporalio.exceptions import ApplicationError from jsonschema import validate, ValidationError from temporalio.client import Client from temporalio.worker import Worker @@ -28,7 +28,7 @@ COMMIT_ID = os.getenv('VERSION') NAMESPACE = os.getenv('NAMESPACE') FLOWX_ENGINE_ADDRESS = os.getenv('FLOWX_ENGINE_ADDRESS') -if not BRANCH_NAME or not COMMIT_ID or not BRANCH_NAME or not NAMESPACE or not FLOWX_ENGINE_ADDRESS: +if not BRANCH_NAME or not COMMIT_ID or not NAMESPACE or not FLOWX_ENGINE_ADDRESS: raise ValueError("Environment variables BRANCH_NAME, VERSION, BRANCH_NAME, NAMESPACE and FLOWX_ENGINE_ADDRESS must be set.") @@ -48,6 +48,7 @@ BLOCK_NAME = REPO_NAME + "_" + BRANCH_NAME block_name_safe = sanitize_name(BLOCK_NAME) commit_id_safe = sanitize_name(COMMIT_ID_SHORT) + # Construct the task queue name TASK_QUEUE = f"{block_name_safe}_{commit_id_safe}" @@ -133,7 +134,7 @@ async def block_main_activity(input_data): except Exception as e: logger.error("Error executing block.py: %s", e) if not IS_TEST_ENVIRONMENT: - raise ActivityError("Error during block.py execution") from e + raise ApplicationError(f"Error during block execution: {e}") from e else: raise RuntimeError("Error during block.py execution") from e