From 97665d3c61a42bc1fb357bf81a06f56752ded0dc Mon Sep 17 00:00:00 2001 From: "Crane.z" <1481445951@qq.com> Date: Fri, 28 Aug 2026 11:34:32 +0800 Subject: [PATCH] feat: update terminal AI config protocol --- cmd/impl/convert_pb_test.go | 23 +- cmd/impl/jms.go | 16 +- go.mod | 2 +- go.sum | 4 + pkg/agent/config_model.go | 10 +- pkg/agent/config_model_test.go | 6 +- pkg/agent/provider/provider_test.go | 2 +- pkg/agent/provider/registry.go | 4 +- pkg/agent/provider/types.go | 6 +- protobuf-go/protobuf/common.pb.go | 147 +++--- protobuf-java/org/jumpserver/wisp/Common.java | 489 +++++++++--------- protos/common.proto | 8 +- 12 files changed, 369 insertions(+), 348 deletions(-) diff --git a/cmd/impl/convert_pb_test.go b/cmd/impl/convert_pb_test.go index 1ef2e24..8d18c16 100644 --- a/cmd/impl/convert_pb_test.go +++ b/cmd/impl/convert_pb_test.go @@ -39,12 +39,29 @@ func TestChatAIEnabledByModelConfig(t *testing.T) { enabled bool }{ {name: "missing configuration"}, - {name: "missing model", setting: model.TerminalConfig{GptApiKey: "key"}}, - {name: "missing api key", setting: model.TerminalConfig{GptModel: "model"}}, + { + name: "disabled with complete configuration", + setting: model.TerminalConfig{ + ChatAIApiKey: "key", ChatAIModel: "model", + }, + }, + { + name: "missing model", + setting: model.TerminalConfig{ + ChatAIEnabled: true, ChatAIApiKey: "key", + }, + }, + { + name: "missing api key", + setting: model.TerminalConfig{ + ChatAIEnabled: true, ChatAIModel: "model", + }, + }, { name: "configured without base url", setting: model.TerminalConfig{ - GptApiKey: " key ", GptModel: " model ", + ChatAIEnabled: true, + ChatAIApiKey: " key ", ChatAIModel: " model ", }, enabled: true, }, diff --git a/cmd/impl/jms.go b/cmd/impl/jms.go index 1a0bfc3..d24d9f5 100644 --- a/cmd/impl/jms.go +++ b/cmd/impl/jms.go @@ -46,12 +46,10 @@ type JMServer struct { agentLimiter *agentRequestLimiter } -// chatAIEnabledByModelConfig mirrors Koko new_terminal while Core versions do -// not expose CHAT_AI_ENABLED. The provider URL is optional and may use its -// default; both the API key and model are required. func chatAIEnabledByModelConfig(setting model.TerminalConfig) bool { - return strings.TrimSpace(setting.GptApiKey) != "" && - strings.TrimSpace(setting.GptModel) != "" + return setting.ChatAIEnabled && + strings.TrimSpace(setting.ChatAIApiKey) != "" && + strings.TrimSpace(setting.ChatAIModel) != "" } func (j *JMServer) GetTokenAuthInfo(ctx context.Context, req *pb.TokenRequest) (*pb.TokenResponse, error) { @@ -414,10 +412,10 @@ func (j *JMServer) GetPublicSetting(ctx context.Context, empty *pb.Empty) (*pb.P pbSetting := pb.PublicSetting{ XpackEnabled: data.XpackEnabled, ValidLicense: data.ValidLicense, - GptBaseUrl: setting.GptBaseUrl, - GptApiKey: setting.GptApiKey, - GptProxy: setting.GptProxy, - GptModel: setting.GptModel, + ChatAiBaseUrl: setting.ChatAIBaseUrl, + ChatAiApiKey: setting.ChatAIApiKey, + ChatAiProxy: setting.ChatAIProxy, + ChatAiModel: setting.ChatAIModel, LicenseContent: setting.LicenseContent, } return &pb.PublicSettingResponse{Status: &status, Data: &pbSetting}, nil diff --git a/go.mod b/go.mod index a17cbd9..c70876a 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.25.0 require ( github.com/gorilla/websocket v1.5.3 - github.com/jumpserver-dev/sdk-go v0.0.0-20260821083952-82cf2e23d207 + github.com/jumpserver-dev/sdk-go v0.0.0-20260828033126-f4e075c4714b github.com/openai/openai-go/v3 v3.46.0 github.com/sirupsen/logrus v1.9.4 github.com/spf13/cobra v1.10.1 diff --git a/go.sum b/go.sum index 9bfd95c..befd000 100644 --- a/go.sum +++ b/go.sum @@ -75,6 +75,10 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfC github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= github.com/jumpserver-dev/sdk-go v0.0.0-20260821083952-82cf2e23d207 h1:hbYIaxsxF47XyTGRxxKt74lmPaGjjNlYBomnaSEhnR8= github.com/jumpserver-dev/sdk-go v0.0.0-20260821083952-82cf2e23d207/go.mod h1:QmnL7BRb74/XY1nu8kWQWs6DHXt3uIaWkDCkQSRyZlM= +github.com/jumpserver-dev/sdk-go v0.0.0-20260828032902-adf185d94ce0 h1:Pzp9f9v+taN+i60jiFMqp4/NTfcrXLsGGZeNT4Qffl4= +github.com/jumpserver-dev/sdk-go v0.0.0-20260828032902-adf185d94ce0/go.mod h1:QmnL7BRb74/XY1nu8kWQWs6DHXt3uIaWkDCkQSRyZlM= +github.com/jumpserver-dev/sdk-go v0.0.0-20260828033126-f4e075c4714b h1:QKPiNmNt1LXPTKwRHs5OX4bbl6F5RIlgk8O1rpTT3A0= +github.com/jumpserver-dev/sdk-go v0.0.0-20260828033126-f4e075c4714b/go.mod h1:QmnL7BRb74/XY1nu8kWQWs6DHXt3uIaWkDCkQSRyZlM= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= diff --git a/pkg/agent/config_model.go b/pkg/agent/config_model.go index 3ef64d8..d637039 100644 --- a/pkg/agent/config_model.go +++ b/pkg/agent/config_model.go @@ -32,17 +32,17 @@ func NewConfigWithDataRoot( dataRoot string, auditEnabled bool, ) Config { - name := strings.TrimSpace(modelConfig.ChatAIType) + name := strings.TrimSpace(modelConfig.ChatAIProvider) if name == "" { name = strings.TrimSpace(os.Getenv(providerEnvName)) } if name == "" { - name = provider.NameGPT + name = provider.NameOpenAICompatible } providerConfig := provider.NormalizeConfig(provider.Config{ - Name: name, APIKey: modelConfig.GptApiKey, - BaseURL: modelConfig.GptBaseUrl, Model: modelConfig.GptModel, - Proxy: modelConfig.GptProxy, ToolCallMode: os.Getenv(toolCallEnvName), + Name: name, APIKey: modelConfig.ChatAIApiKey, + BaseURL: modelConfig.ChatAIBaseUrl, Model: modelConfig.ChatAIModel, + Proxy: modelConfig.ChatAIProxy, ToolCallMode: os.Getenv(toolCallEnvName), ReasoningMode: provider.ReasoningAuto, Store: false, NativeCompaction: false, ContextSoftLimitPercent: 80, RequestTimeout: 5 * time.Minute, diff --git a/pkg/agent/config_model_test.go b/pkg/agent/config_model_test.go index c81916f..2b98ce3 100644 --- a/pkg/agent/config_model_test.go +++ b/pkg/agent/config_model_test.go @@ -7,11 +7,11 @@ import ( "github.com/jumpserver/wisp/pkg/agent/provider" ) -func TestConfigPrefersChatAIType(t *testing.T) { +func TestConfigPrefersChatAIProvider(t *testing.T) { t.Setenv(providerEnvName, provider.NameOpenAI) - config := NewConfig(model.TerminalConfig{ChatAIType: provider.NameDeepSeek}) + config := NewConfig(model.TerminalConfig{ChatAIProvider: provider.NameDeepSeek}) if config.Provider.Name != provider.NameDeepSeek { - t.Fatalf("provider = %q, want ChatAIType", config.Provider.Name) + t.Fatalf("provider = %q, want ChatAIProvider", config.Provider.Name) } config = NewConfig(model.TerminalConfig{}) if config.Provider.Name != provider.NameOpenAI { diff --git a/pkg/agent/provider/provider_test.go b/pkg/agent/provider/provider_test.go index 7ada7da..4ff812a 100644 --- a/pkg/agent/provider/provider_test.go +++ b/pkg/agent/provider/provider_test.go @@ -15,7 +15,7 @@ func TestProviderRoutingAndModelLimits(t *testing.T) { name string transport string }{ - {NameGPT, "chat-completions"}, + {NameOpenAICompatible, "chat-completions"}, {NameOpenAI, "responses"}, {NameDeepSeek, "deepseek-chat-completions"}, {"custom", "chat-completions"}, diff --git a/pkg/agent/provider/registry.go b/pkg/agent/provider/registry.go index c46e30b..38ed009 100644 --- a/pkg/agent/provider/registry.go +++ b/pkg/agent/provider/registry.go @@ -13,7 +13,7 @@ var registry = struct { }{factories: make(map[string]Factory)} func init() { - mustRegister(NameGPT, newCompatibleProvider) + mustRegister(NameOpenAICompatible, newCompatibleProvider) mustRegister(NameOpenAI, newOpenAIProvider) mustRegister(NameDeepSeek, newDeepSeekProvider) mustRegister("deepseek", newDeepSeekProvider) @@ -64,7 +64,7 @@ func NormalizeName(name string) string { func NormalizeConfig(config Config) Config { config.Name = NormalizeName(config.Name) if config.Name == "" { - config.Name = NameGPT + config.Name = NameOpenAICompatible } config.Model = strings.TrimSpace(config.Model) config.BaseURL = strings.TrimSpace(config.BaseURL) diff --git a/pkg/agent/provider/types.go b/pkg/agent/provider/types.go index 6e86c6f..be6a37f 100644 --- a/pkg/agent/provider/types.go +++ b/pkg/agent/provider/types.go @@ -7,9 +7,9 @@ import ( ) const ( - NameGPT = "gpt" - NameOpenAI = "openai" - NameDeepSeek = "deep-seek" + NameOpenAICompatible = "openai_compatible" + NameOpenAI = "openai" + NameDeepSeek = "deep-seek" ToolCallAuto = "auto" ToolCallEnabled = "true" diff --git a/protobuf-go/protobuf/common.pb.go b/protobuf-go/protobuf/common.pb.go index d32fb8a..c1b2273 100644 --- a/protobuf-go/protobuf/common.pb.go +++ b/protobuf-go/protobuf/common.pb.go @@ -1981,10 +1981,10 @@ type PublicSetting struct { XpackEnabled bool `protobuf:"varint,1,opt,name=xpack_enabled,json=xpackEnabled,proto3" json:"xpack_enabled,omitempty"` ValidLicense bool `protobuf:"varint,2,opt,name=valid_license,json=validLicense,proto3" json:"valid_license,omitempty"` - GptBaseUrl string `protobuf:"bytes,3,opt,name=gpt_base_url,json=gptBaseUrl,proto3" json:"gpt_base_url,omitempty"` - GptApiKey string `protobuf:"bytes,4,opt,name=gpt_api_key,json=gptApiKey,proto3" json:"gpt_api_key,omitempty"` - GptProxy string `protobuf:"bytes,5,opt,name=gpt_proxy,json=gptProxy,proto3" json:"gpt_proxy,omitempty"` - GptModel string `protobuf:"bytes,6,opt,name=gpt_model,json=gptModel,proto3" json:"gpt_model,omitempty"` + ChatAiBaseUrl string `protobuf:"bytes,3,opt,name=chat_ai_base_url,json=chatAiBaseUrl,proto3" json:"chat_ai_base_url,omitempty"` + ChatAiApiKey string `protobuf:"bytes,4,opt,name=chat_ai_api_key,json=chatAiApiKey,proto3" json:"chat_ai_api_key,omitempty"` + ChatAiProxy string `protobuf:"bytes,5,opt,name=chat_ai_proxy,json=chatAiProxy,proto3" json:"chat_ai_proxy,omitempty"` + ChatAiModel string `protobuf:"bytes,6,opt,name=chat_ai_model,json=chatAiModel,proto3" json:"chat_ai_model,omitempty"` LicenseContent string `protobuf:"bytes,7,opt,name=license_content,json=licenseContent,proto3" json:"license_content,omitempty"` } @@ -2034,30 +2034,30 @@ func (x *PublicSetting) GetValidLicense() bool { return false } -func (x *PublicSetting) GetGptBaseUrl() string { +func (x *PublicSetting) GetChatAiBaseUrl() string { if x != nil { - return x.GptBaseUrl + return x.ChatAiBaseUrl } return "" } -func (x *PublicSetting) GetGptApiKey() string { +func (x *PublicSetting) GetChatAiApiKey() string { if x != nil { - return x.GptApiKey + return x.ChatAiApiKey } return "" } -func (x *PublicSetting) GetGptProxy() string { +func (x *PublicSetting) GetChatAiProxy() string { if x != nil { - return x.GptProxy + return x.ChatAiProxy } return "" } -func (x *PublicSetting) GetGptModel() string { +func (x *PublicSetting) GetChatAiModel() string { if x != nil { - return x.GptModel + return x.ChatAiModel } return "" } @@ -2609,71 +2609,72 @@ var file_common_proto_rawDesc = []byte{ 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, - 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xfe, - 0x01, 0x0a, 0x0d, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, + 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x9a, + 0x02, 0x0a, 0x0d, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x23, 0x0a, 0x0d, 0x78, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x78, 0x70, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x76, 0x61, - 0x6c, 0x69, 0x64, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x0c, 0x67, 0x70, - 0x74, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x67, 0x70, 0x74, 0x42, 0x61, 0x73, 0x65, 0x55, 0x72, 0x6c, 0x12, 0x1e, 0x0a, 0x0b, - 0x67, 0x70, 0x74, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x67, 0x70, 0x74, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x12, 0x1b, 0x0a, 0x09, - 0x67, 0x70, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x67, 0x70, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x67, 0x70, 0x74, - 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x67, 0x70, - 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x27, 0x0a, 0x0f, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, - 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0e, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, - 0x32, 0x0a, 0x06, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x22, 0xbd, 0x03, 0x0a, 0x10, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, - 0x65, 0x4c, 0x6f, 0x67, 0x44, 0x61, 0x74, 0x61, 0x12, 0x3a, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, - 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x2e, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x4c, 0x6f, 0x67, 0x44, 0x61, - 0x74, 0x61, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x52, 0x05, 0x65, - 0x76, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, - 0x75, 0x73, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, - 0x22, 0xc0, 0x02, 0x0a, 0x0a, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, - 0x17, 0x0a, 0x13, 0x41, 0x73, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x53, - 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x41, 0x73, 0x73, 0x65, - 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, - 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, - 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x4a, - 0x6f, 0x69, 0x6e, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, - 0x55, 0x73, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, - 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x41, 0x64, 0x6d, 0x69, - 0x6e, 0x45, 0x78, 0x69, 0x74, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x10, 0x06, 0x12, 0x16, - 0x0a, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x53, - 0x74, 0x61, 0x72, 0x74, 0x10, 0x07, 0x12, 0x18, 0x0a, 0x14, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, - 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x08, - 0x12, 0x18, 0x0a, 0x14, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, - 0x74, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x10, 0x09, 0x12, 0x15, 0x0a, 0x11, 0x52, 0x65, - 0x70, 0x6c, 0x61, 0x79, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x72, 0x74, 0x10, - 0x0a, 0x12, 0x17, 0x0a, 0x13, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x55, 0x70, 0x6c, 0x6f, 0x61, - 0x64, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x0b, 0x12, 0x17, 0x0a, 0x13, 0x52, 0x65, - 0x70, 0x6c, 0x61, 0x79, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, - 0x65, 0x10, 0x0c, 0x2a, 0x6b, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x0f, 0x0a, 0x0b, 0x4b, 0x69, 0x6c, 0x6c, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4c, 0x6f, 0x63, 0x6b, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x65, 0x73, - 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, - 0x65, 0x72, 0x6d, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, - 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x65, 0x72, 0x6d, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x04, - 0x2a, 0x66, 0x0a, 0x09, 0x52, 0x69, 0x73, 0x6b, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x0a, 0x0a, - 0x06, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x61, 0x72, - 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, - 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x52, 0x65, 0x76, 0x69, 0x65, 0x77, 0x52, 0x65, 0x6a, 0x65, - 0x63, 0x74, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x52, 0x65, 0x76, 0x69, 0x65, 0x77, 0x41, 0x63, - 0x63, 0x65, 0x70, 0x74, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x52, 0x65, 0x76, 0x69, 0x65, 0x77, - 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x05, 0x42, 0x20, 0x0a, 0x13, 0x6f, 0x72, 0x67, 0x2e, - 0x6a, 0x75, 0x6d, 0x70, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x77, 0x69, 0x73, 0x70, 0x5a, - 0x09, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x6c, 0x69, 0x64, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a, 0x10, 0x63, 0x68, + 0x61, 0x74, 0x5f, 0x61, 0x69, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x68, 0x61, 0x74, 0x41, 0x69, 0x42, 0x61, 0x73, 0x65, + 0x55, 0x72, 0x6c, 0x12, 0x25, 0x0a, 0x0f, 0x63, 0x68, 0x61, 0x74, 0x5f, 0x61, 0x69, 0x5f, 0x61, + 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x68, + 0x61, 0x74, 0x41, 0x69, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x0d, 0x63, 0x68, + 0x61, 0x74, 0x5f, 0x61, 0x69, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x41, 0x69, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x22, + 0x0a, 0x0d, 0x63, 0x68, 0x61, 0x74, 0x5f, 0x61, 0x69, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x68, 0x61, 0x74, 0x41, 0x69, 0x4d, 0x6f, 0x64, + 0x65, 0x6c, 0x12, 0x27, 0x0a, 0x0f, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x5f, 0x63, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6c, 0x69, 0x63, + 0x65, 0x6e, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x22, 0x32, 0x0a, 0x06, 0x43, + 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, + 0xbd, 0x03, 0x0a, 0x10, 0x4c, 0x69, 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x4c, 0x6f, 0x67, + 0x44, 0x61, 0x74, 0x61, 0x12, 0x3a, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0e, 0x32, 0x24, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x4c, 0x69, + 0x66, 0x65, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x4c, 0x6f, 0x67, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, + 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0xc0, 0x02, 0x0a, + 0x0a, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x13, 0x41, + 0x73, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x53, 0x75, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x41, 0x73, 0x73, 0x65, 0x74, 0x43, 0x6f, 0x6e, + 0x6e, 0x65, 0x63, 0x74, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x01, 0x12, 0x13, + 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x68, 0x61, 0x72, 0x65, 0x4c, 0x69, 0x6e, + 0x6b, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x53, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, + 0x4c, 0x65, 0x61, 0x76, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x04, 0x12, 0x14, + 0x0a, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x6f, 0x6e, 0x69, 0x74, + 0x6f, 0x72, 0x10, 0x05, 0x12, 0x14, 0x0a, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x45, 0x78, 0x69, + 0x74, 0x4d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x10, 0x06, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x65, + 0x70, 0x6c, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x53, 0x74, 0x61, 0x72, 0x74, + 0x10, 0x07, 0x12, 0x18, 0x0a, 0x14, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x76, + 0x65, 0x72, 0x74, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x08, 0x12, 0x18, 0x0a, 0x14, + 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x46, 0x61, 0x69, + 0x6c, 0x75, 0x72, 0x65, 0x10, 0x09, 0x12, 0x15, 0x0a, 0x11, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, + 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x72, 0x74, 0x10, 0x0a, 0x12, 0x17, 0x0a, + 0x13, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x75, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x10, 0x0b, 0x12, 0x17, 0x0a, 0x13, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, + 0x55, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x10, 0x0c, 0x2a, + 0x6b, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0f, 0x0a, + 0x0b, 0x4b, 0x69, 0x6c, 0x6c, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x00, 0x12, 0x0f, + 0x0a, 0x0b, 0x4c, 0x6f, 0x63, 0x6b, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, + 0x11, 0x0a, 0x0d, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x65, 0x72, 0x6d, 0x45, + 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x54, 0x6f, 0x6b, 0x65, + 0x6e, 0x50, 0x65, 0x72, 0x6d, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x04, 0x2a, 0x66, 0x0a, 0x09, + 0x52, 0x69, 0x73, 0x6b, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x6f, 0x72, + 0x6d, 0x61, 0x6c, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, + 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10, 0x02, 0x12, 0x10, + 0x0a, 0x0c, 0x52, 0x65, 0x76, 0x69, 0x65, 0x77, 0x52, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x10, 0x03, + 0x12, 0x10, 0x0a, 0x0c, 0x52, 0x65, 0x76, 0x69, 0x65, 0x77, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, + 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x52, 0x65, 0x76, 0x69, 0x65, 0x77, 0x43, 0x61, 0x6e, 0x63, + 0x65, 0x6c, 0x10, 0x05, 0x42, 0x20, 0x0a, 0x13, 0x6f, 0x72, 0x67, 0x2e, 0x6a, 0x75, 0x6d, 0x70, + 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x77, 0x69, 0x73, 0x70, 0x5a, 0x09, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/protobuf-java/org/jumpserver/wisp/Common.java b/protobuf-java/org/jumpserver/wisp/Common.java index 5459bee..a639986 100644 --- a/protobuf-java/org/jumpserver/wisp/Common.java +++ b/protobuf-java/org/jumpserver/wisp/Common.java @@ -26425,52 +26425,52 @@ public interface PublicSettingOrBuilder extends boolean getValidLicense(); /** - * string gpt_base_url = 3; - * @return The gptBaseUrl. + * string chat_ai_base_url = 3; + * @return The chatAiBaseUrl. */ - java.lang.String getGptBaseUrl(); + java.lang.String getChatAiBaseUrl(); /** - * string gpt_base_url = 3; - * @return The bytes for gptBaseUrl. + * string chat_ai_base_url = 3; + * @return The bytes for chatAiBaseUrl. */ com.google.protobuf.ByteString - getGptBaseUrlBytes(); + getChatAiBaseUrlBytes(); /** - * string gpt_api_key = 4; - * @return The gptApiKey. + * string chat_ai_api_key = 4; + * @return The chatAiApiKey. */ - java.lang.String getGptApiKey(); + java.lang.String getChatAiApiKey(); /** - * string gpt_api_key = 4; - * @return The bytes for gptApiKey. + * string chat_ai_api_key = 4; + * @return The bytes for chatAiApiKey. */ com.google.protobuf.ByteString - getGptApiKeyBytes(); + getChatAiApiKeyBytes(); /** - * string gpt_proxy = 5; - * @return The gptProxy. + * string chat_ai_proxy = 5; + * @return The chatAiProxy. */ - java.lang.String getGptProxy(); + java.lang.String getChatAiProxy(); /** - * string gpt_proxy = 5; - * @return The bytes for gptProxy. + * string chat_ai_proxy = 5; + * @return The bytes for chatAiProxy. */ com.google.protobuf.ByteString - getGptProxyBytes(); + getChatAiProxyBytes(); /** - * string gpt_model = 6; - * @return The gptModel. + * string chat_ai_model = 6; + * @return The chatAiModel. */ - java.lang.String getGptModel(); + java.lang.String getChatAiModel(); /** - * string gpt_model = 6; - * @return The bytes for gptModel. + * string chat_ai_model = 6; + * @return The bytes for chatAiModel. */ com.google.protobuf.ByteString - getGptModelBytes(); + getChatAiModelBytes(); /** * string license_content = 7; @@ -26506,10 +26506,10 @@ private PublicSetting(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } private PublicSetting() { - gptBaseUrl_ = ""; - gptApiKey_ = ""; - gptProxy_ = ""; - gptModel_ = ""; + chatAiBaseUrl_ = ""; + chatAiApiKey_ = ""; + chatAiProxy_ = ""; + chatAiModel_ = ""; licenseContent_ = ""; } @@ -26548,156 +26548,156 @@ public boolean getValidLicense() { return validLicense_; } - public static final int GPT_BASE_URL_FIELD_NUMBER = 3; + public static final int CHAT_AI_BASE_URL_FIELD_NUMBER = 3; @SuppressWarnings("serial") - private volatile java.lang.Object gptBaseUrl_ = ""; + private volatile java.lang.Object chatAiBaseUrl_ = ""; /** - * string gpt_base_url = 3; - * @return The gptBaseUrl. + * string chat_ai_base_url = 3; + * @return The chatAiBaseUrl. */ @java.lang.Override - public java.lang.String getGptBaseUrl() { - java.lang.Object ref = gptBaseUrl_; + public java.lang.String getChatAiBaseUrl() { + java.lang.Object ref = chatAiBaseUrl_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gptBaseUrl_ = s; + chatAiBaseUrl_ = s; return s; } } /** - * string gpt_base_url = 3; - * @return The bytes for gptBaseUrl. + * string chat_ai_base_url = 3; + * @return The bytes for chatAiBaseUrl. */ @java.lang.Override public com.google.protobuf.ByteString - getGptBaseUrlBytes() { - java.lang.Object ref = gptBaseUrl_; + getChatAiBaseUrlBytes() { + java.lang.Object ref = chatAiBaseUrl_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gptBaseUrl_ = b; + chatAiBaseUrl_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int GPT_API_KEY_FIELD_NUMBER = 4; + public static final int CHAT_AI_API_KEY_FIELD_NUMBER = 4; @SuppressWarnings("serial") - private volatile java.lang.Object gptApiKey_ = ""; + private volatile java.lang.Object chatAiApiKey_ = ""; /** - * string gpt_api_key = 4; - * @return The gptApiKey. + * string chat_ai_api_key = 4; + * @return The chatAiApiKey. */ @java.lang.Override - public java.lang.String getGptApiKey() { - java.lang.Object ref = gptApiKey_; + public java.lang.String getChatAiApiKey() { + java.lang.Object ref = chatAiApiKey_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gptApiKey_ = s; + chatAiApiKey_ = s; return s; } } /** - * string gpt_api_key = 4; - * @return The bytes for gptApiKey. + * string chat_ai_api_key = 4; + * @return The bytes for chatAiApiKey. */ @java.lang.Override public com.google.protobuf.ByteString - getGptApiKeyBytes() { - java.lang.Object ref = gptApiKey_; + getChatAiApiKeyBytes() { + java.lang.Object ref = chatAiApiKey_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gptApiKey_ = b; + chatAiApiKey_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int GPT_PROXY_FIELD_NUMBER = 5; + public static final int CHAT_AI_PROXY_FIELD_NUMBER = 5; @SuppressWarnings("serial") - private volatile java.lang.Object gptProxy_ = ""; + private volatile java.lang.Object chatAiProxy_ = ""; /** - * string gpt_proxy = 5; - * @return The gptProxy. + * string chat_ai_proxy = 5; + * @return The chatAiProxy. */ @java.lang.Override - public java.lang.String getGptProxy() { - java.lang.Object ref = gptProxy_; + public java.lang.String getChatAiProxy() { + java.lang.Object ref = chatAiProxy_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gptProxy_ = s; + chatAiProxy_ = s; return s; } } /** - * string gpt_proxy = 5; - * @return The bytes for gptProxy. + * string chat_ai_proxy = 5; + * @return The bytes for chatAiProxy. */ @java.lang.Override public com.google.protobuf.ByteString - getGptProxyBytes() { - java.lang.Object ref = gptProxy_; + getChatAiProxyBytes() { + java.lang.Object ref = chatAiProxy_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gptProxy_ = b; + chatAiProxy_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - public static final int GPT_MODEL_FIELD_NUMBER = 6; + public static final int CHAT_AI_MODEL_FIELD_NUMBER = 6; @SuppressWarnings("serial") - private volatile java.lang.Object gptModel_ = ""; + private volatile java.lang.Object chatAiModel_ = ""; /** - * string gpt_model = 6; - * @return The gptModel. + * string chat_ai_model = 6; + * @return The chatAiModel. */ @java.lang.Override - public java.lang.String getGptModel() { - java.lang.Object ref = gptModel_; + public java.lang.String getChatAiModel() { + java.lang.Object ref = chatAiModel_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gptModel_ = s; + chatAiModel_ = s; return s; } } /** - * string gpt_model = 6; - * @return The bytes for gptModel. + * string chat_ai_model = 6; + * @return The bytes for chatAiModel. */ @java.lang.Override public com.google.protobuf.ByteString - getGptModelBytes() { - java.lang.Object ref = gptModel_; + getChatAiModelBytes() { + java.lang.Object ref = chatAiModel_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gptModel_ = b; + chatAiModel_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -26763,17 +26763,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (validLicense_ != false) { output.writeBool(2, validLicense_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(gptBaseUrl_)) { - com.google.protobuf.GeneratedMessage.writeString(output, 3, gptBaseUrl_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(chatAiBaseUrl_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 3, chatAiBaseUrl_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(gptApiKey_)) { - com.google.protobuf.GeneratedMessage.writeString(output, 4, gptApiKey_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(chatAiApiKey_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 4, chatAiApiKey_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(gptProxy_)) { - com.google.protobuf.GeneratedMessage.writeString(output, 5, gptProxy_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(chatAiProxy_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 5, chatAiProxy_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(gptModel_)) { - com.google.protobuf.GeneratedMessage.writeString(output, 6, gptModel_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(chatAiModel_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 6, chatAiModel_); } if (!com.google.protobuf.GeneratedMessage.isStringEmpty(licenseContent_)) { com.google.protobuf.GeneratedMessage.writeString(output, 7, licenseContent_); @@ -26795,17 +26795,17 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeBoolSize(2, validLicense_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(gptBaseUrl_)) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(3, gptBaseUrl_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(chatAiBaseUrl_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(3, chatAiBaseUrl_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(gptApiKey_)) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(4, gptApiKey_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(chatAiApiKey_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(4, chatAiApiKey_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(gptProxy_)) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(5, gptProxy_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(chatAiProxy_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(5, chatAiProxy_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(gptModel_)) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(6, gptModel_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(chatAiModel_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(6, chatAiModel_); } if (!com.google.protobuf.GeneratedMessage.isStringEmpty(licenseContent_)) { size += com.google.protobuf.GeneratedMessage.computeStringSize(7, licenseContent_); @@ -26829,14 +26829,14 @@ public boolean equals(final java.lang.Object obj) { != other.getXpackEnabled()) return false; if (getValidLicense() != other.getValidLicense()) return false; - if (!getGptBaseUrl() - .equals(other.getGptBaseUrl())) return false; - if (!getGptApiKey() - .equals(other.getGptApiKey())) return false; - if (!getGptProxy() - .equals(other.getGptProxy())) return false; - if (!getGptModel() - .equals(other.getGptModel())) return false; + if (!getChatAiBaseUrl() + .equals(other.getChatAiBaseUrl())) return false; + if (!getChatAiApiKey() + .equals(other.getChatAiApiKey())) return false; + if (!getChatAiProxy() + .equals(other.getChatAiProxy())) return false; + if (!getChatAiModel() + .equals(other.getChatAiModel())) return false; if (!getLicenseContent() .equals(other.getLicenseContent())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; @@ -26856,14 +26856,14 @@ public int hashCode() { hash = (37 * hash) + VALID_LICENSE_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getValidLicense()); - hash = (37 * hash) + GPT_BASE_URL_FIELD_NUMBER; - hash = (53 * hash) + getGptBaseUrl().hashCode(); - hash = (37 * hash) + GPT_API_KEY_FIELD_NUMBER; - hash = (53 * hash) + getGptApiKey().hashCode(); - hash = (37 * hash) + GPT_PROXY_FIELD_NUMBER; - hash = (53 * hash) + getGptProxy().hashCode(); - hash = (37 * hash) + GPT_MODEL_FIELD_NUMBER; - hash = (53 * hash) + getGptModel().hashCode(); + hash = (37 * hash) + CHAT_AI_BASE_URL_FIELD_NUMBER; + hash = (53 * hash) + getChatAiBaseUrl().hashCode(); + hash = (37 * hash) + CHAT_AI_API_KEY_FIELD_NUMBER; + hash = (53 * hash) + getChatAiApiKey().hashCode(); + hash = (37 * hash) + CHAT_AI_PROXY_FIELD_NUMBER; + hash = (53 * hash) + getChatAiProxy().hashCode(); + hash = (37 * hash) + CHAT_AI_MODEL_FIELD_NUMBER; + hash = (53 * hash) + getChatAiModel().hashCode(); hash = (37 * hash) + LICENSE_CONTENT_FIELD_NUMBER; hash = (53 * hash) + getLicenseContent().hashCode(); hash = (29 * hash) + getUnknownFields().hashCode(); @@ -26999,10 +26999,10 @@ public Builder clear() { bitField0_ = 0; xpackEnabled_ = false; validLicense_ = false; - gptBaseUrl_ = ""; - gptApiKey_ = ""; - gptProxy_ = ""; - gptModel_ = ""; + chatAiBaseUrl_ = ""; + chatAiApiKey_ = ""; + chatAiProxy_ = ""; + chatAiModel_ = ""; licenseContent_ = ""; return this; } @@ -27044,16 +27044,16 @@ private void buildPartial0(org.jumpserver.wisp.Common.PublicSetting result) { result.validLicense_ = validLicense_; } if (((from_bitField0_ & 0x00000004) != 0)) { - result.gptBaseUrl_ = gptBaseUrl_; + result.chatAiBaseUrl_ = chatAiBaseUrl_; } if (((from_bitField0_ & 0x00000008) != 0)) { - result.gptApiKey_ = gptApiKey_; + result.chatAiApiKey_ = chatAiApiKey_; } if (((from_bitField0_ & 0x00000010) != 0)) { - result.gptProxy_ = gptProxy_; + result.chatAiProxy_ = chatAiProxy_; } if (((from_bitField0_ & 0x00000020) != 0)) { - result.gptModel_ = gptModel_; + result.chatAiModel_ = chatAiModel_; } if (((from_bitField0_ & 0x00000040) != 0)) { result.licenseContent_ = licenseContent_; @@ -27078,23 +27078,23 @@ public Builder mergeFrom(org.jumpserver.wisp.Common.PublicSetting other) { if (other.getValidLicense() != false) { setValidLicense(other.getValidLicense()); } - if (!other.getGptBaseUrl().isEmpty()) { - gptBaseUrl_ = other.gptBaseUrl_; + if (!other.getChatAiBaseUrl().isEmpty()) { + chatAiBaseUrl_ = other.chatAiBaseUrl_; bitField0_ |= 0x00000004; onChanged(); } - if (!other.getGptApiKey().isEmpty()) { - gptApiKey_ = other.gptApiKey_; + if (!other.getChatAiApiKey().isEmpty()) { + chatAiApiKey_ = other.chatAiApiKey_; bitField0_ |= 0x00000008; onChanged(); } - if (!other.getGptProxy().isEmpty()) { - gptProxy_ = other.gptProxy_; + if (!other.getChatAiProxy().isEmpty()) { + chatAiProxy_ = other.chatAiProxy_; bitField0_ |= 0x00000010; onChanged(); } - if (!other.getGptModel().isEmpty()) { - gptModel_ = other.gptModel_; + if (!other.getChatAiModel().isEmpty()) { + chatAiModel_ = other.chatAiModel_; bitField0_ |= 0x00000020; onChanged(); } @@ -27140,22 +27140,22 @@ public Builder mergeFrom( break; } // case 16 case 26: { - gptBaseUrl_ = input.readStringRequireUtf8(); + chatAiBaseUrl_ = input.readStringRequireUtf8(); bitField0_ |= 0x00000004; break; } // case 26 case 34: { - gptApiKey_ = input.readStringRequireUtf8(); + chatAiApiKey_ = input.readStringRequireUtf8(); bitField0_ |= 0x00000008; break; } // case 34 case 42: { - gptProxy_ = input.readStringRequireUtf8(); + chatAiProxy_ = input.readStringRequireUtf8(); bitField0_ |= 0x00000010; break; } // case 42 case 50: { - gptModel_ = input.readStringRequireUtf8(); + chatAiModel_ = input.readStringRequireUtf8(); bitField0_ |= 0x00000020; break; } // case 50 @@ -27245,289 +27245,289 @@ public Builder clearValidLicense() { return this; } - private java.lang.Object gptBaseUrl_ = ""; + private java.lang.Object chatAiBaseUrl_ = ""; /** - * string gpt_base_url = 3; - * @return The gptBaseUrl. + * string chat_ai_base_url = 3; + * @return The chatAiBaseUrl. */ - public java.lang.String getGptBaseUrl() { - java.lang.Object ref = gptBaseUrl_; + public java.lang.String getChatAiBaseUrl() { + java.lang.Object ref = chatAiBaseUrl_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gptBaseUrl_ = s; + chatAiBaseUrl_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string gpt_base_url = 3; - * @return The bytes for gptBaseUrl. + * string chat_ai_base_url = 3; + * @return The bytes for chatAiBaseUrl. */ public com.google.protobuf.ByteString - getGptBaseUrlBytes() { - java.lang.Object ref = gptBaseUrl_; + getChatAiBaseUrlBytes() { + java.lang.Object ref = chatAiBaseUrl_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gptBaseUrl_ = b; + chatAiBaseUrl_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string gpt_base_url = 3; - * @param value The gptBaseUrl to set. + * string chat_ai_base_url = 3; + * @param value The chatAiBaseUrl to set. * @return This builder for chaining. */ - public Builder setGptBaseUrl( + public Builder setChatAiBaseUrl( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gptBaseUrl_ = value; + chatAiBaseUrl_ = value; bitField0_ |= 0x00000004; onChanged(); return this; } /** - * string gpt_base_url = 3; + * string chat_ai_base_url = 3; * @return This builder for chaining. */ - public Builder clearGptBaseUrl() { - gptBaseUrl_ = getDefaultInstance().getGptBaseUrl(); + public Builder clearChatAiBaseUrl() { + chatAiBaseUrl_ = getDefaultInstance().getChatAiBaseUrl(); bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } /** - * string gpt_base_url = 3; - * @param value The bytes for gptBaseUrl to set. + * string chat_ai_base_url = 3; + * @param value The bytes for chatAiBaseUrl to set. * @return This builder for chaining. */ - public Builder setGptBaseUrlBytes( + public Builder setChatAiBaseUrlBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - gptBaseUrl_ = value; + chatAiBaseUrl_ = value; bitField0_ |= 0x00000004; onChanged(); return this; } - private java.lang.Object gptApiKey_ = ""; + private java.lang.Object chatAiApiKey_ = ""; /** - * string gpt_api_key = 4; - * @return The gptApiKey. + * string chat_ai_api_key = 4; + * @return The chatAiApiKey. */ - public java.lang.String getGptApiKey() { - java.lang.Object ref = gptApiKey_; + public java.lang.String getChatAiApiKey() { + java.lang.Object ref = chatAiApiKey_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gptApiKey_ = s; + chatAiApiKey_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string gpt_api_key = 4; - * @return The bytes for gptApiKey. + * string chat_ai_api_key = 4; + * @return The bytes for chatAiApiKey. */ public com.google.protobuf.ByteString - getGptApiKeyBytes() { - java.lang.Object ref = gptApiKey_; + getChatAiApiKeyBytes() { + java.lang.Object ref = chatAiApiKey_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gptApiKey_ = b; + chatAiApiKey_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string gpt_api_key = 4; - * @param value The gptApiKey to set. + * string chat_ai_api_key = 4; + * @param value The chatAiApiKey to set. * @return This builder for chaining. */ - public Builder setGptApiKey( + public Builder setChatAiApiKey( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gptApiKey_ = value; + chatAiApiKey_ = value; bitField0_ |= 0x00000008; onChanged(); return this; } /** - * string gpt_api_key = 4; + * string chat_ai_api_key = 4; * @return This builder for chaining. */ - public Builder clearGptApiKey() { - gptApiKey_ = getDefaultInstance().getGptApiKey(); + public Builder clearChatAiApiKey() { + chatAiApiKey_ = getDefaultInstance().getChatAiApiKey(); bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } /** - * string gpt_api_key = 4; - * @param value The bytes for gptApiKey to set. + * string chat_ai_api_key = 4; + * @param value The bytes for chatAiApiKey to set. * @return This builder for chaining. */ - public Builder setGptApiKeyBytes( + public Builder setChatAiApiKeyBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - gptApiKey_ = value; + chatAiApiKey_ = value; bitField0_ |= 0x00000008; onChanged(); return this; } - private java.lang.Object gptProxy_ = ""; + private java.lang.Object chatAiProxy_ = ""; /** - * string gpt_proxy = 5; - * @return The gptProxy. + * string chat_ai_proxy = 5; + * @return The chatAiProxy. */ - public java.lang.String getGptProxy() { - java.lang.Object ref = gptProxy_; + public java.lang.String getChatAiProxy() { + java.lang.Object ref = chatAiProxy_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gptProxy_ = s; + chatAiProxy_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string gpt_proxy = 5; - * @return The bytes for gptProxy. + * string chat_ai_proxy = 5; + * @return The bytes for chatAiProxy. */ public com.google.protobuf.ByteString - getGptProxyBytes() { - java.lang.Object ref = gptProxy_; + getChatAiProxyBytes() { + java.lang.Object ref = chatAiProxy_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gptProxy_ = b; + chatAiProxy_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string gpt_proxy = 5; - * @param value The gptProxy to set. + * string chat_ai_proxy = 5; + * @param value The chatAiProxy to set. * @return This builder for chaining. */ - public Builder setGptProxy( + public Builder setChatAiProxy( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gptProxy_ = value; + chatAiProxy_ = value; bitField0_ |= 0x00000010; onChanged(); return this; } /** - * string gpt_proxy = 5; + * string chat_ai_proxy = 5; * @return This builder for chaining. */ - public Builder clearGptProxy() { - gptProxy_ = getDefaultInstance().getGptProxy(); + public Builder clearChatAiProxy() { + chatAiProxy_ = getDefaultInstance().getChatAiProxy(); bitField0_ = (bitField0_ & ~0x00000010); onChanged(); return this; } /** - * string gpt_proxy = 5; - * @param value The bytes for gptProxy to set. + * string chat_ai_proxy = 5; + * @param value The bytes for chatAiProxy to set. * @return This builder for chaining. */ - public Builder setGptProxyBytes( + public Builder setChatAiProxyBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - gptProxy_ = value; + chatAiProxy_ = value; bitField0_ |= 0x00000010; onChanged(); return this; } - private java.lang.Object gptModel_ = ""; + private java.lang.Object chatAiModel_ = ""; /** - * string gpt_model = 6; - * @return The gptModel. + * string chat_ai_model = 6; + * @return The chatAiModel. */ - public java.lang.String getGptModel() { - java.lang.Object ref = gptModel_; + public java.lang.String getChatAiModel() { + java.lang.Object ref = chatAiModel_; if (!(ref instanceof java.lang.String)) { com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); - gptModel_ = s; + chatAiModel_ = s; return s; } else { return (java.lang.String) ref; } } /** - * string gpt_model = 6; - * @return The bytes for gptModel. + * string chat_ai_model = 6; + * @return The bytes for chatAiModel. */ public com.google.protobuf.ByteString - getGptModelBytes() { - java.lang.Object ref = gptModel_; + getChatAiModelBytes() { + java.lang.Object ref = chatAiModel_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - gptModel_ = b; + chatAiModel_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * string gpt_model = 6; - * @param value The gptModel to set. + * string chat_ai_model = 6; + * @param value The chatAiModel to set. * @return This builder for chaining. */ - public Builder setGptModel( + public Builder setChatAiModel( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - gptModel_ = value; + chatAiModel_ = value; bitField0_ |= 0x00000020; onChanged(); return this; } /** - * string gpt_model = 6; + * string chat_ai_model = 6; * @return This builder for chaining. */ - public Builder clearGptModel() { - gptModel_ = getDefaultInstance().getGptModel(); + public Builder clearChatAiModel() { + chatAiModel_ = getDefaultInstance().getChatAiModel(); bitField0_ = (bitField0_ & ~0x00000020); onChanged(); return this; } /** - * string gpt_model = 6; - * @param value The bytes for gptModel to set. + * string chat_ai_model = 6; + * @param value The bytes for chatAiModel to set. * @return This builder for chaining. */ - public Builder setGptModelBytes( + public Builder setChatAiModelBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - gptModel_ = value; + chatAiModel_ = value; bitField0_ |= 0x00000020; onChanged(); return this; @@ -29303,27 +29303,27 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { internal_static_message_Account_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_LabelValue_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_LabelValue_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_Asset_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_Asset_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_Asset_Specific_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_Asset_Specific_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_Protocol_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_Protocol_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_Gateway_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_Gateway_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor @@ -29511,29 +29511,30 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { "ponentSetting\022\025\n\rmax_idle_time\030\001 \001(\005\022\030\n\020" + "max_session_time\030\002 \001(\005\022\027\n\017chat_ai_enable" + "d\030\003 \001(\010\"1\n\007Forward\022\n\n\002id\030\001 \001(\t\022\014\n\004Host\030\002" + - " \001(\t\022\014\n\004port\030\003 \001(\005\"\247\001\n\rPublicSetting\022\025\n\r" + + " \001(\t\022\014\n\004port\030\003 \001(\005\"\267\001\n\rPublicSetting\022\025\n\r" + "xpack_enabled\030\001 \001(\010\022\025\n\rvalid_license\030\002 \001" + - "(\010\022\024\n\014gpt_base_url\030\003 \001(\t\022\023\n\013gpt_api_key\030" + - "\004 \001(\t\022\021\n\tgpt_proxy\030\005 \001(\t\022\021\n\tgpt_model\030\006 " + - "\001(\t\022\027\n\017license_content\030\007 \001(\t\"%\n\006Cookie\022\014" + - "\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"\250\003\n\020Lifecycl" + - "eLogData\0223\n\005event\030\001 \001(\0162$.message.Lifecy" + - "cleLogData.event_type\022\016\n\006reason\030\002 \001(\t\022\014\n" + - "\004user\030\003 \001(\t\"\300\002\n\nevent_type\022\027\n\023AssetConne" + - "ctSuccess\020\000\022\030\n\024AssetConnectFinished\020\001\022\023\n" + - "\017CreateShareLink\020\002\022\023\n\017UserJoinSession\020\003\022" + - "\024\n\020UserLeaveSession\020\004\022\024\n\020AdminJoinMonito" + - "r\020\005\022\024\n\020AdminExitMonitor\020\006\022\026\n\022ReplayConve" + - "rtStart\020\007\022\030\n\024ReplayConvertSuccess\020\010\022\030\n\024R" + - "eplayConvertFailure\020\t\022\025\n\021ReplayUploadSta" + - "rt\020\n\022\027\n\023ReplayUploadSuccess\020\013\022\027\n\023ReplayU" + - "ploadFailure\020\014*k\n\nTaskAction\022\017\n\013KillSess" + - "ion\020\000\022\017\n\013LockSession\020\001\022\021\n\rUnlockSession\020" + - "\002\022\024\n\020TokenPermExpired\020\003\022\022\n\016TokenPermVali" + - "d\020\004*f\n\tRiskLevel\022\n\n\006Normal\020\000\022\013\n\007Warning\020" + - "\001\022\n\n\006Reject\020\002\022\020\n\014ReviewReject\020\003\022\020\n\014Revie" + - "wAccept\020\004\022\020\n\014ReviewCancel\020\005B \n\023org.jumps" + - "erver.wispZ\t/protobufb\006proto3" + "(\010\022\030\n\020chat_ai_base_url\030\003 \001(\t\022\027\n\017chat_ai_" + + "api_key\030\004 \001(\t\022\025\n\rchat_ai_proxy\030\005 \001(\t\022\025\n\r" + + "chat_ai_model\030\006 \001(\t\022\027\n\017license_content\030\007" + + " \001(\t\"%\n\006Cookie\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 " + + "\001(\t\"\250\003\n\020LifecycleLogData\0223\n\005event\030\001 \001(\0162" + + "$.message.LifecycleLogData.event_type\022\016\n" + + "\006reason\030\002 \001(\t\022\014\n\004user\030\003 \001(\t\"\300\002\n\nevent_ty" + + "pe\022\027\n\023AssetConnectSuccess\020\000\022\030\n\024AssetConn" + + "ectFinished\020\001\022\023\n\017CreateShareLink\020\002\022\023\n\017Us" + + "erJoinSession\020\003\022\024\n\020UserLeaveSession\020\004\022\024\n" + + "\020AdminJoinMonitor\020\005\022\024\n\020AdminExitMonitor\020" + + "\006\022\026\n\022ReplayConvertStart\020\007\022\030\n\024ReplayConve" + + "rtSuccess\020\010\022\030\n\024ReplayConvertFailure\020\t\022\025\n" + + "\021ReplayUploadStart\020\n\022\027\n\023ReplayUploadSucc" + + "ess\020\013\022\027\n\023ReplayUploadFailure\020\014*k\n\nTaskAc" + + "tion\022\017\n\013KillSession\020\000\022\017\n\013LockSession\020\001\022\021" + + "\n\rUnlockSession\020\002\022\024\n\020TokenPermExpired\020\003\022" + + "\022\n\016TokenPermValid\020\004*f\n\tRiskLevel\022\n\n\006Norm" + + "al\020\000\022\013\n\007Warning\020\001\022\n\n\006Reject\020\002\022\020\n\014ReviewR" + + "eject\020\003\022\020\n\014ReviewAccept\020\004\022\020\n\014ReviewCance" + + "l\020\005B \n\023org.jumpserver.wispZ\t/protobufb\006p" + + "roto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -29682,7 +29683,7 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { internal_static_message_PublicSetting_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_PublicSetting_descriptor, - new java.lang.String[] { "XpackEnabled", "ValidLicense", "GptBaseUrl", "GptApiKey", "GptProxy", "GptModel", "LicenseContent", }); + new java.lang.String[] { "XpackEnabled", "ValidLicense", "ChatAiBaseUrl", "ChatAiApiKey", "ChatAiProxy", "ChatAiModel", "LicenseContent", }); internal_static_message_Cookie_descriptor = getDescriptor().getMessageTypes().get(21); internal_static_message_Cookie_fieldAccessorTable = new diff --git a/protos/common.proto b/protos/common.proto index 6bb4e7b..fefbe14 100644 --- a/protos/common.proto +++ b/protos/common.proto @@ -224,10 +224,10 @@ message Forward { message PublicSetting { bool xpack_enabled = 1; bool valid_license = 2; - string gpt_base_url = 3; - string gpt_api_key = 4; - string gpt_proxy = 5; - string gpt_model = 6; + string chat_ai_base_url = 3; + string chat_ai_api_key = 4; + string chat_ai_proxy = 5; + string chat_ai_model = 6; string license_content = 7; }