Skip to content

Commit 77a6668

Browse files
authored
Merge pull request #3311 from quadratichq/qa
QA Jul 28
2 parents 20ac606 + 5841a24 commit 77a6668

File tree

253 files changed

+5301
-2577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+5301
-2577
lines changed

.env.docker

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ AZURE_OPENAI_ENDPOINT=AZURE_OPENAI_ENDPOINT
127127
AZURE_OPENAI_API_KEY=AZURE_OPENAI_API_KEY
128128
XAI_API_KEY=XAI_API_KEY
129129
BASETEN_API_KEY=BASETEN_API_KEY
130+
FIREWORKS_API_KEY=FIREWORKS_API_KEY
130131
OPEN_ROUTER_API_KEY=OPEN_ROUTER_API_KEY
131132

132133
# use image from ECR or build locally

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"deepseek",
4949
"demangle",
5050
"Deque",
51+
"dexie",
5152
"dgraph",
5253
"docgen",
5354
"domcontentloaded",

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ edition = "2024"
1515
description = "Infinite data grid with Python, JavaScript, and SQL built-in"
1616
repository = "https://github.com/quadratichq/quadratic"
1717
license-file = "LICENSE"
18-
version = "0.15.2"
18+
version = "0.16.0"
1919

2020

2121
[profile.release]

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.15.2
1+
0.16.0

dev/control.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ export class Control {
129129
"--workspace=quadratic-api",
130130
], { signal: this.signals.api.signal });
131131
this.ui.printOutput("api", (data) => this.handleResponse("api", data, {
132-
success: "Server running on port",
133-
error: "npm ERR!",
132+
success: "Server running",
133+
error: `"level":"error"`,
134134
start: "> quadratic-api",
135135
}, () => {
136136
if (firstRun && !restart) {
@@ -209,6 +209,7 @@ export class Control {
209209
}
210210
togglePerf() {
211211
this.cli.options.perf = !this.cli.options.perf;
212+
this.cli.options.functionTimer = false;
212213
this.restartCore();
213214
}
214215
toggleFunctionTimer() {

dev/control.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ export class Control {
162162
"api",
163163
data,
164164
{
165-
success: "Server running on port",
166-
error: "npm ERR!",
165+
success: "Server running",
166+
error: `"level":"error"`,
167167
start: "> quadratic-api",
168168
},
169169
() => {

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ services:
144144
AZURE_OPENAI_API_KEY: ${AZURE_OPENAI_API_KEY}
145145
XAI_API_KEY: ${XAI_API_KEY}
146146
BASETEN_API_KEY: ${BASETEN_API_KEY}
147+
FIREWORKS_API_KEY: ${FIREWORKS_API_KEY}
147148
OPEN_ROUTER_API_KEY: ${OPEN_ROUTER_API_KEY}
148149
AWS_S3_REGION: ${AWS_S3_REGION}
149150
AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME}
@@ -340,6 +341,7 @@ services:
340341
AZURE_OPENAI_API_KEY: ${AZURE_OPENAI_API_KEY}
341342
XAI_API_KEY: ${XAI_API_KEY}
342343
BASETEN_API_KEY: ${BASETEN_API_KEY}
344+
FIREWORKS_API_KEY: ${FIREWORKS_API_KEY}
343345
OPEN_ROUTER_API_KEY: ${OPEN_ROUTER_API_KEY}
344346
AWS_S3_REGION: ${AWS_S3_REGION}
345347
AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME}

infra/aws-cloudformation/quadratic-preview.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ Resources:
154154
AZURE_OPENAI_API_KEY=$(aws ssm get-parameter --name "/quadratic-development/AZURE_OPENAI_API_KEY" --with-decryption --query "Parameter.Value" --output text)
155155
XAI_API_KEY=$(aws ssm get-parameter --name "/quadratic-development/XAI_API_KEY" --with-decryption --query "Parameter.Value" --output text)
156156
BASETEN_API_KEY=$(aws ssm get-parameter --name "/quadratic-development/BASETEN_API_KEY" --with-decryption --query "Parameter.Value" --output text)
157+
FIREWORKS_API_KEY=$(aws ssm get-parameter --name "/quadratic-development/FIREWORKS_API_KEY" --with-decryption --query "Parameter.Value" --output text)
157158
OPEN_ROUTER_API_KEY=$(aws ssm get-parameter --name "/quadratic-development/OPEN_ROUTER_API_KEY" --with-decryption --query "Parameter.Value" --output text)
158159

159160
# stripe

infra/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"@pulumi/pulumi": "3.178.0"
99
},
1010
"devDependencies": {
11-
"@types/node": "^24.0.3"
11+
"@types/node": "^24.1.0"
1212
}
1313
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "quadratic",
3-
"version": "0.15.2",
3+
"version": "0.16.0",
44
"author": {
55
"name": "David Kircos",
66
"email": "david@quadratichq.com",

0 commit comments

Comments
 (0)