Merge pull request #3 from thedadams/metadata-testing

feat: add prompt metadata field

Author: thedadams

go.mod

@@ -1,10 +1,10 @@
 module gateway-oauth2
 
-go 1.22.4
+go 1.23.0
 
 require (
 	github.com/adrg/xdg v0.4.0
-	github.com/gptscript-ai/go-gptscript v0.9.2
+	github.com/gptscript-ai/go-gptscript v0.9.5-rc3.0.20240820135702-14a861da41fa
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
 )
 

go.sum

@@ -11,8 +11,8 @@ github.com/go-openapi/swag v0.22.8 h1:/9RjDSQ0vbFR+NyjGMkFTsA1IA0fmhKSThmfGZjicb
 github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI=
 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.9.2 h1:mrHCma/AeZqpRU0pvNHYU/TKm86NAi1F1tWe7Ys8zxk=
-github.com/gptscript-ai/go-gptscript v0.9.2/go.mod h1:Dh6vYRAiVcyC3ElZIGzTvNF1FxtYwA07BHfSiFKQY7s=
+github.com/gptscript-ai/go-gptscript v0.9.5-rc3.0.20240820135702-14a861da41fa h1:4UuWK7OYpThPoT8U9kFqmR26mmcvMc/UfH7O4MajPT8=
+github.com/gptscript-ai/go-gptscript v0.9.5-rc3.0.20240820135702-14a861da41fa/go.mod h1:hOfEt4oCiY/kiSHBm8ywnzFvEk/mWhv1h3yjZxui37U=
 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/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=

main.go

@@ -10,8 +10,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"os/signal"
-	"syscall"
+	"strings"
 	"time"
 
 	"github.com/adrg/xdg"
@@ -152,9 +151,6 @@ func main() {
 		return
 	}
 
-	sigCtx, cancel := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGKILL)
-	defer cancel()
-
 	state, err := generateString()
 	if err != nil {
 		fmt.Printf("failed to generate state: %v\n", err)
@@ -194,86 +190,96 @@ func main() {
 		os.Exit(1)
 	}
 
-	sysPromptInput := fmt.Sprintf(`{"message":%q,"fields":""}`, fmt.Sprintf("Opening browser to %s. If there is an issue, paste this link into a browser manually.", u.String()))
+	metadata := map[string]string{
+		"toolContext":     "credential",
+		"toolDisplayName": fmt.Sprintf("%s%s Integration", strings.ToTitle(integration[:1]), integration[1:]),
+		"authURL":         u.String(),
+	}
+
+	b, err := json.Marshal(metadata)
+	if err != nil {
+		fmt.Printf("failed to marshal metadata: %v\n", err)
+		os.Exit(1)
+	}
 
 	run, err := gs.Run(context.Background(), "sys.prompt", gptscript.Options{
-		Input: sysPromptInput,
+		Input: fmt.Sprintf(`{"metadata":%s,"message":%q}`, b, fmt.Sprintf("Opening browser to %s. If there is an issue, paste this link into a browser manually.", u.String())),
 	})
 	if err != nil {
 		fmt.Printf("failed to run sys.prompt: %v\n", err)
 		os.Exit(1)
 	}
 
-	if _, err = run.Text(); err != nil {
+	out, err := run.Text()
+	if err != nil {
 		fmt.Printf("failed to get text: %v\n", err)
 		os.Exit(1)
 	}
 
-	// Open the user's browser so that they can authorize the app.
-	_ = browser.OpenURL(u.String())
+	var m map[string]string
+	_ = json.Unmarshal([]byte(out), &m)
+
+	if m["handled"] != "true" {
+		// Open the user's browser so that they can authorize the app.
+		_ = browser.OpenURL(u.String())
+	}
 
 	t := time.NewTicker(2 * time.Second)
-	for {
-		select {
-		case <-sigCtx.Done():
-			fmt.Println("canceled")
+	for range t.C {
+		// Construct the request to get the token from the gateway.
+		req, err := http.NewRequest("GET", tokenURL, nil)
+		if err != nil {
+			fmt.Printf("failed to create request: %v\n", err)
 			os.Exit(1)
-		case <-t.C:
-			// Construct the request to get the token from the gateway.
-			req, err := http.NewRequest("GET", tokenURL, nil)
-			if err != nil {
-				fmt.Printf("failed to create request: %v\n", err)
-				os.Exit(1)
-			}
-
-			q = req.URL.Query()
-			q.Set("state", state)
-			q.Set("verifier", verifier)
-			req.URL.RawQuery = q.Encode()
-
-			// Send the request to the gateway.
-			now := time.Now()
-			resp, err := http.DefaultClient.Do(req)
-			if err != nil {
-				fmt.Fprintf(os.Stderr, "failed to send request: %v\n", err)
-				continue
-			}
-
-			if resp.StatusCode != http.StatusOK {
-				fmt.Fprintf(os.Stderr, "unexpected status code: %d\n", resp.StatusCode)
-				continue
-			}
-
-			// Parse the response from the gateway.
-			var oauthResp oauthResponse
-			if err := json.NewDecoder(resp.Body).Decode(&oauthResp); err != nil {
-				fmt.Printf("failed to decode JSON: %v\n", err)
-				_ = resp.Body.Close()
-				os.Exit(1)
-			}
+		}
+
+		q = req.URL.Query()
+		q.Set("state", state)
+		q.Set("verifier", verifier)
+		req.URL.RawQuery = q.Encode()
+
+		// Send the request to the gateway.
+		now := time.Now()
+		resp, err := http.DefaultClient.Do(req)
+		if err != nil {
+			_, _ = fmt.Fprintf(os.Stderr, "failed to send request: %v\n", err)
+			continue
+		}
+
+		if resp.StatusCode != http.StatusOK {
+			_, _ = fmt.Fprintf(os.Stderr, "unexpected status code: %d\n", resp.StatusCode)
+			continue
+		}
+
+		// Parse the response from the gateway.
+		var oauthResp oauthResponse
+		if err := json.NewDecoder(resp.Body).Decode(&oauthResp); err != nil {
+			fmt.Printf("failed to decode JSON: %v\n", err)
 			_ = resp.Body.Close()
+			os.Exit(1)
+		}
+		_ = resp.Body.Close()
 
-			out := cred{
-				Env: map[string]string{
-					env: oauthResp.AccessToken,
-				},
-				RefreshToken: oauthResp.RefreshToken,
-			}
-
-			if oauthResp.ExpiresIn > 0 {
-				expiresAt := now.Add(time.Second * time.Duration(oauthResp.ExpiresIn))
-				out.ExpiresAt = &expiresAt
-			}
-
-			credJSON, err := json.Marshal(out)
-			if err != nil {
-				fmt.Printf("failed to marshal credential: %v\n", err)
-				os.Exit(1)
-			}
-
-			fmt.Print(string(credJSON))
-			os.Exit(0)
+		out := cred{
+			Env: map[string]string{
+				env: oauthResp.AccessToken,
+			},
+			RefreshToken: oauthResp.RefreshToken,
 		}
+
+		if oauthResp.ExpiresIn > 0 {
+			expiresAt := now.Add(time.Second * time.Duration(oauthResp.ExpiresIn))
+			out.ExpiresAt = &expiresAt
+		}
+
+		credJSON, err := json.Marshal(out)
+		if err != nil {
+			fmt.Printf("failed to marshal credential: %v\n", err)
+			os.Exit(1)
+		}
+
+		fmt.Print(string(credJSON))
+		os.Exit(0)
 	}
 }