Revert "Use context for HTTP timeouts rather than set at the client level, enabling robust cancelation and propagation"

This reverts commit 18ebbe2.

Author: danmrichards

cmd/account.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/runware/runware-cli/internal/api"
@@ -24,11 +25,8 @@ var accountCreditsCmd = &cobra.Command{
 			return api.ErrNoAPIKey
 		}
 
-		ctx, cancel := contextWithTimeout(cmd)
-		defer cancel()
-
 		client := api.NewClient(key, config.GetBaseURL(), flagVerbose)
-		result, err := client.AccountDetails(ctx)
+		result, err := client.AccountDetails(context.Background())
 		if err != nil {
 			if api.IsAuthError(err) {
 				output.Error("Authentication failed. Run 'runware auth login' to set your API key.")

cmd/audio_inference.go

@@ -150,11 +150,7 @@ func runAudioInference(cmd *cobra.Command, args []string) error {
 	}
 
 	client := api.NewClient(key, config.GetBaseURL(), flagVerbose)
-
-	ctx, cancel := contextWithTimeout(cmd)
-	defer cancel()
-
-	_, err := client.AudioInference(ctx, req)
+	_, err := client.AudioInference(context.Background(), req)
 	if err != nil {
 		if s != nil {
 			s.Stop()
@@ -177,7 +173,7 @@ func runAudioInference(cmd *cobra.Command, args []string) error {
 	var results []api.AudioInferenceResult
 
 	for time.Now().Before(deadline) {
-		rawData, err := client.GetResponse(ctx, taskUUID)
+		rawData, err := client.GetResponse(context.Background(), taskUUID)
 		if err != nil {
 			if flagVerbose {
 				fmt.Fprintf(os.Stderr, "Poll: %s\n", err) //nolint:errcheck,gosec

cmd/auth.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"bufio"
+	"context"
 	"fmt"
 	"os"
 	"strings"
@@ -49,9 +50,7 @@ var authLoginCmd = &cobra.Command{
 
 		// Validate key by pinging the API
 		client := api.NewClient(key, config.GetBaseURL(), flagVerbose)
-		ctx, cancel := contextWithTimeout(cmd)
-		defer cancel()
-		_, err := client.Ping(ctx)
+		_, err := client.Ping(context.Background())
 		if err != nil {
 			output.Error("Invalid API key. Authentication failed.")
 			return err
@@ -94,10 +93,8 @@ var authStatusCmd = &cobra.Command{
 		if key != "" {
 			maskedKey = config.MaskKey(key)
 			// Verify the key
-			ctx, cancel := contextWithTimeout(cmd)
-			defer cancel()
 			client := api.NewClient(key, config.GetBaseURL(), flagVerbose)
-			_, err := client.Ping(ctx)
+			_, err := client.Ping(context.Background())
 			if err != nil {
 				status = "invalid"
 			} else {

cmd/common.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -66,11 +67,8 @@ func runModelSearch(cmd *cobra.Command, args []string) error {
 		req.Offset = v
 	}
 
-	ctx, cancel := contextWithTimeout(cmd)
-	defer cancel()
-
 	client := api.NewClient(key, config.GetBaseURL(), flagVerbose)
-	result, err := client.ModelSearch(ctx, req)
+	result, err := client.ModelSearch(context.Background(), req)
 	if err != nil {
 		if api.IsAuthError(err) {
 			output.Error("Authentication failed. Run 'runware auth login' to set your API key.")

cmd/model_search.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -22,11 +23,8 @@ var pingCmd = &cobra.Command{
 
 		client := api.NewClient(key, config.GetBaseURL(), flagVerbose)
 
-		ctx, cancel := contextWithTimeout(cmd)
-		defer cancel()
-
 		start := time.Now()
-		_, err := client.Ping(ctx)
+		_, err := client.Ping(context.Background())
 		if err != nil {
 			if api.IsAuthError(err) {
 				output.Error("Authentication failed. Run 'runware auth login' to set your API key.")

cmd/ping.go

@@ -1,10 +1,8 @@
 package cmd
 
 import (
-	"context"
 	"fmt"
 	"os"
-	"time"
 
 	"github.com/runware/runware-cli/internal/config"
 	"github.com/spf13/cobra"
@@ -42,7 +40,6 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&flagFormat, "format", "", "Output format: table, json, yaml")
 	rootCmd.PersistentFlags().BoolVarP(&flagVerbose, "verbose", "v", false, "Show request/response details")
 	rootCmd.PersistentFlags().BoolVar(&flagDebug, "debug", false, "Show full debug output")
-	rootCmd.PersistentFlags().Int("request-timeout", defaultRequestTimeoutSeconds, "HTTP request timeout in seconds (0 = no timeout)")
 
 	rootCmd.RegisterFlagCompletionFunc("format", func(cmd *cobra.Command, args []string, toComplete string) ([]cobra.Completion, cobra.ShellCompDirective) { //nolint:errcheck,gosec
 		return []cobra.Completion{"table", "json", "yaml"}, cobra.ShellCompDirectiveNoFileComp
@@ -77,13 +74,3 @@ func getFormat() string {
 	}
 	return config.Get().Defaults.Format
 }
-
-// contextWithTimeout builds a context from the cobra command's context,
-// applying --request-timeout if set (0 = no timeout).
-func contextWithTimeout(cmd *cobra.Command) (context.Context, context.CancelFunc) {
-	secs, _ := cmd.Flags().GetInt("request-timeout")
-	if secs <= 0 {
-		return context.WithCancel(cmd.Context())
-	}
-	return context.WithTimeout(cmd.Context(), time.Duration(secs)*time.Second)
-}

cmd/root.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -147,11 +148,8 @@ func runTextInference(cmd *cobra.Command, args []string) error {
 		s.Start()
 	}
 
-	ctx, cancel := contextWithTimeout(cmd)
-	defer cancel()
-
 	client := api.NewClient(key, config.GetBaseURL(), flagVerbose)
-	results, err := client.TextInference(ctx, req)
+	results, err := client.TextInference(context.Background(), req)
 
 	if s != nil {
 		s.Stop()

cmd/text_inference.go

@@ -199,11 +199,7 @@ func runVideoInference(cmd *cobra.Command, args []string) error {
 	}
 
 	client := api.NewClient(key, config.GetBaseURL(), flagVerbose)
-
-	ctx, cancel := contextWithTimeout(cmd)
-	defer cancel()
-
-	submitResults, err := client.VideoInference(ctx, req)
+	submitResults, err := client.VideoInference(context.Background(), req)
 
 	if err != nil {
 		if s != nil {
@@ -231,7 +227,7 @@ func runVideoInference(cmd *cobra.Command, args []string) error {
 	var results []api.VideoInferenceResult
 
 	for time.Now().Before(deadline) {
-		rawData, err := client.GetResponse(ctx, taskUUID)
+		rawData, err := client.GetResponse(context.Background(), taskUUID)
 		if err != nil {
 			// getResponse may return an error if results aren't ready yet — keep polling
 			if flagVerbose {

cmd/video_inference.go

@@ -41,7 +41,9 @@ func NewClient(apiKey, baseURL string, verbose bool) *RestClient {
 		apiKey:  apiKey,
 		baseURL: baseURL,
 		verbose: verbose,
-		httpClient: &http.Client{},
+		httpClient: &http.Client{
+			Timeout: 120 * time.Second,
+		},
 	}
 }