Skip to content

Commit bf9b9bd

Browse files
committed
type check hardening
1 parent 9e64023 commit bf9b9bd

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

koboldcpp.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4262,6 +4262,8 @@ def sweep_media_from_messages(messages_array):
42624262
curr_content = message.get("content", None)
42634263
if isinstance(curr_content, list):
42644264
for item in curr_content:
4265+
if not isinstance(item, dict):
4266+
continue
42654267
if item.get("type") == "image_url":
42664268
url = item.get("image_url", {}).get("url", "")
42674269
if url.startswith("data:image"):
@@ -4485,20 +4487,21 @@ def transform_genparams(genparams, api_format, use_jinja):
44854487
elif isinstance(curr_content, list): #is an array
44864488
for item in curr_content:
44874489
if isinstance(item, dict):
4488-
if item['type']=="text":
4490+
item_type = item.get("type", "")
4491+
if item_type=="text":
44894492
messages_string += item['text']
4490-
elif item['type']=="image_url":
4493+
elif item_type=="image_url":
44914494
if 'image_url' in item and item['image_url'] and item['image_url']['url'] and item['image_url']['url'].startswith("data:image"):
44924495
images_added.append(item['image_url']['url'].split(",", 1)[1])
44934496
attachedimgid += 1
44944497
messages_string += f"\n(Attached Image {attachedimgid})\n"
4495-
elif item['type']=="image":
4498+
elif item_type=="image":
44964499
data = get_base64_from_media_data(item.get("data", ""))
44974500
if data:
44984501
images_added.append(data)
44994502
attachedimgid += 1
45004503
messages_string += f"\n(Attached Image {attachedimgid})\n"
4501-
elif item['type']=="input_audio":
4504+
elif item_type=="input_audio":
45024505
if 'input_audio' in item and item['input_audio'] and item['input_audio']['data']:
45034506
audio_added.append(item['input_audio']['data'])
45044507
attachedaudid += 1

0 commit comments

Comments
 (0)