mirror of
https://github.com/langgenius/dify.git
synced 2026-05-05 09:58:04 +08:00
Merge branch 'main' into feat/new-login
* main: (64 commits) chore: Enable Japanese descriptions for Tools (#8646) Make WORKFLOW_* configurable as environment variables. (#8644) feat: add deepseek-v2.5 for model provider siliconflow (#8639) docs: fix predefined_model_scale_out.md redirect error (#8633) feat: add qwen2.5 for model provider siliconflow (#8630) fix: send message error when chatting with opening statement (#8627) fix: llm_generator.py JSONDecodeError (#8504) fix: commands.py (#8483) fix: redundant check for available_document_count (#8491) chore: enhance configuration descriptions (#8624) chore: add Gemini newest experimental models (close #7121) (#8621) feat: support o1 series models for openrouter (#8358) fix: form input add tabIndex (#8478) Add model parameter translation (#8509) feat(tools/cogview): Updated cogview tool to support cogview-3 and the latest cogview-3-plus (#8382) Add Fireworks AI as new model provider (#8428) feat:use xinference tts stream mode (#8616) docs: Add Japanese documentation for tools (#8469) feat: regenerate in `Chat`, `agent` and `Chatflow` app (#7661) feat: update pyproject.toml (#8368) ...
This commit is contained in:
@ -109,6 +109,7 @@ class ChatMessageApi(Resource):
|
||||
parser.add_argument("files", type=list, required=False, location="json")
|
||||
parser.add_argument("model_config", type=dict, required=True, location="json")
|
||||
parser.add_argument("conversation_id", type=uuid_value, location="json")
|
||||
parser.add_argument("parent_message_id", type=uuid_value, required=False, location="json")
|
||||
parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
|
||||
parser.add_argument("retriever_from", type=str, required=False, default="dev", location="json")
|
||||
args = parser.parse_args()
|
||||
|
||||
@ -105,8 +105,6 @@ class ChatMessageListApi(Resource):
|
||||
if rest_count > 0:
|
||||
has_more = True
|
||||
|
||||
history_messages = list(reversed(history_messages))
|
||||
|
||||
return InfiniteScrollPagination(data=history_messages, limit=args["limit"], has_more=has_more)
|
||||
|
||||
|
||||
|
||||
@ -166,6 +166,8 @@ class AdvancedChatDraftWorkflowRunApi(Resource):
|
||||
parser.add_argument("query", type=str, required=True, location="json", default="")
|
||||
parser.add_argument("files", type=list, location="json")
|
||||
parser.add_argument("conversation_id", type=uuid_value, location="json")
|
||||
parser.add_argument("parent_message_id", type=uuid_value, required=False, location="json")
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
try:
|
||||
|
||||
@ -100,6 +100,7 @@ class ChatApi(InstalledAppResource):
|
||||
parser.add_argument("query", type=str, required=True, location="json")
|
||||
parser.add_argument("files", type=list, required=False, location="json")
|
||||
parser.add_argument("conversation_id", type=uuid_value, location="json")
|
||||
parser.add_argument("parent_message_id", type=uuid_value, required=False, location="json")
|
||||
parser.add_argument("retriever_from", type=str, required=False, default="explore_app", location="json")
|
||||
args = parser.parse_args()
|
||||
|
||||
|
||||
@ -51,7 +51,7 @@ class MessageListApi(InstalledAppResource):
|
||||
|
||||
try:
|
||||
return MessageService.pagination_by_first_id(
|
||||
app_model, current_user, args["conversation_id"], args["first_id"], args["limit"]
|
||||
app_model, current_user, args["conversation_id"], args["first_id"], args["limit"], "desc"
|
||||
)
|
||||
except services.errors.conversation.ConversationNotExistsError:
|
||||
raise NotFound("Conversation Not Exists.")
|
||||
|
||||
Reference in New Issue
Block a user