Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Create Llama
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
Create Llama
Commits
5ec1947d
Commit
5ec1947d
authored
1 month ago
by
leehuwuj
Browse files
Options
Downloads
Patches
Plain Diff
support request api
parent
cbebd031
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
templates/types/streaming/fastapi/app/api/routers/chat.py
+29
-22
29 additions, 22 deletions
templates/types/streaming/fastapi/app/api/routers/chat.py
templates/types/streaming/fastapi/app/api/routers/models.py
+0
-1
0 additions, 1 deletion
templates/types/streaming/fastapi/app/api/routers/models.py
with
29 additions
and
23 deletions
templates/types/streaming/fastapi/app/api/routers/chat.py
+
29
−
22
View file @
5ec1947d
import
json
import
logging
from
fastapi
import
APIRouter
,
BackgroundTasks
,
HTTPException
,
Request
,
status
from
llama_index.core.agent.workflow
import
AgentOutput
from
llama_index.core.llms
import
MessageRole
from
app.api.callbacks.llamacloud
import
LlamaCloudFileDownload
...
...
@@ -10,7 +12,6 @@ from app.api.routers.models import (
ChatData
,
Message
,
Result
,
SourceNodes
,
)
from
app.engine.engine
import
get_engine
from
app.engine.query_filter
import
generate_filters
...
...
@@ -58,27 +59,33 @@ async def chat(
)
from
e
# TODO: Update non-streaming endpoint
# Would be better if we use same chat.py endpoint for both agent and multiagent templates
# # non-streaming endpoint - delete if not needed
# @r.post("/request")
# async def chat_request(
# data: ChatData,
# ) -> Result:
# last_message_content = data.get_last_message_content()
# messages = data.get_history_messages()
# non-streaming endpoint - delete if not needed
@r.post
(
"
/request
"
)
async
def
chat_request
(
data
:
ChatData
,
)
->
Result
:
last_message_content
=
data
.
get_last_message_content
()
messages
=
data
.
get_history_messages
()
# doc_ids = data.get_chat_document_ids()
# filters = generate_filters(doc_ids)
# params = data.data or {}
# logger.info(
# f"Creating chat engine with filters: {str(filters)}",
# )
doc_ids
=
data
.
get_chat_document_ids
()
filters
=
generate_filters
(
doc_ids
)
params
=
data
.
data
or
{}
logger
.
info
(
f
"
Creating chat engine with filters:
{
str
(
filters
)
}
"
,
)
engine
=
get_engine
(
filters
=
filters
,
params
=
params
)
# chat_engine = get_chat_engine(filters=filters, params=params)
response
=
await
engine
.
run
(
user_msg
=
last_message_content
,
chat_history
=
messages
,
stream
=
False
,
)
output
=
response
if
isinstance
(
output
,
AgentOutput
):
content
=
output
.
response
.
content
else
:
content
=
json
.
dumps
(
output
)
# response = await chat_engine.achat(last_message_content, messages)
# return Result(
# result=Message(role=MessageRole.ASSISTANT, content=response.response),
# nodes=SourceNodes.from_source_nodes(response.source_nodes),
# )
return
Result
(
result
=
Message
(
role
=
MessageRole
.
ASSISTANT
,
content
=
content
),
)
This diff is collapsed.
Click to expand it.
templates/types/streaming/fastapi/app/api/routers/models.py
+
0
−
1
View file @
5ec1947d
...
...
@@ -317,7 +317,6 @@ class SourceNodes(BaseModel):
class
Result
(
BaseModel
):
result
:
Message
nodes
:
List
[
SourceNodes
]
class
ChatConfig
(
BaseModel
):
...
...
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