Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add support for gen_metadata key (#69) #72

Merged
merged 1 commit into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,4 @@ out.json
.vscode/settings.json

examples/requested_images/*.*
_version.py
4 changes: 4 additions & 0 deletions docs/request_field_names_and_descriptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,10 @@
[
"censored",
null
],
[
"gen_metadata",
null
]
],
"StatsImageModelsRequest": [
Expand Down
16 changes: 15 additions & 1 deletion horde_sdk/ai_horde_api/apimodels/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
from typing_extensions import override

from horde_sdk.ai_horde_api.consts import KNOWN_SAMPLERS, POST_PROCESSOR_ORDER_TYPE
from horde_sdk.ai_horde_api.consts import KNOWN_SAMPLERS, METADATA_TYPE, METADATA_VALUE, POST_PROCESSOR_ORDER_TYPE
from horde_sdk.ai_horde_api.endpoints import AI_HORDE_BASE_URL
from horde_sdk.ai_horde_api.fields import JobID, WorkerID
from horde_sdk.generic_api.apimodels import HordeRequest, HordeResponseBaseModel
Expand Down Expand Up @@ -198,3 +198,17 @@ class JobSubmitResponse(HordeResponseBaseModel):
@classmethod
def get_api_model_name(cls) -> str | None:
return "GenerationSubmitted"


class GenMetadataEntry(BaseModel):
"""Represents a single generation metadata entry.

v2 API Model: `GenerationMetadataStable`
"""

type_: METADATA_TYPE = Field(alias="type")
"""The relevance of the metadata field."""
value: METADATA_VALUE = Field()
"""The value of the metadata field."""
ref: str = Field(max_length=255)
"""Optionally a reference for the metadata (e.g. a lora ID)"""
4 changes: 3 additions & 1 deletion horde_sdk/ai_horde_api/apimodels/generate/_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from pydantic import BaseModel, Field, field_validator
from typing_extensions import override

from horde_sdk.ai_horde_api.apimodels.base import BaseAIHordeRequest, JobRequestMixin
from horde_sdk.ai_horde_api.apimodels.base import BaseAIHordeRequest, GenMetadataEntry, JobRequestMixin
from horde_sdk.ai_horde_api.apimodels.generate._progress import ResponseGenerationProgressMixin
from horde_sdk.ai_horde_api.consts import GENERATION_STATE
from horde_sdk.ai_horde_api.endpoints import AI_HORDE_API_ENDPOINT_SUBPATH
Expand Down Expand Up @@ -36,6 +36,8 @@ class ImageGeneration(BaseModel):
"""The seed which generated this image."""
censored: bool
"""When true this image has been censored by the worker's safety filter."""
gen_metadata: list[GenMetadataEntry] | None = None
"""Extra metadata about faulted or defaulted components of the generation"""

@field_validator("id_", mode="before")
def validate_id(cls, v: str | JobID) -> JobID | str:
Expand Down
9 changes: 8 additions & 1 deletion horde_sdk/ai_horde_api/apimodels/generate/_submit.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
from pydantic import model_validator
from typing_extensions import override

from horde_sdk.ai_horde_api.apimodels.base import BaseAIHordeRequest, JobRequestMixin, JobSubmitResponse
from horde_sdk.ai_horde_api.apimodels.base import (
BaseAIHordeRequest,
GenMetadataEntry,
JobRequestMixin,
JobSubmitResponse,
)
from horde_sdk.ai_horde_api.consts import GENERATION_STATE
from horde_sdk.ai_horde_api.endpoints import AI_HORDE_API_ENDPOINT_SUBPATH
from horde_sdk.consts import HTTPMethod
Expand All @@ -25,6 +30,8 @@ class ImageGenerationJobSubmitRequest(BaseAIHordeRequest, JobRequestMixin, APIKe
"""The seed for this generation."""
censored: bool = False
"""If True, this resulting image has been censored."""
gen_metadata: list[GenMetadataEntry] | None = None
"""Extra metadata about faulted or defaulted components of the generation"""

@model_validator(mode="after")
def validate_generation(self) -> ImageGenerationJobSubmitRequest:
Expand Down
26 changes: 26 additions & 0 deletions horde_sdk/ai_horde_api/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,29 @@ class KNOWN_ALCHEMY_TYPES(StrEnum):
CodeFormers = KNOWN_FACEFIXERS.GFPGAN

strip_background = KNOWN_MISC_POST_PROCESSORS.strip_background


class METADATA_TYPE(StrEnum):
"""The generation metadata types that are known to the API.

(lora, ti, censorship, etc)
"""

lora = auto()
ti = auto()
censorship = auto()
source_image = auto()
source_mask = auto()


class METADATA_VALUE(StrEnum):
"""The generation metadata values that are known to the API.

(download_failed, baseline_mismatch, etc)
"""

download_failed = auto()
parse_failed = auto()
baseline_mismatch = auto()
csam = auto()
nsfw = auto()
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,12 @@
"generation": "R2",
"state": "ok",
"seed": 0,
"censored": false
"censored": false,
"gen_metadata": [
{
"type": "lora",
"value": "download_failed",
"ref": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
"sampler_order": [
0
],
"use_default_badwordsids": true
"use_default_badwordsids": true,
"stop_sequence": [
""
]
},
"softprompt": "a",
"trusted_workers": false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"id": "00000000-0000-0000-0000-000000000000",
"generation": "R2",
"state": "ok"
"state": "ok",
"gen_metadata": [
{
"type": "censorship",
"value": "csam",
"ref": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@
"img": "",
"seed": "",
"id": "",
"censored": false
"censored": false,
"gen_metadata": [
{
"type": "lora",
"value": "download_failed",
"ref": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
}
]
}
],
"shared": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@
"img": "",
"seed": "",
"id": "",
"censored": false
"censored": false,
"gen_metadata": [
{
"type": "lora",
"value": "download_failed",
"ref": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
}
]
}
],
"shared": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
0
],
"use_default_badwordsids": true,
"stop_sequence": [
""
],
"prompt": ""
},
"id": "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@
"model": "",
"state": "ok",
"text": "",
"seed": 0
"seed": 0,
"gen_metadata": [
{
"type": "censorship",
"value": "csam",
"ref": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
}
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@
"model": "",
"state": "ok",
"text": "",
"seed": 0
"seed": 0,
"gen_metadata": [
{
"type": "censorship",
"value": "csam",
"ref": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
}
]
}
]
}