Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

dont try to load image at all if shouldFetchMetadataFromApi (#4511)

Browse Source 
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
This commit is contained in:
Mary Hipp Rogers 2023-09-11 11:11:32 -04:00 committed by GitHub
parent 183f66c70c
commit e060fef540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
invokeai/frontend/web/src/services/api/endpoints/images.ts
View File

@ -130,37 +130,8 @@ export const imagesApi = api.injectEndpoints({
extraOptions,
fetchWithBaseQuery
) => {
const authToken = $authToken.get();
const projectId = $projectId.get();
const customBaseQuery = fetchBaseQuery({
baseUrl: '',
prepareHeaders: (headers) => {
if (authToken) {
headers.set('Authorization', `Bearer ${authToken}`);
}
if (projectId) {
headers.set('project-id', projectId);
}
return headers;
},
responseHandler: async (res) => {
return await res.blob();
},
});
const response = await customBaseQuery(
args.image.image_url,
api,
extraOptions
);
const blobData = await getMetadataAndWorkflowFromImageBlob(
response.data as Blob
);
let metadata = blobData.metadata;
if (args.shouldFetchMetadataFromApi) {
let metadata;
const metadataResponse = await fetchWithBaseQuery(
`images/i/${args.image.image_name}/metadata`
);
@ -173,9 +144,38 @@ export const imagesApi = api.injectEndpoints({
metadata = metadataResult.data;
}
}
}
return { data: { metadata } };
} else {
const authToken = $authToken.get();
const projectId = $projectId.get();
const customBaseQuery = fetchBaseQuery({
baseUrl: '',
prepareHeaders: (headers) => {
if (authToken) {
headers.set('Authorization', `Bearer ${authToken}`);
}
if (projectId) {
headers.set('project-id', projectId);
}
return { data: { ...blobData, metadata } };
return headers;
},
responseHandler: async (res) => {
return await res.blob();
},
});
const response = await customBaseQuery(
args.image.image_url,
api,
extraOptions
);
const data = await getMetadataAndWorkflowFromImageBlob(
response.data as Blob
);
return { data };
}
},
providesTags: (result, error, { image }) => [
{ type: 'ImageMetadataFromFile', id: image.image_name },