consistency
This commit is contained in:
parent
4dcbfea875
commit
95cfd6efff
9 changed files with 26 additions and 28 deletions
|
|
@ -2,7 +2,7 @@ import { v } from 'convex/values';
|
|||
import { mutation, query } from './_generated/server';
|
||||
import { api } from './_generated/api';
|
||||
import { messageRoleValidator, providerValidator } from './schema';
|
||||
import { Id } from './_generated/dataModel';
|
||||
import type { Id } from './_generated/dataModel';
|
||||
|
||||
export const getAllFromConversation = query({
|
||||
args: {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import * as array from '../../utils/array';
|
|||
import * as object from '../../utils/object';
|
||||
import { internal } from './_generated/api';
|
||||
import { Provider } from '../../types';
|
||||
import { Doc } from './_generated/dataModel';
|
||||
import type { Doc } from './_generated/dataModel';
|
||||
|
||||
export const getModelKey = (args: { provider: Provider; model_id: string }) => {
|
||||
return `${args.provider}:${args.model_id}`;
|
||||
|
|
@ -13,11 +13,11 @@ export const getModelKey = (args: { provider: Provider; model_id: string }) => {
|
|||
|
||||
export const get_enabled = query({
|
||||
args: {
|
||||
sessionToken: v.string(),
|
||||
session_token: v.string(),
|
||||
},
|
||||
handler: async (ctx, args): Promise<Record<string, Doc<'user_enabled_models'>>> => {
|
||||
const session = await ctx.runQuery(internal.betterAuth.getSession, {
|
||||
sessionToken: args.sessionToken,
|
||||
sessionToken: args.session_token,
|
||||
});
|
||||
|
||||
if (!session) throw new Error('Invalid session token');
|
||||
|
|
@ -59,11 +59,11 @@ export const get = query({
|
|||
args: {
|
||||
provider: providerValidator,
|
||||
model_id: v.string(),
|
||||
sessionToken: v.string(),
|
||||
session_token: v.string(),
|
||||
},
|
||||
handler: async (ctx, args): Promise<Doc<'user_enabled_models'> | null> => {
|
||||
const session = await ctx.runQuery(internal.betterAuth.getSession, {
|
||||
sessionToken: args.sessionToken,
|
||||
sessionToken: args.session_token,
|
||||
});
|
||||
|
||||
if (!session) throw new Error('Invalid session token');
|
||||
|
|
@ -71,9 +71,7 @@ export const get = query({
|
|||
const model = await ctx.db
|
||||
.query('user_enabled_models')
|
||||
.withIndex('by_model_provider_user', (q) =>
|
||||
q.eq('model_id', args.model_id)
|
||||
.eq('provider', args.provider)
|
||||
.eq('user_id', session.userId)
|
||||
q.eq('model_id', args.model_id).eq('provider', args.provider).eq('user_id', session.userId)
|
||||
)
|
||||
.first();
|
||||
|
||||
|
|
@ -86,11 +84,11 @@ export const set = mutation({
|
|||
provider: providerValidator,
|
||||
model_id: v.string(),
|
||||
enabled: v.boolean(),
|
||||
sessionToken: v.string(),
|
||||
session_token: v.string(),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
const session = await ctx.runQuery(internal.betterAuth.getSession, {
|
||||
sessionToken: args.sessionToken,
|
||||
sessionToken: args.session_token,
|
||||
});
|
||||
|
||||
if (!session) throw new Error('Invalid session token');
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@ import { v } from 'convex/values';
|
|||
import { mutation, query } from './_generated/server';
|
||||
import { internal } from './_generated/api';
|
||||
import { ruleAttachValidator } from './schema';
|
||||
import { Doc } from './_generated/dataModel';
|
||||
import type { Doc } from './_generated/dataModel';
|
||||
|
||||
export const create = mutation({
|
||||
args: {
|
||||
name: v.string(),
|
||||
attach: ruleAttachValidator,
|
||||
rule: v.string(),
|
||||
sessionToken: v.string(),
|
||||
session_token: v.string(),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
const session = await ctx.runQuery(internal.betterAuth.getSession, {
|
||||
sessionToken: args.sessionToken,
|
||||
sessionToken: args.session_token,
|
||||
});
|
||||
|
||||
if (!session) throw new Error('Invalid session token');
|
||||
|
|
@ -39,11 +39,11 @@ export const update = mutation({
|
|||
ruleId: v.id('user_rules'),
|
||||
attach: ruleAttachValidator,
|
||||
rule: v.string(),
|
||||
sessionToken: v.string(),
|
||||
session_token: v.string(),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
const session = await ctx.runQuery(internal.betterAuth.getSession, {
|
||||
sessionToken: args.sessionToken,
|
||||
sessionToken: args.session_token,
|
||||
});
|
||||
|
||||
if (!session) throw new Error('Invalid session token');
|
||||
|
|
@ -63,11 +63,11 @@ export const update = mutation({
|
|||
export const remove = mutation({
|
||||
args: {
|
||||
ruleId: v.id('user_rules'),
|
||||
sessionToken: v.string(),
|
||||
session_token: v.string(),
|
||||
},
|
||||
handler: async (ctx, args) => {
|
||||
const session = await ctx.runQuery(internal.betterAuth.getSession, {
|
||||
sessionToken: args.sessionToken,
|
||||
sessionToken: args.session_token,
|
||||
});
|
||||
|
||||
if (!session) throw new Error('Invalid session token');
|
||||
|
|
@ -83,11 +83,11 @@ export const remove = mutation({
|
|||
|
||||
export const all = query({
|
||||
args: {
|
||||
sessionToken: v.string(),
|
||||
session_token: v.string(),
|
||||
},
|
||||
handler: async (ctx, args): Promise<Doc<'user_rules'>[]> => {
|
||||
const session = await ctx.runQuery(internal.betterAuth.getSession, {
|
||||
sessionToken: args.sessionToken,
|
||||
sessionToken: args.session_token,
|
||||
});
|
||||
|
||||
if (!session) throw new Error('Invalid session token');
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ export class Models {
|
|||
|
||||
init = createInit(() => {
|
||||
const query = useCachedQuery(api.user_enabled_models.get_enabled, {
|
||||
sessionToken: session.current?.session.token ?? '',
|
||||
session_token: session.current?.session.token ?? '',
|
||||
});
|
||||
watch(
|
||||
() => $state.snapshot(query.data),
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
let creatingRule = $state(false);
|
||||
|
||||
const userRulesQuery: QueryResult<Doc<'user_rules'>[]> = useCachedQuery(api.user_rules.all, {
|
||||
sessionToken: session.current?.session.token ?? '',
|
||||
session_token: session.current?.session.token ?? '',
|
||||
});
|
||||
|
||||
async function submitNewRule(e: SubmitEvent) {
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
name,
|
||||
attach,
|
||||
rule,
|
||||
sessionToken: session.current?.session.token ?? '',
|
||||
session_token: session.current?.session.token ?? '',
|
||||
});
|
||||
|
||||
creatingRule = false;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
ruleId: rule._id,
|
||||
attach,
|
||||
rule: ruleText,
|
||||
sessionToken: session.current?.session.token ?? '',
|
||||
session_token: session.current?.session.token ?? '',
|
||||
}),
|
||||
(e) => e
|
||||
);
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
|
||||
await client.mutation(api.user_rules.remove, {
|
||||
ruleId: rule._id,
|
||||
sessionToken: session.current?.session.token ?? '',
|
||||
session_token: session.current?.session.token ?? '',
|
||||
});
|
||||
|
||||
deleting = false;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
provider,
|
||||
model_id: model.id,
|
||||
enabled: v,
|
||||
sessionToken: session.current?.session.token,
|
||||
session_token: session.current?.session.token,
|
||||
}),
|
||||
(e) => e
|
||||
);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ async function generateAIResponse(
|
|||
client.query(api.user_enabled_models.get, {
|
||||
provider: Provider.OpenRouter,
|
||||
model_id: modelId,
|
||||
sessionToken: session.token,
|
||||
session_token: session.token,
|
||||
}),
|
||||
(e) => `Failed to get model: ${e}`
|
||||
);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
let { class: className }: Props = $props();
|
||||
|
||||
const enabledModelsQuery = useCachedQuery(api.user_enabled_models.get_enabled, {
|
||||
sessionToken: session.current?.session.token ?? '',
|
||||
session_token: session.current?.session.token ?? '',
|
||||
});
|
||||
|
||||
const enabledArr = $derived(Object.values(enabledModelsQuery.data ?? {}));
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue