diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 46f07728..4a62c5a3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,7 +40,7 @@ repos: - horde_safety - torch - ruamel.yaml - - hordelib==2.8.0 + - hordelib==2.8.1 - horde_sdk==0.9.2 - horde_model_reference==0.6.3 - semver diff --git a/convert_config_to_env.py b/convert_config_to_env.py index c0712c60..d6c738f4 100644 --- a/convert_config_to_env.py +++ b/convert_config_to_env.py @@ -12,7 +12,6 @@ import argparse from horde_model_reference.model_reference_manager import ModelReferenceManager - from horde_worker_regen.bridge_data.load_config import BridgeDataLoader, ConfigFormat diff --git a/horde-bridge.cmd b/horde-bridge.cmd index cd6b9a01..242514ff 100644 --- a/horde-bridge.cmd +++ b/horde-bridge.cmd @@ -4,7 +4,7 @@ cd /d %~dp0 : This first call to runtime activates the environment for the rest of the script call runtime python -s -m pip -V -call python -s -m pip install horde_sdk~=0.9.2 horde_model_reference~=0.6.3 hordelib~=2.8.0 -U +call python -s -m pip install horde_sdk~=0.9.2 horde_model_reference~=0.6.3 hordelib~=2.8.1 -U if %ERRORLEVEL% NEQ 0 ( echo "Please run update-runtime.cmd." GOTO END diff --git a/horde_worker_regen/bridge_data/load_config.py b/horde_worker_regen/bridge_data/load_config.py index 6da41d6d..56eced63 100644 --- a/horde_worker_regen/bridge_data/load_config.py +++ b/horde_worker_regen/bridge_data/load_config.py @@ -6,13 +6,13 @@ from enum import auto from pathlib import Path -from horde_model_reference.model_reference_manager import ModelReferenceManager from horde_sdk.ai_horde_api.ai_horde_clients import AIHordeAPIManualClient from horde_sdk.ai_horde_worker.model_meta import ImageModelLoadResolver from loguru import logger from ruamel.yaml import YAML from strenum import StrEnum +from horde_model_reference.model_reference_manager import ModelReferenceManager from horde_worker_regen.bridge_data import AIWORKER_REGEN_PREFIX from horde_worker_regen.bridge_data.data_model import reGenBridgeData diff --git a/horde_worker_regen/download_models.py b/horde_worker_regen/download_models.py index 0f0cdbc1..a4b5cc2e 100644 --- a/horde_worker_regen/download_models.py +++ b/horde_worker_regen/download_models.py @@ -12,9 +12,9 @@ def download_all_models( if not load_config_from_env_vars: load_env_vars_from_config() - from horde_model_reference.model_reference_manager import ModelReferenceManager from loguru import logger + from horde_model_reference.model_reference_manager import ModelReferenceManager from horde_worker_regen.bridge_data.load_config import BridgeDataLoader, reGenBridgeData from horde_worker_regen.consts import BRIDGE_CONFIG_FILENAME diff --git a/horde_worker_regen/process_management/main_entry_point.py b/horde_worker_regen/process_management/main_entry_point.py index 73051216..65d3cadc 100644 --- a/horde_worker_regen/process_management/main_entry_point.py +++ b/horde_worker_regen/process_management/main_entry_point.py @@ -1,7 +1,6 @@ from multiprocessing.context import BaseContext from horde_model_reference.model_reference_manager import ModelReferenceManager - from horde_worker_regen.bridge_data.data_model import reGenBridgeData from horde_worker_regen.process_management.process_manager import HordeWorkerProcessManager diff --git a/horde_worker_regen/process_management/process_manager.py b/horde_worker_regen/process_management/process_manager.py index b49a4341..f7f6633d 100644 --- a/horde_worker_regen/process_management/process_manager.py +++ b/horde_worker_regen/process_management/process_manager.py @@ -26,9 +26,6 @@ import psutil import yarl from aiohttp import ClientSession -from horde_model_reference.meta_consts import MODEL_REFERENCE_CATEGORY, STABLE_DIFFUSION_BASELINE_CATEGORY -from horde_model_reference.model_reference_manager import ModelReferenceManager -from horde_model_reference.model_reference_records import StableDiffusion_ModelReference from horde_sdk import RequestErrorResponse from horde_sdk.ai_horde_api import GENERATION_STATE from horde_sdk.ai_horde_api.ai_horde_clients import AIHordeAPIAsyncClientSession, AIHordeAPIAsyncSimpleClient @@ -47,6 +44,9 @@ from typing_extensions import override import horde_worker_regen +from horde_model_reference.meta_consts import MODEL_REFERENCE_CATEGORY, STABLE_DIFFUSION_BASELINE_CATEGORY +from horde_model_reference.model_reference_manager import ModelReferenceManager +from horde_model_reference.model_reference_records import StableDiffusion_ModelReference from horde_worker_regen.bridge_data.data_model import reGenBridgeData from horde_worker_regen.bridge_data.load_config import BridgeDataLoader from horde_worker_regen.consts import ( diff --git a/horde_worker_regen/run_worker.py b/horde_worker_regen/run_worker.py index 68d9c6c9..9515a320 100644 --- a/horde_worker_regen/run_worker.py +++ b/horde_worker_regen/run_worker.py @@ -14,9 +14,9 @@ def main(ctx: BaseContext, load_from_env_vars: bool = False) -> None: """Check for a valid config and start the driver ('main') process for the reGen worker.""" - from horde_model_reference.model_reference_manager import ModelReferenceManager from pydantic import ValidationError + from horde_model_reference.model_reference_manager import ModelReferenceManager from horde_worker_regen.bridge_data.load_config import BridgeDataLoader, reGenBridgeData from horde_worker_regen.consts import BRIDGE_CONFIG_FILENAME from horde_worker_regen.process_management.main_entry_point import start_working diff --git a/tests/test_bridge_data.py b/tests/test_bridge_data.py index 8218e6f7..4a24551c 100644 --- a/tests/test_bridge_data.py +++ b/tests/test_bridge_data.py @@ -2,10 +2,10 @@ import pathlib import pytest -from horde_model_reference.model_reference_manager import ModelReferenceManager from horde_sdk.generic_api.consts import ANON_API_KEY from ruamel.yaml import YAML +from horde_model_reference.model_reference_manager import ModelReferenceManager from horde_worker_regen.bridge_data.data_model import reGenBridgeData from horde_worker_regen.bridge_data.load_config import BridgeDataLoader, ConfigFormat