Skip to content

Commit

Permalink
chore: update database tool names and install sqlite3 in the container
Browse files Browse the repository at this point in the history
image

Addresses part of #1448
Depends on obot-platform/tools#371

Signed-off-by: Nick Hale <4175918+njhale@users.noreply.github.com>
  • Loading branch information
njhale committed Jan 27, 2025
1 parent 687c8d8 commit 6717b19
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
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
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

0 comments on commit 6717b19

Please sign in to comment.