Skip to content

Commit

Permalink
feat: add suffix ordinals (lllyasviel#845)
Browse files Browse the repository at this point in the history
* add suffix ordinals with lambda

* delay importing of modules.config (lllyasviel#2195)

* refactor: use easier to read version to find matching ordinal suffix

---------

Co-authored-by: rsl8 <138326583+rsl8@users.noreply.github.com>
Co-authored-by: Manuel Schmid <manuel.schmid@odt.net>
Co-authored-by: Manuel Schmid <9307310+mashb1t@users.noreply.github.com>
  • Loading branch information
4 people committed Feb 10, 2024
1 parent b9d7e77 commit eb3f4d7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 2 additions & 3 deletions modules/async_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def worker():
from modules.private_logger import log
from extras.expansion import safe_str
from modules.util import remove_empty_str, HWC3, resize_image, \
get_image_shape_ceil, set_image_shape_ceil, get_shape_ceil, resample_image, erode_or_dilate
get_image_shape_ceil, set_image_shape_ceil, get_shape_ceil, resample_image, erode_or_dilate, ordinal_suffix
from modules.upscaler import perform_upscale

try:
Expand Down Expand Up @@ -732,8 +732,7 @@ def callback(step, x0, x, total_steps, y):
done_steps = current_task_id * steps + step
async_task.yields.append(['preview', (
int(15.0 + 85.0 * float(done_steps) / float(all_steps)),
f'Step {step}/{total_steps} in the {current_task_id + 1}-th Sampling',
y)])
f'Step {step}/{total_steps} in the {current_task_id + 1}{ordinal_suffix(current_task_id + 1)} Sampling', y)])

for current_task_id, task in enumerate(tasks):
execution_start_time = time.perf_counter()
Expand Down
4 changes: 4 additions & 0 deletions modules/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,7 @@ def get_files_from_folder(folder_path, exensions=None, name_filter=None):
filenames.append(path)

return filenames


def ordinal_suffix(number: int) -> str:
return 'th' if 10 <= number % 100 <= 20 else {1: 'st', 2: 'nd', 3: 'rd'}.get(number % 10, 'th')

0 comments on commit eb3f4d7

Please sign in to comment.