Skip to content

Commit 6bd27e9

Browse files
author
liq
committed
add: inputs_reload参数,支持输入重载
1 parent 1434d8a commit 6bd27e9

File tree

10 files changed

+21
-3
lines changed

10 files changed

+21
-3
lines changed

api/controllers/console/app/completion.py

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class CompletionMessageApi(Resource):
4444
def post(self, app_model):
4545
parser = reqparse.RequestParser()
4646
parser.add_argument("inputs", type=dict, required=True, location="json")
47+
parser.add_argument("inputs_reload", type=bool, required=False, default=False, location="json")
4748
parser.add_argument("query", type=str, location="json", default="")
4849
parser.add_argument("files", type=list, required=False, location="json")
4950
parser.add_argument("model_config", type=dict, required=True, location="json")
@@ -105,6 +106,7 @@ class ChatMessageApi(Resource):
105106
def post(self, app_model):
106107
parser = reqparse.RequestParser()
107108
parser.add_argument("inputs", type=dict, required=True, location="json")
109+
parser.add_argument("inputs_reload", type=bool, required=False, default=False, location="json")
108110
parser.add_argument("query", type=str, required=True, location="json")
109111
parser.add_argument("files", type=list, required=False, location="json")
110112
parser.add_argument("model_config", type=dict, required=True, location="json")

api/controllers/console/app/workflow.py

+1
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ def post(self, app_model: App):
163163

164164
parser = reqparse.RequestParser()
165165
parser.add_argument("inputs", type=dict, location="json")
166+
parser.add_argument("inputs_reload", type=bool, required=False, default=False, location="json")
166167
parser.add_argument("query", type=str, required=True, location="json", default="")
167168
parser.add_argument("files", type=list, location="json")
168169
parser.add_argument("conversation_id", type=uuid_value, location="json")

api/controllers/console/explore/completion.py

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def post(self, installed_app):
3737

3838
parser = reqparse.RequestParser()
3939
parser.add_argument("inputs", type=dict, required=True, location="json")
40+
parser.add_argument("inputs_reload", type=bool, required=False, default=False, location="json")
4041
parser.add_argument("query", type=str, location="json", default="")
4142
parser.add_argument("files", type=list, required=False, location="json")
4243
parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
@@ -97,6 +98,7 @@ def post(self, installed_app):
9798

9899
parser = reqparse.RequestParser()
99100
parser.add_argument("inputs", type=dict, required=True, location="json")
101+
parser.add_argument("inputs_reload", type=bool, required=False, default=False, location="json")
100102
parser.add_argument("query", type=str, required=True, location="json")
101103
parser.add_argument("files", type=list, required=False, location="json")
102104
parser.add_argument("conversation_id", type=uuid_value, location="json")

api/controllers/service_api/app/completion.py

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def post(self, app_model: App, end_user: EndUser):
3838

3939
parser = reqparse.RequestParser()
4040
parser.add_argument("inputs", type=dict, required=True, location="json")
41+
parser.add_argument("inputs_reload", type=bool, required=False, default=False, location="json")
4142
parser.add_argument("query", type=str, location="json", default="")
4243
parser.add_argument("files", type=list, required=False, location="json")
4344
parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
@@ -101,6 +102,7 @@ def post(self, app_model: App, end_user: EndUser):
101102

102103
parser = reqparse.RequestParser()
103104
parser.add_argument("inputs", type=dict, required=True, location="json")
105+
parser.add_argument("inputs_reload", type=bool, required=False, default=False, location="json")
104106
parser.add_argument("query", type=str, required=True, location="json")
105107
parser.add_argument("files", type=list, required=False, location="json")
106108
parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")

api/controllers/web/completion.py

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def post(self, app_model, end_user):
3636

3737
parser = reqparse.RequestParser()
3838
parser.add_argument("inputs", type=dict, required=True, location="json")
39+
parser.add_argument("inputs_reload", type=bool, required=False, default=False, location="json")
3940
parser.add_argument("query", type=str, location="json", default="")
4041
parser.add_argument("files", type=list, required=False, location="json")
4142
parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")
@@ -92,6 +93,7 @@ def post(self, app_model, end_user):
9293

9394
parser = reqparse.RequestParser()
9495
parser.add_argument("inputs", type=dict, required=True, location="json")
96+
parser.add_argument("inputs_reload", type=bool, required=False, default=False, location="json")
9597
parser.add_argument("query", type=str, required=True, location="json")
9698
parser.add_argument("files", type=list, required=False, location="json")
9799
parser.add_argument("response_mode", type=str, choices=["blocking", "streaming"], location="json")

api/core/app/apps/advanced_chat/app_generator.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ def generate(
6666

6767
query = query.replace('\x00', '')
6868
inputs = args['inputs']
69+
inputs_reload = args["inputs_reload"]
6970

7071
extras = {
7172
"auto_generate_conversation_name": args.get('auto_generate_name', False)
@@ -109,7 +110,7 @@ def generate(
109110
task_id=str(uuid.uuid4()),
110111
app_config=app_config,
111112
conversation_id=conversation.id if conversation else None,
112-
inputs=conversation.inputs if conversation else self._get_cleaned_inputs(inputs, app_config),
113+
inputs=conversation.inputs if conversation and not inputs_reload else self._get_cleaned_inputs(inputs, app_config),
113114
query=query,
114115
files=file_objs,
115116
user_id=user.id,

api/core/app/apps/agent_chat/app_generator.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def generate(self, app_model: App,
5555

5656
query = query.replace('\x00', '')
5757
inputs = args['inputs']
58+
inputs_reload = args["inputs_reload"]
5859

5960
extras = {
6061
"auto_generate_conversation_name": args.get('auto_generate_name', True)
@@ -119,7 +120,7 @@ def generate(self, app_model: App,
119120
app_config=app_config,
120121
model_conf=ModelConfigConverter.convert(app_config),
121122
conversation_id=conversation.id if conversation else None,
122-
inputs=conversation.inputs if conversation else self._get_cleaned_inputs(inputs, app_config),
123+
inputs=conversation.inputs if conversation and not inputs_reload else self._get_cleaned_inputs(inputs, app_config),
123124
query=query,
124125
files=file_objs,
125126
user_id=user.id,

api/core/app/apps/chat/app_generator.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def generate(
5353

5454
query = query.replace('\x00', '')
5555
inputs = args['inputs']
56+
inputs_reload = args["inputs_reload"]
5657

5758
extras = {
5859
"auto_generate_conversation_name": args.get('auto_generate_name', True)
@@ -116,7 +117,7 @@ def generate(
116117
app_config=app_config,
117118
model_conf=ModelConfigConverter.convert(app_config),
118119
conversation_id=conversation.id if conversation else None,
119-
inputs=conversation.inputs if conversation else self._get_cleaned_inputs(inputs, app_config),
120+
inputs=conversation.inputs if conversation and not inputs_reload else self._get_cleaned_inputs(inputs, app_config),
120121
query=query,
121122
files=file_objs,
122123
user_id=user.id,

web/app/components/develop/template/template_advanced_chat.zh.mdx

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ import { Row, Col, Properties, Property, Heading, SubProperty } from '../md.tsx'
4747
允许传入 App 定义的各变量值。
4848
inputs 参数包含了多组键值对(Key/Value pairs),每组的键对应一个特定变量,每组的值则是该变量的具体值。
4949
默认 `{}`
50+
</Property>
51+
<Property name='inputs_reload' type='bool' key='inputs_reload'>
52+
`定制化变量` 是否重载输入变量,默认 `false`
5053
</Property>
5154
<Property name='response_mode' type='string' key='response_mode'>
5255
- `streaming` 流式模式(推荐)。基于 SSE(**[Server-Sent Events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events)**)实现类似打字机输出方式的流式返回。

web/app/components/develop/template/template_chat.zh.mdx

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ import { Row, Col, Properties, Property, Heading, SubProperty } from '../md.tsx'
4747
允许传入 App 定义的各变量值。
4848
inputs 参数包含了多组键值对(Key/Value pairs),每组的键对应一个特定变量,每组的值则是该变量的具体值。
4949
默认 `{}`
50+
</Property>
51+
<Property name='inputs_reload' type='bool' key='inputs_reload'>
52+
`定制化变量` 是否重载输入变量,默认 `false`
5053
</Property>
5154
<Property name='response_mode' type='string' key='response_mode'>
5255
- `streaming` 流式模式(推荐)。基于 SSE(**[Server-Sent Events](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events)**)实现类似打字机输出方式的流式返回。

0 commit comments

Comments
 (0)