Skip to content

fix(job-orchestration): Make tag_ids a required list[int] for compatibility with Spider compressor. #1453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sitaowang1998 merged 7 commits into from
Oct 21, 2025
Merged

fix(job-orchestration): Make tag_ids a required list[int] for compatibility with Spider compressor. #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
812bb25
Use empty tag ids instead of None
sitaowang1998 Oct 20, 2025
e85738b
Update type annotations
sitaowang1998 Oct 20, 2025
62b2c2c
Merge branch 'main' into tag-id-none
sitaowang1998 Oct 20, 2025
bcfc686
Use list instead of List in type annotation
sitaowang1998 Oct 21, 2025
64080a3
Merge branch 'main' into tag-id-none
sitaowang1998 Oct 21, 2025
ea468df
Merge branch 'main' into tag-id-none
sitaowang1998 Oct 21, 2025
4f8dc8f
Merge branch 'main' into tag-id-none
sitaowang1998 Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/job-orchestration/job_orchestration/executor/compress/celery_compress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def compress(
self: Task,
job_id: int,
task_id: int,
tag_ids,
tag_ids: list[int],
clp_io_config_json: str,
paths_to_compress_json: str,
clp_metadata_db_connection_config,
Expand Down
10 changes: 5 additions & 5 deletions components/job-orchestration/job_orchestration/executor/compress/compression_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def update_tags(
table_prefix: str,
dataset: Optional[str],
archive_id: str,
tag_ids: List[int],
tag_ids: list[int],
) -> None:
db_cursor.executemany(
f"""
Expand All @@ -87,10 +87,10 @@ def update_job_metadata_and_tags(
job_id: int,
table_prefix: str,
dataset: Optional[str],
tag_ids: List[int],
tag_ids: list[int],
archive_stats: Dict[str, Any],
) -> None:
if tag_ids is not None:
if len(tag_ids) > 0:
update_tags(db_cursor, table_prefix, dataset, archive_stats["id"], tag_ids)
increment_compression_job_metadata(
db_cursor,
Expand Down Expand Up @@ -312,7 +312,7 @@ def run_clp(
logs_dir: pathlib.Path,
job_id: int,
task_id: int,
tag_ids,
tag_ids: list[int],
paths_to_compress: PathsToCompress,
sql_adapter: SQL_Adapter,
clp_metadata_db_connection_config,
Expand Down Expand Up @@ -522,7 +522,7 @@ def run_clp(
def compression_entry_point(
job_id: int,
task_id: int,
tag_ids,
tag_ids: list[int],
clp_io_config_json: str,
paths_to_compress_json: str,
clp_metadata_db_connection_config: Dict[str, Any],
Expand Down
2 changes: 1 addition & 1 deletion components/job-orchestration/job_orchestration/scheduler/compress/compression_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ def search_and_schedule_new_tasks(
)
db_conn.commit()

tag_ids = None
tag_ids = []
if clp_io_config.output.tags:
tags_table_name = get_tags_table_name(table_prefix, dataset)
db_cursor.executemany(
Expand Down
Loading