Refactoring openapi-spec to work

Author: scalvert

cmd/api.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -13,7 +12,7 @@ import (
 	"github.com/briandowns/spinner"
 	"github.com/scalvert/glean-cli/pkg/config"
 	"github.com/scalvert/glean-cli/pkg/http"
-	"github.com/scalvert/glean-cli/pkg/jsoncolor"
+	"github.com/scalvert/glean-cli/pkg/output"
 	"github.com/spf13/cobra"
 	"golang.org/x/term"
 )
@@ -139,22 +138,10 @@ func newApiCmd() *cobra.Command {
 				return err
 			}
 
-			if opts.raw || opts.noColor {
-				// For raw or no-color output, pretty print without colors
-				var prettyJSON bytes.Buffer
-				if err := json.Indent(&prettyJSON, resp, "", "  "); err != nil {
-					return fmt.Errorf("failed to format JSON response: %w", err)
-				}
-				fmt.Println(prettyJSON.String())
-				return nil
-			}
-
-			// Use colorized JSON output
-			if err := jsoncolor.Write(os.Stdout, bytes.NewReader(resp), "  "); err != nil {
-				return fmt.Errorf("failed to format JSON response: %w", err)
-			}
-
-			return nil
+			return output.Write(os.Stdout, resp, output.Options{
+				NoColor: opts.raw || opts.noColor,
+				Format:  "json",
+			})
 		},
 	}
 
@@ -204,17 +191,10 @@ func previewRequest(req *http.Request, noColor bool) error {
 			return fmt.Errorf("failed to format request body: %w", err)
 		}
 
-		if noColor {
-			var prettyJSON bytes.Buffer
-			if err := json.Indent(&prettyJSON, bodyBytes, "  ", "  "); err != nil {
-				return fmt.Errorf("failed to format request body: %w", err)
-			}
-			fmt.Println(prettyJSON.String())
-		} else {
-			if err := jsoncolor.Write(os.Stdout, bytes.NewReader(bodyBytes), "  "); err != nil {
-				return fmt.Errorf("failed to format request body: %w", err)
-			}
-		}
+		return output.Write(os.Stdout, bodyBytes, output.Options{
+			NoColor: noColor,
+			Format:  "json",
+		})
 	}
 
 	return nil

cmd/openapi_spec.go

@@ -1,13 +1,13 @@
 package cmd
 
 import (
-	"bufio"
 	"fmt"
+	"io"
 	"os"
-	"strings"
 
 	"github.com/MakeNowJust/heredoc"
 	"github.com/scalvert/glean-cli/pkg/llm"
+	"github.com/scalvert/glean-cli/pkg/output"
 	"github.com/spf13/cobra"
 )
 
@@ -16,89 +16,89 @@ var (
 	outputFile string
 	prompt     string
 	model      string
+	noColor    bool
 )
 
-var openapiSpecCmd = &cobra.Command{
-	Use:   "openapi-spec",
-	Short: "Generate an OpenAPI spec from an API definition or curl command",
-	Long: heredoc.Doc(`
-		This command reads an input (either stdin or a file) describing an API endpoint or
-		a curl command and generates an OpenAPI spec, simplifying the creation of Glean Actions.
-
-		Usage:
-		  # Generate from a file
-		  glean generate openapi-spec -f input.txt -o spec.yaml
-
-		  # Generate from stdin
-		  echo "curl example.com/api" | glean generate openapi-spec
-
-		  # Add custom instructions
-		  glean generate openapi-spec -f input.txt --prompt "Include rate limiting details"
-
-		Input Format:
-		  - A curl command
-		  - An API description in a simple format
-
-		Output:
-		  OpenAPI specification in YAML format
-	`),
-	SilenceUsage:  true,
-	SilenceErrors: true,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		var input string
-
-		if inputFile != "" {
-			data, err := os.ReadFile(inputFile)
-
-			if err != nil {
-				return fmt.Errorf("could not read file: %w", err)
+func newOpenapiSpecCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "openapi-spec",
+		Short: "Generate an OpenAPI spec from an API definition or curl command",
+		Long: heredoc.Doc(`
+			Generate an OpenAPI specification from an API definition or curl command.
+
+			The input can be provided via a file or through stdin:
+			  glean generate openapi-spec -f api.txt
+			  echo "curl example.com/api" | glean generate openapi-spec
+
+			The generated spec will be in YAML format and can be saved to a file:
+			  glean generate openapi-spec -f api.txt -o spec.yaml
+
+			Add custom instructions to guide the generation:
+			  glean generate openapi-spec -f api.txt --prompt "Include rate limiting details"
+
+			Use --no-color to disable colorized output.
+		`),
+		Example: heredoc.Doc(`
+			# Generate from a curl command
+			$ echo 'curl -X POST https://api.example.com/users \
+			  -H "Content-Type: application/json" \
+			  -d '"'"'{"name": "John", "email": "john@example.com"}'"'"'' | \
+			  glean generate openapi-spec
+
+			# Generate from a file with custom instructions
+			$ glean generate openapi-spec -f api.txt --prompt "Include authentication details"
+
+			# Save to a file
+			$ glean generate openapi-spec -f api.txt -o spec.yaml
+		`),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			var input []byte
+			var err error
+
+			if inputFile == "-" || inputFile == "" {
+				input, err = io.ReadAll(os.Stdin)
+				if err != nil {
+					return fmt.Errorf("failed to read from stdin: %w", err)
+				}
+				if len(input) == 0 {
+					return fmt.Errorf("no input provided")
+				}
+			} else {
+				input, err = os.ReadFile(inputFile)
+				if err != nil {
+					return fmt.Errorf("failed to read input file: %w", err)
+				}
 			}
-			input = string(data)
-		} else {
-			stat, _ := os.Stdin.Stat()
 
-			if (stat.Mode() & os.ModeCharDevice) != 0 {
-				return fmt.Errorf("no input found; please provide a file or pipe input to stdin")
-			}
-
-			scanner := bufio.NewScanner(os.Stdin)
-
-			var lines []string
-
-			for scanner.Scan() {
-				lines = append(lines, scanner.Text())
+			spec, err := llm.GenerateOpenAPISpec(string(input), prompt, model)
+			if err != nil {
+				return fmt.Errorf("failed to generate OpenAPI spec: %w", err)
 			}
 
-			if err := scanner.Err(); err != nil {
-				return fmt.Errorf("error reading input: %w", err)
+			if outputFile != "" {
+				if err := os.WriteFile(outputFile, []byte(spec), 0644); err != nil {
+					return fmt.Errorf("failed to write output file: %w", err)
+				}
+				fmt.Fprintf(cmd.OutOrStdout(), "OpenAPI spec written to %s\n", outputFile)
+				return nil
 			}
 
-			input = strings.Join(lines, "\n")
-		}
-
-		spec, err := llm.GenerateOpenAPISpec(input, prompt, model)
-		if err != nil {
-			return err
-		}
+			return output.WriteString(cmd.OutOrStdout(), spec, output.Options{
+				NoColor: noColor,
+				Format:  "yaml",
+			})
+		},
+	}
 
-		if outputFile != "" {
-			if err := os.WriteFile(outputFile, []byte(spec), 0600); err != nil {
-				return fmt.Errorf("failed to write output file: %w", err)
-			}
-			fmt.Printf("OpenAPI spec written to %s\n", outputFile)
-		} else {
-			fmt.Println(spec)
-		}
+	cmd.Flags().StringVarP(&inputFile, "file", "f", "", "Input file containing the API/curl command (use \"-\" for stdin)")
+	cmd.Flags().StringVarP(&outputFile, "output", "o", "", "Output file for the OpenAPI spec")
+	cmd.Flags().StringVarP(&prompt, "prompt", "p", "", "Additional instructions for the LLM")
+	cmd.Flags().StringVar(&model, "model", "gpt-4", "LLM model to use")
+	cmd.Flags().BoolVar(&noColor, "no-color", false, "Disable colorized output")
 
-		return nil
-	},
+	return cmd
 }
 
 func init() {
-	generateCmd.AddCommand(openapiSpecCmd)
-
-	openapiSpecCmd.Flags().StringVarP(&inputFile, "file", "f", "", "Input file containing the API/curl command")
-	openapiSpecCmd.Flags().StringVarP(&outputFile, "output", "o", "", "Output file for the OpenAPI spec (defaults to stdout)")
-	openapiSpecCmd.Flags().StringVarP(&prompt, "prompt", "p", "", "Additional instructions for the LLM")
-	openapiSpecCmd.Flags().StringVar(&model, "model", "gpt-4", "LLM model to use")
+	generateCmd.AddCommand(newOpenapiSpecCmd())
 }