From 6ca61e1a23542c834196f22ae9404e88bc27a5ce Mon Sep 17 00:00:00 2001
From: Leonard Kugis <leonard@kug.is>
Date: Sun, 7 Apr 2024 16:54:51 +0200
Subject: Make it compatible with Python < 3.10

---
 modules/models/diffusion/ddpm_edit.py |  2 +-
 modules/styles.py                     | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/models/diffusion/ddpm_edit.py b/modules/models/diffusion/ddpm_edit.py
index 6db340da..52656005 100644
--- a/modules/models/diffusion/ddpm_edit.py
+++ b/modules/models/diffusion/ddpm_edit.py
@@ -19,7 +19,7 @@ from contextlib import contextmanager
 from functools import partial
 from tqdm import tqdm
 from torchvision.utils import make_grid
-from pytorch_lightning.utilities.distributed import rank_zero_only
+from pytorch_lightning.utilities.rank_zero import rank_zero_only
 
 from ldm.util import log_txt_as_img, exists, default, ismap, isimage, mean_flat, count_params, instantiate_from_config
 from ldm.modules.ema import LitEma
diff --git a/modules/styles.py b/modules/styles.py
index 60bd8a7f..4ce32b8e 100644
--- a/modules/styles.py
+++ b/modules/styles.py
@@ -3,14 +3,15 @@ from modules import errors
 import csv
 import os
 import typing
+from typing import Optional, Union
 import shutil
 
 
 class PromptStyle(typing.NamedTuple):
     name: str
-    prompt: str | None
-    negative_prompt: str | None
-    path: str | None = None
+    prompt: Optional[str]
+    negative_prompt: Optional[str]
+    path: Optional[str] = None
 
 
 def merge_prompts(style_prompt: str, prompt: str) -> str:
@@ -79,7 +80,7 @@ def extract_original_prompts(style: PromptStyle, prompt, negative_prompt):
 
 
 class StyleDatabase:
-    def __init__(self, paths: list[str | Path]):
+    def __init__(self, paths: list[Union[str, Path]]):
         self.no_style = PromptStyle("None", "", "", None)
         self.styles = {}
         self.paths = paths
@@ -128,7 +129,7 @@ class StyleDatabase:
             if styles_file.is_file():
                 self.load_from_csv(styles_file)
 
-    def load_from_csv(self, path: str | Path):
+    def load_from_csv(self, path: Union[str, Path]):
         try:
             with open(path, "r", encoding="utf-8-sig", newline="") as file:
                 reader = csv.DictReader(file, skipinitialspace=True)
-- 
cgit v1.2.1