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 'development' into development

Browse Source
This commit is contained in:
Peter Baylies
2022-09-21 17:47:14 -04:00
committed by GitHub
parent 883b2b6e62 0ab5f2159d
commit 88e3b6d310
12 changed files with 141 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/dist/assets/index.727a397b.js → frontend/dist/assets/index.632c341a.js vendored
View File

File diff suppressed because one or more lines are too long

4
frontend/dist/index.html vendored
View File

@ -3,8 +3,8 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Stable Diffusion Dream Server</title>
<script type="module" crossorigin src="/assets/index.727a397b.js"></script>
<title>InvokeAI Stable Diffusion Dream Server</title>
<script type="module" crossorigin src="/assets/index.632c341a.js"></script>
<link rel="stylesheet" href="/assets/index.447eb2a9.css">
</head>
<body>

4
frontend/src/features/gallery/CurrentImageButtons.tsx
View File

@ -92,7 +92,7 @@ const CurrentImageButtons = ({
colorScheme={'gray'}
flexGrow={1}
variant={'outline'}
isDisabled={!['txt2img', 'img2img'].includes(image.metadata.image.type)}
isDisabled={!['txt2img', 'img2img'].includes(image?.metadata?.image?.type)}
onClick={handleClickUseAllParameters}
/>
@ -101,7 +101,7 @@ const CurrentImageButtons = ({
colorScheme={'gray'}
flexGrow={1}
variant={'outline'}
isDisabled={!image.metadata.image.seed}
isDisabled={!image?.metadata?.image?.seed}
onClick={handleClickUseSeed}
/>

6
frontend/src/features/gallery/HoverableImage.tsx
View File

@ -53,8 +53,6 @@ const HoverableImage = memo((props: HoverableImageProps) => {
const handleClickSetSeed = (e: SyntheticEvent) => {
e.stopPropagation();
// Non-null assertion: this button is not rendered unless this exists
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
dispatch(setSeed(image.metadata.image.seed));
};
@ -109,7 +107,7 @@ const HoverableImage = memo((props: HoverableImageProps) => {
/>
</DeleteImageModal>
</Tooltip>
{['txt2img', 'img2img'].includes(image.metadata.image.type) && (
{['txt2img', 'img2img'].includes(image?.metadata?.image?.type) && (
<Tooltip label="Use all parameters">
<IconButton
aria-label="Use all parameters"
@ -121,7 +119,7 @@ const HoverableImage = memo((props: HoverableImageProps) => {
/>
</Tooltip>
)}
{image.metadata.image.seed && (
{image?.metadata?.image?.seed && (
<Tooltip label="Use seed">
<IconButton
aria-label="Use seed"

17
frontend/src/features/gallery/ImageMetadataViewer.tsx
View File

@ -95,7 +95,7 @@ const ImageMetadataViewer = memo(({ image }: ImageMetadataViewerProps) => {
const dispatch = useAppDispatch();
const jsonBgColor = useColorModeValue('blackAlpha.100', 'whiteAlpha.100');
const metadata = image.metadata.image;
const metadata = image?.metadata?.image || {};
const {
type,
postprocessing,
@ -119,12 +119,7 @@ const ImageMetadataViewer = memo(({ image }: ImageMetadataViewerProps) => {
const metadataJSON = JSON.stringify(metadata, null, 2);
return (
<Flex
gap={1}
direction={'column'}
overflowY={'scroll'}
width={'100%'}
>
<Flex gap={1} direction={'column'} overflowY={'scroll'} width={'100%'}>
<Flex gap={2}>
<Text fontWeight={'semibold'}>File:</Text>
<Link href={image.url} isExternal>
@ -132,7 +127,7 @@ const ImageMetadataViewer = memo(({ image }: ImageMetadataViewerProps) => {
<ExternalLinkIcon mx="2px" />
</Link>
</Flex>
{Object.keys(metadata).length ? (
{Object.keys(metadata).length > 0 ? (
<>
{type && <MetadataItem label="Type" value={type} />}
{['esrgan', 'gfpgan'].includes(type) && (
@ -288,9 +283,9 @@ const ImageMetadataViewer = memo(({ image }: ImageMetadataViewerProps) => {
)}
<Flex gap={2} direction={'column'}>
<Flex gap={2}>
<Tooltip label={`Copy JSON`}>
<Tooltip label={`Copy metadata JSON`}>
<IconButton
aria-label="Copy JSON"
aria-label="Copy metadata JSON"
icon={<FaCopy />}
size={'xs'}
variant={'ghost'}
@ -298,7 +293,7 @@ const ImageMetadataViewer = memo(({ image }: ImageMetadataViewerProps) => {
onClick={() => navigator.clipboard.writeText(metadataJSON)}
/>
</Tooltip>
<Text fontWeight={'semibold'}>JSON:</Text>
<Text fontWeight={'semibold'}>Metadata JSON:</Text>
</Flex>
<Box
// maxHeight={200}

1
frontend/src/features/options/SeedVariationOptions.tsx
View File

@ -132,6 +132,7 @@ const SeedVariationOptions = () => {
step={0.01}
min={0}
max={1}
isDisabled={!shouldGenerateVariations}
onChange={handleChangevariationAmount}
/>
<FormControl