chore: bump go-gptscript (#5)

Signed-off-by: Grant Linville <[email protected]>

Author: g-linville

go.mod

@@ -3,16 +3,16 @@ module github.com/gptscript-ai/datasets
 go 1.23.2
 
 require (
-	github.com/gptscript-ai/go-gptscript v0.0.0-20241021182853-3901872ceda9
+	github.com/gptscript-ai/go-gptscript v0.9.6-0.20241023195750-c09e0f56b39b
 	github.com/stretchr/testify v1.9.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/getkin/kin-openapi v0.124.0 // indirect
-	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.8 // indirect
-	github.com/invopop/yaml v0.2.0 // indirect
+	github.com/getkin/kin-openapi v0.128.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/invopop/yaml v0.3.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect

go.sum

@@ -2,16 +2,26 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M=
 github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
+github.com/getkin/kin-openapi v0.128.0 h1:jqq3D9vC9pPq1dGcOCv7yOp1DaEe7c/T1vzcLbITSp4=
+github.com/getkin/kin-openapi v0.128.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM=
 github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
 github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
+github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/swag v0.22.8 h1:/9RjDSQ0vbFR+NyjGMkFTsA1IA0fmhKSThmfGZjicbw=
 github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI=
+github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
 github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
 github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/gptscript-ai/go-gptscript v0.0.0-20241021182853-3901872ceda9 h1:fFq2my3ZaBJ6Tde9v83ioyjotbEMYN3i3wmvNQWLWx8=
 github.com/gptscript-ai/go-gptscript v0.0.0-20241021182853-3901872ceda9/go.mod h1:/FVuLwhz+sIfsWUgUHWKi32qT0i6+IXlUlzs70KKt/Q=
+github.com/gptscript-ai/go-gptscript v0.9.6-0.20241023195750-c09e0f56b39b h1:EDd5OCtZ43YVSzKuQlXLiXCIQ6qhsrqLqY5Ows5ohlY=
+github.com/gptscript-ai/go-gptscript v0.9.6-0.20241023195750-c09e0f56b39b/go.mod h1:/FVuLwhz+sIfsWUgUHWKi32qT0i6+IXlUlzs70KKt/Q=
 github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=
 github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
+github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso=
+github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=

main.go

@@ -23,12 +23,6 @@ subcommands: listDatasets, listElements, getElement, createDataset, addElement
 env vars: GPTSCRIPT_WORKSPACE_DIR`)
 	}
 
-	workspace := os.Getenv("GPTSCRIPT_WORKSPACE_DIR")
-	if workspace == "" {
-		fmt.Println("missing GPTSCRIPT_WORKSPACE_DIR")
-		os.Exit(1)
-	}
-
 	switch os.Args[1] {
 	case "listDatasets":
 		tools.ListDatasets()

pkg/dataset/manager.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"crypto/rand"
 	"encoding/json"
+	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/gptscript-ai/go-gptscript"
 )
@@ -95,7 +95,7 @@ func (m *Manager) GetDataset(ctx context.Context, id string) (Dataset, error) {
 		WorkspaceID: m.workspaceID,
 	})
 	if err != nil {
-		if strings.Contains(strings.ToLower(err.Error()), "not found") {
+		if isNotFoundInWorkspaceError(err) {
 			return Dataset{}, fmt.Errorf("dataset %s not found", id)
 		}
 		return Dataset{}, fmt.Errorf("failed to read dataset file: %w", err)
@@ -119,10 +119,15 @@ func (m *Manager) EnsureUniqueElementFilename(ctx context.Context, datasetID, na
 		}); err == nil {
 			counter++
 			uniqueName = fmt.Sprintf("%s_%d", name, counter)
-		} else if !strings.Contains(strings.ToLower(err.Error()), "not found") {
+		} else if isNotFoundInWorkspaceError(err) {
 			return "", fmt.Errorf("failed to check if file exists: %w", err)
 		} else {
 			return datasetFolder + "/" + datasetID + "/" + uniqueName, nil
 		}
 	}
 }
+
+func isNotFoundInWorkspaceError(err error) bool {
+	var notFoundErr *gptscript.NotFoundInWorkspaceError
+	return errors.As(err, &notFoundErr)
+}