use what we have!

Author: JacobCoffee

cabotage/celery/tasks/build.py

@@ -1109,7 +1109,6 @@ def run_image_build(image_id=None, buildkit=False):
         raise KeyError(f"Image with ID {image_id} not found!")
 
     image.build_job_id = secrets.token_hex(4)
-    image.started_at = datetime.datetime.utcnow()
 
     # Create a GitHub check run at the start of the pipeline
     application = image.application
@@ -1179,7 +1178,6 @@ def run_image_build(image_id=None, buildkit=False):
             db.session.add(image)
             image.error = True
             image.error_detail = str(exc)
-            image.completed_at = datetime.datetime.utcnow()
             db.session.commit()
             from cabotage.celery.metrics import record_image_metrics
 
@@ -1207,8 +1205,6 @@ def run_image_build(image_id=None, buildkit=False):
         except Exception:  # nosec B110
             pass
         db.session.add(image)
-        if not image.completed_at:
-            image.completed_at = datetime.datetime.utcnow()
         if not image.error:
             image.error = True
             image.error_detail = "Image build failed due to an internal error"
@@ -1228,7 +1224,6 @@ def run_image_build(image_id=None, buildkit=False):
     image.image_id = build_metadata["image_id"]
     image.processes = build_metadata["processes"]
     image.built = True
-    image.completed_at = datetime.datetime.utcnow()
     if image.image_metadata is None:
         image.image_metadata = {
             "dockerfile_env_vars": build_metadata["dockerfile_env_vars"]
@@ -1300,7 +1295,6 @@ def run_release_build(release_id=None):
             release.release_metadata = {}
 
         release.build_job_id = secrets.token_hex(4)
-        release.started_at = datetime.datetime.utcnow()
         db.session.add(release)
         db.session.commit()
 
@@ -1316,7 +1310,6 @@ def run_release_build(release_id=None):
             build_metadata = build_release_buildkit(release)
             release.release_id = build_metadata["release_id"]
             release.built = True
-            release.completed_at = datetime.datetime.utcnow()
             if (
                 "installation_id" in release.release_metadata
                 and "statuses_url" in release.release_metadata
@@ -1333,7 +1326,6 @@ def run_release_build(release_id=None):
         except (BuildError, TemplateResolutionError) as exc:
             release.error = True
             release.error_detail = str(exc)
-            release.completed_at = datetime.datetime.utcnow()
             try:
                 log_key = stream_key("release", release.build_job_id)
                 redis_client = get_redis_client(current_app.config["CELERY_BROKER_URL"])
@@ -1373,7 +1365,6 @@ def run_release_build(release_id=None):
                 pass
             release.error = True
             release.error_detail = "Release build failed due to an internal error"
-            release.completed_at = datetime.datetime.utcnow()
             db.session.add(release)
             db.session.commit()
             if (

cabotage/celery/tasks/deploy.py

@@ -1587,11 +1587,8 @@ def _run_job_streaming(
 
 
 def deploy_release(deployment):
-    import datetime
-
     job_id = secrets.token_hex(4)
     deployment.job_id = job_id
-    deployment.started_at = datetime.datetime.utcnow()
     db.session.add(deployment)
     db.session.commit()
     deploy_log = []
@@ -1886,12 +1883,10 @@ def log(msg):
             else:
                 log(f"Release command {postdeploy_command} complete!")
         deployment.complete = True
-        deployment.completed_at = datetime.datetime.utcnow()
         log(f"Deployment {deployment.id} complete")
     except DeployError as exc:
         deployment.error = True
         deployment.error_detail = str(exc)
-        deployment.completed_at = datetime.datetime.utcnow()
         if (
             deployment.deploy_metadata
             and "installation_id" in deployment.deploy_metadata
@@ -1926,7 +1921,6 @@ def log(msg):
     except Exception as exc:
         deployment.error = True
         deployment.error_detail = "Deploy failed due to an internal error"
-        deployment.completed_at = datetime.datetime.utcnow()
         if (
             deployment.deploy_metadata
             and "installation_id" in deployment.deploy_metadata
@@ -2016,9 +2010,6 @@ def log(msg):
 
 
 def fake_deploy_release(deployment):
-    import datetime as _dt
-
-    deployment.started_at = _dt.datetime.utcnow()
     deploy_log = []
     namespace = render_namespace(deployment.release_object)
     deploy_log.append(f"Creating Namespace/{namespace.metadata.name}")
@@ -2146,7 +2137,7 @@ def fake_deploy_release(deployment):
         )
         deploy_log.append(yaml.dump(remove_none(deployment_object.to_dict())))
     deployment.deploy_log = "\n".join(deploy_log)
-    deployment.completed_at = _dt.datetime.utcnow()
+    deployment.complete = True
     db.session.commit()
 
     from cabotage.celery.metrics import record_deploy_metrics

cabotage/server/models/projects.py

@@ -686,15 +686,13 @@ class Deployment(db.Model, Timestamp):
         db.String(64),
         nullable=True,
     )
-    started_at = db.Column(db.DateTime, nullable=True)
-    completed_at = db.Column(db.DateTime, nullable=True)
 
     __mapper_args__ = {"version_id_col": version_id}
 
     @property
     def duration_seconds(self):
-        if self.started_at and self.completed_at:
-            return (self.completed_at - self.started_at).total_seconds()
+        if (self.complete or self.error) and self.created and self.updated:
+            return (self.updated - self.created).total_seconds()
         return None
 
     @property
@@ -800,15 +798,13 @@ class Release(db.Model, Timestamp):
         nullable=True,
         server_default=None,
     )
-    started_at = db.Column(db.DateTime, nullable=True)
-    completed_at = db.Column(db.DateTime, nullable=True)
 
     __mapper_args__ = {"version_id_col": version_id}
 
     @property
     def duration_seconds(self):
-        if self.started_at and self.completed_at:
-            return (self.completed_at - self.started_at).total_seconds()
+        if (self.built or self.error) and self.created and self.updated:
+            return (self.updated - self.created).total_seconds()
         return None
 
     @property
@@ -1246,8 +1242,6 @@ class Image(db.Model, Timestamp):
         db.String(64),
         nullable=True,
     )
-    started_at = db.Column(db.DateTime, nullable=True)
-    completed_at = db.Column(db.DateTime, nullable=True)
 
     __mapper_args__ = {"version_id_col": version_id}
     __table_args__ = (
@@ -1259,8 +1253,8 @@ class Image(db.Model, Timestamp):
 
     @property
     def duration_seconds(self):
-        if self.started_at and self.completed_at:
-            return (self.completed_at - self.started_at).total_seconds()
+        if (self.built or self.error) and self.created and self.updated:
+            return (self.updated - self.created).total_seconds()
         return None
 
     @property

cabotage/server/user/views.py

@@ -4304,6 +4304,13 @@ def _pipeline_range_start(range_param):
     return datetime.datetime.utcnow() - datetime.timedelta(days=days)
 
 
+def _terminal_condition(table):
+    """SQL condition for rows in a terminal state (built/complete or error)."""
+    if table == "deployments":
+        return "(complete = true OR error = true)"
+    return "(built = true OR error = true)"
+
+
 @user_blueprint.route(
     "/projects/<org_slug>/<project_slug>/env/<env_slug>/applications/<app_slug>/pipeline",
 )
@@ -4348,12 +4355,13 @@ def project_application_pipeline_stats(org_slug, project_slug, app_slug, env_slu
     # -- Throughput by day --
     throughput_rows = db.session.execute(
         sa_text(
-            "SELECT date_trunc('day', completed_at) AS day,"
+            "SELECT date_trunc('day', updated) AS day,"
             " count(*) FILTER (WHERE complete = true) AS success,"
             " count(*) FILTER (WHERE error = true) AS failure"
             " FROM deployments"
             " WHERE application_environment_id = :ae_id"
-            "   AND completed_at >= :start AND completed_at IS NOT NULL"
+            "   AND (complete = true OR error = true)"
+            "   AND updated >= :start"
             " GROUP BY day ORDER BY day"
         ),
         {"ae_id": ae_id, "start": start},
@@ -4372,16 +4380,16 @@ def project_application_pipeline_stats(org_slug, project_slug, app_slug, env_slu
     def _duration_percentiles(table):
         return db.session.execute(
             sa_text(
-                f"SELECT date_trunc('day', completed_at) AS day,"
+                f"SELECT date_trunc('day', updated) AS day,"
                 f" percentile_cont(0.5) WITHIN GROUP"
-                f"   (ORDER BY extract(epoch FROM completed_at - started_at)) AS p50,"
+                f"   (ORDER BY extract(epoch FROM updated - created)) AS p50,"
                 f" percentile_cont(0.95) WITHIN GROUP"
-                f"   (ORDER BY extract(epoch FROM completed_at - started_at)) AS p95,"
-                f" avg(extract(epoch FROM completed_at - started_at)) AS avg_dur"
+                f"   (ORDER BY extract(epoch FROM updated - created)) AS p95,"
+                f" avg(extract(epoch FROM updated - created)) AS avg_dur"
                 f" FROM {table}"  # nosec B608 — table from hardcoded list
                 f" WHERE application_environment_id = :ae_id"
-                f"   AND started_at IS NOT NULL AND completed_at IS NOT NULL"
-                f"   AND completed_at >= :start"
+                f"   AND {_terminal_condition(table)}"
+                f"   AND updated >= :start"
                 f" GROUP BY day ORDER BY day"
             ),
             {"ae_id": ae_id, "start": start},
@@ -4458,15 +4466,15 @@ def _duration_percentiles(table):
     summary_row = db.session.execute(
         sa_text(
             "SELECT"
-            " avg(extract(epoch FROM completed_at - started_at)) AS avg_dur,"
+            " avg(extract(epoch FROM updated - created)) AS avg_dur,"
             " percentile_cont(0.5) WITHIN GROUP"
-            "   (ORDER BY extract(epoch FROM completed_at - started_at)) AS p50,"
+            "   (ORDER BY extract(epoch FROM updated - created)) AS p50,"
             " percentile_cont(0.95) WITHIN GROUP"
-            "   (ORDER BY extract(epoch FROM completed_at - started_at)) AS p95"
+            "   (ORDER BY extract(epoch FROM updated - created)) AS p95"
             " FROM deployments"
             " WHERE application_environment_id = :ae_id"
-            "   AND started_at IS NOT NULL AND completed_at IS NOT NULL"
-            "   AND completed_at >= :start"
+            "   AND (complete = true OR error = true)"
+            "   AND updated >= :start"
         ),
         {"ae_id": ae_id, "start": start},
     ).fetchone()
@@ -4550,8 +4558,8 @@ def project_application_pipeline_runs(org_slug, project_slug, app_slug, env_slug
         img = image_by_id.get(img_id) if img_id else None
 
         total = None
-        if img and img.started_at and d.completed_at:
-            total = round((d.completed_at - img.started_at).total_seconds(), 2)
+        if img and img.created and d.updated and (d.complete or d.error):
+            total = round((d.updated - img.created).total_seconds(), 2)
 
         runs.append(
             {
@@ -4627,14 +4635,18 @@ def project_application_pipeline_slowest(
     }
     model = model_map.get(stage, Image)
 
+    terminal = (
+        (model.complete == True) | (model.error == True)  # noqa: E712
+        if model is Deployment
+        else (model.built == True) | (model.error == True)  # noqa: E712
+    )
     rows = (
         model.query.filter(
             model.application_environment_id == app_env.id,
-            model.started_at.isnot(None),
-            model.completed_at.isnot(None),
-            model.completed_at >= start,
+            terminal,
+            model.updated >= start,
         )
-        .order_by(desc(model.completed_at - model.started_at))
+        .order_by(desc(model.updated - model.created))
         .limit(10)
         .all()
     )