diff --git a/arkruntime/model/images/oas_json_gen.go b/arkruntime/model/images/oas_json_gen.go index 6f8fe46..2e19353 100644 --- a/arkruntime/model/images/oas_json_gen.go +++ b/arkruntime/model/images/oas_json_gen.go @@ -529,6 +529,12 @@ func (s *ImageDataItem) encodeFields(e *jx.Encoder) { s.Error.Encode(e) } } + { + if s.OutputFormat.Set { + e.FieldStart("output_format") + s.OutputFormat.Encode(e) + } + } { if s.ZIndex.Set { e.FieldStart("z_index") @@ -555,15 +561,16 @@ func (s *ImageDataItem) encodeFields(e *jx.Encoder) { } } -var jsonFieldsNameOfImageDataItem = [8]string{ +var jsonFieldsNameOfImageDataItem = [9]string{ 0: "url", 1: "b64_json", 2: "size", 3: "error", - 4: "z_index", - 5: "bounding_box", - 6: "name", - 7: "description", + 4: "output_format", + 5: "z_index", + 6: "bounding_box", + 7: "name", + 8: "description", } // Decode decodes ImageDataItem from json. @@ -614,6 +621,16 @@ func (s *ImageDataItem) Decode(d *jx.Decoder) error { }(); err != nil { return errors.Wrap(err, "decode field \"error\"") } + case "output_format": + if err := func() error { + s.OutputFormat.Reset() + if err := s.OutputFormat.Decode(d); err != nil { + return err + } + return nil + }(); err != nil { + return errors.Wrap(err, "decode field \"output_format\"") + } case "z_index": if err := func() error { s.ZIndex.Reset() @@ -2290,6 +2307,10 @@ func (s *Usage) Encode(e *jx.Encoder) { // encodeFields encodes fields. func (s *Usage) encodeFields(e *jx.Encoder) { + { + e.FieldStart("input_images") + e.Int64(s.InputImages) + } { e.FieldStart("generated_images") e.Int64(s.GeneratedImages) @@ -2314,11 +2335,12 @@ func (s *Usage) encodeFields(e *jx.Encoder) { } } -var jsonFieldsNameOfUsage = [4]string{ - 0: "generated_images", - 1: "output_tokens", - 2: "total_tokens", - 3: "tool_usage", +var jsonFieldsNameOfUsage = [5]string{ + 0: "input_images", + 1: "generated_images", + 2: "output_tokens", + 3: "total_tokens", + 4: "tool_usage", } // Decode decodes Usage from json. @@ -2330,8 +2352,20 @@ func (s *Usage) Decode(d *jx.Decoder) error { if err := d.ObjBytes(func(d *jx.Decoder, k []byte) error { switch string(k) { - case "generated_images": + case "input_images": requiredBitSet[0] |= 1 << 0 + if err := func() error { + v, err := d.Int64() + s.InputImages = int64(v) + if err != nil { + return err + } + return nil + }(); err != nil { + return errors.Wrap(err, "decode field \"input_images\"") + } + case "generated_images": + requiredBitSet[0] |= 1 << 1 if err := func() error { v, err := d.Int64() s.GeneratedImages = int64(v) @@ -2382,7 +2416,7 @@ func (s *Usage) Decode(d *jx.Decoder) error { // Validate required fields. var failures []validate.FieldError for i, mask := range [1]uint8{ - 0b00000001, + 0b00000011, } { if result := (requiredBitSet[i] & mask) ^ mask; result != 0 { // Mask only required fields and check equality to mask using XOR. diff --git a/arkruntime/model/images/oas_schemas_gen.go b/arkruntime/model/images/oas_schemas_gen.go index aa02bdb..88ee857 100644 --- a/arkruntime/model/images/oas_schemas_gen.go +++ b/arkruntime/model/images/oas_schemas_gen.go @@ -249,6 +249,8 @@ type ImageDataItem struct { Size OptString `json:"size"` // Per-image failure (set when this slot failed while others succeeded). Error OptImageError `json:"error"` + // Actual container/codec used for this image. + OutputFormat OptOutputFormat `json:"output_format"` // Layer stacking order. The base image is `0`; layers follow bottom-up. ZIndex OptInt32 `json:"z_index"` // Layer region in the base image. Omitted for the base image. @@ -279,6 +281,11 @@ func (s *ImageDataItem) GetError() OptImageError { return s.Error } +// GetOutputFormat returns the value of OutputFormat. +func (s *ImageDataItem) GetOutputFormat() OptOutputFormat { + return s.OutputFormat +} + // GetZIndex returns the value of ZIndex. func (s *ImageDataItem) GetZIndex() OptInt32 { return s.ZIndex @@ -319,6 +326,11 @@ func (s *ImageDataItem) SetError(val OptImageError) { s.Error = val } +// SetOutputFormat sets the value of OutputFormat. +func (s *ImageDataItem) SetOutputFormat(val OptOutputFormat) { + s.OutputFormat = val +} + // SetZIndex sets the value of ZIndex. func (s *ImageDataItem) SetZIndex(val OptInt32) { s.ZIndex = val @@ -1594,6 +1606,8 @@ func (s *ToolUsage) SetWebSearch(val OptInt64) { // Ref: #/components/schemas/Usage type Usage struct { + // Number of reference images supplied by the client. + InputImages int64 `json:"input_images"` // Number of images returned in `data`. GeneratedImages int64 `json:"generated_images"` // Output tokens consumed (for prompt rewriting / reasoning). @@ -1604,6 +1618,11 @@ type Usage struct { ToolUsage OptToolUsage `json:"tool_usage"` } +// GetInputImages returns the value of InputImages. +func (s *Usage) GetInputImages() int64 { + return s.InputImages +} + // GetGeneratedImages returns the value of GeneratedImages. func (s *Usage) GetGeneratedImages() int64 { return s.GeneratedImages @@ -1624,6 +1643,11 @@ func (s *Usage) GetToolUsage() OptToolUsage { return s.ToolUsage } +// SetInputImages sets the value of InputImages. +func (s *Usage) SetInputImages(val int64) { + s.InputImages = val +} + // SetGeneratedImages sets the value of GeneratedImages. func (s *Usage) SetGeneratedImages(val int64) { s.GeneratedImages = val diff --git a/arkruntime/model/images/oas_validators_gen.go b/arkruntime/model/images/oas_validators_gen.go index 8261230..f560771 100644 --- a/arkruntime/model/images/oas_validators_gen.go +++ b/arkruntime/model/images/oas_validators_gen.go @@ -157,12 +157,67 @@ func (s *CreateImageGenerationRequest) Validate() error { return nil } +func (s *ImageDataItem) Validate() error { + if s == nil { + return validate.ErrNilPointer + } + + var failures []validate.FieldError + if err := func() error { + if value, ok := s.OutputFormat.Get(); ok { + if err := func() error { + if err := value.Validate(); err != nil { + return err + } + return nil + }(); err != nil { + return err + } + } + return nil + }(); err != nil { + failures = append(failures, validate.FieldError{ + Name: "output_format", + Error: err, + }) + } + if len(failures) > 0 { + return &validate.Error{Fields: failures} + } + return nil +} + func (s *ImageGenerationResponse) Validate() error { if s == nil { return validate.ErrNilPointer } var failures []validate.FieldError + if err := func() error { + var failures []validate.FieldError + for i, elem := range s.Data { + if err := func() error { + if err := elem.Validate(); err != nil { + return err + } + return nil + }(); err != nil { + failures = append(failures, validate.FieldError{ + Name: fmt.Sprintf("[%d]", i), + Error: err, + }) + } + } + if len(failures) > 0 { + return &validate.Error{Fields: failures} + } + return nil + }(); err != nil { + failures = append(failures, validate.FieldError{ + Name: "data", + Error: err, + }) + } if err := func() error { var failures []validate.FieldError for i, elem := range s.Tools {