Merge pull request #138 from coronasafe/develop

package.json

@@ -24,15 +24,15 @@
     "morgan": "^1.10.0",
     "node-cron": "^3.0.3",
     "onvif": "^0.6.5",
-    "openai": "^4.33.1",
+    "openai": "^4.47.2",
     "pidusage": "^3.0.0",
     "sharp": "^0.33.3",
     "swagger-jsdoc": "^6.1.0",
     "swagger-ui-express": "^4.3.0",
     "uuid": "^9.0.1"
   },
   "scripts": {
-    "copy-assets": "node tools/copyAssets.js",
+    "copy-assets": "cp -r src/views src/public dist/.",
     "build": "prisma generate && tsc && tsc-alias && npm run copy-assets",
     "dev": "nodemon",
     "debug": "nodemon --inspect",
@@ -76,7 +76,6 @@
     "nodemon": "^2.0.19",
     "prettier": "^3.2.5",
     "prisma": "^5.9.1",
-    "shelljs": "^0.8.5",
     "ts-node": "^10.9.1",
     "tsc-alias": "^1.8.8",
     "tsconfig-paths": "^4.2.0",
@@ -86,4 +85,4 @@
   "engines": {
     "node": ">=20.0.0"
   }
-}
+}

prisma/migrations/20240530063454_add_stats_vital/migration.sql

@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "VitalsStat" (
+    "id" SERIAL NOT NULL,
+    "imageId" TEXT NOT NULL,
+    "vitalsFromObservation" JSONB NOT NULL,
+    "vitalsFromImage" JSONB NOT NULL,
+    "gptDetails" JSONB NOT NULL,
+    "accuracy" DOUBLE PRECISION NOT NULL,
+    "cumulativeAccuracy" DOUBLE PRECISION NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "VitalsStat_pkey" PRIMARY KEY ("id")
+);

prisma/migrations/20240609170140_change_accuracy_to_json/migration.sql

@@ -0,0 +1,16 @@
+-- Rename the existing column to a temporary name
+ALTER TABLE "VitalsStat" RENAME COLUMN "accuracy" TO "accuracy_temp";
+ALTER TABLE "VitalsStat" RENAME COLUMN "cumulativeAccuracy" TO "cumulativeAccuracy_temp";
+
+-- Add the new column with the Json type
+ALTER TABLE "VitalsStat" ADD COLUMN "accuracy" Json;
+ALTER TABLE "VitalsStat" ADD COLUMN "cumulativeAccuracy" Json;
+
+-- Copy the data from the old column to the new column, converting floats to JSON
+UPDATE "VitalsStat" SET "accuracy" = json_build_object('overall', "accuracy_temp", 'metrics', '[]'::json);
+UPDATE "VitalsStat" SET "cumulativeAccuracy" = json_build_object('overall', "cumulativeAccuracy_temp", 'metrics', '[]'::json);
+
+-- Drop the temporary column
+ALTER TABLE "VitalsStat" DROP COLUMN "accuracy_temp";
+ALTER TABLE "VitalsStat" DROP COLUMN "cumulativeAccuracy_temp";
+

prisma/schema.prisma

@@ -65,3 +65,15 @@ model DailyRound {
   time            DateTime @default(now())
   asset           Asset    @relation(fields: [assetExternalId], references: [externalId], onDelete: Cascade, onUpdate: Cascade)
 }
+
+model VitalsStat {
+  id                    Int      @id @default(autoincrement())
+  imageId               String
+  vitalsFromObservation Json
+  vitalsFromImage       Json
+  gptDetails            Json
+  accuracy              Json
+  cumulativeAccuracy    Json
+  createdAt             DateTime @default(now())
+  updatedAt             DateTime @updatedAt
+}