DemonGatanjieuandClaude Opus 5.5
f5a3b5f9ff
Current node showed "negative prompt" only on values from a workflow. A material's blocks carried no role, and when a picture and a workflow held the same text the merged card kept the picture's empty one, so a negative prompt could be offered to a positive box with nothing to say so. - api/materials.py works the role out by what the prompt was wired to, as the material details already do; it reads the stored workflow, so pictures kept earlier get it too. - node_parameter_sets.js takes the role from whichever source knows it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
110 lines
7.6 KiB
Python
110 lines
7.6 KiB
Python
import json
|
|
from pathlib import Path
|
|
import sys
|
|
import tempfile
|
|
from types import SimpleNamespace
|
|
import unittest
|
|
from unittest import mock
|
|
|
|
from PIL import Image
|
|
|
|
PLUGIN = Path(__file__).resolve().parents[1]
|
|
sys.path[:0] = [str(PLUGIN), str(PLUGIN.parents[1])]
|
|
from api import materials
|
|
|
|
|
|
class MaterialBrowsingTests(unittest.TestCase):
|
|
def test_filters_pagination_and_tag_edit_preserve_workflow(self):
|
|
with tempfile.TemporaryDirectory() as directory:
|
|
workflow = {'nodes': [{'id': 1, 'type': 'KSampler', 'widgets_values': [123]}]}
|
|
for i in range(55):
|
|
Path(directory, f'{i}.json').write_text(json.dumps({'name': f'Material {i}', 'workflow': workflow, 'kind': 'image_workflow_snapshot', 'tags': ['Portrait'] if i % 2 else ['景色'], 'timestamp': i}))
|
|
first = materials._query_materials(directory, {'category': 'workflow', 'page': '1'})
|
|
second = materials._query_materials(directory, {'category': 'workflow', 'page': '2'})
|
|
self.assertEqual((len(first['materials']), len(second['materials']), first['total']), (48, 7, 55))
|
|
self.assertFalse({m['filename'] for m in first['materials']} & {m['filename'] for m in second['materials']})
|
|
self.assertEqual(materials._query_materials(directory, {'category': 'workflow', 'tag': 'portrait'})['total'], 27)
|
|
# Whole workflows are recipes now: "all" (the pieces) does not list them.
|
|
self.assertEqual(materials._query_materials(directory, {})['total'], 0)
|
|
self.assertEqual(materials._query_materials(directory, {'category': 'workflow', 'q': 'ksampler'})['total'], 55)
|
|
self.assertEqual(materials._query_materials(directory, {'kind': 'image_node_selection'})['total'], 0)
|
|
materials._update_material_details(directory, '0.json', 'Renamed', ['new'])
|
|
self.assertEqual(materials._query_materials(directory, {'category': 'workflow', 'q': 'renamed', 'tag': 'new'})['total'], 1)
|
|
self.assertEqual(json.loads(Path(directory, '0.json').read_text())['workflow'], workflow)
|
|
# One moved to the recipes is not listed again; its file stays whole.
|
|
materials._store._mark_material_moved(directory, '0.json', 'recipe_1.json')
|
|
self.assertEqual(materials._query_materials(directory, {'category': 'workflow'})['total'], 54)
|
|
self.assertEqual(json.loads(Path(directory, '0.json').read_text())['workflow'], workflow)
|
|
|
|
def test_duplicate_warning_uses_image_and_selected_scope(self):
|
|
with tempfile.TemporaryDirectory() as directory:
|
|
source = Path(directory, 'image.png'); Image.new('RGB', (8, 8)).save(source)
|
|
store = Path(directory, 'library'); store.mkdir()
|
|
record = {'name': 'one', 'kind': 'image_node_selection', 'workflow': {'nodes': [{'id': 1, 'type': 'KSampler'}, {'id': 2, 'type': 'CLIPTextEncode'}]}, 'selection': {'node_ids': ['1', '2']}}
|
|
self.assertIsNone(materials._persist_material(str(store), 'one.json', str(source), record))
|
|
record['selection']['node_ids'].reverse()
|
|
duplicate = materials._persist_material(str(store), 'two.json', str(source), record)
|
|
self.assertEqual(duplicate['filename'], 'one.json')
|
|
self.assertFalse((store/'two.json').exists())
|
|
self.assertFalse((store/'.assets/two').exists())
|
|
self.assertIsNone(materials._persist_material(str(store), 'two.json', str(source), record, allow_duplicate=True))
|
|
record['selection']['node_ids'] = ['1']
|
|
self.assertIsNone(materials._persist_material(str(store), 'three.json', str(source), record))
|
|
|
|
def test_tags_are_bounded_and_case_insensitive_duplicates_removed(self):
|
|
self.assertEqual(materials._normalise_material_tags([' Portrait ', 'portrait', '景色']), ['Portrait', '景色'])
|
|
for tags in ('bad', ['x' * 61], ['x'] * 21, [123]):
|
|
with self.assertRaises(ValueError):
|
|
materials._normalise_material_tags(tags)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|
|
|
|
|
|
class MaterialsByNodeTypeTests(unittest.IsolatedAsyncioTestCase):
|
|
async def test_moved_workflow_is_not_offered_again(self):
|
|
with tempfile.TemporaryDirectory() as directory:
|
|
workflow = {'nodes': [{'id': 1, 'type': 'KSampler', 'widgets_values': [123, 'fixed', 20]}]}
|
|
for name in ('kept', 'moved'):
|
|
Path(directory, f'{name}.json').write_text(json.dumps({'name': name, 'workflow': workflow, 'kind': 'image_workflow_snapshot'}))
|
|
materials._store._mark_material_moved(directory, 'moved.json', 'recipe_1.json')
|
|
with mock.patch.object(materials, 'get_materials_dir', lambda: directory):
|
|
response = await materials.api_get_materials_by_node_type(SimpleNamespace(query={'type': 'KSampler'}))
|
|
self.assertEqual([item['name'] for item in json.loads(response.text)['materials']], ['kept'])
|
|
|
|
async def test_a_prompt_says_its_role_by_what_it_is_wired_to(self):
|
|
with tempfile.TemporaryDirectory() as directory:
|
|
workflow = {
|
|
'nodes': [
|
|
{'id': 1, 'type': 'CLIPTextEncode', 'widgets_values': ['a quiet lake']},
|
|
{'id': 2, 'type': 'CLIPTextEncode', 'widgets_values': ['low quality']},
|
|
{'id': 3, 'type': 'CLIPTextEncode', 'widgets_values': ['not wired']},
|
|
{'id': 4, 'type': 'KSampler', 'inputs': [{'name': 'positive', 'link': 1}, {'name': 'negative', 'link': 2}], 'widgets_values': [1]},
|
|
],
|
|
'links': [[1, 1, 0, 4, 1, 'CONDITIONING'], [2, 2, 0, 4, 2, 'CONDITIONING']],
|
|
}
|
|
Path(directory, 'kept.json').write_text(json.dumps({'name': 'kept', 'workflow': workflow, 'kind': 'image_node_selection'}))
|
|
with mock.patch.object(materials, 'get_materials_dir', lambda: directory):
|
|
response = await materials.api_get_materials_by_node_type(SimpleNamespace(query={'type': 'CLIPTextEncode'}))
|
|
blocks = json.loads(response.text)['materials'][0]['blocks']
|
|
self.assertEqual({block['node_id']: block['role'] for block in blocks}, {1: 'positive', 2: 'negative', 3: 'unknown'})
|
|
|
|
async def test_each_says_where_its_values_came_from(self):
|
|
with tempfile.TemporaryDirectory() as directory:
|
|
workflow = {'nodes': [{'id': 1, 'type': 'KSampler', 'widgets_values': [123, 'fixed', 20]}]}
|
|
Path(directory, 'kept.json').write_text(json.dumps({
|
|
'name': 'kept', 'workflow': workflow, 'kind': 'image_node_selection',
|
|
'source': {'type': 'generated_image', 'image': {'filename': 'ComfyUI_00001_.png', 'subfolder': 'day', 'type': 'output'}},
|
|
'image': {'preview_asset_id': 'preview-1.webp'}}))
|
|
Path(directory, 'here.json').write_text(json.dumps({
|
|
'name': 'here', 'workflow': workflow, 'kind': 'node_parameter_selection',
|
|
'source': {'type': 'canvas_node'}, 'image': {'preview_asset_id': '../escape.txt'}}))
|
|
with mock.patch.object(materials, 'get_materials_dir', lambda: directory):
|
|
response = await materials.api_get_materials_by_node_type(SimpleNamespace(query={'type': 'KSampler'}))
|
|
found = {item['name']: item for item in json.loads(response.text)['materials']}
|
|
self.assertEqual((found['kept']['origin'], found['kept']['source_image'], found['kept']['preview']),
|
|
('generated_image', {'filename': 'ComfyUI_00001_.png', 'subfolder': 'day'}, 'preview-1.webp'))
|
|
self.assertEqual((found['here']['origin'], found['here']['source_image'], found['here']['preview']), ('canvas_node', None, ''))
|
|
|