From c27866221822e4112bddb43f8ad102a5589c98ab Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Fri, 2 May 2025 12:17:01 +0200 Subject: [PATCH 001/706] feat: collect database metrics (#17635) Currently we don't have a way to get insight into Postgres connections being exhausted. By using the prometheus' [`DBStats` collector](https://github.com/prometheus/client_golang/blob/main/prometheus/collectors/dbstats_collector.go), we get some insight out-of-the-box. ``` # HELP go_sql_idle_connections The number of idle connections. # TYPE go_sql_idle_connections gauge go_sql_idle_connections{db_name="coder"} 1 # HELP go_sql_in_use_connections The number of connections currently in use. # TYPE go_sql_in_use_connections gauge go_sql_in_use_connections{db_name="coder"} 2 # HELP go_sql_max_idle_closed_total The total number of connections closed due to SetMaxIdleConns. # TYPE go_sql_max_idle_closed_total counter go_sql_max_idle_closed_total{db_name="coder"} 112 # HELP go_sql_max_idle_time_closed_total The total number of connections closed due to SetConnMaxIdleTime. # TYPE go_sql_max_idle_time_closed_total counter go_sql_max_idle_time_closed_total{db_name="coder"} 0 # HELP go_sql_max_lifetime_closed_total The total number of connections closed due to SetConnMaxLifetime. # TYPE go_sql_max_lifetime_closed_total counter go_sql_max_lifetime_closed_total{db_name="coder"} 0 # HELP go_sql_max_open_connections Maximum number of open connections to the database. # TYPE go_sql_max_open_connections gauge go_sql_max_open_connections{db_name="coder"} 10 # HELP go_sql_open_connections The number of established connections both in use and idle. # TYPE go_sql_open_connections gauge go_sql_open_connections{db_name="coder"} 3 # HELP go_sql_wait_count_total The total number of connections waited for. # TYPE go_sql_wait_count_total counter go_sql_wait_count_total{db_name="coder"} 28 # HELP go_sql_wait_duration_seconds_total The total time blocked waiting for a new connection. # TYPE go_sql_wait_duration_seconds_total counter go_sql_wait_duration_seconds_total{db_name="coder"} 0.086936235 ``` `go_sql_wait_count_total` is the metric I'm most interested in gaining, but the others are also very useful. Changing the prefix is easy (`prometheus.WrapRegistererWithPrefix`), but getting rid of the `go_` segment is not quite so easy. I've kept the changeset small for now. **NOTE:** I imported a library to determine the database name from the given conn string. It's [not as simple](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING) as one might hope. The database name is used for the `db_name` label. --------- Signed-off-by: Danny Kopping --- cli/server.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cli/server.go b/cli/server.go index 39cfa52571595..580dae369446c 100644 --- a/cli/server.go +++ b/cli/server.go @@ -739,6 +739,15 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd. _ = sqlDB.Close() }() + if options.DeploymentValues.Prometheus.Enable { + // At this stage we don't think the database name serves much purpose in these metrics. + // It requires parsing the DSN to determine it, which requires pulling in another dependency + // (i.e. https://github.com/jackc/pgx), but it's rather heavy. + // The conn string (https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING) can + // take different forms, which make parsing non-trivial. + options.PrometheusRegistry.MustRegister(collectors.NewDBStatsCollector(sqlDB, "")) + } + options.Database = database.New(sqlDB) ps, err := pubsub.New(ctx, logger.Named("pubsub"), sqlDB, dbURL) if err != nil { From 50695b7d7678867750aa53ad14593169f9a53e75 Mon Sep 17 00:00:00 2001 From: Edward Angert Date: Fri, 2 May 2025 09:44:30 -0400 Subject: [PATCH 002/706] docs: fix link in tutorials faq to new docker-code-server link (#17655) Co-authored-by: EdwardAngert <17991901+EdwardAngert@users.noreply.github.com> --- docs/tutorials/faqs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/faqs.md b/docs/tutorials/faqs.md index 1c2f5b1fb854e..bd386f81288a8 100644 --- a/docs/tutorials/faqs.md +++ b/docs/tutorials/faqs.md @@ -426,7 +426,7 @@ colima start --arch x86_64 --cpu 4 --memory 8 --disk 10 ``` Colima will show the path to the docker socket so we have a -[community template](https://github.com/sharkymark/v2-templates/tree/main/src/docker-code-server) +[community template](https://github.com/sharkymark/v2-templates/tree/main/src/templates/docker/docker-code-server) that prompts the Coder admin to enter the Docker socket as a Terraform variable. ## How to make a `coder_app` optional? From 912b6aba82d9a83662352f887c79935bfeb7a0f9 Mon Sep 17 00:00:00 2001 From: Edward Angert Date: Fri, 2 May 2025 11:13:42 -0400 Subject: [PATCH 003/706] docs: link to eks steps from aws section (#17646) closes #17634 --------- Co-authored-by: Claude Co-authored-by: EdwardAngert <17991901+EdwardAngert@users.noreply.github.com> --- docs/install/cloud/index.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/install/cloud/index.md b/docs/install/cloud/index.md index 4574b00de08c9..9155b4b0ead40 100644 --- a/docs/install/cloud/index.md +++ b/docs/install/cloud/index.md @@ -10,10 +10,13 @@ cloud of choice. We publish an EC2 image with Coder pre-installed. Follow the tutorial here: - [Install Coder on AWS EC2](./ec2.md) +- [Install Coder on AWS EKS](../kubernetes.md#aws) Alternatively, install the [CLI binary](../cli.md) on any Linux machine or follow our [Kubernetes](../kubernetes.md) documentation to install Coder on an -existing EKS cluster. +existing Kubernetes cluster. + +For EKS-specific installation guidance, see the [AWS section in Kubernetes installation docs](../kubernetes.md#aws). ## GCP From e37ddd44d25be76dec42965a9e969c6e62f64224 Mon Sep 17 00:00:00 2001 From: Jaayden Halko Date: Fri, 2 May 2025 16:14:32 +0100 Subject: [PATCH 004/706] chore: improve the design of the create workspace page for dynamic parameters (#17654) contributes to coder/preview#59 1. Improves the design and layout of the presets dropdown and switch 2. Improves the design for the immutable badge Screenshot 2025-05-01 at 23 28 11 Screenshot 2025-05-01 at 23 28 34 --- site/src/components/Badge/Badge.tsx | 9 ++- .../DynamicParameter/DynamicParameter.tsx | 2 +- .../CreateWorkspacePageViewExperimental.tsx | 58 ++++++++++++------- 3 files changed, 44 insertions(+), 25 deletions(-) diff --git a/site/src/components/Badge/Badge.tsx b/site/src/components/Badge/Badge.tsx index 6311dff38b18d..8995222027ed0 100644 --- a/site/src/components/Badge/Badge.tsx +++ b/site/src/components/Badge/Badge.tsx @@ -26,10 +26,15 @@ const badgeVariants = cva( sm: "text-2xs font-regular h-5.5 [&_svg]:size-icon-xs", md: "text-xs font-medium [&_svg]:size-icon-sm", }, + border: { + none: "border-transparent", + solid: "border border-solid", + }, }, defaultVariants: { variant: "default", size: "md", + border: "solid", }, }, ); @@ -41,14 +46,14 @@ export interface BadgeProps } export const Badge = forwardRef( - ({ className, variant, size, asChild = false, ...props }, ref) => { + ({ className, variant, size, border, asChild = false, ...props }, ref) => { const Comp = asChild ? Slot : "div"; return ( ); }, diff --git a/site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx b/site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx index d93933228be92..d023bbcf4446b 100644 --- a/site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx +++ b/site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx @@ -106,7 +106,7 @@ const ParameterLabel: FC = ({ parameter, isPreset }) => { - + Immutable diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx index c725a8cbb73f6..1a07596854f8d 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx @@ -5,12 +5,17 @@ import { ErrorAlert } from "components/Alert/ErrorAlert"; import { Avatar } from "components/Avatar/Avatar"; import { Button } from "components/Button/Button"; import { FeatureStageBadge } from "components/FeatureStageBadge/FeatureStageBadge"; -import { SelectFilter } from "components/Filter/SelectFilter"; import { Input } from "components/Input/Input"; import { Label } from "components/Label/Label"; import { Pill } from "components/Pill/Pill"; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from "components/Select/Select"; import { Spinner } from "components/Spinner/Spinner"; -import { Stack } from "components/Stack/Stack"; import { Switch } from "components/Switch/Switch"; import { UserAutocomplete } from "components/UserAutocomplete/UserAutocomplete"; import { type FormikContextType, useFormik } from "formik"; @@ -153,11 +158,11 @@ export const CreateWorkspacePageViewExperimental: FC< }, [form.submitCount, form.errors]); const [presetOptions, setPresetOptions] = useState([ - { label: "None", value: "" }, + { label: "None", value: "None" }, ]); useEffect(() => { setPresetOptions([ - { label: "None", value: "" }, + { label: "None", value: "None" }, ...presets.map((preset) => ({ label: preset.Name, value: preset.ID, @@ -421,7 +426,7 @@ export const CreateWorkspacePageViewExperimental: FC< )} {parameters.length > 0 && ( -
+

Parameters

@@ -429,30 +434,39 @@ export const CreateWorkspacePageViewExperimental: FC< parameters cannot be modified once the workspace is created.

- + {diagnostics.length > 0 && ( + + )} {presets.length > 0 && ( - -
-
- - -
-
- { +
+
+ + +
+
+
+
- +
)}
From 64b9bc1ca49eb5d8a50dc6892b4827122af772c9 Mon Sep 17 00:00:00 2001 From: M Atif Ali Date: Fri, 2 May 2025 21:07:10 +0500 Subject: [PATCH 005/706] fix: update licensing info URL on sign up page (#17657) --- site/src/pages/SetupPage/SetupPageView.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/src/pages/SetupPage/SetupPageView.tsx b/site/src/pages/SetupPage/SetupPageView.tsx index b47a6e9b78f8c..42c8faedea348 100644 --- a/site/src/pages/SetupPage/SetupPageView.tsx +++ b/site/src/pages/SetupPage/SetupPageView.tsx @@ -18,7 +18,6 @@ import { SignInLayout } from "components/SignInLayout/SignInLayout"; import { Stack } from "components/Stack/Stack"; import { type FormikContextType, useFormik } from "formik"; import type { ChangeEvent, FC } from "react"; -import { docs } from "utils/docs"; import { getFormHelpers, nameValidator, @@ -247,7 +246,7 @@ export const SetupPageView: FC = ({ quotas, and more. From 544259b8093f0c3351f3ae86c6a0440b6479f395 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Fri, 2 May 2025 17:29:57 +0100 Subject: [PATCH 006/706] feat: add database tables and API routes for agentic chat feature (#17570) Backend portion of experimental `AgenticChat` feature: - Adds database tables for chats and chat messages - Adds functionality to stream messages from LLM providers using `kylecarbs/aisdk-go` - Adds API routes with relevant functionality (list, create, update chats, insert chat message) - Adds experiment `codersdk.AgenticChat` --------- Co-authored-by: Kyle Carberry --- cli/server.go | 89 +++ cli/testdata/server-config.yaml.golden | 3 + coderd/ai/ai.go | 167 +++++ coderd/apidoc/docs.go | 592 +++++++++++++++++- coderd/apidoc/swagger.json | 552 +++++++++++++++- coderd/chat.go | 366 +++++++++++ coderd/chat_test.go | 125 ++++ coderd/coderd.go | 20 +- coderd/database/db2sdk/db2sdk.go | 13 + coderd/database/dbauthz/dbauthz.go | 42 ++ coderd/database/dbauthz/dbauthz_test.go | 74 +++ coderd/database/dbgen/dbgen.go | 24 + coderd/database/dbmem/dbmem.go | 137 ++++ coderd/database/dbmetrics/querymetrics.go | 49 ++ coderd/database/dbmock/dbmock.go | 103 +++ coderd/database/dump.sql | 40 ++ coderd/database/foreign_key_constraint.go | 2 + .../database/migrations/000319_chat.down.sql | 3 + coderd/database/migrations/000319_chat.up.sql | 17 + .../testdata/fixtures/000319_chat.up.sql | 6 + coderd/database/modelmethods.go | 5 + coderd/database/models.go | 17 + coderd/database/querier.go | 7 + coderd/database/queries.sql.go | 201 ++++++ coderd/database/queries/chat.sql | 36 ++ coderd/database/unique_constraint.go | 2 + coderd/deployment.go | 25 + coderd/httpmw/chat.go | 59 ++ coderd/httpmw/chat_test.go | 150 +++++ coderd/rbac/object_gen.go | 11 + coderd/rbac/policy/policy.go | 8 + coderd/rbac/roles.go | 2 + coderd/rbac/roles_test.go | 31 + codersdk/chat.go | 153 +++++ codersdk/deployment.go | 52 ++ codersdk/rbacresources_gen.go | 2 + codersdk/toolsdk/toolsdk.go | 9 +- docs/reference/api/chat.md | 372 +++++++++++ docs/reference/api/general.md | 50 ++ docs/reference/api/members.md | 5 + docs/reference/api/schemas.md | 583 ++++++++++++++++- go.mod | 8 +- go.sum | 4 +- site/src/api/rbacresourcesGenerated.ts | 6 + site/src/api/typesGenerated.ts | 58 ++ 45 files changed, 4264 insertions(+), 16 deletions(-) create mode 100644 coderd/ai/ai.go create mode 100644 coderd/chat.go create mode 100644 coderd/chat_test.go create mode 100644 coderd/database/migrations/000319_chat.down.sql create mode 100644 coderd/database/migrations/000319_chat.up.sql create mode 100644 coderd/database/migrations/testdata/fixtures/000319_chat.up.sql create mode 100644 coderd/database/queries/chat.sql create mode 100644 coderd/httpmw/chat.go create mode 100644 coderd/httpmw/chat_test.go create mode 100644 codersdk/chat.go create mode 100644 docs/reference/api/chat.md diff --git a/cli/server.go b/cli/server.go index 580dae369446c..48ec8492f0a55 100644 --- a/cli/server.go +++ b/cli/server.go @@ -61,6 +61,7 @@ import ( "github.com/coder/serpent" "github.com/coder/wgtunnel/tunnelsdk" + "github.com/coder/coder/v2/coderd/ai" "github.com/coder/coder/v2/coderd/entitlements" "github.com/coder/coder/v2/coderd/notifications/reports" "github.com/coder/coder/v2/coderd/runtimeconfig" @@ -610,6 +611,22 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd. ) } + aiProviders, err := ReadAIProvidersFromEnv(os.Environ()) + if err != nil { + return xerrors.Errorf("read ai providers from env: %w", err) + } + vals.AI.Value.Providers = append(vals.AI.Value.Providers, aiProviders...) + for _, provider := range aiProviders { + logger.Debug( + ctx, "loaded ai provider", + slog.F("type", provider.Type), + ) + } + languageModels, err := ai.ModelsFromConfig(ctx, vals.AI.Value.Providers) + if err != nil { + return xerrors.Errorf("create language models: %w", err) + } + realIPConfig, err := httpmw.ParseRealIPConfig(vals.ProxyTrustedHeaders, vals.ProxyTrustedOrigins) if err != nil { return xerrors.Errorf("parse real ip config: %w", err) @@ -640,6 +657,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd. CacheDir: cacheDir, GoogleTokenValidator: googleTokenValidator, ExternalAuthConfigs: externalAuthConfigs, + LanguageModels: languageModels, RealIPConfig: realIPConfig, SSHKeygenAlgorithm: sshKeygenAlgorithm, TracerProvider: tracerProvider, @@ -2621,6 +2639,77 @@ func redirectHTTPToHTTPSDeprecation(ctx context.Context, logger slog.Logger, inv } } +func ReadAIProvidersFromEnv(environ []string) ([]codersdk.AIProviderConfig, error) { + // The index numbers must be in-order. + sort.Strings(environ) + + var providers []codersdk.AIProviderConfig + for _, v := range serpent.ParseEnviron(environ, "CODER_AI_PROVIDER_") { + tokens := strings.SplitN(v.Name, "_", 2) + if len(tokens) != 2 { + return nil, xerrors.Errorf("invalid env var: %s", v.Name) + } + + providerNum, err := strconv.Atoi(tokens[0]) + if err != nil { + return nil, xerrors.Errorf("parse number: %s", v.Name) + } + + var provider codersdk.AIProviderConfig + switch { + case len(providers) < providerNum: + return nil, xerrors.Errorf( + "provider num %v skipped: %s", + len(providers), + v.Name, + ) + case len(providers) == providerNum: + // At the next next provider. + providers = append(providers, provider) + case len(providers) == providerNum+1: + // At the current provider. + provider = providers[providerNum] + } + + key := tokens[1] + switch key { + case "TYPE": + provider.Type = v.Value + case "API_KEY": + provider.APIKey = v.Value + case "BASE_URL": + provider.BaseURL = v.Value + case "MODELS": + provider.Models = strings.Split(v.Value, ",") + } + providers[providerNum] = provider + } + for _, envVar := range environ { + tokens := strings.SplitN(envVar, "=", 2) + if len(tokens) != 2 { + continue + } + switch tokens[0] { + case "OPENAI_API_KEY": + providers = append(providers, codersdk.AIProviderConfig{ + Type: "openai", + APIKey: tokens[1], + }) + case "ANTHROPIC_API_KEY": + providers = append(providers, codersdk.AIProviderConfig{ + Type: "anthropic", + APIKey: tokens[1], + }) + case "GOOGLE_API_KEY": + providers = append(providers, codersdk.AIProviderConfig{ + Type: "google", + APIKey: tokens[1], + }) + } + } + return providers, nil +} + // ReadExternalAuthProvidersFromEnv is provided for compatibility purposes with // the viper CLI. func ReadExternalAuthProvidersFromEnv(environ []string) ([]codersdk.ExternalAuthConfig, error) { diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden index 8f34ee8cbe7be..fc76a6c2ec8a0 100644 --- a/cli/testdata/server-config.yaml.golden +++ b/cli/testdata/server-config.yaml.golden @@ -519,6 +519,9 @@ client: # Support links to display in the top right drop down menu. # (default: , type: struct[[]codersdk.LinkConfig]) supportLinks: [] +# Configure AI providers. +# (default: , type: struct[codersdk.AIConfig]) +ai: {} # External Authentication providers. # (default: , type: struct[[]codersdk.ExternalAuthConfig]) externalAuthProviders: [] diff --git a/coderd/ai/ai.go b/coderd/ai/ai.go new file mode 100644 index 0000000000000..97c825ae44c06 --- /dev/null +++ b/coderd/ai/ai.go @@ -0,0 +1,167 @@ +package ai + +import ( + "context" + + "github.com/anthropics/anthropic-sdk-go" + anthropicoption "github.com/anthropics/anthropic-sdk-go/option" + "github.com/kylecarbs/aisdk-go" + "github.com/openai/openai-go" + openaioption "github.com/openai/openai-go/option" + "golang.org/x/xerrors" + "google.golang.org/genai" + + "github.com/coder/coder/v2/codersdk" +) + +type LanguageModel struct { + codersdk.LanguageModel + StreamFunc StreamFunc +} + +type StreamOptions struct { + SystemPrompt string + Model string + Messages []aisdk.Message + Thinking bool + Tools []aisdk.Tool +} + +type StreamFunc func(ctx context.Context, options StreamOptions) (aisdk.DataStream, error) + +// LanguageModels is a map of language model ID to language model. +type LanguageModels map[string]LanguageModel + +func ModelsFromConfig(ctx context.Context, configs []codersdk.AIProviderConfig) (LanguageModels, error) { + models := make(LanguageModels) + + for _, config := range configs { + var streamFunc StreamFunc + + switch config.Type { + case "openai": + opts := []openaioption.RequestOption{ + openaioption.WithAPIKey(config.APIKey), + } + if config.BaseURL != "" { + opts = append(opts, openaioption.WithBaseURL(config.BaseURL)) + } + client := openai.NewClient(opts...) + streamFunc = func(ctx context.Context, options StreamOptions) (aisdk.DataStream, error) { + openaiMessages, err := aisdk.MessagesToOpenAI(options.Messages) + if err != nil { + return nil, err + } + tools := aisdk.ToolsToOpenAI(options.Tools) + if options.SystemPrompt != "" { + openaiMessages = append([]openai.ChatCompletionMessageParamUnion{ + openai.SystemMessage(options.SystemPrompt), + }, openaiMessages...) + } + + return aisdk.OpenAIToDataStream(client.Chat.Completions.NewStreaming(ctx, openai.ChatCompletionNewParams{ + Messages: openaiMessages, + Model: options.Model, + Tools: tools, + MaxTokens: openai.Int(8192), + })), nil + } + if config.Models == nil { + models, err := client.Models.List(ctx) + if err != nil { + return nil, err + } + config.Models = make([]string, len(models.Data)) + for i, model := range models.Data { + config.Models[i] = model.ID + } + } + case "anthropic": + client := anthropic.NewClient(anthropicoption.WithAPIKey(config.APIKey)) + streamFunc = func(ctx context.Context, options StreamOptions) (aisdk.DataStream, error) { + anthropicMessages, systemMessage, err := aisdk.MessagesToAnthropic(options.Messages) + if err != nil { + return nil, err + } + if options.SystemPrompt != "" { + systemMessage = []anthropic.TextBlockParam{ + *anthropic.NewTextBlock(options.SystemPrompt).OfRequestTextBlock, + } + } + return aisdk.AnthropicToDataStream(client.Messages.NewStreaming(ctx, anthropic.MessageNewParams{ + Messages: anthropicMessages, + Model: options.Model, + System: systemMessage, + Tools: aisdk.ToolsToAnthropic(options.Tools), + MaxTokens: 8192, + })), nil + } + if config.Models == nil { + models, err := client.Models.List(ctx, anthropic.ModelListParams{}) + if err != nil { + return nil, err + } + config.Models = make([]string, len(models.Data)) + for i, model := range models.Data { + config.Models[i] = model.ID + } + } + case "google": + client, err := genai.NewClient(ctx, &genai.ClientConfig{ + APIKey: config.APIKey, + Backend: genai.BackendGeminiAPI, + }) + if err != nil { + return nil, err + } + streamFunc = func(ctx context.Context, options StreamOptions) (aisdk.DataStream, error) { + googleMessages, err := aisdk.MessagesToGoogle(options.Messages) + if err != nil { + return nil, err + } + tools, err := aisdk.ToolsToGoogle(options.Tools) + if err != nil { + return nil, err + } + var systemInstruction *genai.Content + if options.SystemPrompt != "" { + systemInstruction = &genai.Content{ + Parts: []*genai.Part{ + genai.NewPartFromText(options.SystemPrompt), + }, + Role: "model", + } + } + return aisdk.GoogleToDataStream(client.Models.GenerateContentStream(ctx, options.Model, googleMessages, &genai.GenerateContentConfig{ + SystemInstruction: systemInstruction, + Tools: tools, + })), nil + } + if config.Models == nil { + models, err := client.Models.List(ctx, &genai.ListModelsConfig{}) + if err != nil { + return nil, err + } + config.Models = make([]string, len(models.Items)) + for i, model := range models.Items { + config.Models[i] = model.Name + } + } + default: + return nil, xerrors.Errorf("unsupported model type: %s", config.Type) + } + + for _, model := range config.Models { + models[model] = LanguageModel{ + LanguageModel: codersdk.LanguageModel{ + ID: model, + DisplayName: model, + Provider: config.Type, + }, + StreamFunc: streamFunc, + } + } + } + + return models, nil +} diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index daef10a90d422..fb5ae20e448c8 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -343,6 +343,173 @@ const docTemplate = `{ } } }, + "/chats": { + "get": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": [ + "application/json" + ], + "tags": [ + "Chat" + ], + "summary": "List chats", + "operationId": "list-chats", + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/codersdk.Chat" + } + } + } + } + }, + "post": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": [ + "application/json" + ], + "tags": [ + "Chat" + ], + "summary": "Create a chat", + "operationId": "create-a-chat", + "responses": { + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/codersdk.Chat" + } + } + } + } + }, + "/chats/{chat}": { + "get": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": [ + "application/json" + ], + "tags": [ + "Chat" + ], + "summary": "Get a chat", + "operationId": "get-a-chat", + "parameters": [ + { + "type": "string", + "description": "Chat ID", + "name": "chat", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/codersdk.Chat" + } + } + } + } + }, + "/chats/{chat}/messages": { + "get": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": [ + "application/json" + ], + "tags": [ + "Chat" + ], + "summary": "Get chat messages", + "operationId": "get-chat-messages", + "parameters": [ + { + "type": "string", + "description": "Chat ID", + "name": "chat", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Message" + } + } + } + } + }, + "post": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "Chat" + ], + "summary": "Create a chat message", + "operationId": "create-a-chat-message", + "parameters": [ + { + "type": "string", + "description": "Chat ID", + "name": "chat", + "in": "path", + "required": true + }, + { + "description": "Request body", + "name": "request", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/codersdk.CreateChatMessageRequest" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": {} + } + } + } + } + }, "/csp/reports": { "post": { "security": [ @@ -659,6 +826,31 @@ const docTemplate = `{ } } }, + "/deployment/llms": { + "get": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": [ + "application/json" + ], + "tags": [ + "General" + ], + "summary": "Get language models", + "operationId": "get-language-models", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/codersdk.LanguageModelConfig" + } + } + } + } + }, "/deployment/ssh": { "get": { "security": [ @@ -10297,6 +10489,190 @@ const docTemplate = `{ } } }, + "aisdk.Attachment": { + "type": "object", + "properties": { + "contentType": { + "type": "string" + }, + "name": { + "type": "string" + }, + "url": { + "type": "string" + } + } + }, + "aisdk.Message": { + "type": "object", + "properties": { + "annotations": { + "type": "array", + "items": {} + }, + "content": { + "type": "string" + }, + "createdAt": { + "type": "array", + "items": { + "type": "integer" + } + }, + "experimental_attachments": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Attachment" + } + }, + "id": { + "type": "string" + }, + "parts": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Part" + } + }, + "role": { + "type": "string" + } + } + }, + "aisdk.Part": { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "type": "integer" + } + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.ReasoningDetail" + } + }, + "mimeType": { + "description": "Type: \"file\"", + "type": "string" + }, + "reasoning": { + "description": "Type: \"reasoning\"", + "type": "string" + }, + "source": { + "description": "Type: \"source\"", + "allOf": [ + { + "$ref": "#/definitions/aisdk.SourceInfo" + } + ] + }, + "text": { + "description": "Type: \"text\"", + "type": "string" + }, + "toolInvocation": { + "description": "Type: \"tool-invocation\"", + "allOf": [ + { + "$ref": "#/definitions/aisdk.ToolInvocation" + } + ] + }, + "type": { + "$ref": "#/definitions/aisdk.PartType" + } + } + }, + "aisdk.PartType": { + "type": "string", + "enum": [ + "text", + "reasoning", + "tool-invocation", + "source", + "file", + "step-start" + ], + "x-enum-varnames": [ + "PartTypeText", + "PartTypeReasoning", + "PartTypeToolInvocation", + "PartTypeSource", + "PartTypeFile", + "PartTypeStepStart" + ] + }, + "aisdk.ReasoningDetail": { + "type": "object", + "properties": { + "data": { + "type": "string" + }, + "signature": { + "type": "string" + }, + "text": { + "type": "string" + }, + "type": { + "type": "string" + } + } + }, + "aisdk.SourceInfo": { + "type": "object", + "properties": { + "contentType": { + "type": "string" + }, + "data": { + "type": "string" + }, + "metadata": { + "type": "object", + "additionalProperties": {} + }, + "uri": { + "type": "string" + } + } + }, + "aisdk.ToolInvocation": { + "type": "object", + "properties": { + "args": {}, + "result": {}, + "state": { + "$ref": "#/definitions/aisdk.ToolInvocationState" + }, + "step": { + "type": "integer" + }, + "toolCallId": { + "type": "string" + }, + "toolName": { + "type": "string" + } + } + }, + "aisdk.ToolInvocationState": { + "type": "string", + "enum": [ + "call", + "partial-call", + "result" + ], + "x-enum-varnames": [ + "ToolInvocationStateCall", + "ToolInvocationStatePartialCall", + "ToolInvocationStateResult" + ] + }, "coderd.SCIMUser": { "type": "object", "properties": { @@ -10388,6 +10764,37 @@ const docTemplate = `{ } } }, + "codersdk.AIConfig": { + "type": "object", + "properties": { + "providers": { + "type": "array", + "items": { + "$ref": "#/definitions/codersdk.AIProviderConfig" + } + } + } + }, + "codersdk.AIProviderConfig": { + "type": "object", + "properties": { + "base_url": { + "description": "BaseURL is the base URL to use for the API provider.", + "type": "string" + }, + "models": { + "description": "Models is the list of models to use for the API provider.", + "type": "array", + "items": { + "type": "string" + } + }, + "type": { + "description": "Type is the type of the API provider.", + "type": "string" + } + } + }, "codersdk.APIKey": { "type": "object", "required": [ @@ -10973,6 +11380,62 @@ const docTemplate = `{ } } }, + "codersdk.Chat": { + "type": "object", + "properties": { + "created_at": { + "type": "string", + "format": "date-time" + }, + "id": { + "type": "string", + "format": "uuid" + }, + "title": { + "type": "string" + }, + "updated_at": { + "type": "string", + "format": "date-time" + } + } + }, + "codersdk.ChatMessage": { + "type": "object", + "properties": { + "annotations": { + "type": "array", + "items": {} + }, + "content": { + "type": "string" + }, + "createdAt": { + "type": "array", + "items": { + "type": "integer" + } + }, + "experimental_attachments": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Attachment" + } + }, + "id": { + "type": "string" + }, + "parts": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Part" + } + }, + "role": { + "type": "string" + } + } + }, "codersdk.ConnectionLatency": { "type": "object", "properties": { @@ -11006,6 +11469,20 @@ const docTemplate = `{ } } }, + "codersdk.CreateChatMessageRequest": { + "type": "object", + "properties": { + "message": { + "$ref": "#/definitions/codersdk.ChatMessage" + }, + "model": { + "type": "string" + }, + "thinking": { + "type": "boolean" + } + } + }, "codersdk.CreateFirstUserRequest": { "type": "object", "required": [ @@ -11293,7 +11770,73 @@ const docTemplate = `{ } }, "codersdk.CreateTestAuditLogRequest": { - "type": "object" + "type": "object", + "properties": { + "action": { + "enum": [ + "create", + "write", + "delete", + "start", + "stop" + ], + "allOf": [ + { + "$ref": "#/definitions/codersdk.AuditAction" + } + ] + }, + "additional_fields": { + "type": "array", + "items": { + "type": "integer" + } + }, + "build_reason": { + "enum": [ + "autostart", + "autostop", + "initiator" + ], + "allOf": [ + { + "$ref": "#/definitions/codersdk.BuildReason" + } + ] + }, + "organization_id": { + "type": "string", + "format": "uuid" + }, + "request_id": { + "type": "string", + "format": "uuid" + }, + "resource_id": { + "type": "string", + "format": "uuid" + }, + "resource_type": { + "enum": [ + "template", + "template_version", + "user", + "workspace", + "workspace_build", + "git_ssh_key", + "auditable_group" + ], + "allOf": [ + { + "$ref": "#/definitions/codersdk.ResourceType" + } + ] + }, + "time": { + "type": "string", + "format": "date-time" + } + } }, "codersdk.CreateTokenRequest": { "type": "object", @@ -11742,6 +12285,9 @@ const docTemplate = `{ "agent_stat_refresh_interval": { "type": "integer" }, + "ai": { + "$ref": "#/definitions/serpent.Struct-codersdk_AIConfig" + }, "allow_workspace_renames": { "type": "boolean" }, @@ -12009,9 +12555,11 @@ const docTemplate = `{ "workspace-usage", "web-push", "dynamic-parameters", - "workspace-prebuilds" + "workspace-prebuilds", + "agentic-chat" ], "x-enum-comments": { + "ExperimentAgenticChat": "Enables the new agentic AI chat feature.", "ExperimentAutoFillParameters": "This should not be taken out of experiments until we have redesigned the feature.", "ExperimentDynamicParameters": "Enables dynamic parameters when creating a workspace.", "ExperimentExample": "This isn't used for anything.", @@ -12027,7 +12575,8 @@ const docTemplate = `{ "ExperimentWorkspaceUsage", "ExperimentWebPush", "ExperimentDynamicParameters", - "ExperimentWorkspacePrebuilds" + "ExperimentWorkspacePrebuilds", + "ExperimentAgenticChat" ] }, "codersdk.ExternalAuth": { @@ -12538,6 +13087,33 @@ const docTemplate = `{ "RequiredTemplateVariables" ] }, + "codersdk.LanguageModel": { + "type": "object", + "properties": { + "display_name": { + "type": "string" + }, + "id": { + "description": "ID is used by the provider to identify the LLM.", + "type": "string" + }, + "provider": { + "description": "Provider is the provider of the LLM. e.g. openai, anthropic, etc.", + "type": "string" + } + } + }, + "codersdk.LanguageModelConfig": { + "type": "object", + "properties": { + "models": { + "type": "array", + "items": { + "$ref": "#/definitions/codersdk.LanguageModel" + } + } + } + }, "codersdk.License": { "type": "object", "properties": { @@ -14272,6 +14848,7 @@ const docTemplate = `{ "assign_org_role", "assign_role", "audit_log", + "chat", "crypto_key", "debug_info", "deployment_config", @@ -14310,6 +14887,7 @@ const docTemplate = `{ "ResourceAssignOrgRole", "ResourceAssignRole", "ResourceAuditLog", + "ResourceChat", "ResourceCryptoKey", "ResourceDebugInfo", "ResourceDeploymentConfig", @@ -18250,6 +18828,14 @@ const docTemplate = `{ } } }, + "serpent.Struct-codersdk_AIConfig": { + "type": "object", + "properties": { + "value": { + "$ref": "#/definitions/codersdk.AIConfig" + } + } + }, "serpent.URL": { "type": "object", "properties": { diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index 3a7bc4c2c71ed..8420c9ea0f812 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -291,6 +291,151 @@ } } }, + "/chats": { + "get": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": ["application/json"], + "tags": ["Chat"], + "summary": "List chats", + "operationId": "list-chats", + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/codersdk.Chat" + } + } + } + } + }, + "post": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": ["application/json"], + "tags": ["Chat"], + "summary": "Create a chat", + "operationId": "create-a-chat", + "responses": { + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/codersdk.Chat" + } + } + } + } + }, + "/chats/{chat}": { + "get": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": ["application/json"], + "tags": ["Chat"], + "summary": "Get a chat", + "operationId": "get-a-chat", + "parameters": [ + { + "type": "string", + "description": "Chat ID", + "name": "chat", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/codersdk.Chat" + } + } + } + } + }, + "/chats/{chat}/messages": { + "get": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": ["application/json"], + "tags": ["Chat"], + "summary": "Get chat messages", + "operationId": "get-chat-messages", + "parameters": [ + { + "type": "string", + "description": "Chat ID", + "name": "chat", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Message" + } + } + } + } + }, + "post": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "consumes": ["application/json"], + "produces": ["application/json"], + "tags": ["Chat"], + "summary": "Create a chat message", + "operationId": "create-a-chat-message", + "parameters": [ + { + "type": "string", + "description": "Chat ID", + "name": "chat", + "in": "path", + "required": true + }, + { + "description": "Request body", + "name": "request", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/codersdk.CreateChatMessageRequest" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "type": "array", + "items": {} + } + } + } + } + }, "/csp/reports": { "post": { "security": [ @@ -563,6 +708,27 @@ } } }, + "/deployment/llms": { + "get": { + "security": [ + { + "CoderSessionToken": [] + } + ], + "produces": ["application/json"], + "tags": ["General"], + "summary": "Get language models", + "operationId": "get-language-models", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/codersdk.LanguageModelConfig" + } + } + } + } + }, "/deployment/ssh": { "get": { "security": [ @@ -9134,6 +9300,186 @@ } } }, + "aisdk.Attachment": { + "type": "object", + "properties": { + "contentType": { + "type": "string" + }, + "name": { + "type": "string" + }, + "url": { + "type": "string" + } + } + }, + "aisdk.Message": { + "type": "object", + "properties": { + "annotations": { + "type": "array", + "items": {} + }, + "content": { + "type": "string" + }, + "createdAt": { + "type": "array", + "items": { + "type": "integer" + } + }, + "experimental_attachments": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Attachment" + } + }, + "id": { + "type": "string" + }, + "parts": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Part" + } + }, + "role": { + "type": "string" + } + } + }, + "aisdk.Part": { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "type": "integer" + } + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.ReasoningDetail" + } + }, + "mimeType": { + "description": "Type: \"file\"", + "type": "string" + }, + "reasoning": { + "description": "Type: \"reasoning\"", + "type": "string" + }, + "source": { + "description": "Type: \"source\"", + "allOf": [ + { + "$ref": "#/definitions/aisdk.SourceInfo" + } + ] + }, + "text": { + "description": "Type: \"text\"", + "type": "string" + }, + "toolInvocation": { + "description": "Type: \"tool-invocation\"", + "allOf": [ + { + "$ref": "#/definitions/aisdk.ToolInvocation" + } + ] + }, + "type": { + "$ref": "#/definitions/aisdk.PartType" + } + } + }, + "aisdk.PartType": { + "type": "string", + "enum": [ + "text", + "reasoning", + "tool-invocation", + "source", + "file", + "step-start" + ], + "x-enum-varnames": [ + "PartTypeText", + "PartTypeReasoning", + "PartTypeToolInvocation", + "PartTypeSource", + "PartTypeFile", + "PartTypeStepStart" + ] + }, + "aisdk.ReasoningDetail": { + "type": "object", + "properties": { + "data": { + "type": "string" + }, + "signature": { + "type": "string" + }, + "text": { + "type": "string" + }, + "type": { + "type": "string" + } + } + }, + "aisdk.SourceInfo": { + "type": "object", + "properties": { + "contentType": { + "type": "string" + }, + "data": { + "type": "string" + }, + "metadata": { + "type": "object", + "additionalProperties": {} + }, + "uri": { + "type": "string" + } + } + }, + "aisdk.ToolInvocation": { + "type": "object", + "properties": { + "args": {}, + "result": {}, + "state": { + "$ref": "#/definitions/aisdk.ToolInvocationState" + }, + "step": { + "type": "integer" + }, + "toolCallId": { + "type": "string" + }, + "toolName": { + "type": "string" + } + } + }, + "aisdk.ToolInvocationState": { + "type": "string", + "enum": ["call", "partial-call", "result"], + "x-enum-varnames": [ + "ToolInvocationStateCall", + "ToolInvocationStatePartialCall", + "ToolInvocationStateResult" + ] + }, "coderd.SCIMUser": { "type": "object", "properties": { @@ -9225,6 +9571,37 @@ } } }, + "codersdk.AIConfig": { + "type": "object", + "properties": { + "providers": { + "type": "array", + "items": { + "$ref": "#/definitions/codersdk.AIProviderConfig" + } + } + } + }, + "codersdk.AIProviderConfig": { + "type": "object", + "properties": { + "base_url": { + "description": "BaseURL is the base URL to use for the API provider.", + "type": "string" + }, + "models": { + "description": "Models is the list of models to use for the API provider.", + "type": "array", + "items": { + "type": "string" + } + }, + "type": { + "description": "Type is the type of the API provider.", + "type": "string" + } + } + }, "codersdk.APIKey": { "type": "object", "required": [ @@ -9771,6 +10148,62 @@ } } }, + "codersdk.Chat": { + "type": "object", + "properties": { + "created_at": { + "type": "string", + "format": "date-time" + }, + "id": { + "type": "string", + "format": "uuid" + }, + "title": { + "type": "string" + }, + "updated_at": { + "type": "string", + "format": "date-time" + } + } + }, + "codersdk.ChatMessage": { + "type": "object", + "properties": { + "annotations": { + "type": "array", + "items": {} + }, + "content": { + "type": "string" + }, + "createdAt": { + "type": "array", + "items": { + "type": "integer" + } + }, + "experimental_attachments": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Attachment" + } + }, + "id": { + "type": "string" + }, + "parts": { + "type": "array", + "items": { + "$ref": "#/definitions/aisdk.Part" + } + }, + "role": { + "type": "string" + } + } + }, "codersdk.ConnectionLatency": { "type": "object", "properties": { @@ -9801,6 +10234,20 @@ } } }, + "codersdk.CreateChatMessageRequest": { + "type": "object", + "properties": { + "message": { + "$ref": "#/definitions/codersdk.ChatMessage" + }, + "model": { + "type": "string" + }, + "thinking": { + "type": "boolean" + } + } + }, "codersdk.CreateFirstUserRequest": { "type": "object", "required": ["email", "password", "username"], @@ -10069,7 +10516,63 @@ } }, "codersdk.CreateTestAuditLogRequest": { - "type": "object" + "type": "object", + "properties": { + "action": { + "enum": ["create", "write", "delete", "start", "stop"], + "allOf": [ + { + "$ref": "#/definitions/codersdk.AuditAction" + } + ] + }, + "additional_fields": { + "type": "array", + "items": { + "type": "integer" + } + }, + "build_reason": { + "enum": ["autostart", "autostop", "initiator"], + "allOf": [ + { + "$ref": "#/definitions/codersdk.BuildReason" + } + ] + }, + "organization_id": { + "type": "string", + "format": "uuid" + }, + "request_id": { + "type": "string", + "format": "uuid" + }, + "resource_id": { + "type": "string", + "format": "uuid" + }, + "resource_type": { + "enum": [ + "template", + "template_version", + "user", + "workspace", + "workspace_build", + "git_ssh_key", + "auditable_group" + ], + "allOf": [ + { + "$ref": "#/definitions/codersdk.ResourceType" + } + ] + }, + "time": { + "type": "string", + "format": "date-time" + } + } }, "codersdk.CreateTokenRequest": { "type": "object", @@ -10500,6 +11003,9 @@ "agent_stat_refresh_interval": { "type": "integer" }, + "ai": { + "$ref": "#/definitions/serpent.Struct-codersdk_AIConfig" + }, "allow_workspace_renames": { "type": "boolean" }, @@ -10763,9 +11269,11 @@ "workspace-usage", "web-push", "dynamic-parameters", - "workspace-prebuilds" + "workspace-prebuilds", + "agentic-chat" ], "x-enum-comments": { + "ExperimentAgenticChat": "Enables the new agentic AI chat feature.", "ExperimentAutoFillParameters": "This should not be taken out of experiments until we have redesigned the feature.", "ExperimentDynamicParameters": "Enables dynamic parameters when creating a workspace.", "ExperimentExample": "This isn't used for anything.", @@ -10781,7 +11289,8 @@ "ExperimentWorkspaceUsage", "ExperimentWebPush", "ExperimentDynamicParameters", - "ExperimentWorkspacePrebuilds" + "ExperimentWorkspacePrebuilds", + "ExperimentAgenticChat" ] }, "codersdk.ExternalAuth": { @@ -11276,6 +11785,33 @@ "enum": ["REQUIRED_TEMPLATE_VARIABLES"], "x-enum-varnames": ["RequiredTemplateVariables"] }, + "codersdk.LanguageModel": { + "type": "object", + "properties": { + "display_name": { + "type": "string" + }, + "id": { + "description": "ID is used by the provider to identify the LLM.", + "type": "string" + }, + "provider": { + "description": "Provider is the provider of the LLM. e.g. openai, anthropic, etc.", + "type": "string" + } + } + }, + "codersdk.LanguageModelConfig": { + "type": "object", + "properties": { + "models": { + "type": "array", + "items": { + "$ref": "#/definitions/codersdk.LanguageModel" + } + } + } + }, "codersdk.License": { "type": "object", "properties": { @@ -12930,6 +13466,7 @@ "assign_org_role", "assign_role", "audit_log", + "chat", "crypto_key", "debug_info", "deployment_config", @@ -12968,6 +13505,7 @@ "ResourceAssignOrgRole", "ResourceAssignRole", "ResourceAuditLog", + "ResourceChat", "ResourceCryptoKey", "ResourceDebugInfo", "ResourceDeploymentConfig", @@ -16705,6 +17243,14 @@ } } }, + "serpent.Struct-codersdk_AIConfig": { + "type": "object", + "properties": { + "value": { + "$ref": "#/definitions/codersdk.AIConfig" + } + } + }, "serpent.URL": { "type": "object", "properties": { diff --git a/coderd/chat.go b/coderd/chat.go new file mode 100644 index 0000000000000..b10211075cfe6 --- /dev/null +++ b/coderd/chat.go @@ -0,0 +1,366 @@ +package coderd + +import ( + "encoding/json" + "io" + "net/http" + "time" + + "github.com/kylecarbs/aisdk-go" + + "github.com/coder/coder/v2/coderd/ai" + "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/db2sdk" + "github.com/coder/coder/v2/coderd/database/dbtime" + "github.com/coder/coder/v2/coderd/httpapi" + "github.com/coder/coder/v2/coderd/httpmw" + "github.com/coder/coder/v2/coderd/util/strings" + "github.com/coder/coder/v2/codersdk" + "github.com/coder/coder/v2/codersdk/toolsdk" +) + +// postChats creates a new chat. +// +// @Summary Create a chat +// @ID create-a-chat +// @Security CoderSessionToken +// @Produce json +// @Tags Chat +// @Success 201 {object} codersdk.Chat +// @Router /chats [post] +func (api *API) postChats(w http.ResponseWriter, r *http.Request) { + apiKey := httpmw.APIKey(r) + ctx := r.Context() + + chat, err := api.Database.InsertChat(ctx, database.InsertChatParams{ + OwnerID: apiKey.UserID, + CreatedAt: time.Now(), + UpdatedAt: time.Now(), + Title: "New Chat", + }) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to create chat", + Detail: err.Error(), + }) + return + } + + httpapi.Write(ctx, w, http.StatusCreated, db2sdk.Chat(chat)) +} + +// listChats lists all chats for a user. +// +// @Summary List chats +// @ID list-chats +// @Security CoderSessionToken +// @Produce json +// @Tags Chat +// @Success 200 {array} codersdk.Chat +// @Router /chats [get] +func (api *API) listChats(w http.ResponseWriter, r *http.Request) { + apiKey := httpmw.APIKey(r) + ctx := r.Context() + + chats, err := api.Database.GetChatsByOwnerID(ctx, apiKey.UserID) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to list chats", + Detail: err.Error(), + }) + return + } + + httpapi.Write(ctx, w, http.StatusOK, db2sdk.Chats(chats)) +} + +// chat returns a chat by ID. +// +// @Summary Get a chat +// @ID get-a-chat +// @Security CoderSessionToken +// @Produce json +// @Tags Chat +// @Param chat path string true "Chat ID" +// @Success 200 {object} codersdk.Chat +// @Router /chats/{chat} [get] +func (*API) chat(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + chat := httpmw.ChatParam(r) + httpapi.Write(ctx, w, http.StatusOK, db2sdk.Chat(chat)) +} + +// chatMessages returns the messages of a chat. +// +// @Summary Get chat messages +// @ID get-chat-messages +// @Security CoderSessionToken +// @Produce json +// @Tags Chat +// @Param chat path string true "Chat ID" +// @Success 200 {array} aisdk.Message +// @Router /chats/{chat}/messages [get] +func (api *API) chatMessages(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + chat := httpmw.ChatParam(r) + rawMessages, err := api.Database.GetChatMessagesByChatID(ctx, chat.ID) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to get chat messages", + Detail: err.Error(), + }) + return + } + messages := make([]aisdk.Message, len(rawMessages)) + for i, message := range rawMessages { + var msg aisdk.Message + err = json.Unmarshal(message.Content, &msg) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to unmarshal chat message", + Detail: err.Error(), + }) + return + } + messages[i] = msg + } + + httpapi.Write(ctx, w, http.StatusOK, messages) +} + +// postChatMessages creates a new chat message and streams the response. +// +// @Summary Create a chat message +// @ID create-a-chat-message +// @Security CoderSessionToken +// @Accept json +// @Produce json +// @Tags Chat +// @Param chat path string true "Chat ID" +// @Param request body codersdk.CreateChatMessageRequest true "Request body" +// @Success 200 {array} aisdk.DataStreamPart +// @Router /chats/{chat}/messages [post] +func (api *API) postChatMessages(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + chat := httpmw.ChatParam(r) + var req codersdk.CreateChatMessageRequest + err := json.NewDecoder(r.Body).Decode(&req) + if err != nil { + httpapi.Write(ctx, w, http.StatusBadRequest, codersdk.Response{ + Message: "Failed to decode chat message", + Detail: err.Error(), + }) + return + } + + dbMessages, err := api.Database.GetChatMessagesByChatID(ctx, chat.ID) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to get chat messages", + Detail: err.Error(), + }) + return + } + + messages := make([]codersdk.ChatMessage, 0) + for _, dbMsg := range dbMessages { + var msg codersdk.ChatMessage + err = json.Unmarshal(dbMsg.Content, &msg) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to unmarshal chat message", + Detail: err.Error(), + }) + return + } + messages = append(messages, msg) + } + messages = append(messages, req.Message) + + client := codersdk.New(api.AccessURL) + client.SetSessionToken(httpmw.APITokenFromRequest(r)) + + tools := make([]aisdk.Tool, 0) + handlers := map[string]toolsdk.GenericHandlerFunc{} + for _, tool := range toolsdk.All { + if tool.Name == "coder_report_task" { + continue // This tool requires an agent to run. + } + tools = append(tools, tool.Tool) + handlers[tool.Tool.Name] = tool.Handler + } + + provider, ok := api.LanguageModels[req.Model] + if !ok { + httpapi.Write(ctx, w, http.StatusBadRequest, codersdk.Response{ + Message: "Model not found", + }) + return + } + + // If it's the user's first message, generate a title for the chat. + if len(messages) == 1 { + var acc aisdk.DataStreamAccumulator + stream, err := provider.StreamFunc(ctx, ai.StreamOptions{ + Model: req.Model, + SystemPrompt: `- You will generate a short title based on the user's message. +- It should be maximum of 40 characters. +- Do not use quotes, colons, special characters, or emojis.`, + Messages: messages, + Tools: []aisdk.Tool{}, // This initial stream doesn't use tools. + }) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to create stream", + Detail: err.Error(), + }) + return + } + stream = stream.WithAccumulator(&acc) + err = stream.Pipe(io.Discard) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to pipe stream", + Detail: err.Error(), + }) + return + } + var newTitle string + accMessages := acc.Messages() + // If for some reason the stream didn't return any messages, use the + // original message as the title. + if len(accMessages) == 0 { + newTitle = strings.Truncate(messages[0].Content, 40) + } else { + newTitle = strings.Truncate(accMessages[0].Content, 40) + } + err = api.Database.UpdateChatByID(ctx, database.UpdateChatByIDParams{ + ID: chat.ID, + Title: newTitle, + UpdatedAt: dbtime.Now(), + }) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to update chat title", + Detail: err.Error(), + }) + return + } + } + + // Write headers for the data stream! + aisdk.WriteDataStreamHeaders(w) + + // Insert the user-requested message into the database! + raw, err := json.Marshal([]aisdk.Message{req.Message}) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to marshal chat message", + Detail: err.Error(), + }) + return + } + _, err = api.Database.InsertChatMessages(ctx, database.InsertChatMessagesParams{ + ChatID: chat.ID, + CreatedAt: dbtime.Now(), + Model: req.Model, + Provider: provider.Provider, + Content: raw, + }) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to insert chat messages", + Detail: err.Error(), + }) + return + } + + deps, err := toolsdk.NewDeps(client) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to create tool dependencies", + Detail: err.Error(), + }) + return + } + + for { + var acc aisdk.DataStreamAccumulator + stream, err := provider.StreamFunc(ctx, ai.StreamOptions{ + Model: req.Model, + Messages: messages, + Tools: tools, + SystemPrompt: `You are a chat assistant for Coder - an open-source platform for creating and managing cloud development environments on any infrastructure. You are expected to be precise, concise, and helpful. + +You are running as an agent - please keep going until the user's query is completely resolved, before ending your turn and yielding back to the user. Only terminate your turn when you are sure that the problem is solved. Do NOT guess or make up an answer.`, + }) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to create stream", + Detail: err.Error(), + }) + return + } + stream = stream.WithToolCalling(func(toolCall aisdk.ToolCall) aisdk.ToolCallResult { + tool, ok := handlers[toolCall.Name] + if !ok { + return nil + } + toolArgs, err := json.Marshal(toolCall.Args) + if err != nil { + return nil + } + result, err := tool(ctx, deps, toolArgs) + if err != nil { + return map[string]any{ + "error": err.Error(), + } + } + return result + }).WithAccumulator(&acc) + + err = stream.Pipe(w) + if err != nil { + // The client disppeared! + api.Logger.Error(ctx, "stream pipe error", "error", err) + return + } + + // acc.Messages() may sometimes return nil. Serializing this + // will cause a pq error: "cannot extract elements from a scalar". + newMessages := append([]aisdk.Message{}, acc.Messages()...) + if len(newMessages) > 0 { + raw, err := json.Marshal(newMessages) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to marshal chat message", + Detail: err.Error(), + }) + return + } + messages = append(messages, newMessages...) + + // Insert these messages into the database! + _, err = api.Database.InsertChatMessages(ctx, database.InsertChatMessagesParams{ + ChatID: chat.ID, + CreatedAt: dbtime.Now(), + Model: req.Model, + Provider: provider.Provider, + Content: raw, + }) + if err != nil { + httpapi.Write(ctx, w, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to insert chat messages", + Detail: err.Error(), + }) + return + } + } + + if acc.FinishReason() == aisdk.FinishReasonToolCalls { + continue + } + + break + } +} diff --git a/coderd/chat_test.go b/coderd/chat_test.go new file mode 100644 index 0000000000000..71e7b99ab3720 --- /dev/null +++ b/coderd/chat_test.go @@ -0,0 +1,125 @@ +package coderd_test + +import ( + "net/http" + "strings" + "testing" + "time" + + "github.com/stretchr/testify/require" + + "github.com/coder/coder/v2/coderd/coderdtest" + "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/dbgen" + "github.com/coder/coder/v2/coderd/database/dbtime" + "github.com/coder/coder/v2/codersdk" + "github.com/coder/coder/v2/testutil" +) + +func TestChat(t *testing.T) { + t.Parallel() + + t.Run("ExperimentAgenticChatDisabled", func(t *testing.T) { + t.Parallel() + + client, _ := coderdtest.NewWithDatabase(t, nil) + owner := coderdtest.CreateFirstUser(t, client) + memberClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID) + + // Hit the endpoint to get the chat. It should return a 404. + ctx := testutil.Context(t, testutil.WaitShort) + _, err := memberClient.ListChats(ctx) + require.Error(t, err, "list chats should fail") + var sdkErr *codersdk.Error + require.ErrorAs(t, err, &sdkErr, "request should fail with an SDK error") + require.Equal(t, http.StatusForbidden, sdkErr.StatusCode()) + }) + + t.Run("ChatCRUD", func(t *testing.T) { + t.Parallel() + + dv := coderdtest.DeploymentValues(t) + dv.Experiments = []string{string(codersdk.ExperimentAgenticChat)} + dv.AI.Value = codersdk.AIConfig{ + Providers: []codersdk.AIProviderConfig{ + { + Type: "fake", + APIKey: "", + BaseURL: "http://localhost", + Models: []string{"fake-model"}, + }, + }, + } + client, db := coderdtest.NewWithDatabase(t, &coderdtest.Options{ + DeploymentValues: dv, + }) + owner := coderdtest.CreateFirstUser(t, client) + memberClient, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID) + + // Seed the database with some data. + dbChat := dbgen.Chat(t, db, database.Chat{ + OwnerID: memberUser.ID, + CreatedAt: dbtime.Now().Add(-time.Hour), + UpdatedAt: dbtime.Now().Add(-time.Hour), + Title: "This is a test chat", + }) + _ = dbgen.ChatMessage(t, db, database.ChatMessage{ + ChatID: dbChat.ID, + CreatedAt: dbtime.Now().Add(-time.Hour), + Content: []byte(`[{"content": "Hello world"}]`), + Model: "fake model", + Provider: "fake", + }) + + ctx := testutil.Context(t, testutil.WaitShort) + + // Listing chats should return the chat we just inserted. + chats, err := memberClient.ListChats(ctx) + require.NoError(t, err, "list chats should succeed") + require.Len(t, chats, 1, "response should have one chat") + require.Equal(t, dbChat.ID, chats[0].ID, "unexpected chat ID") + require.Equal(t, dbChat.Title, chats[0].Title, "unexpected chat title") + require.Equal(t, dbChat.CreatedAt.UTC(), chats[0].CreatedAt.UTC(), "unexpected chat created at") + require.Equal(t, dbChat.UpdatedAt.UTC(), chats[0].UpdatedAt.UTC(), "unexpected chat updated at") + + // Fetching a single chat by ID should return the same chat. + chat, err := memberClient.Chat(ctx, dbChat.ID) + require.NoError(t, err, "get chat should succeed") + require.Equal(t, chats[0], chat, "get chat should return the same chat") + + // Listing chat messages should return the message we just inserted. + messages, err := memberClient.ChatMessages(ctx, dbChat.ID) + require.NoError(t, err, "list chat messages should succeed") + require.Len(t, messages, 1, "response should have one message") + require.Equal(t, "Hello world", messages[0].Content, "response should have the correct message content") + + // Creating a new chat will fail because the model does not exist. + // TODO: Test the message streaming functionality with a mock model. + // Inserting a chat message will fail due to the model not existing. + _, err = memberClient.CreateChatMessage(ctx, dbChat.ID, codersdk.CreateChatMessageRequest{ + Model: "echo", + Message: codersdk.ChatMessage{ + Role: "user", + Content: "Hello world", + }, + Thinking: false, + }) + require.Error(t, err, "create chat message should fail") + var sdkErr *codersdk.Error + require.ErrorAs(t, err, &sdkErr, "create chat should fail with an SDK error") + require.Equal(t, http.StatusBadRequest, sdkErr.StatusCode(), "create chat should fail with a 400 when model does not exist") + + // Creating a new chat message with malformed content should fail. + res, err := memberClient.Request(ctx, http.MethodPost, "/api/v2/chats/"+dbChat.ID.String()+"/messages", strings.NewReader(`{malformed json}`)) + require.NoError(t, err) + defer res.Body.Close() + apiErr := codersdk.ReadBodyAsError(res) + require.Contains(t, apiErr.Error(), "Failed to decode chat message") + + _, err = memberClient.CreateChat(ctx) + require.NoError(t, err, "create chat should succeed") + chats, err = memberClient.ListChats(ctx) + require.NoError(t, err, "list chats should succeed") + require.Len(t, chats, 2, "response should have two chats") + }) +} diff --git a/coderd/coderd.go b/coderd/coderd.go index 288671c6cb6e9..123e58feb642a 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -41,6 +41,7 @@ import ( "github.com/coder/quartz" "github.com/coder/serpent" + "github.com/coder/coder/v2/coderd/ai" "github.com/coder/coder/v2/coderd/cryptokeys" "github.com/coder/coder/v2/coderd/entitlements" "github.com/coder/coder/v2/coderd/files" @@ -155,6 +156,7 @@ type Options struct { Authorizer rbac.Authorizer AzureCertificates x509.VerifyOptions GoogleTokenValidator *idtoken.Validator + LanguageModels ai.LanguageModels GithubOAuth2Config *GithubOAuth2Config OIDCConfig *OIDCConfig PrometheusRegistry *prometheus.Registry @@ -851,7 +853,7 @@ func New(options *Options) *API { next.ServeHTTP(w, r) }) }, - httpmw.CSRF(options.DeploymentValues.HTTPCookies), + // httpmw.CSRF(options.DeploymentValues.HTTPCookies), ) // This incurs a performance hit from the middleware, but is required to make sure @@ -956,6 +958,7 @@ func New(options *Options) *API { r.Get("/config", api.deploymentValues) r.Get("/stats", api.deploymentStats) r.Get("/ssh", api.sshConfig) + r.Get("/llms", api.deploymentLLMs) }) r.Route("/experiments", func(r chi.Router) { r.Use(apiKeyMiddleware) @@ -998,6 +1001,21 @@ func New(options *Options) *API { r.Get("/{fileID}", api.fileByID) r.Post("/", api.postFile) }) + // Chats are an experimental feature + r.Route("/chats", func(r chi.Router) { + r.Use( + apiKeyMiddleware, + httpmw.RequireExperiment(api.Experiments, codersdk.ExperimentAgenticChat), + ) + r.Get("/", api.listChats) + r.Post("/", api.postChats) + r.Route("/{chat}", func(r chi.Router) { + r.Use(httpmw.ExtractChatParam(options.Database)) + r.Get("/", api.chat) + r.Get("/messages", api.chatMessages) + r.Post("/messages", api.postChatMessages) + }) + }) r.Route("/external-auth", func(r chi.Router) { r.Use( apiKeyMiddleware, diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go index 7efcd009c6ef9..18d1d8a6ac788 100644 --- a/coderd/database/db2sdk/db2sdk.go +++ b/coderd/database/db2sdk/db2sdk.go @@ -751,3 +751,16 @@ func AgentProtoConnectionActionToAuditAction(action database.AuditAction) (agent return agentproto.Connection_ACTION_UNSPECIFIED, xerrors.Errorf("unknown agent connection action %q", action) } } + +func Chat(chat database.Chat) codersdk.Chat { + return codersdk.Chat{ + ID: chat.ID, + Title: chat.Title, + CreatedAt: chat.CreatedAt, + UpdatedAt: chat.UpdatedAt, + } +} + +func Chats(chats []database.Chat) []codersdk.Chat { + return List(chats, Chat) +} diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go index ceb5ba7f2a15a..2ed230dd7a8f3 100644 --- a/coderd/database/dbauthz/dbauthz.go +++ b/coderd/database/dbauthz/dbauthz.go @@ -1269,6 +1269,10 @@ func (q *querier) DeleteApplicationConnectAPIKeysByUserID(ctx context.Context, u return q.db.DeleteApplicationConnectAPIKeysByUserID(ctx, userID) } +func (q *querier) DeleteChat(ctx context.Context, id uuid.UUID) error { + return deleteQ(q.log, q.auth, q.db.GetChatByID, q.db.DeleteChat)(ctx, id) +} + func (q *querier) DeleteCoordinator(ctx context.Context, id uuid.UUID) error { if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceTailnetCoordinator); err != nil { return err @@ -1686,6 +1690,22 @@ func (q *querier) GetAuthorizationUserRoles(ctx context.Context, userID uuid.UUI return q.db.GetAuthorizationUserRoles(ctx, userID) } +func (q *querier) GetChatByID(ctx context.Context, id uuid.UUID) (database.Chat, error) { + return fetch(q.log, q.auth, q.db.GetChatByID)(ctx, id) +} + +func (q *querier) GetChatMessagesByChatID(ctx context.Context, chatID uuid.UUID) ([]database.ChatMessage, error) { + c, err := q.GetChatByID(ctx, chatID) + if err != nil { + return nil, err + } + return q.db.GetChatMessagesByChatID(ctx, c.ID) +} + +func (q *querier) GetChatsByOwnerID(ctx context.Context, ownerID uuid.UUID) ([]database.Chat, error) { + return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetChatsByOwnerID)(ctx, ownerID) +} + func (q *querier) GetCoordinatorResumeTokenSigningKey(ctx context.Context) (string, error) { if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil { return "", err @@ -3315,6 +3335,21 @@ func (q *querier) InsertAuditLog(ctx context.Context, arg database.InsertAuditLo return insert(q.log, q.auth, rbac.ResourceAuditLog, q.db.InsertAuditLog)(ctx, arg) } +func (q *querier) InsertChat(ctx context.Context, arg database.InsertChatParams) (database.Chat, error) { + return insert(q.log, q.auth, rbac.ResourceChat.WithOwner(arg.OwnerID.String()), q.db.InsertChat)(ctx, arg) +} + +func (q *querier) InsertChatMessages(ctx context.Context, arg database.InsertChatMessagesParams) ([]database.ChatMessage, error) { + c, err := q.db.GetChatByID(ctx, arg.ChatID) + if err != nil { + return nil, err + } + if err := q.authorizeContext(ctx, policy.ActionUpdate, c); err != nil { + return nil, err + } + return q.db.InsertChatMessages(ctx, arg) +} + func (q *querier) InsertCryptoKey(ctx context.Context, arg database.InsertCryptoKeyParams) (database.CryptoKey, error) { if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceCryptoKey); err != nil { return database.CryptoKey{}, err @@ -3963,6 +3998,13 @@ func (q *querier) UpdateAPIKeyByID(ctx context.Context, arg database.UpdateAPIKe return update(q.log, q.auth, fetch, q.db.UpdateAPIKeyByID)(ctx, arg) } +func (q *querier) UpdateChatByID(ctx context.Context, arg database.UpdateChatByIDParams) error { + fetch := func(ctx context.Context, arg database.UpdateChatByIDParams) (database.Chat, error) { + return q.db.GetChatByID(ctx, arg.ID) + } + return update(q.log, q.auth, fetch, q.db.UpdateChatByID)(ctx, arg) +} + func (q *querier) UpdateCryptoKeyDeletesAt(ctx context.Context, arg database.UpdateCryptoKeyDeletesAtParams) (database.CryptoKey, error) { if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceCryptoKey); err != nil { return database.CryptoKey{}, err diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go index e562bbd1f7160..6dc9a32f03943 100644 --- a/coderd/database/dbauthz/dbauthz_test.go +++ b/coderd/database/dbauthz/dbauthz_test.go @@ -5307,3 +5307,77 @@ func (s *MethodTestSuite) TestResourcesProvisionerdserver() { }).Asserts(rbac.ResourceWorkspaceAgentDevcontainers, policy.ActionCreate) })) } + +func (s *MethodTestSuite) TestChat() { + createChat := func(t *testing.T, db database.Store) (database.User, database.Chat, database.ChatMessage) { + t.Helper() + + usr := dbgen.User(t, db, database.User{}) + chat := dbgen.Chat(s.T(), db, database.Chat{ + OwnerID: usr.ID, + }) + msg := dbgen.ChatMessage(s.T(), db, database.ChatMessage{ + ChatID: chat.ID, + }) + + return usr, chat, msg + } + + s.Run("DeleteChat", s.Subtest(func(db database.Store, check *expects) { + _, c, _ := createChat(s.T(), db) + check.Args(c.ID).Asserts(c, policy.ActionDelete) + })) + + s.Run("GetChatByID", s.Subtest(func(db database.Store, check *expects) { + _, c, _ := createChat(s.T(), db) + check.Args(c.ID).Asserts(c, policy.ActionRead).Returns(c) + })) + + s.Run("GetChatMessagesByChatID", s.Subtest(func(db database.Store, check *expects) { + _, c, m := createChat(s.T(), db) + check.Args(c.ID).Asserts(c, policy.ActionRead).Returns([]database.ChatMessage{m}) + })) + + s.Run("GetChatsByOwnerID", s.Subtest(func(db database.Store, check *expects) { + u1, u1c1, _ := createChat(s.T(), db) + u1c2 := dbgen.Chat(s.T(), db, database.Chat{ + OwnerID: u1.ID, + CreatedAt: u1c1.CreatedAt.Add(time.Hour), + }) + _, _, _ = createChat(s.T(), db) // other user's chat + check.Args(u1.ID).Asserts(u1c2, policy.ActionRead, u1c1, policy.ActionRead).Returns([]database.Chat{u1c2, u1c1}) + })) + + s.Run("InsertChat", s.Subtest(func(db database.Store, check *expects) { + usr := dbgen.User(s.T(), db, database.User{}) + check.Args(database.InsertChatParams{ + OwnerID: usr.ID, + Title: "test chat", + CreatedAt: dbtime.Now(), + UpdatedAt: dbtime.Now(), + }).Asserts(rbac.ResourceChat.WithOwner(usr.ID.String()), policy.ActionCreate) + })) + + s.Run("InsertChatMessages", s.Subtest(func(db database.Store, check *expects) { + usr := dbgen.User(s.T(), db, database.User{}) + chat := dbgen.Chat(s.T(), db, database.Chat{ + OwnerID: usr.ID, + }) + check.Args(database.InsertChatMessagesParams{ + ChatID: chat.ID, + CreatedAt: dbtime.Now(), + Model: "test-model", + Provider: "test-provider", + Content: []byte(`[]`), + }).Asserts(chat, policy.ActionUpdate) + })) + + s.Run("UpdateChatByID", s.Subtest(func(db database.Store, check *expects) { + _, c, _ := createChat(s.T(), db) + check.Args(database.UpdateChatByIDParams{ + ID: c.ID, + Title: "new title", + UpdatedAt: dbtime.Now(), + }).Asserts(c, policy.ActionUpdate) + })) +} diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go index 854c7c2974fe6..55c2fe4cf6965 100644 --- a/coderd/database/dbgen/dbgen.go +++ b/coderd/database/dbgen/dbgen.go @@ -142,6 +142,30 @@ func APIKey(t testing.TB, db database.Store, seed database.APIKey) (key database return key, fmt.Sprintf("%s-%s", key.ID, secret) } +func Chat(t testing.TB, db database.Store, seed database.Chat) database.Chat { + chat, err := db.InsertChat(genCtx, database.InsertChatParams{ + OwnerID: takeFirst(seed.OwnerID, uuid.New()), + CreatedAt: takeFirst(seed.CreatedAt, dbtime.Now()), + UpdatedAt: takeFirst(seed.UpdatedAt, dbtime.Now()), + Title: takeFirst(seed.Title, "Test Chat"), + }) + require.NoError(t, err, "insert chat") + return chat +} + +func ChatMessage(t testing.TB, db database.Store, seed database.ChatMessage) database.ChatMessage { + msg, err := db.InsertChatMessages(genCtx, database.InsertChatMessagesParams{ + CreatedAt: takeFirst(seed.CreatedAt, dbtime.Now()), + ChatID: takeFirst(seed.ChatID, uuid.New()), + Model: takeFirst(seed.Model, "train"), + Provider: takeFirst(seed.Provider, "thomas"), + Content: takeFirstSlice(seed.Content, []byte(`[{"text": "Choo choo!"}]`)), + }) + require.NoError(t, err, "insert chat message") + require.Len(t, msg, 1, "insert one chat message did not return exactly one message") + return msg[0] +} + func WorkspaceAgentPortShare(t testing.TB, db database.Store, orig database.WorkspaceAgentPortShare) database.WorkspaceAgentPortShare { ps, err := db.UpsertWorkspaceAgentPortShare(genCtx, database.UpsertWorkspaceAgentPortShareParams{ WorkspaceID: takeFirst(orig.WorkspaceID, uuid.New()), diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go index 1359d2e63484d..6bae4455a89ef 100644 --- a/coderd/database/dbmem/dbmem.go +++ b/coderd/database/dbmem/dbmem.go @@ -215,6 +215,8 @@ type data struct { // New tables auditLogs []database.AuditLog + chats []database.Chat + chatMessages []database.ChatMessage cryptoKeys []database.CryptoKey dbcryptKeys []database.DBCryptKey files []database.File @@ -1885,6 +1887,19 @@ func (q *FakeQuerier) DeleteApplicationConnectAPIKeysByUserID(_ context.Context, return nil } +func (q *FakeQuerier) DeleteChat(ctx context.Context, id uuid.UUID) error { + q.mutex.Lock() + defer q.mutex.Unlock() + + for i, chat := range q.chats { + if chat.ID == id { + q.chats = append(q.chats[:i], q.chats[i+1:]...) + return nil + } + } + return sql.ErrNoRows +} + func (*FakeQuerier) DeleteCoordinator(context.Context, uuid.UUID) error { return ErrUnimplemented } @@ -2866,6 +2881,47 @@ func (q *FakeQuerier) GetAuthorizationUserRoles(_ context.Context, userID uuid.U }, nil } +func (q *FakeQuerier) GetChatByID(ctx context.Context, id uuid.UUID) (database.Chat, error) { + q.mutex.RLock() + defer q.mutex.RUnlock() + + for _, chat := range q.chats { + if chat.ID == id { + return chat, nil + } + } + return database.Chat{}, sql.ErrNoRows +} + +func (q *FakeQuerier) GetChatMessagesByChatID(ctx context.Context, chatID uuid.UUID) ([]database.ChatMessage, error) { + q.mutex.RLock() + defer q.mutex.RUnlock() + + messages := []database.ChatMessage{} + for _, chatMessage := range q.chatMessages { + if chatMessage.ChatID == chatID { + messages = append(messages, chatMessage) + } + } + return messages, nil +} + +func (q *FakeQuerier) GetChatsByOwnerID(ctx context.Context, ownerID uuid.UUID) ([]database.Chat, error) { + q.mutex.RLock() + defer q.mutex.RUnlock() + + chats := []database.Chat{} + for _, chat := range q.chats { + if chat.OwnerID == ownerID { + chats = append(chats, chat) + } + } + sort.Slice(chats, func(i, j int) bool { + return chats[i].CreatedAt.After(chats[j].CreatedAt) + }) + return chats, nil +} + func (q *FakeQuerier) GetCoordinatorResumeTokenSigningKey(_ context.Context) (string, error) { q.mutex.RLock() defer q.mutex.RUnlock() @@ -8385,6 +8441,66 @@ func (q *FakeQuerier) InsertAuditLog(_ context.Context, arg database.InsertAudit return alog, nil } +func (q *FakeQuerier) InsertChat(ctx context.Context, arg database.InsertChatParams) (database.Chat, error) { + err := validateDatabaseType(arg) + if err != nil { + return database.Chat{}, err + } + + q.mutex.Lock() + defer q.mutex.Unlock() + + chat := database.Chat{ + ID: uuid.New(), + CreatedAt: arg.CreatedAt, + UpdatedAt: arg.UpdatedAt, + OwnerID: arg.OwnerID, + Title: arg.Title, + } + q.chats = append(q.chats, chat) + + return chat, nil +} + +func (q *FakeQuerier) InsertChatMessages(ctx context.Context, arg database.InsertChatMessagesParams) ([]database.ChatMessage, error) { + err := validateDatabaseType(arg) + if err != nil { + return nil, err + } + + q.mutex.Lock() + defer q.mutex.Unlock() + + id := int64(0) + if len(q.chatMessages) > 0 { + id = q.chatMessages[len(q.chatMessages)-1].ID + } + + messages := make([]database.ChatMessage, 0) + + rawMessages := make([]json.RawMessage, 0) + err = json.Unmarshal(arg.Content, &rawMessages) + if err != nil { + return nil, err + } + + for _, content := range rawMessages { + id++ + _ = content + messages = append(messages, database.ChatMessage{ + ID: id, + ChatID: arg.ChatID, + CreatedAt: arg.CreatedAt, + Model: arg.Model, + Provider: arg.Provider, + Content: content, + }) + } + + q.chatMessages = append(q.chatMessages, messages...) + return messages, nil +} + func (q *FakeQuerier) InsertCryptoKey(_ context.Context, arg database.InsertCryptoKeyParams) (database.CryptoKey, error) { err := validateDatabaseType(arg) if err != nil { @@ -10342,6 +10458,27 @@ func (q *FakeQuerier) UpdateAPIKeyByID(_ context.Context, arg database.UpdateAPI return sql.ErrNoRows } +func (q *FakeQuerier) UpdateChatByID(ctx context.Context, arg database.UpdateChatByIDParams) error { + err := validateDatabaseType(arg) + if err != nil { + return err + } + + q.mutex.Lock() + defer q.mutex.Unlock() + + for i, chat := range q.chats { + if chat.ID == arg.ID { + q.chats[i].Title = arg.Title + q.chats[i].UpdatedAt = arg.UpdatedAt + q.chats[i] = chat + return nil + } + } + + return sql.ErrNoRows +} + func (q *FakeQuerier) UpdateCryptoKeyDeletesAt(_ context.Context, arg database.UpdateCryptoKeyDeletesAtParams) (database.CryptoKey, error) { err := validateDatabaseType(arg) if err != nil { diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go index b76d70c764cf6..128e741da1d76 100644 --- a/coderd/database/dbmetrics/querymetrics.go +++ b/coderd/database/dbmetrics/querymetrics.go @@ -249,6 +249,13 @@ func (m queryMetricsStore) DeleteApplicationConnectAPIKeysByUserID(ctx context.C return err } +func (m queryMetricsStore) DeleteChat(ctx context.Context, id uuid.UUID) error { + start := time.Now() + r0 := m.s.DeleteChat(ctx, id) + m.queryLatencies.WithLabelValues("DeleteChat").Observe(time.Since(start).Seconds()) + return r0 +} + func (m queryMetricsStore) DeleteCoordinator(ctx context.Context, id uuid.UUID) error { start := time.Now() r0 := m.s.DeleteCoordinator(ctx, id) @@ -627,6 +634,27 @@ func (m queryMetricsStore) GetAuthorizationUserRoles(ctx context.Context, userID return row, err } +func (m queryMetricsStore) GetChatByID(ctx context.Context, id uuid.UUID) (database.Chat, error) { + start := time.Now() + r0, r1 := m.s.GetChatByID(ctx, id) + m.queryLatencies.WithLabelValues("GetChatByID").Observe(time.Since(start).Seconds()) + return r0, r1 +} + +func (m queryMetricsStore) GetChatMessagesByChatID(ctx context.Context, chatID uuid.UUID) ([]database.ChatMessage, error) { + start := time.Now() + r0, r1 := m.s.GetChatMessagesByChatID(ctx, chatID) + m.queryLatencies.WithLabelValues("GetChatMessagesByChatID").Observe(time.Since(start).Seconds()) + return r0, r1 +} + +func (m queryMetricsStore) GetChatsByOwnerID(ctx context.Context, ownerID uuid.UUID) ([]database.Chat, error) { + start := time.Now() + r0, r1 := m.s.GetChatsByOwnerID(ctx, ownerID) + m.queryLatencies.WithLabelValues("GetChatsByOwnerID").Observe(time.Since(start).Seconds()) + return r0, r1 +} + func (m queryMetricsStore) GetCoordinatorResumeTokenSigningKey(ctx context.Context) (string, error) { start := time.Now() r0, r1 := m.s.GetCoordinatorResumeTokenSigningKey(ctx) @@ -1992,6 +2020,20 @@ func (m queryMetricsStore) InsertAuditLog(ctx context.Context, arg database.Inse return log, err } +func (m queryMetricsStore) InsertChat(ctx context.Context, arg database.InsertChatParams) (database.Chat, error) { + start := time.Now() + r0, r1 := m.s.InsertChat(ctx, arg) + m.queryLatencies.WithLabelValues("InsertChat").Observe(time.Since(start).Seconds()) + return r0, r1 +} + +func (m queryMetricsStore) InsertChatMessages(ctx context.Context, arg database.InsertChatMessagesParams) ([]database.ChatMessage, error) { + start := time.Now() + r0, r1 := m.s.InsertChatMessages(ctx, arg) + m.queryLatencies.WithLabelValues("InsertChatMessages").Observe(time.Since(start).Seconds()) + return r0, r1 +} + func (m queryMetricsStore) InsertCryptoKey(ctx context.Context, arg database.InsertCryptoKeyParams) (database.CryptoKey, error) { start := time.Now() key, err := m.s.InsertCryptoKey(ctx, arg) @@ -2517,6 +2559,13 @@ func (m queryMetricsStore) UpdateAPIKeyByID(ctx context.Context, arg database.Up return err } +func (m queryMetricsStore) UpdateChatByID(ctx context.Context, arg database.UpdateChatByIDParams) error { + start := time.Now() + r0 := m.s.UpdateChatByID(ctx, arg) + m.queryLatencies.WithLabelValues("UpdateChatByID").Observe(time.Since(start).Seconds()) + return r0 +} + func (m queryMetricsStore) UpdateCryptoKeyDeletesAt(ctx context.Context, arg database.UpdateCryptoKeyDeletesAtParams) (database.CryptoKey, error) { start := time.Now() key, err := m.s.UpdateCryptoKeyDeletesAt(ctx, arg) diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go index 10adfd7c5a408..17b263dfb2e07 100644 --- a/coderd/database/dbmock/dbmock.go +++ b/coderd/database/dbmock/dbmock.go @@ -376,6 +376,20 @@ func (mr *MockStoreMockRecorder) DeleteApplicationConnectAPIKeysByUserID(ctx, us return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteApplicationConnectAPIKeysByUserID", reflect.TypeOf((*MockStore)(nil).DeleteApplicationConnectAPIKeysByUserID), ctx, userID) } +// DeleteChat mocks base method. +func (m *MockStore) DeleteChat(ctx context.Context, id uuid.UUID) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DeleteChat", ctx, id) + ret0, _ := ret[0].(error) + return ret0 +} + +// DeleteChat indicates an expected call of DeleteChat. +func (mr *MockStoreMockRecorder) DeleteChat(ctx, id any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteChat", reflect.TypeOf((*MockStore)(nil).DeleteChat), ctx, id) +} + // DeleteCoordinator mocks base method. func (m *MockStore) DeleteCoordinator(ctx context.Context, id uuid.UUID) error { m.ctrl.T.Helper() @@ -1234,6 +1248,51 @@ func (mr *MockStoreMockRecorder) GetAuthorizedWorkspacesAndAgentsByOwnerID(ctx, return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAuthorizedWorkspacesAndAgentsByOwnerID", reflect.TypeOf((*MockStore)(nil).GetAuthorizedWorkspacesAndAgentsByOwnerID), ctx, ownerID, prepared) } +// GetChatByID mocks base method. +func (m *MockStore) GetChatByID(ctx context.Context, id uuid.UUID) (database.Chat, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetChatByID", ctx, id) + ret0, _ := ret[0].(database.Chat) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetChatByID indicates an expected call of GetChatByID. +func (mr *MockStoreMockRecorder) GetChatByID(ctx, id any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChatByID", reflect.TypeOf((*MockStore)(nil).GetChatByID), ctx, id) +} + +// GetChatMessagesByChatID mocks base method. +func (m *MockStore) GetChatMessagesByChatID(ctx context.Context, chatID uuid.UUID) ([]database.ChatMessage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetChatMessagesByChatID", ctx, chatID) + ret0, _ := ret[0].([]database.ChatMessage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetChatMessagesByChatID indicates an expected call of GetChatMessagesByChatID. +func (mr *MockStoreMockRecorder) GetChatMessagesByChatID(ctx, chatID any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChatMessagesByChatID", reflect.TypeOf((*MockStore)(nil).GetChatMessagesByChatID), ctx, chatID) +} + +// GetChatsByOwnerID mocks base method. +func (m *MockStore) GetChatsByOwnerID(ctx context.Context, ownerID uuid.UUID) ([]database.Chat, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetChatsByOwnerID", ctx, ownerID) + ret0, _ := ret[0].([]database.Chat) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetChatsByOwnerID indicates an expected call of GetChatsByOwnerID. +func (mr *MockStoreMockRecorder) GetChatsByOwnerID(ctx, ownerID any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetChatsByOwnerID", reflect.TypeOf((*MockStore)(nil).GetChatsByOwnerID), ctx, ownerID) +} + // GetCoordinatorResumeTokenSigningKey mocks base method. func (m *MockStore) GetCoordinatorResumeTokenSigningKey(ctx context.Context) (string, error) { m.ctrl.T.Helper() @@ -4203,6 +4262,36 @@ func (mr *MockStoreMockRecorder) InsertAuditLog(ctx, arg any) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InsertAuditLog", reflect.TypeOf((*MockStore)(nil).InsertAuditLog), ctx, arg) } +// InsertChat mocks base method. +func (m *MockStore) InsertChat(ctx context.Context, arg database.InsertChatParams) (database.Chat, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "InsertChat", ctx, arg) + ret0, _ := ret[0].(database.Chat) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// InsertChat indicates an expected call of InsertChat. +func (mr *MockStoreMockRecorder) InsertChat(ctx, arg any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InsertChat", reflect.TypeOf((*MockStore)(nil).InsertChat), ctx, arg) +} + +// InsertChatMessages mocks base method. +func (m *MockStore) InsertChatMessages(ctx context.Context, arg database.InsertChatMessagesParams) ([]database.ChatMessage, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "InsertChatMessages", ctx, arg) + ret0, _ := ret[0].([]database.ChatMessage) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// InsertChatMessages indicates an expected call of InsertChatMessages. +func (mr *MockStoreMockRecorder) InsertChatMessages(ctx, arg any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InsertChatMessages", reflect.TypeOf((*MockStore)(nil).InsertChatMessages), ctx, arg) +} + // InsertCryptoKey mocks base method. func (m *MockStore) InsertCryptoKey(ctx context.Context, arg database.InsertCryptoKeyParams) (database.CryptoKey, error) { m.ctrl.T.Helper() @@ -5337,6 +5426,20 @@ func (mr *MockStoreMockRecorder) UpdateAPIKeyByID(ctx, arg any) *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateAPIKeyByID", reflect.TypeOf((*MockStore)(nil).UpdateAPIKeyByID), ctx, arg) } +// UpdateChatByID mocks base method. +func (m *MockStore) UpdateChatByID(ctx context.Context, arg database.UpdateChatByIDParams) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "UpdateChatByID", ctx, arg) + ret0, _ := ret[0].(error) + return ret0 +} + +// UpdateChatByID indicates an expected call of UpdateChatByID. +func (mr *MockStoreMockRecorder) UpdateChatByID(ctx, arg any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateChatByID", reflect.TypeOf((*MockStore)(nil).UpdateChatByID), ctx, arg) +} + // UpdateCryptoKeyDeletesAt mocks base method. func (m *MockStore) UpdateCryptoKeyDeletesAt(ctx context.Context, arg database.UpdateCryptoKeyDeletesAtParams) (database.CryptoKey, error) { m.ctrl.T.Helper() diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql index 968b6a24d4bf8..9ce3b0171d2d4 100644 --- a/coderd/database/dump.sql +++ b/coderd/database/dump.sql @@ -755,6 +755,32 @@ CREATE TABLE audit_logs ( resource_icon text NOT NULL ); +CREATE TABLE chat_messages ( + id bigint NOT NULL, + chat_id uuid NOT NULL, + created_at timestamp with time zone DEFAULT now() NOT NULL, + model text NOT NULL, + provider text NOT NULL, + content jsonb NOT NULL +); + +CREATE SEQUENCE chat_messages_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +ALTER SEQUENCE chat_messages_id_seq OWNED BY chat_messages.id; + +CREATE TABLE chats ( + id uuid DEFAULT gen_random_uuid() NOT NULL, + owner_id uuid NOT NULL, + created_at timestamp with time zone DEFAULT now() NOT NULL, + updated_at timestamp with time zone DEFAULT now() NOT NULL, + title text NOT NULL +); + CREATE TABLE crypto_keys ( feature crypto_key_feature NOT NULL, sequence integer NOT NULL, @@ -2195,6 +2221,8 @@ CREATE VIEW workspaces_expanded AS COMMENT ON VIEW workspaces_expanded IS 'Joins in the display name information such as username, avatar, and organization name.'; +ALTER TABLE ONLY chat_messages ALTER COLUMN id SET DEFAULT nextval('chat_messages_id_seq'::regclass); + ALTER TABLE ONLY licenses ALTER COLUMN id SET DEFAULT nextval('licenses_id_seq'::regclass); ALTER TABLE ONLY provisioner_job_logs ALTER COLUMN id SET DEFAULT nextval('provisioner_job_logs_id_seq'::regclass); @@ -2216,6 +2244,12 @@ ALTER TABLE ONLY api_keys ALTER TABLE ONLY audit_logs ADD CONSTRAINT audit_logs_pkey PRIMARY KEY (id); +ALTER TABLE ONLY chat_messages + ADD CONSTRAINT chat_messages_pkey PRIMARY KEY (id); + +ALTER TABLE ONLY chats + ADD CONSTRAINT chats_pkey PRIMARY KEY (id); + ALTER TABLE ONLY crypto_keys ADD CONSTRAINT crypto_keys_pkey PRIMARY KEY (feature, sequence); @@ -2699,6 +2733,12 @@ CREATE TRIGGER user_status_change_trigger AFTER INSERT OR UPDATE ON users FOR EA ALTER TABLE ONLY api_keys ADD CONSTRAINT api_keys_user_id_uuid_fkey FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE; +ALTER TABLE ONLY chat_messages + ADD CONSTRAINT chat_messages_chat_id_fkey FOREIGN KEY (chat_id) REFERENCES chats(id) ON DELETE CASCADE; + +ALTER TABLE ONLY chats + ADD CONSTRAINT chats_owner_id_fkey FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE CASCADE; + ALTER TABLE ONLY crypto_keys ADD CONSTRAINT crypto_keys_secret_key_id_fkey FOREIGN KEY (secret_key_id) REFERENCES dbcrypt_keys(active_key_digest); diff --git a/coderd/database/foreign_key_constraint.go b/coderd/database/foreign_key_constraint.go index 3f5ce963e6fdb..0db3e9522547e 100644 --- a/coderd/database/foreign_key_constraint.go +++ b/coderd/database/foreign_key_constraint.go @@ -7,6 +7,8 @@ type ForeignKeyConstraint string // ForeignKeyConstraint enums. const ( ForeignKeyAPIKeysUserIDUUID ForeignKeyConstraint = "api_keys_user_id_uuid_fkey" // ALTER TABLE ONLY api_keys ADD CONSTRAINT api_keys_user_id_uuid_fkey FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE; + ForeignKeyChatMessagesChatID ForeignKeyConstraint = "chat_messages_chat_id_fkey" // ALTER TABLE ONLY chat_messages ADD CONSTRAINT chat_messages_chat_id_fkey FOREIGN KEY (chat_id) REFERENCES chats(id) ON DELETE CASCADE; + ForeignKeyChatsOwnerID ForeignKeyConstraint = "chats_owner_id_fkey" // ALTER TABLE ONLY chats ADD CONSTRAINT chats_owner_id_fkey FOREIGN KEY (owner_id) REFERENCES users(id) ON DELETE CASCADE; ForeignKeyCryptoKeysSecretKeyID ForeignKeyConstraint = "crypto_keys_secret_key_id_fkey" // ALTER TABLE ONLY crypto_keys ADD CONSTRAINT crypto_keys_secret_key_id_fkey FOREIGN KEY (secret_key_id) REFERENCES dbcrypt_keys(active_key_digest); ForeignKeyGitAuthLinksOauthAccessTokenKeyID ForeignKeyConstraint = "git_auth_links_oauth_access_token_key_id_fkey" // ALTER TABLE ONLY external_auth_links ADD CONSTRAINT git_auth_links_oauth_access_token_key_id_fkey FOREIGN KEY (oauth_access_token_key_id) REFERENCES dbcrypt_keys(active_key_digest); ForeignKeyGitAuthLinksOauthRefreshTokenKeyID ForeignKeyConstraint = "git_auth_links_oauth_refresh_token_key_id_fkey" // ALTER TABLE ONLY external_auth_links ADD CONSTRAINT git_auth_links_oauth_refresh_token_key_id_fkey FOREIGN KEY (oauth_refresh_token_key_id) REFERENCES dbcrypt_keys(active_key_digest); diff --git a/coderd/database/migrations/000319_chat.down.sql b/coderd/database/migrations/000319_chat.down.sql new file mode 100644 index 0000000000000..9bab993f500f5 --- /dev/null +++ b/coderd/database/migrations/000319_chat.down.sql @@ -0,0 +1,3 @@ +DROP TABLE IF EXISTS chat_messages; + +DROP TABLE IF EXISTS chats; diff --git a/coderd/database/migrations/000319_chat.up.sql b/coderd/database/migrations/000319_chat.up.sql new file mode 100644 index 0000000000000..a53942239c9e2 --- /dev/null +++ b/coderd/database/migrations/000319_chat.up.sql @@ -0,0 +1,17 @@ +CREATE TABLE IF NOT EXISTS chats ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + owner_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + title TEXT NOT NULL +); + +CREATE TABLE IF NOT EXISTS chat_messages ( + -- BIGSERIAL is auto-incrementing so we know the exact order of messages. + id BIGSERIAL PRIMARY KEY, + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + model TEXT NOT NULL, + provider TEXT NOT NULL, + content JSONB NOT NULL +); diff --git a/coderd/database/migrations/testdata/fixtures/000319_chat.up.sql b/coderd/database/migrations/testdata/fixtures/000319_chat.up.sql new file mode 100644 index 0000000000000..123a62c4eb722 --- /dev/null +++ b/coderd/database/migrations/testdata/fixtures/000319_chat.up.sql @@ -0,0 +1,6 @@ +INSERT INTO chats (id, owner_id, created_at, updated_at, title) VALUES +('00000000-0000-0000-0000-000000000001', '0ed9befc-4911-4ccf-a8e2-559bf72daa94', '2023-10-01 12:00:00+00', '2023-10-01 12:00:00+00', 'Test Chat 1'); + +INSERT INTO chat_messages (id, chat_id, created_at, model, provider, content) VALUES +(1, '00000000-0000-0000-0000-000000000001', '2023-10-01 12:00:00+00', 'annie-oakley', 'cowboy-coder', '{"role":"user","content":"Hello"}'), +(2, '00000000-0000-0000-0000-000000000001', '2023-10-01 12:01:00+00', 'annie-oakley', 'cowboy-coder', '{"role":"assistant","content":"Howdy pardner! What can I do ya for?"}'); diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go index 896fdd4af17e9..b3f6deed9eff0 100644 --- a/coderd/database/modelmethods.go +++ b/coderd/database/modelmethods.go @@ -568,3 +568,8 @@ func (m WorkspaceAgentVolumeResourceMonitor) Debounce( return m.DebouncedUntil, false } + +func (c Chat) RBACObject() rbac.Object { + return rbac.ResourceChat.WithID(c.ID). + WithOwner(c.OwnerID.String()) +} diff --git a/coderd/database/models.go b/coderd/database/models.go index f817ff2712d54..c8ac71e8b9398 100644 --- a/coderd/database/models.go +++ b/coderd/database/models.go @@ -2570,6 +2570,23 @@ type AuditLog struct { ResourceIcon string `db:"resource_icon" json:"resource_icon"` } +type Chat struct { + ID uuid.UUID `db:"id" json:"id"` + OwnerID uuid.UUID `db:"owner_id" json:"owner_id"` + CreatedAt time.Time `db:"created_at" json:"created_at"` + UpdatedAt time.Time `db:"updated_at" json:"updated_at"` + Title string `db:"title" json:"title"` +} + +type ChatMessage struct { + ID int64 `db:"id" json:"id"` + ChatID uuid.UUID `db:"chat_id" json:"chat_id"` + CreatedAt time.Time `db:"created_at" json:"created_at"` + Model string `db:"model" json:"model"` + Provider string `db:"provider" json:"provider"` + Content json.RawMessage `db:"content" json:"content"` +} + type CryptoKey struct { Feature CryptoKeyFeature `db:"feature" json:"feature"` Sequence int32 `db:"sequence" json:"sequence"` diff --git a/coderd/database/querier.go b/coderd/database/querier.go index 9fbfbde410d40..d0f74ee609724 100644 --- a/coderd/database/querier.go +++ b/coderd/database/querier.go @@ -79,6 +79,7 @@ type sqlcQuerier interface { // be recreated. DeleteAllWebpushSubscriptions(ctx context.Context) error DeleteApplicationConnectAPIKeysByUserID(ctx context.Context, userID uuid.UUID) error + DeleteChat(ctx context.Context, id uuid.UUID) error DeleteCoordinator(ctx context.Context, id uuid.UUID) error DeleteCryptoKey(ctx context.Context, arg DeleteCryptoKeyParams) (CryptoKey, error) DeleteCustomRole(ctx context.Context, arg DeleteCustomRoleParams) error @@ -151,6 +152,9 @@ type sqlcQuerier interface { // This function returns roles for authorization purposes. Implied member roles // are included. GetAuthorizationUserRoles(ctx context.Context, userID uuid.UUID) (GetAuthorizationUserRolesRow, error) + GetChatByID(ctx context.Context, id uuid.UUID) (Chat, error) + GetChatMessagesByChatID(ctx context.Context, chatID uuid.UUID) ([]ChatMessage, error) + GetChatsByOwnerID(ctx context.Context, ownerID uuid.UUID) ([]Chat, error) GetCoordinatorResumeTokenSigningKey(ctx context.Context) (string, error) GetCryptoKeyByFeatureAndSequence(ctx context.Context, arg GetCryptoKeyByFeatureAndSequenceParams) (CryptoKey, error) GetCryptoKeys(ctx context.Context) ([]CryptoKey, error) @@ -447,6 +451,8 @@ type sqlcQuerier interface { // every member of the org. InsertAllUsersGroup(ctx context.Context, organizationID uuid.UUID) (Group, error) InsertAuditLog(ctx context.Context, arg InsertAuditLogParams) (AuditLog, error) + InsertChat(ctx context.Context, arg InsertChatParams) (Chat, error) + InsertChatMessages(ctx context.Context, arg InsertChatMessagesParams) ([]ChatMessage, error) InsertCryptoKey(ctx context.Context, arg InsertCryptoKeyParams) (CryptoKey, error) InsertCustomRole(ctx context.Context, arg InsertCustomRoleParams) (CustomRole, error) InsertDBCryptKey(ctx context.Context, arg InsertDBCryptKeyParams) error @@ -540,6 +546,7 @@ type sqlcQuerier interface { UnarchiveTemplateVersion(ctx context.Context, arg UnarchiveTemplateVersionParams) error UnfavoriteWorkspace(ctx context.Context, id uuid.UUID) error UpdateAPIKeyByID(ctx context.Context, arg UpdateAPIKeyByIDParams) error + UpdateChatByID(ctx context.Context, arg UpdateChatByIDParams) error UpdateCryptoKeyDeletesAt(ctx context.Context, arg UpdateCryptoKeyDeletesAtParams) (CryptoKey, error) UpdateCustomRole(ctx context.Context, arg UpdateCustomRoleParams) (CustomRole, error) UpdateExternalAuthLink(ctx context.Context, arg UpdateExternalAuthLinkParams) (ExternalAuthLink, error) diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 3908dab715e31..cd5b297c85e07 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -766,6 +766,207 @@ func (q *sqlQuerier) InsertAuditLog(ctx context.Context, arg InsertAuditLogParam return i, err } +const deleteChat = `-- name: DeleteChat :exec +DELETE FROM chats WHERE id = $1 +` + +func (q *sqlQuerier) DeleteChat(ctx context.Context, id uuid.UUID) error { + _, err := q.db.ExecContext(ctx, deleteChat, id) + return err +} + +const getChatByID = `-- name: GetChatByID :one +SELECT id, owner_id, created_at, updated_at, title FROM chats +WHERE id = $1 +` + +func (q *sqlQuerier) GetChatByID(ctx context.Context, id uuid.UUID) (Chat, error) { + row := q.db.QueryRowContext(ctx, getChatByID, id) + var i Chat + err := row.Scan( + &i.ID, + &i.OwnerID, + &i.CreatedAt, + &i.UpdatedAt, + &i.Title, + ) + return i, err +} + +const getChatMessagesByChatID = `-- name: GetChatMessagesByChatID :many +SELECT id, chat_id, created_at, model, provider, content FROM chat_messages +WHERE chat_id = $1 +ORDER BY created_at ASC +` + +func (q *sqlQuerier) GetChatMessagesByChatID(ctx context.Context, chatID uuid.UUID) ([]ChatMessage, error) { + rows, err := q.db.QueryContext(ctx, getChatMessagesByChatID, chatID) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ChatMessage + for rows.Next() { + var i ChatMessage + if err := rows.Scan( + &i.ID, + &i.ChatID, + &i.CreatedAt, + &i.Model, + &i.Provider, + &i.Content, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const getChatsByOwnerID = `-- name: GetChatsByOwnerID :many +SELECT id, owner_id, created_at, updated_at, title FROM chats +WHERE owner_id = $1 +ORDER BY created_at DESC +` + +func (q *sqlQuerier) GetChatsByOwnerID(ctx context.Context, ownerID uuid.UUID) ([]Chat, error) { + rows, err := q.db.QueryContext(ctx, getChatsByOwnerID, ownerID) + if err != nil { + return nil, err + } + defer rows.Close() + var items []Chat + for rows.Next() { + var i Chat + if err := rows.Scan( + &i.ID, + &i.OwnerID, + &i.CreatedAt, + &i.UpdatedAt, + &i.Title, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const insertChat = `-- name: InsertChat :one +INSERT INTO chats (owner_id, created_at, updated_at, title) +VALUES ($1, $2, $3, $4) +RETURNING id, owner_id, created_at, updated_at, title +` + +type InsertChatParams struct { + OwnerID uuid.UUID `db:"owner_id" json:"owner_id"` + CreatedAt time.Time `db:"created_at" json:"created_at"` + UpdatedAt time.Time `db:"updated_at" json:"updated_at"` + Title string `db:"title" json:"title"` +} + +func (q *sqlQuerier) InsertChat(ctx context.Context, arg InsertChatParams) (Chat, error) { + row := q.db.QueryRowContext(ctx, insertChat, + arg.OwnerID, + arg.CreatedAt, + arg.UpdatedAt, + arg.Title, + ) + var i Chat + err := row.Scan( + &i.ID, + &i.OwnerID, + &i.CreatedAt, + &i.UpdatedAt, + &i.Title, + ) + return i, err +} + +const insertChatMessages = `-- name: InsertChatMessages :many +INSERT INTO chat_messages (chat_id, created_at, model, provider, content) +SELECT + $1 :: uuid AS chat_id, + $2 :: timestamptz AS created_at, + $3 :: VARCHAR(127) AS model, + $4 :: VARCHAR(127) AS provider, + jsonb_array_elements($5 :: jsonb) AS content +RETURNING chat_messages.id, chat_messages.chat_id, chat_messages.created_at, chat_messages.model, chat_messages.provider, chat_messages.content +` + +type InsertChatMessagesParams struct { + ChatID uuid.UUID `db:"chat_id" json:"chat_id"` + CreatedAt time.Time `db:"created_at" json:"created_at"` + Model string `db:"model" json:"model"` + Provider string `db:"provider" json:"provider"` + Content json.RawMessage `db:"content" json:"content"` +} + +func (q *sqlQuerier) InsertChatMessages(ctx context.Context, arg InsertChatMessagesParams) ([]ChatMessage, error) { + rows, err := q.db.QueryContext(ctx, insertChatMessages, + arg.ChatID, + arg.CreatedAt, + arg.Model, + arg.Provider, + arg.Content, + ) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ChatMessage + for rows.Next() { + var i ChatMessage + if err := rows.Scan( + &i.ID, + &i.ChatID, + &i.CreatedAt, + &i.Model, + &i.Provider, + &i.Content, + ); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const updateChatByID = `-- name: UpdateChatByID :exec +UPDATE chats +SET title = $2, updated_at = $3 +WHERE id = $1 +` + +type UpdateChatByIDParams struct { + ID uuid.UUID `db:"id" json:"id"` + Title string `db:"title" json:"title"` + UpdatedAt time.Time `db:"updated_at" json:"updated_at"` +} + +func (q *sqlQuerier) UpdateChatByID(ctx context.Context, arg UpdateChatByIDParams) error { + _, err := q.db.ExecContext(ctx, updateChatByID, arg.ID, arg.Title, arg.UpdatedAt) + return err +} + const deleteCryptoKey = `-- name: DeleteCryptoKey :one UPDATE crypto_keys SET secret = NULL, secret_key_id = NULL diff --git a/coderd/database/queries/chat.sql b/coderd/database/queries/chat.sql new file mode 100644 index 0000000000000..68f662d8a886b --- /dev/null +++ b/coderd/database/queries/chat.sql @@ -0,0 +1,36 @@ +-- name: InsertChat :one +INSERT INTO chats (owner_id, created_at, updated_at, title) +VALUES ($1, $2, $3, $4) +RETURNING *; + +-- name: UpdateChatByID :exec +UPDATE chats +SET title = $2, updated_at = $3 +WHERE id = $1; + +-- name: GetChatsByOwnerID :many +SELECT * FROM chats +WHERE owner_id = $1 +ORDER BY created_at DESC; + +-- name: GetChatByID :one +SELECT * FROM chats +WHERE id = $1; + +-- name: InsertChatMessages :many +INSERT INTO chat_messages (chat_id, created_at, model, provider, content) +SELECT + @chat_id :: uuid AS chat_id, + @created_at :: timestamptz AS created_at, + @model :: VARCHAR(127) AS model, + @provider :: VARCHAR(127) AS provider, + jsonb_array_elements(@content :: jsonb) AS content +RETURNING chat_messages.*; + +-- name: GetChatMessagesByChatID :many +SELECT * FROM chat_messages +WHERE chat_id = $1 +ORDER BY created_at ASC; + +-- name: DeleteChat :exec +DELETE FROM chats WHERE id = $1; diff --git a/coderd/database/unique_constraint.go b/coderd/database/unique_constraint.go index 2b91f38c88d42..4c9c8cedcba23 100644 --- a/coderd/database/unique_constraint.go +++ b/coderd/database/unique_constraint.go @@ -9,6 +9,8 @@ const ( UniqueAgentStatsPkey UniqueConstraint = "agent_stats_pkey" // ALTER TABLE ONLY workspace_agent_stats ADD CONSTRAINT agent_stats_pkey PRIMARY KEY (id); UniqueAPIKeysPkey UniqueConstraint = "api_keys_pkey" // ALTER TABLE ONLY api_keys ADD CONSTRAINT api_keys_pkey PRIMARY KEY (id); UniqueAuditLogsPkey UniqueConstraint = "audit_logs_pkey" // ALTER TABLE ONLY audit_logs ADD CONSTRAINT audit_logs_pkey PRIMARY KEY (id); + UniqueChatMessagesPkey UniqueConstraint = "chat_messages_pkey" // ALTER TABLE ONLY chat_messages ADD CONSTRAINT chat_messages_pkey PRIMARY KEY (id); + UniqueChatsPkey UniqueConstraint = "chats_pkey" // ALTER TABLE ONLY chats ADD CONSTRAINT chats_pkey PRIMARY KEY (id); UniqueCryptoKeysPkey UniqueConstraint = "crypto_keys_pkey" // ALTER TABLE ONLY crypto_keys ADD CONSTRAINT crypto_keys_pkey PRIMARY KEY (feature, sequence); UniqueCustomRolesUniqueKey UniqueConstraint = "custom_roles_unique_key" // ALTER TABLE ONLY custom_roles ADD CONSTRAINT custom_roles_unique_key UNIQUE (name, organization_id); UniqueDbcryptKeysActiveKeyDigestKey UniqueConstraint = "dbcrypt_keys_active_key_digest_key" // ALTER TABLE ONLY dbcrypt_keys ADD CONSTRAINT dbcrypt_keys_active_key_digest_key UNIQUE (active_key_digest); diff --git a/coderd/deployment.go b/coderd/deployment.go index 4c78563a80456..60988aeb2ce5a 100644 --- a/coderd/deployment.go +++ b/coderd/deployment.go @@ -1,8 +1,11 @@ package coderd import ( + "context" "net/http" + "github.com/kylecarbs/aisdk-go" + "github.com/coder/coder/v2/coderd/httpapi" "github.com/coder/coder/v2/coderd/rbac" "github.com/coder/coder/v2/coderd/rbac/policy" @@ -84,3 +87,25 @@ func buildInfoHandler(resp codersdk.BuildInfoResponse) http.HandlerFunc { func (api *API) sshConfig(rw http.ResponseWriter, r *http.Request) { httpapi.Write(r.Context(), rw, http.StatusOK, api.SSHConfig) } + +type LanguageModel struct { + codersdk.LanguageModel + Provider func(ctx context.Context, messages []aisdk.Message, thinking bool) (aisdk.DataStream, error) +} + +// @Summary Get language models +// @ID get-language-models +// @Security CoderSessionToken +// @Produce json +// @Tags General +// @Success 200 {object} codersdk.LanguageModelConfig +// @Router /deployment/llms [get] +func (api *API) deploymentLLMs(rw http.ResponseWriter, r *http.Request) { + models := make([]codersdk.LanguageModel, 0, len(api.LanguageModels)) + for _, model := range api.LanguageModels { + models = append(models, model.LanguageModel) + } + httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.LanguageModelConfig{ + Models: models, + }) +} diff --git a/coderd/httpmw/chat.go b/coderd/httpmw/chat.go new file mode 100644 index 0000000000000..c92fa5038ab22 --- /dev/null +++ b/coderd/httpmw/chat.go @@ -0,0 +1,59 @@ +package httpmw + +import ( + "context" + "net/http" + + "github.com/go-chi/chi/v5" + "github.com/google/uuid" + + "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/httpapi" + "github.com/coder/coder/v2/codersdk" +) + +type chatContextKey struct{} + +func ChatParam(r *http.Request) database.Chat { + chat, ok := r.Context().Value(chatContextKey{}).(database.Chat) + if !ok { + panic("developer error: chat param middleware not provided") + } + return chat +} + +func ExtractChatParam(db database.Store) func(http.Handler) http.Handler { + return func(next http.Handler) http.Handler { + return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { + ctx := r.Context() + arg := chi.URLParam(r, "chat") + if arg == "" { + httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{ + Message: "\"chat\" must be provided.", + }) + return + } + chatID, err := uuid.Parse(arg) + if err != nil { + httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{ + Message: "Invalid chat ID.", + }) + return + } + chat, err := db.GetChatByID(ctx, chatID) + if httpapi.Is404Error(err) { + httpapi.ResourceNotFound(rw) + return + } + if err != nil { + httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{ + Message: "Failed to get chat.", + Detail: err.Error(), + }) + return + } + ctx = context.WithValue(ctx, chatContextKey{}, chat) + next.ServeHTTP(rw, r.WithContext(ctx)) + }) + } +} diff --git a/coderd/httpmw/chat_test.go b/coderd/httpmw/chat_test.go new file mode 100644 index 0000000000000..a8bad05f33797 --- /dev/null +++ b/coderd/httpmw/chat_test.go @@ -0,0 +1,150 @@ +package httpmw_test + +import ( + "context" + "net/http" + "net/http/httptest" + "testing" + "time" + + "github.com/go-chi/chi/v5" + "github.com/google/uuid" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/coder/coder/v2/coderd/database" + "github.com/coder/coder/v2/coderd/database/dbgen" + "github.com/coder/coder/v2/coderd/database/dbmem" + "github.com/coder/coder/v2/coderd/database/dbtime" + "github.com/coder/coder/v2/coderd/httpmw" + "github.com/coder/coder/v2/codersdk" +) + +func TestExtractChat(t *testing.T) { + t.Parallel() + + setupAuthentication := func(db database.Store) (*http.Request, database.User) { + r := httptest.NewRequest("GET", "/", nil) + + user := dbgen.User(t, db, database.User{ + ID: uuid.New(), + }) + _, token := dbgen.APIKey(t, db, database.APIKey{ + UserID: user.ID, + }) + r.Header.Set(codersdk.SessionTokenHeader, token) + r = r.WithContext(context.WithValue(r.Context(), chi.RouteCtxKey, chi.NewRouteContext())) + return r, user + } + + t.Run("None", func(t *testing.T) { + t.Parallel() + var ( + db = dbmem.New() + rw = httptest.NewRecorder() + r, _ = setupAuthentication(db) + rtr = chi.NewRouter() + ) + rtr.Use( + httpmw.ExtractAPIKeyMW(httpmw.ExtractAPIKeyConfig{ + DB: db, + RedirectToLogin: false, + }), + httpmw.ExtractChatParam(db), + ) + rtr.Get("/", nil) + rtr.ServeHTTP(rw, r) + res := rw.Result() + defer res.Body.Close() + require.Equal(t, http.StatusBadRequest, res.StatusCode) + }) + + t.Run("InvalidUUID", func(t *testing.T) { + t.Parallel() + var ( + db = dbmem.New() + rw = httptest.NewRecorder() + r, _ = setupAuthentication(db) + rtr = chi.NewRouter() + ) + chi.RouteContext(r.Context()).URLParams.Add("chat", "not-a-uuid") + rtr.Use( + httpmw.ExtractAPIKeyMW(httpmw.ExtractAPIKeyConfig{ + DB: db, + RedirectToLogin: false, + }), + httpmw.ExtractChatParam(db), + ) + rtr.Get("/", nil) + rtr.ServeHTTP(rw, r) + res := rw.Result() + defer res.Body.Close() + require.Equal(t, http.StatusBadRequest, res.StatusCode) // Changed from NotFound in org test to BadRequest as per chat.go + }) + + t.Run("NotFound", func(t *testing.T) { + t.Parallel() + var ( + db = dbmem.New() + rw = httptest.NewRecorder() + r, _ = setupAuthentication(db) + rtr = chi.NewRouter() + ) + chi.RouteContext(r.Context()).URLParams.Add("chat", uuid.NewString()) + rtr.Use( + httpmw.ExtractAPIKeyMW(httpmw.ExtractAPIKeyConfig{ + DB: db, + RedirectToLogin: false, + }), + httpmw.ExtractChatParam(db), + ) + rtr.Get("/", nil) + rtr.ServeHTTP(rw, r) + res := rw.Result() + defer res.Body.Close() + require.Equal(t, http.StatusNotFound, res.StatusCode) + }) + + t.Run("Success", func(t *testing.T) { + t.Parallel() + var ( + db = dbmem.New() + rw = httptest.NewRecorder() + r, user = setupAuthentication(db) + rtr = chi.NewRouter() + ) + + // Create a test chat + testChat := dbgen.Chat(t, db, database.Chat{ + ID: uuid.New(), + OwnerID: user.ID, + CreatedAt: dbtime.Now(), + UpdatedAt: dbtime.Now(), + Title: "Test Chat", + }) + + rtr.Use( + httpmw.ExtractAPIKeyMW(httpmw.ExtractAPIKeyConfig{ + DB: db, + RedirectToLogin: false, + }), + httpmw.ExtractChatParam(db), + ) + rtr.Get("/", func(rw http.ResponseWriter, r *http.Request) { + chat := httpmw.ChatParam(r) + require.NotZero(t, chat) + assert.Equal(t, testChat.ID, chat.ID) + assert.WithinDuration(t, testChat.CreatedAt, chat.CreatedAt, time.Second) + assert.WithinDuration(t, testChat.UpdatedAt, chat.UpdatedAt, time.Second) + assert.Equal(t, testChat.Title, chat.Title) + rw.WriteHeader(http.StatusOK) + }) + + // Try by ID + chi.RouteContext(r.Context()).URLParams.Add("chat", testChat.ID.String()) + rtr.ServeHTTP(rw, r) + res := rw.Result() + defer res.Body.Close() + require.Equal(t, http.StatusOK, res.StatusCode, "by id") + }) +} diff --git a/coderd/rbac/object_gen.go b/coderd/rbac/object_gen.go index 7c0933c4241b0..40b7dc87a56f8 100644 --- a/coderd/rbac/object_gen.go +++ b/coderd/rbac/object_gen.go @@ -54,6 +54,16 @@ var ( Type: "audit_log", } + // ResourceChat + // Valid Actions + // - "ActionCreate" :: create a chat + // - "ActionDelete" :: delete a chat + // - "ActionRead" :: read a chat + // - "ActionUpdate" :: update a chat + ResourceChat = Object{ + Type: "chat", + } + // ResourceCryptoKey // Valid Actions // - "ActionCreate" :: create crypto keys @@ -354,6 +364,7 @@ func AllResources() []Objecter { ResourceAssignOrgRole, ResourceAssignRole, ResourceAuditLog, + ResourceChat, ResourceCryptoKey, ResourceDebugInfo, ResourceDeploymentConfig, diff --git a/coderd/rbac/policy/policy.go b/coderd/rbac/policy/policy.go index 5b661243dc127..35da0892abfdb 100644 --- a/coderd/rbac/policy/policy.go +++ b/coderd/rbac/policy/policy.go @@ -104,6 +104,14 @@ var RBACPermissions = map[string]PermissionDefinition{ ActionRead: actDef("read and use a workspace proxy"), }, }, + "chat": { + Actions: map[Action]ActionDefinition{ + ActionCreate: actDef("create a chat"), + ActionRead: actDef("read a chat"), + ActionDelete: actDef("delete a chat"), + ActionUpdate: actDef("update a chat"), + }, + }, "license": { Actions: map[Action]ActionDefinition{ ActionCreate: actDef("create a license"), diff --git a/coderd/rbac/roles.go b/coderd/rbac/roles.go index 6b99cb4e871a2..56124faee44e2 100644 --- a/coderd/rbac/roles.go +++ b/coderd/rbac/roles.go @@ -299,6 +299,8 @@ func ReloadBuiltinRoles(opts *RoleOptions) { ResourceOrganizationMember.Type: {policy.ActionRead}, // Users can create provisioner daemons scoped to themselves. ResourceProvisionerDaemon.Type: {policy.ActionRead, policy.ActionCreate, policy.ActionRead, policy.ActionUpdate}, + // Users can create, read, update, and delete their own agentic chat messages. + ResourceChat.Type: {policy.ActionCreate, policy.ActionRead, policy.ActionUpdate, policy.ActionDelete}, })..., ), }.withCachedRegoValue() diff --git a/coderd/rbac/roles_test.go b/coderd/rbac/roles_test.go index 1080903637ac5..e90c89914fdec 100644 --- a/coderd/rbac/roles_test.go +++ b/coderd/rbac/roles_test.go @@ -831,6 +831,37 @@ func TestRolePermissions(t *testing.T) { }, }, }, + // Members may read their own chats. + { + Name: "CreateReadUpdateDeleteMyChats", + Actions: []policy.Action{policy.ActionCreate, policy.ActionRead, policy.ActionUpdate, policy.ActionDelete}, + Resource: rbac.ResourceChat.WithOwner(currentUser.String()), + AuthorizeMap: map[bool][]hasAuthSubjects{ + true: {memberMe, orgMemberMe, owner}, + false: { + userAdmin, orgUserAdmin, templateAdmin, + orgAuditor, orgTemplateAdmin, + otherOrgMember, otherOrgAuditor, otherOrgUserAdmin, otherOrgTemplateAdmin, + orgAdmin, otherOrgAdmin, + }, + }, + }, + // Only owners can create, read, update, and delete other users' chats. + { + Name: "CreateReadUpdateDeleteOtherUserChats", + Actions: []policy.Action{policy.ActionCreate, policy.ActionRead, policy.ActionUpdate, policy.ActionDelete}, + Resource: rbac.ResourceChat.WithOwner(uuid.NewString()), // some other user + AuthorizeMap: map[bool][]hasAuthSubjects{ + true: {owner}, + false: { + memberMe, orgMemberMe, + userAdmin, orgUserAdmin, templateAdmin, + orgAuditor, orgTemplateAdmin, + otherOrgMember, otherOrgAuditor, otherOrgUserAdmin, otherOrgTemplateAdmin, + orgAdmin, otherOrgAdmin, + }, + }, + }, } // We expect every permission to be tested above. diff --git a/codersdk/chat.go b/codersdk/chat.go new file mode 100644 index 0000000000000..2093adaff95e8 --- /dev/null +++ b/codersdk/chat.go @@ -0,0 +1,153 @@ +package codersdk + +import ( + "context" + "encoding/json" + "fmt" + "net/http" + "time" + + "github.com/google/uuid" + "github.com/kylecarbs/aisdk-go" + "golang.org/x/xerrors" +) + +// CreateChat creates a new chat. +func (c *Client) CreateChat(ctx context.Context) (Chat, error) { + res, err := c.Request(ctx, http.MethodPost, "/api/v2/chats", nil) + if err != nil { + return Chat{}, xerrors.Errorf("execute request: %w", err) + } + if res.StatusCode != http.StatusCreated { + return Chat{}, ReadBodyAsError(res) + } + defer res.Body.Close() + var chat Chat + return chat, json.NewDecoder(res.Body).Decode(&chat) +} + +type Chat struct { + ID uuid.UUID `json:"id" format:"uuid"` + CreatedAt time.Time `json:"created_at" format:"date-time"` + UpdatedAt time.Time `json:"updated_at" format:"date-time"` + Title string `json:"title"` +} + +// ListChats lists all chats. +func (c *Client) ListChats(ctx context.Context) ([]Chat, error) { + res, err := c.Request(ctx, http.MethodGet, "/api/v2/chats", nil) + if err != nil { + return nil, xerrors.Errorf("execute request: %w", err) + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return nil, ReadBodyAsError(res) + } + + var chats []Chat + return chats, json.NewDecoder(res.Body).Decode(&chats) +} + +// Chat returns a chat by ID. +func (c *Client) Chat(ctx context.Context, id uuid.UUID) (Chat, error) { + res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/chats/%s", id), nil) + if err != nil { + return Chat{}, xerrors.Errorf("execute request: %w", err) + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return Chat{}, ReadBodyAsError(res) + } + var chat Chat + return chat, json.NewDecoder(res.Body).Decode(&chat) +} + +// ChatMessages returns the messages of a chat. +func (c *Client) ChatMessages(ctx context.Context, id uuid.UUID) ([]ChatMessage, error) { + res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/chats/%s/messages", id), nil) + if err != nil { + return nil, xerrors.Errorf("execute request: %w", err) + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return nil, ReadBodyAsError(res) + } + var messages []ChatMessage + return messages, json.NewDecoder(res.Body).Decode(&messages) +} + +type ChatMessage = aisdk.Message + +type CreateChatMessageRequest struct { + Model string `json:"model"` + Message ChatMessage `json:"message"` + Thinking bool `json:"thinking"` +} + +// CreateChatMessage creates a new chat message and streams the response. +// If the provided message has a conflicting ID with an existing message, +// it will be overwritten. +func (c *Client) CreateChatMessage(ctx context.Context, id uuid.UUID, req CreateChatMessageRequest) (<-chan aisdk.DataStreamPart, error) { + res, err := c.Request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/chats/%s/messages", id), req) + defer func() { + if res != nil && res.Body != nil { + _ = res.Body.Close() + } + }() + if err != nil { + return nil, xerrors.Errorf("execute request: %w", err) + } + if res.StatusCode != http.StatusOK { + return nil, ReadBodyAsError(res) + } + nextEvent := ServerSentEventReader(ctx, res.Body) + + wc := make(chan aisdk.DataStreamPart, 256) + go func() { + defer close(wc) + defer res.Body.Close() + + for { + select { + case <-ctx.Done(): + return + default: + sse, err := nextEvent() + if err != nil { + return + } + if sse.Type != ServerSentEventTypeData { + continue + } + var part aisdk.DataStreamPart + b, ok := sse.Data.([]byte) + if !ok { + return + } + err = json.Unmarshal(b, &part) + if err != nil { + return + } + select { + case <-ctx.Done(): + return + case wc <- part: + } + } + } + }() + + return wc, nil +} + +func (c *Client) DeleteChat(ctx context.Context, id uuid.UUID) error { + res, err := c.Request(ctx, http.MethodDelete, fmt.Sprintf("/api/v2/chats/%s", id), nil) + if err != nil { + return xerrors.Errorf("execute request: %w", err) + } + defer res.Body.Close() + if res.StatusCode != http.StatusNoContent { + return ReadBodyAsError(res) + } + return nil +} diff --git a/codersdk/deployment.go b/codersdk/deployment.go index 154d7f6cb92e4..0741bf9e3844a 100644 --- a/codersdk/deployment.go +++ b/codersdk/deployment.go @@ -383,6 +383,7 @@ type DeploymentValues struct { DisablePasswordAuth serpent.Bool `json:"disable_password_auth,omitempty" typescript:",notnull"` Support SupportConfig `json:"support,omitempty" typescript:",notnull"` ExternalAuthConfigs serpent.Struct[[]ExternalAuthConfig] `json:"external_auth,omitempty" typescript:",notnull"` + AI serpent.Struct[AIConfig] `json:"ai,omitempty" typescript:",notnull"` SSHConfig SSHConfig `json:"config_ssh,omitempty" typescript:",notnull"` WgtunnelHost serpent.String `json:"wgtunnel_host,omitempty" typescript:",notnull"` DisableOwnerWorkspaceExec serpent.Bool `json:"disable_owner_workspace_exec,omitempty" typescript:",notnull"` @@ -2660,6 +2661,15 @@ Write out the current server config as YAML to stdout.`, Value: &c.Support.Links, Hidden: false, }, + { + // Env handling is done in cli.ReadAIProvidersFromEnv + Name: "AI", + Description: "Configure AI providers.", + YAML: "ai", + Value: &c.AI, + // Hidden because this is experimental. + Hidden: true, + }, { // Env handling is done in cli.ReadGitAuthFromEnvironment Name: "External Auth Providers", @@ -3081,6 +3091,21 @@ Write out the current server config as YAML to stdout.`, return opts } +type AIProviderConfig struct { + // Type is the type of the API provider. + Type string `json:"type" yaml:"type"` + // APIKey is the API key to use for the API provider. + APIKey string `json:"-" yaml:"api_key"` + // Models is the list of models to use for the API provider. + Models []string `json:"models" yaml:"models"` + // BaseURL is the base URL to use for the API provider. + BaseURL string `json:"base_url" yaml:"base_url"` +} + +type AIConfig struct { + Providers []AIProviderConfig `json:"providers,omitempty" yaml:"providers,omitempty"` +} + type SupportConfig struct { Links serpent.Struct[[]LinkConfig] `json:"links" typescript:",notnull"` } @@ -3303,6 +3328,7 @@ const ( ExperimentWebPush Experiment = "web-push" // Enables web push notifications through the browser. ExperimentDynamicParameters Experiment = "dynamic-parameters" // Enables dynamic parameters when creating a workspace. ExperimentWorkspacePrebuilds Experiment = "workspace-prebuilds" // Enables the new workspace prebuilds feature. + ExperimentAgenticChat Experiment = "agentic-chat" // Enables the new agentic AI chat feature. ) // ExperimentsSafe should include all experiments that are safe for @@ -3517,6 +3543,32 @@ func (c *Client) SSHConfiguration(ctx context.Context) (SSHConfigResponse, error return sshConfig, json.NewDecoder(res.Body).Decode(&sshConfig) } +type LanguageModelConfig struct { + Models []LanguageModel `json:"models"` +} + +// LanguageModel is a language model that can be used for chat. +type LanguageModel struct { + // ID is used by the provider to identify the LLM. + ID string `json:"id"` + DisplayName string `json:"display_name"` + // Provider is the provider of the LLM. e.g. openai, anthropic, etc. + Provider string `json:"provider"` +} + +func (c *Client) LanguageModelConfig(ctx context.Context) (LanguageModelConfig, error) { + res, err := c.Request(ctx, http.MethodGet, "/api/v2/deployment/llms", nil) + if err != nil { + return LanguageModelConfig{}, err + } + defer res.Body.Close() + if res.StatusCode != http.StatusOK { + return LanguageModelConfig{}, ReadBodyAsError(res) + } + var llms LanguageModelConfig + return llms, json.NewDecoder(res.Body).Decode(&llms) +} + type CryptoKeyFeature string const ( diff --git a/codersdk/rbacresources_gen.go b/codersdk/rbacresources_gen.go index 7f1bd5da4eb3c..54f65767928d6 100644 --- a/codersdk/rbacresources_gen.go +++ b/codersdk/rbacresources_gen.go @@ -9,6 +9,7 @@ const ( ResourceAssignOrgRole RBACResource = "assign_org_role" ResourceAssignRole RBACResource = "assign_role" ResourceAuditLog RBACResource = "audit_log" + ResourceChat RBACResource = "chat" ResourceCryptoKey RBACResource = "crypto_key" ResourceDebugInfo RBACResource = "debug_info" ResourceDeploymentConfig RBACResource = "deployment_config" @@ -69,6 +70,7 @@ var RBACResourceActions = map[RBACResource][]RBACAction{ ResourceAssignOrgRole: {ActionAssign, ActionCreate, ActionDelete, ActionRead, ActionUnassign, ActionUpdate}, ResourceAssignRole: {ActionAssign, ActionRead, ActionUnassign}, ResourceAuditLog: {ActionCreate, ActionRead}, + ResourceChat: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, ResourceCryptoKey: {ActionCreate, ActionDelete, ActionRead, ActionUpdate}, ResourceDebugInfo: {ActionRead}, ResourceDeploymentConfig: {ActionRead, ActionUpdate}, diff --git a/codersdk/toolsdk/toolsdk.go b/codersdk/toolsdk/toolsdk.go index 166bde730efc5..985475d211fa3 100644 --- a/codersdk/toolsdk/toolsdk.go +++ b/codersdk/toolsdk/toolsdk.go @@ -591,7 +591,7 @@ This resource provides the following fields: - init_script: The script to run on provisioned infrastructure to fetch and start the agent. - token: Set the environment variable CODER_AGENT_TOKEN to this value to authenticate the agent. -The agent MUST be installed and started using the init_script. +The agent MUST be installed and started using the init_script. A utility like curl or wget to fetch the agent binary must exist in the provisioned infrastructure. Expose terminal or HTTP applications running in a workspace with: @@ -711,13 +711,20 @@ resource "google_compute_instance" "dev" { auto_delete = false source = google_compute_disk.root.name } + // In order to use google-instance-identity, a service account *must* be provided. service_account { email = data.google_compute_default_service_account.default.email scopes = ["cloud-platform"] } + # ONLY FOR WINDOWS: + # metadata = { + # windows-startup-script-ps1 = coder_agent.main.init_script + # } # The startup script runs as root with no $HOME environment set up, so instead of directly # running the agent init script, create a user (with a homedir, default shell and sudo # permissions) and execute the init script as that user. + # + # The agent MUST be started in here. metadata_startup_script = < 200 Response + +```json +[ + { + "created_at": "2019-08-24T14:15:22Z", + "id": "497f6eca-6276-4993-bfeb-53cbbbba6f08", + "title": "string", + "updated_at": "2019-08-24T14:15:22Z" + } +] +``` + +### Responses + +| Status | Meaning | Description | Schema | +|--------|---------------------------------------------------------|-------------|---------------------------------------------------| +| 200 | [OK](https://tools.ietf.org/html/rfc7231#section-6.3.1) | OK | array of [codersdk.Chat](schemas.md#codersdkchat) | + +

Response Schema

+ +Status Code **200** + +| Name | Type | Required | Restrictions | Description | +|----------------|-------------------|----------|--------------|-------------| +| `[array item]` | array | false | | | +| `» created_at` | string(date-time) | false | | | +| `» id` | string(uuid) | false | | | +| `» title` | string | false | | | +| `» updated_at` | string(date-time) | false | | | + +To perform this operation, you must be authenticated. [Learn more](authentication.md). + +## Create a chat + +### Code samples + +```shell +# Example request using curl +curl -X POST http://coder-server:8080/api/v2/chats \ + -H 'Accept: application/json' \ + -H 'Coder-Session-Token: API_KEY' +``` + +`POST /chats` + +### Example responses + +> 201 Response + +```json +{ + "created_at": "2019-08-24T14:15:22Z", + "id": "497f6eca-6276-4993-bfeb-53cbbbba6f08", + "title": "string", + "updated_at": "2019-08-24T14:15:22Z" +} +``` + +### Responses + +| Status | Meaning | Description | Schema | +|--------|--------------------------------------------------------------|-------------|------------------------------------------| +| 201 | [Created](https://tools.ietf.org/html/rfc7231#section-6.3.2) | Created | [codersdk.Chat](schemas.md#codersdkchat) | + +To perform this operation, you must be authenticated. [Learn more](authentication.md). + +## Get a chat + +### Code samples + +```shell +# Example request using curl +curl -X GET http://coder-server:8080/api/v2/chats/{chat} \ + -H 'Accept: application/json' \ + -H 'Coder-Session-Token: API_KEY' +``` + +`GET /chats/{chat}` + +### Parameters + +| Name | In | Type | Required | Description | +|--------|------|--------|----------|-------------| +| `chat` | path | string | true | Chat ID | + +### Example responses + +> 200 Response + +```json +{ + "created_at": "2019-08-24T14:15:22Z", + "id": "497f6eca-6276-4993-bfeb-53cbbbba6f08", + "title": "string", + "updated_at": "2019-08-24T14:15:22Z" +} +``` + +### Responses + +| Status | Meaning | Description | Schema | +|--------|---------------------------------------------------------|-------------|------------------------------------------| +| 200 | [OK](https://tools.ietf.org/html/rfc7231#section-6.3.1) | OK | [codersdk.Chat](schemas.md#codersdkchat) | + +To perform this operation, you must be authenticated. [Learn more](authentication.md). + +## Get chat messages + +### Code samples + +```shell +# Example request using curl +curl -X GET http://coder-server:8080/api/v2/chats/{chat}/messages \ + -H 'Accept: application/json' \ + -H 'Coder-Session-Token: API_KEY' +``` + +`GET /chats/{chat}/messages` + +### Parameters + +| Name | In | Type | Required | Description | +|--------|------|--------|----------|-------------| +| `chat` | path | string | true | Chat ID | + +### Example responses + +> 200 Response + +```json +[ + { + "annotations": [ + null + ], + "content": "string", + "createdAt": [ + 0 + ], + "experimental_attachments": [ + { + "contentType": "string", + "name": "string", + "url": "string" + } + ], + "id": "string", + "parts": [ + { + "data": [ + 0 + ], + "details": [ + { + "data": "string", + "signature": "string", + "text": "string", + "type": "string" + } + ], + "mimeType": "string", + "reasoning": "string", + "source": { + "contentType": "string", + "data": "string", + "metadata": { + "property1": null, + "property2": null + }, + "uri": "string" + }, + "text": "string", + "toolInvocation": { + "args": null, + "result": null, + "state": "call", + "step": 0, + "toolCallId": "string", + "toolName": "string" + }, + "type": "text" + } + ], + "role": "string" + } +] +``` + +### Responses + +| Status | Meaning | Description | Schema | +|--------|---------------------------------------------------------|-------------|---------------------------------------------------| +| 200 | [OK](https://tools.ietf.org/html/rfc7231#section-6.3.1) | OK | array of [aisdk.Message](schemas.md#aisdkmessage) | + +

Response Schema

+ +Status Code **200** + +| Name | Type | Required | Restrictions | Description | +|------------------------------|------------------------------------------------------------------|----------|--------------|-------------------------| +| `[array item]` | array | false | | | +| `» annotations` | array | false | | | +| `» content` | string | false | | | +| `» createdAt` | array | false | | | +| `» experimental_attachments` | array | false | | | +| `»» contentType` | string | false | | | +| `»» name` | string | false | | | +| `»» url` | string | false | | | +| `» id` | string | false | | | +| `» parts` | array | false | | | +| `»» data` | array | false | | | +| `»» details` | array | false | | | +| `»»» data` | string | false | | | +| `»»» signature` | string | false | | | +| `»»» text` | string | false | | | +| `»»» type` | string | false | | | +| `»» mimeType` | string | false | | Type: "file" | +| `»» reasoning` | string | false | | Type: "reasoning" | +| `»» source` | [aisdk.SourceInfo](schemas.md#aisdksourceinfo) | false | | Type: "source" | +| `»»» contentType` | string | false | | | +| `»»» data` | string | false | | | +| `»»» metadata` | object | false | | | +| `»»»» [any property]` | any | false | | | +| `»»» uri` | string | false | | | +| `»» text` | string | false | | Type: "text" | +| `»» toolInvocation` | [aisdk.ToolInvocation](schemas.md#aisdktoolinvocation) | false | | Type: "tool-invocation" | +| `»»» args` | any | false | | | +| `»»» result` | any | false | | | +| `»»» state` | [aisdk.ToolInvocationState](schemas.md#aisdktoolinvocationstate) | false | | | +| `»»» step` | integer | false | | | +| `»»» toolCallId` | string | false | | | +| `»»» toolName` | string | false | | | +| `»» type` | [aisdk.PartType](schemas.md#aisdkparttype) | false | | | +| `» role` | string | false | | | + +#### Enumerated Values + +| Property | Value | +|----------|-------------------| +| `state` | `call` | +| `state` | `partial-call` | +| `state` | `result` | +| `type` | `text` | +| `type` | `reasoning` | +| `type` | `tool-invocation` | +| `type` | `source` | +| `type` | `file` | +| `type` | `step-start` | + +To perform this operation, you must be authenticated. [Learn more](authentication.md). + +## Create a chat message + +### Code samples + +```shell +# Example request using curl +curl -X POST http://coder-server:8080/api/v2/chats/{chat}/messages \ + -H 'Content-Type: application/json' \ + -H 'Accept: application/json' \ + -H 'Coder-Session-Token: API_KEY' +``` + +`POST /chats/{chat}/messages` + +> Body parameter + +```json +{ + "message": { + "annotations": [ + null + ], + "content": "string", + "createdAt": [ + 0 + ], + "experimental_attachments": [ + { + "contentType": "string", + "name": "string", + "url": "string" + } + ], + "id": "string", + "parts": [ + { + "data": [ + 0 + ], + "details": [ + { + "data": "string", + "signature": "string", + "text": "string", + "type": "string" + } + ], + "mimeType": "string", + "reasoning": "string", + "source": { + "contentType": "string", + "data": "string", + "metadata": { + "property1": null, + "property2": null + }, + "uri": "string" + }, + "text": "string", + "toolInvocation": { + "args": null, + "result": null, + "state": "call", + "step": 0, + "toolCallId": "string", + "toolName": "string" + }, + "type": "text" + } + ], + "role": "string" + }, + "model": "string", + "thinking": true +} +``` + +### Parameters + +| Name | In | Type | Required | Description | +|--------|------|----------------------------------------------------------------------------------|----------|--------------| +| `chat` | path | string | true | Chat ID | +| `body` | body | [codersdk.CreateChatMessageRequest](schemas.md#codersdkcreatechatmessagerequest) | true | Request body | + +### Example responses + +> 200 Response + +```json +[ + null +] +``` + +### Responses + +| Status | Meaning | Description | Schema | +|--------|---------------------------------------------------------|-------------|--------------------| +| 200 | [OK](https://tools.ietf.org/html/rfc7231#section-6.3.1) | OK | array of undefined | + +

Response Schema

+ +To perform this operation, you must be authenticated. [Learn more](authentication.md). diff --git a/docs/reference/api/general.md b/docs/reference/api/general.md index 3c27ddb6dea1d..c14c317066a39 100644 --- a/docs/reference/api/general.md +++ b/docs/reference/api/general.md @@ -161,6 +161,19 @@ curl -X GET http://coder-server:8080/api/v2/deployment/config \ "user": {} }, "agent_stat_refresh_interval": 0, + "ai": { + "value": { + "providers": [ + { + "base_url": "string", + "models": [ + "string" + ], + "type": "string" + } + ] + } + }, "allow_workspace_renames": true, "autobuild_poll_interval": 0, "browser_only": true, @@ -570,6 +583,43 @@ curl -X GET http://coder-server:8080/api/v2/deployment/config \ To perform this operation, you must be authenticated. [Learn more](authentication.md). +## Get language models + +### Code samples + +```shell +# Example request using curl +curl -X GET http://coder-server:8080/api/v2/deployment/llms \ + -H 'Accept: application/json' \ + -H 'Coder-Session-Token: API_KEY' +``` + +`GET /deployment/llms` + +### Example responses + +> 200 Response + +```json +{ + "models": [ + { + "display_name": "string", + "id": "string", + "provider": "string" + } + ] +} +``` + +### Responses + +| Status | Meaning | Description | Schema | +|--------|---------------------------------------------------------|-------------|------------------------------------------------------------------------| +| 200 | [OK](https://tools.ietf.org/html/rfc7231#section-6.3.1) | OK | [codersdk.LanguageModelConfig](schemas.md#codersdklanguagemodelconfig) | + +To perform this operation, you must be authenticated. [Learn more](authentication.md). + ## SSH Config ### Code samples diff --git a/docs/reference/api/members.md b/docs/reference/api/members.md index 972313001f3ea..a58a597d1ea2a 100644 --- a/docs/reference/api/members.md +++ b/docs/reference/api/members.md @@ -185,6 +185,7 @@ Status Code **200** | `resource_type` | `assign_org_role` | | `resource_type` | `assign_role` | | `resource_type` | `audit_log` | +| `resource_type` | `chat` | | `resource_type` | `crypto_key` | | `resource_type` | `debug_info` | | `resource_type` | `deployment_config` | @@ -351,6 +352,7 @@ Status Code **200** | `resource_type` | `assign_org_role` | | `resource_type` | `assign_role` | | `resource_type` | `audit_log` | +| `resource_type` | `chat` | | `resource_type` | `crypto_key` | | `resource_type` | `debug_info` | | `resource_type` | `deployment_config` | @@ -517,6 +519,7 @@ Status Code **200** | `resource_type` | `assign_org_role` | | `resource_type` | `assign_role` | | `resource_type` | `audit_log` | +| `resource_type` | `chat` | | `resource_type` | `crypto_key` | | `resource_type` | `debug_info` | | `resource_type` | `deployment_config` | @@ -652,6 +655,7 @@ Status Code **200** | `resource_type` | `assign_org_role` | | `resource_type` | `assign_role` | | `resource_type` | `audit_log` | +| `resource_type` | `chat` | | `resource_type` | `crypto_key` | | `resource_type` | `debug_info` | | `resource_type` | `deployment_config` | @@ -1009,6 +1013,7 @@ Status Code **200** | `resource_type` | `assign_org_role` | | `resource_type` | `assign_role` | | `resource_type` | `audit_log` | +| `resource_type` | `chat` | | `resource_type` | `crypto_key` | | `resource_type` | `debug_info` | | `resource_type` | `deployment_config` | diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md index e2ba1373aa613..6ca005b4ec69c 100644 --- a/docs/reference/api/schemas.md +++ b/docs/reference/api/schemas.md @@ -182,6 +182,250 @@ | `icon` | string | false | | | | `id` | string | false | | ID is a unique identifier for the log source. It is scoped to a workspace agent, and can be statically defined inside code to prevent duplicate sources from being created for the same agent. | +## aisdk.Attachment + +```json +{ + "contentType": "string", + "name": "string", + "url": "string" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|---------------|--------|----------|--------------|-------------| +| `contentType` | string | false | | | +| `name` | string | false | | | +| `url` | string | false | | | + +## aisdk.Message + +```json +{ + "annotations": [ + null + ], + "content": "string", + "createdAt": [ + 0 + ], + "experimental_attachments": [ + { + "contentType": "string", + "name": "string", + "url": "string" + } + ], + "id": "string", + "parts": [ + { + "data": [ + 0 + ], + "details": [ + { + "data": "string", + "signature": "string", + "text": "string", + "type": "string" + } + ], + "mimeType": "string", + "reasoning": "string", + "source": { + "contentType": "string", + "data": "string", + "metadata": { + "property1": null, + "property2": null + }, + "uri": "string" + }, + "text": "string", + "toolInvocation": { + "args": null, + "result": null, + "state": "call", + "step": 0, + "toolCallId": "string", + "toolName": "string" + }, + "type": "text" + } + ], + "role": "string" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|----------------------------|-----------------------------------------------|----------|--------------|-------------| +| `annotations` | array of undefined | false | | | +| `content` | string | false | | | +| `createdAt` | array of integer | false | | | +| `experimental_attachments` | array of [aisdk.Attachment](#aisdkattachment) | false | | | +| `id` | string | false | | | +| `parts` | array of [aisdk.Part](#aisdkpart) | false | | | +| `role` | string | false | | | + +## aisdk.Part + +```json +{ + "data": [ + 0 + ], + "details": [ + { + "data": "string", + "signature": "string", + "text": "string", + "type": "string" + } + ], + "mimeType": "string", + "reasoning": "string", + "source": { + "contentType": "string", + "data": "string", + "metadata": { + "property1": null, + "property2": null + }, + "uri": "string" + }, + "text": "string", + "toolInvocation": { + "args": null, + "result": null, + "state": "call", + "step": 0, + "toolCallId": "string", + "toolName": "string" + }, + "type": "text" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|------------------|---------------------------------------------------------|----------|--------------|-------------------------| +| `data` | array of integer | false | | | +| `details` | array of [aisdk.ReasoningDetail](#aisdkreasoningdetail) | false | | | +| `mimeType` | string | false | | Type: "file" | +| `reasoning` | string | false | | Type: "reasoning" | +| `source` | [aisdk.SourceInfo](#aisdksourceinfo) | false | | Type: "source" | +| `text` | string | false | | Type: "text" | +| `toolInvocation` | [aisdk.ToolInvocation](#aisdktoolinvocation) | false | | Type: "tool-invocation" | +| `type` | [aisdk.PartType](#aisdkparttype) | false | | | + +## aisdk.PartType + +```json +"text" +``` + +### Properties + +#### Enumerated Values + +| Value | +|-------------------| +| `text` | +| `reasoning` | +| `tool-invocation` | +| `source` | +| `file` | +| `step-start` | + +## aisdk.ReasoningDetail + +```json +{ + "data": "string", + "signature": "string", + "text": "string", + "type": "string" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|-------------|--------|----------|--------------|-------------| +| `data` | string | false | | | +| `signature` | string | false | | | +| `text` | string | false | | | +| `type` | string | false | | | + +## aisdk.SourceInfo + +```json +{ + "contentType": "string", + "data": "string", + "metadata": { + "property1": null, + "property2": null + }, + "uri": "string" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|--------------------|--------|----------|--------------|-------------| +| `contentType` | string | false | | | +| `data` | string | false | | | +| `metadata` | object | false | | | +| » `[any property]` | any | false | | | +| `uri` | string | false | | | + +## aisdk.ToolInvocation + +```json +{ + "args": null, + "result": null, + "state": "call", + "step": 0, + "toolCallId": "string", + "toolName": "string" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|--------------|--------------------------------------------------------|----------|--------------|-------------| +| `args` | any | false | | | +| `result` | any | false | | | +| `state` | [aisdk.ToolInvocationState](#aisdktoolinvocationstate) | false | | | +| `step` | integer | false | | | +| `toolCallId` | string | false | | | +| `toolName` | string | false | | | + +## aisdk.ToolInvocationState + +```json +"call" +``` + +### Properties + +#### Enumerated Values + +| Value | +|----------------| +| `call` | +| `partial-call` | +| `result` | + ## coderd.SCIMUser ```json @@ -305,6 +549,48 @@ | `groups` | array of [codersdk.Group](#codersdkgroup) | false | | | | `users` | array of [codersdk.ReducedUser](#codersdkreduceduser) | false | | | +## codersdk.AIConfig + +```json +{ + "providers": [ + { + "base_url": "string", + "models": [ + "string" + ], + "type": "string" + } + ] +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|-------------|-----------------------------------------------------------------|----------|--------------|-------------| +| `providers` | array of [codersdk.AIProviderConfig](#codersdkaiproviderconfig) | false | | | + +## codersdk.AIProviderConfig + +```json +{ + "base_url": "string", + "models": [ + "string" + ], + "type": "string" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|------------|-----------------|----------|--------------|-----------------------------------------------------------| +| `base_url` | string | false | | Base URL is the base URL to use for the API provider. | +| `models` | array of string | false | | Models is the list of models to use for the API provider. | +| `type` | string | false | | Type is the type of the API provider. | + ## codersdk.APIKey ```json @@ -1038,6 +1324,97 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in | `one_time_passcode` | string | true | | | | `password` | string | true | | | +## codersdk.Chat + +```json +{ + "created_at": "2019-08-24T14:15:22Z", + "id": "497f6eca-6276-4993-bfeb-53cbbbba6f08", + "title": "string", + "updated_at": "2019-08-24T14:15:22Z" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|--------------|--------|----------|--------------|-------------| +| `created_at` | string | false | | | +| `id` | string | false | | | +| `title` | string | false | | | +| `updated_at` | string | false | | | + +## codersdk.ChatMessage + +```json +{ + "annotations": [ + null + ], + "content": "string", + "createdAt": [ + 0 + ], + "experimental_attachments": [ + { + "contentType": "string", + "name": "string", + "url": "string" + } + ], + "id": "string", + "parts": [ + { + "data": [ + 0 + ], + "details": [ + { + "data": "string", + "signature": "string", + "text": "string", + "type": "string" + } + ], + "mimeType": "string", + "reasoning": "string", + "source": { + "contentType": "string", + "data": "string", + "metadata": { + "property1": null, + "property2": null + }, + "uri": "string" + }, + "text": "string", + "toolInvocation": { + "args": null, + "result": null, + "state": "call", + "step": 0, + "toolCallId": "string", + "toolName": "string" + }, + "type": "text" + } + ], + "role": "string" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|----------------------------|-----------------------------------------------|----------|--------------|-------------| +| `annotations` | array of undefined | false | | | +| `content` | string | false | | | +| `createdAt` | array of integer | false | | | +| `experimental_attachments` | array of [aisdk.Attachment](#aisdkattachment) | false | | | +| `id` | string | false | | | +| `parts` | array of [aisdk.Part](#aisdkpart) | false | | | +| `role` | string | false | | | + ## codersdk.ConnectionLatency ```json @@ -1070,6 +1447,77 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in | `password` | string | true | | | | `to_type` | [codersdk.LoginType](#codersdklogintype) | true | | To type is the login type to convert to. | +## codersdk.CreateChatMessageRequest + +```json +{ + "message": { + "annotations": [ + null + ], + "content": "string", + "createdAt": [ + 0 + ], + "experimental_attachments": [ + { + "contentType": "string", + "name": "string", + "url": "string" + } + ], + "id": "string", + "parts": [ + { + "data": [ + 0 + ], + "details": [ + { + "data": "string", + "signature": "string", + "text": "string", + "type": "string" + } + ], + "mimeType": "string", + "reasoning": "string", + "source": { + "contentType": "string", + "data": "string", + "metadata": { + "property1": null, + "property2": null + }, + "uri": "string" + }, + "text": "string", + "toolInvocation": { + "args": null, + "result": null, + "state": "call", + "step": 0, + "toolCallId": "string", + "toolName": "string" + }, + "type": "text" + } + ], + "role": "string" + }, + "model": "string", + "thinking": true +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|------------|----------------------------------------------|----------|--------------|-------------| +| `message` | [codersdk.ChatMessage](#codersdkchatmessage) | false | | | +| `model` | string | false | | | +| `thinking` | boolean | false | | | + ## codersdk.CreateFirstUserRequest ```json @@ -1334,12 +1782,52 @@ This is required on creation to enable a user-flow of validating a template work ## codersdk.CreateTestAuditLogRequest ```json -{} +{ + "action": "create", + "additional_fields": [ + 0 + ], + "build_reason": "autostart", + "organization_id": "7c60d51f-b44e-4682-87d6-449835ea4de6", + "request_id": "266ea41d-adf5-480b-af50-15b940c2b846", + "resource_id": "4d5215ed-38bb-48ed-879a-fdb9ca58522f", + "resource_type": "template", + "time": "2019-08-24T14:15:22Z" +} ``` ### Properties -None +| Name | Type | Required | Restrictions | Description | +|---------------------|------------------------------------------------|----------|--------------|-------------| +| `action` | [codersdk.AuditAction](#codersdkauditaction) | false | | | +| `additional_fields` | array of integer | false | | | +| `build_reason` | [codersdk.BuildReason](#codersdkbuildreason) | false | | | +| `organization_id` | string | false | | | +| `request_id` | string | false | | | +| `resource_id` | string | false | | | +| `resource_type` | [codersdk.ResourceType](#codersdkresourcetype) | false | | | +| `time` | string | false | | | + +#### Enumerated Values + +| Property | Value | +|-----------------|--------------------| +| `action` | `create` | +| `action` | `write` | +| `action` | `delete` | +| `action` | `start` | +| `action` | `stop` | +| `build_reason` | `autostart` | +| `build_reason` | `autostop` | +| `build_reason` | `initiator` | +| `resource_type` | `template` | +| `resource_type` | `template_version` | +| `resource_type` | `user` | +| `resource_type` | `workspace` | +| `resource_type` | `workspace_build` | +| `resource_type` | `git_ssh_key` | +| `resource_type` | `auditable_group` | ## codersdk.CreateTokenRequest @@ -1812,6 +2300,19 @@ CreateWorkspaceRequest provides options for creating a new workspace. Only one o "user": {} }, "agent_stat_refresh_interval": 0, + "ai": { + "value": { + "providers": [ + { + "base_url": "string", + "models": [ + "string" + ], + "type": "string" + } + ] + } + }, "allow_workspace_renames": true, "autobuild_poll_interval": 0, "browser_only": true, @@ -2297,6 +2798,19 @@ CreateWorkspaceRequest provides options for creating a new workspace. Only one o "user": {} }, "agent_stat_refresh_interval": 0, + "ai": { + "value": { + "providers": [ + { + "base_url": "string", + "models": [ + "string" + ], + "type": "string" + } + ] + } + }, "allow_workspace_renames": true, "autobuild_poll_interval": 0, "browser_only": true, @@ -2673,6 +3187,7 @@ CreateWorkspaceRequest provides options for creating a new workspace. Only one o | `address` | [serpent.HostPort](#serpenthostport) | false | | Deprecated: Use HTTPAddress or TLS.Address instead. | | `agent_fallback_troubleshooting_url` | [serpent.URL](#serpenturl) | false | | | | `agent_stat_refresh_interval` | integer | false | | | +| `ai` | [serpent.Struct-codersdk_AIConfig](#serpentstruct-codersdk_aiconfig) | false | | | | `allow_workspace_renames` | boolean | false | | | | `autobuild_poll_interval` | integer | false | | | | `browser_only` | boolean | false | | | @@ -2829,6 +3344,7 @@ CreateWorkspaceRequest provides options for creating a new workspace. Only one o | `web-push` | | `dynamic-parameters` | | `workspace-prebuilds` | +| `agentic-chat` | ## codersdk.ExternalAuth @@ -3446,6 +3962,44 @@ Git clone makes use of this by parsing the URL from: 'Username for "https://gith |-------------------------------| | `REQUIRED_TEMPLATE_VARIABLES` | +## codersdk.LanguageModel + +```json +{ + "display_name": "string", + "id": "string", + "provider": "string" +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|----------------|--------|----------|--------------|-------------------------------------------------------------------| +| `display_name` | string | false | | | +| `id` | string | false | | ID is used by the provider to identify the LLM. | +| `provider` | string | false | | Provider is the provider of the LLM. e.g. openai, anthropic, etc. | + +## codersdk.LanguageModelConfig + +```json +{ + "models": [ + { + "display_name": "string", + "id": "string", + "provider": "string" + } + ] +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|----------|-----------------------------------------------------------|----------|--------------|-------------| +| `models` | array of [codersdk.LanguageModel](#codersdklanguagemodel) | false | | | + ## codersdk.License ```json @@ -5354,6 +5908,7 @@ Git clone makes use of this by parsing the URL from: 'Username for "https://gith | `assign_org_role` | | `assign_role` | | `audit_log` | +| `chat` | | `crypto_key` | | `debug_info` | | `deployment_config` | @@ -11118,6 +11673,30 @@ None |---------|-----------------------------------------------------|----------|--------------|-------------| | `value` | array of [codersdk.LinkConfig](#codersdklinkconfig) | false | | | +## serpent.Struct-codersdk_AIConfig + +```json +{ + "value": { + "providers": [ + { + "base_url": "string", + "models": [ + "string" + ], + "type": "string" + } + ] + } +} +``` + +### Properties + +| Name | Type | Required | Restrictions | Description | +|---------|----------------------------------------|----------|--------------|-------------| +| `value` | [codersdk.AIConfig](#codersdkaiconfig) | false | | | + ## serpent.URL ```json diff --git a/go.mod b/go.mod index 8ff0ba1fa2376..ce41f23e02e05 100644 --- a/go.mod +++ b/go.mod @@ -487,10 +487,13 @@ require ( ) require ( + github.com/anthropics/anthropic-sdk-go v0.2.0-beta.3 github.com/coder/preview v0.0.1 github.com/fsnotify/fsnotify v1.9.0 - github.com/kylecarbs/aisdk-go v0.0.5 + github.com/kylecarbs/aisdk-go v0.0.8 github.com/mark3labs/mcp-go v0.23.1 + github.com/openai/openai-go v0.1.0-beta.6 + google.golang.org/genai v0.7.0 ) require ( @@ -502,7 +505,6 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect - github.com/anthropics/anthropic-sdk-go v0.2.0-beta.3 // indirect github.com/aquasecurity/go-version v0.0.1 // indirect github.com/aquasecurity/trivy v0.58.2 // indirect github.com/aws/aws-sdk-go v1.55.6 // indirect @@ -516,7 +518,6 @@ require ( github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/klauspost/cpuid/v2 v2.2.10 // indirect github.com/moby/sys/user v0.3.0 // indirect - github.com/openai/openai-go v0.1.0-beta.6 // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/samber/lo v1.49.1 // indirect github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect @@ -527,6 +528,5 @@ require ( go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect - google.golang.org/genai v0.7.0 // indirect k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect ) diff --git a/go.sum b/go.sum index fc05152d34122..09bd945ec4898 100644 --- a/go.sum +++ b/go.sum @@ -1467,8 +1467,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kylecarbs/aisdk-go v0.0.5 h1:e4HE/SMBUUZn7AS/luiIYbEtHbbtUBzJS95R6qHDYVE= -github.com/kylecarbs/aisdk-go v0.0.5/go.mod h1:3nAhClwRNo6ZfU44GrBZ8O2fCCrxJdaHb9JIz+P3LR8= +github.com/kylecarbs/aisdk-go v0.0.8 h1:hnKVbLM6U8XqX3t5I26J8k5saXdra595bGt1HP0PvKA= +github.com/kylecarbs/aisdk-go v0.0.8/go.mod h1:3nAhClwRNo6ZfU44GrBZ8O2fCCrxJdaHb9JIz+P3LR8= github.com/kylecarbs/chroma/v2 v2.0.0-20240401211003-9e036e0631f3 h1:Z9/bo5PSeMutpdiKYNt/TTSfGM1Ll0naj3QzYX9VxTc= github.com/kylecarbs/chroma/v2 v2.0.0-20240401211003-9e036e0631f3/go.mod h1:BUGjjsD+ndS6eX37YgTchSEG+Jg9Jv1GiZs9sqPqztk= github.com/kylecarbs/opencensus-go v0.23.1-0.20220307014935-4d0325a68f8b/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= diff --git a/site/src/api/rbacresourcesGenerated.ts b/site/src/api/rbacresourcesGenerated.ts index ffb5b541e3a4a..079dcb4a87a61 100644 --- a/site/src/api/rbacresourcesGenerated.ts +++ b/site/src/api/rbacresourcesGenerated.ts @@ -31,6 +31,12 @@ export const RBACResourceActions: Partial< create: "create new audit log entries", read: "read audit logs", }, + chat: { + create: "create a chat", + delete: "delete a chat", + read: "read a chat", + update: "update a chat", + }, crypto_key: { create: "create crypto keys", delete: "delete crypto keys", diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index d879c09d119b2..b1fcb296de4e8 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -6,6 +6,18 @@ export interface ACLAvailable { readonly groups: readonly Group[]; } +// From codersdk/deployment.go +export interface AIConfig { + readonly providers?: readonly AIProviderConfig[]; +} + +// From codersdk/deployment.go +export interface AIProviderConfig { + readonly type: string; + readonly models: readonly string[]; + readonly base_url: string; +} + // From codersdk/apikey.go export interface APIKey { readonly id: string; @@ -291,6 +303,28 @@ export interface ChangePasswordWithOneTimePasscodeRequest { readonly one_time_passcode: string; } +// From codersdk/chat.go +export interface Chat { + readonly id: string; + readonly created_at: string; + readonly updated_at: string; + readonly title: string; +} + +// From codersdk/chat.go +export interface ChatMessage { + readonly id: string; + readonly createdAt?: Record; + readonly content: string; + readonly role: string; + // external type "github.com/kylecarbs/aisdk-go.Part", to include this type the package must be explicitly included in the parsing + readonly parts?: readonly unknown[]; + // empty interface{} type, falling back to unknown + readonly annotations?: readonly unknown[]; + // external type "github.com/kylecarbs/aisdk-go.Attachment", to include this type the package must be explicitly included in the parsing + readonly experimental_attachments?: readonly unknown[]; +} + // From codersdk/client.go export const CoderDesktopTelemetryHeader = "Coder-Desktop-Telemetry"; @@ -312,6 +346,14 @@ export interface ConvertLoginRequest { readonly password: string; } +// From codersdk/chat.go +export interface CreateChatMessageRequest { + readonly model: string; + // embedded anonymous struct, please fix by naming it + readonly message: unknown; + readonly thinking: boolean; +} + // From codersdk/users.go export interface CreateFirstUserRequest { readonly email: string; @@ -677,6 +719,7 @@ export interface DeploymentValues { readonly disable_password_auth?: boolean; readonly support?: SupportConfig; readonly external_auth?: SerpentStruct; + readonly ai?: SerpentStruct; readonly config_ssh?: SSHConfig; readonly wgtunnel_host?: string; readonly disable_owner_workspace_exec?: boolean; @@ -769,6 +812,7 @@ export const EntitlementsWarningHeader = "X-Coder-Entitlements-Warning"; // From codersdk/deployment.go export type Experiment = + | "agentic-chat" | "auto-fill-parameters" | "dynamic-parameters" | "example" @@ -1186,6 +1230,18 @@ export type JobErrorCode = "REQUIRED_TEMPLATE_VARIABLES"; export const JobErrorCodes: JobErrorCode[] = ["REQUIRED_TEMPLATE_VARIABLES"]; +// From codersdk/deployment.go +export interface LanguageModel { + readonly id: string; + readonly display_name: string; + readonly provider: string; +} + +// From codersdk/deployment.go +export interface LanguageModelConfig { + readonly models: readonly LanguageModel[]; +} + // From codersdk/licenses.go export interface License { readonly id: number; @@ -2061,6 +2117,7 @@ export type RBACResource = | "assign_org_role" | "assign_role" | "audit_log" + | "chat" | "crypto_key" | "debug_info" | "deployment_config" @@ -2099,6 +2156,7 @@ export const RBACResources: RBACResource[] = [ "assign_org_role", "assign_role", "audit_log", + "chat", "crypto_key", "debug_info", "deployment_config", From 3be6487f02db25d9ec213a9bf43b7f32c386b3eb Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Fri, 2 May 2025 14:44:01 -0300 Subject: [PATCH 007/706] feat: support GFM alerts in markdown (#17662) Closes https://github.com/coder/coder/issues/17660 Add support to [GFM Alerts](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax#alerts). Screenshot 2025-05-02 at 14 26 36 PS: This was heavily copied from https://github.com/coder/coder-registry/blob/dev/cmd/main/site/src/components/MarkdownView/MarkdownView.tsx --- .../components/Markdown/Markdown.stories.tsx | 21 +++ site/src/components/Markdown/Markdown.tsx | 177 +++++++++++++++++- site/src/index.css | 4 + site/tailwind.config.js | 2 + 4 files changed, 203 insertions(+), 1 deletion(-) diff --git a/site/src/components/Markdown/Markdown.stories.tsx b/site/src/components/Markdown/Markdown.stories.tsx index d4adce530efdf..37a0670c73fdb 100644 --- a/site/src/components/Markdown/Markdown.stories.tsx +++ b/site/src/components/Markdown/Markdown.stories.tsx @@ -74,3 +74,24 @@ export const WithTable: Story = { | cell 1 | cell 2 | 3 | 4 | `, }, }; + +export const GFMAlerts: Story = { + args: { + children: ` +> [!NOTE] +> Useful information that users should know, even when skimming content. + +> [!TIP] +> Helpful advice for doing things better or more easily. + +> [!IMPORTANT] +> Key information users need to know to achieve their goal. + +> [!WARNING] +> Urgent info that needs immediate user attention to avoid problems. + +> [!CAUTION] +> Advises about risks or negative outcomes of certain actions. + `, + }, +}; diff --git a/site/src/components/Markdown/Markdown.tsx b/site/src/components/Markdown/Markdown.tsx index a9bac7c6ad43a..b68919dce51f8 100644 --- a/site/src/components/Markdown/Markdown.tsx +++ b/site/src/components/Markdown/Markdown.tsx @@ -8,12 +8,20 @@ import { TableRow, } from "components/Table/Table"; import isEqual from "lodash/isEqual"; -import { type FC, memo } from "react"; +import { + type FC, + type HTMLProps, + type ReactElement, + type ReactNode, + isValidElement, + memo, +} from "react"; import ReactMarkdown, { type Options } from "react-markdown"; import { Prism as SyntaxHighlighter } from "react-syntax-highlighter"; import { dracula } from "react-syntax-highlighter/dist/cjs/styles/prism"; import gfm from "remark-gfm"; import colors from "theme/tailwindColors"; +import { cn } from "utils/cn"; interface MarkdownProps { /** @@ -114,6 +122,30 @@ export const Markdown: FC = (props) => { return {children}; }, + /** + * 2025-02-10 - The RemarkGFM plugin that we use currently doesn't have + * support for special alert messages like this: + * ``` + * > [!IMPORTANT] + * > This module will only work with Git versions >=2.34, and... + * ``` + * Have to intercept all blockquotes and see if their content is + * formatted like an alert. + */ + blockquote: (parseProps) => { + const { node: _node, children, ...renderProps } = parseProps; + const alertContent = parseChildrenAsAlertContent(children); + if (alertContent === null) { + return
{children}
; + } + + return ( + + {alertContent.children} + + ); + }, + ...components, }} > @@ -197,6 +229,149 @@ export const InlineMarkdown: FC = (props) => { export const MemoizedMarkdown = memo(Markdown, isEqual); export const MemoizedInlineMarkdown = memo(InlineMarkdown, isEqual); +const githubFlavoredMarkdownAlertTypes = [ + "tip", + "note", + "important", + "warning", + "caution", +]; + +type AlertContent = Readonly<{ + type: string; + children: readonly ReactNode[]; +}>; + +function parseChildrenAsAlertContent( + jsxChildren: ReactNode, +): AlertContent | null { + // Have no idea why the plugin parses the data by mixing node types + // like this. Have to do a good bit of nested filtering. + if (!Array.isArray(jsxChildren)) { + return null; + } + + const mainParentNode = jsxChildren.find((node): node is ReactElement => + isValidElement(node), + ); + let parentChildren = mainParentNode?.props.children; + if (typeof parentChildren === "string") { + // Children will only be an array if the parsed text contains other + // content that can be turned into HTML. If there aren't any, you + // just get one big string + parentChildren = parentChildren.split("\n"); + } + if (!Array.isArray(parentChildren)) { + return null; + } + + const outputContent = parentChildren + .filter((el) => { + if (isValidElement(el)) { + return true; + } + return typeof el === "string" && el !== "\n"; + }) + .map((el) => { + if (!isValidElement(el)) { + return el; + } + if (el.type !== "a") { + return el; + } + + const recastProps = el.props as Record & { + children?: ReactNode; + }; + if (recastProps.target === "_blank") { + return el; + } + + return { + ...el, + props: { + ...recastProps, + target: "_blank", + children: ( + <> + {recastProps.children} + (link opens in new tab) + + ), + }, + }; + }); + const [firstEl, ...remainingChildren] = outputContent; + if (typeof firstEl !== "string") { + return null; + } + + const alertType = firstEl + .trim() + .toLowerCase() + .replace("!", "") + .replace("[", "") + .replace("]", ""); + if (!githubFlavoredMarkdownAlertTypes.includes(alertType)) { + return null; + } + + const hasLeadingLinebreak = + isValidElement(remainingChildren[0]) && remainingChildren[0].type === "br"; + if (hasLeadingLinebreak) { + remainingChildren.shift(); + } + + return { + type: alertType, + children: remainingChildren, + }; +} + +type MarkdownGfmAlertProps = Readonly< + HTMLProps & { + alertType: string; + } +>; + +const MarkdownGfmAlert: FC = ({ + alertType, + children, + ...delegatedProps +}) => { + return ( +
+ +
+ ); +}; + const markdownStyles: Interpolation = (theme: Theme) => ({ fontSize: 16, lineHeight: "24px", diff --git a/site/src/index.css b/site/src/index.css index e2b71d7be6516..f3bf0918ddb3a 100644 --- a/site/src/index.css +++ b/site/src/index.css @@ -29,6 +29,7 @@ --surface-orange: 34 100% 92%; --surface-sky: 201 94% 86%; --surface-red: 0 93% 94%; + --surface-purple: 251 91% 95%; --border-default: 240 6% 90%; --border-success: 142 76% 36%; --border-warning: 30.66, 97.16%, 72.35%; @@ -41,6 +42,7 @@ --highlight-green: 143 64% 24%; --highlight-grey: 240 5% 65%; --highlight-sky: 201 90% 27%; + --highlight-red: 0 74% 42%; --border: 240 5.9% 90%; --input: 240 5.9% 90%; --ring: 240 10% 3.9%; @@ -69,6 +71,7 @@ --surface-orange: 13 81% 15%; --surface-sky: 204 80% 16%; --surface-red: 0 75% 15%; + --surface-purple: 261 73% 23%; --border-default: 240 4% 16%; --border-success: 142 76% 36%; --border-warning: 30.66, 97.16%, 72.35%; @@ -80,6 +83,7 @@ --highlight-green: 141 79% 85%; --highlight-grey: 240 4% 46%; --highlight-sky: 198 93% 60%; + --highlight-red: 0 91% 71%; --border: 240 3.7% 15.9%; --input: 240 3.7% 15.9%; --ring: 240 4.9% 83.9%; diff --git a/site/tailwind.config.js b/site/tailwind.config.js index d2935698e5d9e..e4b40aa1773f9 100644 --- a/site/tailwind.config.js +++ b/site/tailwind.config.js @@ -53,6 +53,7 @@ module.exports = { orange: "hsl(var(--surface-orange))", sky: "hsl(var(--surface-sky))", red: "hsl(var(--surface-red))", + purple: "hsl(var(--surface-purple))", }, border: { DEFAULT: "hsl(var(--border-default))", @@ -69,6 +70,7 @@ module.exports = { green: "hsl(var(--highlight-green))", grey: "hsl(var(--highlight-grey))", sky: "hsl(var(--highlight-sky))", + red: "hsl(var(--highlight-red))", }, }, keyframes: { From 82fdb6a6ae5af47aa931cc5d29efde5217ccd619 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Fri, 2 May 2025 14:44:13 -0300 Subject: [PATCH 008/706] fix: fix size for non-squared app icons (#17663) **Before:** ![image](https://github.com/user-attachments/assets/e7544b00-24b0-405c-b763-49a9a009c1d2) **After:** Screenshot 2025-05-02 at 14 36 19 --- site/src/modules/resources/AgentButton.tsx | 3 ++- .../modules/resources/AppLink/AppLink.stories.tsx | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/site/src/modules/resources/AgentButton.tsx b/site/src/modules/resources/AgentButton.tsx index 580358abdd73d..2f772e4f8e0ca 100644 --- a/site/src/modules/resources/AgentButton.tsx +++ b/site/src/modules/resources/AgentButton.tsx @@ -19,7 +19,8 @@ export const AgentButton = forwardRef( "& .MuiButton-startIcon, & .MuiButton-endIcon": { width: 16, height: 16, - "& svg": { width: "100%", height: "100%" }, + + "& svg, & img": { width: "100%", height: "100%" }, }, })} > diff --git a/site/src/modules/resources/AppLink/AppLink.stories.tsx b/site/src/modules/resources/AppLink/AppLink.stories.tsx index db6fbf02c69da..94cb0e2010b66 100644 --- a/site/src/modules/resources/AppLink/AppLink.stories.tsx +++ b/site/src/modules/resources/AppLink/AppLink.stories.tsx @@ -62,6 +62,19 @@ export const WithIcon: Story = { }, }; +export const WithNonSquaredIcon: Story = { + args: { + workspace: MockWorkspace, + app: { + ...MockWorkspaceApp, + icon: "/icon/windsurf.svg", + sharing_level: "owner", + health: "healthy", + }, + agent: MockWorkspaceAgent, + }, +}; + export const ExternalApp: Story = { args: { workspace: MockWorkspace, From a646478aed63996d5257e425ffd56318eda91457 Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Mon, 5 May 2025 11:54:18 +0200 Subject: [PATCH 009/706] fix: move pubsub publishing out of database transactions to avoid conn exhaustion (#17648) Database transactions hold onto connections, and `pubsub.Publish` tries to acquire a connection of its own. If the latter is called within a transaction, this can lead to connection exhaustion. I plan two follow-ups to this PR: 1. Make connection counts tuneable https://github.com/coder/coder/blob/main/cli/server.go#L2360-L2376 We will then be able to write tests showing how connection exhaustion occurs. 2. Write a linter/ruleguard to prevent `pubsub.Publish` from being called within a transaction. --------- Signed-off-by: Danny Kopping --- enterprise/coderd/prebuilds/reconcile.go | 61 ++++-- enterprise/coderd/prebuilds/reconcile_test.go | 198 ++++++++++-------- 2 files changed, 156 insertions(+), 103 deletions(-) diff --git a/enterprise/coderd/prebuilds/reconcile.go b/enterprise/coderd/prebuilds/reconcile.go index 5639678c1b9db..c31da695637ba 100644 --- a/enterprise/coderd/prebuilds/reconcile.go +++ b/enterprise/coderd/prebuilds/reconcile.go @@ -40,10 +40,11 @@ type StoreReconciler struct { registerer prometheus.Registerer metrics *MetricsCollector - cancelFn context.CancelCauseFunc - running atomic.Bool - stopped atomic.Bool - done chan struct{} + cancelFn context.CancelCauseFunc + running atomic.Bool + stopped atomic.Bool + done chan struct{} + provisionNotifyCh chan database.ProvisionerJob } var _ prebuilds.ReconciliationOrchestrator = &StoreReconciler{} @@ -56,13 +57,14 @@ func NewStoreReconciler(store database.Store, registerer prometheus.Registerer, ) *StoreReconciler { reconciler := &StoreReconciler{ - store: store, - pubsub: ps, - logger: logger, - cfg: cfg, - clock: clock, - registerer: registerer, - done: make(chan struct{}, 1), + store: store, + pubsub: ps, + logger: logger, + cfg: cfg, + clock: clock, + registerer: registerer, + done: make(chan struct{}, 1), + provisionNotifyCh: make(chan database.ProvisionerJob, 10), } reconciler.metrics = NewMetricsCollector(store, logger, reconciler) @@ -100,6 +102,29 @@ func (c *StoreReconciler) Run(ctx context.Context) { // NOTE: without this atomic bool, Stop might race with Run for the c.cancelFn above. c.running.Store(true) + // Publish provisioning jobs outside of database transactions. + // A connection is held while a database transaction is active; PGPubsub also tries to acquire a new connection on + // Publish, so we can exhaust available connections. + // + // A single worker dequeues from the channel, which should be sufficient. + // If any messages are missed due to congestion or errors, provisionerdserver has a backup polling mechanism which + // will periodically pick up any queued jobs (see poll(time.Duration) in coderd/provisionerdserver/acquirer.go). + go func() { + for { + select { + case <-c.done: + return + case <-ctx.Done(): + return + case job := <-c.provisionNotifyCh: + err := provisionerjobs.PostJob(c.pubsub, job) + if err != nil { + c.logger.Error(ctx, "failed to post provisioner job to pubsub", slog.Error(err)) + } + } + } + }() + for { select { // TODO: implement pubsub listener to allow reconciling a specific template imperatively once it has been changed, @@ -576,10 +601,16 @@ func (c *StoreReconciler) provision( return xerrors.Errorf("provision workspace: %w", err) } - err = provisionerjobs.PostJob(c.pubsub, *provisionerJob) - if err != nil { - // Client probably doesn't care about this error, so just log it. - c.logger.Error(ctx, "failed to post provisioner job to pubsub", slog.Error(err)) + if provisionerJob == nil { + return nil + } + + // Publish provisioner job event outside of transaction. + select { + case c.provisionNotifyCh <- *provisionerJob: + default: // channel full, drop the message; provisioner will pick this job up later with its periodic check, though. + c.logger.Warn(ctx, "provisioner job notification queue full, dropping", + slog.F("job_id", provisionerJob.ID), slog.F("prebuild_id", prebuildID.String())) } c.logger.Info(ctx, "prebuild job scheduled", slog.F("transition", transition), diff --git a/enterprise/coderd/prebuilds/reconcile_test.go b/enterprise/coderd/prebuilds/reconcile_test.go index a1732c8391d11..a1666134a7965 100644 --- a/enterprise/coderd/prebuilds/reconcile_test.go +++ b/enterprise/coderd/prebuilds/reconcile_test.go @@ -9,6 +9,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" + "golang.org/x/xerrors" "github.com/coder/coder/v2/coderd/database/dbtime" "github.com/coder/coder/v2/coderd/util/slice" @@ -303,100 +304,106 @@ func TestPrebuildReconciliation(t *testing.T) { for _, prebuildLatestTransition := range tc.prebuildLatestTransitions { for _, prebuildJobStatus := range tc.prebuildJobStatuses { for _, templateDeleted := range tc.templateDeleted { - t.Run(fmt.Sprintf("%s - %s - %s", tc.name, prebuildLatestTransition, prebuildJobStatus), func(t *testing.T) { - t.Parallel() - t.Cleanup(func() { - if t.Failed() { - t.Logf("failed to run test: %s", tc.name) - t.Logf("templateVersionActive: %t", templateVersionActive) - t.Logf("prebuildLatestTransition: %s", prebuildLatestTransition) - t.Logf("prebuildJobStatus: %s", prebuildJobStatus) + for _, useBrokenPubsub := range []bool{true, false} { + t.Run(fmt.Sprintf("%s - %s - %s - pubsub_broken=%v", tc.name, prebuildLatestTransition, prebuildJobStatus, useBrokenPubsub), func(t *testing.T) { + t.Parallel() + t.Cleanup(func() { + if t.Failed() { + t.Logf("failed to run test: %s", tc.name) + t.Logf("templateVersionActive: %t", templateVersionActive) + t.Logf("prebuildLatestTransition: %s", prebuildLatestTransition) + t.Logf("prebuildJobStatus: %s", prebuildJobStatus) + } + }) + clock := quartz.NewMock(t) + ctx := testutil.Context(t, testutil.WaitShort) + cfg := codersdk.PrebuildsConfig{} + logger := slogtest.Make( + t, &slogtest.Options{IgnoreErrors: true}, + ).Leveled(slog.LevelDebug) + db, pubSub := dbtestutil.NewDB(t) + + ownerID := uuid.New() + dbgen.User(t, db, database.User{ + ID: ownerID, + }) + org, template := setupTestDBTemplate(t, db, ownerID, templateDeleted) + templateVersionID := setupTestDBTemplateVersion( + ctx, + t, + clock, + db, + pubSub, + org.ID, + ownerID, + template.ID, + ) + preset := setupTestDBPreset( + t, + db, + templateVersionID, + 1, + uuid.New().String(), + ) + prebuild := setupTestDBPrebuild( + t, + clock, + db, + pubSub, + prebuildLatestTransition, + prebuildJobStatus, + org.ID, + preset, + template.ID, + templateVersionID, + ) + + if !templateVersionActive { + // Create a new template version and mark it as active + // This marks the template version that we care about as inactive + setupTestDBTemplateVersion(ctx, t, clock, db, pubSub, org.ID, ownerID, template.ID) } - }) - clock := quartz.NewMock(t) - ctx := testutil.Context(t, testutil.WaitShort) - cfg := codersdk.PrebuildsConfig{} - logger := slogtest.Make( - t, &slogtest.Options{IgnoreErrors: true}, - ).Leveled(slog.LevelDebug) - db, pubSub := dbtestutil.NewDB(t) - controller := prebuilds.NewStoreReconciler(db, pubSub, cfg, logger, quartz.NewMock(t), prometheus.NewRegistry()) - - ownerID := uuid.New() - dbgen.User(t, db, database.User{ - ID: ownerID, - }) - org, template := setupTestDBTemplate(t, db, ownerID, templateDeleted) - templateVersionID := setupTestDBTemplateVersion( - ctx, - t, - clock, - db, - pubSub, - org.ID, - ownerID, - template.ID, - ) - preset := setupTestDBPreset( - t, - db, - templateVersionID, - 1, - uuid.New().String(), - ) - prebuild := setupTestDBPrebuild( - t, - clock, - db, - pubSub, - prebuildLatestTransition, - prebuildJobStatus, - org.ID, - preset, - template.ID, - templateVersionID, - ) - - if !templateVersionActive { - // Create a new template version and mark it as active - // This marks the template version that we care about as inactive - setupTestDBTemplateVersion(ctx, t, clock, db, pubSub, org.ID, ownerID, template.ID) - } - - // Run the reconciliation multiple times to ensure idempotency - // 8 was arbitrary, but large enough to reasonably trust the result - for i := 1; i <= 8; i++ { - require.NoErrorf(t, controller.ReconcileAll(ctx), "failed on iteration %d", i) - - if tc.shouldCreateNewPrebuild != nil { - newPrebuildCount := 0 - workspaces, err := db.GetWorkspacesByTemplateID(ctx, template.ID) - require.NoError(t, err) - for _, workspace := range workspaces { - if workspace.ID != prebuild.ID { - newPrebuildCount++ + + if useBrokenPubsub { + pubSub = &brokenPublisher{Pubsub: pubSub} + } + controller := prebuilds.NewStoreReconciler(db, pubSub, cfg, logger, quartz.NewMock(t), prometheus.NewRegistry()) + + // Run the reconciliation multiple times to ensure idempotency + // 8 was arbitrary, but large enough to reasonably trust the result + for i := 1; i <= 8; i++ { + require.NoErrorf(t, controller.ReconcileAll(ctx), "failed on iteration %d", i) + + if tc.shouldCreateNewPrebuild != nil { + newPrebuildCount := 0 + workspaces, err := db.GetWorkspacesByTemplateID(ctx, template.ID) + require.NoError(t, err) + for _, workspace := range workspaces { + if workspace.ID != prebuild.ID { + newPrebuildCount++ + } } + // This test configures a preset that desires one prebuild. + // In cases where new prebuilds should be created, there should be exactly one. + require.Equal(t, *tc.shouldCreateNewPrebuild, newPrebuildCount == 1) } - // This test configures a preset that desires one prebuild. - // In cases where new prebuilds should be created, there should be exactly one. - require.Equal(t, *tc.shouldCreateNewPrebuild, newPrebuildCount == 1) - } - if tc.shouldDeleteOldPrebuild != nil { - builds, err := db.GetWorkspaceBuildsByWorkspaceID(ctx, database.GetWorkspaceBuildsByWorkspaceIDParams{ - WorkspaceID: prebuild.ID, - }) - require.NoError(t, err) - if *tc.shouldDeleteOldPrebuild { - require.Equal(t, 2, len(builds)) - require.Equal(t, database.WorkspaceTransitionDelete, builds[0].Transition) - } else { - require.Equal(t, 1, len(builds)) - require.Equal(t, prebuildLatestTransition, builds[0].Transition) + if tc.shouldDeleteOldPrebuild != nil { + builds, err := db.GetWorkspaceBuildsByWorkspaceID(ctx, database.GetWorkspaceBuildsByWorkspaceIDParams{ + WorkspaceID: prebuild.ID, + }) + require.NoError(t, err) + if *tc.shouldDeleteOldPrebuild { + require.Equal(t, 2, len(builds)) + require.Equal(t, database.WorkspaceTransitionDelete, builds[0].Transition) + } else { + require.Equal(t, 1, len(builds)) + require.Equal(t, prebuildLatestTransition, builds[0].Transition) + } } } - } - }) + }) + } } } } @@ -404,6 +411,21 @@ func TestPrebuildReconciliation(t *testing.T) { } } +// brokenPublisher is used to validate that Publish() calls which always fail do not affect the reconciler's behavior, +// since the messages published are not essential but merely advisory. +type brokenPublisher struct { + pubsub.Pubsub +} + +// Publish deliberately fails. +// I'm explicitly _not_ checking for EventJobPosted (coderd/database/provisionerjobs/provisionerjobs.go) since that +// requires too much knowledge of the underlying implementation. +func (*brokenPublisher) Publish(event string, _ []byte) error { + // Mimick some work being done. + <-time.After(testutil.IntervalFast) + return xerrors.Errorf("failed to publish %q", event) +} + func TestMultiplePresetsPerTemplateVersion(t *testing.T) { t.Parallel() From 87f453535758bd505722b6954f31ccdc844deb89 Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Mon, 5 May 2025 14:26:30 +0200 Subject: [PATCH 010/706] chore: optimize CI setup time on Windows (#17666) This PR focuses on optimizing go-test CI times on Windows. It: - backs the `$RUNNER_TEMP` directory with a RAM disk. This directory is used by actions like cache, setup-go, and setup-terraform as a staging area - backs `GOCACHE`, `GOMODCACHE`, and `GOPATH` with a RAM disk - backs `$GITHUB_WORKSPACE` with a RAM disk - that's where the repository is checked out - uses preinstalled Go on Windows runners - starts using the depot Windows runner From what I've seen, these changes bring test times down to be on par with Linux and macOS. The biggest improvement comes from backing frequently accessed paths with RAM disks. The C drive is surprisingly slow - I ran some performance tests with [fio](https://fio.readthedocs.io/en/latest/fio_doc.html#) where I tested IOPS on many small files, and the RAM disk was 100x faster. Additionally, the depot runners seem to have more consistent performance than the ones provided by GitHub. --- .github/actions/setup-go/action.yaml | 29 ++++++++++++++++++++++++++-- .github/workflows/ci.yaml | 16 ++++++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-go/action.yaml b/.github/actions/setup-go/action.yaml index 76b7c5d87d206..e13e019554a39 100644 --- a/.github/actions/setup-go/action.yaml +++ b/.github/actions/setup-go/action.yaml @@ -5,17 +5,42 @@ inputs: version: description: "The Go version to use." default: "1.24.2" + use-preinstalled-go: + description: "Whether to use preinstalled Go." + default: "false" + use-temp-cache-dirs: + description: "Whether to use temporary GOCACHE and GOMODCACHE directories." + default: "false" runs: using: "composite" steps: + - name: Override GOCACHE and GOMODCACHE + shell: bash + if: inputs.use-temp-cache-dirs == 'true' + run: | + # cd to another directory to ensure we're not inside a Go project. + # That'd trigger Go to download the toolchain for that project. + cd "$RUNNER_TEMP" + # RUNNER_TEMP should be backed by a RAM disk on Windows if + # coder/setup-ramdisk-action was used + export GOCACHE_DIR="$RUNNER_TEMP""\go-cache" + export GOMODCACHE_DIR="$RUNNER_TEMP""\go-mod-cache" + export GOPATH_DIR="$RUNNER_TEMP""\go-path" + mkdir -p "$GOCACHE_DIR" + mkdir -p "$GOMODCACHE_DIR" + mkdir -p "$GOPATH_DIR" + go env -w GOCACHE="$GOCACHE_DIR" + go env -w GOMODCACHE="$GOMODCACHE_DIR" + go env -w GOPATH="$GOPATH_DIR" + - name: Setup Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: ${{ inputs.version }} + go-version: ${{ inputs.use-preinstalled-go == 'false' && inputs.version || '' }} - name: Install gotestsum shell: bash - run: go install gotest.tools/gotestsum@latest + run: go install gotest.tools/gotestsum@3f7ff0ec4aeb6f95f5d67c998b71f272aa8a8b41 # v1.12.1 # It isn't necessary that we ever do this, but it helps # separate the "setup" from the "run" times. diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cb1260f2ee767..625e6a82673e1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -313,7 +313,7 @@ jobs: run: ./scripts/check_unstaged.sh test-go: - runs-on: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || matrix.os == 'macos-latest' && github.repository_owner == 'coder' && 'depot-macos-latest' || matrix.os == 'windows-2022' && github.repository_owner == 'coder' && 'windows-latest-16-cores' || matrix.os }} + runs-on: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || matrix.os == 'macos-latest' && github.repository_owner == 'coder' && 'depot-macos-latest' || matrix.os == 'windows-2022' && github.repository_owner == 'coder' && 'depot-windows-2022-16' || matrix.os }} needs: changes if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main' timeout-minutes: 20 @@ -326,10 +326,18 @@ jobs: - windows-2022 steps: - name: Harden Runner + # Harden Runner is only supported on Ubuntu runners. + if: runner.os == 'Linux' uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0 with: egress-policy: audit + # Set up RAM disks to speed up the rest of the job. This action is in + # a separate repository to allow its use before actions/checkout. + - name: Setup RAM Disks + if: runner.os == 'Windows' + uses: coder/setup-ramdisk-action@79dacfe70c47ad6d6c0dd7f45412368802641439 + - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -337,6 +345,12 @@ jobs: - name: Setup Go uses: ./.github/actions/setup-go + with: + # Runners have Go baked-in and Go will automatically + # download the toolchain configured in go.mod, so we don't + # need to reinstall it. It's faster on Windows runners. + use-preinstalled-go: ${{ runner.os == 'Windows' }} + use-temp-cache-dirs: ${{ runner.os == 'Windows' }} - name: Setup Terraform uses: ./.github/actions/setup-tf From dc66dafc7cb0e7c4aab90f6396793543093d1d88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 12:37:32 +0000 Subject: [PATCH 011/706] chore: bump github.com/mark3labs/mcp-go from 0.23.1 to 0.25.0 (#17672) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/mark3labs/mcp-go](https://github.com/mark3labs/mcp-go) from 0.23.1 to 0.25.0.
Release notes

Sourced from github.com/mark3labs/mcp-go's releases.

Release v0.25.0

What's Changed

New Contributors

Full Changelog: https://github.com/mark3labs/mcp-go/compare/v0.24.1...v0.25.0

Release v0.24.1

What's Changed

Full Changelog: https://github.com/mark3labs/mcp-go/compare/v0.24.0...v0.24.1

Release v0.24.0

What's Changed

New Contributors

... (truncated)

Commits
  • eadd702 Format
  • 4a1010e feat(server/sse): Add support for dynamic base paths (#214)
  • cfeb0ee feat: quick return tool-call request, send response via SSE in goroutine (#163)
  • d352118 feat(SSEServer): add WithAppendQueryToMessageEndpoint() (#136)
  • df5f67e [chore][client] Add ability to override the http.Client (#109)
  • ddb59dd fix: handle nil rawMessage in response parsing functions (#218)
  • f0a648b fix(SSE): only initialize http.Server when not set (#229)
  • ffc63d9 Add Accept header (#230)
  • ae96a68 fix: update doc comments to match Go conventions (#226)
  • df73667 fix(client/test): verify mock server binary exists after compilation (#215)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/mark3labs/mcp-go&package-manager=go_modules&previous-version=0.23.1&new-version=0.25.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ce41f23e02e05..7cc6f7c96f1fc 100644 --- a/go.mod +++ b/go.mod @@ -491,7 +491,7 @@ require ( github.com/coder/preview v0.0.1 github.com/fsnotify/fsnotify v1.9.0 github.com/kylecarbs/aisdk-go v0.0.8 - github.com/mark3labs/mcp-go v0.23.1 + github.com/mark3labs/mcp-go v0.25.0 github.com/openai/openai-go v0.1.0-beta.6 google.golang.org/genai v0.7.0 ) diff --git a/go.sum b/go.sum index 09bd945ec4898..2ce394881aa40 100644 --- a/go.sum +++ b/go.sum @@ -1501,8 +1501,8 @@ github.com/makeworld-the-better-one/dither/v2 v2.4.0 h1:Az/dYXiTcwcRSe59Hzw4RI1r github.com/makeworld-the-better-one/dither/v2 v2.4.0/go.mod h1:VBtN8DXO7SNtyGmLiGA7IsFeKrBkQPze1/iAeM95arc= github.com/marekm4/color-extractor v1.2.1 h1:3Zb2tQsn6bITZ8MBVhc33Qn1k5/SEuZ18mrXGUqIwn0= github.com/marekm4/color-extractor v1.2.1/go.mod h1:90VjmiHI6M8ez9eYUaXLdcKnS+BAOp7w+NpwBdkJmpA= -github.com/mark3labs/mcp-go v0.23.1 h1:RzTzZ5kJ+HxwnutKA4rll8N/pKV6Wh5dhCmiJUu5S9I= -github.com/mark3labs/mcp-go v0.23.1/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4= +github.com/mark3labs/mcp-go v0.25.0 h1:UUpcMT3L5hIhuDy7aifj4Bphw4Pfx1Rf8mzMXDe8RQw= +github.com/mark3labs/mcp-go v0.25.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= From 1f569f71f8673812f1daadbcd6ffc263390bd68d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 12:37:45 +0000 Subject: [PATCH 012/706] chore: bump google.golang.org/api from 0.230.0 to 0.231.0 (#17671) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.230.0 to 0.231.0.
Release notes

Sourced from google.golang.org/api's releases.

v0.231.0

0.231.0 (2025-04-29)

Features

Changelog

Sourced from google.golang.org/api's changelog.

0.231.0 (2025-04-29)

Features

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=google.golang.org/api&package-manager=go_modules&previous-version=0.230.0&new-version=0.231.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 7cc6f7c96f1fc..2e67bf024cbd7 100644 --- a/go.mod +++ b/go.mod @@ -206,7 +206,7 @@ require ( golang.org/x/text v0.24.0 // indirect golang.org/x/tools v0.32.0 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da - google.golang.org/api v0.230.0 + google.golang.org/api v0.231.0 google.golang.org/grpc v1.72.0 google.golang.org/protobuf v1.36.6 gopkg.in/DataDog/dd-trace-go.v1 v1.72.1 @@ -219,7 +219,7 @@ require ( ) require ( - cloud.google.com/go/auth v0.16.0 // indirect + cloud.google.com/go/auth v0.16.1 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect cloud.google.com/go/logging v1.13.0 // indirect cloud.google.com/go/longrunning v0.6.4 // indirect @@ -466,7 +466,7 @@ require ( google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect howett.net/plist v1.0.0 // indirect diff --git a/go.sum b/go.sum index 2ce394881aa40..4f1481930c552 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVo cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo= cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0= cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E= -cloud.google.com/go/auth v0.16.0 h1:Pd8P1s9WkcrBE2n/PhAwKsdrR35V3Sg2II9B+ndM3CU= -cloud.google.com/go/auth v0.16.0/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI= +cloud.google.com/go/auth v0.16.1 h1:XrXauHMd30LhQYVRHLGvJiYeczweKQXZxsTbV9TiguU= +cloud.google.com/go/auth v0.16.1/go.mod h1:1howDHJ5IETh/LwYs3ZxvlkXF48aSqqJUM+5o02dNOI= cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc= cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= @@ -2478,8 +2478,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= -google.golang.org/api v0.230.0 h1:2u1hni3E+UXAXrONrrkfWpi/V6cyKVAbfGVeGtC3OxM= -google.golang.org/api v0.230.0/go.mod h1:aqvtoMk7YkiXx+6U12arQFExiRV9D/ekvMCwCd/TksQ= +google.golang.org/api v0.231.0 h1:LbUD5FUl0C4qwia2bjXhCMH65yz1MLPzA/0OYEsYY7Q= +google.golang.org/api v0.231.0/go.mod h1:H52180fPI/QQlUc0F4xWfGZILdv09GCWKt2bcsn164A= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2624,8 +2624,8 @@ google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb h1:ITgPrl429bc6+2Z google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:sAo5UzpjUwgFBCzupwhcLcxHVDK7vG5IqI30YnwX2eE= google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950= google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e h1:ztQaXfzEXTmCBvbtWYRhJxW+0iJcz2qXfd38/e9l7bA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250414145226-207652e42e2e/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 h1:29cjnHVylHwTzH66WfFZqgSQgnxzvWE+jvBwpZCLRxY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= From b8137e7ca40a5638b7a79cdd6a6b3312f10924e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 12:54:22 +0000 Subject: [PATCH 013/706] chore: bump github.com/openai/openai-go from 0.1.0-beta.6 to 0.1.0-beta.10 (#17677) Bumps [github.com/openai/openai-go](https://github.com/openai/openai-go) from 0.1.0-beta.6 to 0.1.0-beta.10.
Release notes

Sourced from github.com/openai/openai-go's releases.

v0.1.0-beta.10

0.1.0-beta.10 (2025-04-14)

Full Changelog: v0.1.0-beta.9...v0.1.0-beta.10

Chores

  • internal: expand CI branch coverage (#369) (258dda8)
  • internal: reduce CI branch coverage (a2f7c03)

v0.1.0-beta.9

0.1.0-beta.9 (2025-04-09)

Full Changelog: v0.1.0-beta.8...v0.1.0-beta.9

Chores

v0.1.0-beta.8

0.1.0-beta.8 (2025-04-09)

Full Changelog: v0.1.0-beta.7...v0.1.0-beta.8

Features

Chores

v0.1.0-beta.7

0.1.0-beta.7 (2025-04-07)

Full Changelog: v0.1.0-beta.6...v0.1.0-beta.7

Features

  • client: make response union's AsAny method type safe (#352) (1252f56)

Chores

... (truncated)

Changelog

Sourced from github.com/openai/openai-go's changelog.

0.1.0-beta.10 (2025-04-14)

Full Changelog: v0.1.0-beta.9...v0.1.0-beta.10

Chores

  • internal: expand CI branch coverage (#369) (258dda8)
  • internal: reduce CI branch coverage (a2f7c03)

0.1.0-beta.9 (2025-04-09)

Full Changelog: v0.1.0-beta.8...v0.1.0-beta.9

Chores

0.1.0-beta.8 (2025-04-09)

Full Changelog: v0.1.0-beta.7...v0.1.0-beta.8

Features

Chores

0.1.0-beta.7 (2025-04-07)

Full Changelog: v0.1.0-beta.6...v0.1.0-beta.7

Features

  • client: make response union's AsAny method type safe (#352) (1252f56)

Chores

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/openai/openai-go&package-manager=go_modules&previous-version=0.1.0-beta.6&new-version=0.1.0-beta.10)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2e67bf024cbd7..cffcd99d06db8 100644 --- a/go.mod +++ b/go.mod @@ -492,7 +492,7 @@ require ( github.com/fsnotify/fsnotify v1.9.0 github.com/kylecarbs/aisdk-go v0.0.8 github.com/mark3labs/mcp-go v0.25.0 - github.com/openai/openai-go v0.1.0-beta.6 + github.com/openai/openai-go v0.1.0-beta.10 google.golang.org/genai v0.7.0 ) diff --git a/go.sum b/go.sum index 4f1481930c552..4c418e5fd2a02 100644 --- a/go.sum +++ b/go.sum @@ -1613,8 +1613,8 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/open-policy-agent/opa v1.3.0 h1:zVvQvQg+9+FuSRBt4LgKNzJwsWl/c85kD5jPozJTydY= github.com/open-policy-agent/opa v1.3.0/go.mod h1:t9iPNhaplD2qpiBqeudzJtEX3fKHK8zdA29oFvofAHo= -github.com/openai/openai-go v0.1.0-beta.6 h1:JquYDpprfrGnlKvQQg+apy9dQ8R9mIrm+wNvAPp6jCQ= -github.com/openai/openai-go v0.1.0-beta.6/go.mod h1:g461MYGXEXBVdV5SaR/5tNzNbSfwTBBefwc+LlDCK0Y= +github.com/openai/openai-go v0.1.0-beta.10 h1:CknhGXe8aXQMRuqg255PFnWzgRY9nEryMxoNIBBM9tU= +github.com/openai/openai-go v0.1.0-beta.10/go.mod h1:g461MYGXEXBVdV5SaR/5tNzNbSfwTBBefwc+LlDCK0Y= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= From 93a584b7c24cbf223ecef301c6edb0ace367c000 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Mon, 5 May 2025 11:10:50 -0300 Subject: [PATCH 014/706] fix: fix windsurf icon on light theme (#17679) --- site/src/modules/resources/AppLink/BaseIcon.tsx | 3 ++- site/src/theme/externalImages.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/site/src/modules/resources/AppLink/BaseIcon.tsx b/site/src/modules/resources/AppLink/BaseIcon.tsx index 1f2885a49a02f..b768facbdd482 100644 --- a/site/src/modules/resources/AppLink/BaseIcon.tsx +++ b/site/src/modules/resources/AppLink/BaseIcon.tsx @@ -1,5 +1,6 @@ import ComputerIcon from "@mui/icons-material/Computer"; import type { WorkspaceApp } from "api/typesGenerated"; +import { ExternalImage } from "components/ExternalImage/ExternalImage"; import type { FC } from "react"; interface BaseIconProps { @@ -9,7 +10,7 @@ interface BaseIconProps { export const BaseIcon: FC = ({ app, onIconPathError }) => { return app.icon ? ( - {`${app.display_name}([ ["/icon/rust.svg", "monochrome"], ["/icon/terminal.svg", "monochrome"], ["/icon/widgets.svg", "monochrome"], + ["/icon/windsurf.svg", "monochrome"], ]); From 4369765996bb39468d8df146b2b6825932353d86 Mon Sep 17 00:00:00 2001 From: Ethan <39577870+ethanndickson@users.noreply.github.com> Date: Tue, 6 May 2025 00:15:24 +1000 Subject: [PATCH 015/706] test: fix `TestWorkspaceAgentReportStats` flake (#17678) Closes https://github.com/coder/internal/issues/609. As seen in the below logs, the `last_used_at` time was updating, but just to the same value that it was on creation; `dbtime.Now` was called in quick succession. ``` t.go:106: 2025-05-05 12:11:54.166 [info] coderd.workspace_usage_tracker: updated workspaces last_used_at count=1 now="2025-05-05T12:11:54.161329Z" t.go:106: 2025-05-05 12:11:54.172 [debu] coderd: GET host=localhost:50422 path=/api/v2/workspaces/745b7ff3-47f2-4e1a-9452-85ea48ba5c46 proto=HTTP/1.1 remote_addr=127.0.0.1 start="2025-05-05T12:11:54.1669073Z" workspace_name=peaceful_faraday34 requestor_id=b2cf02ae-2181-480b-bb1f-95dc6acb6497 requestor_name=testuser requestor_email="" took=5.2105ms status_code=200 latency_ms=5 params_workspace=745b7ff3-47f2-4e1a-9452-85ea48ba5c46 request_id=7fd5ea90-af7b-4104-91c5-9ca64bc2d5e6 workspaceagentsrpc_test.go:70: Error Trace: C:/actions-runner/coder/coder/coderd/workspaceagentsrpc_test.go:70 Error: Should be true Test: TestWorkspaceAgentReportStats Messages: 2025-05-05 12:11:54.161329 +0000 UTC is not after 2025-05-05 12:11:54.161329 +0000 UTC ``` If we change the initial `LastUsedAt` time to be a time in the past, ticking with a `dbtime.Now` will always update it to a later value. If it never updates, the condition will still fail. --- coderd/workspaceagentsrpc_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/coderd/workspaceagentsrpc_test.go b/coderd/workspaceagentsrpc_test.go index 3f1f1a2b8a764..caea9b39c2f54 100644 --- a/coderd/workspaceagentsrpc_test.go +++ b/coderd/workspaceagentsrpc_test.go @@ -32,6 +32,7 @@ func TestWorkspaceAgentReportStats(t *testing.T) { r := dbfake.WorkspaceBuild(t, db, database.WorkspaceTable{ OrganizationID: user.OrganizationID, OwnerID: user.UserID, + LastUsedAt: dbtime.Now().Add(-time.Minute), }).WithAgent().Do() ac := agentsdk.New(client.URL) From 6b4d3f83bc37a53778762c5e2f2a248d894ca004 Mon Sep 17 00:00:00 2001 From: Hugo Dutka Date: Mon, 5 May 2025 18:49:58 +0200 Subject: [PATCH 016/706] chore: reduce "Upload tests to datadog" times in CI (#17668) This PR speeds up the "Upload tests to datadog" step by downloading the `datadog-ci` binary directly from GitHub releases. Most of the time used to be spent in `npm install`, which consistently timed out on Windows after a minute. [Now it takes 3 seconds](https://github.com/coder/coder/actions/runs/14834976784/job/41644230049?pr=17668#step:10:1). I updated it to version v2.48.0 because v2.21.0 didn't have the artifacts for arm64 macOS. --- .github/actions/upload-datadog/action.yaml | 43 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/.github/actions/upload-datadog/action.yaml b/.github/actions/upload-datadog/action.yaml index 11eecac636636..a2df93ab14b28 100644 --- a/.github/actions/upload-datadog/action.yaml +++ b/.github/actions/upload-datadog/action.yaml @@ -10,6 +10,8 @@ runs: steps: - shell: bash run: | + set -e + owner=${{ github.repository_owner }} echo "owner: $owner" if [[ $owner != "coder" ]]; then @@ -21,8 +23,45 @@ runs: echo "No API key provided, skipping..." exit 0 fi - npm install -g @datadog/datadog-ci@2.21.0 - datadog-ci junit upload --service coder ./gotests.xml \ + + BINARY_VERSION="v2.48.0" + BINARY_HASH_WINDOWS="b7bebb8212403fddb1563bae84ce5e69a70dac11e35eb07a00c9ef7ac9ed65ea" + BINARY_HASH_MACOS="e87c808638fddb21a87a5c4584b68ba802965eb0a593d43959c81f67246bd9eb" + BINARY_HASH_LINUX="5e700c465728fff8313e77c2d5ba1ce19a736168735137e1ddc7c6346ed48208" + + TMP_DIR=$(mktemp -d) + + if [[ "${{ runner.os }}" == "Windows" ]]; then + BINARY_PATH="${TMP_DIR}/datadog-ci.exe" + BINARY_URL="https://github.com/DataDog/datadog-ci/releases/download/${BINARY_VERSION}/datadog-ci_win-x64" + elif [[ "${{ runner.os }}" == "macOS" ]]; then + BINARY_PATH="${TMP_DIR}/datadog-ci" + BINARY_URL="https://github.com/DataDog/datadog-ci/releases/download/${BINARY_VERSION}/datadog-ci_darwin-arm64" + elif [[ "${{ runner.os }}" == "Linux" ]]; then + BINARY_PATH="${TMP_DIR}/datadog-ci" + BINARY_URL="https://github.com/DataDog/datadog-ci/releases/download/${BINARY_VERSION}/datadog-ci_linux-x64" + else + echo "Unsupported OS: ${{ runner.os }}" + exit 1 + fi + + echo "Downloading DataDog CI binary version ${BINARY_VERSION} for ${{ runner.os }}..." + curl -sSL "$BINARY_URL" -o "$BINARY_PATH" + + if [[ "${{ runner.os }}" == "Windows" ]]; then + echo "$BINARY_HASH_WINDOWS $BINARY_PATH" | sha256sum --check + elif [[ "${{ runner.os }}" == "macOS" ]]; then + echo "$BINARY_HASH_MACOS $BINARY_PATH" | shasum -a 256 --check + elif [[ "${{ runner.os }}" == "Linux" ]]; then + echo "$BINARY_HASH_LINUX $BINARY_PATH" | sha256sum --check + fi + + # Make binary executable (not needed for Windows) + if [[ "${{ runner.os }}" != "Windows" ]]; then + chmod +x "$BINARY_PATH" + fi + + "$BINARY_PATH" junit upload --service coder ./gotests.xml \ --tags os:${{runner.os}} --tags runner_name:${{runner.name}} env: DATADOG_API_KEY: ${{ inputs.api-key }} From 4587082fcf84a92bda6413733371373acae2392f Mon Sep 17 00:00:00 2001 From: Jaayden Halko Date: Mon, 5 May 2025 22:13:39 +0100 Subject: [PATCH 017/706] chore: update design of External auth section of CreateWorkspacePage (#17683) contributes to coder/preview#59 Figma: https://www.figma.com/design/SMg6H8VKXnPSkE6h9KPoAD/UX-Presets?node-id=2180-2995&t=RL6ICIf6KUL5YUpB-1 This updates the design of the External authentication section of the create workspace page form for both the existing and the new experimental create workspace pages. Screenshot 2025-05-05 at 18 15 28 --- .../CreateWorkspacePage.test.tsx | 2 +- .../CreateWorkspacePageViewExperimental.tsx | 6 +- .../ExternalAuthButton.tsx | 130 ++++++++++-------- 3 files changed, 73 insertions(+), 65 deletions(-) diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx index b24542b34021d..64deba2116fb1 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx @@ -209,7 +209,7 @@ describe("CreateWorkspacePage", () => { .mockResolvedValue([MockTemplateVersionExternalAuthGithubAuthenticated]); await screen.findByText( - "Authenticated with GitHub", + "Authenticated", {}, { interval: 500, timeout: 5000 }, ); diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx index 1a07596854f8d..6751961e3cb2e 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx @@ -304,7 +304,7 @@ export const CreateWorkspacePageViewExperimental: FC<
{Boolean(error) && } @@ -397,14 +397,14 @@ export const CreateWorkspacePageViewExperimental: FC< {externalAuth && externalAuth.length > 0 && (
-

+

External Authentication

This template uses external services for authentication.

-
+
{Boolean(error) && !hasAllRequiredExternalAuth && ( To create a workspace using this template, please connect to diff --git a/site/src/pages/CreateWorkspacePage/ExternalAuthButton.tsx b/site/src/pages/CreateWorkspacePage/ExternalAuthButton.tsx index 427c62b7bdf93..9a647b507947e 100644 --- a/site/src/pages/CreateWorkspacePage/ExternalAuthButton.tsx +++ b/site/src/pages/CreateWorkspacePage/ExternalAuthButton.tsx @@ -1,11 +1,15 @@ -import ReplayIcon from "@mui/icons-material/Replay"; -import LoadingButton from "@mui/lab/LoadingButton"; -import Button from "@mui/material/Button"; -import Tooltip from "@mui/material/Tooltip"; -import { visuallyHidden } from "@mui/utils"; import type { TemplateVersionExternalAuth } from "api/typesGenerated"; +import { Badge } from "components/Badge/Badge"; +import { Button } from "components/Button/Button"; import { ExternalImage } from "components/ExternalImage/ExternalImage"; -import { Pill } from "components/Pill/Pill"; +import { Spinner } from "components/Spinner/Spinner"; +import { + Tooltip, + TooltipContent, + TooltipProvider, + TooltipTrigger, +} from "components/Tooltip/Tooltip"; +import { Check, Redo } from "lucide-react"; import type { FC } from "react"; export interface ExternalAuthButtonProps { @@ -24,62 +28,66 @@ export const ExternalAuthButton: FC = ({ error, }) => { return ( - <> -
- - ) - } - disabled={auth.authenticated} - onClick={() => { - window.open( - auth.authenticate_url, - "_blank", - "width=900,height=600", - ); - onStartPolling(); - }} - > - {auth.authenticated ? ( - `Authenticated with ${auth.display_name}` - ) : ( - <> - Login with {auth.display_name} - {!auth.optional && ( - - Required - - )} - - )} - +
+ + {auth.display_icon && ( + + )} +

{auth.display_name}

+ {!auth.optional && ( + + Required + + )} + + + + {auth.authenticated ? ( + <> + +

+ Authenticated +

+ + ) : ( + + )} - {displayRetry && ( - - - + {displayRetry && !auth.authenticated && ( + + + + + + + Retry login with {auth.display_name} + + + )} -
- + +
); }; From ec003b7cf9c2c041fd401dc7d662084d280b9be5 Mon Sep 17 00:00:00 2001 From: Jaayden Halko Date: Tue, 6 May 2025 11:40:31 +0100 Subject: [PATCH 018/706] fix: update default value handling for dynamic defaults (#17609) resolves coder/preview#102 --- .../DynamicParameter/DynamicParameter.tsx | 89 +++++++++++-------- .../CreateWorkspacePageViewExperimental.tsx | 20 +++-- 2 files changed, 68 insertions(+), 41 deletions(-) diff --git a/site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx b/site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx index d023bbcf4446b..9ec69158c4e84 100644 --- a/site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx +++ b/site/src/modules/workspaces/DynamicParameter/DynamicParameter.tsx @@ -32,7 +32,7 @@ import { TooltipTrigger, } from "components/Tooltip/Tooltip"; import { Info, Settings, TriangleAlert } from "lucide-react"; -import { type FC, useId } from "react"; +import { type FC, useEffect, useId, useState } from "react"; import type { AutofillBuildParameter } from "utils/richParameters"; import * as Yup from "yup"; @@ -164,14 +164,18 @@ const ParameterField: FC = ({ id, }) => { const value = validValue(parameter.value); - const defaultValue = validValue(parameter.default_value); + const [localValue, setLocalValue] = useState(value); + + useEffect(() => { + setLocalValue(value); + }, [value]); switch (parameter.form_type) { case "dropdown": return (