From 021fd3fcb54ae0df3849c47a4f3875d6b7d13669 Mon Sep 17 00:00:00 2001 From: Dax Raad Date: Mon, 9 Jun 2025 14:01:11 -0400 Subject: sync --- packages/tui/pkg/client/gen/openapi.json | 259 ++++++++++++++++------ packages/tui/pkg/client/generated-client.go | 332 ++++++++++++++++++++++++---- 2 files changed, 489 insertions(+), 102 deletions(-) (limited to 'packages/tui') diff --git a/packages/tui/pkg/client/gen/openapi.json b/packages/tui/pkg/client/gen/openapi.json index f329b48b3..e8dfa9eef 100644 --- a/packages/tui/pkg/client/gen/openapi.json +++ b/packages/tui/pkg/client/gen/openapi.json @@ -158,6 +158,16 @@ } } } + }, + "400": { + "description": "Bad request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Error" + } + } + } } }, "operationId": "postSession_create", @@ -439,30 +449,34 @@ "$ref": "#/components/schemas/Event.storage.write" }, { - "$ref": "#/components/schemas/Event.message.updated" + "$ref": "#/components/schemas/Event.lsp.client.diagnostics" }, { - "$ref": "#/components/schemas/Event.message.part.updated" + "$ref": "#/components/schemas/Event.permission.updated" }, { - "$ref": "#/components/schemas/Event.lsp.client.diagnostics" + "$ref": "#/components/schemas/Event.message.updated" }, { - "$ref": "#/components/schemas/Event.permission.updated" + "$ref": "#/components/schemas/Event.message.part.updated" }, { "$ref": "#/components/schemas/Event.session.updated" + }, + { + "$ref": "#/components/schemas/Event.session.error" } ], "discriminator": { "propertyName": "type", "mapping": { "storage.write": "#/components/schemas/Event.storage.write", - "message.updated": "#/components/schemas/Event.message.updated", - "message.part.updated": "#/components/schemas/Event.message.part.updated", "lsp.client.diagnostics": "#/components/schemas/Event.lsp.client.diagnostics", "permission.updated": "#/components/schemas/Event.permission.updated", - "session.updated": "#/components/schemas/Event.session.updated" + "message.updated": "#/components/schemas/Event.message.updated", + "message.part.updated": "#/components/schemas/Event.message.part.updated", + "session.updated": "#/components/schemas/Event.session.updated", + "session.error": "#/components/schemas/Event.session.error" } } }, @@ -491,6 +505,86 @@ "properties" ] }, + "Event.lsp.client.diagnostics": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "lsp.client.diagnostics" + }, + "properties": { + "type": "object", + "properties": { + "serverID": { + "type": "string" + }, + "path": { + "type": "string" + } + }, + "required": [ + "serverID", + "path" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, + "Event.permission.updated": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "permission.updated" + }, + "properties": { + "$ref": "#/components/schemas/permission.info" + } + }, + "required": [ + "type", + "properties" + ] + }, + "permission.info": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "sessionID": { + "type": "string" + }, + "title": { + "type": "string" + }, + "metadata": { + "type": "object", + "additionalProperties": {} + }, + "time": { + "type": "object", + "properties": { + "created": { + "type": "number" + } + }, + "required": [ + "created" + ] + } + }, + "required": [ + "id", + "sessionID", + "title", + "metadata", + "time" + ] + }, "Event.message.updated": { "type": "object", "properties": { @@ -553,7 +647,21 @@ ] }, "error": { - "type": "string" + "oneOf": [ + { + "$ref": "#/components/schemas/ProviderAuthError" + }, + { + "$ref": "#/components/schemas/UnknownError" + } + ], + "discriminator": { + "propertyName": "name", + "mapping": { + "ProviderAuthError": "#/components/schemas/ProviderAuthError", + "UnknownError": "#/components/schemas/UnknownError" + } + } }, "sessionID": { "type": "string" @@ -607,6 +715,7 @@ }, "required": [ "time", + "error", "sessionID", "tool" ] @@ -863,108 +972,80 @@ "type" ] }, - "Event.message.part.updated": { + "ProviderAuthError": { "type": "object", "properties": { - "type": { + "name": { "type": "string", - "const": "message.part.updated" + "const": "ProviderAuthError" }, - "properties": { + "data": { "type": "object", "properties": { - "part": { - "$ref": "#/components/schemas/Message.Part" + "providerID": { + "type": "string" + }, + "message": { + "type": "string" } }, "required": [ - "part" + "providerID", + "message" ] } }, "required": [ - "type", - "properties" + "name", + "data" ] }, - "Event.lsp.client.diagnostics": { + "UnknownError": { "type": "object", "properties": { - "type": { + "name": { "type": "string", - "const": "lsp.client.diagnostics" + "const": "UnknownError" }, - "properties": { + "data": { "type": "object", "properties": { - "serverID": { - "type": "string" - }, - "path": { + "message": { "type": "string" } }, "required": [ - "serverID", - "path" + "message" ] } }, "required": [ - "type", - "properties" + "name", + "data" ] }, - "Event.permission.updated": { + "Event.message.part.updated": { "type": "object", "properties": { "type": { "type": "string", - "const": "permission.updated" + "const": "message.part.updated" }, "properties": { - "$ref": "#/components/schemas/permission.info" - } - }, - "required": [ - "type", - "properties" - ] - }, - "permission.info": { - "type": "object", - "properties": { - "id": { - "type": "string" - }, - "sessionID": { - "type": "string" - }, - "title": { - "type": "string" - }, - "metadata": { - "type": "object", - "additionalProperties": {} - }, - "time": { "type": "object", "properties": { - "created": { - "type": "number" + "part": { + "$ref": "#/components/schemas/Message.Part" } }, "required": [ - "created" + "part" ] } }, "required": [ - "id", - "sessionID", - "title", - "metadata", - "time" + "type", + "properties" ] }, "Event.session.updated": { @@ -1038,6 +1119,44 @@ "time" ] }, + "Event.session.error": { + "type": "object", + "properties": { + "type": { + "type": "string", + "const": "session.error" + }, + "properties": { + "type": "object", + "properties": { + "error": { + "oneOf": [ + { + "$ref": "#/components/schemas/ProviderAuthError" + }, + { + "$ref": "#/components/schemas/UnknownError" + } + ], + "discriminator": { + "propertyName": "name", + "mapping": { + "ProviderAuthError": "#/components/schemas/ProviderAuthError", + "UnknownError": "#/components/schemas/UnknownError" + } + } + } + }, + "required": [ + "error" + ] + } + }, + "required": [ + "type", + "properties" + ] + }, "App.Info": { "type": "object", "properties": { @@ -1086,6 +1205,18 @@ "time" ] }, + "Error": { + "type": "object", + "properties": { + "data": { + "type": "object", + "additionalProperties": {} + } + }, + "required": [ + "data" + ] + }, "Provider.Info": { "type": "object", "properties": { diff --git a/packages/tui/pkg/client/generated-client.go b/packages/tui/pkg/client/generated-client.go index 247af33a7..5e5a34417 100644 --- a/packages/tui/pkg/client/generated-client.go +++ b/packages/tui/pkg/client/generated-client.go @@ -39,6 +39,11 @@ type AppInfo struct { User string `json:"user"` } +// Error defines model for Error. +type Error struct { + Data map[string]interface{} `json:"data"` +} + // Event defines model for Event. type Event struct { union json.RawMessage @@ -75,6 +80,19 @@ type EventPermissionUpdated struct { Type string `json:"type"` } +// EventSessionError defines model for Event.session.error. +type EventSessionError struct { + Properties struct { + Error EventSessionError_Properties_Error `json:"error"` + } `json:"properties"` + Type string `json:"type"` +} + +// EventSessionError_Properties_Error defines model for EventSessionError.Properties.Error. +type EventSessionError_Properties_Error struct { + union json.RawMessage +} + // EventSessionUpdated defines model for Event.session.updated. type EventSessionUpdated struct { Properties struct { @@ -107,8 +125,8 @@ type MessageInfo struct { Reasoning float32 `json:"reasoning"` } `json:"tokens"` } `json:"assistant,omitempty"` - Error *string `json:"error,omitempty"` - SessionID string `json:"sessionID"` + Error MessageInfo_Metadata_Error `json:"error"` + SessionID string `json:"sessionID"` Time struct { Completed *float32 `json:"completed,omitempty"` Created float32 `json:"created"` @@ -119,6 +137,11 @@ type MessageInfo struct { Role MessageInfoRole `json:"role"` } +// MessageInfo_Metadata_Error defines model for MessageInfo.Metadata.Error. +type MessageInfo_Metadata_Error struct { + union json.RawMessage +} + // MessageInfoRole defines model for MessageInfo.Role. type MessageInfoRole string @@ -226,6 +249,23 @@ type ProviderModel struct { Reasoning *bool `json:"reasoning,omitempty"` } +// ProviderAuthError defines model for ProviderAuthError. +type ProviderAuthError struct { + Data struct { + Message string `json:"message"` + ProviderID string `json:"providerID"` + } `json:"data"` + Name string `json:"name"` +} + +// UnknownError defines model for UnknownError. +type UnknownError struct { + Data struct { + Message string `json:"message"` + } `json:"data"` + Name string `json:"name"` +} + // PermissionInfo defines model for permission.info. type PermissionInfo struct { Id string `json:"id"` @@ -334,24 +374,24 @@ func (t *Event) MergeEventStorageWrite(v EventStorageWrite) error { return err } -// AsEventMessageUpdated returns the union data inside the Event as a EventMessageUpdated -func (t Event) AsEventMessageUpdated() (EventMessageUpdated, error) { - var body EventMessageUpdated +// AsEventLspClientDiagnostics returns the union data inside the Event as a EventLspClientDiagnostics +func (t Event) AsEventLspClientDiagnostics() (EventLspClientDiagnostics, error) { + var body EventLspClientDiagnostics err := json.Unmarshal(t.union, &body) return body, err } -// FromEventMessageUpdated overwrites any union data inside the Event as the provided EventMessageUpdated -func (t *Event) FromEventMessageUpdated(v EventMessageUpdated) error { - v.Type = "message.updated" +// FromEventLspClientDiagnostics overwrites any union data inside the Event as the provided EventLspClientDiagnostics +func (t *Event) FromEventLspClientDiagnostics(v EventLspClientDiagnostics) error { + v.Type = "lsp.client.diagnostics" b, err := json.Marshal(v) t.union = b return err } -// MergeEventMessageUpdated performs a merge with any union data inside the Event, using the provided EventMessageUpdated -func (t *Event) MergeEventMessageUpdated(v EventMessageUpdated) error { - v.Type = "message.updated" +// MergeEventLspClientDiagnostics performs a merge with any union data inside the Event, using the provided EventLspClientDiagnostics +func (t *Event) MergeEventLspClientDiagnostics(v EventLspClientDiagnostics) error { + v.Type = "lsp.client.diagnostics" b, err := json.Marshal(v) if err != nil { return err @@ -362,24 +402,24 @@ func (t *Event) MergeEventMessageUpdated(v EventMessageUpdated) error { return err } -// AsEventMessagePartUpdated returns the union data inside the Event as a EventMessagePartUpdated -func (t Event) AsEventMessagePartUpdated() (EventMessagePartUpdated, error) { - var body EventMessagePartUpdated +// AsEventPermissionUpdated returns the union data inside the Event as a EventPermissionUpdated +func (t Event) AsEventPermissionUpdated() (EventPermissionUpdated, error) { + var body EventPermissionUpdated err := json.Unmarshal(t.union, &body) return body, err } -// FromEventMessagePartUpdated overwrites any union data inside the Event as the provided EventMessagePartUpdated -func (t *Event) FromEventMessagePartUpdated(v EventMessagePartUpdated) error { - v.Type = "message.part.updated" +// FromEventPermissionUpdated overwrites any union data inside the Event as the provided EventPermissionUpdated +func (t *Event) FromEventPermissionUpdated(v EventPermissionUpdated) error { + v.Type = "permission.updated" b, err := json.Marshal(v) t.union = b return err } -// MergeEventMessagePartUpdated performs a merge with any union data inside the Event, using the provided EventMessagePartUpdated -func (t *Event) MergeEventMessagePartUpdated(v EventMessagePartUpdated) error { - v.Type = "message.part.updated" +// MergeEventPermissionUpdated performs a merge with any union data inside the Event, using the provided EventPermissionUpdated +func (t *Event) MergeEventPermissionUpdated(v EventPermissionUpdated) error { + v.Type = "permission.updated" b, err := json.Marshal(v) if err != nil { return err @@ -390,24 +430,24 @@ func (t *Event) MergeEventMessagePartUpdated(v EventMessagePartUpdated) error { return err } -// AsEventLspClientDiagnostics returns the union data inside the Event as a EventLspClientDiagnostics -func (t Event) AsEventLspClientDiagnostics() (EventLspClientDiagnostics, error) { - var body EventLspClientDiagnostics +// AsEventMessageUpdated returns the union data inside the Event as a EventMessageUpdated +func (t Event) AsEventMessageUpdated() (EventMessageUpdated, error) { + var body EventMessageUpdated err := json.Unmarshal(t.union, &body) return body, err } -// FromEventLspClientDiagnostics overwrites any union data inside the Event as the provided EventLspClientDiagnostics -func (t *Event) FromEventLspClientDiagnostics(v EventLspClientDiagnostics) error { - v.Type = "lsp.client.diagnostics" +// FromEventMessageUpdated overwrites any union data inside the Event as the provided EventMessageUpdated +func (t *Event) FromEventMessageUpdated(v EventMessageUpdated) error { + v.Type = "message.updated" b, err := json.Marshal(v) t.union = b return err } -// MergeEventLspClientDiagnostics performs a merge with any union data inside the Event, using the provided EventLspClientDiagnostics -func (t *Event) MergeEventLspClientDiagnostics(v EventLspClientDiagnostics) error { - v.Type = "lsp.client.diagnostics" +// MergeEventMessageUpdated performs a merge with any union data inside the Event, using the provided EventMessageUpdated +func (t *Event) MergeEventMessageUpdated(v EventMessageUpdated) error { + v.Type = "message.updated" b, err := json.Marshal(v) if err != nil { return err @@ -418,24 +458,24 @@ func (t *Event) MergeEventLspClientDiagnostics(v EventLspClientDiagnostics) erro return err } -// AsEventPermissionUpdated returns the union data inside the Event as a EventPermissionUpdated -func (t Event) AsEventPermissionUpdated() (EventPermissionUpdated, error) { - var body EventPermissionUpdated +// AsEventMessagePartUpdated returns the union data inside the Event as a EventMessagePartUpdated +func (t Event) AsEventMessagePartUpdated() (EventMessagePartUpdated, error) { + var body EventMessagePartUpdated err := json.Unmarshal(t.union, &body) return body, err } -// FromEventPermissionUpdated overwrites any union data inside the Event as the provided EventPermissionUpdated -func (t *Event) FromEventPermissionUpdated(v EventPermissionUpdated) error { - v.Type = "permission.updated" +// FromEventMessagePartUpdated overwrites any union data inside the Event as the provided EventMessagePartUpdated +func (t *Event) FromEventMessagePartUpdated(v EventMessagePartUpdated) error { + v.Type = "message.part.updated" b, err := json.Marshal(v) t.union = b return err } -// MergeEventPermissionUpdated performs a merge with any union data inside the Event, using the provided EventPermissionUpdated -func (t *Event) MergeEventPermissionUpdated(v EventPermissionUpdated) error { - v.Type = "permission.updated" +// MergeEventMessagePartUpdated performs a merge with any union data inside the Event, using the provided EventMessagePartUpdated +func (t *Event) MergeEventMessagePartUpdated(v EventMessagePartUpdated) error { + v.Type = "message.part.updated" b, err := json.Marshal(v) if err != nil { return err @@ -474,6 +514,34 @@ func (t *Event) MergeEventSessionUpdated(v EventSessionUpdated) error { return err } +// AsEventSessionError returns the union data inside the Event as a EventSessionError +func (t Event) AsEventSessionError() (EventSessionError, error) { + var body EventSessionError + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromEventSessionError overwrites any union data inside the Event as the provided EventSessionError +func (t *Event) FromEventSessionError(v EventSessionError) error { + v.Type = "session.error" + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeEventSessionError performs a merge with any union data inside the Event, using the provided EventSessionError +func (t *Event) MergeEventSessionError(v EventSessionError) error { + v.Type = "session.error" + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + func (t Event) Discriminator() (string, error) { var discriminator struct { Discriminator string `json:"type"` @@ -496,6 +564,8 @@ func (t Event) ValueByDiscriminator() (interface{}, error) { return t.AsEventMessageUpdated() case "permission.updated": return t.AsEventPermissionUpdated() + case "session.error": + return t.AsEventSessionError() case "session.updated": return t.AsEventSessionUpdated() case "storage.write": @@ -515,6 +585,184 @@ func (t *Event) UnmarshalJSON(b []byte) error { return err } +// AsProviderAuthError returns the union data inside the EventSessionError_Properties_Error as a ProviderAuthError +func (t EventSessionError_Properties_Error) AsProviderAuthError() (ProviderAuthError, error) { + var body ProviderAuthError + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromProviderAuthError overwrites any union data inside the EventSessionError_Properties_Error as the provided ProviderAuthError +func (t *EventSessionError_Properties_Error) FromProviderAuthError(v ProviderAuthError) error { + v.Name = "ProviderAuthError" + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeProviderAuthError performs a merge with any union data inside the EventSessionError_Properties_Error, using the provided ProviderAuthError +func (t *EventSessionError_Properties_Error) MergeProviderAuthError(v ProviderAuthError) error { + v.Name = "ProviderAuthError" + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsUnknownError returns the union data inside the EventSessionError_Properties_Error as a UnknownError +func (t EventSessionError_Properties_Error) AsUnknownError() (UnknownError, error) { + var body UnknownError + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromUnknownError overwrites any union data inside the EventSessionError_Properties_Error as the provided UnknownError +func (t *EventSessionError_Properties_Error) FromUnknownError(v UnknownError) error { + v.Name = "UnknownError" + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeUnknownError performs a merge with any union data inside the EventSessionError_Properties_Error, using the provided UnknownError +func (t *EventSessionError_Properties_Error) MergeUnknownError(v UnknownError) error { + v.Name = "UnknownError" + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t EventSessionError_Properties_Error) Discriminator() (string, error) { + var discriminator struct { + Discriminator string `json:"name"` + } + err := json.Unmarshal(t.union, &discriminator) + return discriminator.Discriminator, err +} + +func (t EventSessionError_Properties_Error) ValueByDiscriminator() (interface{}, error) { + discriminator, err := t.Discriminator() + if err != nil { + return nil, err + } + switch discriminator { + case "ProviderAuthError": + return t.AsProviderAuthError() + case "UnknownError": + return t.AsUnknownError() + default: + return nil, errors.New("unknown discriminator value: " + discriminator) + } +} + +func (t EventSessionError_Properties_Error) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *EventSessionError_Properties_Error) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} + +// AsProviderAuthError returns the union data inside the MessageInfo_Metadata_Error as a ProviderAuthError +func (t MessageInfo_Metadata_Error) AsProviderAuthError() (ProviderAuthError, error) { + var body ProviderAuthError + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromProviderAuthError overwrites any union data inside the MessageInfo_Metadata_Error as the provided ProviderAuthError +func (t *MessageInfo_Metadata_Error) FromProviderAuthError(v ProviderAuthError) error { + v.Name = "ProviderAuthError" + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeProviderAuthError performs a merge with any union data inside the MessageInfo_Metadata_Error, using the provided ProviderAuthError +func (t *MessageInfo_Metadata_Error) MergeProviderAuthError(v ProviderAuthError) error { + v.Name = "ProviderAuthError" + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +// AsUnknownError returns the union data inside the MessageInfo_Metadata_Error as a UnknownError +func (t MessageInfo_Metadata_Error) AsUnknownError() (UnknownError, error) { + var body UnknownError + err := json.Unmarshal(t.union, &body) + return body, err +} + +// FromUnknownError overwrites any union data inside the MessageInfo_Metadata_Error as the provided UnknownError +func (t *MessageInfo_Metadata_Error) FromUnknownError(v UnknownError) error { + v.Name = "UnknownError" + b, err := json.Marshal(v) + t.union = b + return err +} + +// MergeUnknownError performs a merge with any union data inside the MessageInfo_Metadata_Error, using the provided UnknownError +func (t *MessageInfo_Metadata_Error) MergeUnknownError(v UnknownError) error { + v.Name = "UnknownError" + b, err := json.Marshal(v) + if err != nil { + return err + } + + merged, err := runtime.JSONMerge(t.union, b) + t.union = merged + return err +} + +func (t MessageInfo_Metadata_Error) Discriminator() (string, error) { + var discriminator struct { + Discriminator string `json:"name"` + } + err := json.Unmarshal(t.union, &discriminator) + return discriminator.Discriminator, err +} + +func (t MessageInfo_Metadata_Error) ValueByDiscriminator() (interface{}, error) { + discriminator, err := t.Discriminator() + if err != nil { + return nil, err + } + switch discriminator { + case "ProviderAuthError": + return t.AsProviderAuthError() + case "UnknownError": + return t.AsUnknownError() + default: + return nil, errors.New("unknown discriminator value: " + discriminator) + } +} + +func (t MessageInfo_Metadata_Error) MarshalJSON() ([]byte, error) { + b, err := t.union.MarshalJSON() + return b, err +} + +func (t *MessageInfo_Metadata_Error) UnmarshalJSON(b []byte) error { + err := t.union.UnmarshalJSON(b) + return err +} + // AsMessagePartText returns the union data inside the MessagePart as a MessagePartText func (t MessagePart) AsMessagePartText() (MessagePartText, error) { var body MessagePartText @@ -1886,6 +2134,7 @@ type PostSessionCreateResponse struct { Body []byte HTTPResponse *http.Response JSON200 *SessionInfo + JSON400 *Error } // Status returns HTTPResponse.Status @@ -2390,6 +2639,13 @@ func ParsePostSessionCreateResponse(rsp *http.Response) (*PostSessionCreateRespo } response.JSON200 = &dest + case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 400: + var dest Error + if err := json.Unmarshal(bodyBytes, &dest); err != nil { + return nil, err + } + response.JSON400 = &dest + } return response, nil -- cgit v1.2.3