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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small fixes #248

Merged
merged 2 commits into from
Jul 22, 2023
Merged

Small fixes #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba4893d
model selector update for upcoming webUI 1.5
zero01101 Jul 22, 2023
fb3bf0a
did something change with sdxl outpainting >:(
zero01101 Jul 22, 2023
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
6 changes: 3 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
<span id="version">
<a href="https://github.com/zero01101/openOutpaint" target="_blank">
<s>Alpha release v0.0.16.4</s>
v20230722.001
v20230722.002
</a>
<br />
<a
Expand Down Expand Up @@ -539,7 +539,7 @@

<!-- Content -->
<script src="js/prompt.js?v=7a1c68c" type="text/javascript"></script>
<script src="js/index.js?v=c6b95a9" type="text/javascript"></script>
<script src="js/index.js?v=d4006e8" type="text/javascript"></script>

<script
src="js/ui/floating/history.js?v=4f29db4"
Expand All @@ -553,7 +553,7 @@
src="js/ui/tool/generic.js?v=3e678e0"
type="text/javascript"></script>

<script src="js/ui/tool/dream.js?v=1bbd3fe" type="text/javascript"></script>
<script src="js/ui/tool/dream.js?v=c97af5b" type="text/javascript"></script>
<script
src="js/ui/tool/maskbrush.js?v=e9bd0eb"
type="text/javascript"></script>
Expand Down
12 changes: 11 additions & 1 deletion js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,7 +1172,17 @@ async function getModels(refresh = false) {
);
const optData = await optResponse.json();

const model = optData.sd_model_checkpoint;
var model = optData.sd_model_checkpoint;
// 20230722 - sigh so this key is now removed https://github.com/AUTOMATIC1111/stable-diffusion-webui/commit/66c5f1bb1556a2d86d9f11aeb92f83d4a09832cc
// no idea why but time to deal with it
if (model === undefined) {
const modelHash = optData.sd_checkpoint_hash;
const hashMap = data.map((option) => ({
hash: option.sha256,
title: option.title,
}));
model = hashMap.find((option) => option.hash === modelHash).title;
}
console.log("Current model: " + model);
if (modelAutoComplete.value !== model) modelAutoComplete.value = model;
} catch (e) {
Expand Down
13 changes: 5 additions & 8 deletions js/ui/tool/dream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,9 @@ const _monitorProgress = (bb, oncheck = null) => {
}

const timeSpent = performance.now() - init;
setTimeout(
() => {
if (running) _checkProgress();
},
Math.max(0, minDelay - timeSpent)
);
setTimeout(() => {
if (running) _checkProgress();
}, Math.max(0, minDelay - timeSpent));
};

_checkProgress();
Expand Down Expand Up @@ -2035,8 +2032,8 @@ const dreamTool = () =>
"outpainting_fill",
"Outpaint Type",
{
0: "fill",
1: "original (SDXL)",
0: "fill (SDXL?)",
1: "original (SDXL?)",
2: "latent noise (SD1.x/2.x)",
3: "latent nothing",
},
Expand Down
Loading