mirror of
https://github.com/M66B/FairEmail.git
synced 2024-12-25 01:06:04 +00:00
OpenAI: added failsafe
This commit is contained in:
parent
0244ef3f82
commit
edaedbfe7d
1 changed files with 5 additions and 5 deletions
|
@ -274,15 +274,17 @@ public class OpenAI {
|
|||
while (start < ssb.length()) {
|
||||
int end = ssb.nextSpanTransition(start, ssb.length(), ImageSpanEx.class);
|
||||
String text = ssb.subSequence(start, end).toString();
|
||||
Log.i("OpenAI content " + start + "..." + end + " text=" + text.replace('\n', '|'));
|
||||
contents.add(new OpenAI.Content(OpenAI.CONTENT_TEXT, text));
|
||||
if (end < ssb.length()) {
|
||||
ImageSpanEx[] spans = ssb.getSpans(end, end, ImageSpanEx.class);
|
||||
if (spans.length == 1) {
|
||||
Log.i("OpenAI images=" + (spans == null ? null : spans.length));
|
||||
if (spans != null && spans.length == 1) {
|
||||
int e = ssb.getSpanEnd(spans[0]);
|
||||
|
||||
if (multimodal) {
|
||||
String url = null;
|
||||
String src = spans[0].getSource();
|
||||
Log.i("OpenAI image url=" + src);
|
||||
if (src != null && src.startsWith("cid:")) {
|
||||
String cid = '<' + src.substring(4) + '>';
|
||||
EntityAttachment attachment = db.attachment().getAttachment(id, cid);
|
||||
|
@ -299,15 +301,13 @@ public class OpenAI {
|
|||
}
|
||||
} else
|
||||
url = src;
|
||||
|
||||
if (url != null)
|
||||
contents.add(new OpenAI.Content(OpenAI.CONTENT_IMAGE, url));
|
||||
}
|
||||
|
||||
end = e;
|
||||
}
|
||||
}
|
||||
start = end;
|
||||
start = (end > start ? end : start + 1);
|
||||
}
|
||||
|
||||
return contents.toArray(new OpenAI.Content[0]);
|
||||
|
|
Loading…
Reference in a new issue