cli: catch upstream errors gracefully (ollama#11512)

pdevine · web-flow · commit 80b538e312c1 · 2025-07-23T22:16:55.000-07:00
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -1137,6 +1137,14 @@ func chat(cmd *cobra.Command, opts runOptions) (*api.Message, error) {
 		if errors.Is(err, context.Canceled) {
 			return nil, nil
 		}
+
+		// this error should ideally be wrapped properly by the client
+		if strings.Contains(err.Error(), "upstream error") {
+			p.StopAndClear()
+			fmt.Println("An error occurred while processing your message. Please try again.")
+			fmt.Println()
+			return nil, nil
+		}
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1137,6 +1137,14 @@ func chat(cmd cobra.Command, opts runOptions) (api.Message, error) {`
`1137`	`1137`	`if errors.Is(err, context.Canceled) {`
`1138`	`1138`	`return nil, nil`
`1139`	`1139`	`}`
	`1140`	`+`
	`1141`	`+ // this error should ideally be wrapped properly by the client`
	`1142`	`+ if strings.Contains(err.Error(), "upstream error") {`
	`1143`	`+ p.StopAndClear()`
	`1144`	`+ fmt.Println("An error occurred while processing your message. Please try again.")`
	`1145`	`+ fmt.Println()`
	`1146`	`+ return nil, nil`
	`1147`	`+ }`
`1140`	`1148`	`return nil, err`
`1141`	`1149`	`}`
`1142`	`1150`