From f30e71ad645d033ab88a8cb8633bf2d1a4c4f1bc Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Tue, 31 Oct 2023 12:32:02 -0700 Subject: [PATCH] maintain gpt maintain gpt --- fooocus_version.py | 2 +- .../fooocus_expansion/positive.txt | 992 +++++++++++++++++- modules/expansion.py | 8 +- 3 files changed, 996 insertions(+), 6 deletions(-) diff --git a/fooocus_version.py b/fooocus_version.py index b0bb82b0..f7c3cbd2 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.1.769' +version = '2.1.770' diff --git a/models/prompt_expansion/fooocus_expansion/positive.txt b/models/prompt_expansion/fooocus_expansion/positive.txt index 938a0fd7..4e35c773 100644 --- a/models/prompt_expansion/fooocus_expansion/positive.txt +++ b/models/prompt_expansion/fooocus_expansion/positive.txt @@ -1 +1,991 @@ -accelerated, acclaimed, accomplished, acknowledged, activated, adapted, adjusted, admirable, adored, adorned, advanced, adventurous, advocated, aesthetic, affectionate, affirming, aged, ageless, aimed, airy, alleviated, alluring, altered, ambient, analytical, angelic, animated, appealing, applauded, appreciative, archetypal, ardent, aristocratic, aromatic, arranged, arrayed, arresting, artistic, aspired, assertive, associated, assuaged, assured, astonishing, astounding, astral, atmosphere, attempted, attention-grabbing, attired, attractive, audacious, august, authentic, authoritative, avant-garde, awarded, awe-inspiring, awe-striking, awesome, backed, baked, balanced, baroque, beaming, beaten, beauteous, beautiful, bedazzling, bedecked, beguiling, bejeweled, beloved, best, bestowed, bewitching, blazing, blended, blessed, blissful, blooming, bodacious, bonafide, bonny, borne, boundless, braised, brave, breathtaking, breezy, brewed, bright, brightened, brilliant, broiled, brooded, brought, bubbly, built, buoyant, burning, calm, calmed, canonized, captivating, carried, catchy, celebrated, celestial, certain, championed, changed, charismatic, charmed, charming, chased, chaste, cheered, cheerful, cherished, cherubic, chic, chivalrous, choicest, chosen, chromatic, churned, cinematic, clad, clapped, classic, clear, coached, colorful, colossal, combined, comely, comforted, comforting, commanding, commendable, commended, compatible, complete, complex, complimented, composition, conceived, conferred, confident, congruent, congruous, connected, consecrated, considered, consistent, consoled, consonant, conspicuous, constructed, consummate, contemplated, contemporary, content, conveyed, cooked, cool, coordinated, cosmic, coupled, courageous, courted, coveted, cozy, craved, created, critical, crystal-clear, cuddly, cultivated, cured, curious, current, curvaceous, customized, cute, cutting-edge, dainty, dapper, daring, dashing, daydreamed, dazzling, decked, decorated, decorative, decorous, deep, defended, deific, deified, deliberated, delicate, delightful, delivered, designed, desired, detail, detailed, developed, devout, diaphanous, dignified, directed, discovered, dispatched, displayed, distilled, distinct, distinctive, distinguished, diverse, divine, dramatic, draped, dreamed, dreamlike, dreamy, driven, drop-dead, dynamic, earnest, eased, ecstatic, edified, educated, effective, effervescent, effulgent, elaborate, elated, electrifying, elegant, elevated, elite, embellished, eminent, emphatic, empowering, enchanting, encouraged, encrusted, endearing, endeavored, endorsed, endowed, enduring, energetic, energized, engaging, enlightened, enlivened, enormous, enrapturing, enthralling, enticing, entrancing, envisioned, epic, esteemed, eternal, ethereal, eulogized, euphoric, evocative, evolved, exalted, examining, excellent, exceptional, exciting, exclusive, expansive, expedited, explorative, exposed, expressive, exquisite, extolled, extraordinary, extremely, exuberant, eye-catching, fair, fairy-tale-like, fancy, fantasied, fantastic, fantastical, fascinating, fashionable, fashioned, favorable, favored, fearless, feathery, fermented, fervent, fetched, fetching, fiery, fine, finest, firm, first-class, first-rate, fixed, flamboyant, flaming, flashing, flashy, flattered, flavored, flawless, flimsy, florid, flowery, focused, formal, formed, fortunate, forward-thinking, fostered, found, foxy, fragranced, fresh, fried, fulgent, futuristic, galactic, gallant, garbed, gargantuan, garnished, gemmed, gentle, gentlemanly, genuine, gifted, gigantic, given, glamorous, gleaming, gleamy, glistening, glittering, glittery, glitzy, glorified, glossy, glowing, godly, gorgeous, gossamer, graceful, grand, granted, grateful, gratified, grilled, guarded, guided, hailed, hallowed, handsome, hardy, harmonious, harmonized, hastened, head-turning, heartened, heartfelt, heavenly, heroic, hoisted, holistic, holy, honored, hoped, hopeful, huggable, hushed, hypnotic, ideal, idyllic, illumination, illustrative, imagined, imagistic, immaculate, immense, immortal, impeccable, imposing, impressive, incandescent, infinite, informed, innocent, innovated, innovative, inproportion, inquisitive, inshape, insistent, inspired, inspiring, instructed, integrated, intense, intoxicating, intrepid, intricate, invaluable, invented, investigative, invigorated, invigorating, inviting, iridescent, jaunty, jaw-dropping, jazzy, jeweled, joined, joyful, joyous, jubilant, kingly, kissable, kneaded, knightly, knockout, ladylike, lambent, lasting, laudable, lauded, lavish, leading-edge, led, legendary, lifelike, lifted, light, lightened, likable, limited, linked, lionized, lithe, lively, located, logical, longed, lordly, lovable, loved, lovely, lucent, lucid, lucky, luminous, lush, lustrous, luxurious, luxury, magical, magnificent, majestic, mammoth, marked, marvelous, massive, matched, matchless, matured, meditated, mellow, mentored, merged, merry, mesmerizing, methodical, mind-blowing, modern, modified, modish, molded, monarchical, monstrous, monumental, motivated, motivational, moved, multifaceted, multifarious, mused, mystical, mythical, naive, natty, navigated, neat, new, nifty, noble, notable, noteworthy, novel, nuanced, nubile, nurtured, odorous, offered, opalescent, optimal, optimistic, opulent, orderly, organized, original, originated, ornate, ostentatious, otherworldly, outfitted, outstanding, overjoyed, pacified, painterly, paired, panoramic, paradisiacal, passionate, patterned, peaceful, peerless, peppy, perfect, perfumed, perky, perpetual, persistent, photogenic, pickled, pictorial, picturesque, piloted, pious, placed, planned, pleased, pleasing, plotted, plush, plushy, poached, polished, pondered, posh, positive, praised, praiseworthy, precious, precise, preeminent, premier, premium, prepossessing, presented, preserved, pretty, priceless, prime, princely, pristine, probing, prodigious, profound, progressive, prominent, promoted, pronounced, propelled, proportional, protected, provided, pulchritudinous, pungent, pure, pursued, pushed, quality, queenly, questioning, quickened, quiet, quintessential, racy, radiant, rare, rational, ravishing, real, reborn, recharged, reclaimed, recognized, recovered, redolent, reenergized, refined, reflected, refreshed, refreshing, refulgent, regal, regenerated, reinvigorated, rejuvenated, rejuvenating, related, relaxed, relentless, relieved, remarkable, renewed, representative, rescued, resilient, resolute, respected, resplendent, restored, retrieved, revealed, revered, reverent, revitalized, revitalizing, revived, rewarded, rhythmic, rich, ripened, ritzy, roasted, robed, robust, rococo, romantic, royal, ruminated, sacred, saintly, salient, saluted, sanctified, satisfied, saturated, saved, scenic, scented, schemed, scientific, sculpted, second-to-none, select, seraphic, serene, serious, set, shaped, shapely, shielded, shimmering, shining, shiny, shipshape, show-stopping, shown, showy, sightly, significant, silent, silky, simmered, sincere, singular, situated, sleek, slick, smart, smelly, snazzy, snug, snuggly, solemn, solid, soothed, soothing, sophisticated, sought, soulful, spangled, sparkling, special, sped, spellbinding, spiced, spiffy, spirited, spiritual, splashy, splendid, sprightly, spruce, spunky, stable, stagey, starry, stately, statuesque, steamed, steered, stewed, stimulated, stimulating, stirred, striking, strong, structured, studded, stunning, stupendous, sturdy, stylish, sublime, sumptuous, sunny, superb, superior, superlative, supplied, supported, supreme, sure, surreal, swank, swanky, sweet, sweetened, swish, symbolic, symmetrical, synchronized, systematic, tailored, taking, tangy, tantalizing, targeted, tasteful, taught, tenacious, tender, thankful, theatrical, thought, thrilled, thrilling, tidy, timeless, titanic, toasted, top-drawer, top-notch, top-tier, topnotch, tough, trained, tranquil, tranquilized, transcendent, transformed, translucent, transparent, transported, treasured, trendy, tried, trim, true, twinkling, twinned, unblemished, uncluttered, uncovered, unequaled, unfeigned, unique, united, universal, unmatched, unparalleled, unrivaled, unsullied, unsurpassed, unyielding, up-to-date, upheld, uplifted, uplifting, valiant, valued, varied, velvety, venerated, venturesome, vibrant, vinted, virginal, visualized, vitalized, vivacious, vivid, vivified, voguish, warm, well-built, well-formed, well-kept, well-proportioned, well-turned, whimsical, whisked, whole, winning, winsome, wished, wisp-like, wonderful, wondrous, wooed, worshiped, worshipped, yearned, zesty, zippy, sharp, focus, background +abloom +accelerated +accepted +accepting +acclaimed +accomplished +acknowledged +activated +adapted +adjusted +admirable +adored +adorned +advanced +adventurous +advocated +aesthetic +affectionate +affirmed +affirming +aged +ageless +agile +aimed +airy +aligned +alive +alleviated +alluring +altered +altruistic +amazing +ambient +amiable +analytical +angelic +animated +appealing +applauded +appreciated +appreciative +archetypal +ardent +aristocratic +aromatic +arranged +arrayed +arresting +artistic +aspirational +aspired +assertive +associated +assuaged +assured +assuredly +astonishing +astounding +astral +atmosphere +attempted +attention-grabbing +attentive +attired +attractive +audacious +august +authentic +authoritative +avant-garde +awarded +awe-inspiring +awe-striking +awesome +backed +background +baked +balance +balanced +baroque +beaming +beaten +beatific +beauteous +beautiful +bedazzling +bedecked +beguiling +bejeweled +beloved +benevolent +best +bestowed +bewitching +blazing +blended +blessed +blissed +blissful +blooming +bodacious +bonafide +bonny +borne +boundless +braised +brave +breathtaking +breezy +brewed +bright +brightened +brilliant +broiled +brooded +brought +bubbly +built +buoyant +buoyed +burning +calm +calmed +canonized +captivating +caring +carried +catchy +celebrated +celestial +certain +championed +changed +channeled +charismatic +charmed +charming +chased +chaste +cheered +cheerful +cherished +cherubic +chic +chivalrous +choicest +chosen +chromatic +churned +cinematic +clad +clapped +classic +clear +clear-minded +coached +color +colors +colorful +colossal +combined +comely +comforted +comforting +commanding +commendable +commended +committed +compassionate +compatible +complete +complex +complimented +composition +comprehensive +conceived +conferred +confident +congruent +congruous +connected +consecrated +considerable +considered +consistent +consoled +consonant +conspicuous +constructed +constructive +consummate +contemplated +contemplative +contemporary +content +contrasted +conveyed +cooked +cool +coordinated +coruscating +cosmic +coupled +courageous +courted +coveted +cozy +craved +created +creative +crisp +critical +crystal-clear +cuddly +cultivated +cured +curious +current +curvaceous +customized +cute +cutting-edge +dainty +dapper +daring +dashing +dauntless +daydreamed +dazzling +dazzlingly +decked +decorated +decorative +decorous +dedicated +deep +defended +definitive +deific +deified +deliberated +delicate +delightful +delivered +demonstrative +dependable +depicted +designed +desired +destined +detail +detailed +determined +developed +devoted +devout +diaphanous +dignified +diligent +directed +discovered +dispatched +displayed +distilled +distinct +distinctive +distinguished +diverse +diversified +divine +dramatic +draped +dreamed +dreamlike +dreamy +driven +drop-dead +dynamic +earnest +eased +ecstatic +edified +edifying +educated +effective +effervescent +effulgent +effusive +elaborate +elated +electrifying +elegant +elevated +elite +eloquent +embellished +emboldened +eminent +emotional +empathetic +empathic +emphatic +empowered +empowering +enchanting +enchantingly +encouraged +encrusted +endearing +endeavored +endorsed +endowed +enduring +energetic +energized +energizing +engaging +enigmatic +enlightened +enlivened +enormous +enraptured +enrapturing +enthralling +enticed +enticing +entrancing +envisioned +epic +equanimous +esteemed +eternal +ethereal +ethically +eulogized +euphonious +euphoric +evocative +evocatively +evolved +exalted +examining +excellent +exceptional +exciting +exclusive +exemplary +exhilarating +expansive +expedited +explorative +exposed +expressive +expressively +exquisite +extemporized +extolled +extradited +extraordinary +extremely +exuberant +eye-catching +fabulous +facilitated +fair +fairy-tale-like +fancy +fantasied +fantastic +fantastical +fascinating +fashionable +fashioned +fathomless +favorable +favored +fearless +feathery +felicitous +fermented +fervent +festive +fetched +fetching +fiery +fine +finest +firm +first-class +first-rate +fixed +flamboyant +flaming +flashing +flashy +flattered +flavored +flawless +flimsy +florid +flourishing +flowery +focus +focused +formal +formed +fortuitous +fortunate +forward-thinking +fostered +fostering +found +foxy +fragranced +free-spirited +fresh +fried +fulfilled +fulgent +futuristic +galactic +gallant +galvanized +garbed +gargantuan +garnished +gemmed +generous +gentle +gentlemanly +genuine +gifted +gigantic +given +glamorous +gleaming +gleamy +glistening +glittering +glittery +glitzy +glorified +glorious +glossy +glowing +godly +gorgeous +gossamer +graceful +gracious +grand +grandiose +granted +grateful +gratified +grilled +guarded +guided +hailed +hallowed +handsome +hardy +harmonious +harmonized +hastened +head-turning +heartened +heartfelt +heartwarming +heavenly +heroic +hoisted +holistic +holy +honored +hoped +hopeful +huggable +hushed +hypnotic +ideal +idealized +idyllic +illuminated +illuminating +illumination +illustrative +illustrious +imaginative +imagined +imagistic +imbued +immaculate +immense +immortal +impeccable +imposing +impressive +incandescent +incisive +indomitable +infinite +inflamed +informed +innocent +innovated +innovative +inproportion +inquisitive +insatiable +inshape +insightful +insistent +inspired +inspiring +instructed +integrated +intense +intoxicating +intrepid +intricate +invaluable +invented +investigative +invigorated +invigorating +invincible +inviting +iridescent +jaunty +jaw-dropping +jazzy +jeweled +joined +joyful +joyous +jubilant +judicious +keen +kind-hearted +kindhearted +kinetic +kingly +kissable +kneaded +knightly +knockout +laced +ladylike +lambent +lasting +laudable +laudatory +lauded +lavish +leading-edge +legendary +lifelike +lifted +light +lightened +lighthearted +likable +limited +linked +lionized +lithe +lively +located +logical +longed +lordly +lovable +loved +lovely +lucent +lucid +lucky +luminous +lush +lustrous +luxurious +luxury +magical +magnificent +majestic +mammoth +manifesting +marked +marvelous +massive +masterful +matched +matchless +matured +meaningful +meditated +meditative +mellifluous +mellow +mentored +merged +merry +mesmerizing +methodical +meticulous +mind-blowing +mindful +miraculous +mirthful +modern +modified +modish +molded +monarchical +monstrous +monumental +motivated +motivational +moved +multifaceted +multifarious +mused +mystical +mythical +naive +natty +navigated +neat +new +nifty +noble +notable +noteworthy +novel +nuanced +nubile +nurtured +nurturing +odorous +offered +opalescent +optimal +optimistic +opulent +orderly +organized +original +originated +ornate +ostentatious +otherworldly +outfitted +outstanding +overjoyed +pacified +painterly +paired +palpable +panoramic +paradisiacal +passionate +patterned +peaceful +peerless +peppy +perfect +perfumed +perky +perpetual +persevering +persistent +photogenic +pickled +pictorial +picturesque +piloted +pious +pivotal +placed +placid +planned +pleased +pleasing +plotted +plush +plushy +poached +polished +pondered +posh +positive +praised +praiseworthy +precious +precise +preeminent +premier +premium +prepossessing +presented +preserved +pretty +priceless +prime +princely +pristine +probing +prodigious +professional +profound +progressive +prominent +promoted +pronounced +propelled +proportional +protected +provided +pulchritudinous +pungent +pure +pursued +pushed +quality +queenly +questioning +quickened +quiet +quintessential +racy +radiant +rare +rational +ravishing +real +reborn +recharged +reclaimed +recognized +recovered +redolent +reenergized +refined +reflected +refreshed +refreshing +refulgent +regal +regenerated +reinvigorated +rejuvenated +rejuvenating +related +relaxed +relentless +relieved +remarkable +renewed +representative +rescued +resilient +resolute +respected +resplendent +restored +retrieved +revealed +revered +reverent +revitalized +revitalizing +revived +rewarded +rhythmic +rich +ripened +ritzy +roasted +robed +robust +rococo +romantic +royal +ruminated +sacred +saintly +salient +saluted +sanctified +satisfied +saturated +saved +scenic +scented +schemed +scientific +sculpted +second-to-none +select +seraphic +serendipitous +serene +serenity +serious +set +shaped +shapely +sharp +shielded +shimmering +shining +shiny +shipshape +show-stopping +shown +showy +sightly +significant +silent +silky +simmered +sincere +singular +situated +sleek +slick +smart +smelly +snazzy +snug +snuggly +solemn +solid +soothed +soothing +sophisticated +sought +soulful +spangled +sparkling +special +spectacular +sped +spellbinding +spiced +spiffy +spirited +spiritual +splashy +splendid +sprightly +spruce +spunky +stable +stagey +starry +stately +statuesque +steamed +steered +stewed +still +stimulated +stimulating +stirred +striking +strong +structured +studded +stunning +stupendous +sturdy +stylish +sublime +sumptuous +sun-kissed +sunny +superb +superior +superlative +supplied +supported +supreme +sure +surreal +swank +swanky +sweet +sweetened +swish +symbolic +symmetry +symmetrical +synchronized +systematic +tailored +taking +tangy +tantalizing +targeted +tasteful +taught +tenacious +tender +thankful +theatrical +thought +thrilled +thrilling +tidy +timeless +titanic +toasted +top-drawer +top-notch +top-tier +topnotch +tough +trained +tranquil +tranquilized +transcendent +transcendental +transformed +translucent +transparent +transported +treasured +trendy +tried +trim +true +twinkling +twinned +unblemished +uncluttered +unconditional +uncovered +unequaled +unfeigned +unique +united +universal +unmatched +unparalleled +unrivaled +unsullied +unsurpassed +unyielding +up-to-date +upheld +uplifted +uplifting +valiant +valued +varied +velvety +venerated +venturesome +vibrant +vinted +virginal +virtuous +visualized +vitalized +vivacious +vivid +vivified +voguish +warm +well-built +well-formed +well-kept +well-proportioned +well-turned +whimsical +whisked +whole +winning +winsome +wished +wisp-like +wonderful +wondrous +wooed +worshiped +worshipped +yearned +zesty +zippy diff --git a/modules/expansion.py b/modules/expansion.py index daa6d5af..ce40b569 100644 --- a/modules/expansion.py +++ b/modules/expansion.py @@ -29,14 +29,14 @@ class FooocusExpansion: def __init__(self): self.tokenizer = AutoTokenizer.from_pretrained(fooocus_expansion_path) - positive_words = open(os.path.join(fooocus_expansion_path, 'positive.txt'), encoding='utf-8').read() - positive_words = positive_words.lower().replace(' ', '').replace('\n', '').split(',') - - # print(', '.join(sorted(list(set(positive_words))))) + positive_words = open(os.path.join(fooocus_expansion_path, 'positive.txt'), + encoding='utf-8').read().splitlines() + # new_content = '\n'.join(sorted(list(set(positive_words)))) # t198 = self.tokenizer('\n', return_tensors="np") # t11 = self.tokenizer(',', return_tensors="np") # positive_ids = [11, 198, self.tokenizer.eos_token_id] + positive_ids = [11] self.bad_words_ids = []