Logic improvements and list work

Various list work and extensions Extended events by a lot Changed ethnicity to cultures Made improvements in prompt output and logic Fixed minor bugs in rare cases
2023-04-14 11:04:23 +02:00
parent ecf0adf7a1
commit fe0cb3c70d
18 changed files with 394 additions and 268 deletions
@@ -12,7 +12,7 @@ from random_functions import *
 # Set artistmode to none, to exclude artists 
 def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all", imagetype = "all"):

-    completeprompt = " "
+    completeprompt = ", "

    isphoto = 0
    othertype = 0
@@ -161,7 +161,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
        completeprompt = add_from_csv(completeprompt, "body_types", 0, "","")

    if(subjectchooser in ["object","animal as human,","human", "job", "fictional", "non fictional", "humanoid"] and normal_dist(insanitylevel)):
-        completeprompt = add_from_csv(completeprompt, "ethnicity", 0, "","")
+        completeprompt = add_from_csv(completeprompt, "cultures", 0, "","")

    if(mainchooser == "object"):
        objecttypelist = ["objects", "buildings", "vehicles"]
@@ -187,7 +187,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
            else:
                completeprompt += ":"
                completeprompt = add_from_csv(completeprompt, chosenobjecttype, 0, "","") 
-                completeptompt += ":" + str(random.randint(1,5)) +  "]"
+                completeprompt += ":" + str(random.randint(1,5)) +  "]"
        hybridorswap = ""

    if(mainchooser == "animal"):
@@ -282,7 +282,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
            if(rare_dist(insanitylevel)):
                completeprompt = add_from_csv(completeprompt, "descriptors", 0, "","")
            if(rare_dist(insanitylevel)):
-                completeprompt = add_from_csv(completeprompt, "ethnicity", 0, "","")
+                completeprompt = add_from_csv(completeprompt, "cultures", 0, "","")

            addontolocation = ["locations","buildings", "vehicles"]
            completeprompt = add_from_csv(completeprompt, random.choice(addontolocation), 0, "","")
@@ -327,20 +327,24 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
        completeprompt = add_from_csv(completeprompt, "fictional characters", 0, "cosplaying as ","")

    # Job 
+    # either go job or activity, not both
+
    if(subjectchooser in ["animal as human","human","fictional", "non fictional", "humanoid"]  and normal_dist(insanitylevel) and humanspecial != 1):
-        completeprompt = add_from_csv(completeprompt, "jobs", 1, "","")
+        joboractivitylist = ["jobs","human_activities"]
+        completeprompt = add_from_csv(completeprompt, random.choice(joboractivitylist), 1, "","")

-    if(subjectchooser in ["animal as human","human","job", "fictional", "non fictional", "humanoid"] and normal_dist(insanitylevel) and humanspecial != 1):
-        completeprompt = add_from_csv(completeprompt, "human_activities", 1, "","")

    if(subjectchooser in ["animal as human","human","job", "fictional", "non fictional", "humanoid"] and legendary_dist(insanitylevel)):
-        completeprompt += ", with -color- skin, "
+        skintypelist = ["-color-", "-material-"]
+        completeprompt += ", with " + random.choice(skintypelist) + " skin, "

    # outfit builder
    if(subjectchooser in ["animal as human","human","fictional", "non fictional", "humanoid"]  and normal_dist(insanitylevel)):
-        completeprompt = " ".join([completeprompt, ", wearing"])
+        completeprompt += ", wearing"
        if(normal_dist(insanitylevel)):
            completeprompt = add_from_csv(completeprompt, "descriptors", 0, "","")
+        if(uncommon_dist(insanitylevel)):
+            completeprompt = add_from_csv(completeprompt, "cultures", 0, "","")
        if(normal_dist(insanitylevel)):
            completeprompt += " -color- "
        if(rare_dist(insanitylevel)):
@@ -380,12 +384,12 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
            case "landscape":
                completeprompt = add_from_csv(completeprompt, "locations", 1, " background is ","")
            case "buildingbackground":
-                completeprompt += ",background is "
+                completeprompt += ", background is "
                if(uncommon_dist(insanitylevel)):
                    completeprompt = add_from_csv(completeprompt, "descriptors", 0, "","")
                completeprompt = add_from_csv(completeprompt, "buildings", 0, "","")
            case "insidebuilding":
-                completeprompt += ",inside a "
+                completeprompt += ", inside a "
                if(uncommon_dist(insanitylevel)):
                    completeprompt = add_from_csv(completeprompt, "descriptors", 0, "","")
                completeprompt = add_from_csv(completeprompt, "buildings", 0, "","")
@@ -398,7 +402,7 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
    if(normal_dist(insanitylevel) or subjectchooser=="landscape"):
        completeprompt = add_from_csv(completeprompt, "timeperiods", 1, "","")

-    if(mainchooser not in ["landscape"]  and normal_dist(insanitylevel)):
+    if(mainchooser not in ["landscape"]  and rare_dist(insanitylevel)):
        completeprompt = add_from_csv(completeprompt, "focus", 1, "","")
        
    # others
@@ -570,12 +574,19 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all
    completeprompt = re.sub('\) ', ')', completeprompt)
    completeprompt = re.sub(' \)', ')', completeprompt)

+    completeprompt = re.sub(' :', ':', completeprompt)
+
    completeprompt = re.sub(',,', ',', completeprompt)
    completeprompt = re.sub(', ,', ',', completeprompt)
-    completeprompt = re.sub(' , ', ',', completeprompt)
+    completeprompt = re.sub(' , ', ', ', completeprompt)
+    completeprompt = re.sub(',\(', ', (', completeprompt)
+
+    completeprompt = re.sub('a The', 'The', completeprompt)
+    completeprompt = re.sub('ss ', 's ', completeprompt)
+
    completeprompt = re.sub(' +', ' ', completeprompt[2:]) # remove first character, that is always a comma. Remove any excess spaces

-
+    completeprompt = completeprompt.strip(", ")
    print(completeprompt)
    return completeprompt
    
@@ -21,7 +21,7 @@ def call_txt2img(passingprompt,ratio,upscale,debugmode):
    if(ratio=='wide'):
        width = "768"
        height = "512"
-    elif(ratio=='portait'):
+    elif(ratio=='portrait'):
        width = "512"
        height = "768"
    elif(ratio=='ultrawide'):
@@ -8,6 +8,7 @@ Rings
 Watch
 Belt
 Hat
+Trucker hat
 Scarf
 Tie
 Bowtie
@@ -101,4 +102,6 @@ Circlet
 -vehicle- Tattoo
 -building- Tattoo
 Three-eyed
-Hair ribbons
+Hair ribbons
+Fangs
+Belts
@@ -152,4 +152,25 @@ Dungeon
 Gate
 Botanical Garden
 Garden
-Citadel
+Citadel
+Great Wall of China
+Machu Picchu
+Petra
+Colosseum
+Taj Mahal
+Christ the Redeemer
+Chichen Itza
+Great Pyramid of Giza
+Hagia Sophia
+Stonehenge
+The Parthenon
+The Roman Aqueducts
+The Acropolis
+The Alhambra
+The Sistine Chapel
+Angkor Wat
+The Sydney Opera House
+The Eiffel Tower
+The Pyramids of Teotihuacan
+The Burj Khalifa
+The Golden Gate Bridge
@@ -13,21 +13,28 @@ Turquoise
 Magenta
 Lavender
 Indigo
+Azure
+Mauve
+Mint green
 Peach
 Gold
 Silver
+Cyan
 Bronze
 Beige
 Cream
 Maroon
-Navy
+Amber
+Navy Blue
 Teal
 Olive
+Violet
 Fuchsia
 Burgundy
 Charcoal
 Mustard
 Rust
+Crimson
 Colorful
 Colorless
 Vivid
@@ -37,4 +44,5 @@ Iridescent
 Neon
 Lime green
 Rainbow
-Psychedelic
+Psychedelic
+Gradient
@@ -69,7 +69,7 @@ Kingdom
 -animal-
 Star
 1000 years
-shadow
+Shadow
 Saint
 Wings
 Potion
@@ -88,4 +88,9 @@ Wonder
 Legend
 Lords
 Nucleus
-Virus
+Virus
+Gift
+Pillars
+Burden
+Dawn
+Need
@@ -71,4 +71,8 @@ Earth
 Bounty
 Insanity
 Nature
-Pain
+Pain
+Beauty
+Blood
+Elegance
+Study
@@ -1,122 +1,176 @@
-Japanese
-Chinese
-Korean
-Vietnamese
-Thai
-Indonesian
-Indian
-Pakistani
-Bangladeshi
-Sri Lankan
-Nepalese
-Iranian
-Iraqi
-Syrian
-Lebanese
-Israeli
-Palestinian
-Turkish
-Greek
-Italian
-French
-German
-British
-Irish
-Scottish
-Welsh
-Russian
-Ukrainian
-Belarusian
-Polish
-Czech
-Slovak
-Hungarian
-Romanian
-Bulgarian
-Serbian
-Croatian
-Bosnian
-Albanian
-Macedonian
-Egyptian
-Moroccan
-Algerian
-Tunisian
-Libyan
-Nigerian
-Ghanaian
-Cameroonian
-Senegalese
-Malian
-Ivorian
-Congolese
-South African
-Ethiopian
-Somali
-Sudanese
-Kenyan
-Tanzanian
-Ugandan
-Rwandan
-Burundian
-American
-Canadian
-Mexican
-Brazilian
-Argentinian
-Chilean
-Peruvian
-Colombian
-Venezuelan
-Ecuadorian
-Costa Rican
-Salvadoran
-Guatemalan
-Honduran
-Panamanian
-Cuban
-Puerto Rican
-Dominican
-Haitian
-Jamaican
-Scandinavian
-Bahamian
-Australian
-New Zealander
-Fijian
-Samoan
-Dutch
-Marshallese
-Palauan
-Micronesian
-Taiwanese
-Hong Konger
-Macanese
-Singaporean
-Malaysian
-Thai Chinese
-Filipino
-Oriental
-European
-South-American
-Asian
-Eastern
-Western
-Persian
-Meiji Era
-Taishō Era
-Shōwa Era
-Heisei Era
-Reiwa Era
-Qin Dynasty
-Han Dynasty
-Tang Dynasty
-Song Dynasty
-Yuan Dynasty
-Ming Dynasty
-Qing Dynasty
-Edo Period
-Golden Age
-Moorish
-Shinto
-Norse
+Japanese
+Chinese
+Korean
+Vietnamese
+Thai
+Indonesian
+Indian
+Pakistani
+Bangladeshi
+Sri Lankan
+Nepalese
+Iranian
+Iraqi
+Syrian
+Lebanese
+Israeli
+Palestinian
+Turkish
+Greek
+Italian
+French
+German
+British
+Irish
+Scottish
+Welsh
+Russian
+Ukrainian
+Belarusian
+Polish
+Czech
+Slovak
+Hungarian
+Romanian
+Bulgarian
+Serbian
+Croatian
+Bosnian
+Albanian
+Macedonian
+Egyptian
+Moroccan
+Algerian
+Tunisian
+Libyan
+Nigerian
+Ghanaian
+Cameroonian
+Senegalese
+Malian
+Ivorian
+Congolese
+South African
+Ethiopian
+Somali
+Sudanese
+Kenyan
+Tanzanian
+Ugandan
+Rwandan
+Burundian
+American
+Canadian
+Mexican
+Brazilian
+Argentinian
+Chilean
+Peruvian
+Colombian
+Venezuelan
+Ecuadorian
+Costa Rican
+Salvadoran
+Guatemalan
+Honduran
+Panamanian
+Cuban
+Puerto Rican
+Dominican
+Haitian
+Jamaican
+Scandinavian
+Bahamian
+Australian
+New Zealander
+Fijian
+Samoan
+Dutch
+Marshallese
+Palauan
+Micronesian
+Taiwanese
+Hong Konger
+Macanese
+Singaporean
+Malaysian
+Thai Chinese
+Filipino
+Oriental
+European
+South-American
+Asian
+Eastern
+Western
+Persian
+Soviet
+Meiji Era
+Taishō Era
+Shōwa Era
+Heisei Era
+Reiwa Era
+Qin Dynasty
+Han Dynasty
+Tang Dynasty
+Song Dynasty
+Yuan Dynasty
+Ming Dynasty
+Qing Dynasty
+Edo Period
+Golden Age
+Moorish
+Shinto
+Norse
+Art Deco
+Baroque
+Bauhaus
+Byzantine
+Chinoiserie
+Classical
+Contemporary
+Art Nouveau
+Gothic
+High-Tech
+Industrial
+Artisanal
+Modern
+Nautical
+Tudor
+Victorian
+Viking
+Bohemian
+Mediterranean
+Traditional
+Urban
+Vintage
+Cottagecore
+Cyberpunk
+Empire
+Sci-fi
+Folk
+Futuristic
+Georgian
+Greco-Roman
+Inca
+Islamic
+Mayan
+Goth
+Emo
+Mughal
+Prehistoric
+Art Nouveau
+Belle Époque
+Space Age
+Disco Era
+New Wave
+Grunge
+Hip-Hop
+Techno
+Hellenistic
+Roman
+Medieval
+Georgian
+Regency
+Atomic Age
+Digital Age
+Baroque
@@ -200,81 +200,6 @@ Absurd
 Ridiculous
 Preposterous
 Ludicrous
-Art Deco
-Baroque
-Bauhaus
-Brutalism
-Byzantine
-Chinoiserie
-Classical
-Contemporary
-Craftsman
-Art Nouveau
-Expressionist
-Federal
-Gothic
-High-Tech
-Industrial
-Artisanal
-Modern
-Nautical
-Prairie
-Rustic
-Tudor
-Vernacular
-Victorian
-Viking
-Maximalist
-Bohemian
-Glad
-Folded
-Glam
-Chic
-Japandi
-Mediterranean
-Minimal
-Shabby
-Traditional
-Transitional
-Tropical
-Urban
-Vintage
-Zen
-Cottagecore
-Cyberpunk
-Egyptian
-Empire
-Ethno
-Folk
-Futuristic
-Georgian
-Greco-Roman
-Inca
-Islamic
-Mayan
-Goth
-Mughal
-Prehistoric
-Art Nouveau
-Belle Époque
-Space Age
-Disco Era
-New Wave
-Grunge
-Hip-Hop
-Techno
-Hellenistic
-Roman
-Medieval
-Georgian
-Regency
-Atomic Age
-Vietnam War
-Postmodernism
-Digital Age
-Information Age
-Great Recession
-Baroque
 Symmetrical
 Asymmetrical
 Ultrarealistic
@@ -344,4 +269,18 @@ Sleek
 Holy
 Broken
 Surreal
-Realistic
+Realistic
+Jagged
+Rubbery
+Narrow
+Celestial
+Tropical
+Shabby
+Minimalist
+Maximalist
+Glad
+Folded
+Glam
+Chic
+Zen
+Rustic
@@ -13,7 +13,6 @@ Sketched
 Ultra Detailed
 Ultrarealistic
 Visual novel
-Video game screenshot
 Movie still
 Anime screencap
 Overdetailed art
@@ -1,4 +1,13 @@
-fall of rome
+The fall of rome
+The founding of Rome
+The Roman Republic established in 509 BC
+The assasination of Julius Caesar
+Augustus becomes first Roman Emperor
+Construction of the Colosseum
+The Roman Empire reaches its greatest territorial extent
+Constantine converts to Christianity
+The sack of Rome by the Visigoths
+The fall of the Western Roman Empire
 The Last Supper
 The Crucifixion of Jesus
 The Resurrection of Jesus
@@ -125,47 +134,20 @@ The Pentecost
 The conversion of Saint Paul
 The stoning of Saint Stephen
 The martyrdom of Saint Peter
-The martyrdom of Saint Paul
-The martyrdom of Saint Sebastian
-The martyrdom of Saint Lawrence
 The martyrdom of Saint Agatha
 The martyrdom of Saint Catherine
 The martyrdom of Saint Ursula
 The life of Saint Francis of Assisi
 The life of Saint Dominic
 The life of Saint Teresa of Avila
-The life of Saint Ignatius of Loyola
 The life of Saint John the Baptist
-The life of Saint John the Evangelist
 The life of Saint Peter
 The life of Saint Paul
-The life of Saint Augustine
-The life of Saint Thomas Aquinas
-The life of Saint Francis Xavier
-The life of Saint Thérèse of Lisieux
 The life of Saint Joan of Arc
 The life of Saint Catherine of Siena
 The life of Saint Elizabeth of Hungary
 The life of Saint Margaret of Scotland
-The life of Saint Bernard of Clairvaux
-The life of Saint Benedict of Nursia
-The life of Saint Scholastica
-The life of Saint Anthony of Padua
 The life of Saint Clare of Assisi
-The life of Saint Catherine of Alexandria
-The life of Saint Lucy of Syracuse
-The life of Saint Agnes of Rome
-The life of Saint Barbara of Nicomedia
-The life of Saint Eustace
-The life of Saint George
-The life of Saint Sebastian
-The life of Saint Roch
-The life of Saint Christopher
-The life of Saint Martin of Tours
-The life of Saint Francis de Sales
-The life of Saint Alphonsus Liguori
-The life of Saint John Vianney
-The life of Saint John Bos
 The 12 works of Hercules
 Hercules Slaying the Nemean Lion
 Hercules Slaying the nine-headed Hydra
@@ -189,16 +171,10 @@ The Battle of Agincourt
 The fall of Constantinople to the Ottoman Empire
 The publication of Martin Luther's 95 Theses
 The end of the medieval period and the beginning of the Renaissance
-Emergence of Homo habilis around
-Development of stone tool technology around
-Emergence of Homo erectus around
-Domestication of fire by Homo erectus around
-Emergence of Homo heidelbergensis around
-Emergence of Neanderthals around
-Emergence of Homo sapiens around
+The dawn of Humankind
+Domestication of fire by Humankind
 Development of sophisticated stone tool technology
-Emergence of modern human behavior, including art and symbolic communication
-Development of agriculture and the beginning of the Neolithic period
+Development of agriculture
 The Great Fire of London
 The Industrial Revolution
 The Battle of Waterloo
@@ -228,4 +204,89 @@ The story of Bellerophon and the Chimera
 The tale of Atalanta and the golden apples
 The curse of the House of Atreus
 The flight of the god Hermes as a baby
-The tale of Arachne and Athena's weaving contest
+The tale of Arachne and Athena's weaving contest
+Construction of the Great Wall of China
+The unification of China under the Qin Dynasty
+Life of the Buddha and the founding of Buddhism
+The Maurya Empire in India
+The establishment of the Han Dynasty in China
+The creation of the Silk Road trade route
+The construction of the Taj Mahal in India
+The Mongol Empire under Genghis Khan
+The invention of gunpowder in China
+The Japanese feudal period
+The Islamic Golden Age
+The founding of the Ottoman Empire
+The Mughal Empire in India
+The Opium Wars in China
+The Russo-Japanese War
+The Korean War
+The Vietnam War
+The Iranian Revolution
+The establishment of the People's Republic of China
+The Indian Rebellion of 1857
+The Boxer Rebellion in China
+The Indonesian National Revolution
+The Mongol Invasion of Japan
+The Battle of Talas between the Arab Abbasid Caliphate and the Chinese Tang Dynasty
+The Partition of India and Pakistan
+The voyages of Marco Polo
+The building of the pyramids in Egypt
+The spread of Islam across North Africa
+The rise and fall of the Kingdom of Ghana
+The establishment of the Mali Empire under Sundiata Keita
+The reign of Mansa Musa, the richest man in history
+The arrival of Europeans on the African continent
+The transatlantic slave trade
+The colonization of Africa by European powers
+The struggle for independence and decolonization
+The ongoing fight against apartheid and racial inequality in South Africa
+The arrival of Christopher Columbus in the New World
+The founding of the first successful English colony at Jamestown, Virginia
+The American Revolution
+The Louisiana Purchase
+The Mexican-American War
+The California Gold Rush
+The American Civil War
+The completion of the first transcontinental railroad
+The discovery of oil in Texas
+The Cuban Revolution
+Foundation of the Kievan Rus
+Mongol invasion and occupation of Russia
+Reign of Ivan the Terrible
+Time of Troubles
+Reign of Peter the Great
+Reign of Catherine the Great
+Decembrist revolt
+Crimean War
+Bolshevik Revolution
+Collapse of the Soviet Union
+The russian invansion in Ukraine
+Raid on Lindisfarne
+The Great Heathen Army's invasion of England
+Battle of Stamford Bridge
+Founding of Dublin, Ireland by Vikings
+Establishment of the Viking Kingdom of York
+Settlement of Iceland by Vikings
+Battle of Clontarf
+Exploration of North America by Leif Erikson
+The Varangian Guard in Constantinople
+The conversion of Norway to Christianity under King Olaf Tryggvason
+The founding of the Ottoman Empire in 1299 by Osman I
+The capture of Constantinople
+The reign of Suleiman the Magnificent
+The golden age of the Ottoman empire
+The Founding of Venice in 421 AD
+The creation of the Venetian Arsenal
+The Fourth Crusade and the sack of Constantinople
+The construction of the Rialto Bridge
+Ragnarok the apocalyptic battle between the gods and giants
+The creation of the world by Odin
+The theft of Thor's hammer by the giant Thrym
+Loki's punishment for causing the death of Baldur
+The binding of the wolf Fenrir
+Odin obtains the Mead of Poetry
+The death of the god Baldr
+Thor and Loki are captured by the giant Skrymir
+Thor retrieves his stolen goats from the giant Thjazi
+The goddess Freya acquires her necklace Brisingamen
@@ -244,14 +244,12 @@ Luna Lovegood
 Fred Weasley
 George Weasley
 Draco Malfoy
-Tom Riddle
 Voldemort
 Hagrid
 Minerva McGonagall
 Dobby
 Bellatrix Lestrange
 Lucius Malfoy
-Narcissa Malfoy
 Zeus
 Thor
 Apollo
@@ -528,4 +526,19 @@ A2 from Nier
 S9 from Nier
 Kainé from Nier
 Emil from Nier
-Anthropomorphic -animal-
+Anthropomorphic -animal-
+Barbie
+Barbarella
+Goku
+Vegeta
+Naruto Uzumaki
+Sailor Moon
+Monkey D. Luffy
+Light Yagami
+Edward Elric
+Spike Spiegel
+Levi Ackerman
+Saitama
+Jotaro Kujo
+Guts
+Alucard
@@ -664,4 +664,7 @@ Mossy land
 Rural area
 Urban area
 Outer space
-Night city cyberpunk
+Night city cyberpunk
+The Great Barrier Reef
+The Terracotta Army
+The Moai of Easter Island
@@ -108,4 +108,5 @@ Water
 Vines
 Cobblestone
 Moss
-Scales
+Scales
+Alabaster
@@ -23,4 +23,8 @@ Sad
 Satisfying
 Shameful
 Surprising
-Horror
+Horror
+Dark
+Light
+Relaxed
+Tranquil
@@ -76,4 +76,5 @@ digital sculpture made of -material-
 Fashion shoot
 -color- and -color- fractals
 mandala
-zentangle
+zentangle
+Natural parks travel poster
@@ -24,6 +24,5 @@ Sunny
 Bathed in shadows
 Thunderstorm
 Foggy
-Starry night
 Moon in the night
 Sun in the sky
@@ -23,7 +23,7 @@ while steps < loops:
    
    # prompt + size

-    #txt2img = call_txt2img(randomprompt, "portait",True,0)
+    #txt2img = call_txt2img(randomprompt, "portrait",True,0)
    #txt2img = call_txt2img(randomprompt, "wide" ,True, 0)
    #txt2img = call_txt2img(randomprompt, "ultrawide",True,0)
    #txt2img = call_txt2img(randomprompt, "square",True,0)