From 87116831b1dfccae512056297b49d7ae00ec69e3 Mon Sep 17 00:00:00 2001 From: db0 Date: Sun, 29 Sep 2024 10:17:18 +0200 Subject: [PATCH 1/2] fix: mark all non-censored nsfw images in info --- .../process_management/process_manager.py | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/horde_worker_regen/process_management/process_manager.py b/horde_worker_regen/process_management/process_manager.py index 0488cfb4..6f0257c9 100644 --- a/horde_worker_regen/process_management/process_manager.py +++ b/horde_worker_regen/process_management/process_manager.py @@ -1804,32 +1804,34 @@ def receive_and_handle_process_messages(self) -> None: if any_safety_failed: completed_job_info.state = GENERATION_STATE.faulted - elif num_images_censored > 0: - completed_job_info.censored = True - for i in range(len(completed_job_info.job_image_results)): - if message.safety_evaluations[i].is_csam: + completed_job_info.censored = False + for i in range(len(completed_job_info.job_image_results)): + if message.safety_evaluations[i].is_csam: + new_meta_entry = GenMetadataEntry( + type=METADATA_TYPE.censorship, + value=METADATA_VALUE.csam, + ) + completed_job_info.job_image_results[i].generation_faults.append(new_meta_entry) + completed_job_info.state = GENERATION_STATE.csam + completed_job_info.censored = True + elif message.safety_evaluations[i].is_nsfw: + # This just marks images as nsfw, if not censored already + if message.safety_evaluations[i].replacement_image_base64 is None: new_meta_entry = GenMetadataEntry( - type=METADATA_TYPE.censorship, - value=METADATA_VALUE.csam, + type=METADATA_TYPE.information, + value=METADATA_VALUE.nsfw, ) 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: + else: new_meta_entry = GenMetadataEntry( - type=METADATA_TYPE.information, + type=METADATA_TYPE.censorship, value=METADATA_VALUE.nsfw, ) completed_job_info.job_image_results[i].generation_faults.append(new_meta_entry) - 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 + completed_job_info.censored = True + if completed_job_info.state != GENERATION_STATE.csam: + completed_job_info.state = GENERATION_STATE.censored + # logger.debug([c.generation_faults for c in completed_job_info.job_image_results]) self.completed_jobs.append(completed_job_info) From 71ae156863cb1fc72fa24c6c58c94d5523fba210 Mon Sep 17 00:00:00 2001 From: tazlin Date: Sun, 29 Sep 2024 07:55:25 -0400 Subject: [PATCH 2/2] 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 8f6cd7d9..3fea66df 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.5" +__version__ = "9.0.6" import pkg_resources # noqa: E402 diff --git a/horde_worker_regen/_version_meta.json b/horde_worker_regen/_version_meta.json index 839fa614..c140cae0 100644 --- a/horde_worker_regen/_version_meta.json +++ b/horde_worker_regen/_version_meta.json @@ -1,5 +1,5 @@ { - "recommended_version": "9.0.5", + "recommended_version": "9.0.6", "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 4dcd9376..0015f162 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "horde_worker_regen" -version = "9.0.5" +version = "9.0.6" description = "Allows you to connect to the AI Horde and generate images for users." authors = [ {name = "tazlin", email = "tazlin.on.github@gmail.com"},