From e813857b949f7f3f5d49bfe29c4fe8eff99b3d5e Mon Sep 17 00:00:00 2001 From: Marat Akhmetov Date: Thu, 11 Dec 2025 13:54:32 +0300 Subject: [PATCH 1/2] [DOP-28176] syncmster-datatrentgen integration --- syncmaster/dto/runs.py | 2 +- syncmaster/dto/transfers.py | 5 +++-- syncmaster/worker/controller.py | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/syncmaster/dto/runs.py b/syncmaster/dto/runs.py index 8f16dcc9..3bd81f49 100644 --- a/syncmaster/dto/runs.py +++ b/syncmaster/dto/runs.py @@ -6,5 +6,5 @@ @dataclass class RunDTO: - id: str + id: int created_at: datetime diff --git a/syncmaster/dto/transfers.py b/syncmaster/dto/transfers.py index a09ab505..2a248ecd 100644 --- a/syncmaster/dto/transfers.py +++ b/syncmaster/dto/transfers.py @@ -14,11 +14,13 @@ @dataclass class TransferDTO: type: ClassVar[str] + id: int + name: str + group_name: str @dataclass class DBTransferDTO(TransferDTO): - id: int table_name: str strategy: FullStrategy | IncrementalStrategy resources: Resources @@ -33,7 +35,6 @@ def __post_init__(self): @dataclass class FileTransferDTO(TransferDTO): - id: int directory_path: str file_format: CSV | JSONLine | JSON | Excel | XML | ORC | Parquet strategy: FullStrategy | IncrementalStrategy diff --git a/syncmaster/worker/controller.py b/syncmaster/worker/controller.py index b32332c7..0f73661e 100644 --- a/syncmaster/worker/controller.py +++ b/syncmaster/worker/controller.py @@ -193,6 +193,8 @@ def __init__( connection_data=source_connection.data, run_data={"id": run.id, "created_at": run.created_at}, transfer_id=run.transfer.id, + transfer_name=run.transfer.name, + group_name=run.transfer.group.name, transfer_params=run.transfer.source_params, strategy_params=run.transfer.strategy_params, resources=run.transfer.resources, @@ -204,6 +206,8 @@ def __init__( connection_data=target_connection.data, run_data={"id": run.id, "created_at": run.created_at}, transfer_id=run.transfer.id, + transfer_name=run.transfer.name, + group_name=run.transfer.group.name, transfer_params=run.transfer.target_params, strategy_params=run.transfer.strategy_params, resources=run.transfer.resources, @@ -243,6 +247,8 @@ def get_handler( connection_auth_data: dict, run_data: dict[str, Any], transfer_id: int, + transfer_name: str, + group_name: str, transfer_params: dict[str, Any], strategy_params: dict[str, Any], resources: dict[str, Any], @@ -262,6 +268,8 @@ def get_handler( connection_dto=connection_dto(**connection_data), transfer_dto=transfer_dto( id=transfer_id, + name=transfer_name, + group_name=group_name, strategy=Strategy.from_dict(strategy_params), resources=Resources(**resources), transformations=transformations, From fb66953548cfa17c26bfb175de147a21be3d8ceb Mon Sep 17 00:00:00 2001 From: Marat Akhmetov Date: Thu, 11 Dec 2025 14:03:35 +0300 Subject: [PATCH 2/2] [DOP-28176] Gave worker access to transfer and group names --- docs/changelog/next_release/308.feature.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/changelog/next_release/308.feature.rst diff --git a/docs/changelog/next_release/308.feature.rst b/docs/changelog/next_release/308.feature.rst new file mode 100644 index 00000000..54862ff7 --- /dev/null +++ b/docs/changelog/next_release/308.feature.rst @@ -0,0 +1 @@ +Gave worker access to transfer and group names \ No newline at end of file