Merge pull request #3240 from quadratichq/qa

QA July 17th

Author: AyushAgrawal-A2

Cargo.toml

@@ -17,7 +17,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.14.0"
+version = "0.14.1"
 
 
 [profile.release]

VERSION

@@ -1 +1 @@
-0.14.0
+0.14.1

package.json

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

quadratic-api/package.json

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

quadratic-api/src/ai/handler/ai.handler.ts

@@ -120,7 +120,7 @@ export const handleAIRequest = async (
       parsedResponse.usage.source = args.source;
       parsedResponse.usage.modelKey = modelKey;
       parsedResponse.usage.cost = calculateUsage(parsedResponse.usage);
-      console.log('[AI.Usage]', parsedResponse.usage);
+      console.log({ message: 'AI.Usage', usage: parsedResponse.usage });
     }
 
     if (debugAndNotInProduction && FINE_TUNE === 'true' && !!parsedResponse) {
@@ -129,7 +129,7 @@ export const handleAIRequest = async (
 
     return parsedResponse;
   } catch (error) {
-    console.error('Error in handleAIRequest: ', modelKey, error);
+    console.error({ message: 'Error in handleAIRequest', modelKey, error });
 
     Sentry.captureException(error, {
       level: 'error',

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

@@ -238,7 +238,7 @@ ${userTextPrompt}
       return MODELS_ROUTER_CONFIGURATION[ai_model];
     }
   } catch (error) {
-    console.error('Error in getModelKey: ', error);
+    console.error({ message: 'Error in getModelKey', error });
   }
 
   return DEFAULT_BACKUP_MODEL;

quadratic-api/src/app.ts

@@ -6,7 +6,8 @@ import 'express-async-errors';
 import fs from 'fs';
 import helmet from 'helmet';
 import path from 'path';
-import { CORS, NODE_ENV, SENTRY_DSN, VERSION } from './env-vars';
+import { CORS, LOG_REQUEST_INFO, NODE_ENV, SENTRY_DSN, VERSION } from './env-vars';
+import { logRequestInfo } from './middleware/logRequestInfo';
 import internal_router from './routes/internal';
 import { ApiError } from './utils/ApiError';
 
@@ -27,6 +28,11 @@ app.use(helmet());
 // set CORS origin from env variable
 app.use(cors({ origin: CORS }));
 
+// Request logging middleware for Datadog
+if (LOG_REQUEST_INFO) {
+  app.use(logRequestInfo);
+}
+
 // Health-check
 app.get('/', (req, res) => {
   res.status(200).json({ message: 'OK' });
@@ -39,36 +45,39 @@ app.get('/health', (req, res) => {
 // Internal routes
 app.use('/v0/internal', internal_router);
 
-// Register all our dynamic routes, then regsiter the error middleware last of all
+// Register all our dynamic routes, then register the error middleware last of all
 registerRoutes().then(() => {
   // Error-logging middleware
-  app.use((err: any, req: Request, res: Response, next: NextFunction) => {
+  app.use((error: any, req: Request, res: Response, next: NextFunction) => {
     if (NODE_ENV !== 'test') {
-      if (err.status >= 500) {
-        if (NODE_ENV === 'production') console.error(`[${new Date().toISOString()}]`, err);
-        else console.log(`[${new Date().toISOString()}]`, err);
+      if (error.status >= 500) {
+        if (NODE_ENV === 'production') {
+          console.error({ time: new Date().toISOString(), error });
+        } else {
+          console.log({ time: new Date().toISOString(), error });
+        }
       }
     }
-    next(err);
+    next(error);
   });
 
   // Error-handling middleware
-  app.use((err: any, req: Request, res: Response, next: NextFunction) => {
+  app.use((error: any, req: Request, res: Response, next: NextFunction) => {
     // Check if headers have already been sent
     if (res.headersSent) {
-      return next(err);
+      return next(error);
     }
 
     // Application-specific error handling
-    if (err instanceof ApiError) {
-      res.status(err.status).json({ error: { message: err.message, ...(err.meta ? { meta: err.meta } : {}) } });
+    if (error instanceof ApiError) {
+      res.status(error.status).json({ error: { message: error.message, ...(error.meta ? { meta: error.meta } : {}) } });
     } else {
-      console.error(err);
+      console.error({ error });
 
       // Generic error handling
-      res.status(err.status || 500).json({
+      res.status(error.status || 500).json({
         error: {
-          message: err.message,
+          message: error.message,
         },
       });
     }
@@ -100,7 +109,7 @@ async function registerRoutes() {
     if (httpMethodIndex === -1) httpMethodIndex = segments.indexOf('DELETE');
 
     if (httpMethodIndex === -1) {
-      console.error('File route is malformed. It needs an HTTP method: %s', file);
+      console.error({ message: 'File route is malformed. It needs an HTTP method', file });
     } else {
       const httpMethod = segments[httpMethodIndex].toLowerCase() as 'get' | 'post' | 'put' | 'patch' | 'delete';
       const routeSegments = segments.slice(0, httpMethodIndex);
@@ -112,14 +121,17 @@ async function registerRoutes() {
         app[httpMethod](expressRoute, ...callbacks);
         registeredRoutes.push(httpMethod.toUpperCase() + ' ' + expressRoute);
       } catch (err) {
-        console.error(`Failed to register route: ${expressRoute}`, err);
+        console.error({ message: 'Failed to register route', expressRoute, error: err });
       }
     }
   }
 
   // Keep around for debugging
   // if (NODE_ENV !== 'production' && NODE_ENV !== 'test') {
-  //   console.log(`Dynamically registered routes: ${registeredRoutes.map((route) => `\n  ${route}`).join('')}`);
+  //   console.log({
+  //     message: 'Dynamically registered routes',
+  //     routes: registeredRoutes.map((route) => `\n  ${route}`).join(''),
+  //   });
   // }
 }
 

quadratic-api/src/auth/auth0.ts

@@ -88,7 +88,7 @@ export const getUsersFromAuth0 = async (users: { id: number; auth0Id: string }[]
 
     // If missing or incomplete, fallback to direct lookup
     if (!auth0User || !auth0User.email) {
-      console.log('Fallback to direct lookup for', auth0Id);
+      console.log({ message: 'Fallback to direct lookup for', auth0Id });
       try {
         auth0User = await getAuth0().getUser({ id: auth0Id });
       } catch (err) {
@@ -104,7 +104,7 @@ export const getUsersFromAuth0 = async (users: { id: number; auth0Id: string }[]
 
     // If we're missing data we expect, log it to Sentry and throw
     if (!auth0User || !auth0User.email) {
-      console.log('Failed to retrieve all user info from Auth0', auth0Id);
+      console.log({ message: 'Failed to retrieve all user info from Auth0', auth0Id });
       Sentry.captureException({
         message: 'Auth0 user returned without `email`',
         level: 'error',

quadratic-api/src/auth/ory.ts

@@ -33,8 +33,8 @@ export const getUsersFromOry = async (users: { id: number; auth0Id: string }[]):
 
   try {
     identities = (await sdk.listIdentities({ ids })).data;
-  } catch (e) {
-    console.error(e);
+  } catch (error) {
+    console.error({ message: 'Error in getUsersFromOry', error });
     return {};
   }
 
@@ -77,8 +77,8 @@ export const getUsersFromOryByEmail = async (email: string): Promise<ByEmailUser
 
   try {
     identities = (await sdk.listIdentities({ credentialsIdentifier: email })).data;
-  } catch (e) {
-    console.error(e);
+  } catch (error) {
+    console.error({ message: 'Error in getUsersFromOryByEmail', error });
     return [];
   }
 

quadratic-api/src/data/connections.ts

@@ -25,5 +25,8 @@ try {
     isDemo: true,
   });
 } catch (error) {
-  console.log('`CONNECTION_DEMO` env var is missing or malformed. No demo connection will be available.', error);
+  console.log({
+    message: '`CONNECTION_DEMO` env var is missing or malformed. No demo connection will be available.',
+    error,
+  });
 }