Skip to content

Commit 27e6932

Browse files
committed
fix: <3.12 python support enum in
1 parent 400e4fc commit 27e6932

File tree

4 files changed

+28
-10
lines changed

4 files changed

+28
-10
lines changed

horde_sdk/ai_horde_api/apimodels/generate/pop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ def has_upscaler(self) -> bool:
381381
return False
382382

383383
return any(
384-
post_processing in KNOWN_UPSCALERS.__members__ or post_processing in KNOWN_UPSCALERS._value2member_map_
384+
post_processing in KNOWN_UPSCALERS.__members__ or post_processing in KNOWN_UPSCALERS.__members__.values()
385385
for post_processing in self.payload.post_processing
386386
)
387387

horde_sdk/generation_parameters/alchemy/consts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def is_upscaler_form(form: KNOWN_ALCHEMY_TYPES | str) -> bool:
144144
if isinstance(form, KNOWN_ALCHEMY_TYPES):
145145
value = form.value
146146

147-
return value in KNOWN_UPSCALERS or value in KNOWN_UPSCALERS.__members__.values()
147+
return value in KNOWN_UPSCALERS.__members__ or value in KNOWN_UPSCALERS.__members__.values()
148148

149149

150150
def is_facefixer_form(form: KNOWN_ALCHEMY_TYPES | str) -> bool:
@@ -153,7 +153,7 @@ def is_facefixer_form(form: KNOWN_ALCHEMY_TYPES | str) -> bool:
153153
if isinstance(form, KNOWN_ALCHEMY_TYPES):
154154
value = form.value
155155

156-
return value in KNOWN_FACEFIXERS or value in KNOWN_FACEFIXERS.__members__.values()
156+
return value in KNOWN_FACEFIXERS.__members__ or value in KNOWN_FACEFIXERS.__members__.values()
157157

158158

159159
def is_interrogator_form(form: KNOWN_ALCHEMY_TYPES | str) -> bool:

tests/ai_horde_api/test_ai_horde_api_models.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ def test_ImageGenerateJobPopResponse() -> None:
433433
)
434434

435435
assert all(
436-
post_processor in KNOWN_UPSCALERS._value2member_map_
436+
post_processor in KNOWN_UPSCALERS.__members__.keys() or post_processor in KNOWN_UPSCALERS.__members__.values()
437437
for post_processor in test_response.payload.post_processing
438438
)
439439

@@ -448,7 +448,10 @@ def test_ImageGenerateJobPopResponse() -> None:
448448
skipped=ImageGenerateJobPopSkippedStatus(),
449449
)
450450

451-
assert all(post_processor in KNOWN_UPSCALERS for post_processor in test_response.payload.post_processing)
451+
assert all(
452+
post_processor in KNOWN_UPSCALERS.__members__ or post_processor in KNOWN_UPSCALERS.__members__.values()
453+
for post_processor in test_response.payload.post_processing
454+
)
452455

453456
test_response = ImageGenerateJobPopResponse(
454457
ids=[

tests/worker/dispatch/ai_horde/test_alchemy_parameters.py

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,34 @@ def assert_common_parameters(
5252

5353
if isinstance(single_generation, UpscaleAlchemyParameters):
5454
assert single_generation.form == KNOWN_ALCHEMY_FORMS.post_process
55-
assert single_generation.upscaler in KNOWN_UPSCALERS
55+
assert (
56+
single_generation.upscaler in KNOWN_UPSCALERS.__members__
57+
or single_generation.upscaler in KNOWN_UPSCALERS.__members__.values()
58+
)
5659
elif isinstance(single_generation, FacefixAlchemyParameters):
5760
assert single_generation.form == KNOWN_ALCHEMY_FORMS.post_process
58-
assert single_generation.facefixer in KNOWN_FACEFIXERS
61+
assert (
62+
single_generation.facefixer in KNOWN_FACEFIXERS.__members__
63+
or single_generation.facefixer in KNOWN_FACEFIXERS.__members__.values()
64+
)
5965
elif isinstance(single_generation, InterrogateAlchemyParameters):
6066
assert single_generation.form == KNOWN_ALCHEMY_FORMS.interrogation
61-
assert single_generation.interrogator in KNOWN_INTERROGATORS
67+
assert (
68+
single_generation.interrogator in KNOWN_INTERROGATORS.__members__
69+
or single_generation.interrogator in KNOWN_INTERROGATORS.__members__.values()
70+
)
6271
elif isinstance(single_generation, CaptionAlchemyParameters):
6372
assert single_generation.form == KNOWN_ALCHEMY_FORMS.caption
64-
assert single_generation.caption_model in KNOWN_CAPTION_MODELS
73+
assert (
74+
single_generation.caption_model in KNOWN_CAPTION_MODELS.__members__
75+
or single_generation.caption_model in KNOWN_CAPTION_MODELS.__members__.values()
76+
)
6577
elif isinstance(single_generation, NSFWAlchemyParameters):
6678
assert single_generation.form == KNOWN_ALCHEMY_FORMS.nsfw
67-
assert single_generation.nsfw_detector in KNOWN_NSFW_DETECTOR
79+
assert (
80+
single_generation.nsfw_detector in KNOWN_NSFW_DETECTOR.__members__
81+
or single_generation.nsfw_detector in KNOWN_NSFW_DETECTOR.__members__.values()
82+
)
6883

6984

7085
def test_convert_alchemy_job_pop_response_to_parameters_interrogate(

0 commit comments

Comments
 (0)