drawthings-py 0.2.0__tar.gz → 0.3.0__tar.gz

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drawthings-py
-Version: 0.2.0
+Version: 0.3.0
 Summary: Python SDK for automating Draw Things image generation over gRPC.
 License-Expression: GPL-3.0-only
 License-File: LICENSE

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drawthings-py"
-version = "0.2.0"
+version = "0.3.0"
 description = "Python SDK for automating Draw Things image generation over gRPC."
 authors = [{ name = "Kelly Jerrell", email = "kcjerrell@gmail.com" }]
 readme = "README.md"
@@ -83,7 +83,7 @@ ignore_missing_imports = true
 include = ["src"]
 exclude = [
     "src/drawthings_py/generated",
-    "src/drawthings_py/_metadata.py",
+    "src/drawthings_py/image/_metadata.py",
     "src/drawthings_py/configs/gen_config_generated.py",
     "scripts/gen"
 ]

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/__init__.py

@@ -4,8 +4,8 @@ Draw Things Python SDK
 
 import drawthings_py.drawthings as DrawThings
 from .configs import Configs, ConfigDict, Presets
-from .filename_pattern import FilenamePattern
-from .image_buffer import ImageBuffer
+from .util.filename_pattern import FilenamePattern
+from .image.image_buffer import ImageBuffer
 from .request_builder import RequestBuilder
 
 __all__ = [

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/_dt_service.py

@@ -6,7 +6,9 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from types import TracebackType
 
-from .image_buffer import ImageBuffer
+from drawthings_py.models.types import ModelsInfo
+
+from .image.image_buffer import ImageBuffer
 from .request_builder import RequestBuilder
 
 
@@ -21,6 +23,12 @@ class DrawThingsService(ABC):
         Generate an image from the provided request builder
         """
 
+    @abstractmethod
+    async def get_models(self) -> ModelsInfo:
+        """
+        Get models from the service
+        """
+
     @abstractmethod
     def _dispose(self):
         """

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/cli_service.py

@@ -1,7 +1,9 @@
 from typing_extensions import override
 
+from drawthings_py.models.types import ModelsInfo
+
 from ._dt_service import DrawThingsService
-from .image_buffer import ImageBuffer
+from .image.image_buffer import ImageBuffer
 from .request_builder import RequestBuilder
 
 
@@ -16,6 +18,10 @@ class CliService(DrawThingsService):
         """
         raise NotImplementedError("this is not implemented yet")
 
+    @override
+    async def get_models(self) -> ModelsInfo:
+        raise NotImplementedError("this is not implemented yet")
+
     @override
     async def generate_image(self, request: RequestBuilder) -> list[ImageBuffer]:
         raise NotImplementedError("this is not implemented yet")

drawthings_py-0.3.0/src/drawthings_py/configs/_util.py

@@ -0,0 +1,70 @@
+from drawthings_py.configs.config_dict import ConfigDict
+from drawthings_py.configs.gen_config import GenConfig
+from drawthings_py.configs.enums import sampler_type_from_value
+
+
+def describe_config(config: GenConfig | ConfigDict) -> str:
+    cd = config._d if isinstance(config, GenConfig) else config  # pyright: ignore[reportPrivateUsage]
+
+    #  flux_klein.cktp, 1024x1024, Strength: 0.9, 20 steps.
+    # EulerA sampler, CFG: 2.5, Shift: auto, flux_turbo.ckpt and
+    # flux_boobs.skpt lora
+
+    leading: list[str] = []
+    if model := cd.get("model"):
+        leading.append(model)
+    if (width := cd.get("width")) and (height := cd.get("height")):
+        leading.append(f"{width}x{height}")
+
+    # Strength (omit when 1.0) and steps
+    mid: list[str] = []
+    if (strength := cd.get("strength")) is not None and float(strength) != 1.0:
+        mid.append(f"Strength: {strength}")
+    if steps := cd.get("steps"):
+        mid.append(f"{steps} steps")
+
+    # Sampler, CFG (guidance), shift, and loras
+    tail: list[str] = []
+    if (sampler := cd.get("sampler")) is not None:
+        tail.append(f"{sampler_type_from_value(sampler)} sampler")
+    if (guidance := cd.get("guidance")) is not None:
+        tail.append(f"CFG: {guidance}")
+
+    # Shift: "auto" when resolution_dependent_shift is True
+    if cd.get("resolution_dependent_shift"):
+        shift_val: str | float | None = "auto"
+    else:
+        shift_val = cd.get("shift")
+    if shift_val is not None:
+        tail.append(f"Shift: {shift_val}")
+
+    # Loras: list filenames
+    lora_files: list[str] = []
+    if loras := cd.get("loras"):
+        for lora in loras:
+            f = lora.get("file")
+            if f:
+                lora_files.append(f)
+    if lora_files:
+        if len(lora_files) == 1:
+            lf = lora_files[0]
+        elif len(lora_files) == 2:
+            lf = f"{lora_files[0]} and {lora_files[1]}"
+        else:
+            lf = ", ".join(lora_files[:-1]) + f", and {lora_files[-1]}"
+        tail.append(f"{lf} lora")
+
+    # Build the final description
+    parts: list[str] = []
+    if leading:
+        first = ", ".join(leading)
+        if mid:
+            first = f"{first}, {', '.join(mid)}."
+        else:
+            first = f"{first}."
+        parts.append(first)
+
+    if tail:
+        parts.append(", ".join(tail))
+
+    return " ".join(parts).strip()

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/configs/config_dict.py

@@ -1,4 +1,4 @@
-from typing import TypedDict, TypeAlias, Literal
+from typing import TypeGuard, TypedDict, TypeAlias, Literal, get_args
 from drawthings_py.configs.types import (
     CompressionMethod,
     ControlDict,
@@ -111,6 +111,12 @@ ConfigKey = Literal[
     "compression_artifacts_quality",
 ]
 
+_CONFIG_KEYS = frozenset(get_args(ConfigKey))
+
+
+def is_config_key(value: str) -> TypeGuard[ConfigKey]:
+    return value in _CONFIG_KEYS
+
 
 class ConfigDict(TypedDict, total=False):
     id: int

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/configs/config_prop.py

@@ -1,4 +1,5 @@
 from abc import ABC, abstractmethod
+import json
 from types import NoneType
 from typing import Callable, Generic, Protocol, TypeVar, cast
 
@@ -19,14 +20,14 @@ from drawthings_py.generated.dt_grpc.config_generated import (
     GenerationConfigurationT,
     LoRAT,
 )
-from drawthings_py._util import (
+from drawthings_py.util._util import (
     ensure_str,
     random_seed,
     snake_to_camel,
     try_parse_float,
     try_parse_int,
 )
-from .config_dict import ConfigValue, ConfigKey, ConfigDict
+from .config_dict import ConfigDict, ConfigKey, ConfigValue
 from .types import (
     ControlDict,
     LoraDict,
@@ -524,7 +525,14 @@ class StrEnumProp(ConfigPropBase[str, int], Generic[V]):
         return self._default
 
 
+_config_props: dict[ConfigKey, ConfigProp] | None = None
+
+
 def load_props() -> dict[ConfigKey, ConfigProp]:
+    global _config_props
+    if _config_props:
+        return _config_props
+
     props: dict[ConfigKey, ConfigProp] = {}
 
     definitions = cast(dict[ConfigKey, PropDefinition], load_definitions())
@@ -550,4 +558,27 @@ def load_props() -> dict[ConfigKey, ConfigProp]:
         else:
             print(f"Unknown config property type in YAML: {key}: {prop_type}")
 
+    _config_props = props
     return props
+
+
+def config_dict_from_json(json_data: str | dict[str, object]) -> ConfigDict:
+    if isinstance(json_data, str):
+        data = cast(dict[str, object], json.loads(json_data))
+    else:
+        data = json_data
+    config = ConfigDict()
+    for prop in load_props().values():
+        if value := prop.from_json(data):
+            config[prop.name] = value  # pyright: ignore[reportGeneralTypeIssues]
+    return config
+
+
+def config_dict_from_fbs(data: bytes) -> ConfigDict:
+    config_t = GenerationConfigurationT.InitFromPackedBuf(data)
+    config = ConfigDict()
+    for prop in load_props().values():
+        value = prop.from_fbs(config_t)
+        if value is not None:
+            config[prop.name] = value  # pyright: ignore[reportGeneralTypeIssues]
+    return config

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/configs/configs.py

@@ -5,13 +5,11 @@ including JSON presets, JSON strings, and Python dictionaries.
 """
 
 import copy
-import json
-from importlib.resources import files
-from typing import Unpack, cast
+from typing import Unpack
 
 from .gen_config import GenConfig
 from .config_dict import ConfigDict
-from .presets import PresetDefinition, PresetName, Presets
+from .presets import PresetName, Presets, load_preset_config
 
 
 class Configs:
@@ -35,7 +33,7 @@ class Configs:
             ValueError: If the preset file does not exist.
         """
         try:
-            json_str = _load_preset_json(name)
+            json_str = load_preset_config(name)
             return GenConfig.from_json(json_str)
         except FileNotFoundError:
             raise ValueError(f"Unknown preset: {name}")
@@ -89,22 +87,3 @@ class Configs:
         for config_copy in reversed(copies):
             d.update(config_copy)
         return GenConfig(**d)
-
-
-def _load_preset_json(name: PresetName | Presets) -> str:
-    """Get the JSON string for a named preset.
-
-    Args:
-        name: The name of the preset to get.
-
-    Returns:
-        A JSON string containing the preset data.
-    """
-    filename = name + ".json"
-    path = files("drawthings_py.resources.configs") / filename
-    preset: PresetDefinition | None = None
-    with path.open("r", encoding="utf-8") as f:
-        preset = cast(PresetDefinition | None, json.load(f))
-    if preset is None:
-        raise ValueError(f"Unknown preset: {name}")
-    return json.dumps(preset["configuration"])

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/configs/gen_config.py

@@ -2,10 +2,18 @@ from __future__ import annotations
 from collections.abc import MutableMapping, Iterator
 from typing import Unpack, overload, Literal, cast
 from typing_extensions import override
-import json
 import flatbuffers  # pyright: ignore[reportMissingTypeStubs]
-from drawthings_py.configs.config_dict import ConfigDict, ConfigKey, ConfigValue
-from drawthings_py.configs.config_prop import load_props
+from drawthings_py.configs.config_dict import (
+    ConfigDict,
+    ConfigKey,
+    ConfigValue,
+    is_config_key,
+)
+from drawthings_py.configs.config_prop import (
+    config_dict_from_fbs,
+    config_dict_from_json,
+    load_props,
+)
 from drawthings_py.generated.dt_grpc.config_generated import GenerationConfigurationT
 from drawthings_py.configs.types import (
     CompressionMethod,
@@ -203,7 +211,9 @@ class GenConfig(MutableMapping[ConfigKey, ConfigValue]):
             config: A dictionary of configuration values to set.
             **kwargs: Keyword arguments of configuration values to set.
         """
-        self._d.update(config or kwargs)
+        for key, value in (config or kwargs).items():
+            if is_config_key(key) and value is not None:
+                self._d[key] = cast(ConfigValue, value)  # pyright: ignore[reportGeneralTypeIssues]
 
     @overload
     def set_hires_fix(self, value: None, /) -> None: ...
@@ -233,6 +243,50 @@ class GenConfig(MutableMapping[ConfigKey, ConfigValue]):
                 "Invalid arguments for set_hires_fix. Either provide no arguments to disable, or width, height, and optionally strength to enable."
             )
 
+    @overload
+    def set_tiled_diffusion(self, value: None, /) -> None: ...
+    @overload
+    def set_tiled_diffusion(self, width: int, height: int, overlap: int, /) -> None: ...
+    def set_tiled_diffusion(
+        self,
+        arg1: None | int = None,
+        height: int | None = None,
+        overlap: int | None = None,
+        /,
+    ) -> None:
+        if arg1 is None:
+            self["tiled_diffusion"] = False
+            del self["diffusion_tile_width"]
+            del self["diffusion_tile_height"]
+            del self["diffusion_tile_overlap"]
+        elif height is not None and overlap is not None:
+            self["tiled_diffusion"] = True
+            self["diffusion_tile_width"] = arg1
+            self["diffusion_tile_height"] = height
+            self["diffusion_tile_overlap"] = overlap
+
+    @overload
+    def set_tiled_decoding(self, value: None, /) -> None: ...
+    @overload
+    def set_tiled_decoding(self, width: int, height: int, overlap: int, /) -> None: ...
+    def set_tiled_decoding(
+        self,
+        arg1: None | int = None,
+        height: int | None = None,
+        overlap: int | None = None,
+        /,
+    ) -> None:
+        if arg1 is None:
+            self["tiled_decoding"] = False
+            del self["decoding_tile_width"]
+            del self["decoding_tile_height"]
+            del self["decoding_tile_overlap"]
+        elif height is not None and overlap is not None:
+            self["tiled_decoding"] = True
+            self["decoding_tile_width"] = arg1
+            self["decoding_tile_height"] = height
+            self["decoding_tile_overlap"] = overlap
+
     def add_lora(self, file: str, weight: float = 1.0, mode: LoraMode = "All"):
         """Add a LoRA to the configuration."""
         # checking for existence is not necessaary - __getitem__ assigns the default
@@ -378,20 +432,11 @@ class GenConfig(MutableMapping[ConfigKey, ConfigValue]):
         return bytes(builder.Output())
 
     @classmethod
-    def from_json(cls, json_str: str) -> GenConfig:
-        data = cast(dict[str, object], json.loads(json_str))
-        config = ConfigDict()
-        for prop in CONFIG_PROPS.values():
-            if value := prop.from_json(data):
-                config[prop.name] = value  # pyright: ignore[reportGeneralTypeIssues]
+    def from_json(cls, json_data: str | dict[str, object]) -> GenConfig:
+        config = config_dict_from_json(json_data)
         return cls(**config)
 
     @classmethod
     def from_fbs(cls, data: bytes) -> GenConfig:
-        config_t = GenerationConfigurationT.InitFromPackedBuf(data)
-        config = ConfigDict()
-        for prop in CONFIG_PROPS.values():
-            value = prop.from_fbs(config_t)
-            if value is not None:
-                config[prop.name] = value  # pyright: ignore[reportGeneralTypeIssues]
+        config = config_dict_from_fbs(data)
         return cls(**config)

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/configs/presets.py

@@ -1,5 +1,7 @@
 from enum import StrEnum
-from typing import Literal, Required, TypedDict
+from importlib.resources import files
+import json
+from typing import Literal, Required, TypedDict, cast
 
 from .config_dict import ConfigDict
 
@@ -56,3 +58,33 @@ class PresetDefinition(TypedDict, total=False):
     configuration: Required[ConfigDict]
     name: Required[str]
     version: str
+
+def load_preset_data(name: PresetName | Presets | str) -> PresetDefinition:
+    """Get the JSON string for a named preset.
+
+    Args:
+        name: The name of the preset to get.
+
+    Returns:
+        A JSON string containing the preset data.
+    """
+    filename = name + ".json"
+    path = files("drawthings_py.resources.configs") / filename
+    preset: PresetDefinition | None = None
+    with path.open("r", encoding="utf-8") as f:
+        preset = cast(PresetDefinition | None, json.load(f))
+    if preset is None:
+        raise ValueError(f"Unknown preset: {name}")
+    return preset
+
+
+def load_preset_config(name: PresetName | Presets) -> str:
+    """Get the JSON string for a named preset.
+
+    Args:
+        name: The name of the preset to get.
+
+    Returns:
+        A JSON string containing the preset data.
+    """
+    return json.dumps(load_preset_data(name)["configuration"])

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/configs/types.py

@@ -14,7 +14,7 @@ from .enums import (
 )
 
 
-from drawthings_py._util import ensure_str
+from drawthings_py.util._util import ensure_str
 
 
 class UpscalerModel(StrEnum):

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/drawthings.py

@@ -27,7 +27,7 @@ def grpc(
     port: int - the port of the gRPC server
     return: GrpcService - the gRPC service
     """
-    from .grpc_service import GrpcService  # pylint: disable=import-outside-toplevel
+    from .grpc.grpc_service import GrpcService  # pylint: disable=import-outside-toplevel
 
     return GrpcService(
         host=host, port=port, progressbar=progressbar, disable_messages=disable_messages

{drawthings_py-0.2.0/src/drawthings_py → drawthings_py-0.3.0/src/drawthings_py/grpc}/grpc_service.py

@@ -19,15 +19,22 @@ import tqdm
 from grpclib import GRPCError
 from grpclib.client import Channel
 
-from ._dt_service import DrawThingsService
-from ._errors import raise_grpc_error
-from ._metadata import ImageMetadata, copy_with_seed, create_metadata
-from ._preview_decoders import decode_preview
-from ._util import pluralize, seeds_from_batch
-from .generated.dt_grpc.config_generated import GenerationConfiguration
-from .generated.dt_grpc import image_service
-from .image_buffer import ImageBuffer
-from .request_builder import ProgressCallback, RequestBuilder, build_grpc_message
+from drawthings_py.models import GrpcModelsSource
+from drawthings_py.models.types import ModelsInfo
+
+from drawthings_py._dt_service import DrawThingsService
+from drawthings_py.util._errors import raise_grpc_error
+from drawthings_py.image._metadata import ImageMetadata, copy_with_seed, create_metadata
+from drawthings_py.image._preview_decoders import decode_preview
+from drawthings_py.util._util import pluralize, seeds_from_batch
+from drawthings_py.generated.dt_grpc.config_generated import GenerationConfiguration
+from drawthings_py.generated.dt_grpc import image_service
+from drawthings_py.image.image_buffer import ImageBuffer
+from drawthings_py.request_builder import (
+    ProgressCallback,
+    RequestBuilder,
+    build_grpc_message,
+)
 
 cert_path = files("drawthings_py.resources").joinpath("root_ca.crt")
 ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
@@ -87,6 +94,7 @@ class GrpcService(DrawThingsService):
 
     _channel: Channel
     _service: image_service.ImageGenerationServiceStub
+    _models: GrpcModelsSource
 
     _progressbar: bool
     _disable_messages: bool
@@ -111,6 +119,12 @@ class GrpcService(DrawThingsService):
         self._service = image_service.ImageGenerationServiceStub(self._channel)
         self._progressbar = progressbar
         self._disable_messages = disable_messages
+        self._models = GrpcModelsSource(self._service)
+
+    @override
+    async def get_models(self) -> ModelsInfo:
+        await self._models.load()
+        return self._models._models  # pyright: ignore[reportPrivateUsage]
 
     @override
     async def generate_image(self, request: RequestBuilder) -> list[ImageBuffer]:
@@ -273,6 +287,7 @@ def _get_batch_metadata(
     metadata_batch = [copy_with_seed(metadata, seed) for seed in seeds]
     return metadata_batch
 
+
 def _estimate_signposts(
     config: GenerationConfiguration, request: image_service.ImageGenerationRequest
 ) -> int:
@@ -301,3 +316,7 @@ def _estimate_signposts(
     est += 1
 
     return est
+
+
+# def _get_service_stub(host: str, port: int) -> image_service.ImageGenerationServiceStub:
+#     pass

{drawthings_py-0.2.0/src/drawthings_py → drawthings_py-0.3.0/src/drawthings_py/image}/_metadata.py

@@ -6,7 +6,7 @@ from collections.abc import Callable
 from pathlib import Path
 from typing import Any, Required, TypedDict, cast
 
-from .generated.dt_grpc.config_generated import GenerationConfiguration
+from drawthings_py.generated.dt_grpc.config_generated import GenerationConfiguration
 
 SAMPLER_NAMES: dict[Any, str] = {
     0: "DPM++ 2M Karras",

{drawthings_py-0.2.0/src/drawthings_py → drawthings_py-0.3.0/src/drawthings_py/image}/_png_writer.py

@@ -11,7 +11,7 @@ from typing_extensions import override
 
 from PIL import Image
 
-from ._metadata import ImageMetadata
+from drawthings_py.image._metadata import ImageMetadata
 
 
 class BytesEncoder(json.JSONEncoder):

{drawthings_py-0.2.0/src/drawthings_py → drawthings_py-0.3.0/src/drawthings_py/image}/_preview_decoders.py

@@ -1,6 +1,6 @@
 import fpzip
 import numpy as np
-from .image_buffer import ImageBuffer
+from drawthings_py.image.image_buffer import ImageBuffer
 
 
 def clamp(value: int) -> int:

{drawthings_py-0.2.0/src/drawthings_py → drawthings_py-0.3.0/src/drawthings_py/image}/image_buffer.py

@@ -8,8 +8,8 @@ import fpzip
 import numpy as np
 from PIL import Image
 
-from ._metadata import ImageMetadata
-from ._png_writer import write_png_with_usercomment
+from drawthings_py.image._metadata import ImageMetadata
+from drawthings_py.image._png_writer import write_png_with_usercomment
 
 _TENSOR_HEADER_SIZE = 68
 _FPZIP_MAGIC = 1012247

drawthings_py-0.3.0/src/drawthings_py/models/__init__.py

@@ -0,0 +1,6 @@
+from .grpc_models_source import ModelsSource, GrpcModelsSource
+
+__all__ = [
+    "ModelsSource",
+    "GrpcModelsSource",
+]

drawthings_py-0.3.0/src/drawthings_py/models/grpc_models_source.py

@@ -0,0 +1,46 @@
+from abc import ABC, abstractmethod
+
+from typing_extensions import override
+
+from drawthings_py.generated.dt_grpc import image_service
+from drawthings_py.models.types import ModelsInfo
+
+
+class ModelsSource(ABC):  # noqa: F821
+    _models: ModelsInfo
+    _files: list[str]
+
+    def __init__(self):
+        self._models = ModelsInfo()
+        self._files = []
+
+    @abstractmethod
+    async def load(self) -> None:
+        pass
+
+    pass
+
+
+class GrpcModelsSource(ModelsSource):
+    _service: image_service.ImageGenerationServiceStub
+
+    def __init__(self, service: image_service.ImageGenerationServiceStub):
+        super().__init__()
+        self._service = service
+
+    @override
+    async def load(self) -> None:
+        req = image_service.EchoRequest(
+            "drawthings-py",
+        )
+        reply = await self._service.echo(req)
+
+        models = reply.override.models if reply.override is not None else None
+        print(f"{len(reply.files)} files. {len(models) if models else 0} models")
+
+        if reply.override is None:
+            return
+
+        self._models: ModelsInfo = ModelsInfo.from_echo_reply(reply)
+        self._files: list[str] = reply.files
+        return

drawthings_py-0.3.0/src/drawthings_py/models/types.py

@@ -0,0 +1,121 @@
+import json
+from typing import Any, Literal, TypeAlias, cast
+
+from drawthings_py.generated.dt_grpc import image_service
+from drawthings_py.util.mixins import ReprMixin
+
+ModelTypes = Literal[
+    "models", "controlnets", "loras", "upscalers", "textual_inversions"
+]
+
+
+class ModelBase(ReprMixin):
+    file: str = ""
+    name: str = ""
+
+    def __init__(self, **kwargs: object):
+        for key, value in kwargs.items():
+            setattr(self, key, value)
+
+
+class ModelInfo(ModelBase):
+    prefix: str = ""
+    version: str = ""
+
+
+class ControlNetInfo(ModelBase):
+    modifier: str = ""
+    type: str = ""
+    global_average_pooling: bool = False
+    version: str = ""
+
+
+class LoRAInfo(ModelBase):
+    prefix: str = ""
+    mode: str = ""
+    version: str = ""
+
+
+class UpscalerInfo(ModelBase):
+    pass
+
+
+class TextualInversionInfo(ModelBase):
+    keyword: str = ""
+
+
+_jl: TypeAlias = list[dict[str, object]]
+
+
+def _cjl(data: Any) -> _jl:  # pyright: ignore[reportExplicitAny, reportAny]
+    return cast(_jl, data)
+
+
+class ModelsInfo(ReprMixin):
+    models: list[ModelInfo]
+    controlNets: list[ControlNetInfo]
+    loras: list[LoRAInfo]
+    upscalers: list[UpscalerInfo]
+    textualInversions: list[TextualInversionInfo]
+    files: list[str]
+
+    def __init__(
+        self,
+        models: list[ModelInfo] | None = None,
+        controlNets: list[ControlNetInfo] | None = None,
+        loras: list[LoRAInfo] | None = None,
+        upscalers: list[UpscalerInfo] | None = None,
+        textualInversions: list[TextualInversionInfo] | None = None,
+        files: list[str] | None = None,
+    ):
+        self.models = models or []
+        self.controlNets = controlNets or []
+        self.loras = loras or []
+        self.upscalers = upscalers or []
+        self.textualInversions = textualInversions or []
+        self.files = files or []
+
+    @classmethod
+    def from_echo_reply(cls, reply: image_service.EchoReply) -> "ModelsInfo":
+        data = reply.override
+        files = reply.files or []
+
+        if data is None:
+            return cls(files=files)
+
+        models = (
+            [ModelInfo(**item) for item in _cjl(json.loads(data.models))]
+            if data.models
+            else []
+        )
+        control_nets = (
+            [ControlNetInfo(**item) for item in _cjl(json.loads(data.control_nets))]
+            if data.control_nets
+            else []
+        )
+        loras = (
+            [LoRAInfo(**item) for item in _cjl(json.loads(data.loras))]
+            if data.loras
+            else []
+        )
+        upscalers = (
+            [UpscalerInfo(**item) for item in _cjl(json.loads(data.upscalers))]
+            if data.upscalers
+            else []
+        )
+        textual_inversions = (
+            [
+                TextualInversionInfo(**item)
+                for item in _cjl(json.loads(data.textual_inversions))
+            ]
+            if data.textual_inversions
+            else []
+        )
+        return cls(
+            models=models,
+            controlNets=control_nets,
+            loras=loras,
+            upscalers=upscalers,
+            textualInversions=textual_inversions,
+            files=reply.files,
+        )

{drawthings_py-0.2.0 → drawthings_py-0.3.0}/src/drawthings_py/request_builder.py

@@ -9,11 +9,11 @@ import os
 from dataclasses import dataclass
 from typing import Callable, Literal, TypeAlias, cast
 
-from .configs.config_dict import ConfigDict, ConfigKey, ConfigValue
-from .configs.gen_config import GenConfig
-from .generated.dt_grpc import image_service
-from .image_buffer import ImageBuffer
-from .seed_provider import SeedProvider
+from drawthings_py.configs.config_dict import ConfigDict, ConfigKey, ConfigValue
+from drawthings_py.configs.gen_config import GenConfig
+from drawthings_py.generated.dt_grpc import image_service
+from drawthings_py.image.image_buffer import ImageBuffer
+from drawthings_py.util.seed_provider import SeedProvider
 
 ImageSource: TypeAlias = str | os.PathLike[str] | ImageBuffer
 """Type alias for image sources, which can be file paths or ImageBuffer instances."""

drawthings_py-0.3.0/src/drawthings_py/util/mixins.py

@@ -0,0 +1,10 @@
+from typing_extensions import override
+
+
+class ReprMixin:
+    @override
+    def __repr__(self):
+
+        fields = ", ".join(f"{k}={v!r}" for k, v in vars(self).items())  # pyright: ignore[reportAny]
+
+        return f"{type(self).__name__}({fields})"