Merge pull request #403 from tapis-project/task/TUI-402--MLHub-basePath

ML Hub - resolve base path implicitly

lib/tapisui-hooks/src/ml-hub/datasets/useCardDetails.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Datasets } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useCardDetails = (
   params: Datasets.GetDatasetCardRequest,
   options: QueryObserverOptions<Datasets.RespDatasetCard, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Datasets.RespDatasetCard, Error>(
     [QueryKeys.details, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/datasets/useDetails.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Datasets } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useDetails = (
   params: Datasets.GetDatasetRequest,
   options: QueryObserverOptions<Datasets.RespDataset, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Datasets.RespDataset, Error>(
     [QueryKeys.details, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/datasets/useList.ts

@@ -3,13 +3,11 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Datasets } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useList = (
   options: QueryObserverOptions<Datasets.RespDatasetsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove  this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Datasets.RespDatasetsObject, Error>(
     [QueryKeys.list, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/datasets/useListByAuthor.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Datasets } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByAuthor = (
   params: Datasets.ListDatasetsByAuthorRequest,
   options: QueryObserverOptions<Datasets.RespDatasetsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Datasets.RespDatasetsObject, Error>(
     [QueryKeys.listByAuthor, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/datasets/useListByLanguage.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Datasets } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByLanguage = (
   params: Datasets.ListDatasetsByLanguageRequest,
   options: QueryObserverOptions<Datasets.RespDatasetsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Datasets.RespDatasetsObject, Error>(
     [QueryKeys.listByLanguage, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/datasets/useListByQuery.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Datasets } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByQuery = (
   params: Datasets.ListDatasetsByQueryRequest,
   options: QueryObserverOptions<Datasets.RespDatasetsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Datasets.RespDatasetsObject, Error>(
     [QueryKeys.listByQuery, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/datasets/useListBySizeCategory.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Datasets } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListBySizeCategory = (
   params: Datasets.ListDatasetsBySizeCategoryRequest,
   options: QueryObserverOptions<Datasets.RespDatasetsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Datasets.RespDatasetsObject, Error>(
     [QueryKeys.listBySizeCategory, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/datasets/useListByTask.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Datasets } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByTask = (
   params: Datasets.ListDatasetsByTaskRequest,
   options: QueryObserverOptions<Datasets.RespDatasetsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Datasets.RespDatasetsObject, Error>(
     [QueryKeys.listByTask, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/datasets/useListDownloadLinks.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Datasets } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListDownloadLinks = (
   params: Datasets.DownloadDatasetRequest,
   options: QueryObserverOptions<Datasets.RespDatasetDownload, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Datasets.RespDatasetDownload, Error>(
     [QueryKeys.listDownloadLinks, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

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

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

lib/tapisui-hooks/src/ml-hub/models/inference/useInferenceServerDetails.ts

@@ -3,7 +3,6 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../../';
 import QueryKeys from '../queryKeys';
-import basePath from '../basePath'; // remove if ml-hub is listed in NGINX
 
 const useInferenceServerDetails = (
   params: Models.DownloadModelRequest,
@@ -12,8 +11,7 @@ const useInferenceServerDetails = (
     Error
   > = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<
     Models.RespModelServer & Models.RespModelServerError,
     Error

lib/tapisui-hooks/src/ml-hub/models/useDetails.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useDetails = (
   params: Models.GetModelRequest,
   options: QueryObserverOptions<Models.RespModel, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Models.RespModel, Error>(
     [QueryKeys.details, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/models/useList.ts

@@ -3,13 +3,11 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useList = (
   options: QueryObserverOptions<Models.RespModelsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove  this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Models.RespModelsObject, Error>(
     [QueryKeys.list, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/models/useListByAuthor.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByAuthor = (
   params: Models.ListModelsByAuthorRequest,
   options: QueryObserverOptions<Models.RespModelsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Models.RespModelsObject, Error>(
     [QueryKeys.listByAuthor, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/models/useListByDataset.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByDataset = (
   params: Models.ListModelsByDatasetRequest,
   options: QueryObserverOptions<Models.RespModelsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Models.RespModelsObject, Error>(
     [QueryKeys.listByDataset, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/models/useListByLanguage.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByLanguage = (
   params: Models.ListModelsByLanguageRequest,
   options: QueryObserverOptions<Models.RespModelsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Models.RespModelsObject, Error>(
     [QueryKeys.listByLanguage, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/models/useListByLibrary.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByLibrary = (
   params: Models.ListModelsByLibraryRequest,
   options: QueryObserverOptions<Models.RespModelsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Models.RespModelsObject, Error>(
     [QueryKeys.listByLibrary, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/models/useListByQuery.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByQuery = (
   params: Models.ListModelsByQueryRequest,
   options: QueryObserverOptions<Models.RespModelsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Models.RespModelsObject, Error>(
     [QueryKeys.listByQuery, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/models/useListByTask.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListByTask = (
   params: Models.ListModelsByTaskRequest,
   options: QueryObserverOptions<Models.RespModelsObject, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Models.RespModelsObject, Error>(
     [QueryKeys.listByTask, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function

lib/tapisui-hooks/src/ml-hub/models/useListDownloadLinks.ts

@@ -3,14 +3,12 @@ import { MLHub as API } from '@tapis/tapisui-api';
 import { Models } from '@tapis/tapis-typescript';
 import { useTapisConfig } from '../../';
 import QueryKeys from './queryKeys';
-import basePath from './basePath'; // remove if ml-hub is listed in NGINX
 
 const useListDownloadLinks = (
   params: Models.DownloadModelRequest,
   options: QueryObserverOptions<Models.RespModelDownload, Error> = {}
 ) => {
-  // const { accessToken, basePath } = useTapisConfig();
-  const { accessToken } = useTapisConfig(); // remove this line and uncomment line above if ml-hub is listed in NGINX
+  const { accessToken, basePath } = useTapisConfig();
   const result = useQuery<Models.RespModelDownload, Error>(
     [QueryKeys.listDownloadLinks, params, accessToken],
     // Default to no token. This will generate a 403 when calling the list function