buildai-cli 0.3.51__tar.gz → 0.3.52__tar.gz

{buildai_cli-0.3.51 → buildai_cli-0.3.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildai-cli
-Version: 0.3.51
+Version: 0.3.52
 Summary: Build AI CLI (Typer)
 Requires-Python: >=3.11
 Requires-Dist: python-dotenv>=1.0.0

{buildai_cli-0.3.51 → buildai_cli-0.3.52}/cli/commands/gigcamera.py

@@ -659,125 +659,34 @@ def vlm_drain_pending_recaps(
                 limit=limit,
                 upload_session_ids=upload_session_ids,
             )
-            claimed_session_ids: list[UUID] = []
-            drain_plan = {
-                "missing_frame_session_ids": [],
-                "ready_recap_session_ids": [],
-                "completed_session_ids": [],
-                "skipped_session_ids": [],
-                "deferred_session_ids": [],
+            drain_summary: dict[str, object] = {
+                "claimed_count": 0,
+                "missing_frame_session_count": 0,
+                "ready_recap_session_count": 0,
+                "completed_session_count": 0,
+                "skipped_session_count": 0,
+                "deferred_session_count": 0,
+                "quarantined_count": 0,
+                "max_attempts": _RECAP_QUEUE_MAX_ATTEMPTS,
+                "manifest_count": 0,
+                "manifests": [],
             }
-            manifests: list[dict[str, object]] = []
-            quarantined_count = 0
 
             if write:
-                quarantined_count = await _quarantine_exhausted_pending_recap_rows(conn)
-                claimed_session_ids = await _claim_pending_recap_sessions(
-                    conn,
-                    limit=limit,
-                    upload_session_ids=upload_session_ids,
-                )
-                drain_plan = await _pending_recap_drain_plan(
-                    conn,
-                    upload_session_ids=claimed_session_ids,
-                    program_version_id=program_version_id,
-                )
-                try:
-                    from dal.processing import media_jobs
-
-                    missing_ids = [str(value) for value in drain_plan["missing_frame_session_ids"]]
-                    ready_ids = [str(value) for value in drain_plan["ready_recap_session_ids"]]
-                    if missing_ids or ready_ids:
-                        async with get_cli_context(
-                            settings,
-                            profile=ctx.obj.get("cli_profile"),
-                        ) as (_db, dal_ctx):
-                            if missing_ids:
-                                manifest = await media_jobs.queue_processor_job(
-                                    dal_ctx,
-                                    processor_ref=(
-                                        media_jobs.GIGCAMERA_NORMALIZE_EXTRACT_PROCESSOR_REF
-                                    ),
-                                    selection_spec={
-                                        "kind": "gigcamera_uploads",
-                                        "upload_session_ids": missing_ids,
-                                        "only_missing_frames": True,
-                                    },
-                                    sink_overrides=None,
-                                    resource_overrides=None,
-                                    submitted_by_principal=_SUBMITTED_BY,
-                                    idempotency_key=_stable_idempotency_key(
-                                        prefix=(
-                                            f"gigcamera-vlm-pending-extract:{program_version_label}"
-                                        ),
-                                        parts=missing_ids,
-                                    ),
-                                )
-                                manifests.append(
-                                    {"phase": "extract", "manifest_id": manifest["id"]}
-                                )
-                                await _mark_pending_recap_rows(
-                                    conn,
-                                    upload_session_ids=drain_plan["missing_frame_session_ids"],
-                                    status="extract_enqueued",
-                                    manifest_id=str(manifest["id"]),
-                                    deferred_reason="extract_manifest_enqueued",
-                                )
-                            if ready_ids:
-                                manifest = await media_jobs.queue_processor_job(
-                                    dal_ctx,
-                                    processor_ref=media_jobs.GIGCAMERA_DAILY_RECAP_PROCESSOR_REF,
-                                    selection_spec={
-                                        "kind": "gigcamera_sessions",
-                                        "upload_session_ids": ready_ids,
-                                        "selection_kind": "near_90s",
-                                        "exclude_completed": True,
-                                    },
-                                    sink_overrides=None,
-                                    resource_overrides=None,
-                                    submitted_by_principal=_SUBMITTED_BY,
-                                    idempotency_key=_stable_idempotency_key(
-                                        prefix=(
-                                            f"gigcamera-vlm-pending-recap:{program_version_label}"
-                                        ),
-                                        parts=ready_ids,
-                                    ),
-                                )
-                                manifests.append({"phase": "recap", "manifest_id": manifest["id"]})
-                                await _mark_pending_recap_rows(
-                                    conn,
-                                    upload_session_ids=drain_plan["ready_recap_session_ids"],
-                                    status="recap_enqueued",
-                                    manifest_id=str(manifest["id"]),
-                                    deferred_reason="recap_manifest_enqueued",
-                                )
-                    await _mark_pending_recap_rows(
-                        conn,
-                        upload_session_ids=drain_plan["deferred_session_ids"],
-                        status="extract_enqueued",
-                        deferred_reason="extract_already_inflight",
-                    )
-                    await _mark_pending_recap_rows(
-                        conn,
-                        upload_session_ids=drain_plan["completed_session_ids"],
-                        status="completed",
-                        deferred_reason="already_completed",
-                    )
-                    await _mark_pending_recap_rows(
-                        conn,
-                        upload_session_ids=drain_plan["skipped_session_ids"],
-                        status="skipped",
-                        deferred_reason="no_core_claims",
-                    )
-                except Exception as exc:
-                    await _mark_pending_recap_rows(
-                        conn,
-                        upload_session_ids=claimed_session_ids,
-                        status="failed",
-                        deferred_reason="drain_failed",
-                        error=str(exc)[:2048],
+                from dal.processing import recap_drain
+
+                async with get_cli_context(
+                    settings,
+                    profile=ctx.obj.get("cli_profile"),
+                ) as (_db, dal_ctx):
+                    drain_summary = await recap_drain.run_drain_pass(
+                        dal_ctx,
+                        program_version_label=program_version_label,
+                        limit=limit,
+                        upload_session_ids=upload_session_ids,
+                        submitted_by_principal=_SUBMITTED_BY,
+                        max_attempts=_RECAP_QUEUE_MAX_ATTEMPTS,
                     )
-                    raise
 
             render(
                 {
@@ -789,17 +698,17 @@ def vlm_drain_pending_recaps(
                         str(upload_session_id) for upload_session_id in upload_session_ids or []
                     ],
                     "claimable_count": claimable_count,
-                    "claimed_count": len(claimed_session_ids),
+                    "claimed_count": drain_summary["claimed_count"],
                     "status_counts": status_counts,
-                    "missing_frame_session_count": len(drain_plan["missing_frame_session_ids"]),
-                    "ready_recap_session_count": len(drain_plan["ready_recap_session_ids"]),
-                    "completed_session_count": len(drain_plan["completed_session_ids"]),
-                    "skipped_session_count": len(drain_plan["skipped_session_ids"]),
-                    "deferred_session_count": len(drain_plan["deferred_session_ids"]),
-                    "quarantined_count": quarantined_count,
-                    "max_attempts": _RECAP_QUEUE_MAX_ATTEMPTS,
-                    "manifest_count": len(manifests),
-                    "manifests": manifests,
+                    "missing_frame_session_count": drain_summary["missing_frame_session_count"],
+                    "ready_recap_session_count": drain_summary["ready_recap_session_count"],
+                    "completed_session_count": drain_summary["completed_session_count"],
+                    "skipped_session_count": drain_summary["skipped_session_count"],
+                    "deferred_session_count": drain_summary["deferred_session_count"],
+                    "quarantined_count": drain_summary["quarantined_count"],
+                    "max_attempts": drain_summary["max_attempts"],
+                    "manifest_count": drain_summary["manifest_count"],
+                    "manifests": drain_summary["manifests"],
                 },
                 format=format,
             )

{buildai_cli-0.3.51 → buildai_cli-0.3.52}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "buildai-cli"
-version = "0.3.51"
+version = "0.3.52"
 description = "Build AI CLI (Typer)"
 requires-python = ">=3.11"
 dependencies = [