mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-08-13 17:23:22 -03:00
Compare commits
29 Commits
7f51812c1e
...
v1.1.9
| Author | SHA1 | Date | |
|---|---|---|---|
| ce8a95abf7 | |||
| c8e7e543d6 | |||
| a9dbb15ffa | |||
| cf64043f7d | |||
| ccaff92c18 | |||
| 585b5c922a | |||
| ea80c2224c | |||
| 8b0f56c1a6 | |||
| 8022d12f03 | |||
| 3939f7f91b | |||
| aebf2e37dd | |||
| f53f859a71 | |||
| d916375abe | |||
| 57983df4bd | |||
| c68d7559a0 | |||
| 9a8f5bf2d6 | |||
| a8d742b031 | |||
| c27e4d1bfc | |||
| d15a8aa9a2 | |||
| 74a7d12ca4 | |||
| 2f94a9773e | |||
| 37bdfa21ea | |||
| f0bf2728c9 | |||
| dc715aa273 | |||
| 7ee2361e87 | |||
| e04c22f83f | |||
| 681cc13e90 | |||
| 090e0297d4 | |||
| 6f71335be4 |
@@ -102,6 +102,7 @@ npm run test:coverage # Generate coverage report
|
||||
- ComfyUI: `app.registerExtension()`, `node.addDOMWidget(name, type, element, options)`
|
||||
- Event handlers via `addEventListener` or widget callbacks
|
||||
- Shared utilities: `web/comfyui/utils.js`
|
||||
- Dual-mode rendering patterns (canvas vs Vue): see `docs/comfyui-dual-mode-widgets.md`
|
||||
|
||||
### Vue Composables Pattern
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@ try: # pragma: no cover - import fallback for pytest collection
|
||||
from .py.nodes.lora_cycler import LoraCyclerLM
|
||||
from .py.nodes.lora_info import LoraInfoLM
|
||||
from .py.nodes.lora_syntax_to_path import LoraSyntaxToPath
|
||||
from .py.nodes.create_hook_lora import CreateHookLoraLM
|
||||
from .py.metadata_collector import init as init_metadata_collector
|
||||
except (
|
||||
ImportError
|
||||
@@ -62,6 +63,9 @@ except (
|
||||
LoraSyntaxToPath = importlib.import_module(
|
||||
"py.nodes.lora_syntax_to_path"
|
||||
).LoraSyntaxToPath
|
||||
CreateHookLoraLM = importlib.import_module(
|
||||
"py.nodes.create_hook_lora"
|
||||
).CreateHookLoraLM
|
||||
init_metadata_collector = importlib.import_module("py.metadata_collector").init
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
@@ -83,6 +87,7 @@ NODE_CLASS_MAPPINGS = {
|
||||
LoraCyclerLM.NAME: LoraCyclerLM,
|
||||
LoraInfoLM.NAME: LoraInfoLM,
|
||||
LoraSyntaxToPath.NAME: LoraSyntaxToPath,
|
||||
CreateHookLoraLM.NAME: CreateHookLoraLM,
|
||||
}
|
||||
|
||||
WEB_DIRECTORY = "./web/comfyui"
|
||||
|
||||
+138
-125
@@ -10,13 +10,17 @@
|
||||
"Brennok",
|
||||
"2018cfh",
|
||||
"Insomnia Art Designs",
|
||||
"Rob Williams",
|
||||
"Arlecchino Shion",
|
||||
"Charles Blakemore",
|
||||
"Rob Williams",
|
||||
"$MetaSamsara",
|
||||
"W+K+White",
|
||||
"stone9k",
|
||||
"Rosenthal",
|
||||
"Francisco Tatis",
|
||||
"Mozzel",
|
||||
"Gingko Biloba",
|
||||
"Birdy",
|
||||
"Kiba",
|
||||
"onesecondinosaur",
|
||||
"Christian Byrne",
|
||||
@@ -27,22 +31,25 @@
|
||||
"Phil",
|
||||
"Carl G.",
|
||||
"Dsperado",
|
||||
"Rosenthal",
|
||||
"ClockDaemon",
|
||||
"Francisco Tatis",
|
||||
"Tobi_Swagg",
|
||||
"SG",
|
||||
"jmack",
|
||||
"Andrew Wilson",
|
||||
"Greybush",
|
||||
"Ricky Carter",
|
||||
"JongWon Han",
|
||||
"VantAI",
|
||||
"レプサイ",
|
||||
"Michael Wong",
|
||||
"Illrigger",
|
||||
"Tom Corrigan",
|
||||
"JackieWang",
|
||||
"FreelancerZ",
|
||||
"fnkylove",
|
||||
"Lilleman",
|
||||
"Robert Stacey",
|
||||
"PM",
|
||||
"Edgar Tejeda",
|
||||
"Liam MacDougal",
|
||||
"Polymorphic Indeterminate",
|
||||
@@ -50,9 +57,7 @@
|
||||
"Dogwalkerbr",
|
||||
"Skalabananen",
|
||||
"Marc Whiffen",
|
||||
"Birdy",
|
||||
"itismyelement",
|
||||
"Mozzel",
|
||||
"quarz",
|
||||
"Reno Lam",
|
||||
"jean jahren",
|
||||
@@ -65,40 +70,46 @@
|
||||
"Jonathan Ross",
|
||||
"KD",
|
||||
"Omnidex",
|
||||
"Nazono_hito",
|
||||
"Nolife_M",
|
||||
"Melville Parrish",
|
||||
"daniel dove",
|
||||
"Lustre",
|
||||
"Tyler Trebuchon",
|
||||
"Release Cabrakan",
|
||||
"JW Sin",
|
||||
"Alex",
|
||||
"SG",
|
||||
"bh",
|
||||
"carozzz",
|
||||
"Marlon Daniels",
|
||||
"James Dooley",
|
||||
"zenbound",
|
||||
"Buzzard",
|
||||
"jmack",
|
||||
"Aaron Bleuer",
|
||||
"LacesOut!",
|
||||
"Adam Shaw",
|
||||
"Mark Corneglio",
|
||||
"SarcasticHashtag",
|
||||
"RedrockVP",
|
||||
"James Todd",
|
||||
"Wicked Choices by ASLPro3D",
|
||||
"FinalyFree",
|
||||
"Weasyl",
|
||||
"Steven Pfeiffer",
|
||||
"レプサイ",
|
||||
"Timmy",
|
||||
"Johnny",
|
||||
"Cory Paza",
|
||||
"Tak",
|
||||
"Lisster",
|
||||
"runte3221",
|
||||
"Big Red",
|
||||
"whudunit",
|
||||
"Luc Job",
|
||||
"dl0901dm",
|
||||
"corde",
|
||||
"Yushio",
|
||||
"Vik71it",
|
||||
"Bishoujoker",
|
||||
"Echo",
|
||||
"Lilleman",
|
||||
"PM",
|
||||
"Todd Keck",
|
||||
"Briton Heilbrun",
|
||||
"wildnut",
|
||||
@@ -108,53 +119,51 @@
|
||||
"BadassArabianMofo",
|
||||
"Pascal Dahle",
|
||||
"Greg",
|
||||
"Sangheili460",
|
||||
"MagnaInsomnia",
|
||||
"Akira_HentAI",
|
||||
"Karl P.",
|
||||
"MiraiKuriyamaSy",
|
||||
"otaku fra",
|
||||
"lmsupporter",
|
||||
"andrew.tappan",
|
||||
"Takkan",
|
||||
"N/A",
|
||||
"Greenmoustache",
|
||||
"zounic",
|
||||
"wfpearl",
|
||||
"ElitaSSJ4",
|
||||
"Matt+J",
|
||||
"Jack B Nimble",
|
||||
"Melville Parrish",
|
||||
"Lustre",
|
||||
"bh",
|
||||
"Jwk0205",
|
||||
"Marlon Daniels",
|
||||
"Starkselle",
|
||||
"Aaron Bleuer",
|
||||
"LacesOut!",
|
||||
"Olive",
|
||||
"greebles",
|
||||
"Some Guy Named Barry",
|
||||
"Resist's Creations - Spicy Edition 🔥",
|
||||
"M Postkasse",
|
||||
"Wolffen",
|
||||
"wamekukyouzin",
|
||||
"drum matthieu",
|
||||
"Jacob Hoehler",
|
||||
"FinalyFree",
|
||||
"DogmaR34",
|
||||
"Matt Wenzel",
|
||||
"Weasyl",
|
||||
"Lex Song",
|
||||
"Cory Paza",
|
||||
"Christopher Michel",
|
||||
"Gonzalo Andre Allendes Lopez",
|
||||
"Serge Bekenkamp",
|
||||
"Jimmy Ledbetter",
|
||||
"Luc Job",
|
||||
"LeoZero",
|
||||
"Philip Hempel",
|
||||
"corde",
|
||||
"nwalker94",
|
||||
"dan",
|
||||
"aai",
|
||||
"Tori",
|
||||
"Mouthlessman",
|
||||
"Ran C",
|
||||
"ViperC",
|
||||
"Sangheili460",
|
||||
"MagnaInsomnia",
|
||||
"Akira_HentAI",
|
||||
"Karl P.",
|
||||
"Adam Taylor",
|
||||
"Weird_With_A_Beard",
|
||||
"N/A",
|
||||
"The Spawn",
|
||||
"graysock",
|
||||
"Pozadine1",
|
||||
@@ -162,7 +171,8 @@
|
||||
"AIGooner",
|
||||
"Luc",
|
||||
"ProtonPrince",
|
||||
"Greenmoustache",
|
||||
"DiffDuck",
|
||||
"elu3199",
|
||||
"fancypants",
|
||||
"John+Edwards",
|
||||
"Joboshy",
|
||||
@@ -172,42 +182,39 @@
|
||||
"contrite831",
|
||||
"Dan",
|
||||
"Bro Xie",
|
||||
"yer fey",
|
||||
"batblue",
|
||||
"carey6409",
|
||||
"Olive",
|
||||
"太郎 ゲーム",
|
||||
"Roslynd",
|
||||
"jinxedx",
|
||||
"Neco28",
|
||||
"David Ortega",
|
||||
"AELOX",
|
||||
"Gooohokrbe",
|
||||
"Dankin-Pics",
|
||||
"Nicfit23",
|
||||
"Cristian Vazquez",
|
||||
"wamekukyouzin",
|
||||
"OldBones",
|
||||
"drum matthieu",
|
||||
"Dogmaster",
|
||||
"Frank Nitty",
|
||||
"Magic Noob",
|
||||
"Christopher Michel",
|
||||
"Zach Gonser",
|
||||
"Serge Bekenkamp",
|
||||
"DougPeterson",
|
||||
"LeoZero",
|
||||
"Antonio Pontes",
|
||||
"nahinahi9",
|
||||
"Bruce",
|
||||
"kushiroK9",
|
||||
"Kevin John Duck",
|
||||
"Dustin Chen",
|
||||
"Kevin Christopher",
|
||||
"Blackfish95",
|
||||
"Mouthlessman",
|
||||
"Paul Kroll",
|
||||
"Penfore",
|
||||
"Bas Imagineer",
|
||||
"John Statham",
|
||||
"Gordon Cole",
|
||||
"AbstractAss",
|
||||
"Dušan Ryban",
|
||||
"decoy",
|
||||
"DiffDuck",
|
||||
"elu3199",
|
||||
"Hasturkun",
|
||||
"Jon Sandman",
|
||||
"Ubivis",
|
||||
@@ -222,34 +229,34 @@
|
||||
"MJG",
|
||||
"David LaVallee",
|
||||
"linnfrey",
|
||||
"ae",
|
||||
"Tr4shP4nda",
|
||||
"Jackthemind",
|
||||
"griffin+dahlberg",
|
||||
"jeaness",
|
||||
"takyamtom",
|
||||
"Brian M",
|
||||
"Josef Lanzl",
|
||||
"Nerezza",
|
||||
"yer fey",
|
||||
"sanborondon",
|
||||
"Error_Rule34_Not_found",
|
||||
"aezin",
|
||||
"jcay015",
|
||||
"Erik Lopez",
|
||||
"Roslynd",
|
||||
"Mateo Curić",
|
||||
"Geolog",
|
||||
"Neco28",
|
||||
"Cosmosis",
|
||||
"Eris3D",
|
||||
"David Ortega",
|
||||
"m",
|
||||
"FloPro4Sho",
|
||||
"Jamie Ogletree",
|
||||
"a _",
|
||||
"Jeff",
|
||||
"Bruce",
|
||||
"Steven Owens",
|
||||
"James Coleman",
|
||||
"Kevin Christopher",
|
||||
"Chad Idk",
|
||||
"dd",
|
||||
"John Statham",
|
||||
"Sam",
|
||||
"sjon kreutz",
|
||||
"yuxz69",
|
||||
"LarsesFPC",
|
||||
@@ -257,8 +264,6 @@
|
||||
"esthe",
|
||||
"AlexDuKaNa",
|
||||
"地獄の禄",
|
||||
"ae",
|
||||
"Tr4shP4nda",
|
||||
"Gamalonia",
|
||||
"capn",
|
||||
"Joseph",
|
||||
@@ -272,12 +277,16 @@
|
||||
"Hailshem",
|
||||
"Naomi Hale Danchi",
|
||||
"epicgamer0020690",
|
||||
"Joshua Porrata",
|
||||
"SuBu",
|
||||
"RedPIXel",
|
||||
"Wind",
|
||||
"IamAyam",
|
||||
"Andrew",
|
||||
"Brian M",
|
||||
"Robert Wegemund",
|
||||
"sanborondon",
|
||||
"confiscated Zyra",
|
||||
"Littlehuggy",
|
||||
"Andrew Marshall",
|
||||
"Brian Buie",
|
||||
"Taylor Funk",
|
||||
"Thought2Form",
|
||||
"Gerald Welly",
|
||||
@@ -285,15 +294,19 @@
|
||||
"Sadlip",
|
||||
"Tee Gee",
|
||||
"tarek helmi",
|
||||
"Joey Callahan",
|
||||
"Max Marklund",
|
||||
"m",
|
||||
"Mike Simone",
|
||||
"Pierce McBride",
|
||||
"Joshua Gray",
|
||||
"Pronredn",
|
||||
"Mikko Hemilä",
|
||||
"Jamie Ogletree",
|
||||
"Jacob McDaniel",
|
||||
"X",
|
||||
"Temikus",
|
||||
"Artokun",
|
||||
"Michael Taylor",
|
||||
"Derek Baker",
|
||||
"lh qwe",
|
||||
"Martial",
|
||||
"conner",
|
||||
@@ -305,24 +318,21 @@
|
||||
"Decx _",
|
||||
"Yuji Kaneko",
|
||||
"Rops Alot",
|
||||
"Sam",
|
||||
"Ace Ventura",
|
||||
"四糸凜音",
|
||||
"Xeeosat",
|
||||
"Douglas Gaspar",
|
||||
"Saya",
|
||||
"George",
|
||||
"dw",
|
||||
"FrxzenSnxw",
|
||||
"WRL_SPR",
|
||||
"momokai",
|
||||
"몽타주",
|
||||
"kudari",
|
||||
"ken",
|
||||
"Crocket",
|
||||
"Joshua Porrata",
|
||||
"keemun",
|
||||
"SuBu",
|
||||
"RedPIXel",
|
||||
"Wind",
|
||||
"Nexus",
|
||||
"Ramneek“Guy”Ashok",
|
||||
"squid_actually",
|
||||
@@ -337,37 +347,36 @@
|
||||
"KitKatM",
|
||||
"socrasteeze",
|
||||
"OrganicArtifact",
|
||||
"ResidentDeviant",
|
||||
"MudkipMedkitz",
|
||||
"deanbrian",
|
||||
"Alex Wortman",
|
||||
"Cody",
|
||||
"emadsultan",
|
||||
"InformedViewz",
|
||||
"CHKeeho80",
|
||||
"Bubbafett",
|
||||
"leaf",
|
||||
"Adam Rinehart",
|
||||
"Pitpe11",
|
||||
"TheD1rtyD03",
|
||||
"gzmzmvp",
|
||||
"Richard",
|
||||
"奚明 刘",
|
||||
"Littlehuggy",
|
||||
"Aberr",
|
||||
"Gregory Kozhemiak",
|
||||
"준희 김",
|
||||
"Brian Buie",
|
||||
"Eric Whitney",
|
||||
"Joey Callahan",
|
||||
"Ivan Tadic",
|
||||
"Tomohiro Baba",
|
||||
"Mike Simone",
|
||||
"Noora",
|
||||
"John J Linehan",
|
||||
"Mattssn",
|
||||
"Elliot E",
|
||||
"Morgandel",
|
||||
"Theerat Jiramate",
|
||||
"Noah",
|
||||
"Jacob McDaniel",
|
||||
"X",
|
||||
"Sloan Steddy",
|
||||
"Artokun",
|
||||
"hexxish",
|
||||
"Derek Baker",
|
||||
"Steam Steam",
|
||||
"NICHOLAS BAXLEY",
|
||||
"CryptoTraderJK",
|
||||
@@ -378,23 +387,14 @@
|
||||
"Fotek Design",
|
||||
"Nihongasuki",
|
||||
"MadSpin",
|
||||
"FrxzenSnxw",
|
||||
"inbijiburu",
|
||||
"Nick “Loadstone” D",
|
||||
"starbugx",
|
||||
"dc7431",
|
||||
"ResidentDeviant",
|
||||
"Ginnie",
|
||||
"Raku",
|
||||
"InformedViewz",
|
||||
"CHKeeho80",
|
||||
"Bubbafett",
|
||||
"leaf",
|
||||
"Vir",
|
||||
"Skyfire83",
|
||||
"Adam Rinehart",
|
||||
"Pitpe11",
|
||||
"TheD1rtyD03",
|
||||
"moonpetal",
|
||||
"g9p0o",
|
||||
"Pkrsky",
|
||||
@@ -403,6 +403,8 @@
|
||||
"SpringBootisTrash",
|
||||
"carsten",
|
||||
"ikok",
|
||||
"quantenmecha",
|
||||
"Jason+Nash",
|
||||
"DarkRoast",
|
||||
"Nasty+Hobbit",
|
||||
"letzte",
|
||||
@@ -414,12 +416,15 @@
|
||||
"David Schenck",
|
||||
"Wolfe7D1",
|
||||
"Draven T",
|
||||
"Time Valentine",
|
||||
"elleshar666",
|
||||
"ACTUALLY_the_Real_Willem_Dafoe",
|
||||
"Михал Михалыч",
|
||||
"Matt",
|
||||
"Aquatic Coffee",
|
||||
"Kauffy",
|
||||
"ethanfel",
|
||||
"SPJ",
|
||||
"Focuschannel",
|
||||
"Edward Kennedy",
|
||||
"Nick Kage",
|
||||
@@ -432,12 +437,13 @@
|
||||
"notedfakes",
|
||||
"Michael Scott",
|
||||
"Pat Hen",
|
||||
"Saya",
|
||||
"Solixer",
|
||||
"Jordan Shaw",
|
||||
"Wes Sims",
|
||||
"Donor4115",
|
||||
"g unit",
|
||||
"Jimmy Borup",
|
||||
"Manu Thetug",
|
||||
"Filippo Ferrari",
|
||||
"JC",
|
||||
"Prompt Pirate",
|
||||
@@ -451,6 +457,11 @@
|
||||
"SomeDude",
|
||||
"nanana",
|
||||
"raf8osz",
|
||||
"Bob+Barker",
|
||||
"D",
|
||||
"Dark_Pest",
|
||||
"Eldithor",
|
||||
"Alex",
|
||||
"Karru",
|
||||
"ChaChanoKo",
|
||||
"redcarrot",
|
||||
@@ -467,36 +478,34 @@
|
||||
"Doug+Rintoul",
|
||||
"Noor",
|
||||
"Yorunai",
|
||||
"quantenmecha",
|
||||
"Jason+Nash",
|
||||
"cocona",
|
||||
"blikkies",
|
||||
"JBsuede",
|
||||
"Time Valentine",
|
||||
"Shock Shockor",
|
||||
"りん あめ",
|
||||
"Matt",
|
||||
"Goldwaters",
|
||||
"Zude",
|
||||
"Joaquin Hierrezuelo",
|
||||
"Frogmilk",
|
||||
"SPJ",
|
||||
"Sean voets",
|
||||
"Kyler",
|
||||
"Kor",
|
||||
"Joseph Hanson",
|
||||
"John Rednoulf",
|
||||
"Bryan Rutkowski",
|
||||
"Justin Blaylock",
|
||||
"aRtFuL_DodGeR",
|
||||
"Steven",
|
||||
"TenaciousD",
|
||||
"Dmitry Ryzhov",
|
||||
"Edward Ten Eyck",
|
||||
"Billy Gladky",
|
||||
"Probis",
|
||||
"Solixer",
|
||||
"Pete Pain",
|
||||
"ItsGeneralButtNaked",
|
||||
"RHopkirk",
|
||||
"jinksta187",
|
||||
"robin.kok.",
|
||||
"Manu Thetug",
|
||||
"Maxim",
|
||||
"Karlanx",
|
||||
"Lyavph",
|
||||
@@ -504,6 +513,7 @@
|
||||
"Youguang",
|
||||
"andrewzpong",
|
||||
"BossGame",
|
||||
"Marcus thronico",
|
||||
"lrdchs",
|
||||
"Tree Tagger",
|
||||
"Inversity",
|
||||
@@ -511,6 +521,15 @@
|
||||
"Kevinj",
|
||||
"Mitchell Robson",
|
||||
"POPPIN",
|
||||
"PoorStudent",
|
||||
"Alex+Zaw",
|
||||
"Supporter",
|
||||
"ExLightSaber",
|
||||
"Mobius2020",
|
||||
"YaboiRay",
|
||||
"Sildoren",
|
||||
"Darv",
|
||||
"Seon+Song",
|
||||
"2turbo",
|
||||
"Dmitry+Viznesenskiy",
|
||||
"tanjin90",
|
||||
@@ -528,11 +547,6 @@
|
||||
"Inkognito",
|
||||
"G",
|
||||
"Tan+Huynh",
|
||||
"Bob+Barker",
|
||||
"D",
|
||||
"Dark_Pest",
|
||||
"Eldithor",
|
||||
"Alex",
|
||||
"BillyBoy84",
|
||||
"Buecyb99",
|
||||
"Welkor",
|
||||
@@ -545,28 +559,27 @@
|
||||
"G",
|
||||
"Ronan Delevacq",
|
||||
"Christian Schäfer",
|
||||
"Leslie Andrew Ridings",
|
||||
"Dave Abraham",
|
||||
"Joaquin Hierrezuelo",
|
||||
"Locrospiel",
|
||||
"Sean voets",
|
||||
"Jarrid Lee",
|
||||
"Poophead27 Blyat",
|
||||
"Joseph Hanson",
|
||||
"John Rednoulf",
|
||||
"Kyron Mahan",
|
||||
"Mythspire",
|
||||
"Boba Smith",
|
||||
"TBitz33",
|
||||
"Anonym dkjglfleeoeldldldlkf",
|
||||
"MR.Bear",
|
||||
"matt",
|
||||
"somethingtosay8",
|
||||
"Ezokewn",
|
||||
"Terminuz",
|
||||
"ivistorm",
|
||||
"SendingRavens",
|
||||
"Sauv",
|
||||
"Steven",
|
||||
"JackJohnnyJim",
|
||||
"Khánh Đặng",
|
||||
"Borte",
|
||||
"Michael Docherty",
|
||||
"Ted Cart",
|
||||
"Sage Himeros",
|
||||
@@ -574,6 +587,7 @@
|
||||
"Paul Hartsuyker",
|
||||
"elitassj",
|
||||
"Tigon",
|
||||
"SkibidiRizzler",
|
||||
"Tania Nayelli Fernandez",
|
||||
"Draconach",
|
||||
"Jacob Winter",
|
||||
@@ -581,6 +595,8 @@
|
||||
"Andrew Wilkinson",
|
||||
"David",
|
||||
"Meilo",
|
||||
"Nacho Ferrando",
|
||||
"Marcos Tortosa Carmona",
|
||||
"Dkom22",
|
||||
"shinonomeiro",
|
||||
"Snille",
|
||||
@@ -589,7 +605,6 @@
|
||||
"xybrightsummer",
|
||||
"jreedatchison",
|
||||
"PhilW",
|
||||
"Marcus thronico",
|
||||
"Janik",
|
||||
"Cruel",
|
||||
"MRBlack",
|
||||
@@ -601,6 +616,13 @@
|
||||
"Scott",
|
||||
"Muratoraccio",
|
||||
"D",
|
||||
"Somebody",
|
||||
"Celestial+Kitten",
|
||||
"TequiTequi",
|
||||
"Homero+Banda",
|
||||
"bakeliteboy",
|
||||
"Nick",
|
||||
"てぃんてぃんひーろー",
|
||||
"Gold_miner_ego",
|
||||
"IshouI;_;",
|
||||
"Monix",
|
||||
@@ -620,17 +642,8 @@
|
||||
"you+halo9",
|
||||
"cloudghost",
|
||||
"Yongkwan+Lee",
|
||||
"PoorStudent",
|
||||
"lucites",
|
||||
"Alex+Zaw",
|
||||
"Mobius2020",
|
||||
"ExLightSaber",
|
||||
"YaboiRay",
|
||||
"nickname",
|
||||
"Sildoren",
|
||||
"Darv",
|
||||
"Seon+Song",
|
||||
"Somebody",
|
||||
"Balut+Omelette",
|
||||
"eriick",
|
||||
"Lev+Lanevskiy",
|
||||
@@ -651,37 +664,35 @@
|
||||
"Vinarus",
|
||||
"Josh Snyder",
|
||||
"ja s",
|
||||
"Leslie Andrew Ridings",
|
||||
"Doug Mason",
|
||||
"scoreswazey",
|
||||
"Oliverfish",
|
||||
"Owen Gwosdz",
|
||||
"Room Light",
|
||||
"Patryk Serious",
|
||||
"AZ Party Oasis",
|
||||
"Devil Lude",
|
||||
"Gentle Sartori",
|
||||
"Snorklebort",
|
||||
"David Murcko",
|
||||
"vinter",
|
||||
"TheFusion",
|
||||
"Jack Dole",
|
||||
"matt",
|
||||
"3zS4QNQ4",
|
||||
"Terminuz",
|
||||
"max blo",
|
||||
"Matt M.",
|
||||
"Ivan Imes",
|
||||
"J M",
|
||||
"Slacks",
|
||||
"Bouya shaka",
|
||||
"Jack Lawfield",
|
||||
"Borte",
|
||||
"Maso",
|
||||
"Homero Banda",
|
||||
"yyuvuvu",
|
||||
"Eric Ketchum",
|
||||
"Nomki",
|
||||
"Kevin Wallace",
|
||||
"ChicRic",
|
||||
"BastardSama",
|
||||
"mercur",
|
||||
"SkibidiRizzler",
|
||||
"Never_M",
|
||||
"Kalle Björk",
|
||||
"Yavizu3d",
|
||||
@@ -689,9 +700,7 @@
|
||||
"Teriak47",
|
||||
"Just me",
|
||||
"Raf Stahelin",
|
||||
"Nacho Ferrando",
|
||||
"Вячеслав Маринин",
|
||||
"Marcos Tortosa Carmona",
|
||||
"Cola Matthew",
|
||||
"OniNoKen",
|
||||
"Iain Wisely",
|
||||
@@ -734,6 +743,15 @@
|
||||
"SelfishMedic",
|
||||
"adderleighn",
|
||||
"EnragedAntelope",
|
||||
"Brandon+G",
|
||||
"fazefour33",
|
||||
"plonk",
|
||||
"Kotetsu",
|
||||
"o",
|
||||
"Tony+V",
|
||||
"Anvil+G",
|
||||
"draganjankovic1975dj528",
|
||||
"MrSEIGE88",
|
||||
"yarsev",
|
||||
"M+Alsulaiti",
|
||||
"Mark+Staaf",
|
||||
@@ -751,11 +769,6 @@
|
||||
"miduzza",
|
||||
"KB",
|
||||
"shw",
|
||||
"Celestial+Kitten",
|
||||
"bakeliteboy",
|
||||
"TequiTequi",
|
||||
"Homero+Banda",
|
||||
"Nick",
|
||||
"Jim",
|
||||
"JoL",
|
||||
"YoruHime",
|
||||
@@ -781,14 +794,14 @@
|
||||
"han b",
|
||||
"Nico",
|
||||
"Maximilian Krischan",
|
||||
"Banana Joe",
|
||||
"socialcat",
|
||||
"proto merp",
|
||||
"_ G3n",
|
||||
"Brandon Thomas",
|
||||
"Donovan Jenkins",
|
||||
"Hans Meier",
|
||||
"Dustin Hendel",
|
||||
"sicarius",
|
||||
"jboul",
|
||||
"Michael Eid",
|
||||
"Liberation",
|
||||
"Bob barker",
|
||||
@@ -805,7 +818,6 @@
|
||||
"jumpd",
|
||||
"John C",
|
||||
"Rim",
|
||||
"Oliverfish",
|
||||
"yfx507",
|
||||
"uruksayshi",
|
||||
"Jairus Knudsen",
|
||||
@@ -814,24 +826,25 @@
|
||||
"nk8",
|
||||
"lylepaul",
|
||||
"Middo",
|
||||
"Gary Chaboya",
|
||||
"Forbidden Atelier",
|
||||
"Thomas Sankowski",
|
||||
"DrB",
|
||||
"Nimhloth",
|
||||
"Adictedtohumping",
|
||||
"Moneymaker412K",
|
||||
"vinter",
|
||||
"Tsani Prodanov",
|
||||
"Towelie",
|
||||
"Jean-françois SEMA",
|
||||
"Myrthrac",
|
||||
"Taylor Dominy",
|
||||
"Andrew Ly",
|
||||
"Slacks",
|
||||
"Glenn Hoetker",
|
||||
"john Greene",
|
||||
"Faburizu",
|
||||
"jimyjomson",
|
||||
"JaeHyun Jang",
|
||||
"Michael Hicks",
|
||||
"Homero Banda",
|
||||
"Chase Kwon",
|
||||
"Bob Ling",
|
||||
"Inyoshu",
|
||||
@@ -858,5 +871,5 @@
|
||||
"Somebody",
|
||||
"CK"
|
||||
],
|
||||
"totalCount": 855
|
||||
"totalCount": 868
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
# ComfyUI Dual-Mode Widget Rendering
|
||||
|
||||
ComfyUI custom node widgets render in one of two modes. Patterns that work in one often fail silently in the other. Test both.
|
||||
|
||||
## Mode Detection
|
||||
|
||||
```js
|
||||
typeof LiteGraph !== 'undefined' && LiteGraph.vueNodesMode
|
||||
```
|
||||
|
||||
In Vue SFCs, `window.LiteGraph` is unavailable — pass as a prop from `main.ts`.
|
||||
|
||||
## Canvas Mode Layout
|
||||
|
||||
Uses `computeLayoutSize()` + `distributeSpace()` to allocate widget height within the node. Widgets with `computeLayoutSize` participate in space distribution; those with `computeSize` have fixed height.
|
||||
|
||||
- `getMinHeight()` in `addDOMWidget` options → minimum widget height
|
||||
- `widget.computeLayoutSize()` → `{ minHeight, minWidth, maxHeight? }`
|
||||
- Avoid `getMaxHeight()` unless the widget genuinely needs a fixed cap (prevents user resize)
|
||||
|
||||
## Vue Mode Layout
|
||||
|
||||
Uses CSS Grid (`grid-template-rows`) + `ResizeObserver`. The ResizeObserver watches the widget's DOM and feeds back into grid row sizing. This creates a feedback loop: content grows → row resizes → more space for content → content reflows/grows → row resizes again.
|
||||
|
||||
### Height Containment
|
||||
|
||||
The fix: `contain: layout size` on the widget root. This tells the browser the element's intrinsic size is CSS-determined, not driven by descendant content. The ResizeObserver sees a stable size and the loop is broken.
|
||||
|
||||
```css
|
||||
.widget-root.lm-vue-node {
|
||||
height: 100%;
|
||||
min-height: var(--comfy-widget-min-height, 200px);
|
||||
contain: layout size;
|
||||
}
|
||||
```
|
||||
|
||||
Existing examples: `.lm-loras-container.lm-vue-node` and `.comfy-tags-container.lm-vue-node` in `web/comfyui/lm_styles.css`.
|
||||
|
||||
**Do NOT** fix height issues with `maxHeight`, `getMaxHeight()`, or inline `max-height` — these prevent the user from resizing the node.
|
||||
|
||||
## Scroll Wheel Isolation
|
||||
|
||||
Both modes need to distinguish "user wants to scroll widget content" from "user wants to zoom canvas".
|
||||
|
||||
**Canvas mode:** Add `@wheel` on widget root. Check `event.target.closest(selector)` for scrollable sub-areas. If scrollable → `event.stopPropagation()`. Otherwise → `app.canvas.processMouseWheel(event)`.
|
||||
|
||||
**Vue mode:** Add CSS class `lm-wheel-scrollable` to scrollable elements. The global capture-phase hook in `web/comfyui/utils.js` (`enableListWheelScroll`) detects wheel events on marked elements and manually scrolls them via `element.scrollTop`, consuming the event before canvas zoom sees it.
|
||||
|
||||
## DOM Structure
|
||||
|
||||
`main.ts` creates an outer `<div>` container, then `vueApp.mount(container)`. The Vue app renders its own root element inside.
|
||||
|
||||
- `container.id` / `container.style.*` → outer element
|
||||
- Vue scoped `<style>` → `[data-v-hash]` applies only to Vue root
|
||||
|
||||
Classes needed by scoped Vue CSS must go on the Vue root element. Pass data as props and bind with `:class` rather than manipulating the DOM from `main.ts`.
|
||||
|
||||
## Serialization
|
||||
|
||||
For stateful widgets that need workflow persistence:
|
||||
|
||||
- `serialize: true` in `addDOMWidget` options
|
||||
- `serializeValue()` → state snapshot (called on workflow save)
|
||||
- `onSetValue(v)` → restore state (called on workflow load)
|
||||
- Always handle missing keys in restored value for backward compatibility with old workflows
|
||||
File diff suppressed because one or more lines are too long
+2202
-2194
File diff suppressed because it is too large
Load Diff
+10
-2
@@ -233,7 +233,7 @@
|
||||
"presetNamePlaceholder": "Preset name...",
|
||||
"baseModel": "Base Model",
|
||||
"baseModelSearchPlaceholder": "Search base models...",
|
||||
"modelTags": "Tags (Top 20)",
|
||||
"modelTags": "Tags",
|
||||
"modelTypes": "Model Types",
|
||||
"license": "License",
|
||||
"noCreditRequired": "No Credit Required",
|
||||
@@ -241,6 +241,8 @@
|
||||
"allowSellingGeneratedContentTooltip": "Allow selling generated images",
|
||||
"noCreditRequiredTooltip": "Use the model without crediting the creator",
|
||||
"noTags": "No tags",
|
||||
"tagSearchPlaceholder": "Search tags...",
|
||||
"noTagMatches": "No tags match the current search.",
|
||||
"autoTags": "Auto Tags",
|
||||
"noBaseModelMatches": "No base models match the current search.",
|
||||
"clearAll": "Clear All Filters",
|
||||
@@ -640,7 +642,13 @@
|
||||
"preparing": "Preparing download...",
|
||||
"connecting": "Connecting to download server...",
|
||||
"completed": "Completed",
|
||||
"downloadComplete": "Download completed successfully"
|
||||
"downloadComplete": "Download completed successfully",
|
||||
"enableCivarchiveApi": "Enable CivArchive API as metadata provider",
|
||||
"enableCivarchiveApiHelp": "When on, CivArchive API is used as a fallback source for model metadata (e.g. for models deleted from CivitAI). Turn off to avoid CivArchive rate limits entirely.",
|
||||
"providerOrder": "Metadata provider fallback order",
|
||||
"providerOrderHelp": "CivitAI API is always tried first. Choose the order of the remaining providers when looking up metadata.",
|
||||
"providerOrderCivitaiArchiveSqlite": "CivitAI → CivArchive → Archive DB",
|
||||
"providerOrderCivitaiSqliteArchive": "CivitAI → Archive DB → CivArchive"
|
||||
},
|
||||
"proxySettings": {
|
||||
"enableProxy": "Enable App-level Proxy",
|
||||
|
||||
+2202
-2194
File diff suppressed because it is too large
Load Diff
+2202
-2194
File diff suppressed because it is too large
Load Diff
+2202
-2194
File diff suppressed because it is too large
Load Diff
+2202
-2194
File diff suppressed because it is too large
Load Diff
+2202
-2194
File diff suppressed because it is too large
Load Diff
+2202
-2194
File diff suppressed because it is too large
Load Diff
+2202
-2194
File diff suppressed because it is too large
Load Diff
+2202
-2194
File diff suppressed because it is too large
Load Diff
@@ -359,6 +359,47 @@ class Config:
|
||||
"Failed to rename legacy 'default' library: %s", rename_error
|
||||
)
|
||||
|
||||
# Clean up a stale "default" library entry that has no meaningful
|
||||
# paths configured (e.g. leftover bootstrap artifact). This only
|
||||
# fires when "comfyui" already exists so we never delete the last
|
||||
# remaining library.
|
||||
if (
|
||||
"default" in libraries
|
||||
and "comfyui" in libraries
|
||||
and isinstance(default_library, Mapping)
|
||||
):
|
||||
default_folder_paths = _normalize_library_folder_paths(
|
||||
default_library
|
||||
)
|
||||
default_extra_paths = default_library.get("extra_folder_paths", {})
|
||||
has_meaningful_paths = bool(default_folder_paths) or bool(
|
||||
default_extra_paths
|
||||
) or any(
|
||||
default_library.get(key)
|
||||
for key in (
|
||||
"default_lora_root",
|
||||
"default_checkpoint_root",
|
||||
"default_unet_root",
|
||||
"default_embedding_root",
|
||||
"recipes_path",
|
||||
)
|
||||
)
|
||||
if not has_meaningful_paths:
|
||||
try:
|
||||
settings_service.delete_library("default")
|
||||
libraries_changed = True
|
||||
logger.info(
|
||||
"Removed stale 'default' library entry "
|
||||
"with no meaningful paths configured"
|
||||
)
|
||||
libraries = settings_service.get_libraries()
|
||||
comfy_library = libraries.get("comfyui", {})
|
||||
except Exception as delete_error:
|
||||
logger.debug(
|
||||
"Failed to remove stale 'default' library: %s",
|
||||
delete_error,
|
||||
)
|
||||
|
||||
default_lora_root = _resolve_valid_default_root(
|
||||
comfy_library.get("default_lora_root", ""),
|
||||
list(self.loras_roots or []),
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
"""Create Hook LoRA (LoraManager) — multi-LoRA hook node compatible with ComfyUI's built-in hook pipeline.
|
||||
|
||||
Produces ``("HOOKS",)`` output that chains seamlessly with downstream hook consumers
|
||||
(ConditioningSetProperties, SetHookKeyframes, CombineHooks, SetClipHooks, etc.).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import os
|
||||
|
||||
from ..utils.utils import get_lora_info_absolute
|
||||
from .utils import (
|
||||
FlexibleOptionalInputType,
|
||||
any_type,
|
||||
apply_lora_syntax_format,
|
||||
get_loras_list,
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class CreateHookLoraLM:
|
||||
NAME = "Create Hook LoRA (LoraManager)"
|
||||
CATEGORY = "Lora Manager/hooks"
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"text": (
|
||||
"AUTOCOMPLETE_TEXT_LORAS",
|
||||
{
|
||||
"placeholder": "Search LoRAs to add...",
|
||||
"tooltip": (
|
||||
"Search and select LoRAs. Each LoRA gets its own "
|
||||
"model/clip strength. Hooks chain with prev_hooks."
|
||||
),
|
||||
},
|
||||
),
|
||||
},
|
||||
"optional": FlexibleOptionalInputType(any_type),
|
||||
}
|
||||
|
||||
RETURN_TYPES = ("HOOKS", "STRING", "STRING")
|
||||
RETURN_NAMES = ("HOOKS", "trigger_words", "active_loras")
|
||||
FUNCTION = "create_hook"
|
||||
|
||||
def create_hook(self, text: str, **kwargs):
|
||||
"""Create a HookGroup from the selected LoRAs, chained with prev_hooks.
|
||||
|
||||
Each active LoRA from the widget is loaded and wrapped in a WeightHook
|
||||
via :func:`comfy.hooks.create_hook_lora`. All hooks are combined into a
|
||||
single group and returned alongside trigger words and a human-readable
|
||||
summary of the active LoRAs.
|
||||
"""
|
||||
del text # used by the frontend widget only
|
||||
|
||||
# Lazy imports: comfy is not available in CI/test environment at module level
|
||||
import comfy.hooks # type: ignore # noqa: C0415
|
||||
import comfy.utils # type: ignore # noqa: C0415
|
||||
|
||||
prev_hooks: comfy.hooks.HookGroup | None = kwargs.get("prev_hooks")
|
||||
|
||||
hook_group = prev_hooks.clone() if prev_hooks is not None else comfy.hooks.HookGroup()
|
||||
|
||||
all_trigger_words: list[str] = []
|
||||
active_loras: list[tuple[str, float, float]] = []
|
||||
|
||||
for lora in get_loras_list(kwargs):
|
||||
if not lora.get("active", False):
|
||||
continue
|
||||
|
||||
lora_name = apply_lora_syntax_format(lora["name"])
|
||||
model_strength = float(lora["strength"])
|
||||
clip_strength = float(lora.get("clipStrength", model_strength))
|
||||
|
||||
# Skip useless no-op entries (both strengths are zero)
|
||||
if model_strength == 0.0 and clip_strength == 0.0:
|
||||
continue
|
||||
|
||||
lora_path, trigger_words = get_lora_info_absolute(lora_name)
|
||||
if not lora_path or not os.path.isfile(lora_path):
|
||||
logger.warning("LoRA '%s' not found — skipping", lora_name)
|
||||
continue
|
||||
|
||||
try:
|
||||
lora_weights = comfy.utils.load_torch_file(lora_path, safe_load=True)
|
||||
|
||||
lora_hooks = comfy.hooks.create_hook_lora(
|
||||
lora=lora_weights,
|
||||
strength_model=model_strength,
|
||||
strength_clip=clip_strength,
|
||||
)
|
||||
except Exception:
|
||||
logger.exception("Failed to load LoRA '%s' — skipping", lora_name)
|
||||
continue
|
||||
hook_group = hook_group.clone_and_combine(lora_hooks)
|
||||
|
||||
active_loras.append((lora_name, model_strength, clip_strength))
|
||||
all_trigger_words.extend(trigger_words)
|
||||
|
||||
# Format trigger words (group mode separator)
|
||||
trigger_words_text = ",, ".join(all_trigger_words) if all_trigger_words else ""
|
||||
|
||||
# Format active LoRAs summary
|
||||
formatted_loras = []
|
||||
for name, model_s, clip_s in active_loras:
|
||||
if abs(model_s - clip_s) > 0.001:
|
||||
formatted_loras.append(
|
||||
f"<lora:{name}:{model_s}:{clip_s}>"
|
||||
)
|
||||
else:
|
||||
formatted_loras.append(f"<lora:{name}:{model_s}>")
|
||||
active_loras_text = " ".join(formatted_loras)
|
||||
|
||||
return (hook_group, trigger_words_text, active_loras_text)
|
||||
@@ -1570,7 +1570,11 @@ class SettingsHandler:
|
||||
else:
|
||||
self._settings.set(key, value)
|
||||
|
||||
if key == "enable_metadata_archive_db":
|
||||
if key in (
|
||||
"enable_metadata_archive_db",
|
||||
"enable_civarchive_api",
|
||||
"metadata_provider_order",
|
||||
):
|
||||
await self._metadata_provider_updater()
|
||||
|
||||
if key in self._PROXY_KEYS:
|
||||
@@ -3471,7 +3475,7 @@ class NodeRegistryHandler:
|
||||
status=400,
|
||||
)
|
||||
|
||||
if not isinstance(value, str) or not value:
|
||||
if value is None or (isinstance(value, str) and not value):
|
||||
return web.json_response(
|
||||
{"success": False, "error": "Missing value parameter"}, status=400
|
||||
)
|
||||
@@ -3578,7 +3582,7 @@ class NodeRegistryHandler:
|
||||
status=400,
|
||||
)
|
||||
|
||||
if not isinstance(value, str) or not value:
|
||||
if value is None or (isinstance(value, str) and not value):
|
||||
return web.json_response(
|
||||
{"success": False, "error": "Missing value parameter"}, status=400
|
||||
)
|
||||
|
||||
@@ -973,6 +973,8 @@ class ModelQueryHandler:
|
||||
limit = int(request.query.get("limit", "20"))
|
||||
if limit < 0:
|
||||
limit = 20
|
||||
elif limit > 200:
|
||||
limit = 20
|
||||
top_tags = await self._service.get_top_tags(limit)
|
||||
return web.json_response({"success": True, "tags": top_tags})
|
||||
except Exception as exc:
|
||||
@@ -981,6 +983,22 @@ class ModelQueryHandler:
|
||||
{"success": False, "error": "Internal server error"}, status=500
|
||||
)
|
||||
|
||||
async def search_tags(self, request: web.Request) -> web.Response:
|
||||
try:
|
||||
query = request.query.get("q", "")
|
||||
limit = int(request.query.get("limit", "20"))
|
||||
if limit < 0:
|
||||
limit = 20
|
||||
elif limit > 200:
|
||||
limit = 20
|
||||
tags = await self._service.search_tags(query, limit)
|
||||
return web.json_response({"success": True, "tags": tags})
|
||||
except Exception as exc:
|
||||
self._logger.error("Error searching tags: %s", exc, exc_info=True)
|
||||
return web.json_response(
|
||||
{"success": False, "error": "Internal server error"}, status=500
|
||||
)
|
||||
|
||||
async def get_base_models(self, request: web.Request) -> web.Response:
|
||||
try:
|
||||
limit = int(request.query.get("limit", "20"))
|
||||
@@ -1787,14 +1805,20 @@ class ModelDownloadHandler:
|
||||
|
||||
async def delete_download_history_item(self, request: web.Request) -> web.Response:
|
||||
try:
|
||||
item_id = int(request.query.get("id", "0"))
|
||||
if not item_id:
|
||||
download_id = request.query.get("download_id")
|
||||
id_str = request.query.get("id")
|
||||
item_id = int(id_str) if id_str else None
|
||||
|
||||
if not download_id and not item_id:
|
||||
return web.json_response(
|
||||
{"success": False, "error": "id is required"}, status=400
|
||||
{"success": False, "error": "id or download_id is required"},
|
||||
status=400,
|
||||
)
|
||||
|
||||
service = await DownloadQueueService.get_instance()
|
||||
deleted = await service.delete_history_item(item_id)
|
||||
deleted = await service.delete_history_item(
|
||||
id=item_id, download_id=download_id
|
||||
)
|
||||
return web.json_response({"success": deleted})
|
||||
except Exception as exc:
|
||||
self._logger.error(
|
||||
@@ -1804,14 +1828,20 @@ class ModelDownloadHandler:
|
||||
|
||||
async def retry_download_from_history(self, request: web.Request) -> web.Response:
|
||||
try:
|
||||
item_id = int(request.query.get("id", "0"))
|
||||
if not item_id:
|
||||
download_id = request.query.get("download_id")
|
||||
id_str = request.query.get("id")
|
||||
item_id = int(id_str) if id_str else None
|
||||
|
||||
if not download_id and not item_id:
|
||||
return web.json_response(
|
||||
{"success": False, "error": "id is required"}, status=400
|
||||
{"success": False, "error": "id or download_id is required"},
|
||||
status=400,
|
||||
)
|
||||
|
||||
service = await DownloadQueueService.get_instance()
|
||||
item = await service.retry_from_history(item_id)
|
||||
item = await service.retry_from_history(
|
||||
item_id=item_id, download_id=download_id
|
||||
)
|
||||
if item is None:
|
||||
return web.json_response(
|
||||
{"success": False, "error": "History item not found or not retryable"},
|
||||
@@ -2935,6 +2965,7 @@ class ModelHandlerSet:
|
||||
"bulk_delete_models": self.management.bulk_delete_models,
|
||||
"verify_duplicates": self.management.verify_duplicates,
|
||||
"get_top_tags": self.query.get_top_tags,
|
||||
"search_tags": self.query.search_tags,
|
||||
"get_base_models": self.query.get_base_models,
|
||||
"get_model_types": self.query.get_model_types,
|
||||
"scan_models": self.query.scan_models,
|
||||
|
||||
@@ -72,6 +72,7 @@ class RecipeHandlerSet:
|
||||
"save_recipe": self.management.save_recipe,
|
||||
"delete_recipe": self.management.delete_recipe,
|
||||
"get_top_tags": self.query.get_top_tags,
|
||||
"search_tags": self.query.search_tags,
|
||||
"get_base_models": self.query.get_base_models,
|
||||
"get_roots": self.query.get_roots,
|
||||
"get_folders": self.query.get_folders,
|
||||
@@ -317,12 +318,11 @@ class RecipeQueryHandler:
|
||||
raise RuntimeError("Recipe scanner unavailable")
|
||||
|
||||
limit = int(request.query.get("limit", "20"))
|
||||
cache = await recipe_scanner.get_cached_data()
|
||||
|
||||
tag_counts: Dict[str, int] = {}
|
||||
for recipe in getattr(cache, "raw_data", []):
|
||||
for tag in recipe.get("tags", []) or []:
|
||||
tag_counts[tag] = tag_counts.get(tag, 0) + 1
|
||||
if limit < 0:
|
||||
limit = 20
|
||||
elif limit > 200:
|
||||
limit = 20
|
||||
tag_counts = await self._get_recipe_tag_counts(recipe_scanner)
|
||||
|
||||
sorted_tags = [
|
||||
{"tag": tag, "count": count} for tag, count in tag_counts.items()
|
||||
@@ -333,6 +333,55 @@ class RecipeQueryHandler:
|
||||
self._logger.error("Error retrieving top tags: %s", exc, exc_info=True)
|
||||
return web.json_response({"success": False, "error": str(exc)}, status=500)
|
||||
|
||||
async def search_tags(self, request: web.Request) -> web.Response:
|
||||
try:
|
||||
await self._ensure_dependencies_ready()
|
||||
recipe_scanner = self._recipe_scanner_getter()
|
||||
if recipe_scanner is None:
|
||||
raise RuntimeError("Recipe scanner unavailable")
|
||||
|
||||
query = request.query.get("q", "")
|
||||
limit = int(request.query.get("limit", "20"))
|
||||
if limit < 0:
|
||||
limit = 20
|
||||
elif limit > 200:
|
||||
limit = 20
|
||||
|
||||
tag_counts = await self._get_recipe_tag_counts(recipe_scanner)
|
||||
normalized_query = (query or "").strip().lower()
|
||||
if not normalized_query:
|
||||
sorted_tags = [
|
||||
{"tag": tag, "count": count} for tag, count in tag_counts.items()
|
||||
]
|
||||
sorted_tags.sort(key=lambda entry: entry["count"], reverse=True)
|
||||
return web.json_response(
|
||||
{"success": True, "tags": sorted_tags[: (limit if limit > 0 else 20)]}
|
||||
)
|
||||
|
||||
matched = [
|
||||
{"tag": tag, "count": count}
|
||||
for tag, count in tag_counts.items()
|
||||
if normalized_query in tag.lower()
|
||||
]
|
||||
matched.sort(key=lambda entry: entry["count"], reverse=True)
|
||||
if limit == 0:
|
||||
result = matched
|
||||
else:
|
||||
result = matched[:limit]
|
||||
return web.json_response({"success": True, "tags": result})
|
||||
except Exception as exc:
|
||||
self._logger.error("Error searching recipe tags: %s", exc, exc_info=True)
|
||||
return web.json_response({"success": False, "error": str(exc)}, status=500)
|
||||
|
||||
async def _get_recipe_tag_counts(self, recipe_scanner) -> Dict[str, int]:
|
||||
"""Compute tag->count mapping from cached recipe data."""
|
||||
cache = await recipe_scanner.get_cached_data()
|
||||
tag_counts: Dict[str, int] = {}
|
||||
for recipe in getattr(cache, "raw_data", []):
|
||||
for tag in recipe.get("tags", []) or []:
|
||||
tag_counts[tag] = tag_counts.get(tag, 0) + 1
|
||||
return tag_counts
|
||||
|
||||
async def get_base_models(self, request: web.Request) -> web.Response:
|
||||
try:
|
||||
await self._ensure_dependencies_ready()
|
||||
|
||||
@@ -46,6 +46,7 @@ COMMON_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
|
||||
"GET", "/api/lm/{prefix}/auto-organize-progress", "get_auto_organize_progress"
|
||||
),
|
||||
RouteDefinition("GET", "/api/lm/{prefix}/top-tags", "get_top_tags"),
|
||||
RouteDefinition("GET", "/api/lm/{prefix}/search-tags", "search_tags"),
|
||||
RouteDefinition("GET", "/api/lm/{prefix}/base-models", "get_base_models"),
|
||||
RouteDefinition("GET", "/api/lm/{prefix}/model-types", "get_model_types"),
|
||||
RouteDefinition("GET", "/api/lm/{prefix}/scan", "scan_models"),
|
||||
|
||||
@@ -29,6 +29,7 @@ ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
|
||||
RouteDefinition("POST", "/api/lm/recipes/save", "save_recipe"),
|
||||
RouteDefinition("DELETE", "/api/lm/recipe/{recipe_id}", "delete_recipe"),
|
||||
RouteDefinition("GET", "/api/lm/recipes/top-tags", "get_top_tags"),
|
||||
RouteDefinition("GET", "/api/lm/recipes/search-tags", "search_tags"),
|
||||
RouteDefinition("GET", "/api/lm/recipes/base-models", "get_base_models"),
|
||||
RouteDefinition("GET", "/api/lm/recipes/roots", "get_roots"),
|
||||
RouteDefinition("GET", "/api/lm/recipes/folders", "get_folders"),
|
||||
|
||||
@@ -804,6 +804,12 @@ class BaseModelService(ABC):
|
||||
"""Get top tags sorted by frequency"""
|
||||
return await self.scanner.get_top_tags(limit)
|
||||
|
||||
async def search_tags(
|
||||
self, query: str, limit: int = 50
|
||||
) -> List[Dict]:
|
||||
"""Search tags by substring, sorted by frequency"""
|
||||
return await self.scanner.search_tags(query, limit)
|
||||
|
||||
async def get_base_models(self, limit: int = 20) -> List[Dict]:
|
||||
"""Get base models sorted by frequency"""
|
||||
return await self.scanner.get_base_models(limit)
|
||||
@@ -1092,6 +1098,11 @@ class BaseModelService(ABC):
|
||||
|
||||
Listing/search endpoints return lightweight cache entries; this method performs
|
||||
a lazy read of the on-disk metadata snapshot when callers need full detail.
|
||||
|
||||
As a beneficial side effect, the in-memory and persistent caches are
|
||||
opportunistically synchronised with the on-disk metadata — this keeps the
|
||||
caches fresh even when a ``.metadata.json`` file was edited outside of the
|
||||
normal save path (e.g. manually or by an external script).
|
||||
"""
|
||||
metadata, should_skip = await MetadataManager.load_metadata(
|
||||
file_path, self.metadata_class
|
||||
@@ -1109,6 +1120,19 @@ class BaseModelService(ABC):
|
||||
MetadataManager.save_metadata(file_path, metadata)
|
||||
)
|
||||
|
||||
# Opportunistically sync the in-memory + persistent caches.
|
||||
# The .metadata.json disk read is already paid for; the sync only
|
||||
# performs work when the cache is actually stale, and uses targeted,
|
||||
# in-place operations to minimise overhead even with large model sets.
|
||||
#
|
||||
# Fire-and-forget by design: the task is intentionally untracked.
|
||||
# sync_cache_from_metadata handles its own errors internally.
|
||||
asyncio.create_task(
|
||||
self.scanner.sync_cache_from_metadata(
|
||||
file_path, metadata.to_dict()
|
||||
)
|
||||
)
|
||||
|
||||
return self.filter_civitai_data(metadata.to_dict().get("civitai", {}))
|
||||
|
||||
async def get_model_description(self, file_path: str) -> Optional[str]:
|
||||
|
||||
@@ -114,6 +114,13 @@ class CheckpointScanner(ModelScanner):
|
||||
and metadata.hash_status == "completed"
|
||||
and metadata.sha256
|
||||
):
|
||||
# Ensure the in-memory hash index is populated even when
|
||||
# the hash was already computed and persisted to the metadata
|
||||
# file. Without this, usage tracking (and any other caller
|
||||
# that queries get_hash_by_filename first) will miss on every
|
||||
# lookup and keep calling back into this method, creating a
|
||||
# tight loop that never populates the index.
|
||||
self._hash_index.add_entry(metadata.sha256.lower(), file_path)
|
||||
return metadata.sha256
|
||||
|
||||
async with self._hash_calculation_lock:
|
||||
@@ -125,6 +132,7 @@ class CheckpointScanner(ModelScanner):
|
||||
and metadata.hash_status == "completed"
|
||||
and metadata.sha256
|
||||
):
|
||||
self._hash_index.add_entry(metadata.sha256.lower(), file_path)
|
||||
return metadata.sha256
|
||||
|
||||
task = self._hash_calculation_tasks.get(real_path)
|
||||
@@ -175,6 +183,9 @@ class CheckpointScanner(ModelScanner):
|
||||
|
||||
# Check if hash is already calculated
|
||||
if metadata.hash_status == "completed" and metadata.sha256:
|
||||
# Populate the in-memory hash index even for pre-computed
|
||||
# hashes, mirroring the fix in calculate_hash_for_model.
|
||||
self._hash_index.add_entry(metadata.sha256.lower(), file_path)
|
||||
return metadata.sha256
|
||||
|
||||
# Update status to calculating
|
||||
@@ -193,6 +204,20 @@ class CheckpointScanner(ModelScanner):
|
||||
# Update hash index
|
||||
self._hash_index.add_entry(sha256.lower(), file_path)
|
||||
|
||||
# Update the in-memory cache entry so that subsequent
|
||||
# _persist_current_cache / _save_persistent_cache calls
|
||||
# write the hash back to the SQLite models table. Without
|
||||
# this the hash only lives in the metadata file and the
|
||||
# in-memory hash index, both of which are lost across
|
||||
# restarts, causing the same re-computation loop on the
|
||||
# next session.
|
||||
if self._cache is not None and self._cache.raw_data:
|
||||
for entry in self._cache.raw_data:
|
||||
if entry.get("file_path") == file_path:
|
||||
entry["sha256"] = sha256.lower()
|
||||
entry["hash_status"] = "completed"
|
||||
break
|
||||
|
||||
logger.info(f"Hash calculated for checkpoint: {file_path}")
|
||||
return sha256
|
||||
|
||||
|
||||
@@ -682,7 +682,10 @@ class DownloadManager:
|
||||
u for u in download_urls if not u.startswith(CIVITAI_DOWNLOAD_URL_PREFIXES)
|
||||
]
|
||||
download_urls = non_civitai_urls + civitai_urls
|
||||
else:
|
||||
|
||||
# Fallback: when mirrors is empty or all mirrors have been deleted,
|
||||
# use the file's downloadUrl directly (e.g. CivitAI download endpoint).
|
||||
if not download_urls:
|
||||
download_url = file_info.get("downloadUrl")
|
||||
if download_url:
|
||||
download_urls.append(normalize_civitai_download_url(download_url))
|
||||
@@ -1386,7 +1389,17 @@ class DownloadManager:
|
||||
|
||||
# Update save directory with relative path if provided
|
||||
if relative_path:
|
||||
base_save_dir = save_dir
|
||||
save_dir = os.path.join(save_dir, relative_path)
|
||||
# Security: validate path containment after joining
|
||||
resolved_dir = os.path.realpath(os.path.normpath(save_dir))
|
||||
base_dir = os.path.realpath(os.path.normpath(base_save_dir))
|
||||
if not resolved_dir.startswith(base_dir + os.sep) and resolved_dir != base_dir:
|
||||
logger.warning(
|
||||
"Path traversal detected: %s escapes %s",
|
||||
resolved_dir, base_dir,
|
||||
)
|
||||
return {"success": False, "error": "Download path is outside allowed directory"}
|
||||
# Create directory if it doesn't exist
|
||||
os.makedirs(save_dir, exist_ok=True)
|
||||
|
||||
@@ -1520,35 +1533,8 @@ class DownloadManager:
|
||||
|
||||
if not file_info:
|
||||
return {"success": False, "error": "No suitable file found in metadata"}
|
||||
mirrors = file_info.get("mirrors") or []
|
||||
download_urls = []
|
||||
if mirrors:
|
||||
for mirror in mirrors:
|
||||
if mirror.get("deletedAt") is None and mirror.get("url"):
|
||||
download_urls.append(
|
||||
normalize_civitai_download_url(mirror["url"])
|
||||
)
|
||||
|
||||
# When source is 'civarchive', prioritize non-Civitai URLs
|
||||
# This avoids failed downloads from deleted Civitai models
|
||||
if source == "civarchive" and len(download_urls) > 1:
|
||||
civitai_urls = [
|
||||
u
|
||||
for u in download_urls
|
||||
if u.startswith(CIVITAI_DOWNLOAD_URL_PREFIXES)
|
||||
]
|
||||
non_civitai_urls = [
|
||||
u
|
||||
for u in download_urls
|
||||
if not u.startswith(CIVITAI_DOWNLOAD_URL_PREFIXES)
|
||||
]
|
||||
download_urls = non_civitai_urls + civitai_urls
|
||||
else:
|
||||
download_url = file_info.get("downloadUrl")
|
||||
if download_url:
|
||||
download_urls.append(
|
||||
normalize_civitai_download_url(download_url)
|
||||
)
|
||||
download_urls = self._build_download_urls_from_file_info(file_info, source=source)
|
||||
|
||||
if not download_urls:
|
||||
return {"success": False, "error": "No mirror URL found"}
|
||||
@@ -1851,6 +1837,9 @@ class DownloadManager:
|
||||
model_tags, model_type
|
||||
)
|
||||
|
||||
if not first_tag:
|
||||
first_tag = "no tags" # Default if no tags available
|
||||
|
||||
# Format the template with available data
|
||||
formatted_path = path_template
|
||||
formatted_path = formatted_path.replace("{base_model}", mapped_base_model)
|
||||
@@ -1866,6 +1855,15 @@ class DownloadManager:
|
||||
if model_type == "embedding":
|
||||
formatted_path = formatted_path.replace(" ", "_")
|
||||
|
||||
# Sanitize the resolved path to prevent path traversal:
|
||||
# - Strip leading slashes (prevents os.path.join from treating path as absolute)
|
||||
# - Collapse double slashes from empty placeholder substitutions
|
||||
# - Strip trailing slashes for cleanliness
|
||||
formatted_path = formatted_path.lstrip("/")
|
||||
while "//" in formatted_path:
|
||||
formatted_path = formatted_path.replace("//", "/")
|
||||
formatted_path = formatted_path.rstrip("/")
|
||||
|
||||
return formatted_path
|
||||
|
||||
async def _execute_download(
|
||||
|
||||
@@ -74,6 +74,8 @@ class DownloadQueueService:
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_dh_completed ON download_history(completed_at DESC);
|
||||
CREATE INDEX IF NOT EXISTS idx_dh_status ON download_history(status);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_dh_download_id
|
||||
ON download_history(download_id) WHERE download_id IS NOT NULL;
|
||||
"""
|
||||
|
||||
@classmethod
|
||||
@@ -390,7 +392,7 @@ class DownloadQueueService:
|
||||
)
|
||||
conn.execute(
|
||||
"""
|
||||
INSERT INTO download_history (
|
||||
INSERT OR IGNORE INTO download_history (
|
||||
download_id, model_id, model_version_id, model_name,
|
||||
version_name, thumbnail_url, status, error, file_path,
|
||||
bytes_downloaded, total_bytes, completed_at
|
||||
@@ -547,17 +549,27 @@ class DownloadQueueService:
|
||||
"offset": offset,
|
||||
}
|
||||
|
||||
async def delete_history_item(self, id: int) -> bool:
|
||||
"""Delete a single history entry by its *id*.
|
||||
async def delete_history_item(
|
||||
self, id: Optional[int] = None, download_id: Optional[str] = None
|
||||
) -> bool:
|
||||
"""Delete a single history entry by *download_id* (preferred) or *id*.
|
||||
|
||||
Returns ``True`` if a row was deleted.
|
||||
"""
|
||||
async with self._lock:
|
||||
conn = self._get_conn()
|
||||
cursor = conn.execute(
|
||||
"DELETE FROM download_history WHERE id = ?",
|
||||
(id,),
|
||||
)
|
||||
if download_id:
|
||||
cursor = conn.execute(
|
||||
"DELETE FROM download_history WHERE download_id = ?",
|
||||
(download_id,),
|
||||
)
|
||||
elif id is not None:
|
||||
cursor = conn.execute(
|
||||
"DELETE FROM download_history WHERE id = ?",
|
||||
(id,),
|
||||
)
|
||||
else:
|
||||
return False
|
||||
conn.commit()
|
||||
return cursor.rowcount > 0
|
||||
|
||||
@@ -614,21 +626,34 @@ class DownloadQueueService:
|
||||
# Retry
|
||||
# ------------------------------------------------------------------
|
||||
|
||||
async def retry_from_history(self, item_id: int) -> Optional[dict[str, Any]]:
|
||||
async def retry_from_history(
|
||||
self,
|
||||
item_id: Optional[int] = None,
|
||||
download_id: Optional[str] = None,
|
||||
) -> Optional[dict[str, Any]]:
|
||||
"""Re-queue a failed or canceled download from history.
|
||||
|
||||
Looks up the history record by its primary key. If the status is
|
||||
``failed`` or ``canceled`` a new queue entry is created with the
|
||||
same model metadata and a fresh download id, and the original
|
||||
history entry is **deleted** to prevent exponential growth when
|
||||
the retried item is later canceled or fails again and re-retried.
|
||||
Looks up the history record by *download_id* (preferred) or
|
||||
*item_id*. If the status is ``failed`` or ``canceled`` a new
|
||||
queue entry is created with the same model metadata and a fresh
|
||||
download id, and the original history entry is **deleted** to
|
||||
prevent exponential growth when the retried item is later
|
||||
canceled or fails again and re-retried.
|
||||
"""
|
||||
async with self._lock:
|
||||
conn = self._get_conn()
|
||||
row = conn.execute(
|
||||
"SELECT * FROM download_history WHERE id = ?",
|
||||
(item_id,),
|
||||
).fetchone()
|
||||
if download_id:
|
||||
row = conn.execute(
|
||||
"SELECT * FROM download_history WHERE download_id = ?",
|
||||
(download_id,),
|
||||
).fetchone()
|
||||
elif item_id is not None:
|
||||
row = conn.execute(
|
||||
"SELECT * FROM download_history WHERE id = ?",
|
||||
(item_id,),
|
||||
).fetchone()
|
||||
else:
|
||||
return None
|
||||
if row is None:
|
||||
return None
|
||||
status = str(row["status"])
|
||||
@@ -660,7 +685,7 @@ class DownloadQueueService:
|
||||
)
|
||||
conn.execute(
|
||||
"DELETE FROM download_history WHERE id = ?",
|
||||
(item_id,),
|
||||
(row["id"],),
|
||||
)
|
||||
conn.commit()
|
||||
queued = conn.execute(
|
||||
|
||||
+19
-10
@@ -270,14 +270,14 @@ class Downloader:
|
||||
|
||||
Note: This is private and caller MUST hold self._session_lock.
|
||||
"""
|
||||
# Close existing session if any
|
||||
if self._session is not None:
|
||||
try:
|
||||
await self._session.close()
|
||||
except Exception as e: # pragma: no cover
|
||||
logger.warning(f"Error closing previous session: {e}")
|
||||
finally:
|
||||
self._session = None
|
||||
# Snapshot and clear old session reference before creating the new
|
||||
# one. This ensures self._session is always valid (or None, which
|
||||
# triggers a fresh creation) and avoids a race where concurrent
|
||||
# requests hold a reference to a session whose connector has been
|
||||
# torn down by a premature close() call — the root cause of the
|
||||
# intermittent "NoneType has no attribute connect" crash.
|
||||
old_session = self._session
|
||||
self._session = None
|
||||
|
||||
# Check for app-level proxy settings
|
||||
proxy_url = None # http(s) proxy, passed via the per-request `proxy=` kwarg
|
||||
@@ -372,6 +372,13 @@ class Downloader:
|
||||
self._proxy_url = proxy_url
|
||||
self._session_created_at = datetime.now()
|
||||
|
||||
# Close the previous session now that the replacement is live.
|
||||
if old_session is not None:
|
||||
try:
|
||||
await old_session.close()
|
||||
except Exception as e: # pragma: no cover
|
||||
logger.warning(f"Error closing previous session: {e}")
|
||||
|
||||
logger.debug(
|
||||
"Created new HTTP session with proxy settings. App-level proxy: %s, System-level proxy (trust_env): %s",
|
||||
bool(proxy_url),
|
||||
@@ -753,7 +760,8 @@ class Downloader:
|
||||
else:
|
||||
resume_offset = 0
|
||||
total_size = 0
|
||||
await self._create_session()
|
||||
async with self._session_lock:
|
||||
await self._create_session()
|
||||
continue
|
||||
|
||||
return False, integrity_error
|
||||
@@ -843,7 +851,8 @@ class Downloader:
|
||||
logger.info(f"Will resume from byte {resume_offset}")
|
||||
|
||||
# Refresh session to get new connection
|
||||
await self._create_session()
|
||||
async with self._session_lock:
|
||||
await self._create_session()
|
||||
continue
|
||||
else:
|
||||
logger.error(f"Max retries exceeded for download: {e}")
|
||||
|
||||
@@ -15,6 +15,17 @@ from .service_registry import ServiceRegistry
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
_PROVIDER_DISPLAY_NAMES = {
|
||||
"civitai_api": "CivitAI",
|
||||
"civarchive_api": "CivArchive",
|
||||
"sqlite": "Archive DB",
|
||||
}
|
||||
|
||||
_PRESET_PROVIDER_ORDERS = {
|
||||
"civitai_archive_sqlite": ["civitai_api", "civarchive_api", "sqlite"],
|
||||
"civitai_sqlite_archive": ["civitai_api", "sqlite", "civarchive_api"],
|
||||
}
|
||||
|
||||
async def initialize_metadata_providers():
|
||||
"""Initialize and configure all metadata providers based on settings"""
|
||||
provider_manager = await ModelMetadataProviderManager.get_instance()
|
||||
@@ -26,7 +37,9 @@ async def initialize_metadata_providers():
|
||||
# Get settings
|
||||
settings_manager = get_settings_manager()
|
||||
enable_archive_db = settings_manager.get('enable_metadata_archive_db', False)
|
||||
|
||||
enable_civarchive_api = settings_manager.get('enable_civarchive_api', True)
|
||||
provider_order = settings_manager.get('metadata_provider_order', 'civitai_archive_sqlite')
|
||||
|
||||
providers = []
|
||||
|
||||
# Initialize archive database provider if enabled
|
||||
@@ -59,27 +72,48 @@ async def initialize_metadata_providers():
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to initialize Civitai API metadata provider: {e}")
|
||||
|
||||
# Register CivArchive provider, and all add to fallback providers
|
||||
try:
|
||||
civarchive_client = await ServiceRegistry.get_civarchive_client()
|
||||
civarchive_provider = CivArchiveModelMetadataProvider(civarchive_client)
|
||||
provider_manager.register_provider('civarchive_api', civarchive_provider)
|
||||
providers.append(('civarchive_api', civarchive_provider))
|
||||
logger.debug("CivArchive metadata provider registered (also included in fallback)")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to initialize CivArchive metadata provider: {e}")
|
||||
# Register CivArchive provider when enabled. Civitai API is always
|
||||
# preferred (better metadata); CivArchive mainly recovers metadata for
|
||||
# models deleted from Civitai, so it can be turned off to avoid its long
|
||||
# rate-limit windows entirely.
|
||||
if enable_civarchive_api:
|
||||
try:
|
||||
civarchive_client = await ServiceRegistry.get_civarchive_client()
|
||||
civarchive_provider = CivArchiveModelMetadataProvider(civarchive_client)
|
||||
provider_manager.register_provider('civarchive_api', civarchive_provider)
|
||||
providers.append(('civarchive_api', civarchive_provider))
|
||||
logger.debug("CivArchive metadata provider registered (also included in fallback)")
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to initialize CivArchive metadata provider: {e}")
|
||||
else:
|
||||
logger.debug("CivArchive metadata provider disabled by setting 'enable_civarchive_api'")
|
||||
|
||||
# Preset fallback orderings (see module-level _PRESET_PROVIDER_ORDERS).
|
||||
# civitai_api is always first (better metadata); the remaining providers
|
||||
# are arranged by the configured preset. Providers that are not
|
||||
# registered (disabled/unavailable) are simply skipped, so each preset
|
||||
# degrades gracefully.
|
||||
desired_order = _PRESET_PROVIDER_ORDERS.get(
|
||||
provider_order, _PRESET_PROVIDER_ORDERS["civitai_archive_sqlite"]
|
||||
)
|
||||
|
||||
# Set up fallback provider based on available providers
|
||||
if len(providers) > 1:
|
||||
# Always use Civitai API (it has better metadata), then CivArchive API, then Archive DB
|
||||
ordered_providers: list[tuple[str, ModelMetadataProvider]] = []
|
||||
ordered_providers.extend([p for p in providers if p[0] == 'civitai_api'])
|
||||
ordered_providers.extend([p for p in providers if p[0] == 'civarchive_api'])
|
||||
ordered_providers.extend([p for p in providers if p[0] == 'sqlite'])
|
||||
|
||||
for name in desired_order:
|
||||
ordered_providers.extend([p for p in providers if p[0] == name])
|
||||
# Include any provider not covered by the preset (defensive) at the end
|
||||
for p in providers:
|
||||
if p not in ordered_providers:
|
||||
ordered_providers.append(p)
|
||||
|
||||
if ordered_providers:
|
||||
fallback_provider = FallbackMetadataProvider(ordered_providers)
|
||||
provider_manager.register_provider('fallback', fallback_provider, is_default=True)
|
||||
logger.debug(
|
||||
"Metadata fallback provider order: %s",
|
||||
", ".join(name for name, _ in ordered_providers),
|
||||
)
|
||||
elif len(providers) == 1:
|
||||
# Only one provider available, set it as default
|
||||
provider_name, provider = providers[0]
|
||||
@@ -96,11 +130,30 @@ async def update_metadata_providers():
|
||||
# Get current settings
|
||||
settings_manager = get_settings_manager()
|
||||
enable_archive_db = settings_manager.get('enable_metadata_archive_db', False)
|
||||
enable_civarchive_api = settings_manager.get('enable_civarchive_api', True)
|
||||
provider_order = settings_manager.get('metadata_provider_order', 'civitai_archive_sqlite')
|
||||
|
||||
# Reinitialize all providers with new settings
|
||||
provider_manager = await initialize_metadata_providers()
|
||||
|
||||
logger.info(f"Updated metadata providers, archive_db enabled: {enable_archive_db}")
|
||||
# Build effective provider chain for logging (use actually-registered
|
||||
# providers, not just settings, so a failed init is reflected correctly)
|
||||
registered = set(provider_manager.providers.keys())
|
||||
desired = _PRESET_PROVIDER_ORDERS.get(
|
||||
provider_order, _PRESET_PROVIDER_ORDERS["civitai_archive_sqlite"]
|
||||
)
|
||||
chain = " → ".join(
|
||||
_PROVIDER_DISPLAY_NAMES[p]
|
||||
for p in desired
|
||||
if p in registered and p in _PROVIDER_DISPLAY_NAMES
|
||||
)
|
||||
|
||||
logger.info(
|
||||
"Updated metadata providers: archive_db=%s, civarchive_api=%s, chain=%s",
|
||||
enable_archive_db,
|
||||
enable_civarchive_api,
|
||||
chain,
|
||||
)
|
||||
return provider_manager
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to update metadata providers: {e}")
|
||||
|
||||
@@ -8,6 +8,7 @@ from abc import ABC, abstractmethod
|
||||
from ..utils.utils import calculate_relative_path_for_model, remove_empty_dirs
|
||||
from ..utils.constants import AUTO_ORGANIZE_BATCH_SIZE
|
||||
from ..services.settings_manager import get_settings_manager
|
||||
from ..services.model_lifecycle_service import _require_path_in_library_roots
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -493,6 +494,9 @@ class ModelMoveService:
|
||||
Dictionary with move result
|
||||
"""
|
||||
try:
|
||||
_require_path_in_library_roots(file_path, self.scanner, label="Source path")
|
||||
_require_path_in_library_roots(target_path, self.scanner, label="Target path")
|
||||
|
||||
if use_default_paths:
|
||||
# Find the model in cache to get metadata
|
||||
cache = await self.scanner.get_cached_data()
|
||||
|
||||
@@ -48,6 +48,35 @@ async def delete_model_artifacts(
|
||||
return deleted
|
||||
|
||||
|
||||
def _require_path_in_library_roots(file_path: str, scanner, *, label: str = "path") -> None:
|
||||
"""Raise ``ValueError`` if *file_path* is not inside a configured model root.
|
||||
|
||||
Uses ``os.path.realpath()`` to resolve symlinks before comparing,
|
||||
so symlink-based escapes are also caught. Skips when the scanner
|
||||
does not expose ``get_model_roots`` or the list is empty.
|
||||
"""
|
||||
|
||||
roots = None
|
||||
if hasattr(scanner, "get_model_roots"):
|
||||
try:
|
||||
roots = scanner.get_model_roots()
|
||||
except NotImplementedError:
|
||||
roots = None
|
||||
if not roots:
|
||||
return
|
||||
|
||||
resolved = os.path.realpath(os.path.normpath(file_path))
|
||||
|
||||
for root in roots:
|
||||
root_resolved = os.path.realpath(os.path.normpath(root))
|
||||
if resolved == root_resolved or resolved.startswith(root_resolved + os.sep):
|
||||
return
|
||||
|
||||
raise ValueError(
|
||||
f"{label} '{file_path}' is outside configured library directories"
|
||||
)
|
||||
|
||||
|
||||
class ModelLifecycleService:
|
||||
"""Co-ordinate destructive and mutating model operations."""
|
||||
|
||||
@@ -74,6 +103,8 @@ class ModelLifecycleService:
|
||||
if not file_path:
|
||||
raise ValueError("Model path is required")
|
||||
|
||||
_require_path_in_library_roots(file_path, self._scanner, label="File path")
|
||||
|
||||
cache = await self._scanner.get_cached_data()
|
||||
|
||||
cached_entry = None
|
||||
@@ -182,6 +213,8 @@ class ModelLifecycleService:
|
||||
if not file_path:
|
||||
raise ValueError("Model path is required")
|
||||
|
||||
_require_path_in_library_roots(file_path, self._scanner, label="File path")
|
||||
|
||||
metadata_path = os.path.splitext(file_path)[0] + ".metadata.json"
|
||||
metadata = await self._metadata_loader(metadata_path)
|
||||
metadata["exclude"] = True
|
||||
@@ -229,6 +262,8 @@ class ModelLifecycleService:
|
||||
if not file_path:
|
||||
raise ValueError("Model path is required")
|
||||
|
||||
_require_path_in_library_roots(file_path, self._scanner, label="File path")
|
||||
|
||||
if not os.path.exists(file_path):
|
||||
raise ValueError("Model file does not exist")
|
||||
|
||||
@@ -270,6 +305,9 @@ class ModelLifecycleService:
|
||||
if not file_paths:
|
||||
raise ValueError("No file paths provided for deletion")
|
||||
|
||||
for path in file_paths:
|
||||
_require_path_in_library_roots(path, self._scanner, label="File path")
|
||||
|
||||
return await self._scanner.bulk_delete_models(file_paths)
|
||||
|
||||
async def rename_model(
|
||||
@@ -280,6 +318,8 @@ class ModelLifecycleService:
|
||||
if not file_path or not new_file_name:
|
||||
raise ValueError("File path and new file name are required")
|
||||
|
||||
_require_path_in_library_roots(file_path, self._scanner, label="File path")
|
||||
|
||||
invalid_chars = {"/", "\\", ":", "*", "?", '"', "<", ">", "|"}
|
||||
if any(char in new_file_name for char in invalid_chars):
|
||||
raise ValueError("Invalid characters in file name")
|
||||
|
||||
@@ -14,7 +14,7 @@ from ..utils.metadata_manager import MetadataManager
|
||||
from ..utils.civitai_utils import resolve_license_info
|
||||
from .model_cache import ModelCache
|
||||
from .model_hash_index import ModelHashIndex
|
||||
from .model_lifecycle_service import delete_model_artifacts
|
||||
from .model_lifecycle_service import delete_model_artifacts, _require_path_in_library_roots
|
||||
from .service_registry import ServiceRegistry
|
||||
from .websocket_manager import ws_manager
|
||||
from .persistent_model_cache import get_persistent_cache
|
||||
@@ -1394,6 +1394,9 @@ class ModelScanner:
|
||||
|
||||
base_name = os.path.splitext(os.path.basename(source_path))[0]
|
||||
source_dir = os.path.dirname(source_path)
|
||||
|
||||
_require_path_in_library_roots(source_path, self, label="Source path")
|
||||
_require_path_in_library_roots(target_path, self, label="Target path")
|
||||
|
||||
os.makedirs(target_path, exist_ok=True)
|
||||
|
||||
@@ -1566,6 +1569,218 @@ class ModelScanner:
|
||||
|
||||
return cache_entry if metadata else True
|
||||
|
||||
async def sync_cache_from_metadata(
|
||||
self, file_path: str, metadata_dict: Dict[str, Any]
|
||||
) -> bool:
|
||||
"""Opportunistically sync in-memory and persistent caches from metadata.
|
||||
|
||||
Builds a prospective cache entry from *metadata_dict* (deserialized
|
||||
``.metadata.json`` content) and compares it against the current cache
|
||||
entry. When the two are already identical this method returns
|
||||
``False`` without touching anything — avoiding the overhead of
|
||||
``update_single_model_cache``, which always removes and re-inserts
|
||||
the entry, triggers a full resort, and persists via the heavyweight
|
||||
``save_cache()``.
|
||||
|
||||
When differences are detected the update is applied **in-place** with
|
||||
targeted operations:
|
||||
|
||||
* The existing ``raw_data`` entry is modified rather than removed and
|
||||
re-appended (O(1) instead of O(n)).
|
||||
* Tag counts and the hash index are updated incrementally.
|
||||
* The version index is rebuilt only for the affected entry.
|
||||
* ``resort()`` is called **only** when a sort-relevant field changed
|
||||
(``model_name`` / ``file_name`` for name-sort, ``modified`` for
|
||||
date-sort, ``size`` for size-sort).
|
||||
* The persistent (SQLite) cache receives a targeted single-row update
|
||||
via :meth:`PersistentModelCache.update_single_model` rather than a
|
||||
full-table ``save_cache()``.
|
||||
|
||||
Returns:
|
||||
``True`` if any cache update was performed, ``False`` if the
|
||||
caches were already in sync.
|
||||
|
||||
.. note::
|
||||
|
||||
This is a **best-effort** operation. Failures are logged but
|
||||
never propagated — callers should fire-and-forget via
|
||||
:func:`asyncio.create_task`.
|
||||
"""
|
||||
try:
|
||||
return await self._sync_cache_from_metadata_impl(
|
||||
file_path, metadata_dict
|
||||
)
|
||||
except Exception:
|
||||
logger.warning(
|
||||
"sync_cache_from_metadata failed for %s",
|
||||
file_path,
|
||||
exc_info=True,
|
||||
)
|
||||
return False
|
||||
|
||||
async def _sync_cache_from_metadata_impl(
|
||||
self, file_path: str, metadata_dict: Dict[str, Any]
|
||||
) -> bool:
|
||||
cache = await self.get_cached_data()
|
||||
|
||||
# Locate the existing cache entry -----------------------------------
|
||||
existing_idx: Optional[int] = None
|
||||
existing_entry: Optional[Dict[str, Any]] = None
|
||||
for i, item in enumerate(cache.raw_data):
|
||||
if item.get("file_path") == file_path:
|
||||
existing_entry = item
|
||||
existing_idx = i
|
||||
break
|
||||
|
||||
# Build the desired entry from metadata ------------------------------
|
||||
folder_value = (
|
||||
existing_entry.get("folder", "")
|
||||
if existing_entry
|
||||
else self._calculate_folder(file_path)
|
||||
)
|
||||
desired_entry = self._build_cache_entry(
|
||||
metadata_dict,
|
||||
folder=folder_value,
|
||||
file_path_override=file_path,
|
||||
)
|
||||
|
||||
# Ensure sha256 is populated (defensive — metadata should have it)
|
||||
if (
|
||||
not desired_entry.get("sha256")
|
||||
and file_path
|
||||
and os.path.exists(file_path)
|
||||
):
|
||||
try:
|
||||
sha256 = await calculate_sha256(file_path)
|
||||
if sha256:
|
||||
desired_entry["sha256"] = sha256.lower()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Not in cache at all — delegate to the full update path ------------
|
||||
if existing_entry is None:
|
||||
result = await self.update_single_model_cache(
|
||||
file_path, file_path, metadata_dict
|
||||
)
|
||||
return bool(result)
|
||||
|
||||
# Compare — skip everything if already in sync -----------------------
|
||||
if not self._cache_entries_differ(existing_entry, desired_entry):
|
||||
return False
|
||||
|
||||
# Re-validate: the cache may have been replaced concurrently
|
||||
# (e.g. by _apply_scan_result). Use identity check, not equality,
|
||||
# so we detect when the raw_data list was swapped out from under us.
|
||||
if self._cache is None or not any(
|
||||
item is existing_entry for item in self._cache.raw_data
|
||||
):
|
||||
return False
|
||||
|
||||
# ---- Differences detected: apply targeted, in-place updates --------
|
||||
|
||||
# Snapshot old values for delta computations
|
||||
old_tags = list(existing_entry.get("tags") or [])
|
||||
old_sha256: str = existing_entry.get("sha256", "") or ""
|
||||
old_model_name: str = existing_entry.get("model_name", "") or ""
|
||||
old_file_name: str = existing_entry.get("file_name", "") or ""
|
||||
old_modified: float = float(existing_entry.get("modified", 0.0) or 0.0)
|
||||
old_size: int = int(existing_entry.get("size", 0) or 0)
|
||||
old_civitai = existing_entry.get("civitai")
|
||||
|
||||
# ---- In-place update of the cache entry ----
|
||||
existing_entry.clear()
|
||||
existing_entry.update(desired_entry)
|
||||
|
||||
# ---- Incremental tag count update ----
|
||||
new_tags: set = set(desired_entry.get("tags") or [])
|
||||
old_tag_set: set = set(old_tags)
|
||||
for tag in old_tag_set - new_tags:
|
||||
current = self._tags_count.get(tag, 0)
|
||||
if current <= 1:
|
||||
self._tags_count.pop(tag, None)
|
||||
else:
|
||||
self._tags_count[tag] = current - 1
|
||||
for tag in new_tags - old_tag_set:
|
||||
self._tags_count[tag] = self._tags_count.get(tag, 0) + 1
|
||||
|
||||
# ---- Incremental hash index update ----
|
||||
new_sha = (desired_entry.get("sha256", "") or "").lower()
|
||||
old_sha = (old_sha256 or "").lower()
|
||||
if new_sha != old_sha:
|
||||
if old_sha:
|
||||
self._hash_index.remove_by_path(file_path)
|
||||
if new_sha:
|
||||
self._hash_index.add_entry(new_sha, file_path)
|
||||
|
||||
# ---- Incremental version index update ----
|
||||
new_civitai = desired_entry.get("civitai")
|
||||
if old_civitai != new_civitai:
|
||||
temp_old = {
|
||||
"file_path": file_path,
|
||||
"file_name": old_file_name,
|
||||
"civitai": old_civitai,
|
||||
}
|
||||
cache.remove_from_version_index(temp_old)
|
||||
cache.add_to_version_index(existing_entry)
|
||||
|
||||
# ---- Conditional resort (only when sort-key fields changed) ----
|
||||
need_resort = False
|
||||
_last = cache._last_sort
|
||||
sort_key: Optional[str] = _last[0] if _last != (None, None) else None
|
||||
if sort_key == "name":
|
||||
if (
|
||||
old_model_name != desired_entry.get("model_name", "")
|
||||
or old_file_name != desired_entry.get("file_name", "")
|
||||
):
|
||||
need_resort = True
|
||||
elif sort_key == "date":
|
||||
if old_modified != float(desired_entry.get("modified", 0.0) or 0.0):
|
||||
need_resort = True
|
||||
elif sort_key == "size":
|
||||
if old_size != int(desired_entry.get("size", 0) or 0):
|
||||
need_resort = True
|
||||
|
||||
if need_resort:
|
||||
await cache.resort()
|
||||
|
||||
# ---- Targeted SQL update (single row, not full save_cache) ----
|
||||
persistent = getattr(self, "_persistent_cache", None)
|
||||
if persistent is not None:
|
||||
old_item_for_sql: Dict[str, Any] = {
|
||||
"file_path": file_path,
|
||||
"tags": old_tags,
|
||||
"sha256": old_sha256,
|
||||
}
|
||||
await asyncio.get_event_loop().run_in_executor(
|
||||
None,
|
||||
persistent.update_single_model,
|
||||
self.model_type,
|
||||
desired_entry,
|
||||
old_item_for_sql,
|
||||
)
|
||||
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
def _cache_entries_differ(a: Dict[str, Any], b: Dict[str, Any]) -> bool:
|
||||
"""Return ``True`` when two cache-entry dicts differ in any field.
|
||||
|
||||
Tag lists are compared order-insensitively; all other keys use
|
||||
standard equality.
|
||||
"""
|
||||
a_tags = sorted(a.get("tags") or [])
|
||||
b_tags = sorted(b.get("tags") or [])
|
||||
if a_tags != b_tags:
|
||||
return True
|
||||
|
||||
all_keys = set(a.keys()) | set(b.keys())
|
||||
for key in all_keys:
|
||||
if key == "tags":
|
||||
continue
|
||||
if a.get(key) != b.get(key):
|
||||
return True
|
||||
return False
|
||||
|
||||
def has_hash(self, sha256: str) -> bool:
|
||||
"""Check if a model with given hash exists"""
|
||||
return self._hash_index.has_hash(sha256.lower())
|
||||
@@ -1618,7 +1833,32 @@ class ModelScanner:
|
||||
if limit == 0:
|
||||
return sorted_tags
|
||||
return sorted_tags[:limit]
|
||||
|
||||
|
||||
async def search_tags(
|
||||
self, query: str, limit: int = 50
|
||||
) -> List[Dict[str, any]]:
|
||||
"""Search tags by case-insensitive substring match, sorted by count.
|
||||
|
||||
If query is empty, behaves like get_top_tags (returns top ``limit``
|
||||
tags). If limit is 0, all matching tags are returned.
|
||||
"""
|
||||
await self.get_cached_data()
|
||||
|
||||
normalized_query = (query or "").strip().lower()
|
||||
if not normalized_query:
|
||||
return await self.get_top_tags(limit if limit > 0 else 20)
|
||||
|
||||
matched = [
|
||||
{"tag": tag, "count": count}
|
||||
for tag, count in self._tags_count.items()
|
||||
if normalized_query in tag.lower()
|
||||
]
|
||||
matched.sort(key=lambda x: x["count"], reverse=True)
|
||||
|
||||
if limit == 0:
|
||||
return matched
|
||||
return matched[:limit]
|
||||
|
||||
async def get_base_models(self, limit: int = 20) -> List[Dict[str, any]]:
|
||||
"""Get base models sorted by count. If limit is 0, return all."""
|
||||
cache = await self.get_cached_data()
|
||||
@@ -1734,6 +1974,8 @@ class ModelScanner:
|
||||
break
|
||||
|
||||
try:
|
||||
_require_path_in_library_roots(file_path, self, label="File path")
|
||||
|
||||
target_dir = os.path.dirname(file_path)
|
||||
base_name = os.path.basename(file_path)
|
||||
file_name, main_extension = os.path.splitext(base_name)
|
||||
|
||||
@@ -587,6 +587,95 @@ class PersistentModelCache:
|
||||
placeholders = ", ".join(["?"] * len(self._MODEL_COLUMNS))
|
||||
return f"INSERT INTO models ({columns}) VALUES ({placeholders})"
|
||||
|
||||
def update_single_model(
|
||||
self,
|
||||
model_type: str,
|
||||
new_item: Dict,
|
||||
old_item: Optional[Dict] = None,
|
||||
) -> None:
|
||||
"""Update a single model row in the persistent cache.
|
||||
|
||||
A lightweight alternative to :meth:`save_cache` that performs a targeted
|
||||
DELETE + INSERT for the model row and computes incremental tag / hash-index
|
||||
deltas from *old_item*. When *old_item* is omitted the previous tags and
|
||||
hash are not cleaned up (callers should only omit it for brand-new entries).
|
||||
|
||||
All operations run inside a single transaction so readers see a consistent
|
||||
view.
|
||||
"""
|
||||
if not self.is_enabled():
|
||||
return
|
||||
if not self._schema_initialized:
|
||||
self._initialize_schema()
|
||||
if not self._schema_initialized:
|
||||
return
|
||||
|
||||
file_path: Optional[str] = new_item.get("file_path")
|
||||
if not file_path:
|
||||
return
|
||||
|
||||
try:
|
||||
with self._db_lock:
|
||||
conn = self._connect()
|
||||
try:
|
||||
conn.execute("PRAGMA foreign_keys = ON")
|
||||
conn.execute("BEGIN")
|
||||
|
||||
# --- model row (DELETE + INSERT = upsert) ---
|
||||
conn.execute(
|
||||
"DELETE FROM models WHERE model_type = ? AND file_path = ?",
|
||||
(model_type, file_path),
|
||||
)
|
||||
row = self._prepare_model_row(model_type, new_item)
|
||||
conn.execute(self._insert_model_sql(), row)
|
||||
|
||||
# --- tags ---
|
||||
new_tags: set = set(new_item.get("tags") or [])
|
||||
old_tags: set = set(old_item.get("tags") or []) if old_item else set()
|
||||
tags_to_delete = old_tags - new_tags
|
||||
tags_to_insert = new_tags - old_tags
|
||||
|
||||
if tags_to_delete:
|
||||
conn.executemany(
|
||||
"DELETE FROM model_tags WHERE model_type = ? AND file_path = ? AND tag = ?",
|
||||
[(model_type, file_path, t) for t in tags_to_delete],
|
||||
)
|
||||
if tags_to_insert:
|
||||
conn.executemany(
|
||||
"INSERT INTO model_tags (model_type, file_path, tag) VALUES (?, ?, ?)",
|
||||
[(model_type, file_path, t) for t in tags_to_insert],
|
||||
)
|
||||
|
||||
# --- hash_index ---
|
||||
new_sha: Optional[str] = (new_item.get("sha256") or "").lower() or None
|
||||
old_sha: Optional[str] = (
|
||||
(old_item.get("sha256") or "").lower() or None
|
||||
) if old_item else None
|
||||
if new_sha != old_sha:
|
||||
if old_sha:
|
||||
conn.execute(
|
||||
"DELETE FROM hash_index WHERE model_type = ? AND sha256 = ? AND file_path = ?",
|
||||
(model_type, old_sha, file_path),
|
||||
)
|
||||
if new_sha:
|
||||
conn.execute(
|
||||
"INSERT OR IGNORE INTO hash_index (model_type, sha256, file_path) VALUES (?, ?, ?)",
|
||||
(model_type, new_sha, file_path),
|
||||
)
|
||||
|
||||
conn.execute("COMMIT")
|
||||
except Exception:
|
||||
conn.execute("ROLLBACK")
|
||||
raise
|
||||
finally:
|
||||
conn.close()
|
||||
except Exception as exc:
|
||||
logger.warning(
|
||||
"Failed to update single model in persistent cache (%s): %s",
|
||||
file_path,
|
||||
exc,
|
||||
)
|
||||
|
||||
def _load_tags(self, conn: sqlite3.Connection, model_type: str) -> Dict[str, List[str]]:
|
||||
tag_rows = conn.execute(
|
||||
"SELECT file_path, tag FROM model_tags WHERE model_type = ?",
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import asyncio
|
||||
from typing import Iterable, List, Dict, Optional
|
||||
from dataclasses import dataclass, field
|
||||
from operator import itemgetter
|
||||
from natsort import natsorted
|
||||
|
||||
|
||||
@@ -149,5 +148,10 @@ class RecipeCache:
|
||||
)
|
||||
if not name_only:
|
||||
self.sorted_by_date = sorted(
|
||||
self.raw_data, key=itemgetter("created_date", "file_path"), reverse=True
|
||||
self.raw_data,
|
||||
key=lambda x: (
|
||||
x.get("modified", x.get("created_date", 0)),
|
||||
x.get("file_path", ""),
|
||||
),
|
||||
reverse=True,
|
||||
)
|
||||
|
||||
@@ -216,11 +216,12 @@ class RecipePersistenceService:
|
||||
"preview_nsfw_level",
|
||||
"favorite",
|
||||
"gen_params",
|
||||
"base_model",
|
||||
)
|
||||
|
||||
if not any(key in updates for key in allowed_fields):
|
||||
raise RecipeValidationError(
|
||||
"At least one field to update must be provided (title or tags or source_path or preview_nsfw_level or favorite or gen_params)"
|
||||
"At least one field to update must be provided (title or tags or source_path or preview_nsfw_level or favorite or gen_params or base_model)"
|
||||
)
|
||||
|
||||
if "gen_params" in updates and not isinstance(updates["gen_params"], dict):
|
||||
|
||||
@@ -65,6 +65,8 @@ DEFAULT_SETTINGS: Dict[str, Any] = {
|
||||
"onboarding_completed": False,
|
||||
"dismissed_banners": [],
|
||||
"enable_metadata_archive_db": False,
|
||||
"enable_civarchive_api": True,
|
||||
"metadata_provider_order": "civitai_archive_sqlite",
|
||||
"proxy_enabled": False,
|
||||
"proxy_host": "",
|
||||
"proxy_port": "",
|
||||
|
||||
@@ -12,6 +12,7 @@ NODE_TYPES = {
|
||||
"Lora Loader (LoraManager)": 1,
|
||||
"Lora Stacker (LoraManager)": 2,
|
||||
"WanVideo Lora Select (LoraManager)": 3,
|
||||
"Create Hook LoRA (LoraManager)": 4,
|
||||
}
|
||||
|
||||
# Default ComfyUI node color when bgcolor is null
|
||||
|
||||
@@ -113,6 +113,35 @@ def get_model_folder(model_hash: str, library_name: Optional[str] = None) -> str
|
||||
exc,
|
||||
)
|
||||
return legacy_folder
|
||||
elif not os.path.exists(resolved_folder):
|
||||
# Reverse migration: when consolidating from multi-library to
|
||||
# single-library mode (e.g. after "default" was cleaned up), look
|
||||
# for existing example images inside library-named subdirectories
|
||||
# and bring them back to the root level.
|
||||
root = get_example_images_root()
|
||||
if root:
|
||||
try:
|
||||
for entry in os.listdir(root):
|
||||
entry_path = os.path.join(root, entry)
|
||||
if not os.path.isdir(entry_path):
|
||||
continue
|
||||
if is_hash_folder(entry) or entry == "_deleted":
|
||||
continue
|
||||
if not _library_folder_has_only_hash_dirs(entry_path):
|
||||
continue
|
||||
legacy = os.path.join(entry_path, normalized_hash)
|
||||
if os.path.exists(legacy):
|
||||
shutil.move(legacy, resolved_folder)
|
||||
logger.info(
|
||||
"Consolidated example images from '%s' to '%s'",
|
||||
legacy, resolved_folder,
|
||||
)
|
||||
break
|
||||
except OSError as exc:
|
||||
logger.error(
|
||||
"Failed to consolidate example images during "
|
||||
"library merge: %s", exc,
|
||||
)
|
||||
|
||||
return resolved_folder
|
||||
|
||||
|
||||
@@ -488,6 +488,12 @@ def calculate_relative_path_for_model(
|
||||
if model_type == "embedding":
|
||||
formatted_path = formatted_path.replace(" ", "_")
|
||||
|
||||
# Sanitize the resolved path to prevent path traversal
|
||||
formatted_path = formatted_path.lstrip("/")
|
||||
while "//" in formatted_path:
|
||||
formatted_path = formatted_path.replace("//", "/")
|
||||
formatted_path = formatted_path.rstrip("/")
|
||||
|
||||
return formatted_path
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
[project]
|
||||
name = "comfyui-lora-manager"
|
||||
description = "Revolutionize your workflow with the ultimate LoRA companion for ComfyUI!"
|
||||
version = "1.1.7"
|
||||
version = "1.1.9"
|
||||
license = {file = "LICENSE"}
|
||||
dependencies = [
|
||||
"aiohttp",
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
import os
|
||||
import sys
|
||||
import json
|
||||
# Ensure the script's directory is on sys.path so that py.* imports resolve
|
||||
# regardless of the current working directory (e.g. when launched via
|
||||
# ComfyUI's python_embeded from the ComfyUI root directory).
|
||||
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||
from py.middleware.cache_middleware import cache_control
|
||||
from py.middleware.error_middleware import api_json_error
|
||||
from py.utils.settings_paths import ensure_settings_file
|
||||
|
||||
@@ -274,6 +274,11 @@
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
/* Inline extra tags (selected but not in top-20/appended after API results) */
|
||||
.filter-tag.extra-tag {
|
||||
border-style: dashed;
|
||||
}
|
||||
|
||||
/* Ensure solid border and full opacity when active or excluded */
|
||||
.filter-tag.special-tag.active,
|
||||
.filter-tag.special-tag.exclude {
|
||||
|
||||
@@ -49,10 +49,6 @@ export const MODEL_CONFIG = {
|
||||
* @returns {Object} Object containing all API endpoints for the model type
|
||||
*/
|
||||
export function getApiEndpoints(modelType) {
|
||||
if (!Object.values(MODEL_TYPES).includes(modelType)) {
|
||||
throw new Error(`Invalid model type: ${modelType}`);
|
||||
}
|
||||
|
||||
return {
|
||||
// Base CRUD operations
|
||||
list: `/api/lm/${modelType}/list`,
|
||||
@@ -93,6 +89,7 @@ export function getApiEndpoints(modelType) {
|
||||
// Query operations
|
||||
scan: `/api/lm/${modelType}/scan`,
|
||||
topTags: `/api/lm/${modelType}/top-tags`,
|
||||
searchTags: `/api/lm/${modelType}/search-tags`,
|
||||
baseModels: `/api/lm/${modelType}/base-models`,
|
||||
roots: `/api/lm/${modelType}/roots`,
|
||||
folders: `/api/lm/${modelType}/folders`,
|
||||
|
||||
@@ -1665,13 +1665,19 @@ export class BulkManager {
|
||||
cancelled = true;
|
||||
});
|
||||
|
||||
const isRecipesPage = state.currentPageType === 'recipes';
|
||||
|
||||
for (const filepath of state.selectedModels) {
|
||||
if (cancelled) {
|
||||
showToast('toast.api.operationCancelled', {}, 'info');
|
||||
break;
|
||||
}
|
||||
try {
|
||||
await getModelApiClient().saveModelMetadata(filepath, { base_model: newBaseModel });
|
||||
if (isRecipesPage) {
|
||||
await updateRecipeMetadata(filepath, { base_model: newBaseModel });
|
||||
} else {
|
||||
await getModelApiClient().saveModelMetadata(filepath, { base_model: newBaseModel });
|
||||
}
|
||||
successCount++;
|
||||
} catch (error) {
|
||||
errorCount++;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { getCurrentPageState } from '../state/index.js';
|
||||
import { showToast, updatePanelPositions } from '../utils/uiHelpers.js';
|
||||
import { getModelApiClient } from '../api/modelApiFactory.js';
|
||||
import { getApiEndpoints } from '../api/apiConfig.js';
|
||||
import { removeStorageItem, setStorageItem, getStorageItem } from '../utils/storageHelpers.js';
|
||||
import { MODEL_TYPE_DISPLAY_NAMES } from '../utils/constants.js';
|
||||
import { translate } from '../utils/i18nHelpers.js';
|
||||
@@ -24,6 +25,12 @@ export class FilterManager {
|
||||
this.baseModelOptions = [];
|
||||
this.tagsLoaded = false;
|
||||
|
||||
// Tag search state
|
||||
this.modelTagsSearchInput = document.getElementById('modelTagsSearchInput');
|
||||
this.tagSearchDebounceTimer = null;
|
||||
this.tagSearchAbortController = null;
|
||||
this.tagSearchQuery = '';
|
||||
|
||||
// Initialize preset manager
|
||||
this.presetManager = new FilterPresetManager({
|
||||
page: this.currentPage,
|
||||
@@ -123,6 +130,60 @@ export class FilterManager {
|
||||
this.renderBaseModelTags();
|
||||
});
|
||||
}
|
||||
|
||||
if (this.modelTagsSearchInput) {
|
||||
this.modelTagsSearchInput.addEventListener('input', () => {
|
||||
clearTimeout(this.tagSearchDebounceTimer);
|
||||
this.tagSearchDebounceTimer = setTimeout(() => {
|
||||
this.handleTagSearchInput();
|
||||
}, 150);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
handleTagSearchInput() {
|
||||
const query = (this.modelTagsSearchInput?.value || '').trim();
|
||||
const trimmedQuery = query.toLowerCase();
|
||||
if (trimmedQuery === this.tagSearchQuery) return;
|
||||
this.tagSearchQuery = trimmedQuery;
|
||||
|
||||
if (!trimmedQuery) {
|
||||
// Empty query: reload top tags (default/common view)
|
||||
this.loadTopTags();
|
||||
return;
|
||||
}
|
||||
this.searchTags(trimmedQuery);
|
||||
}
|
||||
|
||||
async searchTags(query) {
|
||||
// Abort any in-flight search request
|
||||
if (this.tagSearchAbortController) {
|
||||
this.tagSearchAbortController.abort();
|
||||
}
|
||||
this.tagSearchAbortController = new AbortController();
|
||||
const controller = this.tagSearchAbortController;
|
||||
|
||||
try {
|
||||
const tagsEndpoint = `${getApiEndpoints(this.currentPage).searchTags}?q=${encodeURIComponent(query)}&limit=20`;
|
||||
const response = await fetch(tagsEndpoint, { signal: controller.signal });
|
||||
if (!response.ok) throw new Error('Failed to search tags');
|
||||
const data = await response.json();
|
||||
if (controller.signal.aborted) return; // stale response
|
||||
if (data.success && data.tags) {
|
||||
this.createTagFilterElements(data.tags);
|
||||
} else {
|
||||
throw new Error('Invalid response format');
|
||||
}
|
||||
} catch (error) {
|
||||
if (error.name === 'AbortError') return; // expected, ignore
|
||||
console.error('Error searching tags:', error);
|
||||
const tagsContainer = document.getElementById('modelTagsFilter');
|
||||
if (tagsContainer) {
|
||||
tagsContainer.innerHTML = '<div class="tags-error">Failed to search tags</div>';
|
||||
}
|
||||
const emptyState = document.getElementById('modelTagsEmptyState');
|
||||
if (emptyState) emptyState.hidden = true;
|
||||
}
|
||||
}
|
||||
|
||||
getNormalizedSearchQuery(input) {
|
||||
@@ -146,15 +207,24 @@ export class FilterManager {
|
||||
}
|
||||
|
||||
async loadTopTags() {
|
||||
// Abort any in-flight tag search request
|
||||
if (this.tagSearchAbortController) {
|
||||
this.tagSearchAbortController.abort();
|
||||
this.tagSearchAbortController = null;
|
||||
}
|
||||
this.tagSearchQuery = '';
|
||||
|
||||
try {
|
||||
// Show loading state
|
||||
const tagsContainer = document.getElementById('modelTagsFilter');
|
||||
const emptyState = document.getElementById('modelTagsEmptyState');
|
||||
if (!tagsContainer) return;
|
||||
if (emptyState) emptyState.hidden = true;
|
||||
|
||||
tagsContainer.innerHTML = '<div class="tags-loading">Loading tags...</div>';
|
||||
|
||||
// Determine the API endpoint based on the page type
|
||||
const tagsEndpoint = `/api/lm/${this.currentPage}/top-tags?limit=20`;
|
||||
const tagsEndpoint = `${getApiEndpoints(this.currentPage).topTags}?limit=20`;
|
||||
|
||||
const response = await fetch(tagsEndpoint);
|
||||
if (!response.ok) throw new Error('Failed to fetch tags');
|
||||
@@ -179,29 +249,38 @@ export class FilterManager {
|
||||
|
||||
createTagFilterElements(tags) {
|
||||
const tagsContainer = document.getElementById('modelTagsFilter');
|
||||
const emptyState = document.getElementById('modelTagsEmptyState');
|
||||
if (!tagsContainer) return;
|
||||
|
||||
tagsContainer.innerHTML = '';
|
||||
if (emptyState) emptyState.hidden = true;
|
||||
|
||||
// Collect existing tag names from the API response
|
||||
const existingTagNames = new Set(tags.map(t => t.tag));
|
||||
|
||||
// Add any active filter tags that aren't in the top 20
|
||||
// Collect active filter tags that aren't in the response (excluding __no_tags__)
|
||||
const missingSelectedTags = [];
|
||||
if (this.filters.tags) {
|
||||
Object.keys(this.filters.tags).forEach(tagName => {
|
||||
// Skip special tags like __no_tags__
|
||||
if (tagName.startsWith('__')) return;
|
||||
|
||||
if (!existingTagNames.has(tagName)) {
|
||||
// Add this tag to the list with count 0 (unknown)
|
||||
tags.push({ tag: tagName, count: 0 });
|
||||
missingSelectedTags.push({ tag: tagName, count: 0 });
|
||||
existingTagNames.add(tagName);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Append missing selected tags after the API results so they appear inline
|
||||
for (const t of missingSelectedTags) {
|
||||
tags.push(t);
|
||||
}
|
||||
|
||||
if (!tags.length) {
|
||||
tagsContainer.innerHTML = `<div class="no-tags">No ${this.currentPage === 'recipes' ? 'recipe ' : ''}tags available</div>`;
|
||||
if (this.tagSearchQuery) {
|
||||
if (emptyState) emptyState.hidden = false;
|
||||
} else {
|
||||
tagsContainer.innerHTML = `<div class="no-tags">No ${this.currentPage === 'recipes' ? 'recipe ' : ''}tags available</div>`;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -209,6 +288,10 @@ export class FilterManager {
|
||||
const tagEl = document.createElement('div');
|
||||
tagEl.className = 'filter-tag tag-filter';
|
||||
const tagName = tag.tag;
|
||||
|
||||
if (missingSelectedTags.some(t => t.tag === tagName)) {
|
||||
tagEl.classList.add('extra-tag');
|
||||
}
|
||||
tagEl.dataset.tag = tagName;
|
||||
|
||||
// Show count only if it's > 0 (known count)
|
||||
@@ -234,26 +317,28 @@ export class FilterManager {
|
||||
tagsContainer.appendChild(tagEl);
|
||||
});
|
||||
|
||||
// Add "No tags" as a special filter at the end
|
||||
const noTagsEl = document.createElement('div');
|
||||
noTagsEl.className = 'filter-tag tag-filter special-tag';
|
||||
const noTagsLabel = translate('header.filter.noTags', {}, 'No tags');
|
||||
const noTagsKey = '__no_tags__';
|
||||
noTagsEl.dataset.tag = noTagsKey;
|
||||
noTagsEl.innerHTML = noTagsLabel;
|
||||
// Add "No tags" as a special filter at the end (skip during search)
|
||||
if (!this.tagSearchQuery) {
|
||||
const noTagsEl = document.createElement('div');
|
||||
noTagsEl.className = 'filter-tag tag-filter special-tag';
|
||||
const noTagsLabel = translate('header.filter.noTags', {}, 'No tags');
|
||||
const noTagsKey = '__no_tags__';
|
||||
noTagsEl.dataset.tag = noTagsKey;
|
||||
noTagsEl.innerHTML = noTagsLabel;
|
||||
|
||||
noTagsEl.addEventListener('click', async () => {
|
||||
const currentState = (this.filters.tags && this.filters.tags[noTagsKey]) || 'none';
|
||||
const newState = this.getNextTriStateState(currentState);
|
||||
this.setTagFilterState(noTagsKey, newState);
|
||||
this.applyTagElementState(noTagsEl, newState);
|
||||
noTagsEl.addEventListener('click', async () => {
|
||||
const currentState = (this.filters.tags && this.filters.tags[noTagsKey]) || 'none';
|
||||
const newState = this.getNextTriStateState(currentState);
|
||||
this.setTagFilterState(noTagsKey, newState);
|
||||
this.applyTagElementState(noTagsEl, newState);
|
||||
|
||||
this.updateActiveFiltersCount();
|
||||
this.updateActiveFiltersCount();
|
||||
|
||||
await this.applyFilters(false);
|
||||
});
|
||||
await this.applyFilters(false);
|
||||
});
|
||||
|
||||
tagsContainer.appendChild(noTagsEl);
|
||||
tagsContainer.appendChild(noTagsEl);
|
||||
}
|
||||
this.updateTagSelections();
|
||||
}
|
||||
|
||||
@@ -341,7 +426,7 @@ export class FilterManager {
|
||||
if (!baseModelTagsContainer) return;
|
||||
|
||||
// Set the API endpoint based on current page
|
||||
const apiEndpoint = `/api/lm/${this.currentPage}/base-models?limit=0`;
|
||||
const apiEndpoint = `${getApiEndpoints(this.currentPage).baseModels}?limit=0`;
|
||||
|
||||
// Fetch base models
|
||||
fetch(apiEndpoint)
|
||||
@@ -721,6 +806,16 @@ export class FilterManager {
|
||||
tagLogic: 'any'
|
||||
});
|
||||
|
||||
// Clear tag search input and reset search state
|
||||
if (this.modelTagsSearchInput) {
|
||||
this.modelTagsSearchInput.value = '';
|
||||
}
|
||||
this.tagSearchQuery = '';
|
||||
if (this.tagSearchAbortController) {
|
||||
this.tagSearchAbortController.abort();
|
||||
this.tagSearchAbortController = null;
|
||||
}
|
||||
|
||||
// Update tag logic toggle UI
|
||||
this.updateTagLogicToggleUI();
|
||||
|
||||
@@ -731,6 +826,10 @@ export class FilterManager {
|
||||
// Update UI
|
||||
this.updateTagSelections();
|
||||
this.updateActiveFiltersCount();
|
||||
// Reload tag area to drop any non-top-20 tags from the deactivated preset
|
||||
if (this.tagsLoaded) {
|
||||
await this.loadTopTags();
|
||||
}
|
||||
this.presetManager.renderPresets(); // Re-render to remove active state
|
||||
|
||||
// Remove from local Storage
|
||||
|
||||
@@ -478,11 +478,9 @@ export class FilterPresetManager {
|
||||
const pageState = getCurrentPageState();
|
||||
pageState.filters = this.filterManager.cloneFilters();
|
||||
|
||||
// If tags haven't been loaded yet, load them first
|
||||
if (!this.filterManager.tagsLoaded) {
|
||||
await this.filterManager.loadTopTags();
|
||||
this.filterManager.tagsLoaded = true;
|
||||
}
|
||||
// Refresh tag display so preset's non-top-20 tags appear inline
|
||||
await this.filterManager.loadTopTags();
|
||||
this.filterManager.tagsLoaded = true;
|
||||
|
||||
// Check again after async operation
|
||||
if (requestId !== this.applyPresetRequestId) return;
|
||||
@@ -745,8 +743,16 @@ export class FilterPresetManager {
|
||||
presetEl.classList.add('active');
|
||||
}
|
||||
|
||||
presetEl.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
// Apply preset on click (toggle if already active)
|
||||
// Bind to the whole .filter-preset div so clicking anywhere inside triggers apply
|
||||
presetEl.addEventListener('click', async () => {
|
||||
this.cancelPendingDelete();
|
||||
|
||||
if (this.activePreset === preset.name) {
|
||||
await this.filterManager.clearFilters();
|
||||
} else {
|
||||
await this.applyPreset(preset.name);
|
||||
}
|
||||
});
|
||||
|
||||
const presetName = document.createElement('span');
|
||||
@@ -759,18 +765,6 @@ export class FilterPresetManager {
|
||||
deleteBtn.innerHTML = '<i class="fas fa-times"></i>';
|
||||
deleteBtn.title = translate('header.filter.presetDeleteTooltip', {}, 'Delete preset');
|
||||
|
||||
// Apply preset on name click (toggle if already active)
|
||||
presetName.addEventListener('click', async (e) => {
|
||||
e.stopPropagation();
|
||||
this.cancelPendingDelete();
|
||||
|
||||
if (this.activePreset === preset.name) {
|
||||
await this.filterManager.clearFilters();
|
||||
} else {
|
||||
await this.applyPreset(preset.name);
|
||||
}
|
||||
});
|
||||
|
||||
// Two-step delete on delete button click
|
||||
deleteBtn.addEventListener('click', (e) => {
|
||||
e.stopPropagation();
|
||||
|
||||
@@ -2346,6 +2346,16 @@ export class SettingsManager {
|
||||
enableMetadataArchiveCheckbox.checked = state.global.settings.enable_metadata_archive_db || false;
|
||||
}
|
||||
|
||||
const enableCivarchiveApiCheckbox = document.getElementById('enableCivarchiveApi');
|
||||
if (enableCivarchiveApiCheckbox) {
|
||||
enableCivarchiveApiCheckbox.checked = state.global.settings.enable_civarchive_api ?? true;
|
||||
}
|
||||
|
||||
const metadataProviderOrderSelect = document.getElementById('metadataProviderOrder');
|
||||
if (metadataProviderOrderSelect) {
|
||||
metadataProviderOrderSelect.value = state.global.settings.metadata_provider_order || 'civitai_archive_sqlite';
|
||||
}
|
||||
|
||||
// Load status
|
||||
await this.updateMetadataArchiveStatus();
|
||||
} catch (error) {
|
||||
|
||||
@@ -13,6 +13,8 @@ const DEFAULT_SETTINGS_BASE = Object.freeze({
|
||||
language: 'en',
|
||||
show_only_sfw: false,
|
||||
enable_metadata_archive_db: false,
|
||||
enable_civarchive_api: true,
|
||||
metadata_provider_order: 'civitai_archive_sqlite',
|
||||
proxy_enabled: false,
|
||||
proxy_type: 'http',
|
||||
proxy_host: '',
|
||||
|
||||
@@ -369,21 +369,24 @@ export function getMatureBlurThreshold(settings = {}) {
|
||||
export const NODE_TYPES = {
|
||||
LORA_LOADER: 1,
|
||||
LORA_STACKER: 2,
|
||||
WAN_VIDEO_LORA_SELECT: 3
|
||||
WAN_VIDEO_LORA_SELECT: 3,
|
||||
HOOK_LORA: 4
|
||||
};
|
||||
|
||||
// Node type names to IDs mapping
|
||||
export const NODE_TYPE_NAMES = {
|
||||
"Lora Loader (LoraManager)": NODE_TYPES.LORA_LOADER,
|
||||
"Lora Stacker (LoraManager)": NODE_TYPES.LORA_STACKER,
|
||||
"WanVideo Lora Select (LoraManager)": NODE_TYPES.WAN_VIDEO_LORA_SELECT
|
||||
"WanVideo Lora Select (LoraManager)": NODE_TYPES.WAN_VIDEO_LORA_SELECT,
|
||||
"Create Hook LoRA (LoraManager)": NODE_TYPES.HOOK_LORA
|
||||
};
|
||||
|
||||
// Node type icons
|
||||
export const NODE_TYPE_ICONS = {
|
||||
[NODE_TYPES.LORA_LOADER]: "fas fa-l",
|
||||
[NODE_TYPES.LORA_STACKER]: "fas fa-s",
|
||||
[NODE_TYPES.WAN_VIDEO_LORA_SELECT]: "fas fa-w"
|
||||
[NODE_TYPES.WAN_VIDEO_LORA_SELECT]: "fas fa-w",
|
||||
[NODE_TYPES.HOOK_LORA]: "fas fa-h"
|
||||
};
|
||||
|
||||
// Default ComfyUI node color when bgcolor is null
|
||||
|
||||
@@ -141,6 +141,20 @@ const PARAM_TO_WIDGET_CANDIDATES = {
|
||||
scheduler: ['scheduler'],
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Node-type-specific widget name overrides.
|
||||
// Keys are ComfyUI node class names (e.g. "GlobalSeed //Inspire").
|
||||
// Values are partial PARAM_TO_WIDGET_CANDIDATES maps; the per-node candidates
|
||||
// are tried *before* the global ones. Only the params listed here are
|
||||
// overridden — every other param still uses the global candidates.
|
||||
// ---------------------------------------------------------------------------
|
||||
const NODE_TYPE_WIDGET_OVERRIDES = {
|
||||
// Inspire Pack — Global Seed node stores the seed in a widget named "value"
|
||||
'GlobalSeed //Inspire': {
|
||||
seed: ['value'],
|
||||
},
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Parse a combined sampler+scheduler value (space-separated or underscore)
|
||||
// e.g., "Euler a Karras", "DPM++ 2M beta", "er_sde_beta"
|
||||
@@ -235,7 +249,7 @@ function resolveSamplerScheduler(rawValue) {
|
||||
// Find which gen params can be sent to a given node, matching by widget names
|
||||
// Returns array of { widgetName, value } objects
|
||||
// ---------------------------------------------------------------------------
|
||||
function findMatchingWidgets(nodeWidgetNames, resolvedParams) {
|
||||
function findMatchingWidgets(nodeWidgetNames, resolvedParams, nodeType) {
|
||||
if (!nodeWidgetNames || !Array.isArray(nodeWidgetNames) || nodeWidgetNames.length === 0) {
|
||||
return [];
|
||||
}
|
||||
@@ -243,6 +257,26 @@ function findMatchingWidgets(nodeWidgetNames, resolvedParams) {
|
||||
const widgetSet = new Set(nodeWidgetNames.map(w => String(w).toLowerCase()));
|
||||
const updates = [];
|
||||
|
||||
// Resolve node-type-specific overrides (if any)
|
||||
const typeOverrides =
|
||||
nodeType && typeof nodeType === 'string'
|
||||
? (NODE_TYPE_WIDGET_OVERRIDES[nodeType] || {})
|
||||
: {};
|
||||
|
||||
/**
|
||||
* Build the effective candidate list for a parameter:
|
||||
* type-specific overrides (if any) come first, then the global candidates.
|
||||
*/
|
||||
function getCandidates(key) {
|
||||
const global = PARAM_TO_WIDGET_CANDIDATES[key] || [key];
|
||||
const extra = typeOverrides[key];
|
||||
if (extra && Array.isArray(extra) && extra.length > 0) {
|
||||
// Prepend type-specific candidates; keep global as fallback
|
||||
return [...extra, ...global];
|
||||
}
|
||||
return global;
|
||||
}
|
||||
|
||||
// Simple numeric/string params: seed, steps, cfg
|
||||
const simpleParams = [
|
||||
{ key: 'seed', value: resolvedParams.seed },
|
||||
@@ -251,10 +285,10 @@ function findMatchingWidgets(nodeWidgetNames, resolvedParams) {
|
||||
];
|
||||
for (const { key, value } of simpleParams) {
|
||||
if (value === undefined || value === null || value === '') continue;
|
||||
const candidates = PARAM_TO_WIDGET_CANDIDATES[key] || [key];
|
||||
const candidates = getCandidates(key);
|
||||
for (const candidate of candidates) {
|
||||
if (widgetSet.has(candidate.toLowerCase())) {
|
||||
updates.push({ widgetName: candidate, value: String(value) });
|
||||
updates.push({ widgetName: candidate, value });
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -262,7 +296,7 @@ function findMatchingWidgets(nodeWidgetNames, resolvedParams) {
|
||||
|
||||
// Sampler
|
||||
if (resolvedParams.sampler) {
|
||||
const candidates = PARAM_TO_WIDGET_CANDIDATES.sampler;
|
||||
const candidates = getCandidates('sampler');
|
||||
for (const candidate of candidates) {
|
||||
if (widgetSet.has(candidate.toLowerCase())) {
|
||||
updates.push({ widgetName: candidate, value: resolvedParams.sampler });
|
||||
@@ -273,7 +307,7 @@ function findMatchingWidgets(nodeWidgetNames, resolvedParams) {
|
||||
|
||||
// Scheduler
|
||||
if (resolvedParams.scheduler) {
|
||||
const candidates = PARAM_TO_WIDGET_CANDIDATES.scheduler;
|
||||
const candidates = getCandidates('scheduler');
|
||||
for (const candidate of candidates) {
|
||||
if (widgetSet.has(candidate.toLowerCase())) {
|
||||
updates.push({ widgetName: candidate, value: resolvedParams.scheduler });
|
||||
@@ -290,6 +324,7 @@ export {
|
||||
SCHEDULER_SUFFIXES,
|
||||
SCHEDULER_ONLY_VALUES,
|
||||
PARAM_TO_WIDGET_CANDIDATES,
|
||||
NODE_TYPE_WIDGET_OVERRIDES,
|
||||
parseCombinedSamplerName,
|
||||
resolveSamplerScheduler,
|
||||
findMatchingWidgets,
|
||||
|
||||
@@ -134,7 +134,10 @@ export async function copyToClipboard(text, successMessage = null) {
|
||||
}
|
||||
|
||||
export function showToast(key, params = {}, type = 'info', fallback = null) {
|
||||
const message = translate(key, params, fallback);
|
||||
// Plain messages (contain spaces) are not i18n dot-notation keys — use verbatim
|
||||
// to avoid spurious "Translation key not found" warnings from i18next
|
||||
const isPlainMessage = typeof key === 'string' && /\s/.test(key);
|
||||
const message = isPlainMessage ? key : translate(key, params, fallback);
|
||||
const toast = document.createElement('div');
|
||||
toast.className = `toast toast-${type}`;
|
||||
toast.textContent = message;
|
||||
@@ -605,7 +608,7 @@ function isNodeEnabled(node) {
|
||||
if (!node) {
|
||||
return false;
|
||||
}
|
||||
// ComfyUI node mode: 0 = Normal/Enabled, others = Always/Never/OnEvent
|
||||
// ComfyUI node mode (LGraphEventMode): 0 = Always, 2 = Never, 4 = Bypass
|
||||
return node.mode === undefined || node.mode === 0;
|
||||
}
|
||||
|
||||
@@ -1144,8 +1147,8 @@ export async function sendGenParamsToWorkflow(genParams) {
|
||||
const node = targetNodes[nodeKey];
|
||||
if (!node) continue;
|
||||
|
||||
const widgetNames = node.widget_names || [];
|
||||
const updates = findMatchingWidgets(widgetNames, raw);
|
||||
const widgetNames = getWidgetNames(node);
|
||||
const updates = findMatchingWidgets(widgetNames, raw, node.type_name);
|
||||
|
||||
if (updates.length === 0) {
|
||||
showToast(`Node "${node.title || node.type}" has no matching widgets for these parameters`, {}, 'warning');
|
||||
|
||||
@@ -251,10 +251,15 @@
|
||||
<button class="tag-logic-option" data-value="all" title="{{ t('header.filter.tagLogicAll') }}">{{ t('header.filter.all') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<input type="text" id="modelTagsSearchInput" class="filter-search-input"
|
||||
placeholder="{{ t('header.filter.tagSearchPlaceholder') }}" autocomplete="off">
|
||||
<div class="filter-tags" id="modelTagsFilter">
|
||||
<!-- Top tags will be dynamically inserted here -->
|
||||
<div class="tags-loading">{{ t('common.status.loading') }}</div>
|
||||
</div>
|
||||
<div id="modelTagsEmptyState" class="filter-empty-state" hidden>
|
||||
{{ t('header.filter.noTagMatches') }}
|
||||
</div>
|
||||
</div>
|
||||
{% if current_page == 'loras' or current_page == 'checkpoints' %}
|
||||
<div class="filter-section">
|
||||
|
||||
@@ -144,6 +144,46 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="settings-subsection">
|
||||
<div class="settings-subsection-header">
|
||||
<h4>{{ t('settings.sections.downloads') }}</h4>
|
||||
</div>
|
||||
<div class="setting-item">
|
||||
<div class="setting-row">
|
||||
<div class="setting-info">
|
||||
<label for="downloadBackend">{{ t('settings.downloadBackend.label') }}</label>
|
||||
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.downloadBackend.help') }}"></i>
|
||||
<a class="settings-action-link" href="https://github.com/willmiao/ComfyUI-Lora-Manager/wiki/Aria2-Download-Backend-(Experimental)" target="_blank" rel="noopener" aria-label="{{ t('settings.aria2HelpLink') }}" title="{{ t('settings.aria2HelpLink') }}">
|
||||
<i class="fas fa-question-circle" aria-hidden="true"></i>
|
||||
</a>
|
||||
</div>
|
||||
<div class="setting-control select-control">
|
||||
<select id="downloadBackend" onchange="settingsManager.saveSelectSetting('downloadBackend', 'download_backend')">
|
||||
<option value="python">{{ t('settings.downloadBackend.options.python') }}</option>
|
||||
<option value="aria2">{{ t('settings.downloadBackend.options.aria2') }}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="setting-item" id="aria2PathSetting" style="display: none;">
|
||||
<div class="setting-row">
|
||||
<div class="setting-info">
|
||||
<label for="aria2cPath">{{ t('settings.aria2cPath.label') }}</label>
|
||||
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.aria2cPath.help') }}"></i>
|
||||
</div>
|
||||
<div class="setting-control">
|
||||
<div class="text-input-wrapper">
|
||||
<input type="text"
|
||||
id="aria2cPath"
|
||||
placeholder="{{ t('settings.aria2cPath.placeholder') }}"
|
||||
onblur="settingsManager.saveInputSetting('aria2cPath', 'aria2c_path')"
|
||||
onkeydown="if(event.key === 'Enter') { this.blur(); }" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- AI Provider Configuration (BYOK) -->
|
||||
<div class="settings-subsection">
|
||||
<div class="settings-subsection-header">
|
||||
@@ -250,46 +290,6 @@
|
||||
{{ provider_models_json | safe }}
|
||||
</script>
|
||||
|
||||
<div class="settings-subsection">
|
||||
<div class="settings-subsection-header">
|
||||
<h4>{{ t('settings.sections.downloads') }}</h4>
|
||||
</div>
|
||||
<div class="setting-item">
|
||||
<div class="setting-row">
|
||||
<div class="setting-info">
|
||||
<label for="downloadBackend">{{ t('settings.downloadBackend.label') }}</label>
|
||||
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.downloadBackend.help') }}"></i>
|
||||
<a class="settings-action-link" href="https://github.com/willmiao/ComfyUI-Lora-Manager/wiki/Aria2-Download-Backend-(Experimental)" target="_blank" rel="noopener" aria-label="{{ t('settings.aria2HelpLink') }}" title="{{ t('settings.aria2HelpLink') }}">
|
||||
<i class="fas fa-question-circle" aria-hidden="true"></i>
|
||||
</a>
|
||||
</div>
|
||||
<div class="setting-control select-control">
|
||||
<select id="downloadBackend" onchange="settingsManager.saveSelectSetting('downloadBackend', 'download_backend')">
|
||||
<option value="python">{{ t('settings.downloadBackend.options.python') }}</option>
|
||||
<option value="aria2">{{ t('settings.downloadBackend.options.aria2') }}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="setting-item" id="aria2PathSetting" style="display: none;">
|
||||
<div class="setting-row">
|
||||
<div class="setting-info">
|
||||
<label for="aria2cPath">{{ t('settings.aria2cPath.label') }}</label>
|
||||
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.aria2cPath.help') }}"></i>
|
||||
</div>
|
||||
<div class="setting-control">
|
||||
<div class="text-input-wrapper">
|
||||
<input type="text"
|
||||
id="aria2cPath"
|
||||
placeholder="{{ t('settings.aria2cPath.placeholder') }}"
|
||||
onblur="settingsManager.saveInputSetting('aria2cPath', 'aria2c_path')"
|
||||
onkeydown="if(event.key === 'Enter') { this.blur(); }" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Backup -->
|
||||
<div class="settings-subsection">
|
||||
<div class="settings-subsection-header">
|
||||
@@ -1401,7 +1401,26 @@
|
||||
<div class="settings-input-error-message" id="metadataRefreshSkipPathsError"></div>
|
||||
</div>
|
||||
|
||||
<!-- Metadata Archive -->
|
||||
<!-- CivArchive API provider toggle -->
|
||||
<div class="setting-item">
|
||||
<div class="setting-row">
|
||||
<div class="setting-info">
|
||||
<label for="enableCivarchiveApi">
|
||||
{{ t('settings.metadataArchive.enableCivarchiveApi') }}
|
||||
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.metadataArchive.enableCivarchiveApiHelp') }}"></i>
|
||||
</label>
|
||||
</div>
|
||||
<div class="setting-control">
|
||||
<label class="toggle-switch">
|
||||
<input type="checkbox" id="enableCivarchiveApi"
|
||||
onchange="settingsManager.saveToggleSetting('enableCivarchiveApi', 'enable_civarchive_api')">
|
||||
<span class="toggle-slider"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Metadata Archive DB -->
|
||||
<div class="setting-item">
|
||||
<div class="setting-row">
|
||||
<div class="setting-info">
|
||||
@@ -1419,13 +1438,13 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="setting-item">
|
||||
<div class="metadata-archive-status" id="metadataArchiveStatus">
|
||||
<!-- Status will be populated by JavaScript -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="setting-item">
|
||||
<div class="setting-row">
|
||||
<div class="setting-info">
|
||||
@@ -1444,6 +1463,24 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Metadata provider fallback order -->
|
||||
<div class="setting-item">
|
||||
<div class="setting-row">
|
||||
<div class="setting-info">
|
||||
<label for="metadataProviderOrder">
|
||||
{{ t('settings.metadataArchive.providerOrder') }}
|
||||
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.metadataArchive.providerOrderHelp') }}"></i>
|
||||
</label>
|
||||
</div>
|
||||
<div class="setting-control select-control">
|
||||
<select id="metadataProviderOrder" onchange="settingsManager.saveSelectSetting('metadataProviderOrder', 'metadata_provider_order')">
|
||||
<option value="civitai_archive_sqlite">{{ t('settings.metadataArchive.providerOrderCivitaiArchiveSqlite') }}</option>
|
||||
<option value="civitai_sqlite_archive">{{ t('settings.metadataArchive.providerOrderCivitaiSqliteArchive') }}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -823,3 +823,73 @@ def test_apply_library_settings_ignores_extra_lora_path_overlapping_primary_root
|
||||
"same lora folder" in record.message.lower()
|
||||
for record in caplog.records
|
||||
)
|
||||
|
||||
|
||||
def test_save_paths_removes_stale_empty_default_when_comfyui_exists(
|
||||
monkeypatch: pytest.MonkeyPatch, tmp_path,
|
||||
):
|
||||
"""When an empty-shell 'default' library coexists with 'comfyui', the
|
||||
stale 'default' entry should be removed and 'comfyui' activated."""
|
||||
folder_paths = _setup_config_environment(monkeypatch, tmp_path)
|
||||
|
||||
class FakeSettingsService:
|
||||
def __init__(self):
|
||||
# Replicate the user's settings.json: empty default + populated comfyui
|
||||
self.libraries = {
|
||||
"default": {
|
||||
"folder_paths": {},
|
||||
"extra_folder_paths": {},
|
||||
"default_lora_root": "",
|
||||
"default_checkpoint_root": "",
|
||||
"default_unet_root": "",
|
||||
"default_embedding_root": "",
|
||||
"recipes_path": "",
|
||||
},
|
||||
"comfyui": {
|
||||
"folder_paths": {
|
||||
key: list(value) for key, value in folder_paths.items()
|
||||
},
|
||||
"default_lora_root": folder_paths["loras"][0],
|
||||
"default_checkpoint_root": folder_paths["checkpoints"][0],
|
||||
"default_embedding_root": folder_paths["embeddings"][0],
|
||||
},
|
||||
}
|
||||
# No active_library key — get_active_library_name() falls back to
|
||||
# dict order, returning "default".
|
||||
self.active_library = "default"
|
||||
self.delete_calls: list[str] = []
|
||||
self.upsert_calls: list[tuple[str, dict]] = []
|
||||
|
||||
def get_libraries(self):
|
||||
return dict(self.libraries)
|
||||
|
||||
def delete_library(self, name: str):
|
||||
self.delete_calls.append(name)
|
||||
self.libraries.pop(name, None)
|
||||
|
||||
def rename_library(self, *_):
|
||||
raise AssertionError("rename_library should not be invoked")
|
||||
|
||||
def get_active_library_name(self):
|
||||
return self.active_library
|
||||
|
||||
def upsert_library(self, name: str, **payload):
|
||||
self.upsert_calls.append((name, payload))
|
||||
self.libraries[name] = {**payload}
|
||||
if payload.get("activate"):
|
||||
self.active_library = name
|
||||
|
||||
fake_settings = FakeSettingsService()
|
||||
monkeypatch.setattr(settings_manager_module, "settings", fake_settings)
|
||||
|
||||
config_module.Config()
|
||||
|
||||
assert fake_settings.delete_calls == ["default"]
|
||||
assert "default" not in fake_settings.libraries
|
||||
assert set(fake_settings.libraries.keys()) == {"comfyui"}
|
||||
|
||||
assert len(fake_settings.upsert_calls) == 1
|
||||
name, payload = fake_settings.upsert_calls[0]
|
||||
assert name == "comfyui"
|
||||
assert payload["activate"] is True
|
||||
assert fake_settings.active_library == "comfyui"
|
||||
|
||||
@@ -85,6 +85,7 @@ sys.modules['comfy.utils'] = comfy_mock.utils
|
||||
sys.modules['comfy.sd'] = comfy_mock.sd
|
||||
sys.modules['comfy.model_management'] = comfy_mock.model_management
|
||||
sys.modules['comfy.comfy_types'] = comfy_mock.comfy_types
|
||||
sys.modules['comfy.hooks'] = MockModule("comfy.hooks")
|
||||
|
||||
execution_mock = MockModule("execution")
|
||||
execution_mock.PromptExecutor = mock.MagicMock()
|
||||
|
||||
@@ -113,6 +113,8 @@ function renderControlsDom(pageKey) {
|
||||
<div id="baseModelEmptyState" hidden></div>
|
||||
<div id="filterPresets" class="filter-presets"></div>
|
||||
<div id="modelTagsFilter" class="filter-tags"></div>
|
||||
<input id="modelTagsSearchInput" />
|
||||
<div id="modelTagsEmptyState" hidden></div>
|
||||
<button class="clear-filter"></button>
|
||||
</div>
|
||||
<div class="controls">
|
||||
@@ -961,4 +963,198 @@ describe('PageControls favorites, sorting, and duplicates scenarios', () => {
|
||||
expect(stateModule.state.bulkMode).toBe(true);
|
||||
expect(pageState.duplicatesMode).toBe(true);
|
||||
});
|
||||
|
||||
describe('tag search', () => {
|
||||
it('fetches /search-tags when typing in the tag search input (debounced)', async () => {
|
||||
vi.useFakeTimers();
|
||||
const searchTagsUrls = [];
|
||||
global.fetch = vi.fn((url) => {
|
||||
if (url.includes('/search-tags')) {
|
||||
searchTagsUrls.push(url);
|
||||
return Promise.resolve({
|
||||
ok: true,
|
||||
json: async () => ({ success: true, tags: [{ tag: 'anime', count: 3 }] }),
|
||||
});
|
||||
}
|
||||
if (url.includes('/top-tags')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
|
||||
}
|
||||
if (url.includes('/base-models')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, base_models: [] }) });
|
||||
}
|
||||
if (url.includes('/model-types')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, model_types: [] }) });
|
||||
}
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true }) });
|
||||
});
|
||||
|
||||
renderControlsDom('loras');
|
||||
const stateModule = await import('../../../static/js/state/index.js');
|
||||
stateModule.initPageState('loras');
|
||||
const { FilterManager } = await import('../../../static/js/managers/FilterManager.js');
|
||||
const manager = new FilterManager({ page: 'loras' });
|
||||
|
||||
// Open the panel so tags load
|
||||
manager.toggleFilterPanel();
|
||||
await vi.runAllTimersAsync();
|
||||
|
||||
const input = document.getElementById('modelTagsSearchInput');
|
||||
input.value = 'ani';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
|
||||
// Before debounce fires, no search-tags call yet
|
||||
expect(searchTagsUrls.length).toBe(0);
|
||||
|
||||
// Advance past the 150ms debounce
|
||||
vi.advanceTimersByTime(160);
|
||||
await vi.runAllTimersAsync();
|
||||
|
||||
expect(searchTagsUrls.length).toBe(1);
|
||||
expect(searchTagsUrls[0]).toContain('/search-tags');
|
||||
expect(searchTagsUrls[0]).toContain('q=ani');
|
||||
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
it('renders selected-but-missing tags in a dedicated group at the top', async () => {
|
||||
vi.useFakeTimers();
|
||||
global.fetch = vi.fn((url) => {
|
||||
if (url.includes('/search-tags')) {
|
||||
return Promise.resolve({
|
||||
ok: true,
|
||||
json: async () => ({ success: true, tags: [{ tag: 'anime', count: 3 }] }),
|
||||
});
|
||||
}
|
||||
if (url.includes('/top-tags')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
|
||||
}
|
||||
if (url.includes('/base-models')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, base_models: [] }) });
|
||||
}
|
||||
if (url.includes('/model-types')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, model_types: [] }) });
|
||||
}
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true }) });
|
||||
});
|
||||
|
||||
renderControlsDom('loras');
|
||||
const stateModule = await import('../../../static/js/state/index.js');
|
||||
stateModule.initPageState('loras');
|
||||
const { FilterManager } = await import('../../../static/js/managers/FilterManager.js');
|
||||
const manager = new FilterManager({ page: 'loras' });
|
||||
|
||||
// Pre-seed an active tag filter that won't appear in search results
|
||||
manager.filters.tags = { 'my-custom-tag': 'include' };
|
||||
|
||||
// Open panel and let top-tags load (empty)
|
||||
manager.toggleFilterPanel();
|
||||
await vi.runAllTimersAsync();
|
||||
|
||||
// Type a search query
|
||||
const input = document.getElementById('modelTagsSearchInput');
|
||||
input.value = 'ani';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
vi.advanceTimersByTime(160);
|
||||
await vi.runAllTimersAsync();
|
||||
|
||||
const container = document.getElementById('modelTagsFilter');
|
||||
const extraTag = container.querySelector('.filter-tag.extra-tag');
|
||||
expect(extraTag).not.toBeNull();
|
||||
expect(extraTag.dataset.tag).toBe('my-custom-tag');
|
||||
|
||||
// The search result tag should also be present
|
||||
const resultTag = container.querySelector('.filter-tag.tag-filter[data-tag="anime"]');
|
||||
expect(resultTag).not.toBeNull();
|
||||
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
it('shows empty state when search returns no matches and no selected tags', async () => {
|
||||
vi.useFakeTimers();
|
||||
global.fetch = vi.fn((url) => {
|
||||
if (url.includes('/search-tags')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
|
||||
}
|
||||
if (url.includes('/top-tags')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
|
||||
}
|
||||
if (url.includes('/base-models')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, base_models: [] }) });
|
||||
}
|
||||
if (url.includes('/model-types')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, model_types: [] }) });
|
||||
}
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true }) });
|
||||
});
|
||||
|
||||
renderControlsDom('loras');
|
||||
const stateModule = await import('../../../static/js/state/index.js');
|
||||
stateModule.initPageState('loras');
|
||||
const { FilterManager } = await import('../../../static/js/managers/FilterManager.js');
|
||||
const manager = new FilterManager({ page: 'loras' });
|
||||
|
||||
manager.toggleFilterPanel();
|
||||
await vi.runAllTimersAsync();
|
||||
|
||||
const input = document.getElementById('modelTagsSearchInput');
|
||||
input.value = 'zzz';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
vi.advanceTimersByTime(160);
|
||||
await vi.runAllTimersAsync();
|
||||
|
||||
const emptyState = document.getElementById('modelTagsEmptyState');
|
||||
expect(emptyState.hidden).toBe(false);
|
||||
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
it('reloads top tags when search input is cleared', async () => {
|
||||
vi.useFakeTimers();
|
||||
let topTagsCallCount = 0;
|
||||
global.fetch = vi.fn((url) => {
|
||||
if (url.includes('/search-tags')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [{ tag: 'anime', count: 3 }] }) });
|
||||
}
|
||||
if (url.includes('/top-tags')) {
|
||||
topTagsCallCount++;
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, tags: [] }) });
|
||||
}
|
||||
if (url.includes('/base-models')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, base_models: [] }) });
|
||||
}
|
||||
if (url.includes('/model-types')) {
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true, model_types: [] }) });
|
||||
}
|
||||
return Promise.resolve({ ok: true, json: async () => ({ success: true }) });
|
||||
});
|
||||
|
||||
renderControlsDom('loras');
|
||||
const stateModule = await import('../../../static/js/state/index.js');
|
||||
stateModule.initPageState('loras');
|
||||
const { FilterManager } = await import('../../../static/js/managers/FilterManager.js');
|
||||
const manager = new FilterManager({ page: 'loras' });
|
||||
|
||||
manager.toggleFilterPanel();
|
||||
await vi.runAllTimersAsync();
|
||||
const callsAfterOpen = topTagsCallCount;
|
||||
expect(callsAfterOpen).toBeGreaterThanOrEqual(1);
|
||||
|
||||
// Type, then clear
|
||||
const input = document.getElementById('modelTagsSearchInput');
|
||||
input.value = 'ani';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
vi.advanceTimersByTime(160);
|
||||
await vi.runAllTimersAsync();
|
||||
|
||||
input.value = '';
|
||||
input.dispatchEvent(new Event('input', { bubbles: true }));
|
||||
vi.advanceTimersByTime(160);
|
||||
await vi.runAllTimersAsync();
|
||||
|
||||
// An additional top-tags call should have happened after clearing
|
||||
expect(topTagsCallCount).toBeGreaterThan(callsAfterOpen);
|
||||
|
||||
vi.useRealTimers();
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
parseCombinedSamplerName,
|
||||
resolveSamplerScheduler,
|
||||
findMatchingWidgets,
|
||||
NODE_TYPE_WIDGET_OVERRIDES,
|
||||
} from '../../../static/js/utils/genParamsMapper.js';
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -204,9 +205,9 @@ describe('findMatchingWidgets', () => {
|
||||
|
||||
it('matches seed to seed widget', () => {
|
||||
const updates = findMatchingWidgets(['seed', 'steps', 'cfg', 'sampler_name', 'scheduler'], resolved);
|
||||
expect(updates).toContainEqual({ widgetName: 'seed', value: '42' });
|
||||
expect(updates).toContainEqual({ widgetName: 'steps', value: '30' });
|
||||
expect(updates).toContainEqual({ widgetName: 'cfg', value: '7' });
|
||||
expect(updates).toContainEqual({ widgetName: 'seed', value: 42 });
|
||||
expect(updates).toContainEqual({ widgetName: 'steps', value: 30 });
|
||||
expect(updates).toContainEqual({ widgetName: 'cfg', value: 7 });
|
||||
expect(updates).toContainEqual({ widgetName: 'sampler_name', value: 'euler_ancestral' });
|
||||
expect(updates).toContainEqual({ widgetName: 'scheduler', value: 'karras' });
|
||||
});
|
||||
@@ -221,7 +222,7 @@ describe('findMatchingWidgets', () => {
|
||||
const updates = findMatchingWidgets(['noise_seed', 'steps', 'cfg', 'sampler_name', 'scheduler'], resolved);
|
||||
const seedUpdate = updates.find(u => u.widgetName === 'noise_seed');
|
||||
expect(seedUpdate).toBeDefined();
|
||||
expect(seedUpdate.value).toBe('42');
|
||||
expect(seedUpdate.value).toBe(42);
|
||||
});
|
||||
|
||||
it('matches rgthree-style sampler widget name', () => {
|
||||
@@ -243,4 +244,53 @@ describe('findMatchingWidgets', () => {
|
||||
const updates = findMatchingWidgets(['seed', 'steps', 'cfg', 'sampler_name', 'scheduler'], resolved);
|
||||
expect(updates.map(u => u.widgetName)).toEqual(['seed', 'steps', 'cfg', 'sampler_name', 'scheduler']);
|
||||
});
|
||||
|
||||
// --- node-type-specific overrides ---
|
||||
it('matches GlobalSeed //Inspire value widget for seed param', () => {
|
||||
const updates = findMatchingWidgets(
|
||||
['value', 'mode', 'action', 'last_seed'],
|
||||
{ seed: 42 },
|
||||
'GlobalSeed //Inspire'
|
||||
);
|
||||
expect(updates).toHaveLength(1);
|
||||
expect(updates[0]).toEqual({ widgetName: 'value', value: 42 });
|
||||
});
|
||||
|
||||
it('ignores nodeType when it does not match any override entry', () => {
|
||||
const updates = findMatchingWidgets(
|
||||
['value', 'mode', 'action', 'last_seed'],
|
||||
{ seed: 42 },
|
||||
'SomeOtherNode'
|
||||
);
|
||||
expect(updates).toEqual([]);
|
||||
});
|
||||
|
||||
it('still falls back to global candidates when override candidates do not match', () => {
|
||||
// GlobalSeed override does not include steps — should use global candidate "steps"
|
||||
const updates = findMatchingWidgets(
|
||||
['steps', 'cfg', 'sampler_name'],
|
||||
{ steps: 20 },
|
||||
'GlobalSeed //Inspire'
|
||||
);
|
||||
expect(updates).toHaveLength(1);
|
||||
expect(updates[0]).toEqual({ widgetName: 'steps', value: 20 });
|
||||
});
|
||||
|
||||
it('prefers overrides when both override and global candidates match', () => {
|
||||
// If a hypothetical node has both "value" and "seed" widgets AND a
|
||||
// GlobalSeed override, the override candidate "value" should take precedence
|
||||
const updates = findMatchingWidgets(
|
||||
['seed', 'noise_seed', 'value', 'mode'],
|
||||
{ seed: 99 },
|
||||
'GlobalSeed //Inspire'
|
||||
);
|
||||
expect(updates).toHaveLength(1);
|
||||
expect(updates[0].widgetName).toBe('value');
|
||||
});
|
||||
|
||||
it('omits nodeType argument and still matches via global candidates', () => {
|
||||
const updates = findMatchingWidgets(['seed', 'steps', 'cfg'], { seed: 7 });
|
||||
expect(updates).toHaveLength(1);
|
||||
expect(updates[0]).toEqual({ widgetName: 'seed', value: 7 });
|
||||
});
|
||||
});
|
||||
|
||||
@@ -36,3 +36,53 @@ async def test_model_query_handler_rejects_negative_limit_for_base_models():
|
||||
await handler.get_base_models(SimpleNamespace(query={"limit": "-1"}))
|
||||
|
||||
assert service.received_limit == 20
|
||||
|
||||
|
||||
class DummySearchTagsService:
|
||||
"""Minimal service stub recording search_tags arguments."""
|
||||
|
||||
def __init__(self, result=None):
|
||||
self.received_query = None
|
||||
self.received_limit = None
|
||||
self._result = result or []
|
||||
|
||||
async def search_tags(self, query, limit):
|
||||
self.received_query = query
|
||||
self.received_limit = limit
|
||||
return self._result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_model_query_handler_search_tags_passes_query_and_limit():
|
||||
service = DummySearchTagsService(result=[{"tag": "anime", "count": 3}])
|
||||
handler = ModelQueryHandler(service=service, logger=logging.getLogger(__name__))
|
||||
|
||||
response = await handler.search_tags(
|
||||
SimpleNamespace(query={"q": "ani", "limit": "50"})
|
||||
)
|
||||
payload = json.loads(response.text)
|
||||
|
||||
assert payload["success"] is True
|
||||
assert payload["tags"] == [{"tag": "anime", "count": 3}]
|
||||
assert service.received_query == "ani"
|
||||
assert service.received_limit == 50
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_model_query_handler_search_tags_defaults_limit_to_20():
|
||||
service = DummySearchTagsService()
|
||||
handler = ModelQueryHandler(service=service, logger=logging.getLogger(__name__))
|
||||
|
||||
await handler.search_tags(SimpleNamespace(query={}))
|
||||
|
||||
assert service.received_limit == 20
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_model_query_handler_search_tags_clamps_negative_limit():
|
||||
service = DummySearchTagsService()
|
||||
handler = ModelQueryHandler(service=service, logger=logging.getLogger(__name__))
|
||||
|
||||
await handler.search_tags(SimpleNamespace(query={"limit": "-5"}))
|
||||
|
||||
assert service.received_limit == 20
|
||||
|
||||
@@ -1189,6 +1189,65 @@ def test_relative_path_sanitizes_model_and_version_placeholders():
|
||||
assert relative_path == "Fancy_Model/Version_One"
|
||||
|
||||
|
||||
def test_relative_path_empty_first_tag_fallback():
|
||||
"""Test that empty first_tag falls back to 'no tags'."""
|
||||
manager = DownloadManager()
|
||||
settings_manager = get_settings_manager()
|
||||
settings_manager.settings["download_path_templates"]["lora"] = (
|
||||
"{base_model}/{first_tag}"
|
||||
)
|
||||
|
||||
version_info = {
|
||||
"baseModel": "SDXL",
|
||||
"model": {"name": "Test Model", "tags": []},
|
||||
"creator": {"username": "Author"},
|
||||
}
|
||||
|
||||
relative_path = manager._calculate_relative_path(version_info, "lora")
|
||||
|
||||
assert relative_path == "SDXL/no tags"
|
||||
|
||||
|
||||
def test_relative_path_empty_base_model_and_first_tag():
|
||||
"""Test that empty base_model + empty first_tag does NOT produce a leading slash."""
|
||||
manager = DownloadManager()
|
||||
settings_manager = get_settings_manager()
|
||||
settings_manager.settings["download_path_templates"]["lora"] = (
|
||||
"{base_model}/{first_tag}"
|
||||
)
|
||||
|
||||
version_info = {
|
||||
"baseModel": "",
|
||||
"model": {"name": "Test Model", "tags": []},
|
||||
"creator": {"username": "Author"},
|
||||
}
|
||||
|
||||
relative_path = manager._calculate_relative_path(version_info, "lora")
|
||||
|
||||
assert not relative_path.startswith("/")
|
||||
assert relative_path == "no tags"
|
||||
|
||||
|
||||
def test_relative_path_sanitizes_double_slashes():
|
||||
"""Test that empty placeholder substitutions don't produce double slashes."""
|
||||
manager = DownloadManager()
|
||||
settings_manager = get_settings_manager()
|
||||
settings_manager.settings["download_path_templates"]["lora"] = (
|
||||
"{base_model}/{first_tag}/{author}"
|
||||
)
|
||||
|
||||
version_info = {
|
||||
"baseModel": "SDXL",
|
||||
"model": {"name": "Test Model", "tags": []},
|
||||
"creator": {"username": "Author"},
|
||||
}
|
||||
|
||||
relative_path = manager._calculate_relative_path(version_info, "lora")
|
||||
|
||||
assert "//" not in relative_path
|
||||
assert relative_path == "SDXL/no tags/Author"
|
||||
|
||||
|
||||
def test_distribute_preview_to_entries_moves_and_copies(tmp_path):
|
||||
"""Test that preview distribution moves file to first entry and copies to others."""
|
||||
manager = DownloadManager()
|
||||
|
||||
@@ -0,0 +1,193 @@
|
||||
"""Unit tests for DownloadQueueService history operations.
|
||||
|
||||
Covers the new ``download_id``-based code paths in
|
||||
``delete_history_item`` and ``retry_from_history``, plus backward
|
||||
compatibility with ``id``.
|
||||
"""
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from py.services.download_queue_service import DownloadQueueService
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Helpers
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _make_service(tmp_path: Path) -> DownloadQueueService:
|
||||
"""Create a DownloadQueueService backed by a temporary database."""
|
||||
return DownloadQueueService(db_path=str(tmp_path / "queue.sqlite"))
|
||||
|
||||
|
||||
async def _seed(
|
||||
svc: DownloadQueueService,
|
||||
download_id: str,
|
||||
status: str = "failed",
|
||||
) -> tuple[int, str]:
|
||||
"""Insert a history row and return (autoincrement id, download_id)."""
|
||||
row_id = await svc.add_to_history(
|
||||
download_id=download_id,
|
||||
model_id=1,
|
||||
model_version_id=100,
|
||||
model_name="TestModel",
|
||||
version_name="v1",
|
||||
status=status,
|
||||
)
|
||||
return row_id, download_id
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# delete_history_item
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_by_download_id(tmp_path: Path) -> None:
|
||||
"""delete_history_item(download_id=...) removes the correct row."""
|
||||
svc = _make_service(tmp_path)
|
||||
rid, did = await _seed(svc, "dl-aaa")
|
||||
|
||||
deleted = await svc.delete_history_item(download_id=did)
|
||||
assert deleted is True
|
||||
|
||||
# Verify gone from history
|
||||
history = await svc.get_history()
|
||||
assert len(history["items"]) == 0
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_by_id_legacy(tmp_path: Path) -> None:
|
||||
"""delete_history_item(id=...) still works (backward compat)."""
|
||||
svc = _make_service(tmp_path)
|
||||
rid, _did = await _seed(svc, "dl-bbb")
|
||||
|
||||
deleted = await svc.delete_history_item(id=rid)
|
||||
assert deleted is True
|
||||
|
||||
history = await svc.get_history()
|
||||
assert len(history["items"]) == 0
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_no_params_returns_false(tmp_path: Path) -> None:
|
||||
"""Calling delete_history_item with no params returns False."""
|
||||
svc = _make_service(tmp_path)
|
||||
await _seed(svc, "dl-ccc")
|
||||
|
||||
deleted = await svc.delete_history_item()
|
||||
assert deleted is False
|
||||
|
||||
# Row is still there
|
||||
history = await svc.get_history()
|
||||
assert len(history["items"]) == 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_download_id_precedence(tmp_path: Path) -> None:
|
||||
"""When both id and download_id are given, download_id is used."""
|
||||
svc = _make_service(tmp_path)
|
||||
# Insert two rows
|
||||
rid_a, did_a = await _seed(svc, "dl-aaa")
|
||||
rid_b, did_b = await _seed(svc, "dl-bbb")
|
||||
|
||||
# Delete by download_id while also passing the *wrong* id
|
||||
deleted = await svc.delete_history_item(id=rid_b, download_id=did_a)
|
||||
assert deleted is True
|
||||
|
||||
history = await svc.get_history()
|
||||
ids_left = [it["id"] for it in history["items"]]
|
||||
assert rid_a not in ids_left # dl-aaa was deleted
|
||||
assert rid_b in ids_left # dl-bbb (wrong id) was ignored
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# retry_from_history
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_retry_by_download_id(tmp_path: Path) -> None:
|
||||
"""retry_from_history(download_id=...) re-queues and deletes history."""
|
||||
svc = _make_service(tmp_path)
|
||||
rid, did = await _seed(svc, "dl-fail", status="failed")
|
||||
|
||||
item = await svc.retry_from_history(download_id=did)
|
||||
assert item is not None
|
||||
assert item["status"] == "queued"
|
||||
|
||||
# History row must be deleted (the bug fix)
|
||||
history = await svc.get_history()
|
||||
ids_in_history = [it["id"] for it in history["items"]]
|
||||
assert rid not in ids_in_history
|
||||
|
||||
# Queue must contain the new item
|
||||
queue = await svc.get_queue()
|
||||
assert len(queue) == 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_retry_by_download_id_canceled(tmp_path: Path) -> None:
|
||||
"""retry_from_history works for 'canceled' status too."""
|
||||
svc = _make_service(tmp_path)
|
||||
rid, did = await _seed(svc, "dl-cancel", status="canceled")
|
||||
|
||||
item = await svc.retry_from_history(download_id=did)
|
||||
assert item is not None
|
||||
assert item["status"] == "queued"
|
||||
|
||||
history = await svc.get_history()
|
||||
assert len(history["items"]) == 0
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_retry_by_id_legacy(tmp_path: Path) -> None:
|
||||
"""retry_from_history(item_id=...) still works (backward compat)."""
|
||||
svc = _make_service(tmp_path)
|
||||
rid, _did = await _seed(svc, "dl-legacy", status="failed")
|
||||
|
||||
item = await svc.retry_from_history(item_id=rid)
|
||||
assert item is not None
|
||||
assert item["status"] == "queued"
|
||||
|
||||
history = await svc.get_history()
|
||||
assert len(history["items"]) == 0
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_retry_no_params_returns_none(tmp_path: Path) -> None:
|
||||
"""Calling retry_from_history with no params returns None."""
|
||||
svc = _make_service(tmp_path)
|
||||
await _seed(svc, "dl-none", status="failed")
|
||||
|
||||
item = await svc.retry_from_history()
|
||||
assert item is None
|
||||
|
||||
# History untouched
|
||||
history = await svc.get_history()
|
||||
assert len(history["items"]) == 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_retry_non_retryable_status(tmp_path: Path) -> None:
|
||||
"""retry_from_history returns None for 'completed' status."""
|
||||
svc = _make_service(tmp_path)
|
||||
_rid, did = await _seed(svc, "dl-ok", status="completed")
|
||||
|
||||
item = await svc.retry_from_history(download_id=did)
|
||||
assert item is None
|
||||
|
||||
# History untouched
|
||||
history = await svc.get_history()
|
||||
assert len(history["items"]) == 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_retry_unknown_download_id(tmp_path: Path) -> None:
|
||||
"""retry_from_history returns None for a non-existent download_id."""
|
||||
svc = _make_service(tmp_path)
|
||||
await _seed(svc, "dl-real", status="failed")
|
||||
|
||||
item = await svc.retry_from_history(download_id="dl-nope")
|
||||
assert item is None
|
||||
@@ -60,3 +60,114 @@ async def test_get_metadata_provider_returns_fallback_as_is(monkeypatch):
|
||||
provider = await metadata_service.get_metadata_provider()
|
||||
|
||||
assert provider is fallback
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# initialize_metadata_providers — provider gating + fallback ordering
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def _stub_settings(**overrides):
|
||||
"""Minimal settings stub returning configured values."""
|
||||
base = {
|
||||
"enable_metadata_archive_db": False,
|
||||
"enable_civarchive_api": True,
|
||||
"metadata_provider_order": "civitai_archive_sqlite",
|
||||
}
|
||||
base.update(overrides)
|
||||
return SimpleNamespace(get=lambda key, default=None: base.get(key, default))
|
||||
|
||||
|
||||
async def _run_initialize(monkeypatch, settings):
|
||||
# Fresh provider manager for each test
|
||||
monkeypatch.setattr(
|
||||
metadata_service.ModelMetadataProviderManager,
|
||||
"get_instance",
|
||||
AsyncMock(return_value=metadata_service.ModelMetadataProviderManager()),
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
metadata_service, "get_settings_manager", lambda: settings
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
metadata_service.ServiceRegistry,
|
||||
"get_civitai_client",
|
||||
AsyncMock(return_value=object()),
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
metadata_service.ServiceRegistry,
|
||||
"get_civarchive_client",
|
||||
AsyncMock(return_value=object()),
|
||||
)
|
||||
|
||||
# Make MetadataArchiveManager report a usable db path when enabled
|
||||
fake_archive = SimpleNamespace(get_database_path=lambda: "/tmp/fake.db")
|
||||
monkeypatch.setattr(
|
||||
metadata_service, "MetadataArchiveManager", lambda _base: fake_archive
|
||||
)
|
||||
# Pretend the db file exists
|
||||
monkeypatch.setattr(metadata_service.os.path, "exists", lambda _p: True)
|
||||
|
||||
manager = await metadata_service.initialize_metadata_providers()
|
||||
return manager
|
||||
|
||||
|
||||
def _fallback_provider_order(manager):
|
||||
"""Return the ordered list of provider labels inside the fallback provider."""
|
||||
fallback = manager.providers.get("fallback")
|
||||
assert isinstance(fallback, FallbackMetadataProvider), "expected a fallback provider"
|
||||
return list(fallback._provider_labels)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_initialize_providers_default_order(monkeypatch):
|
||||
settings = _stub_settings(enable_metadata_archive_db=True)
|
||||
manager = await _run_initialize(monkeypatch, settings)
|
||||
assert _fallback_provider_order(manager) == ["civitai_api", "civarchive_api", "sqlite"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_initialize_providers_prefer_sqlite_order(monkeypatch):
|
||||
settings = _stub_settings(
|
||||
enable_metadata_archive_db=True,
|
||||
metadata_provider_order="civitai_sqlite_archive",
|
||||
)
|
||||
manager = await _run_initialize(monkeypatch, settings)
|
||||
assert _fallback_provider_order(manager) == ["civitai_api", "sqlite", "civarchive_api"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_initialize_providers_disables_civarchive(monkeypatch):
|
||||
settings = _stub_settings(
|
||||
enable_metadata_archive_db=True,
|
||||
enable_civarchive_api=False,
|
||||
)
|
||||
manager = await _run_initialize(monkeypatch, settings)
|
||||
# civarchive_api must not be registered at all
|
||||
assert "civarchive_api" not in manager.providers
|
||||
assert _fallback_provider_order(manager) == ["civitai_api", "sqlite"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_initialize_providers_skips_unavailable_sqlite_in_preset(monkeypatch):
|
||||
# Preset wants sqlite before civarchive, but archive db is disabled ->
|
||||
# sqlite is unavailable and must be skipped, civarchive stays.
|
||||
settings = _stub_settings(
|
||||
enable_metadata_archive_db=False,
|
||||
metadata_provider_order="civitai_sqlite_archive",
|
||||
)
|
||||
manager = await _run_initialize(monkeypatch, settings)
|
||||
assert _fallback_provider_order(manager) == ["civitai_api", "civarchive_api"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_initialize_providers_single_provider_when_only_civitai(monkeypatch):
|
||||
# Both archive db and civarchive disabled -> only civitai_api remains,
|
||||
# which takes the single-provider path (registered as default, no fallback).
|
||||
settings = _stub_settings(
|
||||
enable_metadata_archive_db=False,
|
||||
enable_civarchive_api=False,
|
||||
)
|
||||
manager = await _run_initialize(monkeypatch, settings)
|
||||
assert "fallback" not in manager.providers
|
||||
assert manager.default_provider == "civitai_api"
|
||||
|
||||
|
||||
@@ -3,11 +3,164 @@ from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
from py.services.model_lifecycle_service import ModelLifecycleService
|
||||
from py.services.model_lifecycle_service import ModelLifecycleService, _require_path_in_library_roots
|
||||
from py.utils.metadata_manager import MetadataManager
|
||||
from py.utils.models import LoraMetadata
|
||||
|
||||
|
||||
class ScannerWithRoots:
|
||||
def __init__(self, roots):
|
||||
self._roots = list(roots)
|
||||
|
||||
def get_model_roots(self):
|
||||
return self._roots
|
||||
|
||||
|
||||
class TestRequirePathInLibraryRoots:
|
||||
def test_accepts_path_within_root(self, tmp_path):
|
||||
root = tmp_path / "loras"
|
||||
root.mkdir()
|
||||
model = root / "model.safetensors"
|
||||
model.write_text("")
|
||||
|
||||
scanner = ScannerWithRoots([str(root)])
|
||||
_require_path_in_library_roots(str(model), scanner)
|
||||
|
||||
def test_rejects_path_outside_roots(self, tmp_path):
|
||||
root = tmp_path / "loras"
|
||||
root.mkdir()
|
||||
outside = tmp_path / "outside" / "model.safetensors"
|
||||
outside.parent.mkdir(parents=True)
|
||||
outside.write_text("")
|
||||
|
||||
scanner = ScannerWithRoots([str(root)])
|
||||
with pytest.raises(ValueError, match="outside configured library"):
|
||||
_require_path_in_library_roots(str(outside), scanner)
|
||||
|
||||
def test_passes_when_no_roots_configured(self, tmp_path):
|
||||
f = tmp_path / "model.safetensors"
|
||||
f.write_text("")
|
||||
|
||||
scanner = ScannerWithRoots([])
|
||||
_require_path_in_library_roots(str(f), scanner)
|
||||
|
||||
def test_accepts_path_matching_root_exactly(self, tmp_path):
|
||||
root = tmp_path / "loras"
|
||||
root.mkdir()
|
||||
|
||||
scanner = ScannerWithRoots([str(root)])
|
||||
_require_path_in_library_roots(str(root), scanner)
|
||||
|
||||
def test_rejects_symlink_escape(self, tmp_path):
|
||||
root = tmp_path / "loras"
|
||||
root.mkdir()
|
||||
model = root / "model.safetensors"
|
||||
model.write_text("")
|
||||
|
||||
outside_dir = tmp_path / "outside"
|
||||
outside_dir.mkdir()
|
||||
outside_file = outside_dir / "escaped.safetensors"
|
||||
outside_file.write_text("")
|
||||
|
||||
symlink = root / "link.safetensors"
|
||||
symlink.symlink_to(outside_file)
|
||||
|
||||
scanner = ScannerWithRoots([str(root)])
|
||||
with pytest.raises(ValueError, match="outside configured library"):
|
||||
_require_path_in_library_roots(str(symlink), scanner)
|
||||
|
||||
|
||||
class ScannerForDelete:
|
||||
def __init__(self, raw_data, roots, model_type="lora"):
|
||||
self.model_type = model_type
|
||||
self.cache = DummyCache(raw_data)
|
||||
self._hash_index = DummyHashIndex()
|
||||
self._roots = list(roots)
|
||||
self._persist_calls = []
|
||||
|
||||
def get_model_roots(self):
|
||||
return self._roots
|
||||
|
||||
async def get_cached_data(self):
|
||||
return self.cache
|
||||
|
||||
async def _persist_current_cache(self):
|
||||
self._persist_calls.append(True)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_delete_model_rejects_path_outside_roots(tmp_path: Path):
|
||||
root = tmp_path / "loras"
|
||||
root.mkdir()
|
||||
model = root / "model.safetensors"
|
||||
model.write_bytes(b"data")
|
||||
|
||||
scanner = ScannerForDelete(
|
||||
raw_data=[{"file_path": str(model)}],
|
||||
roots=[str(root)],
|
||||
)
|
||||
service = ModelLifecycleService(
|
||||
scanner=scanner,
|
||||
metadata_manager=DummyMetadataManager({"civitai": {"modelId": 1}}),
|
||||
metadata_loader=lambda x: {},
|
||||
)
|
||||
# Path within root should work (model file exists)
|
||||
result = await service.delete_model(str(model))
|
||||
assert result["success"] is True
|
||||
|
||||
# Path outside root should be rejected
|
||||
outside = tmp_path / "outside.safetensors"
|
||||
outside.write_bytes(b"data")
|
||||
scanner2 = ScannerForDelete(
|
||||
raw_data=[],
|
||||
roots=[str(root)],
|
||||
)
|
||||
service2 = ModelLifecycleService(
|
||||
scanner=scanner2,
|
||||
metadata_manager=DummyMetadataManager({}),
|
||||
metadata_loader=lambda x: {},
|
||||
)
|
||||
with pytest.raises(ValueError, match="outside configured library"):
|
||||
await service2.delete_model(str(outside))
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_rename_model_rejects_path_outside_roots(tmp_path: Path):
|
||||
root = tmp_path / "loras"
|
||||
root.mkdir()
|
||||
|
||||
scanner = ScannerWithRoots([str(root)])
|
||||
service = ModelLifecycleService(
|
||||
scanner=scanner,
|
||||
metadata_manager=DummyMetadataManager({}),
|
||||
metadata_loader=lambda x: {},
|
||||
)
|
||||
outside = tmp_path / "outside.safetensors"
|
||||
outside.write_bytes(b"data")
|
||||
|
||||
with pytest.raises(ValueError, match="outside configured library"):
|
||||
await service.rename_model(file_path=str(outside), new_file_name="new_name")
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_bulk_delete_rejects_any_path_outside_roots(tmp_path: Path):
|
||||
root = tmp_path / "loras"
|
||||
root.mkdir()
|
||||
model_ok = root / "model.safetensors"
|
||||
model_ok.write_bytes(b"data")
|
||||
outside = tmp_path / "outside.safetensors"
|
||||
outside.write_bytes(b"data")
|
||||
|
||||
scanner = ScannerWithRoots([str(root)])
|
||||
service = ModelLifecycleService(
|
||||
scanner=scanner,
|
||||
metadata_manager=DummyMetadataManager({}),
|
||||
metadata_loader=lambda x: {},
|
||||
)
|
||||
with pytest.raises(ValueError, match="outside configured library"):
|
||||
await service.bulk_delete_models([str(model_ok), str(outside)])
|
||||
|
||||
|
||||
class DummyCache:
|
||||
def __init__(self, raw_data):
|
||||
self.raw_data = raw_data
|
||||
|
||||
@@ -667,3 +667,310 @@ async def test_log_duplicate_filename_summary_silent_when_no_duplicates(tmp_path
|
||||
# No warning should be logged when there are no duplicates
|
||||
for record in caplog.records:
|
||||
assert "Duplicate filename conflict detected" not in record.message
|
||||
|
||||
|
||||
# ── _cache_entries_differ ────────────────────────────────────────────
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"a_tags, b_tags, expect_differ",
|
||||
[
|
||||
(["alpha", "beta"], ["beta", "alpha"], False), # order-insensitive
|
||||
(["alpha"], ["alpha", "beta"], True), # count differs
|
||||
([], ["alpha"], True),
|
||||
(None, [], False), # None ≈ []
|
||||
(["alpha"], None, True),
|
||||
],
|
||||
)
|
||||
def test_cache_entries_differ_tags(a_tags, b_tags, expect_differ):
|
||||
base = {"file_path": "/m/a.safetensors", "model_name": "A", "size": 1}
|
||||
entry_a = {**base, "tags": a_tags}
|
||||
entry_b = {**base, "tags": b_tags}
|
||||
assert ModelScanner._cache_entries_differ(entry_a, entry_b) == expect_differ
|
||||
|
||||
|
||||
def test_cache_entries_differ_identical():
|
||||
entry = {
|
||||
"file_path": "/m/a.safetensors", "model_name": "A", "size": 1,
|
||||
"tags": ["x"], "civitai": {"id": 1}, "notes": "hi",
|
||||
}
|
||||
assert ModelScanner._cache_entries_differ(entry, dict(entry)) is False
|
||||
|
||||
|
||||
def test_cache_entries_differ_field_changed():
|
||||
a = {"file_path": "/m/a.safetensors", "model_name": "A", "size": 1}
|
||||
b = {**a, "model_name": "B"}
|
||||
assert ModelScanner._cache_entries_differ(a, b) is True
|
||||
|
||||
|
||||
def test_cache_entries_differ_extra_key():
|
||||
a = {"file_path": "/m/a.safetensors", "model_name": "A"}
|
||||
b = {**a, "extra_field": "value"}
|
||||
assert ModelScanner._cache_entries_differ(a, b) is True
|
||||
|
||||
|
||||
# ── sync_cache_from_metadata ─────────────────────────────────────────
|
||||
|
||||
|
||||
def _make_cache_entry(**overrides) -> dict:
|
||||
entry = {
|
||||
"file_path": "/m/a.safetensors",
|
||||
"model_name": "TestModel",
|
||||
"file_name": "a",
|
||||
"folder": "",
|
||||
"size": 100,
|
||||
"modified": 10.0,
|
||||
"sha256": "abc123",
|
||||
"base_model": "SD1.5",
|
||||
"preview_url": "",
|
||||
"preview_nsfw_level": 0,
|
||||
"from_civitai": True,
|
||||
"favorite": False,
|
||||
"notes": "old note",
|
||||
"usage_tips": "{}",
|
||||
"metadata_source": None,
|
||||
"exclude": False,
|
||||
"db_checked": False,
|
||||
"last_checked_at": 0.0,
|
||||
"tags": ["alpha"],
|
||||
"civitai": {"id": 111, "modelId": 222, "name": "v1"},
|
||||
"civitai_deleted": False,
|
||||
"skip_metadata_refresh": False,
|
||||
"hf_url": "",
|
||||
"license_flags": 113,
|
||||
"hash_status": "completed",
|
||||
}
|
||||
entry.update(overrides)
|
||||
return entry
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_sync_cache_no_change(tmp_path: Path):
|
||||
"""When metadata matches the cache entry, return False and mutate nothing."""
|
||||
scanner = DummyScanner(tmp_path)
|
||||
entry = _make_cache_entry()
|
||||
scanner._cache = ModelCache(
|
||||
raw_data=[dict(entry)], folders=[], name_display_mode="model_name"
|
||||
)
|
||||
await scanner._cache.resort()
|
||||
scanner._tags_count = {"alpha": 1}
|
||||
scanner._hash_index.add_entry("abc123", "/m/a.safetensors")
|
||||
|
||||
# metadata_dict that would produce the identical cache entry
|
||||
metadata_dict = {
|
||||
"file_path": "/m/a.safetensors",
|
||||
"model_name": "TestModel",
|
||||
"file_name": "a",
|
||||
"folder": "",
|
||||
"size": 100,
|
||||
"modified": 10.0,
|
||||
"sha256": "abc123",
|
||||
"base_model": "SD1.5",
|
||||
"preview_url": "",
|
||||
"preview_nsfw_level": 0,
|
||||
"from_civitai": True,
|
||||
"favorite": False,
|
||||
"notes": "old note",
|
||||
"usage_tips": "{}",
|
||||
"tags": ["alpha"],
|
||||
"civitai": {"id": 111, "modelId": 222, "name": "v1"},
|
||||
"hf_url": "",
|
||||
}
|
||||
|
||||
changed = await scanner.sync_cache_from_metadata(
|
||||
"/m/a.safetensors", metadata_dict
|
||||
)
|
||||
assert changed is False
|
||||
# Verify cache was NOT mutated
|
||||
cached = await scanner.get_cached_data()
|
||||
assert cached.raw_data[0]["notes"] == "old note"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_sync_cache_in_place_update(tmp_path: Path):
|
||||
"""When metadata differs, update the cache entry in-place."""
|
||||
scanner = DummyScanner(tmp_path)
|
||||
entry = _make_cache_entry(notes="old note", tags=["alpha"], model_name="OldName")
|
||||
scanner._cache = ModelCache(
|
||||
raw_data=[dict(entry)], folders=[], name_display_mode="model_name"
|
||||
)
|
||||
await scanner._cache.resort()
|
||||
scanner._tags_count = {"alpha": 1}
|
||||
scanner._hash_index.add_entry("abc123", "/m/a.safetensors")
|
||||
|
||||
# Capture the exact dict object in raw_data before sync
|
||||
original_entry_ref = scanner._cache.raw_data[0]
|
||||
|
||||
metadata_dict = {
|
||||
"file_path": "/m/a.safetensors",
|
||||
"model_name": "NewName",
|
||||
"file_name": "a",
|
||||
"folder": "",
|
||||
"size": 100,
|
||||
"modified": 10.0,
|
||||
"sha256": "abc123",
|
||||
"base_model": "SD1.5",
|
||||
"preview_url": "",
|
||||
"preview_nsfw_level": 0,
|
||||
"from_civitai": True,
|
||||
"favorite": False,
|
||||
"notes": "new note",
|
||||
"usage_tips": "{}",
|
||||
"tags": ["beta", "gamma"],
|
||||
"civitai": {"id": 111, "modelId": 222, "name": "v1"},
|
||||
"hf_url": "",
|
||||
}
|
||||
|
||||
changed = await scanner.sync_cache_from_metadata(
|
||||
"/m/a.safetensors", metadata_dict
|
||||
)
|
||||
assert changed is True
|
||||
|
||||
cached = await scanner.get_cached_data()
|
||||
updated = cached.raw_data[0]
|
||||
# In-place: the same dict object persisted in raw_data
|
||||
assert updated is original_entry_ref
|
||||
assert updated["notes"] == "new note"
|
||||
assert updated["model_name"] == "NewName"
|
||||
assert sorted(updated["tags"]) == ["beta", "gamma"]
|
||||
# Tag counts updated incrementally
|
||||
assert scanner._tags_count.get("alpha", 0) == 0
|
||||
assert scanner._tags_count.get("beta", 0) == 1
|
||||
assert scanner._tags_count.get("gamma", 0) == 1
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_sync_cache_not_in_cache_delegates(tmp_path: Path):
|
||||
"""When the file_path is not in the cache at all, fall back to full update."""
|
||||
scanner = DummyScanner(tmp_path)
|
||||
scanner._cache = ModelCache(raw_data=[], folders=[], name_display_mode="model_name")
|
||||
await scanner._cache.resort()
|
||||
|
||||
metadata_dict = {
|
||||
"file_path": "/m/b.safetensors",
|
||||
"model_name": "BrandNew",
|
||||
"file_name": "b",
|
||||
"folder": "",
|
||||
"size": 200,
|
||||
"modified": 20.0,
|
||||
"sha256": "def456",
|
||||
"base_model": "SDXL",
|
||||
"preview_url": "",
|
||||
"preview_nsfw_level": 0,
|
||||
"from_civitai": True,
|
||||
"favorite": False,
|
||||
"notes": "",
|
||||
"usage_tips": "{}",
|
||||
"tags": [],
|
||||
"civitai": {},
|
||||
"hf_url": "",
|
||||
}
|
||||
|
||||
changed = await scanner.sync_cache_from_metadata(
|
||||
"/m/b.safetensors", metadata_dict
|
||||
)
|
||||
assert changed is True
|
||||
cached = await scanner.get_cached_data()
|
||||
assert len(cached.raw_data) == 1
|
||||
assert cached.raw_data[0]["model_name"] == "BrandNew"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_sync_cache_conditional_resort_skipped(tmp_path: Path, monkeypatch):
|
||||
"""When only non-sort-key fields change, resort() is NOT called."""
|
||||
scanner = DummyScanner(tmp_path)
|
||||
entry = _make_cache_entry(notes="old note", model_name="SameName")
|
||||
scanner._cache = ModelCache(
|
||||
raw_data=[dict(entry)], folders=[], name_display_mode="model_name"
|
||||
)
|
||||
await scanner._cache.resort()
|
||||
scanner._cache._last_sort = ("name", "asc") # name sort is active
|
||||
scanner._tags_count = {"alpha": 1}
|
||||
scanner._hash_index.add_entry("abc123", "/m/a.safetensors")
|
||||
|
||||
# Track resort calls
|
||||
resort_called = False
|
||||
original_resort = scanner._cache.resort
|
||||
|
||||
async def tracking_resort():
|
||||
nonlocal resort_called
|
||||
resort_called = True
|
||||
await original_resort()
|
||||
|
||||
monkeypatch.setattr(scanner._cache, "resort", tracking_resort)
|
||||
|
||||
metadata_dict = {
|
||||
"file_path": "/m/a.safetensors",
|
||||
"model_name": "SameName", # unchanged — no resort needed
|
||||
"file_name": "a",
|
||||
"folder": "",
|
||||
"size": 100,
|
||||
"modified": 10.0,
|
||||
"sha256": "abc123",
|
||||
"base_model": "SD1.5",
|
||||
"preview_url": "",
|
||||
"preview_nsfw_level": 0,
|
||||
"from_civitai": True,
|
||||
"favorite": False,
|
||||
"notes": "updated note", # changed, but not sort-relevant
|
||||
"usage_tips": "{}",
|
||||
"tags": ["alpha"],
|
||||
"civitai": {"id": 111, "modelId": 222, "name": "v1"},
|
||||
"hf_url": "",
|
||||
}
|
||||
|
||||
changed = await scanner.sync_cache_from_metadata(
|
||||
"/m/a.safetensors", metadata_dict
|
||||
)
|
||||
assert changed is True
|
||||
assert resort_called is False
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_sync_cache_conditional_resort_triggered(tmp_path: Path, monkeypatch):
|
||||
"""When the sort-key field changes, resort() IS called."""
|
||||
scanner = DummyScanner(tmp_path)
|
||||
entry = _make_cache_entry(model_name="OldName")
|
||||
scanner._cache = ModelCache(
|
||||
raw_data=[dict(entry)], folders=[], name_display_mode="model_name"
|
||||
)
|
||||
await scanner._cache.resort()
|
||||
scanner._cache._last_sort = ("name", "asc")
|
||||
scanner._tags_count = {"alpha": 1}
|
||||
scanner._hash_index.add_entry("abc123", "/m/a.safetensors")
|
||||
|
||||
resort_calls = 0
|
||||
original_resort = scanner._cache.resort
|
||||
|
||||
async def tracking_resort():
|
||||
nonlocal resort_calls
|
||||
resort_calls += 1
|
||||
await original_resort()
|
||||
|
||||
monkeypatch.setattr(scanner._cache, "resort", tracking_resort)
|
||||
|
||||
metadata_dict = {
|
||||
"file_path": "/m/a.safetensors",
|
||||
"model_name": "NewName", # changed — should trigger resort
|
||||
"file_name": "a",
|
||||
"folder": "",
|
||||
"size": 100,
|
||||
"modified": 10.0,
|
||||
"sha256": "abc123",
|
||||
"base_model": "SD1.5",
|
||||
"preview_url": "",
|
||||
"preview_nsfw_level": 0,
|
||||
"from_civitai": True,
|
||||
"favorite": False,
|
||||
"notes": "old note",
|
||||
"usage_tips": "{}",
|
||||
"tags": ["alpha"],
|
||||
"civitai": {"id": 111, "modelId": 222, "name": "v1"},
|
||||
"hf_url": "",
|
||||
}
|
||||
|
||||
changed = await scanner.sync_cache_from_metadata(
|
||||
"/m/a.safetensors", metadata_dict
|
||||
)
|
||||
assert changed is True
|
||||
assert resort_calls == 1
|
||||
|
||||
@@ -225,3 +225,119 @@ def test_incremental_updates_only_touch_changed_rows(tmp_path: Path, monkeypatch
|
||||
assert second['metadata_source'] == 'archive_db'
|
||||
assert second['civitai_deleted'] is True
|
||||
assert second['civitai']['creator']['username'] == 'builder_v2'
|
||||
|
||||
|
||||
# ── update_single_model ───────────────────────────────────────────────
|
||||
|
||||
|
||||
def test_update_single_model_insert(tmp_path: Path, monkeypatch):
|
||||
"""Insert a brand-new model row via update_single_model."""
|
||||
monkeypatch.setenv('LORA_MANAGER_DISABLE_PERSISTENT_CACHE', '0')
|
||||
db_path = tmp_path / 'cache.sqlite'
|
||||
store = PersistentModelCache(db_path=str(db_path))
|
||||
|
||||
file_path = (tmp_path / 'x.safetensors').as_posix()
|
||||
new_item = {
|
||||
'file_path': file_path,
|
||||
'file_name': 'x',
|
||||
'model_name': 'Model X',
|
||||
'folder': '',
|
||||
'size': 42,
|
||||
'modified': 1.0,
|
||||
'sha256': 'sha-x',
|
||||
'base_model': 'SDXL',
|
||||
'preview_url': '',
|
||||
'preview_nsfw_level': 0,
|
||||
'from_civitai': True,
|
||||
'favorite': True,
|
||||
'notes': 'test note',
|
||||
'usage_tips': '{}',
|
||||
'metadata_source': None,
|
||||
'exclude': False,
|
||||
'db_checked': False,
|
||||
'last_checked_at': 0.0,
|
||||
'tags': ['test', 'new'],
|
||||
'civitai': None,
|
||||
'civitai_deleted': False,
|
||||
'skip_metadata_refresh': False,
|
||||
'license_flags': DEFAULT_LICENSE_FLAGS,
|
||||
'hash_status': 'completed',
|
||||
'hf_url': '',
|
||||
}
|
||||
|
||||
store.update_single_model('dummy', new_item)
|
||||
|
||||
persisted = store.load_cache('dummy')
|
||||
assert persisted is not None
|
||||
items = {item['file_path']: item for item in persisted.raw_data}
|
||||
assert file_path in items
|
||||
assert items[file_path]['model_name'] == 'Model X'
|
||||
assert items[file_path]['favorite'] is True
|
||||
assert sorted(items[file_path]['tags']) == ['new', 'test']
|
||||
|
||||
|
||||
def test_update_single_model_update_tags(tmp_path: Path, monkeypatch):
|
||||
"""Tags are updated incrementally: old tags removed, new tags added."""
|
||||
monkeypatch.setenv('LORA_MANAGER_DISABLE_PERSISTENT_CACHE', '0')
|
||||
db_path = tmp_path / 'cache.sqlite'
|
||||
store = PersistentModelCache(db_path=str(db_path))
|
||||
|
||||
file_path = (tmp_path / 'y.safetensors').as_posix()
|
||||
base = {
|
||||
'file_path': file_path, 'file_name': 'y', 'model_name': 'Y',
|
||||
'folder': '', 'size': 1, 'modified': 1.0, 'sha256': 'sha-y',
|
||||
'base_model': '', 'preview_url': '', 'preview_nsfw_level': 0,
|
||||
'from_civitai': True, 'favorite': False, 'notes': '', 'usage_tips': '{}',
|
||||
'metadata_source': None, 'exclude': False, 'db_checked': False,
|
||||
'last_checked_at': 0.0, 'civitai': None, 'civitai_deleted': False,
|
||||
'skip_metadata_refresh': False, 'license_flags': DEFAULT_LICENSE_FLAGS,
|
||||
'hash_status': 'completed', 'hf_url': '',
|
||||
}
|
||||
|
||||
# First insert with tags [alpha, beta]
|
||||
store.update_single_model('dummy', {**base, 'tags': ['alpha', 'beta']})
|
||||
|
||||
# Now update: replace with [beta, gamma]
|
||||
old_item = {'file_path': file_path, 'tags': ['alpha', 'beta'], 'sha256': 'sha-y'}
|
||||
new_item = {**base, 'tags': ['beta', 'gamma']}
|
||||
store.update_single_model('dummy', new_item, old_item=old_item)
|
||||
|
||||
persisted = store.load_cache('dummy')
|
||||
assert persisted is not None
|
||||
items = {item['file_path']: item for item in persisted.raw_data}
|
||||
assert sorted(items[file_path]['tags']) == ['beta', 'gamma']
|
||||
|
||||
|
||||
def test_update_single_model_update_hash(tmp_path: Path, monkeypatch):
|
||||
"""When sha256 changes, the hash_index is updated incrementally."""
|
||||
monkeypatch.setenv('LORA_MANAGER_DISABLE_PERSISTENT_CACHE', '0')
|
||||
db_path = tmp_path / 'cache.sqlite'
|
||||
store = PersistentModelCache(db_path=str(db_path))
|
||||
|
||||
file_path = (tmp_path / 'z.safetensors').as_posix()
|
||||
base = {
|
||||
'file_path': file_path, 'file_name': 'z', 'model_name': 'Z',
|
||||
'folder': '', 'size': 1, 'modified': 1.0, 'base_model': '',
|
||||
'preview_url': '', 'preview_nsfw_level': 0, 'from_civitai': True,
|
||||
'favorite': False, 'notes': '', 'usage_tips': '{}',
|
||||
'metadata_source': None, 'exclude': False, 'db_checked': False,
|
||||
'last_checked_at': 0.0, 'tags': [], 'civitai': None,
|
||||
'civitai_deleted': False, 'skip_metadata_refresh': False,
|
||||
'license_flags': DEFAULT_LICENSE_FLAGS, 'hash_status': 'completed', 'hf_url': '',
|
||||
}
|
||||
|
||||
store.update_single_model('dummy', {**base, 'sha256': 'old-hash'})
|
||||
|
||||
old_item = {'file_path': file_path, 'tags': [], 'sha256': 'old-hash'}
|
||||
new_item = {**base, 'sha256': 'new-hash'}
|
||||
store.update_single_model('dummy', new_item, old_item=old_item)
|
||||
|
||||
persisted = store.load_cache('dummy')
|
||||
assert persisted is not None
|
||||
# old hash should be gone from hash_index
|
||||
old_hash_pairs = [p for p in persisted.hash_rows if p[0] == 'old-hash']
|
||||
assert len(old_hash_pairs) == 0
|
||||
# new hash should be present
|
||||
new_hash_pairs = [p for p in persisted.hash_rows if p[0] == 'new-hash']
|
||||
assert len(new_hash_pairs) == 1
|
||||
assert new_hash_pairs[0][1] == file_path
|
||||
|
||||
@@ -114,6 +114,38 @@ def test_calculate_relative_path_sanitizes_model_and_version_names(isolated_sett
|
||||
assert relative_path == "Fancy_Model/Version_One"
|
||||
|
||||
|
||||
def test_calculate_relative_path_sanitizes_leading_slash(isolated_settings):
|
||||
"""Test that empty base_model does NOT produce a leading slash in the path."""
|
||||
isolated_settings["download_path_templates"]["lora"] = "{base_model}/{first_tag}"
|
||||
|
||||
model_data = {
|
||||
"base_model": "",
|
||||
"tags": [],
|
||||
"civitai": {"id": 1, "creator": {"username": "Author"}},
|
||||
}
|
||||
|
||||
relative_path = calculate_relative_path_for_model(model_data, "lora")
|
||||
|
||||
assert not relative_path.startswith("/")
|
||||
assert relative_path == "no tags"
|
||||
|
||||
|
||||
def test_calculate_relative_path_sanitizes_double_slashes(isolated_settings):
|
||||
"""Test that empty substitutions don't produce double slashes."""
|
||||
isolated_settings["download_path_templates"]["lora"] = "{base_model}/{first_tag}/{author}"
|
||||
|
||||
model_data = {
|
||||
"base_model": "",
|
||||
"tags": [],
|
||||
"civitai": {"id": 1, "creator": {"username": "Author"}},
|
||||
}
|
||||
|
||||
relative_path = calculate_relative_path_for_model(model_data, "lora")
|
||||
|
||||
assert "//" not in relative_path
|
||||
assert relative_path == "no tags/Author"
|
||||
|
||||
|
||||
def test_calculate_recipe_fingerprint_filters_and_sorts():
|
||||
loras = [
|
||||
{"hash": "ABC", "strength": 0.1234},
|
||||
|
||||
@@ -1,40 +1,117 @@
|
||||
<template>
|
||||
<div class="lora-info-widget">
|
||||
<div class="lora-info-widget" :class="{ 'lm-vue-node': isVueMode }" @wheel="onWheel">
|
||||
<template v-if="loraName">
|
||||
<div class="info-field">
|
||||
<label class="info-label">Filename</label>
|
||||
<div class="lora-filename">{{ loraName }}</div>
|
||||
<!-- Tab bar -->
|
||||
<div class="lora-info-tabs">
|
||||
<label
|
||||
class="lora-info-tab"
|
||||
:class="{ active: activeTab === 'notes' }"
|
||||
>
|
||||
<input
|
||||
type="radio"
|
||||
v-model="activeTab"
|
||||
value="notes"
|
||||
class="lora-info-tab-input"
|
||||
/>
|
||||
<span class="lora-info-tab-label">Notes</span>
|
||||
</label>
|
||||
<label
|
||||
class="lora-info-tab"
|
||||
:class="{ active: activeTab === 'description' }"
|
||||
>
|
||||
<input
|
||||
type="radio"
|
||||
v-model="activeTab"
|
||||
value="description"
|
||||
class="lora-info-tab-input"
|
||||
@change="onDescriptionTabActivated"
|
||||
/>
|
||||
<span class="lora-info-tab-label">Description</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="info-field notes-field">
|
||||
<label class="info-label">Notes</label>
|
||||
<textarea
|
||||
v-model="notes"
|
||||
class="lora-notes"
|
||||
placeholder="Add notes about this LoRA..."
|
||||
:disabled="saving"
|
||||
></textarea>
|
||||
|
||||
<!-- Notes tab content -->
|
||||
<div v-show="activeTab === 'notes'" class="tab-content notes-tab">
|
||||
<div class="info-field">
|
||||
<label class="info-label">Filename</label>
|
||||
<div class="lora-filename">{{ loraName }}</div>
|
||||
</div>
|
||||
<div class="info-field notes-field">
|
||||
<label class="info-label">Notes</label>
|
||||
<textarea
|
||||
v-model="notes"
|
||||
class="lora-notes lm-wheel-scrollable"
|
||||
placeholder="Add notes about this LoRA..."
|
||||
:disabled="saving"
|
||||
></textarea>
|
||||
</div>
|
||||
<button
|
||||
class="save-btn"
|
||||
:disabled="notes === originalNotes || saving"
|
||||
@click="saveNotes"
|
||||
>
|
||||
{{ saving ? 'Saving...' : 'Save' }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- Description tab content -->
|
||||
<div v-show="activeTab === 'description'" class="tab-content description-tab lm-wheel-scrollable">
|
||||
<!-- Loading state -->
|
||||
<div v-if="descriptionLoading" class="description-state">
|
||||
<i class="fas fa-spinner fa-spin"></i>
|
||||
<span>Loading description...</span>
|
||||
</div>
|
||||
|
||||
<!-- Error state -->
|
||||
<div v-else-if="descriptionError" class="description-state error">
|
||||
<span>Failed to load description</span>
|
||||
</div>
|
||||
|
||||
<!-- Empty state (loaded but no content) -->
|
||||
<div v-else-if="!hasDescription" class="description-state placeholder">
|
||||
<span>No description available</span>
|
||||
</div>
|
||||
|
||||
<!-- Description content -->
|
||||
<div v-else class="description-content">
|
||||
<div v-if="versionDescription" class="description-section">
|
||||
<label class="info-label">About this version</label>
|
||||
<div class="description-text" v-html="versionDescription"></div>
|
||||
</div>
|
||||
<div v-if="modelDescription" class="description-section">
|
||||
<label class="info-label">Model Description</label>
|
||||
<div class="description-text" v-html="modelDescription"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
class="save-btn"
|
||||
:disabled="notes === originalNotes || saving"
|
||||
@click="saveNotes"
|
||||
>
|
||||
{{ saving ? 'Saving...' : 'Save' }}
|
||||
</button>
|
||||
</template>
|
||||
<div v-else class="placeholder">No LoRA selected</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onMounted, ref } from 'vue'
|
||||
import { onMounted, ref, computed, watch } from 'vue'
|
||||
|
||||
interface LoraInfoWidget {
|
||||
serializeValue?: () => Promise<unknown>
|
||||
value?: unknown
|
||||
onSetValue?: (v: unknown) => void
|
||||
callback?: unknown
|
||||
_setLoraInfo?: (data: { name: string; notes: string; filePath: string }) => void
|
||||
options?: {
|
||||
getValue?: () => LoraInfoWidgetValue
|
||||
setValue?: (v: unknown) => void
|
||||
}
|
||||
node?: { widgets?: Array<{ id?: string }>; widgets_values?: Array<unknown> }
|
||||
id?: string
|
||||
_setLoraInfo?: (data: { name: string; notes: string; filePath: string; activeTab?: string } | null) => void
|
||||
__pendingLoraInfo?: { name: string; notes: string; filePath: string; activeTab?: string } | null
|
||||
}
|
||||
|
||||
interface LoraInfoWidgetValue {
|
||||
name?: string
|
||||
notes?: string
|
||||
filePath?: string
|
||||
activeTab?: string
|
||||
}
|
||||
|
||||
const props = defineProps<{
|
||||
@@ -42,6 +119,7 @@ const props = defineProps<{
|
||||
node: { id: number }
|
||||
api: { fetchApi: (url: string, options?: RequestInit) => Promise<Response> }
|
||||
app: { extensionManager: { toast: { add: (opts: Record<string, unknown>) => void } } }
|
||||
isVueMode?: boolean
|
||||
}>()
|
||||
|
||||
const loraName = ref<string>('')
|
||||
@@ -49,6 +127,69 @@ const notes = ref<string>('')
|
||||
const originalNotes = ref<string>('')
|
||||
const filePath = ref<string>('')
|
||||
const saving = ref<boolean>(false)
|
||||
const activeTab = ref<string>('notes')
|
||||
|
||||
// Description tab state
|
||||
const versionDescription = ref<string>('')
|
||||
const modelDescription = ref<string>('')
|
||||
const descriptionLoading = ref<boolean>(false)
|
||||
const descriptionError = ref<boolean>(false)
|
||||
const descriptionLoaded = ref<boolean>(false)
|
||||
|
||||
const hasDescription = computed(() =>
|
||||
!!(versionDescription.value || modelDescription.value)
|
||||
)
|
||||
|
||||
// Reset and auto-fetch description state when the LoRA selection changes
|
||||
watch(filePath, (newPath) => {
|
||||
descriptionLoaded.value = false
|
||||
descriptionError.value = false
|
||||
versionDescription.value = ''
|
||||
modelDescription.value = ''
|
||||
if (newPath && activeTab.value === 'description') {
|
||||
fetchDescription()
|
||||
}
|
||||
})
|
||||
|
||||
function onDescriptionTabActivated() {
|
||||
if (!descriptionLoaded.value && filePath.value) {
|
||||
fetchDescription()
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchDescription() {
|
||||
if (descriptionLoading.value || !filePath.value) return
|
||||
|
||||
descriptionLoading.value = true
|
||||
descriptionError.value = false
|
||||
|
||||
try {
|
||||
const response = await props.api.fetchApi(
|
||||
`/lm/loras/metadata?file_path=${encodeURIComponent(filePath.value)}`,
|
||||
{ method: 'GET' }
|
||||
)
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch metadata: ${response.statusText}`)
|
||||
}
|
||||
|
||||
const data = await response.json()
|
||||
if (data.success && data.metadata) {
|
||||
versionDescription.value = data.metadata.description || ''
|
||||
modelDescription.value = data.metadata.model?.description || ''
|
||||
descriptionLoaded.value = true
|
||||
} else {
|
||||
// Successful response but no metadata — treat as empty, not error
|
||||
descriptionLoaded.value = true
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('[LoraInfoWidget] Failed to fetch description:', e)
|
||||
descriptionError.value = true
|
||||
// Don't set descriptionLoaded — allow retry on next tab switch
|
||||
} finally {
|
||||
descriptionLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function saveNotes() {
|
||||
if (notes.value === originalNotes.value || saving.value) return
|
||||
@@ -91,14 +232,62 @@ async function saveNotes() {
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// Display-only widget - return null on serialization to avoid saving to workflow
|
||||
props.widget.serializeValue = async () => null
|
||||
function onWheel(event: WheelEvent) {
|
||||
const target = event.target as HTMLElement | null
|
||||
if (!target) return
|
||||
|
||||
// Handle external value updates (e.g., loading workflow, paste)
|
||||
props.widget.onSetValue = (v: unknown) => {
|
||||
const comfyApp = (window as unknown as { app?: { canvas?: { processMouseWheel?: (e: WheelEvent) => void } } }).app
|
||||
if (!comfyApp?.canvas?.processMouseWheel) return
|
||||
|
||||
// Always pass pinch-to-zoom to canvas
|
||||
if (event.ctrlKey) {
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
comfyApp.canvas.processMouseWheel(event)
|
||||
return
|
||||
}
|
||||
|
||||
// Horizontal scroll: pass to canvas
|
||||
if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
comfyApp.canvas.processMouseWheel(event)
|
||||
return
|
||||
}
|
||||
|
||||
// Check if the target is inside a scrollable area (notes textarea or description tab)
|
||||
const scrollableEl = target.closest('.lora-notes, .description-tab') as HTMLElement | null
|
||||
if (scrollableEl) {
|
||||
const canScrollY = scrollableEl.scrollHeight > scrollableEl.clientHeight
|
||||
if (canScrollY) {
|
||||
// Let native scroll handle it, but stop propagation to prevent canvas zoom
|
||||
event.stopPropagation()
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
// Forward to canvas for zoom
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
comfyApp.canvas.processMouseWheel(event)
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// Build current state snapshot for serialization
|
||||
const buildValue = (): LoraInfoWidgetValue => ({
|
||||
name: loraName.value,
|
||||
notes: notes.value,
|
||||
filePath: filePath.value,
|
||||
activeTab: activeTab.value,
|
||||
})
|
||||
|
||||
// Set value from external source (workflow load, paste, etc.)
|
||||
const applyValue = (v: unknown) => {
|
||||
if (v && typeof v === 'object') {
|
||||
const data = v as { name?: string; notes?: string; filePath?: string }
|
||||
const data = v as LoraInfoWidgetValue
|
||||
// Set activeTab before filePath so the filePath watcher sees the correct tab
|
||||
// and triggers fetchDescription() when restoring description tab
|
||||
if (data.activeTab !== undefined) activeTab.value = data.activeTab
|
||||
if (data.name !== undefined) loraName.value = data.name
|
||||
if (data.notes !== undefined) {
|
||||
notes.value = data.notes
|
||||
@@ -108,30 +297,55 @@ onMounted(() => {
|
||||
}
|
||||
}
|
||||
|
||||
// Restore from saved value if exists (for workflow loading)
|
||||
if (props.widget.value && typeof props.widget.value === 'object') {
|
||||
const data = props.widget.value as { name?: string; notes?: string; filePath?: string }
|
||||
if (data.name !== undefined) loraName.value = data.name
|
||||
if (data.notes !== undefined) {
|
||||
notes.value = data.notes
|
||||
originalNotes.value = data.notes
|
||||
// ComponentWidgetImpl.value getter/setter delegates to options.getValue/options.setValue.
|
||||
// These must be set for workflow JSON persistence (LGraphNode.serialize/configure) to work.
|
||||
props.widget.options.getValue = buildValue
|
||||
props.widget.options.setValue = applyValue
|
||||
|
||||
// Also set serializeValue for prompt/API serialization path (executionUtil.ts)
|
||||
props.widget.serializeValue = async () => buildValue()
|
||||
|
||||
// Handle external value updates (e.g., loading workflow, paste)
|
||||
props.widget.onSetValue = applyValue
|
||||
|
||||
// Restore from saved value. Because configure() may call widget.value = data
|
||||
// before onMounted fires (and before options.setValue is assigned), we check
|
||||
// widgets_values directly in case the value was already pushed.
|
||||
const widgetIndex = props.widget.node?.widgets?.findIndex(
|
||||
(w: { id?: string }) => w.id === props.widget.id
|
||||
)
|
||||
let restored = false
|
||||
if (widgetIndex !== undefined && widgetIndex >= 0) {
|
||||
const savedValue = props.widget.node?.widgets_values?.[widgetIndex]
|
||||
if (savedValue && typeof savedValue === 'object') {
|
||||
applyValue(savedValue)
|
||||
restored = true
|
||||
}
|
||||
if (data.filePath !== undefined) filePath.value = data.filePath
|
||||
}
|
||||
// Fallback: if configure() ran after onMounted, widget.value (via options.getValue)
|
||||
// already has the saved data. Only use this path if the widgets_values lookup didn't restore.
|
||||
if (!restored && props.widget.value && typeof props.widget.value === 'object') {
|
||||
applyValue(props.widget.value)
|
||||
}
|
||||
|
||||
// Expose setLoraInfo on the widget object for external callers (e.g., lora_info.js).
|
||||
// Accepts null to clear the display (when selection is deselected).
|
||||
props.widget._setLoraInfo = (data: { name: string; notes: string; filePath: string } | null) => {
|
||||
props.widget._setLoraInfo = (data: { name: string; notes: string; filePath: string; activeTab?: string } | null) => {
|
||||
if (data) {
|
||||
loraName.value = data.name
|
||||
notes.value = data.notes
|
||||
originalNotes.value = data.notes
|
||||
filePath.value = data.filePath
|
||||
// Preserve existing activeTab unless explicitly provided
|
||||
if (data.activeTab !== undefined) {
|
||||
activeTab.value = data.activeTab
|
||||
}
|
||||
} else {
|
||||
loraName.value = ''
|
||||
notes.value = ''
|
||||
originalNotes.value = ''
|
||||
filePath.value = ''
|
||||
// Do NOT reset activeTab on deselection — user's tab preference persists
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,6 +369,86 @@ onMounted(() => {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Vue node mode: prevent content from pushing node size via ResizeObserver.
|
||||
contain:layout size tells the browser the element's intrinsic size is
|
||||
determined solely by CSS — not by descendant content. This breaks the
|
||||
feedback loop where content grows → ResizeObserver resizes → content
|
||||
reflows → repeat. Same technique used by tags_widget.js + lm_styles.css. */
|
||||
.lora-info-widget.lm-vue-node {
|
||||
contain: layout size;
|
||||
}
|
||||
|
||||
/* ── Tab bar ── */
|
||||
.lora-info-tabs {
|
||||
display: flex;
|
||||
gap: 0;
|
||||
margin-bottom: 10px;
|
||||
border-bottom: 1px solid var(--border-color, #444);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.lora-info-tab {
|
||||
flex: 1;
|
||||
text-align: center;
|
||||
cursor: pointer;
|
||||
padding: 6px 0;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.lora-info-tab-input {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
|
||||
.lora-info-tab-label {
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
color: var(--fg-color, #fff);
|
||||
opacity: 0.5;
|
||||
transition: opacity 0.15s;
|
||||
}
|
||||
|
||||
.lora-info-tab:hover .lora-info-tab-label {
|
||||
opacity: 0.75;
|
||||
}
|
||||
|
||||
.lora-info-tab.active .lora-info-tab-label {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.lora-info-tab.active::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
bottom: -1px;
|
||||
left: 25%;
|
||||
right: 25%;
|
||||
height: 2px;
|
||||
background: rgba(66, 153, 225, 0.8);
|
||||
border-radius: 1px;
|
||||
}
|
||||
|
||||
/* ── Tab content ── */
|
||||
.tab-content {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.notes-tab {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.description-tab {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-y: auto;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
/* ── Info fields (shared) ── */
|
||||
.info-field {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -176,6 +470,10 @@ onMounted(() => {
|
||||
color: var(--fg-color, #fff);
|
||||
word-break: break-all;
|
||||
margin-bottom: 8px;
|
||||
/* Override node-level grab cursor and user-select:none from .lg-node.cursor-grab */
|
||||
cursor: auto;
|
||||
user-select: text;
|
||||
-webkit-user-select: text;
|
||||
}
|
||||
|
||||
.notes-field {
|
||||
@@ -235,6 +533,91 @@ onMounted(() => {
|
||||
border-color: rgba(226, 232, 240, 0.1);
|
||||
}
|
||||
|
||||
/* ── Description states ── */
|
||||
.description-state {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 8px;
|
||||
padding: 24px 16px;
|
||||
color: var(--fg-color, #fff);
|
||||
opacity: 0.5;
|
||||
font-size: 12px;
|
||||
min-height: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.description-state.error {
|
||||
opacity: 0.7;
|
||||
color: #f87171;
|
||||
}
|
||||
|
||||
/* ── Description content ── */
|
||||
.description-content {
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.description-section {
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
.description-section:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.description-text {
|
||||
padding: 8px 0;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
color: var(--fg-color, #fff);
|
||||
opacity: 0.85;
|
||||
word-break: break-word;
|
||||
/* Override node-level grab cursor and user-select:none from .lg-node.cursor-grab */
|
||||
cursor: auto;
|
||||
user-select: text;
|
||||
-webkit-user-select: text;
|
||||
}
|
||||
|
||||
.description-text :deep(p) {
|
||||
margin: 0 0 8px 0;
|
||||
}
|
||||
|
||||
.description-text :deep(p:last-child) {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.description-text :deep(a) {
|
||||
color: rgba(66, 153, 225, 0.9);
|
||||
}
|
||||
|
||||
.description-text :deep(ul),
|
||||
.description-text :deep(ol) {
|
||||
padding-left: 20px;
|
||||
margin: 4px 0;
|
||||
}
|
||||
|
||||
.description-text :deep(h1),
|
||||
.description-text :deep(h2),
|
||||
.description-text :deep(h3) {
|
||||
font-size: 13px;
|
||||
margin: 10px 0 4px 0;
|
||||
font-weight: 600;
|
||||
opacity: 0.95;
|
||||
}
|
||||
|
||||
.description-text :deep(code) {
|
||||
background: rgba(255, 255, 255, 0.08);
|
||||
padding: 1px 4px;
|
||||
border-radius: 3px;
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.description-text :deep(img) {
|
||||
max-width: 100%;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
/* ── Placeholder (shared) ── */
|
||||
.placeholder {
|
||||
font-style: italic;
|
||||
color: rgba(226, 232, 240, 0.5);
|
||||
@@ -242,4 +625,14 @@ onMounted(() => {
|
||||
padding: 16px 0;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
/* ── Spinner (Font Awesome) ── */
|
||||
.fa-spinner {
|
||||
animation: fa-spin 1s linear infinite;
|
||||
}
|
||||
|
||||
@keyframes fa-spin {
|
||||
0% { transform: rotate(0deg); }
|
||||
100% { transform: rotate(360deg); }
|
||||
}
|
||||
</style>
|
||||
@@ -656,7 +656,7 @@ function createLoraInfoWidget(node: any) {
|
||||
|
||||
forwardMiddleMouseToCanvas(container)
|
||||
|
||||
let internalValue: { name?: string; notes?: string; filePath?: string } | undefined
|
||||
let internalValue: { name?: string; notes?: string; filePath?: string; activeTab?: string } | undefined
|
||||
|
||||
const widget = node.addDOMWidget(
|
||||
'lora_info_display',
|
||||
@@ -666,13 +666,13 @@ function createLoraInfoWidget(node: any) {
|
||||
getValue() {
|
||||
return internalValue
|
||||
},
|
||||
setValue(v: { name?: string; notes?: string; filePath?: string }) {
|
||||
setValue(v: { name?: string; notes?: string; filePath?: string; activeTab?: string }) {
|
||||
internalValue = v
|
||||
if (typeof widget.onSetValue === 'function') {
|
||||
widget.onSetValue(v)
|
||||
}
|
||||
},
|
||||
serialize: false, // Display-only widget
|
||||
serialize: true,
|
||||
getMinHeight() {
|
||||
return LORA_INFO_WIDGET_MIN_HEIGHT
|
||||
}
|
||||
@@ -684,6 +684,7 @@ function createLoraInfoWidget(node: any) {
|
||||
node,
|
||||
api,
|
||||
app,
|
||||
isVueMode: typeof LiteGraph !== 'undefined' && LiteGraph.vueNodesMode,
|
||||
})
|
||||
|
||||
vueApp.use(PrimeVue, {
|
||||
|
||||
@@ -16,6 +16,7 @@ export const LORA_PROVIDER_NODE_TYPES = [
|
||||
"Lora Stacker (LoraManager)",
|
||||
"Lora Randomizer (LoraManager)",
|
||||
"Lora Cycler (LoraManager)",
|
||||
"Create Hook LoRA (LoraManager)",
|
||||
] as const;
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,418 @@
|
||||
/**
|
||||
* Tests for LoraInfoWidget — tab switching, lazy description loading,
|
||||
* state serialization roundtrip, and activeTab persistence.
|
||||
*/
|
||||
|
||||
import { nextTick } from 'vue'
|
||||
import { shallowMount } from '@vue/test-utils'
|
||||
import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'
|
||||
import LoraInfoWidget from '@/components/LoraInfoWidget.vue'
|
||||
import { setupFetchMock, resetFetchMock } from '../setup'
|
||||
|
||||
// ── Helpers ──
|
||||
|
||||
function createMockFetchApi(overrides: {
|
||||
response?: unknown
|
||||
ok?: boolean
|
||||
error?: string
|
||||
} = {}) {
|
||||
const { response = { success: true, metadata: {} }, ok = true } = overrides
|
||||
return vi.fn().mockResolvedValue({
|
||||
ok,
|
||||
json: () => Promise.resolve(response),
|
||||
})
|
||||
}
|
||||
|
||||
function createMockToast() {
|
||||
return { add: vi.fn() }
|
||||
}
|
||||
|
||||
function createMockWidget(value?: unknown) {
|
||||
type PendingInfo = { name: string; notes: string; filePath: string; activeTab?: string } | null
|
||||
const widget = {
|
||||
options: {} as { getValue?: () => unknown; setValue?: (v: unknown) => void },
|
||||
serializeValue: (async () => null) as () => Promise<unknown>,
|
||||
value: (value ?? undefined) as unknown,
|
||||
onSetValue: undefined as unknown as ((v: unknown) => void),
|
||||
_setLoraInfo: undefined as unknown as (data: Record<string, unknown> | null) => void,
|
||||
__pendingLoraInfo: undefined as unknown as PendingInfo | undefined,
|
||||
}
|
||||
return widget
|
||||
}
|
||||
|
||||
interface MountOptions {
|
||||
initialValue?: Record<string, unknown>
|
||||
}
|
||||
|
||||
type TestWidget = ReturnType<typeof createMockWidget>
|
||||
|
||||
function mountWidget(options: MountOptions = {}) {
|
||||
const fetchApi = createMockFetchApi()
|
||||
const widget = createMockWidget(options.initialValue)
|
||||
const node = { id: 1 }
|
||||
const app = { extensionManager: { toast: createMockToast() } }
|
||||
|
||||
const wrapper = shallowMount(LoraInfoWidget, {
|
||||
props: { widget, node, api: { fetchApi }, app },
|
||||
})
|
||||
|
||||
return { wrapper, widget: widget as TestWidget, fetchApi, app }
|
||||
}
|
||||
|
||||
// ── Tests ──
|
||||
|
||||
describe('LoraInfoWidget', () => {
|
||||
beforeEach(() => {
|
||||
setupFetchMock()
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
resetFetchMock()
|
||||
})
|
||||
|
||||
describe('initial state', () => {
|
||||
it('shows placeholder when no LoRA is selected', () => {
|
||||
const { wrapper } = mountWidget()
|
||||
expect(wrapper.text()).toContain('No LoRA selected')
|
||||
})
|
||||
|
||||
it('shows Notes tab by default when LoRA is set', async () => {
|
||||
const { wrapper, widget } = mountWidget()
|
||||
widget._setLoraInfo!({ name: 'test.safetensors', notes: '', filePath: '/path/test.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
expect(wrapper.text()).toContain('test.safetensors')
|
||||
expect(wrapper.find('.notes-tab').isVisible()).toBe(true)
|
||||
expect(wrapper.find('.description-tab').isVisible()).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('tab switching', () => {
|
||||
it('switches to Description tab and back to Notes', async () => {
|
||||
const { wrapper, widget } = mountWidget()
|
||||
widget._setLoraInfo!({ name: 'test.safetensors', notes: '', filePath: '/path/test.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
const tabs = wrapper.findAll('.lora-info-tab')
|
||||
|
||||
// Click Description tab
|
||||
const descriptionTab = wrapper.findAll('.lora-info-tab-input')[1]
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
|
||||
expect(tabs[1].classes()).toContain('active')
|
||||
expect(wrapper.text()).toContain('No description available')
|
||||
|
||||
// Switch back to Notes
|
||||
const notesTab = wrapper.findAll('.lora-info-tab-input')[0]
|
||||
await notesTab.setValue('notes')
|
||||
await nextTick()
|
||||
|
||||
expect(tabs[0].classes()).toContain('active')
|
||||
expect(wrapper.text()).toContain('test.safetensors')
|
||||
})
|
||||
})
|
||||
|
||||
describe('description lazy loading', () => {
|
||||
it('fetches metadata when Description tab is activated', async () => {
|
||||
const fetchApi = createMockFetchApi({
|
||||
response: {
|
||||
success: true,
|
||||
metadata: {
|
||||
description: '<p>Version desc</p>',
|
||||
model: { description: '<p>Model desc</p>' },
|
||||
},
|
||||
},
|
||||
})
|
||||
const widget = createMockWidget()
|
||||
const wrapper = shallowMount(LoraInfoWidget, {
|
||||
props: {
|
||||
widget,
|
||||
node: { id: 1 },
|
||||
api: { fetchApi },
|
||||
app: { extensionManager: { toast: createMockToast() } },
|
||||
},
|
||||
})
|
||||
|
||||
widget._setLoraInfo!({ name: 'test.safetensors', notes: '', filePath: '/path/test.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
// Switch to Description tab
|
||||
const descriptionTab = wrapper.findAll('.lora-info-tab-input')[1]
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
await nextTick() // flush async fetch
|
||||
|
||||
expect(fetchApi).toHaveBeenCalledWith(
|
||||
expect.stringContaining('/lm/loras/metadata'),
|
||||
expect.objectContaining({ method: 'GET' })
|
||||
)
|
||||
expect(wrapper.html()).toContain('Version desc')
|
||||
expect(wrapper.html()).toContain('Model desc')
|
||||
})
|
||||
|
||||
it('shows loading state while fetching', async () => {
|
||||
// Use a never-resolving promise to simulate loading
|
||||
const fetchApi = vi.fn().mockReturnValue(new Promise(() => {}))
|
||||
const widget = createMockWidget()
|
||||
const wrapper = shallowMount(LoraInfoWidget, {
|
||||
props: {
|
||||
widget,
|
||||
node: { id: 1 },
|
||||
api: { fetchApi },
|
||||
app: { extensionManager: { toast: createMockToast() } },
|
||||
},
|
||||
})
|
||||
|
||||
widget._setLoraInfo!({ name: 'test.safetensors', notes: '', filePath: '/path/test.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
const descriptionTab = wrapper.findAll('.lora-info-tab-input')[1]
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
|
||||
expect(wrapper.text()).toContain('Loading description')
|
||||
})
|
||||
|
||||
it('shows error state when fetch fails', async () => {
|
||||
const fetchApi = vi.fn().mockRejectedValue(new Error('Network error'))
|
||||
const widget = createMockWidget()
|
||||
const wrapper = shallowMount(LoraInfoWidget, {
|
||||
props: {
|
||||
widget,
|
||||
node: { id: 1 },
|
||||
api: { fetchApi },
|
||||
app: { extensionManager: { toast: createMockToast() } },
|
||||
},
|
||||
})
|
||||
|
||||
widget._setLoraInfo!({ name: 'test.safetensors', notes: '', filePath: '/path/test.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
const descriptionTab = wrapper.findAll('.lora-info-tab-input')[1]
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
await nextTick()
|
||||
|
||||
expect(wrapper.text()).toContain('Failed to load description')
|
||||
})
|
||||
|
||||
it('shows empty state when metadata has no descriptions', async () => {
|
||||
const fetchApi = createMockFetchApi({
|
||||
response: {
|
||||
success: true,
|
||||
metadata: {
|
||||
description: '',
|
||||
model: {},
|
||||
},
|
||||
},
|
||||
})
|
||||
const widget = createMockWidget()
|
||||
const wrapper = shallowMount(LoraInfoWidget, {
|
||||
props: {
|
||||
widget,
|
||||
node: { id: 1 },
|
||||
api: { fetchApi },
|
||||
app: { extensionManager: { toast: createMockToast() } },
|
||||
},
|
||||
})
|
||||
|
||||
widget._setLoraInfo!({ name: 'test.safetensors', notes: '', filePath: '/path/test.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
const descriptionTab = wrapper.findAll('.lora-info-tab-input')[1]
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
await nextTick()
|
||||
|
||||
expect(wrapper.text()).toContain('No description available')
|
||||
})
|
||||
|
||||
it('caches description and does not re-fetch on second activation', async () => {
|
||||
const fetchApi = createMockFetchApi({
|
||||
response: {
|
||||
success: true,
|
||||
metadata: {
|
||||
description: '<p>Version desc</p>',
|
||||
model: { description: '<p>Model desc</p>' },
|
||||
},
|
||||
},
|
||||
})
|
||||
const widget = createMockWidget()
|
||||
const wrapper = shallowMount(LoraInfoWidget, {
|
||||
props: {
|
||||
widget,
|
||||
node: { id: 1 },
|
||||
api: { fetchApi },
|
||||
app: { extensionManager: { toast: createMockToast() } },
|
||||
},
|
||||
})
|
||||
|
||||
widget._setLoraInfo!({ name: 'test.safetensors', notes: '', filePath: '/path/test.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
// First activation
|
||||
const descriptionTab = wrapper.findAll('.lora-info-tab-input')[1]
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
await nextTick()
|
||||
|
||||
expect(fetchApi).toHaveBeenCalledTimes(1)
|
||||
|
||||
// Switch away and back
|
||||
const notesTab = wrapper.findAll('.lora-info-tab-input')[0]
|
||||
await notesTab.setValue('notes')
|
||||
await nextTick()
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
|
||||
// Should NOT have called fetch again
|
||||
expect(fetchApi).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('re-fetches when LoRA selection changes', async () => {
|
||||
const fetchApi = createMockFetchApi({
|
||||
response: {
|
||||
success: true,
|
||||
metadata: {
|
||||
description: '<p>Version desc</p>',
|
||||
model: { description: '<p>Model desc</p>' },
|
||||
},
|
||||
},
|
||||
})
|
||||
const widget = createMockWidget()
|
||||
const wrapper = shallowMount(LoraInfoWidget, {
|
||||
props: {
|
||||
widget,
|
||||
node: { id: 1 },
|
||||
api: { fetchApi },
|
||||
app: { extensionManager: { toast: createMockToast() } },
|
||||
},
|
||||
})
|
||||
|
||||
widget._setLoraInfo!({ name: 'first.safetensors', notes: '', filePath: '/path/first.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
const descriptionTab = wrapper.findAll('.lora-info-tab-input')[1]
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
await nextTick()
|
||||
|
||||
expect(fetchApi).toHaveBeenCalledTimes(1)
|
||||
|
||||
// Select a different LoRA — resets description state
|
||||
widget._setLoraInfo!({ name: 'second.safetensors', notes: '', filePath: '/path/second.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
// Should show loading again (not cached)
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
await nextTick()
|
||||
|
||||
expect(fetchApi).toHaveBeenCalledTimes(2)
|
||||
})
|
||||
})
|
||||
|
||||
describe('serialization roundtrip', () => {
|
||||
it('serializeValue includes activeTab', async () => {
|
||||
const { wrapper, widget } = mountWidget()
|
||||
widget._setLoraInfo!({ name: 'test.safetensors', notes: 'my notes', filePath: '/path/test.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
// Switch to Description tab
|
||||
const descriptionTab = wrapper.findAll('.lora-info-tab-input')[1]
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
|
||||
const serialized = await widget.serializeValue!()
|
||||
expect(serialized).toMatchObject({
|
||||
name: 'test.safetensors',
|
||||
notes: 'my notes',
|
||||
filePath: '/path/test.safetensors',
|
||||
activeTab: 'description',
|
||||
})
|
||||
})
|
||||
|
||||
it('onSetValue restores activeTab from workflow value', async () => {
|
||||
const { wrapper } = mountWidget({
|
||||
initialValue: {
|
||||
name: 'saved.safetensors',
|
||||
notes: 'saved notes',
|
||||
filePath: '/path/saved.safetensors',
|
||||
activeTab: 'description',
|
||||
},
|
||||
})
|
||||
|
||||
await nextTick()
|
||||
|
||||
// Description tab should be visible (activeTab restored to 'description')
|
||||
expect(wrapper.find('.description-tab').isVisible()).toBe(true)
|
||||
expect(wrapper.text()).toContain('saved.safetensors')
|
||||
})
|
||||
|
||||
it('defaults to notes tab when activeTab is missing in saved value', async () => {
|
||||
const { wrapper } = mountWidget({
|
||||
initialValue: {
|
||||
name: 'legacy.safetensors',
|
||||
notes: 'legacy notes',
|
||||
filePath: '/path/legacy.safetensors',
|
||||
// No activeTab — legacy workflow
|
||||
},
|
||||
})
|
||||
|
||||
await nextTick()
|
||||
|
||||
expect(wrapper.find('.notes-tab').isVisible()).toBe(true)
|
||||
})
|
||||
})
|
||||
|
||||
describe('_setLoraInfo race condition guard', () => {
|
||||
it('consumes __pendingLoraInfo pushed before mount', async () => {
|
||||
const widget = createMockWidget()
|
||||
widget.__pendingLoraInfo = {
|
||||
name: 'pending.safetensors',
|
||||
notes: 'pending notes',
|
||||
filePath: '/path/pending.safetensors',
|
||||
}
|
||||
|
||||
const wrapper = shallowMount(LoraInfoWidget, {
|
||||
props: {
|
||||
widget,
|
||||
node: { id: 1 },
|
||||
api: { fetchApi: createMockFetchApi() },
|
||||
app: { extensionManager: { toast: createMockToast() } },
|
||||
},
|
||||
})
|
||||
|
||||
await nextTick()
|
||||
|
||||
expect(widget.__pendingLoraInfo).toBeUndefined()
|
||||
expect(wrapper.text()).toContain('pending.safetensors')
|
||||
})
|
||||
|
||||
it('preserves activeTab when _setLoraInfo called with null (deselection)', async () => {
|
||||
const { wrapper, widget } = mountWidget()
|
||||
widget._setLoraInfo!({ name: 'test.safetensors', notes: '', filePath: '/path/test.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
// Switch to Description tab
|
||||
const descriptionTab = wrapper.findAll('.lora-info-tab-input')[1]
|
||||
await descriptionTab.setValue('description')
|
||||
await nextTick()
|
||||
|
||||
// Deselect — template shows placeholder (no tab bar rendered)
|
||||
widget._setLoraInfo!(null)
|
||||
await nextTick()
|
||||
|
||||
// Placeholder shown
|
||||
expect(wrapper.text()).toContain('No LoRA selected')
|
||||
|
||||
// Re-select — activeTab should still be 'description'
|
||||
widget._setLoraInfo!({ name: 'second.safetensors', notes: '', filePath: '/path/second.safetensors' })
|
||||
await nextTick()
|
||||
|
||||
const tabs = wrapper.findAll('.lora-info-tab')
|
||||
expect(tabs[1].classes()).toContain('active')
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,143 @@
|
||||
import { app } from "../../scripts/app.js";
|
||||
import {
|
||||
getActiveLorasFromNode,
|
||||
updateConnectedTriggerWords,
|
||||
chainCallback,
|
||||
mergeLoras,
|
||||
getWidgetByName,
|
||||
getWidgetSerializedValue,
|
||||
} from "./utils.js";
|
||||
import { addLorasWidget } from "./loras_widget.js";
|
||||
import { applyLoraValuesToText, debounce } from "./lora_syntax_utils.js";
|
||||
import { applySelectionHighlight } from "./trigger_word_highlight.js";
|
||||
import { updateConnectedLoraInfoNodes } from "./lora_info.js";
|
||||
|
||||
app.registerExtension({
|
||||
name: "LoraManager.CreateHookLora",
|
||||
|
||||
async beforeRegisterNodeDef(nodeType, nodeData, app) {
|
||||
if (nodeType.comfyClass === "Create Hook LoRA (LoraManager)") {
|
||||
chainCallback(nodeType.prototype, "onNodeCreated", function () {
|
||||
// Enable widget serialization so loras widget state is persisted
|
||||
this.serialize_widgets = true;
|
||||
|
||||
this.addInput("prev_hooks", "HOOKS", {
|
||||
shape: 7,
|
||||
});
|
||||
|
||||
// Flags to prevent callback loops between text widget ↔ loras widget
|
||||
let isUpdating = false;
|
||||
let isSyncingInput = false;
|
||||
|
||||
// Get the text input widget (AUTOCOMPLETE_TEXT_LORAS type, created by Vue widgets)
|
||||
const inputWidget = getWidgetByName(this, "text");
|
||||
if (!inputWidget) {
|
||||
console.warn(
|
||||
"LoRA Manager: text widget not found for Create Hook LoRA"
|
||||
);
|
||||
return;
|
||||
}
|
||||
this.inputWidget = inputWidget;
|
||||
|
||||
const scheduleInputSync = debounce((lorasValue) => {
|
||||
if (isSyncingInput) {
|
||||
return;
|
||||
}
|
||||
|
||||
isSyncingInput = true;
|
||||
isUpdating = true;
|
||||
|
||||
try {
|
||||
const nextText = applyLoraValuesToText(
|
||||
inputWidget.value,
|
||||
lorasValue
|
||||
);
|
||||
|
||||
if (inputWidget.value !== nextText) {
|
||||
inputWidget.value = nextText;
|
||||
}
|
||||
} finally {
|
||||
isUpdating = false;
|
||||
isSyncingInput = false;
|
||||
}
|
||||
});
|
||||
|
||||
// Create the LoRA list widget
|
||||
const result = addLorasWidget(
|
||||
this,
|
||||
"loras",
|
||||
{
|
||||
onSelectionChange: (selection) => {
|
||||
applySelectionHighlight(this, selection);
|
||||
updateConnectedLoraInfoNodes(this, selection);
|
||||
},
|
||||
},
|
||||
(value) => {
|
||||
// Prevent recursive calls
|
||||
if (isUpdating) return;
|
||||
isUpdating = true;
|
||||
|
||||
try {
|
||||
// Update connected trigger word toggles with active LoRA names
|
||||
const activeLoraNames = new Set();
|
||||
value.forEach((lora) => {
|
||||
if (lora.active) {
|
||||
activeLoraNames.add(lora.name);
|
||||
}
|
||||
});
|
||||
updateConnectedTriggerWords(this, activeLoraNames);
|
||||
} finally {
|
||||
isUpdating = false;
|
||||
}
|
||||
|
||||
scheduleInputSync(value);
|
||||
}
|
||||
);
|
||||
|
||||
this.lorasWidget = result.widget;
|
||||
|
||||
// Set up callback for the text input widget to trigger merge logic
|
||||
inputWidget.callback = (value) => {
|
||||
if (isUpdating) return;
|
||||
isUpdating = true;
|
||||
|
||||
try {
|
||||
const currentLoras = this.lorasWidget?.value || [];
|
||||
const mergedLoras = mergeLoras(value, currentLoras);
|
||||
if (this.lorasWidget) {
|
||||
this.lorasWidget.value = mergedLoras;
|
||||
}
|
||||
|
||||
// Update connected trigger word toggles
|
||||
const activeLoraNames = getActiveLorasFromNode(this);
|
||||
updateConnectedTriggerWords(this, activeLoraNames);
|
||||
} finally {
|
||||
isUpdating = false;
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
async loadedGraphNode(node) {
|
||||
if (node.comfyClass === "Create Hook LoRA (LoraManager)") {
|
||||
// Restore saved loras widget values on workflow load
|
||||
let existingLoras = [];
|
||||
if (node.widgets_values && node.widgets_values.length > 0) {
|
||||
const savedValue = getWidgetSerializedValue(node, "loras");
|
||||
existingLoras = savedValue || [];
|
||||
}
|
||||
// Merge the loras data from text widget with saved values
|
||||
const inputWidget =
|
||||
node.inputWidget || getWidgetByName(node, "text");
|
||||
if (!inputWidget) {
|
||||
console.warn(
|
||||
"LoRA Manager: text widget not found while restoring Create Hook LoRA"
|
||||
);
|
||||
return;
|
||||
}
|
||||
const mergedLoras = mergeLoras(inputWidget.value, existingLoras);
|
||||
node.lorasWidget.value = mergedLoras;
|
||||
}
|
||||
},
|
||||
});
|
||||
@@ -711,7 +711,11 @@ export function addLorasWidget(node, name, opts, callback) {
|
||||
// Create widget with new DOM Widget API
|
||||
const widget = node.addDOMWidget(name, "custom", container, {
|
||||
getValue: function() {
|
||||
return widgetValue;
|
||||
return widgetValue.map(lora => {
|
||||
const entry = { ...lora };
|
||||
entry.selected = lora.name === selectedLora;
|
||||
return entry;
|
||||
});
|
||||
},
|
||||
setValue: function(v) {
|
||||
// Remove duplicates by keeping the last occurrence of each lora name
|
||||
@@ -738,6 +742,15 @@ export function addLorasWidget(node, name, opts, callback) {
|
||||
});
|
||||
|
||||
widgetValue = updatedValue;
|
||||
|
||||
// Restore selection state when loading a saved workflow
|
||||
if (!selectedLora) {
|
||||
const selectedEntry = updatedValue.find(lora => lora.selected);
|
||||
if (selectedEntry) {
|
||||
selectedLora = selectedEntry.name;
|
||||
}
|
||||
}
|
||||
|
||||
renderLoras(widgetValue, widget);
|
||||
},
|
||||
hideOnZoom: true,
|
||||
|
||||
@@ -438,7 +438,9 @@ export function initReorderDrag(dragHandle, loraName, widget, renderFunction) {
|
||||
if (firstEntry) {
|
||||
const rect = firstEntry.getBoundingClientRect();
|
||||
const containerRect = container.getBoundingClientRect();
|
||||
dropIndicator.style.top = `${(rect.top - containerRect.top - 2) / scale}px`;
|
||||
// Convert GBCR visual offset to container-local space (rect/containerRect are post-scale,
|
||||
// scrollTop is pre-scale), so only the visual-diff portion is divided by scale
|
||||
dropIndicator.style.top = `${(rect.top - containerRect.top) / scale + container.scrollTop - 2}px`;
|
||||
dropIndicator.style.opacity = '1';
|
||||
}
|
||||
} else if (targetIndex < entries.length) {
|
||||
@@ -447,7 +449,7 @@ export function initReorderDrag(dragHandle, loraName, widget, renderFunction) {
|
||||
if (targetEntry) {
|
||||
const rect = targetEntry.getBoundingClientRect();
|
||||
const containerRect = container.getBoundingClientRect();
|
||||
dropIndicator.style.top = `${(rect.top - containerRect.top - 2) / scale}px`;
|
||||
dropIndicator.style.top = `${(rect.top - containerRect.top) / scale + container.scrollTop - 2}px`;
|
||||
dropIndicator.style.opacity = '1';
|
||||
}
|
||||
} else {
|
||||
@@ -456,7 +458,7 @@ export function initReorderDrag(dragHandle, loraName, widget, renderFunction) {
|
||||
if (lastEntry) {
|
||||
const rect = lastEntry.getBoundingClientRect();
|
||||
const containerRect = container.getBoundingClientRect();
|
||||
dropIndicator.style.top = `${(rect.bottom - containerRect.top + 2) / scale}px`;
|
||||
dropIndicator.style.top = `${(rect.bottom - containerRect.top) / scale + container.scrollTop + 2}px`;
|
||||
dropIndicator.style.opacity = '1';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ const LORA_NODE_CLASSES = new Set([
|
||||
"Lora Loader (LoraManager)",
|
||||
"Lora Stacker (LoraManager)",
|
||||
"WanVideo Lora Select (LoraManager)",
|
||||
"Create Hook LoRA (LoraManager)",
|
||||
]);
|
||||
|
||||
function normalizeTriggerWordList(triggerWords) {
|
||||
|
||||
@@ -8,6 +8,7 @@ export const LORA_PROVIDER_NODE_TYPES = [
|
||||
"Lora Stacker (LoraManager)",
|
||||
"Lora Randomizer (LoraManager)",
|
||||
"Lora Cycler (LoraManager)",
|
||||
"Create Hook LoRA (LoraManager)",
|
||||
];
|
||||
|
||||
export const LORA_STACK_AGGREGATOR_NODE_TYPES = [
|
||||
@@ -438,6 +439,7 @@ export function mergeLoras(lorasText, lorasArr) {
|
||||
active: lora.active !== undefined ? lora.active : true,
|
||||
expanded: lora.expanded !== undefined ? lora.expanded : false,
|
||||
clipStrength: lora.clipStrength !== undefined ? lora.clipStrength : parsedLoras[lora.name].clipStrength,
|
||||
selected: !!lora.selected,
|
||||
});
|
||||
usedNames.add(lora.name);
|
||||
}
|
||||
@@ -451,6 +453,7 @@ export function mergeLoras(lorasText, lorasArr) {
|
||||
strength: parsedLoras[name].strength,
|
||||
active: true,
|
||||
clipStrength: parsedLoras[name].clipStrength,
|
||||
selected: false,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
@@ -1,6 +1,6 @@
|
||||
import { app } from "../../scripts/app.js";
|
||||
import { api } from "../../scripts/api.js";
|
||||
import { getAllGraphNodes, getNodeReference, getNodeFromGraph, chainCallback } from "./utils.js";
|
||||
import { getAllGraphNodes, getNodeReference, getNodeFromGraph, chainCallback, getLinkFromGraph } from "./utils.js";
|
||||
import { ensureLmStyles } from "./lm_styles_loader.js";
|
||||
|
||||
const DEBOUNCE_DELAY = 500;
|
||||
@@ -9,6 +9,7 @@ const LORA_NODE_CLASSES = new Set([
|
||||
"Lora Loader (LoraManager)",
|
||||
"Lora Stacker (LoraManager)",
|
||||
"WanVideo Lora Select (LoraManager)",
|
||||
"Create Hook LoRA (LoraManager)",
|
||||
]);
|
||||
|
||||
const TARGET_WIDGET_NAMES = new Set(["ckpt_name", "unet_name"]);
|
||||
@@ -76,6 +77,84 @@ function fadeWidgetTextColor(widget, fromColor, toColor, duration) {
|
||||
return () => { if (rafId) cancelAnimationFrame(rafId); };
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Primitive node helpers
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Set of node type names that represent Primitive value nodes.
|
||||
* Includes both the dynamic PrimitiveNode (created by double-clicking
|
||||
* a widget input) and the static typed primitives from the node library.
|
||||
*/
|
||||
const PRIMITIVE_NODE_TYPES = new Set([
|
||||
"PrimitiveNode", // dynamic (double-click a widget input)
|
||||
"PrimitiveInt",
|
||||
"PrimitiveFloat",
|
||||
"PrimitiveString",
|
||||
"PrimitiveBoolean",
|
||||
"PrimitiveStringMultiline",
|
||||
]);
|
||||
|
||||
/**
|
||||
* Return true when `node` is any flavour of Primitive node.
|
||||
* @param {Object} node - LiteGraph node instance
|
||||
* @returns {boolean}
|
||||
*/
|
||||
function isPrimitiveNodeType(node) {
|
||||
return PRIMITIVE_NODE_TYPES.has(node?.type);
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the 0-based input slot index whose widget name matches `widgetName`.
|
||||
* Returns -1 when no matching input is found.
|
||||
*
|
||||
* Matching strategy (in order):
|
||||
* 1. `input.widget?.name === widgetName` — direct widget ref (preferred)
|
||||
* 2. `input.name === widgetName` — fallback by slot name
|
||||
*
|
||||
* @param {Object} node - LiteGraph node instance
|
||||
* @param {string} widgetName
|
||||
* @returns {number}
|
||||
*/
|
||||
function findInputSlotForWidget(node, widgetName) {
|
||||
if (!node || !Array.isArray(node.inputs)) {
|
||||
return -1;
|
||||
}
|
||||
return node.inputs.findIndex(
|
||||
(inp) => inp?.widget?.name === widgetName || inp?.name === widgetName
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* If the input slot that backs `widgetName` on `node` is connected to a
|
||||
* Primitive node, return that Primitive node. Otherwise return null.
|
||||
*
|
||||
* This is the key bridge for the "send gen params → Primitive" flow:
|
||||
* when a KSampler widget (e.g. "steps") has an incoming wire from a
|
||||
* Primitive node, we want to update the Primitive's value instead of the
|
||||
* KSampler widget, because ComfyUI's execution engine reads from the
|
||||
* connected input, not the widget.
|
||||
*
|
||||
* @param {Object} node - the target node (e.g. KSampler)
|
||||
* @param {string} widgetName - e.g. "steps", "cfg", "seed"
|
||||
* @returns {Object|null} - the connected Primitive node, or null
|
||||
*/
|
||||
function tryResolvePrimitiveConnection(node, widgetName) {
|
||||
const slotIndex = findInputSlotForWidget(node, widgetName);
|
||||
if (slotIndex === -1) return null;
|
||||
|
||||
const input = node.inputs[slotIndex];
|
||||
if (input?.link == null) return null;
|
||||
|
||||
const link = getLinkFromGraph(node.graph, input.link);
|
||||
if (!link) return null;
|
||||
|
||||
const originNode = node.graph?.getNodeById?.(link.origin_id);
|
||||
if (!originNode) return null;
|
||||
|
||||
return isPrimitiveNodeType(originNode) ? originNode : null;
|
||||
}
|
||||
|
||||
app.registerExtension({
|
||||
name: "LoraManager.WorkflowRegistry",
|
||||
|
||||
@@ -309,6 +388,60 @@ app.registerExtension({
|
||||
return;
|
||||
}
|
||||
|
||||
// ---- Redirect to connected Primitive node when present ----
|
||||
// When a widget input (e.g. "steps", "cfg", "seed" on KSampler)
|
||||
// is wired to a Primitive node, the Primitive's value overrides
|
||||
// the widget value during execution. Update the Primitive
|
||||
// directly so the change actually takes effect.
|
||||
if (widgetName) {
|
||||
const primitiveNode = tryResolvePrimitiveConnection(node, widgetName);
|
||||
if (primitiveNode) {
|
||||
const primWidget = primitiveNode.widgets?.[0];
|
||||
if (primWidget) {
|
||||
let primNewValue = value;
|
||||
if (mode === "append") {
|
||||
const sep =
|
||||
primWidget.value && primWidget.value.length > 0
|
||||
? " "
|
||||
: "";
|
||||
primNewValue = primWidget.value + sep + value;
|
||||
}
|
||||
primWidget.value = primNewValue;
|
||||
if (
|
||||
Array.isArray(primitiveNode.widgets_values) &&
|
||||
primitiveNode.widgets_values.length > 0
|
||||
) {
|
||||
primitiveNode.widgets_values[0] = primNewValue;
|
||||
}
|
||||
if (typeof primWidget.callback === "function") {
|
||||
try {
|
||||
primWidget.callback(primNewValue);
|
||||
} catch (callbackError) {
|
||||
console.error(
|
||||
"LoRA Manager: primitive widget callback failed",
|
||||
callbackError
|
||||
);
|
||||
}
|
||||
}
|
||||
if (typeof primitiveNode.setDirtyCanvas === "function") {
|
||||
primitiveNode.setDirtyCanvas(true);
|
||||
}
|
||||
if (typeof app.graph?.setDirtyCanvas === "function") {
|
||||
app.graph.setDirtyCanvas(true, true);
|
||||
}
|
||||
this.flashWidget(primitiveNode, primWidget);
|
||||
console.debug(
|
||||
"LoRA Manager: redirected widget update to Primitive node %s (id=%d) ← %s = %o",
|
||||
primitiveNode.type,
|
||||
primitiveNode.id,
|
||||
widgetName,
|
||||
primNewValue
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---- Update widget value ----
|
||||
const widgetIndex = node.widgets.indexOf(targetWidget);
|
||||
let newValue = value;
|
||||
|
||||
Reference in New Issue
Block a user