Merge pull request #3365 from quadratichq/qa

QA Auth 13th - 2

Author: davidkircos

.vscode/settings.json

@@ -24,6 +24,7 @@
     "cellvalue",
     "chrono",
     "Cinstrument",
+    "clickhouse",
     "clippy",
     "cmdk",
     "Cockroachdb",

Cargo.toml

@@ -15,7 +15,7 @@ edition = "2024"
 description = "Infinite data grid with Python, JavaScript, and SQL built-in"
 repository = "https://github.com/quadratichq/quadratic"
 license-file = "LICENSE"
-version = "0.16.3"
+version = "0.16.4"
 
 
 [profile.release]

VERSION

@@ -1 +1 @@
-0.16.3
+0.16.4

package.json

@@ -1,6 +1,6 @@
 {
   "name": "quadratic",
-  "version": "0.16.3",
+  "version": "0.16.4",
   "author": {
     "name": "David Kircos",
     "email": "david@quadratichq.com",

quadratic-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quadratic-api",
-  "version": "0.16.3",
+  "version": "0.16.4",
   "description": "",
   "main": "index.js",
   "scripts": {

quadratic-api/prisma/migrations/20250813181554_add_context_to_feedback/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "QFeedback" ADD COLUMN     "context" TEXT;

quadratic-api/prisma/schema.prisma

@@ -248,6 +248,9 @@ model FileInvite {
 model QFeedback {
     id           Int      @id @default(autoincrement())
     feedback     String
+    // Additional context about the feedback source
+    // If it's null, that's in-app feedback (which was the first kind we used)
+    context      String?
     created_date DateTime @default(now())
     userId       Int?
     user         User?    @relation(fields: [userId], references: [id])

quadratic-api/src/ai/helpers/modelRouter.helper.ts

@@ -35,12 +35,6 @@ export const getModelKey = async (
 
     const promptMessages = getPromptMessagesForAI(messages);
 
-    // if the last message is not a user prompt, use the last AI prompt message model key
-    const lastPromptMessage = promptMessages[promptMessages.length - 1];
-    if (lastPromptMessage.role !== 'user' || lastPromptMessage.contextType !== 'userPrompt') {
-      return getLastAIPromptMessageModelKey(promptMessages) ?? DEFAULT_BACKUP_MODEL;
-    }
-
     // if the model is the default free model, check if the user prompt contains an image file
     if (!isQuadraticModel(modelKey) && !MODELS_CONFIGURATION[modelKey].imageSupport) {
       const hasImageFile = getUserPromptMessages(promptMessages).some((message) =>
@@ -55,6 +49,12 @@ export const getModelKey = async (
       return modelKey;
     }
 
+    // if the last message is not a user prompt, use the last AI prompt message model key
+    const lastPromptMessage = promptMessages[promptMessages.length - 1];
+    if (lastPromptMessage.role !== 'user' || lastPromptMessage.contextType !== 'userPrompt') {
+      return getLastAIPromptMessageModelKey(promptMessages) ?? DEFAULT_BACKUP_MODEL;
+    }
+
     const userTextPrompt = lastPromptMessage.content
       .filter(isContentText)
       .map((content) => content.text)

quadratic-api/src/auth/auth.ts

@@ -19,10 +19,10 @@ export type ByEmailUser = {
   user_id?: string;
 };
 
-export const getUsers = async (users: UsersRequest[], skipMissing = false): Promise<Record<number, User>> => {
+export const getUsers = async (users: UsersRequest[]): Promise<Record<number, User>> => {
   switch (AUTH_TYPE) {
     case 'auth0':
-      return await getUsersFromAuth0(users, skipMissing);
+      return await getUsersFromAuth0(users);
     case 'ory':
       return await getUsersFromOry(users);
     default:

quadratic-api/src/auth/auth0.ts

@@ -57,7 +57,7 @@ const getAuth0 = () => {
  *     }
  *   }
  */
-export const getUsersFromAuth0 = async (users: { id: number; auth0Id: string }[], skipMissing = false) => {
+export const getUsersFromAuth0 = async (users: { id: number; auth0Id: string }[]) => {
   // If we got nothing, we return an empty object
   if (users.length === 0) {
     return {};
@@ -115,10 +115,6 @@ export const getUsersFromAuth0 = async (users: { id: number; auth0Id: string }[]
         },
       });
 
-      if (skipMissing) {
-        return;
-      }
-
       throw new Error('Failed to retrieve all user info from Auth0');
     }