From e89ffbd46203b68c20d9301fa924bbf016f47b4c Mon Sep 17 00:00:00 2001 From: fern-api <115122769+fern-api[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:10:47 +0000 Subject: [PATCH 1/2] SDK regeneration --- core/request_option.go | 2 +- go.mod | 2 -- go.sum | 4 --- types.go | 64 ++++++++---------------------------------- 4 files changed, 13 insertions(+), 59 deletions(-) diff --git a/core/request_option.go b/core/request_option.go index d495892..4267ff4 100644 --- a/core/request_option.go +++ b/core/request_option.go @@ -56,7 +56,7 @@ func (r *RequestOptions) cloneHeader() http.Header { headers := r.HTTPHeader.Clone() headers.Set("X-Fern-Language", "Go") headers.Set("X-Fern-SDK-Name", "github.com/cohere-ai/cohere-go/v2") - headers.Set("X-Fern-SDK-Version", "v2.8.3") + headers.Set("X-Fern-SDK-Version", "v2.8.5") return headers } diff --git a/go.mod b/go.mod index ffb7b4b..ac8fdef 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,11 @@ module github.com/cohere-ai/cohere-go/v2 go 1.18 require ( - github.com/aws/aws-sdk-go-v2 v1.28.0 github.com/google/uuid v1.4.0 github.com/stretchr/testify v1.7.0 ) require ( - github.com/aws/smithy-go v1.20.2 // indirect github.com/davecgh/go-spew v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 9e68cd1..b3766d4 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,3 @@ -github.com/aws/aws-sdk-go-v2 v1.28.0 h1:ne6ftNhY0lUvlazMUQF15FF6NH80wKmPRFG7g2q6TCw= -github.com/aws/aws-sdk-go-v2 v1.28.0/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= -github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= -github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= diff --git a/types.go b/types.go index db9056c..b1672b0 100644 --- a/types.go +++ b/types.go @@ -4539,9 +4539,11 @@ func (p *ParseInfo) String() string { return fmt.Sprintf("%#v", p) } +type RerankDocument = map[string]string + type RerankRequestDocumentsItem struct { - String string - RerankRequestDocumentsItemText *RerankRequestDocumentsItemText + String string + RerankDocument RerankDocument } func (r *RerankRequestDocumentsItem) UnmarshalJSON(data []byte) error { @@ -4550,9 +4552,9 @@ func (r *RerankRequestDocumentsItem) UnmarshalJSON(data []byte) error { r.String = valueString return nil } - valueRerankRequestDocumentsItemText := new(RerankRequestDocumentsItemText) - if err := json.Unmarshal(data, &valueRerankRequestDocumentsItemText); err == nil { - r.RerankRequestDocumentsItemText = valueRerankRequestDocumentsItemText + var valueRerankDocument RerankDocument + if err := json.Unmarshal(data, &valueRerankDocument); err == nil { + r.RerankDocument = valueRerankDocument return nil } return fmt.Errorf("%s cannot be deserialized as a %T", data, r) @@ -4562,69 +4564,27 @@ func (r RerankRequestDocumentsItem) MarshalJSON() ([]byte, error) { if r.String != "" { return json.Marshal(r.String) } - if r.RerankRequestDocumentsItemText != nil { - return json.Marshal(r.RerankRequestDocumentsItemText) + if r.RerankDocument != nil { + return json.Marshal(r.RerankDocument) } return nil, fmt.Errorf("type %T does not include a non-empty union type", r) } type RerankRequestDocumentsItemVisitor interface { VisitString(string) error - VisitRerankRequestDocumentsItemText(*RerankRequestDocumentsItemText) error + VisitRerankDocument(RerankDocument) error } func (r *RerankRequestDocumentsItem) Accept(visitor RerankRequestDocumentsItemVisitor) error { if r.String != "" { return visitor.VisitString(r.String) } - if r.RerankRequestDocumentsItemText != nil { - return visitor.VisitRerankRequestDocumentsItemText(r.RerankRequestDocumentsItemText) + if r.RerankDocument != nil { + return visitor.VisitRerankDocument(r.RerankDocument) } return fmt.Errorf("type %T does not include a non-empty union type", r) } -type RerankRequestDocumentsItemText struct { - // The text of the document to rerank. - Text string `json:"text" url:"text"` - - extraProperties map[string]interface{} - _rawJSON json.RawMessage -} - -func (r *RerankRequestDocumentsItemText) GetExtraProperties() map[string]interface{} { - return r.extraProperties -} - -func (r *RerankRequestDocumentsItemText) UnmarshalJSON(data []byte) error { - type unmarshaler RerankRequestDocumentsItemText - var value unmarshaler - if err := json.Unmarshal(data, &value); err != nil { - return err - } - *r = RerankRequestDocumentsItemText(value) - - extraProperties, err := core.ExtractExtraProperties(data, *r) - if err != nil { - return err - } - r.extraProperties = extraProperties - - r._rawJSON = json.RawMessage(data) - return nil -} - -func (r *RerankRequestDocumentsItemText) String() string { - if len(r._rawJSON) > 0 { - if value, err := core.StringifyJSON(r._rawJSON); err == nil { - return value - } - } - if value, err := core.StringifyJSON(r); err == nil { - return value - } - return fmt.Sprintf("%#v", r) -} - type RerankResponse struct { Id *string `json:"id,omitempty" url:"id,omitempty"` // An ordered list of ranked documents From e0865bc1aa6c94fdc2dabb23412dc3b4a145e311 Mon Sep 17 00:00:00 2001 From: Billy Trend Date: Thu, 4 Jul 2024 16:15:55 +0100 Subject: [PATCH 2/2] Tidy --- go.mod | 2 ++ go.sum | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/go.mod b/go.mod index ac8fdef..28de4f3 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,13 @@ module github.com/cohere-ai/cohere-go/v2 go 1.18 require ( + github.com/aws/aws-sdk-go-v2 v1.30.1 github.com/google/uuid v1.4.0 github.com/stretchr/testify v1.7.0 ) require ( + github.com/aws/smithy-go v1.20.3 // indirect github.com/davecgh/go-spew v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index b3766d4..9dc1bcf 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,7 @@ +github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NPV+o= +github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= +github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE= +github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=