Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 19 additions & 3 deletions apps/mobile/src/lib/modelOptions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,17 @@ describe("mobile model options", () => {
enabled: true,
installed: true,
auth: { status: "authenticated" },
models: [{ slug: "test", name: "Test", capabilities: null }],
models: [{ slug: "gpt-6.2-astra", name: "gpt-6.2-astra", capabilities: null }],
})),
} as unknown as ServerConfig;
const selection = { instanceId: ProviderInstanceId.make("codex_work"), model: "saved" };
const selection = { instanceId: ProviderInstanceId.make("codex_work"), model: "gpt-6.2-sol" };
const options = buildModelOptions(config, selection, undefined, null);
expect(options.map((option) => option.label)).toEqual([
"GPT-6.2-Astra",
"GPT-6.2-Astra",
"GPT-6.2-Sol",
]);
expect(options[2]?.selection).toBe(selection);
expect(options[0]?.providerBadge).toEqual({ displayName: "Personal", showBadge: true });
expect(options[1]?.providerBadge).toEqual({
displayName: "Work",
Expand Down Expand Up @@ -427,6 +433,16 @@ describe("mobile model options", () => {
expect(isModelSelectionUnavailable(config, disabled, null)).toBe(true);
expect(isModelSelectionUnavailable(config, removed, null)).toBe(true);
expect(resolveSelectableModelSelection(null, disabled, null)).toBe(disabled);
const endpoint = {
...config,
providers: config.providers.map((provider) => ({ ...provider, requiresListedModel: true })),
};
expect(isModelSelectionUnavailable(endpoint, usable, null)).toBe(true);
expect(resolveSelectableModelSelection(endpoint, usable, null)).toBeNull();
expect(buildModelOptions(endpoint, usable, undefined, null)[0]).toMatchObject({
selection: usable,
isUnavailable: true,
});
const cooling = {
...config,
providers: config.providers.map((provider) => ({
Expand Down Expand Up @@ -533,7 +549,7 @@ describe("mobile model options", () => {
const options = buildModelOptions(changedConfig, selection, undefined, null);
const missing = options.find((option) => option.selection.model === selection.model);
expect(missing).toMatchObject({
label: selection.model,
label: "Gemini 3.1 Pro High",
providerLabel: "Google Work",
providerDriver: "antigravity",
isUnavailable: true,
Expand Down
6 changes: 4 additions & 2 deletions apps/mobile/src/lib/modelOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
} from "@t3tools/contracts";
import {
buildExplicitProviderOptionSelectionsFromDescriptors,
formatModelSlugName,
getProviderOptionDescriptors,
} from "@t3tools/shared/model";
import {
Expand Down Expand Up @@ -258,6 +259,7 @@ function isProviderSelectionUnavailable(
provider.availability === "unavailable" ||
provider.status === "error" ||
provider.status === "disabled" ||
(provider.requiresListedModel && unavailableModelReason(provider, selection.model) !== null) ||
providerLimitedUntilMs(provider, Date.now()) !== null
)
return true;
Expand Down Expand Up @@ -459,7 +461,7 @@ export function buildModelOptions(
const shortName = resolveModelShortName(model, provider.driver);
options.set(key, {
key,
label: model.name,
label: model.name === model.slug ? formatModelSlugName(model.slug) : model.name,
...(shortName ? { shortName } : {}),
subtitle: model.subProvider ?? "",
providerKey: provider.instanceId,
Expand Down Expand Up @@ -529,7 +531,7 @@ export function buildModelOptions(
: undefined;
options.set(key, {
key,
label: model?.name ?? fallbackModelSelection.model,
label: model?.name ?? formatModelSlugName(fallbackModelSelection.model),
...(shortName ? { shortName } : {}),
subtitle: model?.subProvider ?? "",
providerKey: fallbackModelSelection.instanceId,
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/environment/ServerEnvironment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ export const make = Effect.gen(function* () {
usagePriceOverrides: true,
usageModelAliases: true,
inferenceProxy: true,
traexPeerRouting: true,
inferenceConfigureGuard: true,
inferenceRoutePreservesEnablement: true,
threadPinning: true,
Expand Down
91 changes: 87 additions & 4 deletions apps/server/src/inference/InferenceProxy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { expect, it } from "@effect/vitest";
import { vi } from "vite-plus/test";
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as NodeSocketServer from "@effect/platform-node/NodeSocketServer";
import {
PeerLinkError,
EnvironmentId,
Expand Down Expand Up @@ -38,6 +39,7 @@ import * as ProcessRunner from "../processRunner.ts";
import * as ManagedPolicy from "../policy/ManagedPolicy.ts";
import * as SqlitePersistence from "../persistence/Sqlite.ts";
import * as InferenceProxy from "./InferenceProxy.ts";
import { traexConsumerRouteKey } from "./traex.ts";
import { proxyVersion } from "./install.ts";

const keychainState = vi.hoisted(() => ({
Expand Down Expand Up @@ -121,6 +123,7 @@ it.effect(
let currentExit: Deferred.Deferred<void> | undefined;
let expectRecovery = false;
const recovered = yield* Deferred.make<void>();
let configPath = "";
let starts = 0;
let stops = 0;
const spawner = ChildProcessSpawner.make((command) =>
Expand All @@ -137,6 +140,7 @@ it.effect(
}
const exited = yield* Deferred.make<void>();
if (!tailscale) {
if (ChildProcess.isStandardCommand(command)) configPath = String(command.args[1]);
currentExit = exited;
if (expectRecovery) yield* Deferred.succeed(recovered, undefined);
yield* Effect.addFinalizer(() => Deferred.succeed(exited, undefined));
Expand Down Expand Up @@ -181,10 +185,29 @@ it.effect(
const importedClaudeAuth: Record<string, unknown>[] = [];
const importedCodexFiles: string[] = [];
const importedClaudeFiles: string[] = [];
let registryReconciles = 0;
let activeCodexConfig: unknown;
let activeCodexEnabled: boolean | undefined;
const remoteCatalogKeys: (string | undefined)[] = [];
let peerBridgeKey = "";
const http = HttpClient.make((request) => {
if (
request.url.endsWith("/traex/host/v1/models") ||
request.url === "http://127.0.0.1:8317/v1/models"
) {
const direct = request.url.startsWith("http://127.0.0.1:8317/");
const permitted =
request.headers.authorization ===
"Bearer " + (direct ? "local-bridge-secret" : peerBridgeKey);
return Effect.succeed(
HttpClientResponse.fromWeb(
request,
permitted
? Response.json({ data: [{ id: "traex-test" }] })
: new Response(null, { status: 403 }),
),
);
}
if (request.url.endsWith("/v0/management/api-call")) {
const body = request.body;
if (body._tag !== "Uint8Array" || !body.text) throw new Error("Missing usage request");
Expand Down Expand Up @@ -413,6 +436,7 @@ it.effect(
Layer.succeed(ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutator, {
reconcile: (instances) =>
Effect.sync(() => {
registryReconciles++;
const activeCodex = instances[ProviderInstanceId.make("codex")];
activeCodexConfig = activeCodex?.config;
activeCodexEnabled = activeCodex?.enabled;
Expand Down Expand Up @@ -540,7 +564,7 @@ it.effect(
},
}),
);
const grant = yield* Effect.scoped(
const { grant, oldPort } = yield* Effect.scoped(
Effect.gen(function* () {
const proxy = yield* InferenceProxy.InferenceProxy;
expect((yield* proxy.status).enabled).toBe(false);
Expand Down Expand Up @@ -1001,13 +1025,43 @@ it.effect(
yield* proxy.manage({ operation: "setRouting", strategy: "fill-first" });
yield* proxy.manage({ operation: "setRouting", sessionAffinity: false });
const readConfig = fs
.readFileString(config.stateDir + "/inference-proxy/config.yaml")
.readFileString(configPath)
.pipe(Effect.map((s) => JSON.parse(s) as Record<string, unknown>));
expect(yield* readConfig).toMatchObject({
routing: { strategy: "fill-first", "session-affinity": false },
});
expect((yield* readConfig)["oauth"]).not.toHaveProperty("model-alias");
const issued = yield* proxy.grant(peer);
yield* fs.makeDirectory(home + "/.traex-bridge", { recursive: true });
yield* fs.writeFileString(home + "/.traex-bridge/api-key", "local-bridge-secret");
const beforeDiscovery = registryReconciles;
yield* proxy.refreshModelCatalog(true, ProviderInstanceId.make("codex_traex"));
expect(registryReconciles).toBe(beforeDiscovery + 1);
yield* proxy.refreshModelCatalog(true, ProviderInstanceId.make("codex_traex"));
expect(registryReconciles).toBe(beforeDiscovery + 1);
expect((yield* proxy.status).traexAvailable).toBe(true);
const bridgeGrant = yield* proxy.grant({
...peer,
capability: "traex",
automatic: true,
});
peerBridgeKey = bridgeGrant.key;
expect(bridgeGrant.key).not.toBe(issued.key);
expect(yield* proxy.authorize(bridgeGrant.key)).toBeNull();
expect(yield* proxy.traexCandidates("host", issued.key)).toBeNull();
expect(yield* proxy.traexCandidates("host", bridgeGrant.key)).toEqual([
{ baseUrl: "http://127.0.0.1:8317", key: "local-bridge-secret", models: [] },
]);
const consumerBridgeKey = yield* traexConsumerRouteKey(state);
expect(
yield* proxy.traexCandidates("resolve", consumerBridgeKey, "generic-codex-only"),
).toEqual([]);
expect(
yield* proxy.traexCandidates("resolve", consumerBridgeKey, "traex-test"),
).toMatchObject([{ baseUrl: "http://127.0.0.1:8317", models: ["traex-test"] }]);
yield* fs.remove(home + "/.traex-bridge/api-key");
yield* proxy.refreshModelCatalog(true, ProviderInstanceId.make("codex_traex"));
expect(registryReconciles).toBe(beforeDiscovery + 2);
yield* proxy.manage({
operation: "configure",
enabled: true,
Expand Down Expand Up @@ -1346,6 +1400,24 @@ it.effect(
(yield* proxy.connect({ ...connect, grant: linkedGrant }).pipe(Effect.flip)).message,
).toContain("Connect to the inference host");
linked = true;
yield* proxy.registerFallback({
...connect,
driver: "traex",
grant: { ...linkedGrant, key: peerBridgeKey },
});
expect(
yield* proxy.traexCandidates("resolve", consumerBridgeKey, "traex-test"),
).toEqual([
{
baseUrl: linkedUrl + "/api/inference/traex/host",
key: peerBridgeKey,
models: ["traex-test"],
},
]);
expect(
yield* proxy.traexCandidates("resolve", consumerBridgeKey, "generic-codex-only"),
).toEqual([]);
expect(yield* proxy.traexCandidates("host", peerBridgeKey)).toEqual([]);
yield* proxy.connect({ ...connect, grant: linkedGrant });
expect(
(yield* settings.getSettings).providerInstances[ProviderInstanceId.make("codex")]
Expand Down Expand Up @@ -1739,20 +1811,28 @@ it.effect(
expect(yield* fs.exists(staleRuntime)).toBe(false);
expect(yield* fs.exists(otherPlatform)).toBe(true);
expect(yield* fs.exists(runtime)).toBe(true);
return issued;
return { grant: issued, oldPort: Number(new URL(local.baseUrl).port) };
}).pipe(Effect.provide(service)),
);
expect(stops).toBe(3);
const legacyConfig = config.stateDir + "/inference-proxy/config.yaml";
expect(yield* fs.exists(configPath)).toBe(false);
yield* NodeSocketServer.make({ host: "127.0.0.1", port: oldPort });
yield* fs.writeFileString(legacyConfig, "occupied listener configuration");
yield* Effect.scoped(
Effect.gen(function* () {
const proxy = yield* InferenceProxy.InferenceProxy;
expect((yield* proxy.status).routing).toMatchObject({
strategy: "fill-first",
sessionAffinity: false,
});
expect((yield* proxy.authorize(grant.key))?.baseUrl).toMatch(/^http:\/\/127\.0\.0\.1:/);
const restoredUrl = (yield* proxy.authorize(grant.key))!.baseUrl;
expect(restoredUrl).toMatch(/^http:\/\/127\.0\.0\.1:/);
expect(new URL(restoredUrl).port).not.toBe(String(oldPort));
expect(yield* fs.readFileString(legacyConfig)).toBe("occupied listener configuration");
yield* proxy.manage({ operation: "revoke", environmentId: peer.environmentId });
expect(yield* proxy.authorize(grant.key)).toBeNull();
expect(yield* proxy.traexCandidates("host", peerBridgeKey)).toBeNull();
expect(yield* proxy.health(grant.key)).toBeNull();
expect(
yield* proxy.grant({ ...peer, automatic: true }).pipe(Effect.result),
Expand All @@ -1764,6 +1844,9 @@ it.effect(
yield* Deferred.succeed(currentExit!, undefined);
yield* TestClock.adjust("1 second");
yield* Deferred.await(recovered);
expect((yield* proxy.grant({ environmentId: hostId, label: "Local" })).baseUrl).toBe(
restoredUrl,
);
yield* proxy.manage({ operation: "configure", enabled: false, sharing: false });
expect((yield* proxy.status).consumers).toEqual([]);
expect(Option.isSome(yield* state.get("inference-proxy-state"))).toBe(true);
Expand Down
Loading
Loading