From 708c85a6f6d5ae8a3086afa7bafb726652d58ed3 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 12:01:41 +0000 Subject: [PATCH] feat(api): api update (#3612) --- .stats.yml | 2 +- ai_gateway/aigateway.go | 2 - ai_gateway/aigateway_test.go | 5 +- ai_gateway/dataset.go | 156 ++++++++++---------------------- ai_gateway/dataset_test.go | 30 ++---- ai_gateway/evaluation.go | 166 ++++++++++++++++++---------------- ai_gateway/evaluation_test.go | 12 +-- ai_gateway/log.go | 6 +- shared/union.go | 3 - 9 files changed, 154 insertions(+), 228 deletions(-) diff --git a/.stats.yml b/.stats.yml index 3eace84bc29..e4620134b7e 100644 --- a/.stats.yml +++ b/.stats.yml @@ -1,2 +1,2 @@ configured_endpoints: 1381 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-34e58184c8582fbfa6e469d190a541a701067980fa9d9158ed1ffc1eed88d681.yml +openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-d6dc39cc9dc12992f205f2436d49fb9c8b2e58090dfbbfbeec2d431ab75349a7.yml diff --git a/ai_gateway/aigateway.go b/ai_gateway/aigateway.go index cbc508087d5..4c86d362d8b 100644 --- a/ai_gateway/aigateway.go +++ b/ai_gateway/aigateway.go @@ -549,8 +549,6 @@ func (r aiGatewayUpdateResponseEnvelopeJSON) RawJSON() string { type AIGatewayListParams struct { AccountID param.Field[string] `path:"account_id,required"` - // gateway id - ID param.Field[string] `query:"id"` // Order By Column Name OrderBy param.Field[string] `query:"order_by"` // Order By Direction diff --git a/ai_gateway/aigateway_test.go b/ai_gateway/aigateway_test.go index 4835a708df2..a8db6bbd879 100644 --- a/ai_gateway/aigateway_test.go +++ b/ai_gateway/aigateway_test.go @@ -100,11 +100,10 @@ func TestAIGatewayListWithOptionalParams(t *testing.T) { ) _, err := client.AIGateway.List(context.TODO(), ai_gateway.AIGatewayListParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), - ID: cloudflare.F("my-gateway"), OrderBy: cloudflare.F("order_by"), OrderByDirection: cloudflare.F(ai_gateway.AIGatewayListParamsOrderByDirectionAsc), Page: cloudflare.F(int64(1)), - PerPage: cloudflare.F(int64(5)), + PerPage: cloudflare.F(int64(1)), }) if err != nil { var apierr *cloudflare.Error @@ -130,7 +129,7 @@ func TestAIGatewayDelete(t *testing.T) { ) _, err := client.AIGateway.Delete( context.TODO(), - "id", + "my-gateway", ai_gateway.AIGatewayDeleteParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), }, diff --git a/ai_gateway/dataset.go b/ai_gateway/dataset.go index 66a70d9dff1..a3d7d68c691 100644 --- a/ai_gateway/dataset.go +++ b/ai_gateway/dataset.go @@ -168,14 +168,15 @@ func (r *DatasetService) Get(ctx context.Context, gatewayID string, id string, q } type DatasetNewResponse struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Enable bool `json:"enable,required"` - Filters []DatasetNewResponseFilter `json:"filters,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - JSON datasetNewResponseJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Enable bool `json:"enable,required"` + Filters []DatasetNewResponseFilter `json:"filters,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + JSON datasetNewResponseJSON `json:"-"` } // datasetNewResponseJSON contains the JSON metadata for the struct @@ -298,14 +299,15 @@ func init() { } type DatasetUpdateResponse struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Enable bool `json:"enable,required"` - Filters []DatasetUpdateResponseFilter `json:"filters,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - JSON datasetUpdateResponseJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Enable bool `json:"enable,required"` + Filters []DatasetUpdateResponseFilter `json:"filters,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + JSON datasetUpdateResponseJSON `json:"-"` } // datasetUpdateResponseJSON contains the JSON metadata for the struct @@ -428,14 +430,15 @@ func init() { } type DatasetListResponse struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Enable bool `json:"enable,required"` - Filters []DatasetListResponseFilter `json:"filters,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - JSON datasetListResponseJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Enable bool `json:"enable,required"` + Filters []DatasetListResponseFilter `json:"filters,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + JSON datasetListResponseJSON `json:"-"` } // datasetListResponseJSON contains the JSON metadata for the struct @@ -558,14 +561,15 @@ func init() { } type DatasetDeleteResponse struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Enable bool `json:"enable,required"` - Filters []DatasetDeleteResponseFilter `json:"filters,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - JSON datasetDeleteResponseJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Enable bool `json:"enable,required"` + Filters []DatasetDeleteResponseFilter `json:"filters,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + JSON datasetDeleteResponseJSON `json:"-"` } // datasetDeleteResponseJSON contains the JSON metadata for the struct @@ -688,14 +692,15 @@ func init() { } type DatasetGetResponse struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Enable bool `json:"enable,required"` - Filters []DatasetGetResponseFilter `json:"filters,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - JSON datasetGetResponseJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Enable bool `json:"enable,required"` + Filters []DatasetGetResponseFilter `json:"filters,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + JSON datasetGetResponseJSON `json:"-"` } // datasetGetResponseJSON contains the JSON metadata for the struct @@ -1002,11 +1007,9 @@ func (r datasetUpdateResponseEnvelopeJSON) RawJSON() string { } type DatasetListParams struct { - AccountID param.Field[string] `path:"account_id,required"` - ID param.Field[string] `query:"id"` - Enable param.Field[bool] `query:"enable"` - Filters param.Field[[]DatasetListParamsFilter] `query:"filters"` - Name param.Field[string] `query:"name"` + AccountID param.Field[string] `path:"account_id,required"` + Enable param.Field[bool] `query:"enable"` + Name param.Field[string] `query:"name"` // Order By Column Name OrderBy param.Field[string] `query:"order_by"` // Order By Direction @@ -1025,69 +1028,6 @@ func (r DatasetListParams) URLQuery() (v url.Values) { }) } -type DatasetListParamsFilter struct { - Key param.Field[DatasetListParamsFiltersKey] `query:"key,required"` - Operator param.Field[DatasetListParamsFiltersOperator] `query:"operator,required"` - Value param.Field[[]DatasetListParamsFiltersValueUnion] `query:"value,required"` -} - -// URLQuery serializes [DatasetListParamsFilter]'s query parameters as -// `url.Values`. -func (r DatasetListParamsFilter) URLQuery() (v url.Values) { - return apiquery.MarshalWithSettings(r, apiquery.QuerySettings{ - ArrayFormat: apiquery.ArrayQueryFormatRepeat, - NestedFormat: apiquery.NestedQueryFormatDots, - }) -} - -type DatasetListParamsFiltersKey string - -const ( - DatasetListParamsFiltersKeyCreatedAt DatasetListParamsFiltersKey = "created_at" - DatasetListParamsFiltersKeyRequestContentType DatasetListParamsFiltersKey = "request_content_type" - DatasetListParamsFiltersKeyResponseContentType DatasetListParamsFiltersKey = "response_content_type" - DatasetListParamsFiltersKeySuccess DatasetListParamsFiltersKey = "success" - DatasetListParamsFiltersKeyCached DatasetListParamsFiltersKey = "cached" - DatasetListParamsFiltersKeyProvider DatasetListParamsFiltersKey = "provider" - DatasetListParamsFiltersKeyModel DatasetListParamsFiltersKey = "model" - DatasetListParamsFiltersKeyCost DatasetListParamsFiltersKey = "cost" - DatasetListParamsFiltersKeyTokens DatasetListParamsFiltersKey = "tokens" - DatasetListParamsFiltersKeyTokensIn DatasetListParamsFiltersKey = "tokens_in" - DatasetListParamsFiltersKeyTokensOut DatasetListParamsFiltersKey = "tokens_out" - DatasetListParamsFiltersKeyDuration DatasetListParamsFiltersKey = "duration" - DatasetListParamsFiltersKeyFeedback DatasetListParamsFiltersKey = "feedback" -) - -func (r DatasetListParamsFiltersKey) IsKnown() bool { - switch r { - case DatasetListParamsFiltersKeyCreatedAt, DatasetListParamsFiltersKeyRequestContentType, DatasetListParamsFiltersKeyResponseContentType, DatasetListParamsFiltersKeySuccess, DatasetListParamsFiltersKeyCached, DatasetListParamsFiltersKeyProvider, DatasetListParamsFiltersKeyModel, DatasetListParamsFiltersKeyCost, DatasetListParamsFiltersKeyTokens, DatasetListParamsFiltersKeyTokensIn, DatasetListParamsFiltersKeyTokensOut, DatasetListParamsFiltersKeyDuration, DatasetListParamsFiltersKeyFeedback: - return true - } - return false -} - -type DatasetListParamsFiltersOperator string - -const ( - DatasetListParamsFiltersOperatorEq DatasetListParamsFiltersOperator = "eq" - DatasetListParamsFiltersOperatorContains DatasetListParamsFiltersOperator = "contains" - DatasetListParamsFiltersOperatorLt DatasetListParamsFiltersOperator = "lt" - DatasetListParamsFiltersOperatorGt DatasetListParamsFiltersOperator = "gt" -) - -func (r DatasetListParamsFiltersOperator) IsKnown() bool { - switch r { - case DatasetListParamsFiltersOperatorEq, DatasetListParamsFiltersOperatorContains, DatasetListParamsFiltersOperatorLt, DatasetListParamsFiltersOperatorGt: - return true - } - return false -} - -// Satisfied by [shared.UnionString], [shared.UnionFloat], [shared.UnionBool]. -type DatasetListParamsFiltersValueUnion interface { - ImplementsAIGatewayDatasetListParamsFiltersValueUnion() -} - // Order By Direction type DatasetListParamsOrderByDirection string diff --git a/ai_gateway/dataset_test.go b/ai_gateway/dataset_test.go index 941d4a1db09..eace14cfd18 100644 --- a/ai_gateway/dataset_test.go +++ b/ai_gateway/dataset_test.go @@ -30,7 +30,7 @@ func TestDatasetNew(t *testing.T) { ) _, err := client.AIGateway.Datasets.New( context.TODO(), - "gateway_id", + "my-gateway", ai_gateway.DatasetNewParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), Enable: cloudflare.F(true), @@ -74,7 +74,7 @@ func TestDatasetUpdate(t *testing.T) { ) _, err := client.AIGateway.Datasets.Update( context.TODO(), - "gateway_id", + "my-gateway", "id", ai_gateway.DatasetUpdateParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), @@ -119,29 +119,15 @@ func TestDatasetListWithOptionalParams(t *testing.T) { ) _, err := client.AIGateway.Datasets.List( context.TODO(), - "gateway_id", + "my-gateway", ai_gateway.DatasetListParams{ - AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), - ID: cloudflare.F("id"), - Enable: cloudflare.F(true), - Filters: cloudflare.F([]ai_gateway.DatasetListParamsFilter{{ - Key: cloudflare.F(ai_gateway.DatasetListParamsFiltersKeyCreatedAt), - Operator: cloudflare.F(ai_gateway.DatasetListParamsFiltersOperatorEq), - Value: cloudflare.F([]ai_gateway.DatasetListParamsFiltersValueUnion{shared.UnionString("string"), shared.UnionString("string"), shared.UnionString("string")}), - }, { - Key: cloudflare.F(ai_gateway.DatasetListParamsFiltersKeyCreatedAt), - Operator: cloudflare.F(ai_gateway.DatasetListParamsFiltersOperatorEq), - Value: cloudflare.F([]ai_gateway.DatasetListParamsFiltersValueUnion{shared.UnionString("string"), shared.UnionString("string"), shared.UnionString("string")}), - }, { - Key: cloudflare.F(ai_gateway.DatasetListParamsFiltersKeyCreatedAt), - Operator: cloudflare.F(ai_gateway.DatasetListParamsFiltersOperatorEq), - Value: cloudflare.F([]ai_gateway.DatasetListParamsFiltersValueUnion{shared.UnionString("string"), shared.UnionString("string"), shared.UnionString("string")}), - }}), + AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), + Enable: cloudflare.F(true), Name: cloudflare.F("name"), OrderBy: cloudflare.F("order_by"), OrderByDirection: cloudflare.F(ai_gateway.DatasetListParamsOrderByDirectionAsc), Page: cloudflare.F(int64(1)), - PerPage: cloudflare.F(int64(5)), + PerPage: cloudflare.F(int64(1)), Search: cloudflare.F("search"), }, ) @@ -169,7 +155,7 @@ func TestDatasetDelete(t *testing.T) { ) _, err := client.AIGateway.Datasets.Delete( context.TODO(), - "gateway_id", + "my-gateway", "id", ai_gateway.DatasetDeleteParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), @@ -199,7 +185,7 @@ func TestDatasetGet(t *testing.T) { ) _, err := client.AIGateway.Datasets.Get( context.TODO(), - "gateway_id", + "my-gateway", "id", ai_gateway.DatasetGetParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), diff --git a/ai_gateway/evaluation.go b/ai_gateway/evaluation.go index cbe64fce9c2..f59572e17a0 100644 --- a/ai_gateway/evaluation.go +++ b/ai_gateway/evaluation.go @@ -40,7 +40,7 @@ func NewEvaluationService(opts ...option.RequestOption) (r *EvaluationService) { return } -// Create a new Evaluations +// Create a new Evaluation func (r *EvaluationService) New(ctx context.Context, gatewayID string, params EvaluationNewParams, opts ...option.RequestOption) (res *EvaluationNewResponse, err error) { var env EvaluationNewResponseEnvelope opts = append(r.Options[:], opts...) @@ -61,7 +61,7 @@ func (r *EvaluationService) New(ctx context.Context, gatewayID string, params Ev return } -// List Evaluationss +// List Evaluations func (r *EvaluationService) List(ctx context.Context, gatewayID string, params EvaluationListParams, opts ...option.RequestOption) (res *pagination.V4PagePaginationArray[EvaluationListResponse], err error) { var raw *http.Response opts = append(r.Options[:], opts...) @@ -87,12 +87,12 @@ func (r *EvaluationService) List(ctx context.Context, gatewayID string, params E return res, nil } -// List Evaluationss +// List Evaluations func (r *EvaluationService) ListAutoPaging(ctx context.Context, gatewayID string, params EvaluationListParams, opts ...option.RequestOption) *pagination.V4PagePaginationArrayAutoPager[EvaluationListResponse] { return pagination.NewV4PagePaginationArrayAutoPager(r.List(ctx, gatewayID, params, opts...)) } -// Delete a Evaluations +// Delete a Evaluation func (r *EvaluationService) Delete(ctx context.Context, gatewayID string, id string, body EvaluationDeleteParams, opts ...option.RequestOption) (res *EvaluationDeleteResponse, err error) { var env EvaluationDeleteResponseEnvelope opts = append(r.Options[:], opts...) @@ -117,7 +117,7 @@ func (r *EvaluationService) Delete(ctx context.Context, gatewayID string, id str return } -// Fetch a Evaluations +// Fetch a Evaluation func (r *EvaluationService) Get(ctx context.Context, gatewayID string, id string, query EvaluationGetParams, opts ...option.RequestOption) (res *EvaluationGetResponse, err error) { var env EvaluationGetResponseEnvelope opts = append(r.Options[:], opts...) @@ -143,16 +143,17 @@ func (r *EvaluationService) Get(ctx context.Context, gatewayID string, id string } type EvaluationNewResponse struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Datasets []EvaluationNewResponseDataset `json:"datasets,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - Processed bool `json:"processed,required"` - Results []EvaluationNewResponseResult `json:"results,required"` - TotalLogs float64 `json:"total_logs,required"` - JSON evaluationNewResponseJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Datasets []EvaluationNewResponseDataset `json:"datasets,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + Processed bool `json:"processed,required"` + Results []EvaluationNewResponseResult `json:"results,required"` + TotalLogs float64 `json:"total_logs,required"` + JSON evaluationNewResponseJSON `json:"-"` } // evaluationNewResponseJSON contains the JSON metadata for the struct @@ -180,14 +181,15 @@ func (r evaluationNewResponseJSON) RawJSON() string { } type EvaluationNewResponseDataset struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Enable bool `json:"enable,required"` - Filters []EvaluationNewResponseDatasetsFilter `json:"filters,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - JSON evaluationNewResponseDatasetJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Enable bool `json:"enable,required"` + Filters []EvaluationNewResponseDatasetsFilter `json:"filters,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + JSON evaluationNewResponseDatasetJSON `json:"-"` } // evaluationNewResponseDatasetJSON contains the JSON metadata for the struct @@ -347,16 +349,17 @@ func (r evaluationNewResponseResultJSON) RawJSON() string { } type EvaluationListResponse struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Datasets []EvaluationListResponseDataset `json:"datasets,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - Processed bool `json:"processed,required"` - Results []EvaluationListResponseResult `json:"results,required"` - TotalLogs float64 `json:"total_logs,required"` - JSON evaluationListResponseJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Datasets []EvaluationListResponseDataset `json:"datasets,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + Processed bool `json:"processed,required"` + Results []EvaluationListResponseResult `json:"results,required"` + TotalLogs float64 `json:"total_logs,required"` + JSON evaluationListResponseJSON `json:"-"` } // evaluationListResponseJSON contains the JSON metadata for the struct @@ -384,14 +387,15 @@ func (r evaluationListResponseJSON) RawJSON() string { } type EvaluationListResponseDataset struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Enable bool `json:"enable,required"` - Filters []EvaluationListResponseDatasetsFilter `json:"filters,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - JSON evaluationListResponseDatasetJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Enable bool `json:"enable,required"` + Filters []EvaluationListResponseDatasetsFilter `json:"filters,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + JSON evaluationListResponseDatasetJSON `json:"-"` } // evaluationListResponseDatasetJSON contains the JSON metadata for the struct @@ -551,16 +555,17 @@ func (r evaluationListResponseResultJSON) RawJSON() string { } type EvaluationDeleteResponse struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Datasets []EvaluationDeleteResponseDataset `json:"datasets,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - Processed bool `json:"processed,required"` - Results []EvaluationDeleteResponseResult `json:"results,required"` - TotalLogs float64 `json:"total_logs,required"` - JSON evaluationDeleteResponseJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Datasets []EvaluationDeleteResponseDataset `json:"datasets,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + Processed bool `json:"processed,required"` + Results []EvaluationDeleteResponseResult `json:"results,required"` + TotalLogs float64 `json:"total_logs,required"` + JSON evaluationDeleteResponseJSON `json:"-"` } // evaluationDeleteResponseJSON contains the JSON metadata for the struct @@ -588,14 +593,15 @@ func (r evaluationDeleteResponseJSON) RawJSON() string { } type EvaluationDeleteResponseDataset struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Enable bool `json:"enable,required"` - Filters []EvaluationDeleteResponseDatasetsFilter `json:"filters,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - JSON evaluationDeleteResponseDatasetJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Enable bool `json:"enable,required"` + Filters []EvaluationDeleteResponseDatasetsFilter `json:"filters,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + JSON evaluationDeleteResponseDatasetJSON `json:"-"` } // evaluationDeleteResponseDatasetJSON contains the JSON metadata for the struct @@ -755,16 +761,17 @@ func (r evaluationDeleteResponseResultJSON) RawJSON() string { } type EvaluationGetResponse struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Datasets []EvaluationGetResponseDataset `json:"datasets,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - Processed bool `json:"processed,required"` - Results []EvaluationGetResponseResult `json:"results,required"` - TotalLogs float64 `json:"total_logs,required"` - JSON evaluationGetResponseJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Datasets []EvaluationGetResponseDataset `json:"datasets,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + Processed bool `json:"processed,required"` + Results []EvaluationGetResponseResult `json:"results,required"` + TotalLogs float64 `json:"total_logs,required"` + JSON evaluationGetResponseJSON `json:"-"` } // evaluationGetResponseJSON contains the JSON metadata for the struct @@ -792,14 +799,15 @@ func (r evaluationGetResponseJSON) RawJSON() string { } type EvaluationGetResponseDataset struct { - ID string `json:"id,required"` - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - Enable bool `json:"enable,required"` - Filters []EvaluationGetResponseDatasetsFilter `json:"filters,required"` - GatewayID string `json:"gateway_id,required"` - ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` - Name string `json:"name,required"` - JSON evaluationGetResponseDatasetJSON `json:"-"` + ID string `json:"id,required"` + CreatedAt time.Time `json:"created_at,required" format:"date-time"` + Enable bool `json:"enable,required"` + Filters []EvaluationGetResponseDatasetsFilter `json:"filters,required"` + // gateway id + GatewayID string `json:"gateway_id,required"` + ModifiedAt time.Time `json:"modified_at,required" format:"date-time"` + Name string `json:"name,required"` + JSON evaluationGetResponseDatasetJSON `json:"-"` } // evaluationGetResponseDatasetJSON contains the JSON metadata for the struct @@ -994,7 +1002,6 @@ func (r evaluationNewResponseEnvelopeJSON) RawJSON() string { type EvaluationListParams struct { AccountID param.Field[string] `path:"account_id,required"` - ID param.Field[string] `query:"id"` Name param.Field[string] `query:"name"` // Order By Column Name OrderBy param.Field[string] `query:"order_by"` @@ -1004,8 +1011,7 @@ type EvaluationListParams struct { PerPage param.Field[int64] `query:"per_page"` Processed param.Field[bool] `query:"processed"` // Search by id, name - Search param.Field[string] `query:"search"` - TotalLogs param.Field[float64] `query:"total_logs"` + Search param.Field[string] `query:"search"` } // URLQuery serializes [EvaluationListParams]'s query parameters as `url.Values`. diff --git a/ai_gateway/evaluation_test.go b/ai_gateway/evaluation_test.go index da64f27b2df..1234aa8635c 100644 --- a/ai_gateway/evaluation_test.go +++ b/ai_gateway/evaluation_test.go @@ -29,7 +29,7 @@ func TestEvaluationNew(t *testing.T) { ) _, err := client.AIGateway.Evaluations.New( context.TODO(), - "gateway_id", + "my-gateway", ai_gateway.EvaluationNewParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), DatasetIDs: cloudflare.F([]string{"string", "string", "string"}), @@ -61,18 +61,16 @@ func TestEvaluationListWithOptionalParams(t *testing.T) { ) _, err := client.AIGateway.Evaluations.List( context.TODO(), - "gateway_id", + "my-gateway", ai_gateway.EvaluationListParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), - ID: cloudflare.F("id"), Name: cloudflare.F("name"), OrderBy: cloudflare.F("order_by"), OrderByDirection: cloudflare.F(ai_gateway.EvaluationListParamsOrderByDirectionAsc), Page: cloudflare.F(int64(1)), - PerPage: cloudflare.F(int64(5)), + PerPage: cloudflare.F(int64(1)), Processed: cloudflare.F(true), Search: cloudflare.F("search"), - TotalLogs: cloudflare.F(0.000000), }, ) if err != nil { @@ -99,7 +97,7 @@ func TestEvaluationDelete(t *testing.T) { ) _, err := client.AIGateway.Evaluations.Delete( context.TODO(), - "gateway_id", + "my-gateway", "id", ai_gateway.EvaluationDeleteParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), @@ -129,7 +127,7 @@ func TestEvaluationGet(t *testing.T) { ) _, err := client.AIGateway.Evaluations.Get( context.TODO(), - "gateway_id", + "my-gateway", "id", ai_gateway.EvaluationGetParams{ AccountID: cloudflare.F("3ebbcb006d4d46d7bb6a8c7f14676cb0"), diff --git a/ai_gateway/log.go b/ai_gateway/log.go index 503f74c4e71..97d2bcc1b63 100644 --- a/ai_gateway/log.go +++ b/ai_gateway/log.go @@ -419,6 +419,7 @@ const ( LogListParamsFiltersKeyCached LogListParamsFiltersKey = "cached" LogListParamsFiltersKeyProvider LogListParamsFiltersKey = "provider" LogListParamsFiltersKeyModel LogListParamsFiltersKey = "model" + LogListParamsFiltersKeyModelType LogListParamsFiltersKey = "model_type" LogListParamsFiltersKeyCost LogListParamsFiltersKey = "cost" LogListParamsFiltersKeyTokens LogListParamsFiltersKey = "tokens" LogListParamsFiltersKeyTokensIn LogListParamsFiltersKey = "tokens_in" @@ -429,7 +430,7 @@ const ( func (r LogListParamsFiltersKey) IsKnown() bool { switch r { - case LogListParamsFiltersKeyCreatedAt, LogListParamsFiltersKeyRequestContentType, LogListParamsFiltersKeyResponseContentType, LogListParamsFiltersKeySuccess, LogListParamsFiltersKeyCached, LogListParamsFiltersKeyProvider, LogListParamsFiltersKeyModel, LogListParamsFiltersKeyCost, LogListParamsFiltersKeyTokens, LogListParamsFiltersKeyTokensIn, LogListParamsFiltersKeyTokensOut, LogListParamsFiltersKeyDuration, LogListParamsFiltersKeyFeedback: + case LogListParamsFiltersKeyCreatedAt, LogListParamsFiltersKeyRequestContentType, LogListParamsFiltersKeyResponseContentType, LogListParamsFiltersKeySuccess, LogListParamsFiltersKeyCached, LogListParamsFiltersKeyProvider, LogListParamsFiltersKeyModel, LogListParamsFiltersKeyModelType, LogListParamsFiltersKeyCost, LogListParamsFiltersKeyTokens, LogListParamsFiltersKeyTokensIn, LogListParamsFiltersKeyTokensOut, LogListParamsFiltersKeyDuration, LogListParamsFiltersKeyFeedback: return true } return false @@ -532,6 +533,7 @@ const ( LogDeleteParamsFiltersKeyCached LogDeleteParamsFiltersKey = "cached" LogDeleteParamsFiltersKeyProvider LogDeleteParamsFiltersKey = "provider" LogDeleteParamsFiltersKeyModel LogDeleteParamsFiltersKey = "model" + LogDeleteParamsFiltersKeyModelType LogDeleteParamsFiltersKey = "model_type" LogDeleteParamsFiltersKeyCost LogDeleteParamsFiltersKey = "cost" LogDeleteParamsFiltersKeyTokens LogDeleteParamsFiltersKey = "tokens" LogDeleteParamsFiltersKeyTokensIn LogDeleteParamsFiltersKey = "tokens_in" @@ -542,7 +544,7 @@ const ( func (r LogDeleteParamsFiltersKey) IsKnown() bool { switch r { - case LogDeleteParamsFiltersKeyCreatedAt, LogDeleteParamsFiltersKeyRequestContentType, LogDeleteParamsFiltersKeyResponseContentType, LogDeleteParamsFiltersKeySuccess, LogDeleteParamsFiltersKeyCached, LogDeleteParamsFiltersKeyProvider, LogDeleteParamsFiltersKeyModel, LogDeleteParamsFiltersKeyCost, LogDeleteParamsFiltersKeyTokens, LogDeleteParamsFiltersKeyTokensIn, LogDeleteParamsFiltersKeyTokensOut, LogDeleteParamsFiltersKeyDuration, LogDeleteParamsFiltersKeyFeedback: + case LogDeleteParamsFiltersKeyCreatedAt, LogDeleteParamsFiltersKeyRequestContentType, LogDeleteParamsFiltersKeyResponseContentType, LogDeleteParamsFiltersKeySuccess, LogDeleteParamsFiltersKeyCached, LogDeleteParamsFiltersKeyProvider, LogDeleteParamsFiltersKeyModel, LogDeleteParamsFiltersKeyModelType, LogDeleteParamsFiltersKeyCost, LogDeleteParamsFiltersKeyTokens, LogDeleteParamsFiltersKeyTokensIn, LogDeleteParamsFiltersKeyTokensOut, LogDeleteParamsFiltersKeyDuration, LogDeleteParamsFiltersKeyFeedback: return true } return false diff --git a/shared/union.go b/shared/union.go index c2dfecc741f..3a7f772236a 100644 --- a/shared/union.go +++ b/shared/union.go @@ -82,7 +82,6 @@ func (UnionString) ImplementsAIGatewayDatasetDeleteResponseFiltersValueUnion() func (UnionString) ImplementsAIGatewayDatasetGetResponseFiltersValueUnion() {} func (UnionString) ImplementsAIGatewayDatasetNewParamsFiltersValueUnion() {} func (UnionString) ImplementsAIGatewayDatasetUpdateParamsFiltersValueUnion() {} -func (UnionString) ImplementsAIGatewayDatasetListParamsFiltersValueUnion() {} func (UnionString) ImplementsAIGatewayEvaluationNewResponseDatasetsFiltersValueUnion() {} func (UnionString) ImplementsAIGatewayEvaluationListResponseDatasetsFiltersValueUnion() {} func (UnionString) ImplementsAIGatewayEvaluationDeleteResponseDatasetsFiltersValueUnion() {} @@ -103,7 +102,6 @@ func (UnionBool) ImplementsAIGatewayDatasetDeleteResponseFiltersValueUnion() func (UnionBool) ImplementsAIGatewayDatasetGetResponseFiltersValueUnion() {} func (UnionBool) ImplementsAIGatewayDatasetNewParamsFiltersValueUnion() {} func (UnionBool) ImplementsAIGatewayDatasetUpdateParamsFiltersValueUnion() {} -func (UnionBool) ImplementsAIGatewayDatasetListParamsFiltersValueUnion() {} func (UnionBool) ImplementsAIGatewayEvaluationNewResponseDatasetsFiltersValueUnion() {} func (UnionBool) ImplementsAIGatewayEvaluationListResponseDatasetsFiltersValueUnion() {} func (UnionBool) ImplementsAIGatewayEvaluationDeleteResponseDatasetsFiltersValueUnion() {} @@ -133,7 +131,6 @@ func (UnionFloat) ImplementsAIGatewayDatasetDeleteResponseFiltersValueUnion() func (UnionFloat) ImplementsAIGatewayDatasetGetResponseFiltersValueUnion() {} func (UnionFloat) ImplementsAIGatewayDatasetNewParamsFiltersValueUnion() {} func (UnionFloat) ImplementsAIGatewayDatasetUpdateParamsFiltersValueUnion() {} -func (UnionFloat) ImplementsAIGatewayDatasetListParamsFiltersValueUnion() {} func (UnionFloat) ImplementsAIGatewayEvaluationNewResponseDatasetsFiltersValueUnion() {} func (UnionFloat) ImplementsAIGatewayEvaluationListResponseDatasetsFiltersValueUnion() {} func (UnionFloat) ImplementsAIGatewayEvaluationDeleteResponseDatasetsFiltersValueUnion() {}