merge with main and resolve conflicts

2024-08-30 20:32:17 +00:00 · 2024-05-27 22:20:34 -04:00
parent 987ee704a1 ddff9b4584
commit 34e1eb19f9
256 changed files with 9360 additions and 6061 deletions
--- a/tests/app/services/model_load/test_load_api.py
+++ b/tests/app/services/model_load/test_load_api.py
@ -19,7 +19,7 @@ def mock_context(
    return build_invocation_context(
        services=mock_services,
        data=None,  # type: ignore
-        cancel_event=None,  # type: ignore
+        is_canceled=None,  # type: ignore
    )