@meyicloud/meyi-cost-server 1.7.0 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meyicloud/meyi-cost-server",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Tenant-aware AWS CUR and Athena cost plugin server for MeyiConnect",
   "type": "module",
   "main": "./index.js",

package/src/controllers/cost-analysis.controller.js

@@ -36,6 +36,11 @@ export class CostAnalysisController {
     catch (error) { return next(error); }
   }
 
+  async removeReport(req, res, next) {
+    try { return res.json(await this.reportService.remove(req, req.params.id)); }
+    catch (error) { return next(error); }
+  }
+
   async downloadPdf(req, res, next) {
     try {
       const report = await this.reportService.pdf(req, req.params.id);

package/src/repositories/cost-analysis-report.repository.js

@@ -71,8 +71,14 @@ export class CostAnalysisReportRepository {
     return rows(await this.db.execute(sql`UPDATE ${sql.raw(this.reports)} SET status = 'RUNNING', attempt_count = attempt_count + 1, started_at = now(), error = NULL, updated_at = now() WHERE id = ${id} AND status = 'PENDING' RETURNING *`))[0] || null;
   }
 
-  async setTaskArn(id, taskArn) {
-    await this.db.execute(sql`UPDATE ${sql.raw(this.reports)} SET ecs_task_arn = ${taskArn}, updated_at = now() WHERE id = ${id}`);
+  async setTaskStarted(id, { taskArn, provider, modelId, source, artifactBucket, markdownKey, pdfKey }) {
+    await this.db.execute(sql`
+      UPDATE ${sql.raw(this.reports)}
+      SET ecs_task_arn = ${taskArn}, provider_name = ${provider}, model_id = ${modelId},
+          provider_source = ${source}, artifact_bucket = ${artifactBucket},
+          markdown_key = ${markdownKey}, pdf_key = ${pdfKey}, updated_at = now()
+      WHERE id = ${id}
+    `);
   }
 
   async completeExternal(id, result) {
@@ -125,4 +131,12 @@ export class CostAnalysisReportRepository {
       FROM ${sql.raw(this.reports)} WHERE tenant_id = ${tenantId} AND id = ${id} LIMIT 1
     `))[0] || null;
   }
+
+  async remove(tenantId, id) {
+    return rows(await this.db.execute(sql`
+      DELETE FROM ${sql.raw(this.reports)}
+      WHERE tenant_id = ${tenantId} AND id = ${id}
+      RETURNING id
+    `))[0] || null;
+  }
 }

package/src/routes/index.js

@@ -15,6 +15,7 @@ export function createCostRouter({ costController, budgetController, costAnalysi
   router.put("/analysis/schedule", costAnalysisController.updateSchedule.bind(costAnalysisController));
   router.get("/analysis/reports", costAnalysisController.reports.bind(costAnalysisController));
   router.get("/analysis/reports/:id", costAnalysisController.report.bind(costAnalysisController));
+  router.delete("/analysis/reports/:id", costAnalysisController.removeReport.bind(costAnalysisController));
   router.get("/analysis/reports/:id/pdf", costAnalysisController.downloadPdf.bind(costAnalysisController));
   router.get("/analysis/reports/:id/markdown", costAnalysisController.downloadMarkdown.bind(costAnalysisController));
   router.get("/budgets", budgetController.list.bind(budgetController));

package/src/services/cost-analyser.service.js

@@ -218,7 +218,13 @@ export class CostAnalyserService {
         throw Object.assign(new Error(`Unable to start cost analyser: ${reason}`), { name: "CostAnalyserLaunchError", statusCode: 502 });
       }
       const taskArn = launched.tasks[0].taskArn;
-      await onStarted?.(taskArn);
+      await onStarted?.({
+        taskArn,
+        ...this.statusSummary(provider),
+        artifactBucket: this.reportBucket,
+        markdownKey: `${prefix}/report.md`,
+        pdfKey: `${prefix}/report.pdf`,
+      });
       const deadline = Date.now() + this.timeoutMs;
       while (Date.now() < deadline) {
         const response = await this.ecs.send(new DescribeTasksCommand({ cluster: this.cluster, tasks: [taskArn] }));

package/src/services/cost-analysis-report.service.js

@@ -49,6 +49,25 @@ export class CostAnalysisReportService {
     return reportDto(row);
   }
 
+  async remove(req, id) {
+    if (String(req.user?.role || "").toLowerCase() !== "admin") {
+      throw Object.assign(new Error("Administrator access is required to remove AI report history"), { statusCode: 403 });
+    }
+    const tenantId = this.tenant(req);
+    const row = await this.repository.find(tenantId, id, true);
+    if (!row) throw Object.assign(new Error("AI cost report was not found"), { statusCode: 404 });
+    if (row.status === "PENDING" || row.status === "RUNNING") {
+      throw Object.assign(new Error("A running AI cost report cannot be removed"), { statusCode: 409 });
+    }
+    const artifactKey = row.markdown_key || row.pdf_key;
+    if (row.artifact_bucket && artifactKey) {
+      const slash = artifactKey.lastIndexOf("/");
+      await this.artifactService.removePrefix(row.artifact_bucket, slash >= 0 ? artifactKey.slice(0, slash + 1) : artifactKey);
+    }
+    await this.repository.remove(tenantId, id);
+    return { success: true };
+  }
+
   async pdf(req, id) {
     const row = await this.repository.find(this.tenant(req), id, true);
     if (!row) throw Object.assign(new Error("AI cost report was not found"), { statusCode: 404 });

package/src/services/cost-report-artifact.service.js

@@ -1,4 +1,4 @@
-import { GetObjectCommand, S3Client } from "@aws-sdk/client-s3";
+import { DeleteObjectsCommand, GetObjectCommand, ListObjectsV2Command, S3Client } from "@aws-sdk/client-s3";
 
 async function bytes(body) {
   if (!body) return Buffer.alloc(0);
@@ -18,5 +18,21 @@ export class CostReportArtifactService {
     const response = await this.client.send(new GetObjectCommand({ Bucket: bucket, Key: key }));
     return bytes(response.Body);
   }
-}
 
+  async removePrefix(bucket, prefix) {
+    if (!bucket || !prefix) return;
+    let continuationToken;
+    do {
+      const page = await this.client.send(new ListObjectsV2Command({
+        Bucket: bucket,
+        Prefix: prefix,
+        ContinuationToken: continuationToken,
+      }));
+      const objects = (page.Contents || []).map(({ Key }) => ({ Key })).filter(({ Key }) => Boolean(Key));
+      if (objects.length) {
+        await this.client.send(new DeleteObjectsCommand({ Bucket: bucket, Delete: { Objects: objects, Quiet: true } }));
+      }
+      continuationToken = page.IsTruncated ? page.NextContinuationToken : undefined;
+    } while (continuationToken);
+  }
+}

package/src/workers/cost-analysis-report.worker.js

@@ -27,7 +27,7 @@ export class CostAnalysisReportWorker {
         reportId: report.id,
         range,
         frequency: schedule.frequency,
-        onStarted: (taskArn) => this.repository.setTaskArn(report.id, taskArn),
+        onStarted: (metadata) => this.repository.setTaskStarted(report.id, metadata),
       });
       await this.repository.completeExternal(report.id, result);
       await this.repository.setNextRun(schedule.tenant_id, nextRunAt, true, schedule.next_run_at);