Merge branch 'dev' of https://github.com/tapis-project/tapis-ui into dev

lib/icicle-tapisui-extension/package.json

@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/ICICLE-ai/tapisui-extension-icicle#readme",
   "dependencies": {
-    "@tapis/tapis-typescript": "^0.0.31",
+    "@tapis/tapis-typescript": "^0.0.32",
     "@tapis/tapisui-extensions-core": "file:../tapisui-extensions-core",
     "@tapis/tapisui-common": "file:../tapisui-common",
     "react": "^18.3.1"

lib/tapisui-api/package.json

@@ -28,7 +28,7 @@
     ]
   },
   "dependencies": {
-    "@tapis/tapis-typescript": "^0.0.31",
+    "@tapis/tapis-typescript": "^0.0.32",
     "axios": "^0.21.4",
     "cross-fetch": "^3.1.4",
     "streamsaver": "^2.0.5",

lib/tapisui-api/src/ml-hub/datasets/cardDetails.ts

@@ -0,0 +1,20 @@
+import { Datasets } from '@tapis/tapis-typescript';
+import { apiGenerator, errorDecoder } from '../../utils';
+
+const cardDetails = (
+  params: Datasets.GetDatasetCardRequest,
+  basePath: string,
+  jwt: string
+) => {
+  const api: Datasets.DatasetsApi = apiGenerator<Datasets.DatasetsApi>(
+    Datasets,
+    Datasets.DatasetsApi,
+    basePath,
+    jwt
+  );
+  return errorDecoder<Datasets.RespDatasetCard>(() =>
+    api.getDatasetCard(params)
+  );
+};
+
+export default cardDetails;

lib/tapisui-api/src/ml-hub/datasets/details.ts

@@ -0,0 +1,18 @@
+import { Datasets } from '@tapis/tapis-typescript';
+import { apiGenerator, errorDecoder } from '../../utils';
+
+const details = (
+  params: Datasets.GetDatasetRequest,
+  basePath: string,
+  jwt: string
+) => {
+  const api: Datasets.DatasetsApi = apiGenerator<Datasets.DatasetsApi>(
+    Datasets,
+    Datasets.DatasetsApi,
+    basePath,
+    jwt
+  );
+  return errorDecoder<Datasets.RespDataset>(() => api.getDataset(params));
+};
+
+export default details;

lib/tapisui-api/src/ml-hub/datasets/index.ts

@@ -0,0 +1,9 @@
+export { default as list } from './list';
+export { default as details } from './details';
+export { default as listByAuthor } from './listByAuthor';
+export { default as listByLanguage } from './listByLanguage';
+export { default as listByQuery } from './listByQuery';
+export { default as listByTask } from './listByTask';
+export { default as listBySizeCategory } from './listBySizeCategory';
+export { default as listDownloadLinks } from './listDownloadLinks';
+export { default as cardDetails } from './cardDetails';

lib/tapisui-api/src/ml-hub/datasets/list.ts

@@ -0,0 +1,14 @@
+import { Datasets } from '@tapis/tapis-typescript';
+import { apiGenerator, errorDecoder } from '../../utils';
+
+const list = (basePath: string, jwt: string) => {
+  const api: Datasets.DatasetsApi = apiGenerator<Datasets.DatasetsApi>(
+    Datasets,
+    Datasets.DatasetsApi,
+    basePath,
+    jwt
+  );
+  return errorDecoder<Datasets.RespDatasetsObject>(() => api.listDatasets());
+};
+
+export default list;

lib/tapisui-api/src/ml-hub/datasets/listByAuthor.ts

@@ -0,0 +1,20 @@
+import { Datasets } from '@tapis/tapis-typescript';
+import { apiGenerator, errorDecoder } from '../../utils';
+
+const listByAuthor = (
+  params: Datasets.ListDatasetsByAuthorRequest,
+  basePath: string,
+  jwt: string
+) => {
+  const api: Datasets.DatasetsApi = apiGenerator<Datasets.DatasetsApi>(
+    Datasets,
+    Datasets.DatasetsApi,
+    basePath,
+    jwt
+  );
+  return errorDecoder<Datasets.RespDatasetsObject>(() =>
+    api.listDatasetsByAuthor(params)
+  );
+};
+
+export default listByAuthor;

lib/tapisui-api/src/ml-hub/datasets/listByLanguage.ts

@@ -0,0 +1,20 @@
+import { Datasets } from '@tapis/tapis-typescript';
+import { apiGenerator, errorDecoder } from '../../utils';
+
+const listByLanguage = (
+  params: Datasets.ListDatasetsByLanguageRequest,
+  basePath: string,
+  jwt: string
+) => {
+  const api: Datasets.DatasetsApi = apiGenerator<Datasets.DatasetsApi>(
+    Datasets,
+    Datasets.DatasetsApi,
+    basePath,
+    jwt
+  );
+  return errorDecoder<Datasets.RespDatasetsObject>(() =>
+    api.listDatasetsByLanguage(params)
+  );
+};
+
+export default listByLanguage;

lib/tapisui-api/src/ml-hub/datasets/listByQuery.ts

@@ -0,0 +1,20 @@
+import { Datasets } from '@tapis/tapis-typescript';
+import { apiGenerator, errorDecoder } from '../../utils';
+
+const listByQuery = (
+  params: Datasets.ListDatasetsByQueryRequest,
+  basePath: string,
+  jwt: string
+) => {
+  const api: Datasets.DatasetsApi = apiGenerator<Datasets.DatasetsApi>(
+    Datasets,
+    Datasets.DatasetsApi,
+    basePath,
+    jwt
+  );
+  return errorDecoder<Datasets.RespDatasetsObject>(() =>
+    api.listDatasetsByQuery(params)
+  );
+};
+
+export default listByQuery;

lib/tapisui-api/src/ml-hub/datasets/listBySizeCategory.ts

@@ -0,0 +1,20 @@
+import { Datasets } from '@tapis/tapis-typescript';
+import { apiGenerator, errorDecoder } from '../../utils';
+
+const listBySizeCategory = (
+  params: Datasets.ListDatasetsBySizeCategoryRequest,
+  basePath: string,
+  jwt: string
+) => {
+  const api: Datasets.DatasetsApi = apiGenerator<Datasets.DatasetsApi>(
+    Datasets,
+    Datasets.DatasetsApi,
+    basePath,
+    jwt
+  );
+  return errorDecoder<Datasets.RespDatasetsObject>(() =>
+    api.listDatasetsBySizeCategory(params)
+  );
+};
+
+export default listBySizeCategory;

lib/tapisui-api/src/ml-hub/datasets/listByTask.ts

@@ -0,0 +1,20 @@
+import { Datasets } from '@tapis/tapis-typescript';
+import { apiGenerator, errorDecoder } from '../../utils';
+
+const listByTask = (
+  params: Datasets.ListDatasetsByTaskRequest,
+  basePath: string,
+  jwt: string
+) => {
+  const api: Datasets.DatasetsApi = apiGenerator<Datasets.DatasetsApi>(
+    Datasets,
+    Datasets.DatasetsApi,
+    basePath,
+    jwt
+  );
+  return errorDecoder<Datasets.RespDatasetsObject>(() =>
+    api.listDatasetsByTask(params)
+  );
+};
+
+export default listByTask;

lib/tapisui-api/src/ml-hub/datasets/listDownloadLinks.ts

@@ -0,0 +1,20 @@
+import { Datasets } from '@tapis/tapis-typescript';
+import { apiGenerator, errorDecoder } from '../../utils';
+
+const listDownloadLinks = (
+  params: Datasets.DownloadDatasetRequest,
+  basePath: string,
+  jwt: string
+) => {
+  const api: Datasets.DatasetsApi = apiGenerator<Datasets.DatasetsApi>(
+    Datasets,
+    Datasets.DatasetsApi,
+    basePath,
+    jwt
+  );
+  return errorDecoder<Datasets.RespDatasetDownload>(() =>
+    api.downloadDataset(params)
+  );
+};
+
+export default listDownloadLinks;

lib/tapisui-api/src/ml-hub/index.ts

@@ -1 +1,2 @@
 export * as Models from './models';
+export * as Datasets from './datasets';

lib/tapisui-common/package.json

@@ -45,7 +45,7 @@
     "@mui/icons-material": "^5.15.20",
     "@mui/material": "^5.15.20",
     "@rollup/plugin-commonjs": "^26.0.1",
-    "@tapis/tapis-typescript": "0.0.31",
+    "@tapis/tapis-typescript": "0.0.32",
     "@tapis/tapisui-hooks": "^0.0.3",
     "@vitejs/plugin-react": "^4.3.1",
     "bootstrap": "^4.6.0",