diff --git a/pkg/invoke/invoker.go b/pkg/invoke/invoker.go index 57d080c76..bc11015fe 100644 --- a/pkg/invoke/invoker.go +++ b/pkg/invoke/invoker.go @@ -40,26 +40,24 @@ var ( const ephemeralRunPrefix = "ephemeral-run" type Invoker struct { - gptClient *gptscript.GPTScript - uncached kclient.WithWatch - gatewayClient *client.Client - tokenService *jwt.TokenService - events *events.Emitter - noReplyEmailAddress string - serverURL string - serverPort int + gptClient *gptscript.GPTScript + uncached kclient.WithWatch + gatewayClient *client.Client + tokenService *jwt.TokenService + events *events.Emitter + serverURL string + serverPort int } -func NewInvoker(c kclient.WithWatch, gptClient *gptscript.GPTScript, gatewayClient *client.Client, noReplyEmailAddress, serverURL string, serverPort int, tokenService *jwt.TokenService, events *events.Emitter) *Invoker { +func NewInvoker(c kclient.WithWatch, gptClient *gptscript.GPTScript, gatewayClient *client.Client, serverURL string, serverPort int, tokenService *jwt.TokenService, events *events.Emitter) *Invoker { return &Invoker{ - uncached: c, - gptClient: gptClient, - gatewayClient: gatewayClient, - tokenService: tokenService, - events: events, - serverURL: serverURL, - serverPort: serverPort, - noReplyEmailAddress: noReplyEmailAddress, + uncached: c, + gptClient: gptClient, + gatewayClient: gatewayClient, + tokenService: tokenService, + events: events, + serverURL: serverURL, + serverPort: serverPort, } } @@ -530,8 +528,7 @@ func (i *Invoker) Resume(ctx context.Context, c kclient.WithWatch, thread *v1.Th "OBOT_USER_NAME="+userName, "OBOT_USER_EMAIL="+userEmail, "OBOT_USER_TIMEZONE="+userTimezone, - "OBOT_NO_REPLY_EMAIL="+i.noReplyEmailAddress, - "GPTSCRIPT_HTTP_ENV=OBOT_TOKEN,OBOT_RUN_ID,OBOT_THREAD_ID,OBOT_WORKFLOW_ID,OBOT_WORKFLOW_STEP_ID,OBOT_AGENT_ID,OBOT_NO_REPLY_EMAIL", + "GPTSCRIPT_HTTP_ENV=OBOT_TOKEN,OBOT_RUN_ID,OBOT_THREAD_ID,OBOT_WORKFLOW_ID,OBOT_WORKFLOW_STEP_ID,OBOT_AGENT_ID", ), DefaultModel: run.Spec.DefaultModel, DefaultModelProvider: modelProvider, diff --git a/pkg/services/config.go b/pkg/services/config.go index 4dfec6693..0edccea7b 100644 --- a/pkg/services/config.go +++ b/pkg/services/config.go @@ -66,7 +66,6 @@ type Config struct { EncryptionConfigFile string `usage:"The path to the encryption configuration file" default:"./encryption.yaml"` KnowledgeSetIngestionLimit int `usage:"The maximum number of files to ingest into a knowledge set" default:"3000" env:"OBOT_KNOWLEDGESET_INGESTION_LIMIT" name:"knowledge-set-ingestion-limit"` EmailServerName string `usage:"The name of the email server to display for email receivers"` - NoReplyEmailAddress string `usage:"The email to use for no-reply emails from obot"` Docker bool `usage:"Enable Docker support" default:"false" env:"OBOT_DOCKER"` AuthConfig @@ -233,7 +232,7 @@ func New(ctx context.Context, config Config) (*Services, error) { tokenServer = &jwt.TokenService{} events = events.NewEmitter(storageClient) gatewayClient = client.New(gatewayDB, config.AuthAdminEmails) - invoker = invoke.NewInvoker(storageClient, c, gatewayClient, config.NoReplyEmailAddress, config.Hostname, config.HTTPListenPort, tokenServer, events) + invoker = invoke.NewInvoker(storageClient, c, gatewayClient, config.Hostname, config.HTTPListenPort, tokenServer, events) modelProviderDispatcher = dispatcher.New(invoker, storageClient, c) proxyServer *proxy.Proxy