Skip to content

Commit

Permalink
Merge pull request #14814 from AUTOMATIC1111/catch-load-style.csv-error
Browse files Browse the repository at this point in the history
catch load style.csv error
  • Loading branch information
AUTOMATIC1111 authored Feb 1, 2024
2 parents 652a7bb + bbe8e02 commit b594f51
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions modules/styles.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from pathlib import Path
from modules import errors
import csv
import os
import typing
Expand Down Expand Up @@ -128,19 +129,22 @@ def reload(self):
self.load_from_csv(styles_file)

def load_from_csv(self, path: str | Path):
with open(path, "r", encoding="utf-8-sig", newline="") as file:
reader = csv.DictReader(file, skipinitialspace=True)
for row in reader:
# Ignore empty rows or rows starting with a comment
if not row or row["name"].startswith("#"):
continue
# Support loading old CSV format with "name, text"-columns
prompt = row["prompt"] if "prompt" in row else row["text"]
negative_prompt = row.get("negative_prompt", "")
# Add style to database
self.styles[row["name"]] = PromptStyle(
row["name"], prompt, negative_prompt, str(path)
)
try:
with open(path, "r", encoding="utf-8-sig", newline="") as file:
reader = csv.DictReader(file, skipinitialspace=True)
for row in reader:
# Ignore empty rows or rows starting with a comment
if not row or row["name"].startswith("#"):
continue
# Support loading old CSV format with "name, text"-columns
prompt = row["prompt"] if "prompt" in row else row["text"]
negative_prompt = row.get("negative_prompt", "")
# Add style to database
self.styles[row["name"]] = PromptStyle(
row["name"], prompt, negative_prompt, str(path)
)
except Exception:
errors.report(f'Error loading styles from {path}: ', exc_info=True)

def get_style_paths(self) -> set:
"""Returns a set of all distinct paths of files that styles are loaded from."""
Expand Down

0 comments on commit b594f51

Please sign in to comment.