summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mcp_sd15/config.py27
-rw-r--r--src/mcp_sd15/schema.py34
-rw-r--r--src/mcp_sd15/tools/generate_guided_image.py2
-rw-r--r--src/mcp_sd15/tools/generate_image.py2
-rw-r--r--src/mcp_sd15/tools/inpaint_image.py2
5 files changed, 63 insertions, 4 deletions
diff --git a/src/mcp_sd15/config.py b/src/mcp_sd15/config.py
index df2da34..e41bdfd 100644
--- a/src/mcp_sd15/config.py
+++ b/src/mcp_sd15/config.py
@@ -80,12 +80,19 @@ class ServerConfig:
@dataclass(frozen=True)
+class PromptConfig:
+ positive: str = ""
+ negative: str = ""
+
+
+@dataclass(frozen=True)
class AppConfig:
model: ModelConfig
generation: GenerationConfig
controlnet: ControlNetConfig
output: OutputConfig
server: ServerConfig = ServerConfig()
+ prompt: PromptConfig = PromptConfig()
def controlnet_path(self, mode: str) -> Path:
item = self.controlnet.for_mode(mode)
@@ -121,6 +128,13 @@ def _filename(value: str | None, label: str) -> str | None:
return value
+def _read_prompt(path: Path) -> str:
+ try:
+ return path.read_text(encoding="utf-8").strip()
+ except OSError as exc:
+ raise ConfigError(f"cannot read prompt file {path}: {exc}") from exc
+
+
def _bool(table: dict[str, Any], key: str, default: bool) -> bool:
value = table.get(key, default)
if not isinstance(value, bool):
@@ -230,12 +244,25 @@ def load_config(path: str | Path, *, validate_paths: bool = True) -> AppConfig:
):
raise ConfigError("server.port must be an integer between 1 and 65535")
+ prompt_raw = _table(raw, "prompt")
+ positive_file = _filename(_string(prompt_raw, "positive_file"), "prompt.positive_file")
+ negative_file = _filename(_string(prompt_raw, "negative_file"), "prompt.negative_file")
+ prompt_positive = ""
+ prompt_negative = ""
+ if positive_file:
+ positive_path = root / "prompts" / positive_file
+ prompt_positive = _read_prompt(positive_path)
+ if negative_file:
+ negative_path = root / "prompts" / negative_file
+ prompt_negative = _read_prompt(negative_path)
+
config = AppConfig(
model=ModelConfig(root, checkpoint, vae, tuple(loras)),
generation=GenerationConfig(steps_value, cfg_scale, scheduler, default_size),
controlnet=controlnet,
output=OutputConfig(output_dir.resolve(), _bool(output_raw, "enabled", False)),
server=ServerConfig(transport, host, port_value),
+ prompt=PromptConfig(prompt_positive, prompt_negative),
)
if validate_paths:
validate_model_paths(config)
diff --git a/src/mcp_sd15/schema.py b/src/mcp_sd15/schema.py
index e22450d..184cc8d 100644
--- a/src/mcp_sd15/schema.py
+++ b/src/mcp_sd15/schema.py
@@ -49,6 +49,14 @@ def _size(value: str | ImageSize | None, default: str) -> ImageSize:
raise InvalidRequestError(f"unsupported size: {value}") from exc
+def _combine(base: str, user: str, *, separator: str) -> str:
+ if not base:
+ return user
+ if not user:
+ return base
+ return f"{base}{separator}{user}"
+
+
@dataclass(frozen=True)
class TextToImageRequest:
positive_prompt: str
@@ -63,10 +71,14 @@ class TextToImageRequest:
size: str | ImageSize | None = None,
*,
default_size: str = ImageSize.SQUARE_512,
+ base_positive: str = "",
+ base_negative: str = "",
) -> TextToImageRequest:
+ user_positive = _prompt(positive_prompt, "positive_prompt", required=True)
+ user_negative = _prompt(negative_prompt, "negative_prompt", required=False)
return cls(
- _prompt(positive_prompt, "positive_prompt", required=True),
- _prompt(negative_prompt, "negative_prompt", required=False),
+ _combine(base_positive, user_positive, separator=", "),
+ _combine(base_negative, user_negative, separator="\n"),
_size(size, default_size),
)
@@ -89,9 +101,16 @@ class GuidedImageRequest:
size: str | ImageSize | None = None,
*,
default_size: str = ImageSize.SQUARE_512,
+ base_positive: str = "",
+ base_negative: str = "",
) -> GuidedImageRequest:
base = TextToImageRequest.create(
- positive_prompt, negative_prompt, size, default_size=default_size
+ positive_prompt,
+ negative_prompt,
+ size,
+ default_size=default_size,
+ base_positive=base_positive,
+ base_negative=base_negative,
)
try:
mode = ControlMode(control_mode)
@@ -120,9 +139,16 @@ class InpaintImageRequest:
size: str | ImageSize | None = None,
*,
default_size: str = ImageSize.SQUARE_512,
+ base_positive: str = "",
+ base_negative: str = "",
) -> InpaintImageRequest:
base = TextToImageRequest.create(
- positive_prompt, negative_prompt, size, default_size=default_size
+ positive_prompt,
+ negative_prompt,
+ size,
+ default_size=default_size,
+ base_positive=base_positive,
+ base_negative=base_negative,
)
for label, value in (("input_image", input_image), ("mask_image", mask_image)):
if not isinstance(value, str) or not value.strip():
diff --git a/src/mcp_sd15/tools/generate_guided_image.py b/src/mcp_sd15/tools/generate_guided_image.py
index c69286c..fec4229 100644
--- a/src/mcp_sd15/tools/generate_guided_image.py
+++ b/src/mcp_sd15/tools/generate_guided_image.py
@@ -19,5 +19,7 @@ async def generate_guided_image(
negative_prompt,
size,
default_size=service.config.generation.default_size,
+ base_positive=service.config.prompt.positive,
+ base_negative=service.config.prompt.negative,
)
return await service.generate_guided_image(request)
diff --git a/src/mcp_sd15/tools/generate_image.py b/src/mcp_sd15/tools/generate_image.py
index bae30c8..c1ddad9 100644
--- a/src/mcp_sd15/tools/generate_image.py
+++ b/src/mcp_sd15/tools/generate_image.py
@@ -15,5 +15,7 @@ async def generate_image(
negative_prompt,
size,
default_size=service.config.generation.default_size,
+ base_positive=service.config.prompt.positive,
+ base_negative=service.config.prompt.negative,
)
return await service.generate_image(request)
diff --git a/src/mcp_sd15/tools/inpaint_image.py b/src/mcp_sd15/tools/inpaint_image.py
index be1dbda..e1232ce 100644
--- a/src/mcp_sd15/tools/inpaint_image.py
+++ b/src/mcp_sd15/tools/inpaint_image.py
@@ -19,5 +19,7 @@ async def inpaint_image(
negative_prompt,
size,
default_size=service.config.generation.default_size,
+ base_positive=service.config.prompt.positive,
+ base_negative=service.config.prompt.negative,
)
return await service.inpaint_image(request)
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-19 19:06:49 +0000