From 028c61bd1276b5588c77fc4e97d9983eb8a0c8c6 Mon Sep 17 00:00:00 2001 From: AIrjen Date: Sun, 16 Apr 2023 07:49:22 +0200 Subject: [PATCH 1/2] Update build_dynamic_prompt.py changed code to if-statements --- build_dynamic_prompt.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/build_dynamic_prompt.py b/build_dynamic_prompt.py index 5b78977..8c8f662 100644 --- a/build_dynamic_prompt.py +++ b/build_dynamic_prompt.py @@ -379,20 +379,20 @@ def build_dynamic_prompt(insanitylevel = 5, forcesubject = "all", artists = "all if(subjectchooser not in ["landscape", "concept"] and humanspecial != 1 and normal_dist(insanitylevel)): - backgroundtype = ["landscape", "buildingbackground", "insidebuilding"] - match random.choice(backgroundtype): - case "landscape": - completeprompt = add_from_csv(completeprompt, "locations", 1, " background is ","") - case "buildingbackground": - 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 " - if(uncommon_dist(insanitylevel)): - completeprompt = add_from_csv(completeprompt, "descriptors", 0, "","") - completeprompt = add_from_csv(completeprompt, "buildings", 0, "","") + backgroundtypelist = ["landscape", "buildingbackground", "insidebuilding"] + backgroundtype = random.choice(backgroundtypelist) + if(backgroundtype == "landscape"): + completeprompt = add_from_csv(completeprompt, "locations", 1, " background is ","") + elif(backgroundtype == "buildingbackground"): + completeprompt += ", background is " + if(uncommon_dist(insanitylevel)): + completeprompt = add_from_csv(completeprompt, "descriptors", 0, "","") + completeprompt = add_from_csv(completeprompt, "buildings", 0, "","") + elif(backgroundtype == "insidebuilding"): + completeprompt += ", inside a " + if(uncommon_dist(insanitylevel)): + completeprompt = add_from_csv(completeprompt, "descriptors", 0, "","") + completeprompt = add_from_csv(completeprompt, "buildings", 0, "","") From ba9a2380fc12b4d07578788b6108da05e2e85573 Mon Sep 17 00:00:00 2001 From: AIrjen Date: Sun, 16 Apr 2023 16:55:28 +0200 Subject: [PATCH 2/2] colors fix Im so sorry, fixed it --- csv_reader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csv_reader.py b/csv_reader.py index 4941401..bd69265 100644 --- a/csv_reader.py +++ b/csv_reader.py @@ -21,7 +21,7 @@ def add_from_csv(completeprompt, csvfilename, addcomma, prefix, suffix): def csv_to_list(csvfilename): csvlist = [] script_dir = os.path.dirname(os.path.abspath(__file__)) - full_path = os.path.join(script_dir, ".\\csvfiles\\" ) + full_path = os.path.join(script_dir, "./csvfiles/" ) with open(full_path + csvfilename + ".csv", "r", newline="",encoding="utf8") as file: reader = csv.reader(file, delimiter=",") for row in reader: