refactor: lingering gen fixes; style: fix

Author: tazlin

.github/workflows/maintests.yml

@@ -19,23 +19,26 @@ jobs:
   build:
     env:
       AIWORKER_CACHE_HOME: ${{ github.workspace }}/.cache
-      TESTS_ONGOING: 1
-      HORDE_SDK_TESTING: 1
-      HORDE_MODEL_REFERENCE_MAKE_FOLDERS: 1
+      TESTS_ONGOING: "1"
+      AI_HORDE_TESTING: "1"
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.12", "3.13"]
+        python-version:
+          - "3.12"
+          - "3.13"
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Python
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version: ${{ matrix.python }}
-      - name: Install tox and any other packages
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade -r requirements.dev.txt
-      - name: Run unit tests
-        run: tox -e tests-no-api-calls
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+
+      - name: Install the project
+        run: uv sync --locked --all-extras --dev
+
+
+      - name: Run tests
+        run: uv run pytest tests --ignore-glob='**/*api_calls*' -m "not api_side_ci"

.github/workflows/prtests.yml

@@ -22,25 +22,27 @@ jobs:
   build:
     env:
       AIWORKER_CACHE_HOME: ${{ github.workspace }}/.cache
-      TESTS_ONGOING: 1
-      HORDE_SDK_TESTING: 1
-      HORDE_MODEL_REFERENCE_MAKE_FOLDERS: 1
+      TESTS_ONGOING: "1"
+      AI_HORDE_TESTING: "1"
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.12", "3.13"]
+        python-version:
+          - "3.12"
+          - "3.13"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: Setup Python
-        uses: actions/setup-python@v4
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version: ${{ matrix.python }}
-      - name: Install tox and any other packages
-        run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade -r requirements.dev.txt
-      - name: Run unit tests
-        run: tox -e tests-no-api-calls
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+
+      - name: Install the project
+        run: uv sync --locked --all-extras --dev
+
+      - name: Run tests
+        run: uv run pytest tests --ignore-glob='**/*api_calls*' -m "not api_side_ci"

horde_sdk/ai_horde_api/ai_horde_clients.py

@@ -1456,7 +1456,7 @@ async def heartbeat_request(
     async def image_generate_request(
         self,
         image_gen_request: ImageGenerateAsyncRequest,
-        timeout: int = GENERATION_MAX_LIFE, # noqa: ASYNC109 # FIXME
+        timeout: int = GENERATION_MAX_LIFE,  # noqa: ASYNC109 # FIXME
         check_callback: Callable[[ImageGenerateCheckResponse], None] | None = None,
         delay: float = 0.0,
     ) -> tuple[ImageGenerateStatusResponse, GenerationID]:
@@ -1542,7 +1542,7 @@ async def image_generate_request_dry_run(
     async def alchemy_request(
         self,
         alchemy_request: AlchemyAsyncRequest,
-        timeout: int = GENERATION_MAX_LIFE, # noqa: ASYNC109 # FIXME
+        timeout: int = GENERATION_MAX_LIFE,  # noqa: ASYNC109 # FIXME
         check_callback: Callable[[AlchemyStatusResponse], None] | None = None,
     ) -> tuple[AlchemyStatusResponse, GenerationID]:
         """Submit an alchemy request to the AI-Horde API, and wait for it to complete.
@@ -1588,7 +1588,7 @@ async def alchemy_request(
     async def text_generate_request(
         self,
         text_gen_request: TextGenerateAsyncRequest,
-        timeout: int = GENERATION_MAX_LIFE, # noqa: ASYNC109 # FIXME
+        timeout: int = GENERATION_MAX_LIFE,  # noqa: ASYNC109 # FIXME
         check_callback: Callable[[TextGenerateStatusResponse], None] | None = None,
         delay: float = 0.0,
     ) -> tuple[TextGenerateStatusResponse, GenerationID]:

horde_sdk/generation_parameters/generic/__init__.py

@@ -46,7 +46,7 @@ class SchemaVersionedBaseModel(BaseModel):
 
     @model_validator(mode="before")
     @classmethod
-    def _assign_schema_version(cls, data: Any) -> Any: # noqa: ANN401
+    def _assign_schema_version(cls, data: Any) -> Any:  # noqa: ANN401
         """Populate ``schema_version`` when omitted by callers."""
         if data is None:
             return {"schema_version": cls.SCHEMA_VERSION}
@@ -80,8 +80,6 @@ class GenerationParameterBaseModel(SchemaVersionedBaseModel, AbstractGenerationP
     for a list of those LoRa entries.
     """
 
-
-
     underlying_generation_scheme: UNDERLYING_GENERATION_SCHEME | None = None
     """The underlying method the generation uses to produce results.
 
@@ -160,7 +158,7 @@ class GenerationWithModelParameters(GenerationParameterBaseModel):
     underlying_generation_scheme: UNDERLYING_GENERATION_SCHEME = UNDERLYING_GENERATION_SCHEME.MODEL
     """See :attr:`ComposedParameterSetBase.underlying_generation_scheme` for more information."""
 
-    model: str
+    model: str | None = None
     model_baseline: str | None = None
 
 

horde_sdk/generation_parameters/image/object_models.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Mapping, Sequence
+from collections.abc import Sequence
 from pathlib import Path
 from typing import override
 
@@ -259,6 +259,10 @@ class BasicImageGenerationParameters(BasicImageGenerationParametersTemplate):
         from_attributes=True,
     )
 
+
+    model: str
+    """The model to use for the generation."""
+
     prompt: str
     """The prompt to use for the generation."""
 
@@ -610,7 +614,8 @@ def get_number_expected_results(self: ImageGenerationParametersTemplate) -> int:
     def to_parameters(
         self,
         *,
-        base_param_updates: Mapping[str, object] | None = None,
+        base_param_updates: BasicImageGenerationParametersTemplate | None = None,
+        additional_param_updates: ImageGenerationComponentContainer | None = None,
         result_ids: Sequence[ID_TYPES] | None = None,
         allocator: ResultIdAllocator | None = None,
         seed: str = "image",
@@ -623,9 +628,16 @@ def to_parameters(
         overrides: dict[str, object] | None = None
         if base_param_updates:
             overrides = {
-                "base_params": base_params.model_copy(update=dict(base_param_updates)),
+                "base_params": base_params.model_copy(update=base_param_updates.model_dump(exclude_none=True)),
             }
 
+        if additional_param_updates:
+            if overrides is None:
+                overrides = {}
+            if not self.additional_params:
+                raise ValueError("additional_params must be defined before applying updates.")
+            overrides["additional_params"] = self.additional_params.model_copy(update=dict(additional_param_updates))
+
         finalization = finalize_template_for_parameters(
             self,
             overrides=overrides,

horde_sdk/generation_parameters/text/object_models.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Mapping, Sequence
+from collections.abc import Sequence
 from enum import auto
 from typing import Self, override
 
@@ -191,6 +191,9 @@ class BasicTextGenerationParameters(BasicTextGenerationParametersTemplate):  # T
 
     model_config = get_default_frozen_model_config_dict()
 
+    model: str
+    """The model to use for the generation."""
+
     prompt: str  # pyright: ignore[reportGeneralTypeIssues, reportIncompatibleVariableOverride]
     """The prompt to use for the generation."""
 
@@ -216,7 +219,7 @@ def get_number_expected_results(self) -> int:
     def to_parameters(
         self,
         *,
-        base_param_updates: Mapping[str, object] | None = None,
+        base_param_updates: BasicTextGenerationParametersTemplate | None = None,
         result_ids: Sequence[ID_TYPES] | None = None,
         allocator: ResultIdAllocator | None = None,
         seed: str = "text",
@@ -229,7 +232,7 @@ def to_parameters(
         overrides: dict[str, object] | None = None
         if base_param_updates:
             overrides = {
-                "base_params": base_params.model_copy(update=dict(base_param_updates)),
+                "base_params": base_params.model_copy(update=base_param_updates.model_dump(exclude_none=True)),
             }
 
         def _inject_base_params_into_fingerprint(

horde_sdk/generic_api/apimodels.py

@@ -138,7 +138,6 @@ class MyDataRootModel(HordeResponseRootModel[MyData]):
     )
 
 
-
 class HordeResponseBaseModel(HordeResponse, BaseModel):
     """Base class for all Horde API response data models (leveraging pydantic)."""
 

horde_sdk/generic_api/generic_clients.py

@@ -973,11 +973,11 @@ async def _handle_exit_async(
             # Log the results of each cleanup request.
             for i, cleanup_response in enumerate(cleanup_responses):
                 if isinstance(cleanup_response, Exception):
-                    logger.error(f"Recovery request {i+1} failed!")
+                    logger.error(f"Recovery request {i + 1} failed!")
 
-                logger.info(f"Recovery request {i+1} submitted!")
-                logger.debug(f"Recovery request {i+1}: {cleanup_requests[i].log_safe_model_dump()}")
-                logger.debug(f"Recovery response {i+1}: {cleanup_response}")
+                logger.info(f"Recovery request {i + 1} submitted!")
+                logger.debug(f"Recovery request {i + 1}: {cleanup_requests[i].log_safe_model_dump()}")
+                logger.debug(f"Recovery response {i + 1}: {cleanup_response}")
 
             # Return True to indicate that all requests were handled successfully.
             return True

horde_sdk/worker/builders.py

@@ -6,12 +6,19 @@
 from loguru import logger
 
 from horde_sdk.consts import ID_TYPES
+from horde_sdk.generation_parameters import BasicImageGenerationParametersTemplate
 from horde_sdk.generation_parameters.alchemy import SingleAlchemyParameters
 from horde_sdk.generation_parameters.alchemy.object_models import SingleAlchemyParametersTemplate
 from horde_sdk.generation_parameters.image import ImageGenerationParameters
-from horde_sdk.generation_parameters.image.object_models import ImageGenerationParametersTemplate
+from horde_sdk.generation_parameters.image.object_models import (
+    ImageGenerationComponentContainer,
+    ImageGenerationParametersTemplate,
+)
 from horde_sdk.generation_parameters.text import TextGenerationParameters
-from horde_sdk.generation_parameters.text.object_models import TextGenerationParametersTemplate
+from horde_sdk.generation_parameters.text.object_models import (
+    BasicTextGenerationParametersTemplate,
+    TextGenerationParametersTemplate,
+)
 from horde_sdk.generation_parameters.utils import ResultIdAllocator
 from horde_sdk.safety import SafetyRules, default_image_safety_rules, default_text_safety_rules
 from horde_sdk.worker.consts import (
@@ -198,7 +205,8 @@ def from_template(
         *,
         generation_id: ID_TYPES | None = None,
         dispatch_result_ids: Sequence[ID_TYPES] | None = None,
-        base_param_updates: Mapping[str, object] | None = None,
+        base_param_updates: BasicImageGenerationParametersTemplate | None = None,
+        additional_param_updates: ImageGenerationComponentContainer | None = None,
         result_ids: Sequence[ID_TYPES] | None = None,
         allocator: ResultIdAllocator | None = None,
         seed: str = "image",
@@ -503,7 +511,7 @@ def from_template(
         *,
         generation_id: ID_TYPES | None = None,
         dispatch_result_ids: Sequence[ID_TYPES] | None = None,
-        base_param_updates: Mapping[str, object] | None = None,
+        base_param_updates: BasicTextGenerationParametersTemplate | None = None,
         result_ids: Sequence[ID_TYPES] | None = None,
         allocator: ResultIdAllocator | None = None,
         seed: str = "text",