chore: maintain homebrew tap as well as homebrew core formulas

Signed-off-by: Taylor Price <[email protected]>

Author: drpebcak

.github/workflows/release.yaml

@@ -40,6 +40,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_PROJECT_TOKEN: ${{ secrets.GH_PROJECT_TOKEN }}
           GORELEASER_CURRENT_TAG: ${{ github.ref_name }}
+  homebrew-release:
+    needs: release-tag
+    if: "! contains(github.ref_name, '-rc')"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update Homebrew formula
+        uses: dawidd6/action-homebrew-bump-formula@v3
+        with:
+          token: ${{secrets.BREW_GH_TOKEN}}
+          formula: gptscript
   winget-release:
     needs: release-tag
     if: "! contains(github.ref_name, '-rc')"

.goreleaser.yml

@@ -52,13 +52,14 @@ release:
   prerelease: auto
 
 brews:
-  - description: "GPTScript CLI"
+  - name: gptscript
+    description: "GPTScript CLI"
     install: |
       bin.install "gptscript"
-      generate_completions_from_executable(bin/"gptscript", "completion", shells: [:bash, :zsh, :fish])
+      generate_completions_from_executable(bin/"gptscript", "completion")
     homepage: "https://github.com/gptscript-ai/gptscript"
     skip_upload: false
-    folder: "Formula"
+    directory: "Formula"
     repository:
       owner: gptscript-ai
       name: homebrew-tap

docs/docs/01-overview.md

@@ -21,10 +21,21 @@ Here are some sample use cases of GPTScript:
 
 <Tabs>
     <TabItem value="MacOS and Linux (Homebrew)">
+    ## Homebrew Tap
+___
     ```shell
     brew install gptscript-ai/tap/gptscript 
     gptscript github.com/gptscript-ai/llm-basics-demo
     ```
+    ## Homebrew
+___
+:::warning
+The [formula in homebrew-core](https://github.com/Homebrew/homebrew-core/blob/master/Formula/g/gptscript.rb) might be slightly outdated. Use our homebrew tap to always get the latest updates.
+:::
+    ```
+    brew install gptscript
+    gptscript github.com/gptscript-ai/llm-basics-demo
+    ```
     </TabItem>
     <TabItem value="MacOS and Linux (install.sh)">
     ```shell

examples/gptreview.gpt

@@ -0,0 +1,28 @@
+    Name: Code Reviewer
+    Description: A tool to help you perform code review of open PRs
+    Context: learn-gh
+    Tools: sys.exec, sys.http.html2text?, sys.find, sys.read, sys.write
+    Args: PR_URL: The GitHub PR_URL
+    chat:true
+
+    You have the gh cli available to you. Use it to perform code review for a pr.
+
+    Perform the following steps in order:
+    1. Ask the user for the ($PR_URL) and save it.
+    2. Identify the files changed in the pull request ($PR_URL) using the pr number and perform a diff.
+        1. Analyze the complete code of each identified file and perform a detailed line by line code review.
+        2. Repeat the process for each changed file in the pr.
+    3. Share your review comments separately for each file.
+    4. In a new line write "Code: Approved" or "Code: Require Changes" based on the review.
+    ---
+    Name: learn-gh
+    Description: A tool to help you learn gh cli
+
+    #!/usr/bin/env bash
+
+    echo "The following is the help text for the gh cli and some of its sub-commands. Use these when figuring out how to construct new commands.  Note that the --search flag is used for filtering and sorting as well; there is no dedicated --sort flag."
+    gh --help
+    gh repo --help
+    gh pr --help
+    gh pr checkout --help
+    gh pr diff --help

pkg/engine/engine.go

@@ -207,6 +207,11 @@ func NewContext(ctx context.Context, prg *types.Program, input string) (Context,
 	}
 
 	callCtx.AgentGroup = agentGroup
+
+	if callCtx.Tool.IsAgentsOnly() && len(callCtx.AgentGroup) > 0 {
+		callCtx.Tool = callCtx.Program.ToolSet[callCtx.AgentGroup[0].ToolID]
+	}
+
 	return callCtx, nil
 }
 

pkg/input/input.go

@@ -3,10 +3,12 @@ package input
 import (
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/gptscript-ai/gptscript/internal"
 	"github.com/gptscript-ai/gptscript/pkg/loader"
 	"github.com/gptscript-ai/gptscript/pkg/types"
 )
@@ -33,7 +35,7 @@ func FromFile(file string) (string, error) {
 		}
 		return string(data), nil
 	} else if file != "" {
-		if s, err := os.Stat(file); err == nil && s.IsDir() {
+		if s, err := fs.Stat(internal.FS, file); err == nil && s.IsDir() {
 			for _, ext := range types.DefaultFiles {
 				if _, err := os.Stat(filepath.Join(file, ext)); err == nil {
 					file = filepath.Join(file, ext)
@@ -42,7 +44,7 @@ func FromFile(file string) (string, error) {
 			}
 		}
 		log.Debugf("reading file %s", file)
-		data, err := os.ReadFile(file)
+		data, err := fs.ReadFile(internal.FS, file)
 		if err != nil {
 			return "", fmt.Errorf("reading %s: %w", file, err)
 		}

pkg/parser/parser.go

@@ -199,6 +199,7 @@ func (c *context) finish(tools *[]Node) {
 		len(c.tool.GlobalTools) > 0 ||
 		len(c.tool.ExportInputFilters) > 0 ||
 		len(c.tool.ExportOutputFilters) > 0 ||
+		len(c.tool.Agents) > 0 ||
 		c.tool.Chat {
 		*tools = append(*tools, Node{
 			ToolNode: &ToolNode{

pkg/tests/runner_test.go

@@ -800,6 +800,26 @@ func TestExport(t *testing.T) {
 	assert.Equal(t, "TEST RESULT CALL: 3", x)
 }
 
+func TestAgentOnly(t *testing.T) {
+	r := tester.NewRunner(t)
+
+	prg, err := r.Load("")
+	require.NoError(t, err)
+
+	r.RespondWith(tester.Result{
+		Func: types.CompletionFunctionCall{
+			Name:      "agent2",
+			Arguments: "Agent 2 input",
+		},
+	})
+
+	resp, err := r.Chat(context.Background(), nil, prg, nil, "Input 1")
+	require.NoError(t, err)
+	r.AssertResponded(t)
+	assert.False(t, resp.Done)
+	autogold.Expect("TEST RESULT CALL: 2").Equal(t, resp.Content)
+	autogold.ExpectFile(t, toJSONString(t, resp), autogold.Name(t.Name()+"/step1"))
+}
 func TestAgents(t *testing.T) {
 	r := tester.NewRunner(t)
 

pkg/tests/testdata/TestAgentOnly/call1-resp.golden

@@ -0,0 +1,16 @@
+`{
+  "role": "assistant",
+  "content": [
+    {
+      "toolCall": {
+        "index": 0,
+        "id": "call_1",
+        "function": {
+          "name": "agent2",
+          "arguments": "Agent 2 input"
+        }
+      }
+    }
+  ],
+  "usage": {}
+}`

pkg/tests/testdata/TestAgentOnly/call1.golden

@@ -0,0 +1,42 @@
+`{
+  "model": "gpt-4o",
+  "internalSystemPrompt": false,
+  "tools": [
+    {
+      "function": {
+        "toolID": "testdata/TestAgentOnly/test.gpt:agent2",
+        "name": "agent2",
+        "parameters": {
+          "properties": {
+            "defaultPromptParameter": {
+              "description": "Prompt to send to the assistant. This may be an instruction or question.",
+              "type": "string"
+            }
+          },
+          "type": "object"
+        }
+      }
+    }
+  ],
+  "messages": [
+    {
+      "role": "system",
+      "content": [
+        {
+          "text": "I am agent1"
+        }
+      ],
+      "usage": {}
+    },
+    {
+      "role": "user",
+      "content": [
+        {
+          "text": "Input 1"
+        }
+      ],
+      "usage": {}
+    }
+  ],
+  "chat": true
+}`