Repository navigation
feat(coderd): add queries for organization AI model prices - #30718
Merged
Merged
Conversation
This was referenced Oct 13, 2026
SasSwart
force-pushed
the
sdlcgraph/aigov-612-3-store
branch
from
October 14, 2026 12:42
8cf8989 to
bf364f1
Compare
SasSwart
force-pushed
the
sdlcgraph/aigov-612-3-store
branch
from
October 15, 2026 07:53
bf364f1 to
83743f8
Compare
SasSwart
commented
Oct 15, 2026
SasSwart
marked this pull request as ready for review
October 15, 2026 08:14
SasSwart
force-pushed
the
sdlcgraph/aigov-612-3-store
branch
from
October 15, 2026 11:12
83743f8 to
450a56b
Compare
SasSwart
force-pushed
the
sdlcgraph/aigov-612-3-store
branch
4 times, most recently
from
October 19, 2026 12:22
f1d0d8c to
04b9a40
Compare
SasSwart
commented
Oct 19, 2026
SasSwart
added a commit
that referenced
this pull request
Oct 21, 2026
Adds `ai_model_configs`: an organization's AI Governance configuration for one model on one configured provider. Token prices are its first settings. Migration `000630` is additive and needs no backfill. - Rows are soft deleted with a `deleted` flag. A surrogate `id` is the primary key, and a partial unique index allows one live row per `(organization_id, provider_id, model)`. Cascades on delete of the organization or provider. The organization is a column, as in other organization-scoped tables. - A check constraint rejects an empty model. - Pricing per provider ID is what lets `openai-compat` gateways be priced, and lets providers of the same type have different prices. - Site-wide prices per provider type stay in the existing `ai_model_prices` table, unchanged. Recording which price was used on each token usage record is deferred until its design settles. **Used later:** #30718 adds the queries that read and write the table, and #30719 looks prices up from it. The rest of the diff is generated. --- *This PR was generated by Coder Agents on behalf of @SasSwart.*
Organization prices are only per configured provider, so remove the upsert and delete queries for provider type prices and their listing branch.
Org admins edit prices one model at a time, so the upsert takes typed params instead of a JSON batch. The org price listing tells organization and site-wide rows apart by provider_id instead of a price kind.
Replace GetOrganizationAIModelPrices, which listed every price that applies to an organization, with GetOrganizationAIProviderModelPrice, which reads one price by organization, provider and model. Queries target the renamed ai_model_configs table. Split the tests per query, and cover that an identical upsert leaves updated_at unchanged and that an empty model is rejected. Leave a TODO to authorize these queries against a resource for AI Governance model config rather than ResourceAiModelPrice.
DeleteOrganizationAIProviderModelPrice now flags the live row as deleted instead of removing it. Reads and upserts only match live rows, so an upsert after a delete inserts a new live row and leaves the soft-deleted one untouched.
SasSwart
force-pushed
the
sdlcgraph/aigov-612-3-store
branch
from
October 21, 2026 06:38
cacf787 to
1e4ae6b
Compare
…elper The get helper captured the parent test's context and testing.T, which paralleltestctx flags once the subtests call t.Parallel.
SasSwart
added a commit
that referenced
this pull request
Oct 21, 2026
…#31116) Adds @ssncferreira and @SasSwart as code owners of `ai_providers.sql`, `ai_provider_keys.sql` and `aicostcontrol.sql`, alongside @ibetitsmike and @johnstcn. The `codersdk/aiproviders*.go` rules are unchanged. Both current owners are on PTO, which leaves the organization AI model price stack (#30718, #30719) without anyone who can give the required code owner review on `aicostcontrol.sql`. > Generated by Coder Agents on behalf of @SasSwart.
ssncferreira
approved these changes
Oct 21, 2026
ssncferreira
left a comment
Collaborator
There was a problem hiding this comment.
LGTM 👍 I think we should just update the query names to Config, instead of Price
| // only its prices. Authorize it, and the other organization model price | ||
| // queries, against a resource that represents that configuration instead of | ||
| // ResourceAiModelPrice. | ||
| func (q *querier) DeleteOrganizationAIProviderModelPrice(ctx context.Context, arg database.DeleteOrganizationAIProviderModelPriceParams) (int64, error) { |
Collaborator
There was a problem hiding this comment.
nit: since this is for the whole AI Governance model, remove Price from the query (same for the other dbauthz methods):
Suggested change
| func (q *querier) DeleteOrganizationAIProviderModelPrice(ctx context.Context, arg database.DeleteOrganizationAIProviderModelPriceParams) (int64, error) { | |
| func (q *querier) DeleteOrganizationAIProviderModelConfig(ctx context.Context, arg database.DeleteOrganizationAIProviderModelPriceParams) (int64, error) { |
Collaborator
Author
| CASE WHEN source = 'custom' THEN 0 ELSE 1 END ASC | ||
| LIMIT 1; | ||
|
|
||
| -- name: GetOrganizationAIProviderModelPrice :one |
Collaborator
There was a problem hiding this comment.
Same as above, as well as the other queries, and the comments:
Suggested change
| -- name: GetOrganizationAIProviderModelPrice :one | |
| -- name: GetOrganizationAIProviderModelConfig :one |
Collaborator
Author
|
|
||
| -- name: GetOrganizationAIProviderModelPrice :one | ||
| -- Returns the organization's live price for one model on one configured | ||
| -- provider. Soft-deleted rows are ignored. |
Collaborator
There was a problem hiding this comment.
nit: Should this join ai_providers and filter out deleted providers? This way models from deleted providers would not be returned.
|
|
||
| // upsertOrgProviderPrice sets an organization's price for a model on a | ||
| // configured provider, with only an input price. | ||
| func upsertOrgProviderPrice(ctx context.Context, t *testing.T, db database.Store, orgID, providerID uuid.UUID, model string, inputPrice int64) { |
Collaborator
There was a problem hiding this comment.
nit: should we add this to dbgen?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds the store queries for organization AI model prices in
ai_model_configs, with authorization. They cover basic CRUD on one price, keyed by(organization_id, provider_id, model).GetOrganizationAIProviderModelPricereads one price.UpsertOrganizationAIProviderModelPricesets one price, with typed params. It rewrites an existing row only when a price differs, soupdated_atrecords the last change.DeleteOrganizationAIProviderModelPricesoft deletes one price. Reads and upserts only match live rows, so setting a price after a delete inserts a new live row.All three authorize against
ResourceAiModelPrice.InOrg(org). The newAiModelPriceInOrgcase inTestRolePermissionspins that only owners and org admins pass. A TODO in dbauthz notes that this should become a resource for AI Governance model config.Each query has its own test. The upsert tests cover that identical prices leave
updated_atunchanged, that changed prices advance it, and that an empty model is rejected.Used later: #30719 seeds its lookup tests with the upsert. #30720 serves all three through the org price API.
This PR was generated by Coder Agents on behalf of @SasSwart.