switch controlnet in webui

lama_cleaner/app/src/adapters/inpainting.ts

@@ -1,5 +1,5 @@
 import { PluginName } from '../components/Plugins/Plugins'
-import { Rect, Settings } from '../store/Atoms'
+import { ControlNetMethodMap, Rect, Settings } from '../store/Atoms'
 import { dataURItoBlob, loadImage, srcToFile } from '../utils'
 
 export const API_ENDPOINT = `${process.env.REACT_APP_INPAINTING_URL}`
@@ -92,6 +92,10 @@ export default async function inpaint(
     'controlnet_conditioning_scale',
     settings.controlnetConditioningScale.toString()
   )
+  fd.append(
+    'controlnet_method',
+    ControlNetMethodMap[settings.controlnetMethod.toString()]
+  )
 
   try {
     const res = await fetch(`${API_ENDPOINT}/inpaint`, {

lama_cleaner/app/src/components/SidePanel/SidePanel.tsx

@@ -3,6 +3,7 @@ import { useRecoilState, useRecoilValue } from 'recoil'
 import * as PopoverPrimitive from '@radix-ui/react-popover'
 import { useToggle } from 'react-use'
 import {
+  ControlNetMethod,
   isControlNetState,
   isInpaintingState,
   negativePropmtState,
@@ -47,6 +48,44 @@ const SidePanel = () => {
     }
   }
 
+  const renderConterNetSetting = () => {
+    return (
+      <>
+        <SettingBlock
+          className="sub-setting-block"
+          title="ControlNet"
+          input={
+            <Selector
+              width={80}
+              value={setting.controlnetMethod as string}
+              options={Object.values(ControlNetMethod)}
+              onChange={val => {
+                const method = val as ControlNetMethod
+                setSettingState(old => {
+                  return { ...old, controlnetMethod: method }
+                })
+              }}
+            />
+          }
+        />
+
+        <NumberInputSetting
+          title="ControlNet Weight"
+          width={INPUT_WIDTH}
+          allowFloat
+          value={`${setting.controlnetConditioningScale}`}
+          desc="Lowered this value if there is a big misalignment between the text prompt and the control image"
+          onValue={value => {
+            const val = value.length === 0 ? 0 : parseFloat(value)
+            setSettingState(old => {
+              return { ...old, controlnetConditioningScale: val }
+            })
+          }}
+        />
+      </>
+    )
+  }
+
   return (
     <div className="side-panel">
       <PopoverPrimitive.Root open={open}>
@@ -58,6 +97,8 @@ const SidePanel = () => {
         </PopoverPrimitive.Trigger>
         <PopoverPrimitive.Portal>
           <PopoverPrimitive.Content className="side-panel-content">
+            {isControlNet && renderConterNetSetting()}
+
             <SettingBlock
               title="Croper"
               input={
@@ -117,22 +158,6 @@ const SidePanel = () => {
               }}
             />
 
-            {isControlNet && (
-              <NumberInputSetting
-                title="ControlNet Weight"
-                width={INPUT_WIDTH}
-                allowFloat
-                value={`${setting.controlnetConditioningScale}`}
-                desc="Lowered this value if there is a big misalignment between the text prompt and the control image"
-                onValue={value => {
-                  const val = value.length === 0 ? 0 : parseFloat(value)
-                  setSettingState(old => {
-                    return { ...old, controlnetConditioningScale: val }
-                  })
-                }}
-              />
-            )}
-
             <NumberInputSetting
               title="Mask Blur"
               width={INPUT_WIDTH}

lama_cleaner/app/src/store/Atoms.tsx

@@ -440,6 +440,7 @@ export interface Settings {
 
   // ControlNet
   controlnetConditioningScale: number
+  controlnetMethod: string
 }
 
 const defaultHDSettings: ModelsHDSettings = {
@@ -546,6 +547,18 @@ export enum SDSampler {
   uni_pc = 'uni_pc',
 }
 
+export enum ControlNetMethod {
+  canny = 'canny',
+  inpaint = 'inpaint',
+  openpose = 'openpose',
+}
+
+export const ControlNetMethodMap: any = {
+  canny: 'control_v11p_sd15_canny',
+  inpaint: 'control_v11p_sd15_inpaint',
+  openpose: 'control_v11p_sd15_openpose',
+}
+
 export enum SDMode {
   text2img = 'text2img',
   img2img = 'img2img',
@@ -597,7 +610,8 @@ export const settingStateDefault: Settings = {
   p2pGuidanceScale: 7.5,
 
   // ControlNet
-  controlnetConditioningScale: 0.4,
+  controlnetConditioningScale: 1.0,
+  controlnetMethod: ControlNetMethod.canny,
 }
 
 const localStorageEffect =