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.

Sign up for GitHub

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

chore: update database tool names and install sqlite3 in the container image #1450

Merged
merged 1 commit into from
Jan 27, 2025
Merged

chore: update database tool names and install sqlite3 in the container image #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ENV PGDATA=/data/postgresql
COPY --from=build-pgvector /usr/lib/postgresql17/vector.so /usr/lib/postgresql17/
COPY --from=build-pgvector /usr/share/postgresql17/extension/vector* /usr/share/postgresql17/extension/

RUN apk add --no-cache git python-3.13 py3.13-pip npm bash tini procps libreoffice docker perl-utils
RUN apk add --no-cache git python-3.13 py3.13-pip npm bash tini procps libreoffice docker perl-utils sqlite sqlite-dev
COPY --chmod=0755 /tools/package-chrome.sh /

RUN /package-chrome.sh && rm /package-chrome.sh
Expand All @@ -56,6 +56,7 @@ COPY --from=bin /app/bin/obot /bin/
EXPOSE 22
# libreoffice executables
ENV PATH=$PATH:/usr/lib/libreoffice/program
ENV PATH=$PATH:/usr/bin
ENV HOME=/data
ENV XDG_CACHE_HOME=/data/cache
ENV OBOT_SERVER_AGENTS_DIR=/agents
Expand Down
11 changes: 5 additions & 6 deletions pkg/api/handlers/tables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package handlers

import (
"encoding/json"
"fmt"
"regexp"

"github.com/gptscript-ai/go-gptscript"
Expand All @@ -23,10 +22,10 @@ func NewTableHandler(gptScript *gptscript.GPTScript) *TableHandler {

func (t *TableHandler) tables(req api.Context, workspaceID string) (string, error) {
var toolRef v1.ToolReference
if err := req.Get(&toolRef, "database"); err != nil {
if err := req.Get(&toolRef, "database-ui"); err != nil {
return "", err
}
run, err := t.gptScript.Run(req.Context(), "List Database Tables from "+toolRef.Status.Reference, gptscript.Options{
run, err := t.gptScript.Run(req.Context(), "list_database_tables from "+toolRef.Status.Reference, gptscript.Options{
Workspace: workspaceID,
})
if err != nil {
Expand All @@ -38,16 +37,16 @@ func (t *TableHandler) tables(req api.Context, workspaceID string) (string, erro

func (t *TableHandler) rows(req api.Context, workspaceID, tableName string) (string, error) {
var toolRef v1.ToolReference
if err := req.Get(&toolRef, "database"); err != nil {
if err := req.Get(&toolRef, "database-ui"); err != nil {
return "", err
}
input, err := json.Marshal(map[string]string{
"query": fmt.Sprintf("SELECT * FROM '%s';", tableName),
"table": tableName,
})
if err != nil {
return "", err
}
run, err := t.gptScript.Run(req.Context(), "Run Database Query from "+toolRef.Status.Reference, gptscript.Options{
run, err := t.gptScript.Run(req.Context(), "list_database_table_rows from "+toolRef.Status.Reference, gptscript.Options{
Input: string(input),
Workspace: workspaceID,
})
Expand Down