refactor: RateLimitHeaders Resets filed

chat_test.go

@@ -126,22 +126,20 @@ func TestChatCompletionsWithRateLimitHeaders(t *testing.T) {
 	checks.NoError(t, err, "CreateChatCompletion error")
 
 	headers := resp.GetRateLimitHeaders()
-	resetReqTime, err := headers.ParseResetRequestsTime()
-	checks.NoError(t, err, "ParseResetRequestsTime error")
-	resetTokensTime, err := headers.ParseResetTokensTime()
-	checks.NoError(t, err, "ParseResetTokensTime error")
-	t.Logf("reset requests time: %s, reset tokens time: %s", resetReqTime, resetTokensTime)
+	resetRequests := headers.ResetRequests.String()
+	if resetRequests != rateLimitHeaders["x-ratelimit-reset-requests"] {
+		t.Errorf("expected resetRequests %s to be %s", resetRequests, rateLimitHeaders["x-ratelimit-reset-requests"])
+	}
+	resetRequestsTime := headers.ResetRequests.Time()
+	if resetRequestsTime.Before(time.Now()) {
+		t.Errorf("unexpected reset requetsts: %v", resetRequestsTime)
+	}
+
 	bs1, _ := json.Marshal(headers)
 	bs2, _ := json.Marshal(rateLimitHeaders)
 	if string(bs1) != string(bs2) {
 		t.Errorf("expected rate limit header %s to be %s", bs2, bs1)
 	}
-	headers.ResetRequests = "xxx"
-	headers.ResetTokens = "xxx"
-	_, err = headers.ParseResetRequestsTime()
-	checks.HasError(t, err, "ParseResetRequestsTime not error")
-	_, err = headers.ParseResetTokensTime()
-	checks.HasError(t, err, "ParseResetTokensTime not error")
 }
 
 // TestChatCompletionsFunctions tests including a function call.

models.go

@@ -94,12 +94,23 @@ func (c *Client) DeleteFineTuneModel(ctx context.Context, modelID string) (
 // RateLimitHeaders struct represents Openai rate limits headers.
 type RateLimitHeaders struct {
 	createTime        time.Time
-	LimitRequests     int    `json:"x-ratelimit-limit-requests"`
-	LimitTokens       int    `json:"x-ratelimit-limit-tokens"`
-	RemainingRequests int    `json:"x-ratelimit-remaining-requests"`
-	RemainingTokens   int    `json:"x-ratelimit-remaining-tokens"`
-	ResetRequests     string `json:"x-ratelimit-reset-requests"`
-	ResetTokens       string `json:"x-ratelimit-reset-tokens"`
+	LimitRequests     int       `json:"x-ratelimit-limit-requests"`
+	LimitTokens       int       `json:"x-ratelimit-limit-tokens"`
+	RemainingRequests int       `json:"x-ratelimit-remaining-requests"`
+	RemainingTokens   int       `json:"x-ratelimit-remaining-tokens"`
+	ResetRequests     ResetTime `json:"x-ratelimit-reset-requests"`
+	ResetTokens       ResetTime `json:"x-ratelimit-reset-tokens"`
+}
+
+type ResetTime string
+
+func (r ResetTime) String() string {
+	return string(r)
+}
+
+func (r ResetTime) Time() time.Time {
+	d, _ := time.ParseDuration(string(r))
+	return time.Now().Add(d)
 }
 
 func newRateLimitHeaders(h http.Header) RateLimitHeaders {
@@ -113,23 +124,7 @@ func newRateLimitHeaders(h http.Header) RateLimitHeaders {
 		LimitTokens:       limitTokens,
 		RemainingRequests: remainingReq,
 		RemainingTokens:   remainingTokens,
-		ResetRequests:     h.Get("x-ratelimit-reset-requests"),
-		ResetTokens:       h.Get("x-ratelimit-reset-tokens"),
-	}
-}
-
-func (r RateLimitHeaders) ParseResetRequestsTime() (time.Time, error) {
-	d, err := time.ParseDuration(r.ResetRequests)
-	if err != nil {
-		return time.Time{}, err
-	}
-	return r.createTime.Add(d), nil
-}
-
-func (r RateLimitHeaders) ParseResetTokensTime() (time.Time, error) {
-	d, err := time.ParseDuration(r.ResetTokens)
-	if err != nil {
-		return time.Time{}, err
+		ResetRequests:     ResetTime(h.Get("x-ratelimit-reset-requests")),
+		ResetTokens:       ResetTime(h.Get("x-ratelimit-reset-tokens")),
 	}
-	return r.createTime.Add(d), nil
 }