Support artist and ar placeholders

app.py

@@ -96,7 +96,7 @@ OUTPUT_DIR = DATA_DIR / "output"
 IMAGE_DIR = DATA_DIR / "img"
 STAR_DB = DATA_DIR / "explorer.db"
 ARTIST_DB = Path(tempfile.gettempdir()) / "artists.sqlite"
-ARTIST_PLACEHOLDER = re.compile(r"\{ar(\d+)\}")
+ARTIST_PLACEHOLDER = re.compile(r"\{(?:artist|ar)(\d*)\}", re.I)
 TIMEZONE = ZoneInfo("Asia/Singapore")
 CPU_DEVICE = torch.device("cpu")
 MIB = 1024 * 1024
@@ -361,6 +361,8 @@ def copy_artist_database():
             for path in (
                 DATA_MOUNT / "_cache" / "artists.sqlite",
                 DATA_DIR / "_cache" / "artists.sqlite",
+                DATA_MOUNT / "artists.sqlite",
+                DATA_DIR / "artists.sqlite",
                 Path.cwd() / "artists.sqlite",
             )
             if path.is_file()
@@ -766,11 +768,11 @@ class DirectRequest(BaseModel):
 
 
 def resolve_artist_prompts(request):
-    matches = ARTIST_PLACEHOLDER.findall(
-        f"{request.prompt}\n{request.second_prompt}"
-    )
-    identifiers = list(dict.fromkeys(value.lstrip("0") or "0" for value in matches))
-    request.selected_artists = []
+    prompts = [request.prompt, request.second_prompt]
+    prompts.extend(d.prompt for d in getattr(request, "detailers", []) if getattr(d, "prompt", None))
+    prompts.extend(r.prompt for r in getattr(request, "regions", []) if getattr(r, "prompt", None))
+    matches = ARTIST_PLACEHOLDER.findall("\n".join(prompts))
+    identifiers = list(dict.fromkeys(value.lstrip("0") or "1" for value in matches))
     if not identifiers:
         return
     if not ARTIST_DB.is_file():
@@ -800,10 +802,17 @@ def resolve_artist_prompts(request):
     replacements = dict(zip(identifiers, selected))
 
     def replace(match):
-        return replacements[match.group(1).lstrip("0") or "0"]
+        artist = replacements[match.group(1).lstrip("0") or "1"]
+        return re.sub(r"[()]", r"\\\g<0>", artist)
 
     request.prompt = ARTIST_PLACEHOLDER.sub(replace, request.prompt)
     request.second_prompt = ARTIST_PLACEHOLDER.sub(replace, request.second_prompt)
+    for d in getattr(request, "detailers", []):
+        if getattr(d, "prompt", None):
+            d.prompt = ARTIST_PLACEHOLDER.sub(replace, d.prompt)
+    for r in getattr(request, "regions", []):
+        if getattr(r, "prompt", None):
+            r.prompt = ARTIST_PLACEHOLDER.sub(replace, r.prompt)
     request.selected_artists = list(dict.fromkeys(selected))