pengjunjie/ragflow
1
0
Fork 1
mirror of https://github.com/infiniflow/ragflow.git synced 2025-12-08 20:42:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix exec sql exception issue. (#3982)

Browse Source 
### What problem does this PR solve?
#3978

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
Kevin Hu
2024-12-11 11:44:59 +08:00
committed by GitHub
parent 95259af68f
commit beeacd3e3f
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
agent/canvas.py
View File

@ -206,7 +206,12 @@ class Canvas(ABC):
waiting.append(c) waiting.append(c)
continue continue
yield "*'{}'* is running...🕞".format(self.get_compnent_name(c)) yield "*'{}'* is running...🕞".format(self.get_compnent_name(c))
ans = cpn.run(self.history, **kwargs) try:
ans = cpn.run(self.history, **kwargs)
except Exception as e:
logging.exception(f"Canvas.run got exception: {e}")
self.path[-1].append(c)
raise e
self.path[-1].append(c) self.path[-1].append(c)
ran += 1 ran += 1
@ -228,20 +233,12 @@ class Canvas(ABC):
switch_out = cpn["obj"].output()[1].iloc[0, 0] switch_out = cpn["obj"].output()[1].iloc[0, 0]
assert switch_out in self.components, \ assert switch_out in self.components, \
"{}'s output: {} not valid.".format(cpn_id, switch_out) "{}'s output: {} not valid.".format(cpn_id, switch_out)
try: for m in prepare2run([switch_out]):
for m in prepare2run([switch_out]): yield {"content": m, "running_status": True}
yield {"content": m, "running_status": True}
except Exception as e:
logging.exception("Canvas.run got exception")
raise e
continue continue
try: for m in prepare2run(cpn["downstream"]):
for m in prepare2run(cpn["downstream"]): yield {"content": m, "running_status": True}
yield {"content": m, "running_status": True}
except Exception as e:
logging.exception("Canvas.run got exception")
raise e
if ran >= len(self.path[-1]) and waiting: if ran >= len(self.path[-1]) and waiting:
without_dependent_checking = waiting without_dependent_checking = waiting

2
agent/component/exesql.py
View File

@ -64,7 +64,7 @@ class ExeSQL(ComponentBase, ABC):
self._loop += 1 self._loop += 1
ans = self.get_input() ans = self.get_input()
ans = "".join(ans["content"]) if "content" in ans else "" ans = "".join([str(a) for a in ans["content"]]) if "content" in ans else ""
ans = re.sub(r'^.*?SELECT ', 'SELECT ', repr(ans), flags=re.IGNORECASE) ans = re.sub(r'^.*?SELECT ', 'SELECT ', repr(ans), flags=re.IGNORECASE)
ans = re.sub(r';.*?SELECT ', '; SELECT ', ans, flags=re.IGNORECASE) ans = re.sub(r';.*?SELECT ', '; SELECT ', ans, flags=re.IGNORECASE)
ans = re.sub(r';[^;]*$', r';', ans) ans = re.sub(r';[^;]*$', r';', ans)