refactor: use http.NewRequestWithContext instead of http.NewRequest (#97)

bestgopher · web-flow · commit 58d99eb220f7 · 2023-03-02T10:27:09.000+04:00
diff --git a/answers.go b/answers.go
@@ -40,12 +40,11 @@ func (c *Client) Answers(ctx context.Context, request AnswerRequest) (response A
 		return
 	}
 
-	req, err := http.NewRequest("POST", c.fullURL("/answers"), bytes.NewBuffer(reqBytes))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL("/answers"), bytes.NewBuffer(reqBytes))
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &response)
 	return
 }
diff --git a/chat.go b/chat.go
@@ -67,12 +67,11 @@ func (c *Client) CreateChatCompletion(
 	}
 
 	urlSuffix := "/chat/completions"
-	req, err := http.NewRequest("POST", c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &response)
 	return
 }
diff --git a/completion.go b/completion.go
@@ -99,12 +99,11 @@ func (c *Client) CreateCompletion(
 	}
 
 	urlSuffix := "/completions"
-	req, err := http.NewRequest("POST", c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &response)
 	return
 }
diff --git a/edits.go b/edits.go
@@ -39,12 +39,11 @@ func (c *Client) Edits(ctx context.Context, request EditsRequest) (response Edit
 		return
 	}
 
-	req, err := http.NewRequest("POST", c.fullURL("/edits"), bytes.NewBuffer(reqBytes))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL("/edits"), bytes.NewBuffer(reqBytes))
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &response)
 	return
 }
diff --git a/embeddings.go b/embeddings.go
@@ -141,12 +141,11 @@ func (c *Client) CreateEmbeddings(ctx context.Context, request EmbeddingRequest)
 	}
 
 	urlSuffix := "/embeddings"
-	req, err := http.NewRequest(http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &resp)
 
 	return
diff --git a/engines.go b/engines.go
@@ -22,12 +22,11 @@ type EnginesList struct {
 // ListEngines Lists the currently available engines, and provides basic
 // information about each option such as the owner and availability.
 func (c *Client) ListEngines(ctx context.Context) (engines EnginesList, err error) {
-	req, err := http.NewRequest("GET", c.fullURL("/engines"), nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.fullURL("/engines"), nil)
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &engines)
 	return
 }
@@ -39,12 +38,11 @@ func (c *Client) GetEngine(
 	engineID string,
 ) (engine Engine, err error) {
 	urlSuffix := fmt.Sprintf("/engines/%s", engineID)
-	req, err := http.NewRequest("GET", c.fullURL(urlSuffix), nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.fullURL(urlSuffix), nil)
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &engine)
 	return
 }
diff --git a/files.go b/files.go
@@ -98,12 +98,11 @@ func (c *Client) CreateFile(ctx context.Context, request FileRequest) (file File
 
 	w.Close()
 
-	req, err := http.NewRequest("POST", c.fullURL("/files"), &b)
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL("/files"), &b)
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	req.Header.Set("Content-Type", w.FormDataContentType())
 
 	err = c.sendRequest(req, &file)
@@ -113,25 +112,23 @@ func (c *Client) CreateFile(ctx context.Context, request FileRequest) (file File
 
 // DeleteFile deletes an existing file.
 func (c *Client) DeleteFile(ctx context.Context, fileID string) (err error) {
-	req, err := http.NewRequest("DELETE", c.fullURL("/files/"+fileID), nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodDelete, c.fullURL("/files/"+fileID), nil)
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, nil)
 	return
 }
 
 // ListFiles Lists the currently available files,
 // and provides basic information about each file such as the file name and purpose.
 func (c *Client) ListFiles(ctx context.Context) (files FilesList, err error) {
-	req, err := http.NewRequest("GET", c.fullURL("/files"), nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.fullURL("/files"), nil)
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &files)
 	return
 }
@@ -140,12 +137,11 @@ func (c *Client) ListFiles(ctx context.Context) (files FilesList, err error) {
 // such as the file name and purpose.
 func (c *Client) GetFile(ctx context.Context, fileID string) (file File, err error) {
 	urlSuffix := fmt.Sprintf("/files/%s", fileID)
-	req, err := http.NewRequest("GET", c.fullURL(urlSuffix), nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.fullURL(urlSuffix), nil)
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &file)
 	return
 }
diff --git a/image.go b/image.go
@@ -53,12 +53,11 @@ func (c *Client) CreateImage(ctx context.Context, request ImageRequest) (respons
 	}
 
 	urlSuffix := "/images/generations"
-	req, err := http.NewRequest(http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &response)
 	return
 }
@@ -111,12 +110,11 @@ func (c *Client) CreateEditImage(ctx context.Context, request ImageEditRequest)
 	}
 	writer.Close()
 	urlSuffix := "/images/edits"
-	req, err := http.NewRequest(http.MethodPost, c.fullURL(urlSuffix), body)
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), body)
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	req.Header.Set("Content-Type", writer.FormDataContentType())
 	err = c.sendRequest(req, &response)
 	return
diff --git a/models.go b/models.go
@@ -40,11 +40,11 @@ type ModelsList struct {
 // ListModels Lists the currently available models,
 // and provides basic information about each model such as the model id and parent.
 func (c *Client) ListModels(ctx context.Context) (models ModelsList, err error) {
-	req, err := http.NewRequest("GET", c.fullURL("/models"), nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.fullURL("/models"), nil)
 	if err != nil {
 		return
 	}
-	req = req.WithContext(ctx)
+
 	err = c.sendRequest(req, &models)
 	return
 }
diff --git a/moderation.go b/moderation.go
@@ -58,12 +58,11 @@ func (c *Client) Moderations(ctx context.Context, request ModerationRequest) (re
 		return
 	}
 
-	req, err := http.NewRequest("POST", c.fullURL("/moderations"), bytes.NewBuffer(reqBytes))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL("/moderations"), bytes.NewBuffer(reqBytes))
 	if err != nil {
 		return
 	}
 
-	req = req.WithContext(ctx)
 	err = c.sendRequest(req, &response)
 	return
 }
diff --git a/stream.go b/stream.go
@@ -79,7 +79,7 @@ func (c *Client) CreateCompletionStream(
 	}
 
 	urlSuffix := "/completions"
-	req, err := http.NewRequest("POST", c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Accept", "text/event-stream")
 	req.Header.Set("Cache-Control", "no-cache")
@@ -89,7 +89,6 @@ func (c *Client) CreateCompletionStream(
 		return
 	}
 
-	req = req.WithContext(ctx)
 	resp, err := c.config.HTTPClient.Do(req) //nolint:bodyclose // body is closed in stream.Close()
 	if err != nil {
 		return

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,11 @@ func (c *Client) Answers(ctx context.Context, request AnswerRequest) (response A`
`40`	`40`	`return`
`41`	`41`	`}`
`42`	`42`
`43`		`- req, err := http.NewRequest("POST", c.fullURL("/answers"), bytes.NewBuffer(reqBytes))`
	`43`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL("/answers"), bytes.NewBuffer(reqBytes))`
`44`	`44`	`if err != nil {`
`45`	`45`	`return`
`46`	`46`	`}`
`47`	`47`
`48`		`- req = req.WithContext(ctx)`
`49`	`48`	`err = c.sendRequest(req, &response)`
`50`	`49`	`return`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,11 @@ func (c *Client) CreateChatCompletion(`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`urlSuffix := "/chat/completions"`
`70`		`- req, err := http.NewRequest("POST", c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
	`70`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
`71`	`71`	`if err != nil {`
`72`	`72`	`return`
`73`	`73`	`}`
`74`	`74`
`75`		`- req = req.WithContext(ctx)`
`76`	`75`	`err = c.sendRequest(req, &response)`
`77`	`76`	`return`
`78`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,11 @@ func (c *Client) CreateCompletion(`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`urlSuffix := "/completions"`
`102`		`- req, err := http.NewRequest("POST", c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
	`102`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
`103`	`103`	`if err != nil {`
`104`	`104`	`return`
`105`	`105`	`}`
`106`	`106`
`107`		`- req = req.WithContext(ctx)`
`108`	`107`	`err = c.sendRequest(req, &response)`
`109`	`108`	`return`
`110`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,11 @@ func (c *Client) Edits(ctx context.Context, request EditsRequest) (response Edit`
`39`	`39`	`return`
`40`	`40`	`}`
`41`	`41`
`42`		`- req, err := http.NewRequest("POST", c.fullURL("/edits"), bytes.NewBuffer(reqBytes))`
	`42`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL("/edits"), bytes.NewBuffer(reqBytes))`
`43`	`43`	`if err != nil {`
`44`	`44`	`return`
`45`	`45`	`}`
`46`	`46`
`47`		`- req = req.WithContext(ctx)`
`48`	`47`	`err = c.sendRequest(req, &response)`
`49`	`48`	`return`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,12 +141,11 @@ func (c *Client) CreateEmbeddings(ctx context.Context, request EmbeddingRequest)`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`urlSuffix := "/embeddings"`
`144`		`- req, err := http.NewRequest(http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
	`144`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
`145`	`145`	`if err != nil {`
`146`	`146`	`return`
`147`	`147`	`}`
`148`	`148`
`149`		`- req = req.WithContext(ctx)`
`150`	`149`	`err = c.sendRequest(req, &resp)`
`151`	`150`
`152`	`151`	`return`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,11 @@ func (c *Client) CreateImage(ctx context.Context, request ImageRequest) (respons`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`urlSuffix := "/images/generations"`
`56`		`- req, err := http.NewRequest(http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
	`56`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
`57`	`57`	`if err != nil {`
`58`	`58`	`return`
`59`	`59`	`}`
`60`	`60`
`61`		`- req = req.WithContext(ctx)`
`62`	`61`	`err = c.sendRequest(req, &response)`
`63`	`62`	`return`
`64`	`63`	`}`
`@@ -111,12 +110,11 @@ func (c *Client) CreateEditImage(ctx context.Context, request ImageEditRequest)`
`111`	`110`	`}`
`112`	`111`	`writer.Close()`
`113`	`112`	`urlSuffix := "/images/edits"`
`114`		`- req, err := http.NewRequest(http.MethodPost, c.fullURL(urlSuffix), body)`
	`113`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), body)`
`115`	`114`	`if err != nil {`
`116`	`115`	`return`
`117`	`116`	`}`
`118`	`117`
`119`		`- req = req.WithContext(ctx)`
`120`	`118`	`req.Header.Set("Content-Type", writer.FormDataContentType())`
`121`	`119`	`err = c.sendRequest(req, &response)`
`122`	`120`	`return`
Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ type ModelsList struct {`
`40`	`40`	`// ListModels Lists the currently available models,`
`41`	`41`	`// and provides basic information about each model such as the model id and parent.`
`42`	`42`	`func (c *Client) ListModels(ctx context.Context) (models ModelsList, err error) {`
`43`		`- req, err := http.NewRequest("GET", c.fullURL("/models"), nil)`
	`43`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.fullURL("/models"), nil)`
`44`	`44`	`if err != nil {`
`45`	`45`	`return`
`46`	`46`	`}`
`47`		`- req = req.WithContext(ctx)`
	`47`	`+`
`48`	`48`	`err = c.sendRequest(req, &models)`
`49`	`49`	`return`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,11 @@ func (c *Client) Moderations(ctx context.Context, request ModerationRequest) (re`
`58`	`58`	`return`
`59`	`59`	`}`
`60`	`60`
`61`		`- req, err := http.NewRequest("POST", c.fullURL("/moderations"), bytes.NewBuffer(reqBytes))`
	`61`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL("/moderations"), bytes.NewBuffer(reqBytes))`
`62`	`62`	`if err != nil {`
`63`	`63`	`return`
`64`	`64`	`}`
`65`	`65`
`66`		`- req = req.WithContext(ctx)`
`67`	`66`	`err = c.sendRequest(req, &response)`
`68`	`67`	`return`
`69`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func (c *Client) CreateCompletionStream(`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`urlSuffix := "/completions"`
`82`		`- req, err := http.NewRequest("POST", c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
	`82`	`+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.fullURL(urlSuffix), bytes.NewBuffer(reqBytes))`
`83`	`83`	`req.Header.Set("Content-Type", "application/json")`
`84`	`84`	`req.Header.Set("Accept", "text/event-stream")`
`85`	`85`	`req.Header.Set("Cache-Control", "no-cache")`
`@@ -89,7 +89,6 @@ func (c *Client) CreateCompletionStream(`
`89`	`89`	`return`
`90`	`90`	`}`
`91`	`91`
`92`		`- req = req.WithContext(ctx)`
`93`	`92`	`resp, err := c.config.HTTPClient.Do(req) //nolint:bodyclose // body is closed in stream.Close()`
`94`	`93`	`if err != nil {`
`95`	`94`	`return`