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

More rebase repair.

Browse Source
This commit is contained in:
user1 2023-05-06 23:55:56 -07:00 committed by Kent Keirsey
parent 5d5cdc7716
commit 78b0b37ba6
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
invokeai/frontend/web/src/common/util/parseMetadata.ts
View File

@ -108,12 +108,7 @@ const parseControlField = (controlField: unknown): ControlField | undefined => {
if (!('control' in controlField)) { if (!('control' in controlField)) {
return; return;
} }
console.log(typeof controlField.control); // console.log(typeof controlField.control);
// A ControlField's `controlnets` must be a array
// TODO: check type - array of tuples
//if (Array.isArray(controlField.control)) {
//return;
// }
// Build a valid ControlField // Build a valid ControlField
return { return {

18
invokeai/frontend/web/src/features/nodes/components/InputFieldComponent.tsx
View File

@ -7,12 +7,7 @@ import EnumInputFieldComponent from './fields/EnumInputFieldComponent';
import ImageInputFieldComponent from './fields/ImageInputFieldComponent'; import ImageInputFieldComponent from './fields/ImageInputFieldComponent';
import LatentsInputFieldComponent from './fields/LatentsInputFieldComponent'; import LatentsInputFieldComponent from './fields/LatentsInputFieldComponent';
import ConditioningInputFieldComponent from './fields/ConditioningInputFieldComponent'; import ConditioningInputFieldComponent from './fields/ConditioningInputFieldComponent';
<<<<<<< HEAD
=======
import ControlNetInputFieldComponent from './fields/ControlNetInputFieldComponent';
import ControlInputFieldComponent from './fields/ControlInputFieldComponent'; import ControlInputFieldComponent from './fields/ControlInputFieldComponent';
>>>>>>> 5b9fa636 (Refactored controlnet node to output ControlField that bundles control info.)
import ModelInputFieldComponent from './fields/ModelInputFieldComponent'; import ModelInputFieldComponent from './fields/ModelInputFieldComponent';
import NumberInputFieldComponent from './fields/NumberInputFieldComponent'; import NumberInputFieldComponent from './fields/NumberInputFieldComponent';
import StringInputFieldComponent from './fields/StringInputFieldComponent'; import StringInputFieldComponent from './fields/StringInputFieldComponent';
@ -103,18 +98,6 @@ const InputFieldComponent = (props: InputFieldComponentProps) => {
); );
} }
<<<<<<< HEAD
=======
if (type === 'controlnet' && template.type === 'controlnet') {
return (
<ControlNetInputFieldComponent
nodeId={nodeId}
field={field}
template={template}
/>
);
}
if (type === 'control' && template.type === 'control') { if (type === 'control' && template.type === 'control') {
return ( return (
<ControlInputFieldComponent <ControlInputFieldComponent
@ -125,7 +108,6 @@ const InputFieldComponent = (props: InputFieldComponentProps) => {
); );
} }
>>>>>>> 5b9fa636 (Refactored controlnet node to output ControlField that bundles control info.)
if (type === 'model' && template.type === 'model') { if (type === 'model' && template.type === 'model') {
return ( return (
<ModelInputFieldComponent <ModelInputFieldComponent