Skip to content

enhance: remove --ui option #708

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

Closed
wants to merge 2 commits into from
Closed

enhance: remove --ui option #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceed1e0
enhance: remove --ui option
njhale Aug 5, 2024
6966938
chore: remove ui dispatch from release workflow
njhale Aug 7, 2024
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
16 changes: 5 additions & 11 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ jobs:
release-tag:
runs-on: ubuntu-22.04
steps:
- name: trigger ui repo tag workflow
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ secrets.DISPATCH_PAT }}
repository: gptscript-ai/ui
event-type: release
client-payload: '{"tag": "${{ github.ref_name }}"}'
- name: Checkout
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -47,11 +40,11 @@ jobs:
steps:
- name: Install winget-create
run: |
Invoke-WebRequest -Uri 'https://aka.ms/wingetcreate/latest' -OutFile 'wingetcreate.exe'
Invoke-WebRequest -Uri 'https://aka.ms/wingetcreate/latest' -OutFile 'wingetcreate.exe'
- name: Create WinGet Package Update Pull Request
run: |
$url = "${{ github.server_url }}/${{ github.repository }}/releases/download/${{ github.ref_name }}/gptscript-${{ github.ref_name }}-windows-amd64.zip"
./wingetcreate.exe update --submit --token "${{ secrets.WINGET_GH_TOKEN }}" --urls $url --version "${{ github.ref_name }}" gptscript-ai.gptscript
$url = "${{ github.server_url }}/${{ github.repository }}/releases/download/${{ github.ref_name }}/gptscript-${{ github.ref_name }}-windows-amd64.zip"
./wingetcreate.exe update --submit --token "${{ secrets.WINGET_GH_TOKEN }}" --urls $url --version "${{ github.ref_name }}" gptscript-ai.gptscript
node-release:
needs: release-tag
runs-on: ubuntu-latest
Expand Down Expand Up @@ -84,4 +77,5 @@ jobs:
token: ${{ secrets.DISPATCH_PAT }}
repository: gptscript-ai/go-gptscript
event-type: release
client-payload: '{"tag": "${{ github.ref_name }}"}'
client-payload: '{"tag": "${{ github.ref_name }}"}'

1 change: 0 additions & 1 deletion docs/docs/04-command-line-reference/gptscript.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ gptscript [flags] PROGRAM_FILE [INPUT...]
-q, --quiet No output logging (set --quiet=false to force on even when there is no TTY) ($GPTSCRIPT_QUIET)
--save-chat-state-file string A file to save the chat state to so that a conversation can be resumed with --chat-state ($GPTSCRIPT_SAVE_CHAT_STATE_FILE)
--sub-tool string Use tool of this name, not the first tool in file ($GPTSCRIPT_SUB_TOOL)
--ui Launch the UI ($GPTSCRIPT_UI)
--workspace string Directory to use for the workspace, if specified it will not be deleted on exit ($GPTSCRIPT_WORKSPACE)
```

Expand Down
77 changes: 0 additions & 77 deletions pkg/cli/gptscript.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"
"io"
"os"
"path/filepath"
"sort"
"strconv"
"strings"
Expand All @@ -19,7 +18,6 @@ import (
"github.com/gptscript-ai/gptscript/pkg/builtin"
"github.com/gptscript-ai/gptscript/pkg/cache"
"github.com/gptscript-ai/gptscript/pkg/chat"
"github.com/gptscript-ai/gptscript/pkg/env"
"github.com/gptscript-ai/gptscript/pkg/gptscript"
"github.com/gptscript-ai/gptscript/pkg/input"
"github.com/gptscript-ai/gptscript/pkg/loader"
Expand Down Expand Up @@ -69,7 +67,6 @@ type GPTScript struct {
ForceChat bool `usage:"Force an interactive chat session if even the top level tool is not a chat tool" local:"true"`
ForceSequential bool `usage:"Force parallel calls to run sequentially" local:"true"`
Workspace string `usage:"Directory to use for the workspace, if specified it will not be deleted on exit"`
UI bool `usage:"Launch the UI" local:"true" name:"ui"`
DisableTUI bool `usage:"Don't use chat TUI but instead verbose output" local:"true" name:"disable-tui"`
SaveChatStateFile string `usage:"A file to save the chat state to so that a conversation can be resumed with --chat-state" local:"true"`
DefaultModelProvider string `usage:"Default LLM model provider to use, this will override OpenAI settings"`
Expand Down Expand Up @@ -142,7 +139,6 @@ func (r *GPTScript) NewGPTScriptOpts() (gptscript.Options, error) {
Env: os.Environ(),
CredentialContext: r.CredentialContext,
Workspace: r.Workspace,
DisablePromptServer: r.UI,
DefaultModelProvider: r.DefaultModelProvider,
}

Expand Down Expand Up @@ -334,61 +330,6 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
return err
}

// If the user is trying to launch the chat-builder UI, then set up the tool and options here.
if r.UI {
if os.Getenv(system.BinEnvVar) == "" {
gptOpt.Env = append(gptOpt.Env, system.BinEnvVar+"="+system.Bin())
}

// Pass the corrected environment variables for SDK server options
if r.DefaultModel != "" {
gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_DEFAULT_MODEL="+r.DefaultModel)
}
if len(r.CredentialOverride) > 0 {
gptOpt.Env = append(gptOpt.Env, "GPTSCRIPT_SDKSERVER_CREDENTIAL_OVERRIDE="+strings.Join(r.CredentialOverride, ","))
}

// If args has more than one element, then the user has provided a file.
if len(args) > 0 {
file := args[0]
if file == "-" {
return fmt.Errorf("chat UI only supports files, cannot read from stdin")
}

// If the file is external, then set the SCRIPTS_PATH to the current working directory. Otherwise,
// set it to the directory of the script and set the file to the base.
if !(strings.HasPrefix(file, "http://") || strings.HasPrefix(file, "https://") || strings.HasPrefix(file, "github.com")) {
absPathToScript, err := filepath.Abs(file)
if err != nil {
return fmt.Errorf("cannot determine absolute path to script %s: %v", file, err)
}
gptOpt.Env = append(gptOpt.Env, "SCRIPTS_PATH="+filepath.Dir(absPathToScript))
file = strings.TrimSuffix(filepath.Base(file), ".gpt")
} else {
cwd, err := os.Getwd()
if err != nil {
return fmt.Errorf("could not determine current working directory: %w", err)
}
gptOpt.Env = append(gptOpt.Env, "SCRIPTS_PATH="+cwd)
}

gptOpt.Env = append(gptOpt.Env, "UI_RUN_FILE="+file)
// Remove the file from args because the above line will pass it to the UI tool.
args = args[1:]
} else {
cwd, err := os.Getwd()
if err != nil {
return fmt.Errorf("could not determine current working directory: %w", err)
}
gptOpt.Env = append(gptOpt.Env, "SCRIPTS_PATH="+cwd)
}

// The UI must run in daemon mode.
r.Daemon = true
// Use the UI tool as the first argument.
args = append([]string{uiTool()}, args...)
}

ctx := cmd.Context()

gptScript, err := gptscript.New(ctx, gptOpt)
Expand Down Expand Up @@ -490,28 +431,10 @@ func (r *GPTScript) Run(cmd *cobra.Command, args []string) (retErr error) {
}, gptOpt.Env, toolInput, r.SaveChatStateFile)
}

if r.UI {
// If the UI is running, then all prompts should go through the SDK and the UI.
// Not clearing ExtraEnv here would mean that the prompts would go through the terminal.
gptScript.ExtraEnv = nil
}

s, err := gptScript.Run(cmd.Context(), prg, gptOpt.Env, toolInput)
if err != nil {
return err
}

return r.PrintOutput(toolInput, s)
}

// uiTool returns the versioned UI tool reference for the current GPTScript version.
// For release versions, a reference with a matching release tag is returned.
// For all other versions, a reference to main is returned.
func uiTool() string {
ref := "github.com/gptscript-ai/ui"
if tag := version.Tag; !strings.Contains(tag, "v0.0.0-dev") {
ref = fmt.Sprintf("%s@%s", ref, tag)
}

return env.VarOrDefault("GPTSCRIPT_CHAT_UI_TOOL", ref)
}