Skip to content

Commit 2f6a4f6

Browse files
Merge remote-tracking branch 'origin/maryhipp/use-open-api-variables' into feat/ui/api-cleanup
2 parents 83e2b75 + 37c2b57 commit 2f6a4f6

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

invokeai/frontend/web/src/services/apiSlice.ts

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import {
2+
BaseQueryFn,
3+
FetchArgs,
4+
FetchBaseQueryError,
25
TagDescription,
36
createApi,
47
fetchBaseQuery,
@@ -18,6 +21,7 @@ import { BaseModelType } from './api/models/BaseModelType';
1821
import { ModelType } from './api/models/ModelType';
1922
import { ModelsList } from './api/models/ModelsList';
2023
import { keyBy } from 'lodash-es';
24+
import { OpenAPI } from './api/core/OpenAPI';
2125

2226
type ListBoardsArg = { offset: number; limit: number };
2327
type UpdateBoardArg = { board_id: string; changes: BoardChanges };
@@ -41,8 +45,27 @@ const modelsAdapter = createEntityAdapter<ModelConfig>({
4145
const getModelId = ({ base_model, type, name }: ModelConfig) =>
4246
`${base_model}/${type}/${name}`;
4347

48+
const dynamicBaseQuery: BaseQueryFn<
49+
string | FetchArgs,
50+
unknown,
51+
FetchBaseQueryError
52+
> = async (args, api, extraOptions) => {
53+
const baseUrl = OpenAPI.BASE || '';
54+
55+
const rawBaseQuery = fetchBaseQuery({
56+
baseUrl: `${baseUrl}/api/v1`,
57+
prepareHeaders: (headers, { getState }) => {
58+
if (OpenAPI.TOKEN)
59+
headers.set('Authorization', `Bearer ${OpenAPI.TOKEN}`);
60+
return headers;
61+
},
62+
});
63+
64+
return rawBaseQuery(args, api, extraOptions);
65+
};
66+
4467
export const api = createApi({
45-
baseQuery: fetchBaseQuery({ baseUrl: 'http://localhost:5173/api/v1/' }),
68+
baseQuery: dynamicBaseQuery,
4669
reducerPath: 'api',
4770
tagTypes,
4871
endpoints: (build) => ({

0 commit comments

Comments
 (0)