Merge pull request #3184 from quadratichq/qa

QA July 8

Author: AyushAgrawal-A2

.github/workflows/qa-deploy.yml

@@ -298,8 +298,8 @@ jobs:
         service:
           - name: client
             url: "https://qa.quadratic-preview.com/version.json"
-          - name: api-heroku
-            url: "https://quadratic-staging.herokuapp.com/health"
+          # - name: api-heroku
+          #   url: "https://quadratic-staging.herokuapp.com/health"
           - name: api-aws
             url: "https://api-pr-qa.quadratic-preview.com/health"
           - name: multiplayer

Cargo.toml

@@ -14,7 +14,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.13.1"
+version = "0.13.2"
 
 [profile.release]
 # Tell `rustc` to optimize for small code size.

VERSION

@@ -1 +1 @@
-0.13.1
+0.13.2

package.json

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

quadratic-api/package.json

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

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

@@ -17,7 +17,7 @@ import type { AIModelKey, AIRequestHelperArgs, ParsedAIResponse } from 'quadrati
 import { handleAnthropicRequest } from '../../ai/handler/anthropic.handler';
 import { handleBedrockRequest } from '../../ai/handler/bedrock.handler';
 import { handleOpenAIRequest } from '../../ai/handler/openai.handler';
-import { getQuadraticContext, getToolUseContext } from '../../ai/helpers/context.helper';
+import { getCurrentDateContext, getQuadraticContext, getToolUseContext } from '../../ai/helpers/context.helper';
 import {
   anthropic,
   bedrock,
@@ -42,6 +42,14 @@ export const handleAIRequest = async (
 ): Promise<ParsedAIResponse | undefined> => {
   let args = inputArgs;
   try {
+    if (args.time) {
+      const currentDateContext = getCurrentDateContext(args.time);
+      args = {
+        ...args,
+        messages: [...currentDateContext, ...args.messages],
+      };
+    }
+
     if (args.useToolsPrompt) {
       const toolUseContext = getToolUseContext(args.source);
       args = {
@@ -51,7 +59,7 @@ export const handleAIRequest = async (
     }
 
     if (args.useQuadraticContext) {
-      const quadraticContext = getQuadraticContext(args.language, args.time);
+      const quadraticContext = getQuadraticContext(args.language);
       args = {
         ...args,
         messages: [...quadraticContext, ...args.messages],

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

@@ -6,7 +6,7 @@ import { JavascriptDocs } from '../docs/JavascriptDocs';
 import { PythonDocs } from '../docs/PythonDocs';
 import { QuadraticDocs } from '../docs/QuadraticDocs';
 
-export const getQuadraticContext = (language?: CodeCellType, time?: string): ChatMessage[] => [
+export const getQuadraticContext = (language?: CodeCellType): ChatMessage[] => [
   {
     role: 'user',
     content: [
@@ -17,8 +17,9 @@ You are a helpful assistant inside of a spreadsheet application called Quadratic
 Be minimally verbose in your explanations of the code and data you produce.\n
 You are an agent - please keep going until the user's query is completely resolved, before ending your turn and yielding back to the user. Only terminate your turn when you are sure that the problem is solved.\n
 If you are not sure about sheet data content pertaining to the user's request, use your tools to read data and gather the relevant information: do NOT guess or make up an answer.\n
-Be proactive. When the user makes a request, use your tools to solve it. Don't ask the user for clarifying information before trying to solve the user's query. If you don't see the data you need, use your tool for retrieving relevant data and then solve the problem.\n
-The current date is ${time || new Date().toString()}.\n
+Be proactive. When the user makes a request, use your tools to solve it.\n
+IMPORTANT: Don't ask the user for clarifying information before trying to solve the user's query. If you don't see the data you need, use your tools for retrieving relevant data and then solve the problem.\n
+Do what you think is most appropriate instead of asking for clarifying details. The user will correct you if what you do is incorrect. The user will be displeased if you ask for clarifying details.\n
 This is the documentation for Quadratic:\n
 ${QuadraticDocs}\n\n
 ${language === 'Python' || language === undefined ? PythonDocs : ''}\n
@@ -95,3 +96,28 @@ ${Object.entries(aiToolsSpec)
     },
   ];
 };
+
+export const getCurrentDateContext = (time: string): ChatMessage[] => {
+  return [
+    {
+      role: 'user',
+      content: [
+        {
+          type: 'text',
+          text: `The current date is ${time || new Date().toString()}.`,
+        },
+      ],
+      contextType: 'currentDate',
+    },
+    {
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: `I understand the current date and user locale.`,
+        },
+      ],
+      contextType: 'currentDate',
+    },
+  ];
+};

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

@@ -23,6 +23,10 @@ export const getModelKey = async (
   exceededBillingLimit: boolean
 ): Promise<AIModelKey> => {
   try {
+    if (!['AIAnalyst', 'AIAssistant'].includes(inputArgs.source)) {
+      return modelKey;
+    }
+
     if (!isOnPaidPlan) {
       return DEFAULT_MODEL_FREE;
     }

quadratic-client/package.json

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

quadratic-client/public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.13.1"
+  "version": "0.13.2"
 }