Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LlamaIndexTS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mirrored_repos
MachineLearning
run-llama
LlamaIndexTS
Commits
27eef246
Commit
27eef246
authored
1 year ago
by
Marcus Schiesser
Browse files
Options
Downloads
Patches
Plain Diff
feat: use context-generator for multi-modal messages
parent
1dabdbf7
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
packages/core/src/ChatEngine.ts
+53
-19
53 additions, 19 deletions
packages/core/src/ChatEngine.ts
with
53 additions
and
19 deletions
packages/core/src/ChatEngine.ts
+
53
−
19
View file @
27eef246
...
...
@@ -328,6 +328,17 @@ export class ContextChatEngine implements ChatEngine {
}
}
export
interface
MessageContentDetail
{
type
:
"
text
"
|
"
image_url
"
;
text
:
string
;
image_url
:
{
url
:
string
};
}
/**
* Extended type for the content of a message that allows for multi-modal messages.
*/
export
type
MessageContent
=
string
|
MessageContentDetail
[];
/**
* HistoryChatEngine is a ChatEngine that uses a `ChatHistory` object
* to keeps track of chat's message history.
...
...
@@ -347,38 +358,34 @@ export class HistoryChatEngine {
async
chat
<
T
extends
boolean
|
undefined
=
undefined
,
R
=
T
extends
true
?
AsyncGenerator
<
string
,
void
,
unknown
>
:
Response
,
>
(
message
:
any
,
chatHistory
:
ChatHistory
,
streaming
?:
T
):
Promise
<
R
>
{
>
(
message
:
MessageContent
,
chatHistory
:
ChatHistory
,
streaming
?:
T
,
):
Promise
<
R
>
{
//Streaming option
if
(
streaming
)
{
return
this
.
streamChat
(
message
,
chatHistory
)
as
R
;
}
const
context
=
await
this
.
contextGenerator
?.
generate
(
message
);
chatHistory
.
addMessage
({
content
:
message
,
role
:
"
user
"
,
});
const
response
=
await
this
.
llm
.
chat
(
await
chatHistory
.
requestMessages
(
context
?
[
context
.
message
]
:
undefined
,
),
const
requestMessages
=
await
this
.
prepareRequestMessages
(
message
,
chatHistory
,
);
const
response
=
await
this
.
llm
.
chat
(
requestMessages
);
chatHistory
.
addMessage
(
response
.
message
);
return
new
Response
(
response
.
message
.
content
)
as
R
;
}
protected
async
*
streamChat
(
message
:
any
,
message
:
MessageContent
,
chatHistory
:
ChatHistory
,
):
AsyncGenerator
<
string
,
void
,
unknown
>
{
const
context
=
await
this
.
contextGenerator
?.
generate
(
message
);
chatHistory
.
addMessage
({
content
:
message
,
role
:
"
user
"
,
});
const
requestMessages
=
await
this
.
prepareRequestMessages
(
message
,
chatHistory
,
);
const
response_stream
=
await
this
.
llm
.
chat
(
await
chatHistory
.
requestMessages
(
context
?
[
context
.
message
]
:
undefined
,
),
requestMessages
,
undefined
,
true
,
);
...
...
@@ -394,4 +401,31 @@ export class HistoryChatEngine {
});
return
;
}
private
async
prepareRequestMessages
(
message
:
MessageContent
,
chatHistory
:
ChatHistory
,
)
{
chatHistory
.
addMessage
({
content
:
message
,
role
:
"
user
"
,
});
let
requestMessages
;
let
context
;
if
(
this
.
contextGenerator
)
{
if
(
Array
.
isArray
(
message
))
{
// message is of type MessageContentDetail[] - retrieve just the text parts and concatenate them
// so we can pass them to the context generator
message
=
(
message
as
MessageContentDetail
[])
.
filter
((
c
)
=>
c
.
type
===
"
text
"
)
.
map
((
c
)
=>
c
.
text
)
.
join
(
"
\n\n
"
);
}
context
=
await
this
.
contextGenerator
.
generate
(
message
);
}
requestMessages
=
await
chatHistory
.
requestMessages
(
context
?
[
context
.
message
]
:
undefined
,
);
return
requestMessages
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment