Update MLEdge dataset schema, Update tapis-typescript

tapis-project · Sep 10, 2024 · 1350d4e · 1350d4e
1 parent 84b7bc3
commit 1350d4e
Show file tree

Hide file tree

Showing 15 changed files with 626 additions and 3,197 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.0",
     "@mui/x-data-grid": "^7.7.0",
-    "@tapis/tapis-typescript": "^0.0.38",
+    "@tapis/tapis-typescript": "^0.0.40",
     "@tapis/tapisui-api": "file:./packages/tapisui-api",
     "@tapis/tapisui-common": "file:./packages/tapisui-common",
     "@tapis/tapisui-extensions-core": "file:./packages/tapisui-extensions-core",

diff --git a/packages/icicle-tapisui-extension/package-lock.json b/packages/icicle-tapisui-extension/package-lock.json
diff --git a/packages/icicle-tapisui-extension/package.json b/packages/icicle-tapisui-extension/package.json
@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/ICICLE-ai/tapisui-extension-icicle#readme",
   "dependencies": {
-    "@tapis/tapis-typescript": "^0.0.38",
+    "@tapis/tapis-typescript": "^0.0.40",
     "@tapis/tapisui-extensions-core": "file:../tapisui-extensions-core",
     "@tapis/tapisui-common": "file:../tapisui-common",
     "@tapis/tapisui-hooks": "file:../tapisui-hooks",

diff --git a/packages/icicle-tapisui-extension/src/pages/MLEdge/Analysis/AnalysisForm.tsx b/packages/icicle-tapisui-extension/src/pages/MLEdge/Analysis/AnalysisForm.tsx
@@ -87,7 +87,7 @@ const devices = [
   {
     id: 3,
     name: 'Jetson Nano',
-    type: 'Jetson Nano',
+    type: 'Jetson',
     site: 'TACC',
     gpu: true,
   },
@@ -143,18 +143,22 @@ const models = [
 
 const datasets = [
   {
+    id: '15-image',
     url: '',
     name: '15 Image',
   },
   {
+    id: 'ena',
     url: 'https://storage.googleapis.com/public-datasets-lila/ena24/ena24.zip',
     name: 'ENA',
   },
   {
+    id: 'ohio-small-animals',
     url: 'ohio-small-animals',
     name: 'Ohio Small Animals',
   },
   {
+    id: 'okavango-delta',
     url: 'okavango-delta',
     name: 'Okavango Delta',
   },
@@ -293,6 +297,9 @@ const AnalysisForm: React.FC = () => {
                   status,
                   report: 'Download',
                 };
+                const dataset = datasets.filter(
+                  (d) => d.id == values.dataset
+                )[0];
                 const device = devices.filter((d) => d.id == values.device)[0];
                 const envVariables = [
                   {
@@ -317,7 +324,7 @@ const AnalysisForm: React.FC = () => {
                   },
                   {
                     key: 'CT_CONTROLLER_INPUT',
-                    value: values.dataset,
+                    value: dataset.url,
                   },
                 ];
 
@@ -489,7 +496,7 @@ const AnalysisForm: React.FC = () => {
                       <option value="" label="Select option" />
                       {datasets.map((dataset) => {
                         return (
-                          <option value={dataset.url} label={dataset.name} />
+                          <option value={dataset.id} label={dataset.name} />
                         );
                       })}
                       <option value="url" label="-- provide dataset url --" />