diff --git a/core/gpu.py b/core/gpu.py index 2d8b35ed2..a6ed0af80 100644 --- a/core/gpu.py +++ b/core/gpu.py @@ -232,13 +232,14 @@ def generate_thread_call(job: Job) -> Union[List[Image.Image], List[str]]: return (images, deltatime) except InferenceInterruptedError: - await websocket_manager.broadcast( - Notification( - "warning", - "Inference interrupted", - "The inference was forcefully interrupted", + if config.frontend.on_change_timer == 0: + await websocket_manager.broadcast( + Notification( + "warning", + "Inference interrupted", + "The inference was forcefully interrupted", + ) ) - ) return ([], 0.0) except ValueError as err: diff --git a/frontend/dist/assets/SettingsView.js b/frontend/dist/assets/SettingsView.js index b806fa923..65e9174f9 100644 --- a/frontend/dist/assets/SettingsView.js +++ b/frontend/dist/assets/SettingsView.js @@ -2917,16 +2917,19 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({ __name: "GeneralSettings", setup(__props) { const settings = useSettings(); + watch(settings.defaultSettings.frontend, () => { + settings.data.settings.frontend.on_change_timer = settings.defaultSettings.frontend.on_change_timer; + }); return (_ctx, _cache) => { return openBlock(), createBlock(unref(NForm), null, { default: withCtx(() => [ _hoisted_1$1, - createVNode(unref(NFormItem), { label: "Continuous generation timeout (0 for disabled)" }, { + createVNode(unref(NFormItem), { label: "Continuous generation timeout (0 for disabled) [ms]" }, { default: withCtx(() => [ createVNode(unref(NInputNumber), { value: unref(settings).defaultSettings.frontend.on_change_timer, "onUpdate:value": _cache[0] || (_cache[0] = ($event) => unref(settings).defaultSettings.frontend.on_change_timer = $event), - min: 100, + min: 0, step: 50 }, null, 8, ["value"]) ]), diff --git a/frontend/dist/assets/index.css b/frontend/dist/assets/index.css index 9e3ef0a1d..b34ecb4d3 100644 --- a/frontend/dist/assets/index.css +++ b/frontend/dist/assets/index.css @@ -30,8 +30,8 @@ margin-left: 16px; } -.main[data-v-fedbc04b] { - background-color: var(--33343887); +.main[data-v-9bd83b27] { + background-color: var(--37d47be4); } body { min-height: 100vh; diff --git a/frontend/dist/assets/index.js b/frontend/dist/assets/index.js index 50bd2dc9a..dc3ebd46c 100644 --- a/frontend/dist/assets/index.js +++ b/frontend/dist/assets/index.js @@ -1376,6 +1376,8 @@ function flushJobs(seen2) { } } } +/* @__PURE__ */ new Set(); +/* @__PURE__ */ new Map(); function emit(instance, event, ...rawArgs) { if (instance.isUnmounted) return; @@ -5881,7 +5883,7 @@ function normalizeContainer(container) { } var isVue2 = false; /*! - * pinia v2.0.34 + * pinia v2.0.35 * (c) 2023 Eduardo San Martin Morote * @license MIT */ @@ -6569,6 +6571,7 @@ const render$1 = (r, ...args) => { return null; } }; +/* @__PURE__ */ new Set(); function warn$2(location2, message) { console.error(`[naive/${location2}]: ${message}`); } @@ -8348,6 +8351,7 @@ const clickoutside = { } }; const clickoutside$1 = clickoutside; +/* @__PURE__ */ new Set(); function warn$1(location2, message) { console.error(`[vdirs/${location2}]: ${message}`); } @@ -36585,6 +36589,7 @@ function useEventListener(...args) { const _global = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {}; const globalKey = "__vueuse_ssr_handlers__"; _global[globalKey] = _global[globalKey] || {}; +/* @__PURE__ */ new Map(); var SwipeDirection; (function(SwipeDirection2) { SwipeDirection2["UP"] = "UP"; @@ -38138,12 +38143,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({ __name: "App", setup(__props) { useCssVars((_ctx) => ({ - "33343887": unref(backgroundColor) + "37d47be4": unref(backgroundColor) })); const settings = useSettings(); const theme = computed(() => { if (settings.data.settings.frontend.theme === "dark") { - document.body.style.backgroundColor = "black"; + document.body.style.backgroundColor = "#121215"; return darkTheme; } else { document.body.style.backgroundColor = "white"; @@ -38190,8 +38195,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({ }; } }); -const App_vue_vue_type_style_index_0_scoped_fedbc04b_lang = ""; -const App = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fedbc04b"]]); +const App_vue_vue_type_style_index_0_scoped_9bd83b27_lang = ""; +const App = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9bd83b27"]]); const scriptRel = "modulepreload"; const assetsURL = function(dep) { return "/" + dep; diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 7e2159a81..508fa9ea1 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -31,7 +31,7 @@ const settings = useSettings(); const theme = computed(() => { if (settings.data.settings.frontend.theme === "dark") { - document.body.style.backgroundColor = "black"; + document.body.style.backgroundColor = "#121215"; return darkTheme; } else { document.body.style.backgroundColor = "white"; diff --git a/frontend/src/components/settings/GeneralSettings.vue b/frontend/src/components/settings/GeneralSettings.vue index addfc1244..fbadd732f 100644 --- a/frontend/src/components/settings/GeneralSettings.vue +++ b/frontend/src/components/settings/GeneralSettings.vue @@ -1,10 +1,10 @@