From 4ea70b2222e64b217bf6ad1f6030600e98645d88 Mon Sep 17 00:00:00 2001 From: Rbrtcs1 Date: Fri, 27 Sep 2024 20:17:22 -0400 Subject: [PATCH 1/4] No longer send nsfw gen_metadata unless image is replaced --- horde_worker_regen/process_management/process_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/horde_worker_regen/process_management/process_manager.py b/horde_worker_regen/process_management/process_manager.py index 78043b4d..4f880a8f 100644 --- a/horde_worker_regen/process_management/process_manager.py +++ b/horde_worker_regen/process_management/process_manager.py @@ -1814,7 +1814,7 @@ def receive_and_handle_process_messages(self) -> None: ) completed_job_info.job_image_results[i].generation_faults.append(new_meta_entry) completed_job_info.state = GENERATION_STATE.csam - elif message.safety_evaluations[i].is_nsfw: + elif message.safety_evaluations[i].is_nsfw and message.safety_evaluations[i].replacement_image_base64 is not None: new_meta_entry = GenMetadataEntry( type=METADATA_TYPE.censorship, value=METADATA_VALUE.nsfw, From fc3034a2a6f06e662af09b8fe9e8506c7d0dfaee Mon Sep 17 00:00:00 2001 From: db0 Date: Sat, 28 Sep 2024 11:53:47 +0200 Subject: [PATCH 2/4] feat: Reports whether the image is nsfw whether it was censored or not --- .../process_management/process_manager.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/horde_worker_regen/process_management/process_manager.py b/horde_worker_regen/process_management/process_manager.py index 4f880a8f..8d63cdd4 100644 --- a/horde_worker_regen/process_management/process_manager.py +++ b/horde_worker_regen/process_management/process_manager.py @@ -1814,14 +1814,19 @@ def receive_and_handle_process_messages(self) -> None: ) completed_job_info.job_image_results[i].generation_faults.append(new_meta_entry) completed_job_info.state = GENERATION_STATE.csam - elif message.safety_evaluations[i].is_nsfw and message.safety_evaluations[i].replacement_image_base64 is not None: + elif message.safety_evaluations[i].is_nsfw: new_meta_entry = GenMetadataEntry( - type=METADATA_TYPE.censorship, + type=METADATA_TYPE.information, value=METADATA_VALUE.nsfw, ) - completed_job_info.job_image_results[i].generation_faults.append(new_meta_entry) - if completed_job_info.state != GENERATION_STATE.csam: - completed_job_info.state = GENERATION_STATE.censored + if message.safety_evaluations[i].replacement_image_base64 is not None: + new_meta_entry = GenMetadataEntry( + type=METADATA_TYPE.censorship, + value=METADATA_VALUE.nsfw, + ) + completed_job_info.job_image_results[i].generation_faults.append(new_meta_entry) + if completed_job_info.state != GENERATION_STATE.csam: + completed_job_info.state = GENERATION_STATE.censored else: completed_job_info.censored = False # logger.debug([c.generation_faults for c in completed_job_info.job_image_results]) From 1acb42413d579037300d29b7ed969c4857e6ab25 Mon Sep 17 00:00:00 2001 From: tazlin Date: Sat, 28 Sep 2024 08:16:51 -0400 Subject: [PATCH 3/4] chore: version bump --- horde_worker_regen/__init__.py | 2 +- horde_worker_regen/_version_meta.json | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/horde_worker_regen/__init__.py b/horde_worker_regen/__init__.py index 7e5da517..8f6cd7d9 100644 --- a/horde_worker_regen/__init__.py +++ b/horde_worker_regen/__init__.py @@ -8,7 +8,7 @@ ASSETS_FOLDER_PATH = Path(__file__).parent / "assets" -__version__ = "9.0.4" +__version__ = "9.0.5" import pkg_resources # noqa: E402 diff --git a/horde_worker_regen/_version_meta.json b/horde_worker_regen/_version_meta.json index 22a5be22..839fa614 100644 --- a/horde_worker_regen/_version_meta.json +++ b/horde_worker_regen/_version_meta.json @@ -1,5 +1,5 @@ { - "recommended_version": "9.0.4", + "recommended_version": "9.0.5", "required_min_version": "9.0.2", "required_min_version_update_date": "2024-09-26", "required_min_version_info": { diff --git a/pyproject.toml b/pyproject.toml index 257b310e..4dcd9376 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "horde_worker_regen" -version = "9.0.4" +version = "9.0.5" description = "Allows you to connect to the AI Horde and generate images for users." authors = [ {name = "tazlin", email = "tazlin.on.github@gmail.com"}, From f9532f2d90f8342126e225679f716d6833cdb0bd Mon Sep 17 00:00:00 2001 From: tazlin Date: Sat, 28 Sep 2024 08:28:19 -0400 Subject: [PATCH 4/4] fix: use latest avail. horde deps --- .pre-commit-config.yaml | 4 ++-- horde-bridge.cmd | 2 +- requirements.rocm.txt | 4 ++-- requirements.txt | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f48259a0..b127c901 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,7 +40,7 @@ repos: - horde_safety==0.2.3 - torch==2.3.1 - ruamel.yaml - - horde_engine==2.15.2 - - horde_sdk==0.14.10 + - horde_engine==2.15.3 + - horde_sdk==0.14.11 - horde_model_reference==0.9.0 - semver diff --git a/horde-bridge.cmd b/horde-bridge.cmd index fb9ac750..adce7be4 100644 --- a/horde-bridge.cmd +++ b/horde-bridge.cmd @@ -5,7 +5,7 @@ cd /d %~dp0 call runtime python -s -m pip -V call python -s -m pip uninstall hordelib -call python -s -m pip install horde_sdk~=0.14.10 horde_model_reference~=0.9.0 horde_engine~=2.15.2 horde_safety~=0.2.3 -U +call python -s -m pip install horde_sdk~=0.14.11 horde_model_reference~=0.9.0 horde_engine~=2.15.3 horde_safety~=0.2.3 -U if %ERRORLEVEL% NEQ 0 ( echo "Please run update-runtime.cmd." diff --git a/requirements.rocm.txt b/requirements.rocm.txt index 5208c77b..f7dc6864 100644 --- a/requirements.rocm.txt +++ b/requirements.rocm.txt @@ -1,9 +1,9 @@ numpy==1.26.4 torch==2.3.1+rocm6.0 -horde_sdk~=0.14.10 +horde_sdk~=0.14.11 horde_safety~=0.2.3 -horde_engine~=2.15.2 +horde_engine~=2.15.3 horde_model_reference~=0.9.0 python-dotenv diff --git a/requirements.txt b/requirements.txt index 8c29d044..afd6eb0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ numpy==1.26.4 torch==2.3.1 -horde_sdk~=0.14.10 +horde_sdk~=0.14.11 horde_safety~=0.2.3 -horde_engine~=2.15.2 +horde_engine~=2.15.3 horde_model_reference>=0.9.0 python-dotenv