Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) updates from grist-core

Browse Source
This commit is contained in:
Paul Fitzpatrick 2024-09-16 08:47:08 -04:00
commit 938bb0666e
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/server/lib/Assistance.ts
View File

@ -148,8 +148,8 @@ class RetryableError extends Error {
* An optional ASSISTANT_MAX_TOKENS can be specified. * An optional ASSISTANT_MAX_TOKENS can be specified.
*/ */
export class OpenAIAssistant implements Assistant { export class OpenAIAssistant implements Assistant {
public static DEFAULT_MODEL = "gpt-3.5-turbo-0613"; public static DEFAULT_MODEL = "gpt-4o-2024-08-06";
public static DEFAULT_LONGER_CONTEXT_MODEL = "gpt-3.5-turbo-16k-0613"; public static DEFAULT_LONGER_CONTEXT_MODEL = "";
private _apiKey?: string; private _apiKey?: string;
private _model?: string; private _model?: string;

1
static/sinon.js Symbolic link
View File

@ -0,0 +1 @@
../node_modules/sinon/pkg/sinon.js

39
test/server/lib/Assistance.ts
View File

@ -1,11 +1,12 @@
import {createDocTools} from "test/server/docTools"; import {AssistanceState} from 'app/common/AssistancePrompts';
import {ActiveDoc} from "app/server/lib/ActiveDoc"; import {ActiveDoc} from "app/server/lib/ActiveDoc";
import {DEPS, OpenAIAssistant, sendForCompletion} from "app/server/lib/Assistance"; import {DEPS, OpenAIAssistant, sendForCompletion} from 'app/server/lib/Assistance';
import {DocSession} from 'app/server/lib/DocSession';
import {assert} from 'chai'; import {assert} from 'chai';
import * as sinon from 'sinon';
import {Response} from 'node-fetch'; import {Response} from 'node-fetch';
import {DocSession} from "app/server/lib/DocSession"; import * as sinon from 'sinon';
import {AssistanceState} from "app/common/AssistancePrompts"; import {createDocTools} from 'test/server/docTools';
import {EnvironmentSnapshot} from 'test/server/testUtils';
// For some reason, assert.isRejected is not getting defined, // For some reason, assert.isRejected is not getting defined,
// though test/chai-as-promised.js should be taking care of this. // though test/chai-as-promised.js should be taking care of this.
@ -14,6 +15,12 @@ const chai = require('chai');
const chaiAsPromised = require('chai-as-promised'); const chaiAsPromised = require('chai-as-promised');
chai.use(chaiAsPromised); chai.use(chaiAsPromised);
/**
* We no longer use a longer context model by default, but we still
* test this configuration.
*/
const LONGER_CONTEXT_MODEL_FOR_TEST = "fake";
describe('Assistance', function () { describe('Assistance', function () {
this.timeout(10000); this.timeout(10000);
@ -22,8 +29,11 @@ describe('Assistance', function () {
const table2Id = "Table2"; const table2Id = "Table2";
let session: DocSession; let session: DocSession;
let doc: ActiveDoc; let doc: ActiveDoc;
let oldEnv: EnvironmentSnapshot;
before(async () => { before(async () => {
oldEnv = new EnvironmentSnapshot();
process.env.OPENAI_API_KEY = "fake"; process.env.OPENAI_API_KEY = "fake";
process.env.ASSISTANT_LONGER_CONTEXT_MODEL = LONGER_CONTEXT_MODEL_FOR_TEST;
session = docTools.createFakeSession(); session = docTools.createFakeSession();
doc = await docTools.createDoc('test.grist'); doc = await docTools.createDoc('test.grist');
await doc.applyUserActions(session, [ await doc.applyUserActions(session, [
@ -31,6 +41,9 @@ describe('Assistance', function () {
["AddTable", table2Id, [{id: "A"}, {id: "B"}, {id: "C"}]], ["AddTable", table2Id, [{id: "A"}, {id: "B"}, {id: "C"}]],
]); ]);
}); });
after(async function () {
oldEnv.restore();
});
const colId = "C"; const colId = "C";
const userMessageContent = "Sum of A and B"; const userMessageContent = "Sum of A and B";
@ -204,8 +217,8 @@ describe('Assistance', function () {
); );
checkModels([ checkModels([
OpenAIAssistant.DEFAULT_MODEL, OpenAIAssistant.DEFAULT_MODEL,
OpenAIAssistant.DEFAULT_LONGER_CONTEXT_MODEL, LONGER_CONTEXT_MODEL_FOR_TEST,
OpenAIAssistant.DEFAULT_LONGER_CONTEXT_MODEL, LONGER_CONTEXT_MODEL_FOR_TEST,
]); ]);
}); });
@ -254,8 +267,8 @@ describe('Assistance', function () {
); );
checkModels([ checkModels([
OpenAIAssistant.DEFAULT_MODEL, OpenAIAssistant.DEFAULT_MODEL,
OpenAIAssistant.DEFAULT_LONGER_CONTEXT_MODEL, LONGER_CONTEXT_MODEL_FOR_TEST,
OpenAIAssistant.DEFAULT_LONGER_CONTEXT_MODEL, LONGER_CONTEXT_MODEL_FOR_TEST,
]); ]);
}); });
@ -278,8 +291,8 @@ describe('Assistance', function () {
); );
checkModels([ checkModels([
OpenAIAssistant.DEFAULT_MODEL, OpenAIAssistant.DEFAULT_MODEL,
OpenAIAssistant.DEFAULT_LONGER_CONTEXT_MODEL, LONGER_CONTEXT_MODEL_FOR_TEST,
OpenAIAssistant.DEFAULT_LONGER_CONTEXT_MODEL, LONGER_CONTEXT_MODEL_FOR_TEST,
]); ]);
}); });
@ -310,8 +323,8 @@ describe('Assistance', function () {
const result = await checkSendForCompletion(); const result = await checkSendForCompletion();
checkModels([ checkModels([
OpenAIAssistant.DEFAULT_MODEL, OpenAIAssistant.DEFAULT_MODEL,
OpenAIAssistant.DEFAULT_LONGER_CONTEXT_MODEL, LONGER_CONTEXT_MODEL_FOR_TEST,
OpenAIAssistant.DEFAULT_LONGER_CONTEXT_MODEL, LONGER_CONTEXT_MODEL_FOR_TEST,
]); ]);
assert.deepEqual(result.suggestedActions, [ assert.deepEqual(result.suggestedActions, [
["ModifyColumn", table1Id, colId, {formula: "123"}] ["ModifyColumn", table1Id, colId, {formula: "123"}]