Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SqlClient unhandled exceptions #501 #502

Merged
merged 1 commit into from
Dec 14, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions griptape/tools/sql_client/tool.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations
from typing import Optional
from attr import define, field
from griptape.artifacts import InfoArtifact, ListArtifact
from griptape.artifacts import InfoArtifact, ListArtifact, ErrorArtifact
from griptape.tools import BaseTool
from griptape.utils.decorators import activity
from griptape.loaders import SqlLoader
Expand Down Expand Up @@ -38,9 +38,12 @@ def table_schema(self) -> str:
"schema": Schema({"sql_query": str}),
}
)
def execute_query(self, params: dict) -> ListArtifact | InfoArtifact:
query = params["values"]["sql_query"]
rows = self.sql_loader.load(query)
def execute_query(self, params: dict) -> ListArtifact | InfoArtifact | ErrorArtifact:
try:
query = params["values"]["sql_query"]
rows = self.sql_loader.load(query)
except Exception as e:
return ErrorArtifact(f"error executing query: {e}")

if len(rows) > 0:
return ListArtifact(rows)
Expand Down