Skip to content

perf(server): settings loads skip the provider history query when nothing needs migrating #28776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
only21mil wants to merge 1 commit into from
+27 −2
Closed

perf(server): settings loads skip the provider history query when nothing needs migrating #28776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions apps/server/src/serverSettings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,31 @@ it.layer(NodeServices.layer)("server settings", (it) => {
}).pipe(Effect.provide(layerServerSettings())),
);

it.effect("reads provider history only when legacy provider settings need migrating", () =>
Effect.gen(function* () {
const serverConfig = yield* ServerConfig.ServerConfig;
const fileSystem = yield* FileSystem.FileSystem;
const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
const sql = yield* SqlClient.SqlClient;
yield* sql`DROP TABLE provider_session_runtime`;
yield* fileSystem.writeFileString(
serverConfig.settingsPath,
JSON.stringify({ providers: { grok: { binaryPath: "/opt/grok" } } }),
);

const error = yield* Effect.flip(serverSettings.getSettings);
assert.equal(error.operation, "read-provider-history");

yield* fileSystem.writeFileString(
serverConfig.settingsPath,
JSON.stringify({ addProjectBaseDirectory: "~/Development" }),
);

const settings = yield* serverSettings.getSettings;
assert.equal(settings.addProjectBaseDirectory, "~/Development");
}).pipe(Effect.provide(layerServerSettings())),
);

it.effect("migrates legacy providers from an invalid file without rewriting it", () =>
Effect.gen(function* () {
const serverConfig = yield* ServerConfig.ServerConfig;
Expand Down
4 changes: 2 additions & 2 deletions apps/server/src/serverSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ const make = Effect.gen(function* () {

// A file that failed to decode must stay on disk for the user to repair.
const settingsFileTrusted = Option.isNone(parseFailure);
const providerHistory = yield* sql<{
const readProviderHistory = sql<{
readonly providerName: string;
readonly providerInstanceId: string | null;
}>`
Expand Down Expand Up @@ -791,7 +791,7 @@ const make = Effect.gen(function* () {
const loaded = foldProviderInstanceEnabledFlags(
legacyProviders === undefined
? settings
: migrateLegacyProviderSettings(settings, legacyProviders, providerHistory),
: migrateLegacyProviderSettings(settings, legacyProviders, yield* readProviderHistory),
);
const folded = settingsFileTrusted
? foldLegacyProjectSettings(loaded, legacyProjectRows)
Expand Down
Loading