Skip to content

Commit

Permalink
style: linting
Browse files Browse the repository at this point in the history
  • Loading branch information
db0 committed Mar 28, 2024
1 parent 5fee832 commit 4cac407
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion convert_config_to_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion horde-bridge.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion horde_worker_regen/bridge_data/load_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion horde_worker_regen/download_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion horde_worker_regen/process_management/main_entry_point.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions horde_worker_regen/process_management/process_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion horde_worker_regen/run_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test_bridge_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 4cac407

Please sign in to comment.