Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ML Hub - resolve base path implicitly #403

Merged
merged 3 commits into from
Jul 16, 2024
Merged

ML Hub - resolve base path implicitly #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2de51d
remove explicit basePath from ML Hub models so it will read basePath …
dhannywi Jul 16, 2024
6bd3ec5
added missing export for ML Hub datasets hooks
dhannywi Jul 16, 2024
19ff0d7
remove explicit basePath from ML Hub datasets so it will read basePat…
dhannywi Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/basePath.ts
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useCardDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListByAuthor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListByLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListByQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListBySizeCategory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListByTask.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/datasets/useListDownloadLinks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/tapisui-hooks/src/ml-hub/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * as Models from './models';
export * as Datasets from './datasets';
3 changes: 0 additions & 3 deletions lib/tapisui-hooks/src/ml-hub/models/basePath.ts
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/inference/useInferenceServerDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/useDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/useList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/useListByAuthor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/useListByDataset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/useListByLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/useListByLibrary.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/useListByQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/useListByTask.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions lib/tapisui-hooks/src/ml-hub/models/useListDownloadLinks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading