Merge pull request #12 from covid-modeling/gorzell/idm-covasim

api: Add model-slug for idm-covasim.

Author: adityasharad

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@covid-modeling/api",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
   "scripts": {

packages/api/schema/runner.json

@@ -126,7 +126,8 @@
       "enum": [
         "mrc-ide-covid-sim",
         "basel",
-        "mc19"
+        "mc19",
+        "idm-covasim"
       ],
       "type": "string"
     },

packages/api/src/index.ts

@@ -29,6 +29,7 @@ export enum ModelSlug {
   MRCIDECovidSim = 'mrc-ide-covid-sim',
   Basel = 'basel',
   MC19 = 'mc19',
+  IDMCovasim = 'idm-covasim',
 }
 
 export interface Model {

packages/model-runner/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@covid-modeling/model-runner",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "dist/index.js",
   "scripts": {
     "test": "PATH=$PATH:../../node_modules/.bin && mocha --debug-brk --ui tdd -r ts-node/register test/unit/*-test.ts",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@azure/identity": "^1.1.0-preview1",
     "@azure/storage-blob": "^12.1.1",
-    "@covid-modeling/api": "0.9.*",
+    "@covid-modeling/api": "0.9.1",
     "archiver": "^4.0.1",
     "d3": "^5.15.0",
     "dockerode": "^3.2.0",

packages/model-runner/test/test-job-idm-covasim.json

@@ -0,0 +1,43 @@
+{
+  "id": "my-model-run-id",
+  "callbackURL": null,
+  "models": [
+    {
+      "slug": "idm-covasim",
+      "imageURL": "docker.pkg.github.com/covid-modeling/covasim-connector/covasim-connector:master"
+    }
+  ],
+  "configuration": {
+    "region": "US",
+    "subregion": "US-NY",
+    "parameters": {
+      "calibrationDate": "2020-04-18",
+      "calibrationCaseCount": 1400,
+      "calibrationDeathCount": 200,
+      "interventionPeriods": [
+        {
+          "startDate": "2020-03-18",
+          "reductionPopulationContact": 10,
+          "socialDistancing": "moderate"
+        },
+        {
+          "startDate": "2020-03-22",
+          "reductionPopulationContact": 34,
+          "socialDistancing": "moderate",
+          "schoolClosure": "aggressive"
+        },
+        {
+          "startDate": "2020-03-23",
+          "reductionPopulationContact": 64,
+          "socialDistancing": "aggressive",
+          "schoolClosure": "aggressive"
+        },
+        {
+          "startDate": "2020-07-01",
+          "reductionPopulationContact": 0
+        }
+      ],
+      "r0": null
+    }
+  }
+}

packages/model-runner/test/test-job-matrix.json

@@ -13,6 +13,10 @@
     {
       "slug": "mc19",
       "imageURL": "docker.pkg.github.com/covid-modeling/model-runner/modelingcovid-covidmodel-connector:master"
+    },
+    {
+      "slug": "idm-covasim",
+      "imageURL": "docker.pkg.github.com/covid-modeling/covasim-connector/covasim-connector:master"
     }
   ],
   "configuration": {