Normalize branch and model selection handling

- Deduplicate terminal IDs and favorite model slugs with trim-aware iteration - Use effect-based filtering for local branch and built-in model lists - Switch stable array handling to non-mutating `toSorted`

Julius Marminge committed 6 months ago

Commit 7793bd61 parent 7f03f4d8 files · +63 −23Browse files

Showing the changes to apps/web/src/modelSelection.ts (1 of 8 files). Show all

Unified · Split

apps/web/src/modelSelection.ts+8−4

 } from "@t3tools/shared/model";
 import { getComposerProviderState } from "./components/chat/composerProviderState";
 import { UnifiedSettings } from "@t3tools/contracts/settings";
+import * as Arr from "effect/Array";
+import * as Result from "effect/Result";
 import {
   getDefaultServerModel,
   getProviderModels,
   const options: AppModelOption[] = getProviderModels(providers, provider).map(toAppModelOption);
   const seen = new Set(options.map((option) => option.slug));
   const builtInModelSlugs = new Set(
-    getProviderModels(providers, provider)
+    Arr.filterMap(getProviderModels(providers, provider), (model) =>
-      .filter((model) => !model.isCustom)
+      model.isCustom ? Result.failVoid : Result.succeed(model.slug),
-      .map((model) => model.slug),
+    ),
   );
   // Read from the default instance's config first (that's where edits
   const options: AppModelOption[] = entry.models.map(toAppModelOption);
   const seen = new Set(options.map((option) => option.slug));
   const builtInModelSlugs = new Set(
-    entry.models.filter((model) => !model.isCustom).map((model) => model.slug),
+    Arr.filterMap(entry.models, (model) =>
+      model.isCustom ? Result.failVoid : Result.succeed(model.slug),
+    ),
   );
   const customModels = readInstanceCustomModels(settings, entry.instanceId, entry.driverKind);