- Control Net Settings Slot {this.props.index}
-
-
-
-
- 
+ return (
+ {
- const control_net_json = await api.requestGet(`${g_sd_url}/controlnet/model_list`)
+ const control_net_json = await api.requestGet(
+ `${g_sd_url}/controlnet/model_list`
+ )
const model_list = control_net_json?.model_list
return model_list
@@ -36,15 +40,14 @@ async function initializeControlNetTab(controlnet_max_models: number) {
try {
const models = await requestControlNetModelList()
- store.supportedModels = models || [];
+ store.supportedModels = models || []
} catch (e) {
console.warn(e)
}
try {
const pps = await requestControlNetPreprocessors()
- store.supportedPreprocessors = pps ? pps.module_list : [];
+ store.supportedPreprocessors = pps ? pps.module_list : []
store.preprocessorDetail = pps ? pps.module_detail : {}
-
} catch (e) {
console.warn(e)
}
@@ -52,9 +55,10 @@ async function initializeControlNetTab(controlnet_max_models: number) {
function getEnableControlNet(index: number) {
if (typeof index == 'undefined')
- return store.controlNetUnitData.filter(item => item.enabled).length > 0
- else
- return store.controlNetUnitData[index || 0].enabled
+ return (
+ store.controlNetUnitData.filter((item) => item.enabled).length > 0
+ )
+ else return store.controlNetUnitData[index || 0].enabled
}
function mapPluginSettingsToControlNet(plugin_settings: any) {
const ps = plugin_settings // for shortness
@@ -79,8 +83,9 @@ function mapPluginSettingsToControlNet(plugin_settings: any) {
guessmode: false,
}
if (store.controlnetApiVersion > 1) {
- controlnet_units[index].control_mode = store.controlNetUnitData[index].control_mode;
- controlnet_units[index].pixel_perfect = true;
+ controlnet_units[index].control_mode =
+ store.controlNetUnitData[index].control_mode
+ controlnet_units[index].pixel_perfect = true
}
}
@@ -89,7 +94,7 @@ function mapPluginSettingsToControlNet(plugin_settings: any) {
plugin_settings['mode'] === Enum.generationModeEnum['Inpaint'] ||
plugin_settings['mode'] === Enum.generationModeEnum['Outpaint']
) {
- const b_use_guess_mode = store.controlNetUnitData[0].guessmode;
+ const b_use_guess_mode = store.controlNetUnitData[0].guessmode
controlnet_units[0]['guessmode'] = b_use_guess_mode
}
@@ -105,23 +110,23 @@ function mapPluginSettingsToControlNet(plugin_settings: any) {
args: controlnet_units,
},
},
-
}
return controlnet_payload
}
function getControlNetMaxModelsNumber() {
- return store.maxControlNet;
+ return store.maxControlNet
}
function getUnitsData() {
return store.controlNetUnitData
}
function setControlMaskSrc(base64: string, index: number) {
- store.controlNetUnitData[index].mask = base64;
+ store.controlNetUnitData[index].mask = base64
}
function isControlNetModeEnable() {
//@ts-ignore
- let is_tab_enabled = !document.getElementById('chDisableControlNetTab').checked
+ let is_tab_enabled = !document.getElementById('chDisableControlNetTab')
+ .checked
let numOfEnabled = 0
if (is_tab_enabled) {
@@ -138,7 +143,7 @@ function isControlNetModeEnable() {
return is_mode_enabled
}
function getModuleDetail() {
- return store.preprocessorDetail;
+ return store.preprocessorDetail
}
export {
requestControlNetModelList,
@@ -150,5 +155,5 @@ export {
getUnitsData,
setControlMaskSrc,
isControlNetModeEnable,
- getModuleDetail
-}
\ No newline at end of file
+ getModuleDetail,
+}
diff --git a/typescripts/controlnet/main.tsx b/typescripts/controlnet/main.tsx
index 797ae17..27bddc5 100644
--- a/typescripts/controlnet/main.tsx
+++ b/typescripts/controlnet/main.tsx
@@ -1,16 +1,13 @@
import ReactDOM from 'react-dom/client'
-import React from 'react';
-import ControlNetTab from './ControlNetTab';
+import React from 'react'
+import ControlNetTab from './ControlNetTab'
import store from './store'
import { versionCompare } from './util'
-const elem = document.getElementById('sp-control_net-tab-page');
+const elem = document.getElementById('sp-control_net-tab-page')
if (elem) {
const root = ReactDOM.createRoot(elem)
- root.render()
+ root.render(({
supportedPreprocessors: [],
preprocessorDetail: {},
- controlNetUnitData: []
-});
+ controlNetUnitData: [],
+})
reaction(
() => {
- return ControlNetStore.controlNetUnitData.map(data => data.module)
+ return ControlNetStore.controlNetUnitData.map((data) => data.module)
},
(module_, index) => {
ControlNetStore.controlNetUnitData.forEach((data, index) => {
@@ -81,11 +84,16 @@ reaction(
)
reaction(
() => ControlNetStore.maxControlNet,
- maxControlNet => {
- ControlNetStore.controlNetUnitData = Array(maxControlNet).fill(0).map((v, index) => {
- return ControlNetStore.controlNetUnitData[index] || DefaultControlNetUnitData;
- })
+ (maxControlNet) => {
+ ControlNetStore.controlNetUnitData = Array(maxControlNet)
+ .fill(0)
+ .map((v, index) => {
+ return (
+ ControlNetStore.controlNetUnitData[index] ||
+ DefaultControlNetUnitData
+ )
+ })
}
)
-export default ControlNetStore
\ No newline at end of file
+export default ControlNetStore
diff --git a/typescripts/controlnet/util.tsx b/typescripts/controlnet/util.tsx
index 2b26710..1d33aae 100644
--- a/typescripts/controlnet/util.tsx
+++ b/typescripts/controlnet/util.tsx
@@ -1,10 +1,18 @@
-
-export function mapRange(x: number, in_min: number, in_max: number, out_min: number, out_max: number, step: number) {
- return Math.round(
- (
- ((x - in_min) * (out_max - out_min)) / (in_max - in_min) + out_min
- ) / step
- ) * step
+export function mapRange(
+ x: number,
+ in_min: number,
+ in_max: number,
+ out_min: number,
+ out_max: number,
+ step: number
+) {
+ return (
+ Math.round(
+ (((x - in_min) * (out_max - out_min)) / (in_max - in_min) +
+ out_min) /
+ step
+ ) * step
+ )
}
export function versionCompare(to: string, from: string) {
@@ -14,13 +22,15 @@ export function versionCompare(to: string, from: string) {
for (let i = 0; i < Math.max(vTo.length, vFrom.length); i++) {
const vFromI = +(vFrom[i] || 0)
const vToI = +(vTo[i] || 0)
- if (isNaN(vFromI) || isNaN(vToI)) { throw new Error(`invalid version ${vTo} or ${vFrom} `) }
+ if (isNaN(vFromI) || isNaN(vToI)) {
+ throw new Error(`invalid version ${vTo} or ${vFrom} `)
+ }
if (vFromI > vToI) {
return -1
- } else if (vFromI < vToI) {
- return 1;
+ } else if (vFromI < vToI) {
+ return 1
}
}
- return 0;
-}
\ No newline at end of file
+ return 0
+}
diff --git a/typescripts/entry.ts b/typescripts/entry.ts
index c99ebc0..b3959fb 100644
--- a/typescripts/entry.ts
+++ b/typescripts/entry.ts
@@ -4,16 +4,3 @@ export * as ultimate_sd_upscaler from './ultimate_sd_upscaler/ultimate_sd_upscal
export * as scripts from './ultimate_sd_upscaler/scripts'
export * as main from './main/main'
export * as logger from './util/logger'
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/typescripts/main/astore.ts b/typescripts/main/astore.ts
index c6466db..23b681e 100644
--- a/typescripts/main/astore.ts
+++ b/typescripts/main/astore.ts
@@ -24,4 +24,4 @@ export class AStore {
toJsFunc() {
return toJS(this)
}
-}
\ No newline at end of file
+}
diff --git a/typescripts/ultimate_sd_upscaler/ultimate_sd_upscaler.tsx b/typescripts/ultimate_sd_upscaler/ultimate_sd_upscaler.tsx
index 8efafaa..1133474 100644
--- a/typescripts/ultimate_sd_upscaler/ultimate_sd_upscaler.tsx
+++ b/typescripts/ultimate_sd_upscaler/ultimate_sd_upscaler.tsx
@@ -159,18 +159,16 @@ export class UltimateSDUpscalerForm extends React.Component<{
}
async getUpscalers() {
- try{
-
+ try {
const sd_upscalers_json = await requestGetUpscalers()
const sd_upscalers = sd_upscalers_json.map(
(upscaler: any) => upscaler.name
- )
- this.setState({ sd_upscalers: sd_upscalers })
- return sd_upscalers
- }
- catch(e){
- console.warn("ultimate sd upscaler getUpscalers(): ",e)
- }
+ )
+ this.setState({ sd_upscalers: sd_upscalers })
+ return sd_upscalers
+ } catch (e) {
+ console.warn('ultimate sd upscaler getUpscalers(): ', e)
+ }
}
handleRefresh = async () => {
diff --git a/typescripts/util/elements.tsx b/typescripts/util/elements.tsx
index e4a22ea..3e5d2c3 100644
--- a/typescripts/util/elements.tsx
+++ b/typescripts/util/elements.tsx
@@ -2,11 +2,9 @@ import React, { CSSProperties, ReactEventHandler, useState } from 'react'
// import ReactDOM from 'react-dom'
import ReactDOM from 'react-dom/client'
// import { versions } from 'uxp'
-export { ReactComponent as MoveToCanvasSvg } from '../../icon/move_to_canvas.svg';
-export { ReactComponent as PenSvg } from '../../icon/pen.svg';
-export { ReactComponent as PreviewSvg } from '../../icon/preview.svg';
-
-
+export { ReactComponent as MoveToCanvasSvg } from '../../icon/move_to_canvas.svg'
+export { ReactComponent as PenSvg } from '../../icon/pen.svg'
+export { ReactComponent as PreviewSvg } from '../../icon/preview.svg'
declare global {
namespace JSX {
@@ -266,11 +264,9 @@ export class SpMenu extends React.Component<{
}
}
class PhotoshopElem extends React.Component<{ [key: string]: any }, {}> {
- protected elem: Element | null = null;
+ protected elem: Element | null = null
- protected curEvents: { [key: string]: (evt: Event) => any } = {
-
- }
+ protected curEvents: { [key: string]: (evt: Event) => any } = {}
componentDidMount(): void {
this.updateEventListener()
@@ -281,35 +277,34 @@ class PhotoshopElem extends React.Component<{ [key: string]: any }, {}> {
// }
updateEventListener() {
- if (!this.elem) throw new Error('elem is not rendered with ref');
+ if (!this.elem) throw new Error('elem is not rendered with ref')
const [, newEvent] = this.splitProps(this.props)
- Object.keys(this.curEvents).forEach(evkey => {
+ Object.keys(this.curEvents).forEach((evkey) => {
if (this.curEvents[evkey] != newEvent[evkey]) {
- this.elem?.removeEventListener(evkey, this.curEvents[evkey]);
+ this.elem?.removeEventListener(evkey, this.curEvents[evkey])
}
- });
- Object.keys(newEvent).forEach(evkey => {
- this.elem?.addEventListener(evkey, newEvent[evkey]);
+ })
+ Object.keys(newEvent).forEach((evkey) => {
+ this.elem?.addEventListener(evkey, newEvent[evkey])
})
}
componentWillUnmount(): void {
- Object.keys(this.curEvents).forEach(evkey => {
- this.elem?.removeEventListener(evkey, this.curEvents[evkey]);
- });
+ Object.keys(this.curEvents).forEach((evkey) => {
+ this.elem?.removeEventListener(evkey, this.curEvents[evkey])
+ })
}
splitProps(props: any): [any, any] {
- const attr: any = {};
- const event: any = {};
+ const attr: any = {}
+ const event: any = {}
Object.keys(props).forEach((propKey: string) => {
if (propKey.startsWith('on')) {
const key = propKey[2].toLocaleLowerCase() + propKey.slice(3)
- event[key] = props[propKey];
-
+ event[key] = props[propKey]
} else {
- attr[propKey] = props[propKey];
+ attr[propKey] = props[propKey]
}
})
return [attr, event]
@@ -318,81 +313,131 @@ class PhotoshopElem extends React.Component<{ [key: string]: any }, {}> {
export class SpPicker extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
- return this.elem = elem} {...attr}>
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+ )
}
}
export class SpMenuComponent extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
- return this.elem = elem} {...attr}>
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+ )
}
}
export class SpMenuItem extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
- return this.elem = elem} {...attr}>
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+ )
}
}
export class SpLabel extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
- return this.elem = elem} {...attr}>
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+ )
}
}
export class SpCheckBox extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
if (!attr['checked']) delete attr['checked']
- return this.elem = elem} {...attr}>
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+ )
}
}
export class SpSlider extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
- return this.elem = elem} {...attr}>
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+ )
}
}
export class SpRadioGroup extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
- return this.elem = elem} {...attr}>
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+ )
}
}
export class SpRadio extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
- return this.elem = elem} {...attr}>
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+ )
}
}
export class SpDivider extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
- return this.elem = elem} {...attr}>
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+ )
}
}
-
-export class Thumbnail extends React.Component<{children:React.ReactNode}> {
-
- render() {
- return this.elem = elem} {...attr}>
-
- }}
-
+ return (
+ (this.elem = elem)}
+ {...attr}
+ >
+
+ )
+ }
+}
diff --git a/typescripts/util/logger.ts b/typescripts/util/logger.ts
index 154ce3e..72e39a6 100644
--- a/typescripts/util/logger.ts
+++ b/typescripts/util/logger.ts
@@ -1,7 +1,5 @@
-
-import {format} from 'util';
-export function formateLog(data: any, ...optional_param: any[]){
-
- const formattedOutput = format(data, ...optional_param);
+import { format } from 'util'
+export function formateLog(data: any, ...optional_param: any[]) {
+ const formattedOutput = format(data, ...optional_param)
return formattedOutput
-}
\ No newline at end of file
+}
diff --git a/typescripts/util/oldSystem.tsx b/typescripts/util/oldSystem.tsx
index 6b58e08..d976e2c 100644
--- a/typescripts/util/oldSystem.tsx
+++ b/typescripts/util/oldSystem.tsx
@@ -1,5 +1,5 @@
//@ts-ignore
-const req = window['require'];
+const req = window['require']
// because we use window['require'], so the base path of this require function is the root path of plugin.
const selection = req('./selection')
@@ -26,5 +26,5 @@ export {
html_manip,
psapi,
general,
- io
-}
\ No newline at end of file
+ io,
+}
diff --git a/utility/presets/preset.js b/utility/presets/preset.js
index f597d0e..81096c8 100644
--- a/utility/presets/preset.js
+++ b/utility/presets/preset.js
@@ -160,9 +160,9 @@ function getPresetSettings(preset_type) {
if (preset_type === Enum.PresetTypeEnum['SDPreset']) {
preset_settings = g_ui_settings_object.getSettings()
} else if (preset_type === Enum.PresetTypeEnum['ControlNetPreset']) {
- const { getUnitsData } = require('../../typescripts/dist/bundle').control_net // only import ControlNetUnit to avoid circular dependency
+ const { getUnitsData } =
+ require('../../typescripts/dist/bundle').control_net // only import ControlNetUnit to avoid circular dependency
preset_settings = getUnitsData()
-
}
return preset_settings
}
diff --git a/webpack.config.js b/webpack.config.js
index 535dcc3..cb8db4f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,4 +1,3 @@
-
const path = require('path')
// const CleanWebpackPlugin = require('clean-webpack-plugin')
const CopyPlugin = require('copy-webpack-plugin')
@@ -23,11 +22,10 @@ module.exports = {
},
resolve: {
extensions: ['.tsx', '.ts', '.js', '.jsx'],
-
- fallback: {
- "util": require.resolve("util/")
- }
-
+
+ fallback: {
+ util: require.resolve('util/'),
+ },
},
module: {
rules: [
@@ -64,7 +62,6 @@ module.exports = {
test: /\.svg$/,
use: ['@svgr/webpack', 'url-loader'],
},
-
],
},
plugins: [
+ Enable
- Low VRAM
- 1 ? 'none' : void 0, marginRight: "10px"}} onChange={this.onGuessModeChange.bind(this)} checked={storeData.guessmode} id={`chGuessMode_${this.props.index}`}>Guess Mode
- 1 ? void 0 : 'none', marginRight: "10px"}} onChange={this.onPixelPerfectChange.bind(this)} checked={storeData.pixel_perfect} id={`chPixelPerfect_${this.props.index}`}>Pixel Perfect
- {
- this.props.appState.controlnetApiVersion > 1 &&
-
- Control Mode:
- Balanced
- Prompt
- ControlNet
-
- }
-
-
-
-
+ )
}
}
diff --git a/typescripts/controlnet/entry.ts b/typescripts/controlnet/entry.ts
index 6007ad2..db1b9fb 100644
--- a/typescripts/controlnet/entry.ts
+++ b/typescripts/controlnet/entry.ts
@@ -1,16 +1,20 @@
-import { Enum, api } from "../util/oldSystem";
-import { store, versionCompare } from "./main"
+import { Enum, api } from '../util/oldSystem'
+import { store, versionCompare } from './main'
-declare const g_sd_config_obj: any;
-declare let g_sd_url: string;
+declare const g_sd_config_obj: any
+declare let g_sd_url: string
async function requestControlNetPreprocessors() {
- const control_net_json = await api.requestGet(`${g_sd_url}/controlnet/module_list?alias_name=1`)
+ const control_net_json = await api.requestGet(
+ `${g_sd_url}/controlnet/module_list?alias_name=1`
+ )
return control_net_json
}
async function requestControlNetModelList(): Promise
+
+ Control Net Settings Slot {this.props.index}
+
+
+
+
+ ControlNet
+
+
+ )}
-
+
-
+ 
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 
-
-
-
-
-
-
-
-
- Weight:
- {storeData.weight}
-
-
- Guidance strength start:
- {storeData.guidance_start}
-
-
- Guidance strength end:
- {storeData.guidance_end}
-
- {ppSlider && ppSlider[0] && !storeData.pixel_perfect &&
- {ppSlider[0].name}:
- {storeData.processor_res.toFixed(2)}
- }
- {ppSlider && ppSlider[1] &&
- {ppSlider[1].name}:
- {storeData.threshold_a.toFixed(2)}
- }
- {ppSlider && ppSlider[2] &&
- {ppSlider[2].name}:
- {storeData.threshold_b.toFixed(2)}
- }
+
+
+
+ Weight:
+
+ {storeData.weight}
+
+
+
+
+ Guidance strength start:
+
+
+ {storeData.guidance_start}
+
+
+
+
+ Guidance strength end:
+
+
+ {storeData.guidance_end}
+
+
+ {ppSlider &&
+ ppSlider[0] &&
+ !storeData.pixel_perfect && (
+
+
+ {ppSlider[0].name}:
+
+
+ {storeData.processor_res.toFixed(2)}
+
+
+ )}
+ {ppSlider && ppSlider[1] && (
+
+
+ {ppSlider[1].name}:
+
+
+ {storeData.threshold_a.toFixed(2)}
+
+
+ )}
+ {ppSlider && ppSlider[2] && (
+
+
+ {ppSlider[2].name}:
+
+
+ {storeData.threshold_b.toFixed(2)}
+
+
+ )}
+
+
-
- {this.props.children}
-
+export class Thumbnail extends React.Component<{ children: React.ReactNode }> {
+ render() {
+ return (
+ {this.props.children}
+ )
}
}
-
-
export class ActionButtonSVG extends PhotoshopElem {
render() {
const [attr] = this.splitProps(this.props)
-
- return
- {this.props.children}
-
-
+ {this.props.children}
+
+