Skip to content

Commit be45a61

Browse files
committed
Add template parameter to support Age detetection
- Add template parameter support to image captioning in base.py - Fix template vs prompt logic (exclude prompt when template is used) - Fix exception handling in utils.py to prevent BaseException errors
1 parent 5917b7b commit be45a61

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

runware/base.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -589,17 +589,23 @@ async def _requestImageToText(
589589
# Multiple images - use inputImages parameter
590590
task_params["inputImages"] = uploaded_images
591591

592-
# Add prompt parameter (array of strings)
593-
task_params["prompt"] = requestImageToText.prompt
594-
595592
# Add model parameter only if specified - backend handles default
596593
if requestImageToText.model is not None:
597594
task_params["model"] = requestImageToText.model
598595

596+
# Add template parameter if specified
597+
if requestImageToText.template is not None:
598+
task_params["template"] = requestImageToText.template
599+
# When using template, do NOT include prompt parameter
600+
else:
601+
# Use the provided prompt when no template
602+
task_params["prompt"] = requestImageToText.prompt
603+
599604
# Add optional parameters if they are provided
600605
if requestImageToText.includeCost:
601606
task_params["includeCost"] = requestImageToText.includeCost
602607

608+
603609
# Send the task with all applicable parameters
604610
await self.send([task_params])
605611

runware/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,11 @@ def safe_reject(error):
654654
nonlocal iteration_resolved, iteration_error
655655
if not iteration_resolved:
656656
iteration_resolved = True
657-
iteration_error = error
657+
# Ensure error is a proper exception fixes TypeError: exceptions must derive from BaseException
658+
if isinstance(error, BaseException):
659+
iteration_error = error
660+
else:
661+
iteration_error = Exception(str(error))
658662

659663
try:
660664
callback_returned = callback(safe_resolve, safe_reject, interval_handle)

0 commit comments

Comments
 (0)