Skip to content

Commit

Permalink
Fixs for translation agent (#3557)
Browse files Browse the repository at this point in the history
### What problem does this PR solve?

#3556 

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
- [x] New Feature (non-breaking change which adds functionality)
  • Loading branch information
KevinHuSh authored Nov 21, 2024
1 parent d47ee88 commit 30f111e
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 4 deletions.
10 changes: 7 additions & 3 deletions agent/component/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,10 +385,14 @@ def __str__(self):
"""
return """{{
"component_name": "{}",
"params": {}
"params": {},
"output": {},
"inputs": {}
}}""".format(self.component_name,
self._param
)
self._param,
json.dumps(json.loads(str(self._param))["output"], ensure_ascii=False),
json.dumps(json.loads(str(self._param))["inputs"], ensure_ascii=False)
)

def __init__(self, canvas, id, param: ComponentParamBase):
self._canvas = canvas
Expand Down
85 changes: 85 additions & 0 deletions agent/component/template.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
#
# Copyright 2024 The InfiniFlow Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import re
from agent.component.base import ComponentBase, ComponentParamBase


class TemplateParam(ComponentParamBase):
"""
Define the Generate component parameters.
"""

def __init__(self):
super().__init__()
self.content = ""
self.parameters = []

def check(self):
self.check_empty(self.content, "[Template] Content")
return True


class Template(ComponentBase):
component_name = "Template"

def get_dependent_components(self):
cpnts = set([para["component_id"].split("@")[0] for para in self._param.parameters \
if para.get("component_id") \
and para["component_id"].lower().find("answer") < 0 \
and para["component_id"].lower().find("begin") < 0])
return list(cpnts)

def _run(self, history, **kwargs):
content = self._param.content

self._param.inputs = []
for para in self._param.parameters:
if not para.get("component_id"): continue
component_id = para["component_id"].split("@")[0]
if para["component_id"].lower().find("@") >= 0:
cpn_id, key = para["component_id"].split("@")
for p in self._canvas.get_component(cpn_id)["obj"]._param.query:
if p["key"] == key:
kwargs[para["key"]] = p.get("value", "")
self._param.inputs.append(
{"component_id": para["component_id"], "content": kwargs[para["key"]]})
break
else:
assert False, f"Can't find parameter '{key}' for {cpn_id}"
continue

cpn = self._canvas.get_component(component_id)["obj"]
if cpn.component_name.lower() == "answer":
hist = self._canvas.get_history(1)
if hist:
hist = hist[0]["content"]
else:
hist = ""
kwargs[para["key"]] = hist
continue

_, out = cpn.output(allow_partial=False)
if "content" not in out.columns:
kwargs[para["key"]] = ""
else:
kwargs[para["key"]] = " - "+"\n - ".join([o if isinstance(o, str) else str(o) for o in out["content"]])
self._param.inputs.append({"component_id": para["component_id"], "content": kwargs[para["key"]]})

for n, v in kwargs.items():
content = re.sub(r"\{%s\}" % re.escape(n), re.escape(str(v)), content)

return Template.be_output(content)

5 changes: 4 additions & 1 deletion api/apps/canvas_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ def sse():
try:
for ans in canvas.run(stream=True):
if ans.get("running_status"):
yield "data:" + json.dumps({"code": 0, "message": "", "data": ans}, ensure_ascii=False) + "\n\n"
yield "data:" + json.dumps({"code": 0, "message": "",
"data": {"answer": ans["content"],
"running_status": True}},
ensure_ascii=False) + "\n\n"
continue
for k in ans.keys():
final_ans[k] = ans[k]
Expand Down
1 change: 1 addition & 0 deletions api/apps/user_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ def user_register(user_id, user):
"model_type": llm.model_type,
"api_key": settings.API_KEY,
"api_base": settings.LLM_BASE_URL,
"max_tokens": llm.max_tokens
}
)

Expand Down

0 comments on commit 30f111e

Please sign in to comment.