refactor: enhance row validation in activity and tasks APIs for better type safety

This commit is contained in:
Abhimanyu Saharan
2026-02-11 11:46:52 +05:30
parent 18d958b3e3
commit 4d1190afb1
4 changed files with 196 additions and 13 deletions

View File

@@ -103,16 +103,39 @@ def _coerce_task_comment_rows(
) -> list[tuple[ActivityEvent, Task, Board, Agent | None]]:
rows: list[tuple[ActivityEvent, Task, Board, Agent | None]] = []
for item in items:
first: Any
second: Any
third: Any
fourth: Any
if isinstance(item, tuple):
if len(item) != TASK_COMMENT_ROW_LEN:
msg = "Expected (ActivityEvent, Task, Board, Agent | None) rows"
raise TypeError(msg)
first, second, third, fourth = item
else:
try:
row_len = len(item)
first = item[0]
second = item[1]
third = item[2]
fourth = item[3]
except (IndexError, KeyError, TypeError):
msg = "Expected (ActivityEvent, Task, Board, Agent | None) rows"
raise TypeError(msg) from None
if row_len != TASK_COMMENT_ROW_LEN:
msg = "Expected (ActivityEvent, Task, Board, Agent | None) rows"
raise TypeError(msg)
if (
isinstance(item, tuple)
and len(item) == TASK_COMMENT_ROW_LEN
and isinstance(item[0], ActivityEvent)
and isinstance(item[1], Task)
and isinstance(item[2], Board)
and (isinstance(item[3], Agent) or item[3] is None)
isinstance(first, ActivityEvent)
and isinstance(second, Task)
and isinstance(third, Board)
and (isinstance(fourth, Agent) or fourth is None)
):
rows.append((item[0], item[1], item[2], item[3]))
rows.append((first, second, third, fourth))
continue
msg = "Expected (ActivityEvent, Task, Board, Agent | None) rows"
raise TypeError(msg)
return rows

View File

@@ -164,14 +164,32 @@ def _coerce_task_event_rows(
) -> list[tuple[ActivityEvent, Task | None]]:
rows: list[tuple[ActivityEvent, Task | None]] = []
for item in items:
if (
isinstance(item, tuple)
and len(item) == TASK_EVENT_ROW_LEN
and isinstance(item[0], ActivityEvent)
and (isinstance(item[1], Task) or item[1] is None)
first: object
second: object
if isinstance(item, tuple):
if len(item) != TASK_EVENT_ROW_LEN:
msg = "Expected (ActivityEvent, Task | None) rows"
raise TypeError(msg)
first, second = item
else:
try:
row_len = len(item) # type: ignore[arg-type]
first = item[0] # type: ignore[index]
second = item[1] # type: ignore[index]
except (IndexError, KeyError, TypeError):
msg = "Expected (ActivityEvent, Task | None) rows"
raise TypeError(msg) from None
if row_len != TASK_EVENT_ROW_LEN:
msg = "Expected (ActivityEvent, Task | None) rows"
raise TypeError(msg)
if isinstance(first, ActivityEvent) and (
isinstance(second, Task) or second is None
):
rows.append((item[0], item[1]))
rows.append((first, second))
continue
msg = "Expected (ActivityEvent, Task | None) rows"
raise TypeError(msg)
return rows