composable diffusion is gone for good

as it is very different and can be easily misused.
handle them manually instead.

Author: wfjsw

README.md

@@ -14,7 +14,7 @@ https://tags.novelai.dev
  - 标签分类、释义与配图
  - 即时搜索
  - 构建标签组合并调配权重
- - 支持调配高级标签工程（[Prompt Editing](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#prompt-editing) / [Composable-Diffusion](https://github.com/AUTOMATIC1111/stable-diffusion-webui/#:~:text=Composable%2DDiffusion%2C%20a,a%20penguin%20%3A2.2) / [Alternating Words](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#alternating-words)）
+ - 支持调配高级标签工程（[Prompt Editing](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#prompt-editing) / [Alternating Words](https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#alternating-words)）
  - 导入已有标签组合并自动匹配
  - 预设（固定标签组合）整理、说明与配图
  - 嵌入模型索引与下载

src/components/CartItem.vue

@@ -22,7 +22,7 @@ import {ElButton, ElTooltip} from 'element-plus'
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome'
 import {faCircleMinus, faCirclePlus, faThumbsDown, faThumbsUp, faTrash, faBlender, faRepeat, faScaleUnbalanced, faScaleUnbalancedFlip} from '@fortawesome/pro-regular-svg-icons'
 import LiteralWeightIdentifier from './LiteralWeightIdentifier.vue'
-import {type CartChildItem, type CartItem, type CartItemSimple, useCartStore, CartItemCompositionChild} from '../stores/cart'
+import {type CartChildItem, type CartItem, type CartItemSimple, useCartStore} from '../stores/cart'
 import {useSettingsStore} from '../stores/settings'
 import type Node from 'element-plus/es/components/tree/src/model/node'
 import {toRefs, inject, computed} from 'vue'
@@ -68,7 +68,7 @@ function deleteFrom(direction: 'positive' | 'negative', item: CartItem|CartChild
 
 function adjustLiteralWeight(delta: number) {
     if (data.value.type !== 'null') {
-        if (settingsStore.useFixedMultiplier || data.value.parent?.type === 'composition') {
+        if (settingsStore.useFixedMultiplier) {
             data.value.weight = data.value.weight.add(0.05 * delta)
         } else {
             data.value.weight = data.value.weight.times(Math.pow(settingsStore.newEmphasis ? 1.1 : 1.05, delta))
@@ -125,10 +125,9 @@ const editingChildWeight = computed<Decimal>({
     <div class="flex">
         <div class="tag-label">
             <span class="tag-label-text" @dblclick.stop="performSearch">{{ node.label }}</span>
-            <LiteralWeightIdentifier v-if="data.type !== 'null' && data.parent?.type !== 'composition'" v-model:weight="data.weight"
+            <LiteralWeightIdentifier v-if="data.type !== 'null'" v-model:weight="data.weight"
                                      class="weight-identifier" />
             <PercentageWeightIdentifier v-if="data.parent?.type === 'editing'" v-model:weight="editingChildWeight" class="weight-identifier" />
-            <PercentageWeightIdentifier v-if="data.parent?.type === 'composition'" v-model:weight="(data as CartItemCompositionChild).weight" class="weight-identifier" />
         </div>
         <div class="tag-button">
             <ElTooltip v-if="['tag', 'embedding'].includes(data.type)"
@@ -140,11 +139,10 @@ const editingChildWeight = computed<Decimal>({
                 </ElButton>
             </ElTooltip>
 
-            <ElTooltip v-if="(data.type === 'editing' || data.type === 'alternate' || data.type === 'composition' || data.type === 'group')
-                && data.parent?.type !== 'composition' && cartStore.isMixtureSwitchable(data)" content="切换混合方式" :show-after="750">
+            <ElTooltip v-if="(data.type === 'editing' || data.type === 'alternate' || data.type === 'group')
+                && cartStore.isMixtureSwitchable(data)" content="切换混合方式" :show-after="750">
                 <ElButton link type="primary"
-                    @click.stop="(data.type === 'editing' || data.type === 'alternate' || data.type === 'composition' || data.type === 'group')
-                    && data.parent?.type !== 'composition'
+                    @click.stop="(data.type === 'editing' || data.type === 'alternate' || data.type === 'group')
                     && cartStore.switchMixtureType(direction, data)">
                     <FontAwesomeIcon :icon="faRepeat" />
                 </ElButton>

src/components/CartTree.vue

@@ -21,7 +21,7 @@
 import {ElTree} from 'element-plus'
 import type Node from 'element-plus/es/components/tree/src/model/node'
 import type {AllowDropType, NodeDropType} from 'element-plus/es/components/tree/src/tree.type'
-import {type CartItemEditingChild, type CartItemPresetChild, type CartItemSimple, type CartItemComplex, type CartItemComposition, type CartItemEditing, type CartItem, type CartChildItem, useCartStore, CartItemAlternate, CartItemCompositionChild} from '../stores/cart'
+import {type CartItemEditingChild, type CartItemPresetChild, type CartItemSimple, type CartItemComplex, type CartItemEditing, type CartItem, type CartChildItem, useCartStore, type CartItemAlternate} from '../stores/cart'
 import CartItemComponent from './CartItem.vue'
 
 const props = defineProps<{
@@ -70,7 +70,6 @@ function allowDrop(draggingNode: Node, dropNode: Node, type: AllowDropType) {
  * 6. 出：mixture拖干净，需要删掉mixture
  * 7. 入：有simple标签拖进free的simple标签，创建editing
  * 8. ~~出：alternate和editing移出，需要补一个weight~~ - 这个weight现在不丢了 所以不需要补
- * 9. 入：拖入 composite的非group应当套一层group
  *
  * 最后需要把parent改了，标签类型修正了
  *
@@ -101,15 +100,14 @@ function dropPostProcess(draggingNode: Node, dropNode: Node, type: NodeDropType)
                 })
             }
         }
-    } else if (draggingNode.data.parent?.type === 'composite'
-        || draggingNode.data.parent?.type === 'alternate'
+    } else if (draggingNode.data.parent?.type === 'alternate'
         || draggingNode.data.parent?.type === 'group') {
         // 6. 出：mixture拖干净，需要删掉mixture
         if (draggingNode.data.parent.children.length === 0) {
             cartStore.removeCartItem(props.direction, draggingNode.data.parent)
         } else if (draggingNode.data.parent?.type !== 'group' && draggingNode.data.parent.children.length === 1) {
             // 除 group 以外剩下一个就解散
-            cartStore.dismissCartItem(props.direction, draggingNode.data.parent as CartItemComposition | CartItemAlternate)
+            cartStore.dismissCartItem(props.direction, draggingNode.data.parent as CartItemAlternate)
             skipReParent = true
         }
     }
@@ -131,14 +129,6 @@ function dropPostProcess(draggingNode: Node, dropNode: Node, type: NodeDropType)
         const dropCartItem = dropNode.data as CartItemSimple
         // 7. 入：有simple标签拖进free的simple标签，创建editing
         cartStore.createMixtureFromTag(props.direction, dropCartItem)
-    } else if (dropNode.data.type === 'composition' && type === 'inner') {
-        const draggingCartItem = draggingNode.data as CartItemCompositionChild
-        const dropCartItem = dropNode.data as CartItemComposition
-        // 9. 入：拖入 composite的非group应当套一层group
-        draggingCartItem.parent = dropCartItem
-        if (draggingCartItem.type !== 'group') {
-            cartStore.wrapCompositionChild(draggingCartItem)
-        }
     } else if (dropNode.data.parent?.type === 'editing' && type !== 'inner') {
         const dropCartItem = dropNode.data as CartItemEditingChild
         if (dropCartItem.parent.children.length > 2) {
@@ -151,16 +141,7 @@ function dropPostProcess(draggingNode: Node, dropNode: Node, type: NodeDropType)
                 cartStore.switchMixtureType(props.direction, dropCartItem.parent, 'alternate')
             }
         }
-    } else if (dropNode.data.parent?.type === 'composition' && type !== 'inner') {
-        const draggingCartItem = draggingNode.data as CartItemCompositionChild
-        const dropCartItem = dropNode.data as CartItemCompositionChild
-        // 9. 入：拖入 composite的非group应当套一层group
-        draggingCartItem.parent = dropCartItem.parent
-        if (draggingCartItem.type !== 'group') {
-            cartStore.wrapCompositionChild(draggingCartItem)
-            skipReParent = true
-        }
-    }
+    } 
 
     if (!skipReParent) {
         if (type === 'before' || type === 'after') {