Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2de0df0

Browse files
committed
fixup: more chnages and lint rule
1 parent 89b7bbf commit 2de0df0

File tree

10 files changed

+29
-28
lines changed

10 files changed

+29
-28
lines changed

.github/workflows/typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ IST = "IST"
99
MacOS = "macOS"
1010
AKS = "AKS"
1111
O_WRONLY = "O_WRONLY"
12+
AIBridge = "AI Bridge"
1213

1314
[default.extend-words]
1415
AKS = "AKS"

coderd/database/dbauthz/dbauthz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,12 +596,12 @@ var (
596596
// See aibridged package.
597597
subjectAibridged = rbac.Subject{
598598
Type: rbac.SubjectAibridged,
599-
FriendlyName: "AIBridge Daemon",
599+
FriendlyName: "AI Bridge Daemon",
600600
ID: uuid.Nil.String(),
601601
Roles: rbac.Roles([]rbac.Role{
602602
{
603603
Identifier: rbac.RoleIdentifier{Name: "aibridged"},
604-
DisplayName: "AIBridge Daemon",
604+
DisplayName: "AI Bridge Daemon",
605605
Site: rbac.Permissions(map[string][]policy.Action{
606606
rbac.ResourceUser.Type: {
607607
policy.ActionRead, // Required to validate API key owner is active.

coderd/database/querier.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries.sql.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/database/queries/aibridge.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ ORDER BY
209209
id ASC;
210210

211211
-- name: ListAIBridgeInterceptionsTelemetrySummaries :many
212-
-- Finds all unique AIBridge interception telemetry summaries combinations
212+
-- Finds all unique AI Bridge interception telemetry summaries combinations
213213
-- (provider, model, client) in the given timeframe for telemetry reporting.
214214
SELECT
215215
DISTINCT ON (provider, model, client)

coderd/rbac/regosql/configs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func ConnectionLogConverter() *sqltypes.VariableConverter {
8181
func AIBridgeInterceptionConverter() *sqltypes.VariableConverter {
8282
matcher := sqltypes.NewVariableConverter().RegisterMatcher(
8383
resourceIDMatcher(),
84-
// AIBridge interceptions are not tied to any organization.
84+
// AI Bridge interceptions are not tied to any organization.
8585
sqltypes.StringVarMatcher("''", []string{"input", "object", "org_owner"}),
8686
sqltypes.StringVarMatcher("initiator_id :: text", []string{"input", "object", "owner"}),
8787
)

coderd/telemetry/telemetry.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ func (r *remoteReporter) createSnapshot() (*Snapshot, error) {
751751
eg.Go(func() error {
752752
summaries, err := r.generateAIBridgeInterceptionsSummaries(ctx)
753753
if err != nil {
754-
return xerrors.Errorf("generate AIBridge interceptions telemetry summaries: %w", err)
754+
return xerrors.Errorf("generate AI Bridge interceptions telemetry summaries: %w", err)
755755
}
756756
snapshot.AIBridgeInterceptionsSummaries = summaries
757757
return nil
@@ -785,7 +785,7 @@ func (r *remoteReporter) generateAIBridgeInterceptionsSummaries(ctx context.Cont
785785
return nil, nil
786786
}
787787
if err != nil {
788-
return nil, xerrors.Errorf("insert AIBridge interceptions telemetry lock (period_ending_at=%q): %w", endedAtBefore, err)
788+
return nil, xerrors.Errorf("insert AI Bridge interceptions telemetry lock (period_ending_at=%q): %w", endedAtBefore, err)
789789
}
790790

791791
// List the summary categories that need to be calculated.
@@ -794,7 +794,7 @@ func (r *remoteReporter) generateAIBridgeInterceptionsSummaries(ctx context.Cont
794794
EndedAtBefore: endedAtBefore, // exclusive
795795
})
796796
if err != nil {
797-
return nil, xerrors.Errorf("list AIBridge interceptions telemetry summaries (startedAtAfter=%q, endedAtBefore=%q): %w", endedAtAfter, endedAtBefore, err)
797+
return nil, xerrors.Errorf("list AI Bridge interceptions telemetry summaries (startedAtAfter=%q, endedAtBefore=%q): %w", endedAtAfter, endedAtBefore, err)
798798
}
799799

800800
// Calculate and convert the summaries for all categories.
@@ -813,7 +813,7 @@ func (r *remoteReporter) generateAIBridgeInterceptionsSummaries(ctx context.Cont
813813
EndedAtBefore: endedAtBefore,
814814
})
815815
if err != nil {
816-
return xerrors.Errorf("calculate AIBridge interceptions telemetry summary (provider=%q, model=%q, client=%q, startedAtAfter=%q, endedAtBefore=%q): %w", category.Provider, category.Model, category.Client, endedAtAfter, endedAtBefore, err)
816+
return xerrors.Errorf("calculate AI Bridge interceptions telemetry summary (provider=%q, model=%q, client=%q, startedAtAfter=%q, endedAtBefore=%q): %w", category.Provider, category.Model, category.Client, endedAtAfter, endedAtBefore, err)
817817
}
818818

819819
// Double check that at least one interception was found in the

codersdk/aibridge.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ type AIBridgeListInterceptionsResponse struct {
6565
// @typescript-ignore AIBridgeListInterceptionsFilter
6666
type AIBridgeListInterceptionsFilter struct {
6767
// Limit defaults to 100, max is 1000.
68-
// Offset based pagination is not supported for AIBridge interceptions. Use
68+
// Offset based pagination is not supported for AI Bridge interceptions. Use
6969
// cursor pagination instead with after_id.
7070
Pagination Pagination `json:"pagination,omitempty"`
7171

@@ -112,7 +112,7 @@ func (f AIBridgeListInterceptionsFilter) asRequestOption() RequestOption {
112112
}
113113
}
114114

115-
// AIBridgeListInterceptions returns AIBridge interceptions with the given
115+
// AIBridgeListInterceptions returns AI Bridge interceptions with the given
116116
// filter.
117117
func (c *Client) AIBridgeListInterceptions(ctx context.Context, filter AIBridgeListInterceptionsFilter) (AIBridgeListInterceptionsResponse, error) {
118118
res, err := c.Request(ctx, http.MethodGet, "/api/v2/aibridge/interceptions", nil, filter.asRequestOption(), filter.Pagination.asRequestOption(), filter.Pagination.asRequestOption())

codersdk/deployment.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ func (c *DeploymentValues) Options() serpent.OptionSet {
11741174
YAML: "inbox",
11751175
}
11761176
deploymentGroupAIBridge = serpent.Group{
1177-
Name: "AIBridge",
1177+
Name: "AI Bridge",
11781178
YAML: "aibridge",
11791179
}
11801180
)
@@ -3238,9 +3238,9 @@ Write out the current server config as YAML to stdout.`,
32383238
YAML: "hideAITasks",
32393239
},
32403240

3241-
// AIBridge Options
3241+
// AI Bridge Options
32423242
{
3243-
Name: "AIBridge Enabled",
3243+
Name: "AI Bridge Enabled",
32443244
Description: "Whether to start an in-memory aibridged instance.",
32453245
Flag: "aibridge-enabled",
32463246
Env: "CODER_AIBRIDGE_ENABLED",
@@ -3250,7 +3250,7 @@ Write out the current server config as YAML to stdout.`,
32503250
YAML: "enabled",
32513251
},
32523252
{
3253-
Name: "AIBridge OpenAI Base URL",
3253+
Name: "AI Bridge OpenAI Base URL",
32543254
Description: "The base URL of the OpenAI API.",
32553255
Flag: "aibridge-openai-base-url",
32563256
Env: "CODER_AIBRIDGE_OPENAI_BASE_URL",
@@ -3260,7 +3260,7 @@ Write out the current server config as YAML to stdout.`,
32603260
YAML: "openai_base_url",
32613261
},
32623262
{
3263-
Name: "AIBridge OpenAI Key",
3263+
Name: "AI Bridge OpenAI Key",
32643264
Description: "The key to authenticate against the OpenAI API.",
32653265
Flag: "aibridge-openai-key",
32663266
Env: "CODER_AIBRIDGE_OPENAI_KEY",
@@ -3270,7 +3270,7 @@ Write out the current server config as YAML to stdout.`,
32703270
YAML: "openai_key",
32713271
},
32723272
{
3273-
Name: "AIBridge Anthropic Base URL",
3273+
Name: "AI Bridge Anthropic Base URL",
32743274
Description: "The base URL of the Anthropic API.",
32753275
Flag: "aibridge-anthropic-base-url",
32763276
Env: "CODER_AIBRIDGE_ANTHROPIC_BASE_URL",
@@ -3280,7 +3280,7 @@ Write out the current server config as YAML to stdout.`,
32803280
YAML: "anthropic_base_url",
32813281
},
32823282
{
3283-
Name: "AIBridge Anthropic Key",
3283+
Name: "AI Bridge Anthropic Key",
32843284
Description: "The key to authenticate against the Anthropic API.",
32853285
Flag: "aibridge-anthropic-key",
32863286
Env: "CODER_AIBRIDGE_ANTHROPIC_KEY",
@@ -3290,7 +3290,7 @@ Write out the current server config as YAML to stdout.`,
32903290
YAML: "anthropic_key",
32913291
},
32923292
{
3293-
Name: "AIBridge Bedrock Region",
3293+
Name: "AI Bridge Bedrock Region",
32943294
Description: "The AWS Bedrock API region.",
32953295
Flag: "aibridge-bedrock-region",
32963296
Env: "CODER_AIBRIDGE_BEDROCK_REGION",
@@ -3300,7 +3300,7 @@ Write out the current server config as YAML to stdout.`,
33003300
YAML: "bedrock_region",
33013301
},
33023302
{
3303-
Name: "AIBridge Bedrock Access Key",
3303+
Name: "AI Bridge Bedrock Access Key",
33043304
Description: "The access key to authenticate against the AWS Bedrock API.",
33053305
Flag: "aibridge-bedrock-access-key",
33063306
Env: "CODER_AIBRIDGE_BEDROCK_ACCESS_KEY",
@@ -3310,7 +3310,7 @@ Write out the current server config as YAML to stdout.`,
33103310
YAML: "bedrock_access_key",
33113311
},
33123312
{
3313-
Name: "AIBridge Bedrock Access Key Secret",
3313+
Name: "AI Bridge Bedrock Access Key Secret",
33143314
Description: "The access key secret to use with the access key to authenticate against the AWS Bedrock API.",
33153315
Flag: "aibridge-bedrock-access-key-secret",
33163316
Env: "CODER_AIBRIDGE_BEDROCK_ACCESS_KEY_SECRET",
@@ -3320,7 +3320,7 @@ Write out the current server config as YAML to stdout.`,
33203320
YAML: "bedrock_access_key_secret",
33213321
},
33223322
{
3323-
Name: "AIBridge Bedrock Model",
3323+
Name: "AI Bridge Bedrock Model",
33243324
Description: "The model to use when making requests to the AWS Bedrock API.",
33253325
Flag: "aibridge-bedrock-model",
33263326
Env: "CODER_AIBRIDGE_BEDROCK_MODEL",
@@ -3330,7 +3330,7 @@ Write out the current server config as YAML to stdout.`,
33303330
YAML: "bedrock_model",
33313331
},
33323332
{
3333-
Name: "AIBridge Bedrock Small Fast Model",
3333+
Name: "AI Bridge Bedrock Small Fast Model",
33343334
Description: "The small fast model to use when making requests to the AWS Bedrock API. Claude Code uses Haiku-class models to perform background tasks. See https://docs.claude.com/en/docs/claude-code/settings#environment-variables.",
33353335
Flag: "aibridge-bedrock-small-fastmodel",
33363336
Env: "CODER_AIBRIDGE_BEDROCK_SMALL_FAST_MODEL",

enterprise/coderd/aibridge.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (api *API) aiBridgeListInterceptions(rw http.ResponseWriter, r *http.Reques
144144
}, nil)
145145
if err != nil {
146146
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
147-
Message: "Internal error getting AIBridge interceptions.",
147+
Message: "Internal error getting AI Bridge interceptions.",
148148
Detail: err.Error(),
149149
})
150150
return
@@ -172,7 +172,7 @@ func populatedAndConvertAIBridgeInterceptions(ctx context.Context, db database.S
172172
ids[i] = row.AIBridgeInterception.ID
173173
}
174174

175-
//nolint:gocritic // This is a system function until we implement a join for aibridge interceptions. AIBridge interception subresources use the same authorization call as their parent.
175+
//nolint:gocritic // This is a system function until we implement a join for aibridge interceptions. AI Bridge interception subresources use the same authorization call as their parent.
176176
tokenUsagesRows, err := db.ListAIBridgeTokenUsagesByInterceptionIDs(dbauthz.AsSystemRestricted(ctx), ids)
177177
if err != nil {
178178
return nil, xerrors.Errorf("get linked aibridge token usages from database: %w", err)
@@ -182,7 +182,7 @@ func populatedAndConvertAIBridgeInterceptions(ctx context.Context, db database.S
182182
tokenUsagesMap[row.InterceptionID] = append(tokenUsagesMap[row.InterceptionID], row)
183183
}
184184

185-
//nolint:gocritic // This is a system function until we implement a join for aibridge interceptions. AIBridge interception subresources use the same authorization call as their parent.
185+
//nolint:gocritic // This is a system function until we implement a join for aibridge interceptions. AI Bridge interception subresources use the same authorization call as their parent.
186186
userPromptRows, err := db.ListAIBridgeUserPromptsByInterceptionIDs(dbauthz.AsSystemRestricted(ctx), ids)
187187
if err != nil {
188188
return nil, xerrors.Errorf("get linked aibridge user prompts from database: %w", err)
@@ -192,7 +192,7 @@ func populatedAndConvertAIBridgeInterceptions(ctx context.Context, db database.S
192192
userPromptsMap[row.InterceptionID] = append(userPromptsMap[row.InterceptionID], row)
193193
}
194194

195-
//nolint:gocritic // This is a system function until we implement a join for aibridge interceptions. AIBridge interception subresources use the same authorization call as their parent.
195+
//nolint:gocritic // This is a system function until we implement a join for aibridge interceptions. AI Bridge interception subresources use the same authorization call as their parent.
196196
toolUsagesRows, err := db.ListAIBridgeToolUsagesByInterceptionIDs(dbauthz.AsSystemRestricted(ctx), ids)
197197
if err != nil {
198198
return nil, xerrors.Errorf("get linked aibridge tool usages from database: %w", err)

0 commit comments

Comments
 (0)