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

Merge branch 'main' into feat/taesd

Browse Source
This commit is contained in:
Millun Atluri 2023-09-12 17:47:53 +10:00 committed by GitHub
commit 3dfff278aa
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

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

@ -130,6 +130,22 @@ export const imagesApi = api.injectEndpoints({
extraOptions, extraOptions,
fetchWithBaseQuery fetchWithBaseQuery
) => { ) => {
if (args.shouldFetchMetadataFromApi) {
let metadata;
const metadataResponse = await fetchWithBaseQuery(
`images/i/${args.image.image_name}/metadata`
);
if (metadataResponse.data) {
const metadataResult = zCoreMetadata.safeParse(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(metadataResponse.data as any)?.metadata
);
if (metadataResult.success) {
metadata = metadataResult.data;
}
}
return { data: { metadata } };
} else {
const authToken = $authToken.get(); const authToken = $authToken.get();
const projectId = $projectId.get(); const projectId = $projectId.get();
const customBaseQuery = fetchBaseQuery({ const customBaseQuery = fetchBaseQuery({
@ -154,28 +170,12 @@ export const imagesApi = api.injectEndpoints({
api, api,
extraOptions extraOptions
); );
const blobData = await getMetadataAndWorkflowFromImageBlob( const data = await getMetadataAndWorkflowFromImageBlob(
response.data as Blob response.data as Blob
); );
let metadata = blobData.metadata; return { data };
if (args.shouldFetchMetadataFromApi) {
const metadataResponse = await fetchWithBaseQuery(
`images/i/${args.image.image_name}/metadata`
);
if (metadataResponse.data) {
const metadataResult = zCoreMetadata.safeParse(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(metadataResponse.data as any)?.metadata
);
if (metadataResult.success) {
metadata = metadataResult.data;
} }
}
}
return { data: { ...blobData, metadata } };
}, },
providesTags: (result, error, { image }) => [ providesTags: (result, error, { image }) => [
{ type: 'ImageMetadataFromFile', id: image.image_name }, { type: 'ImageMetadataFromFile', id: image.image_name },