Merge remote-tracking branch 'upstream/main'

app/utils/checkers.ts

@@ -0,0 +1,21 @@
+import { useAccessStore } from "../store/access";
+import { useAppConfig } from "../store/config";
+import { collectModels } from "./model";
+
+export function identifyDefaultClaudeModel(modelName: string) {
+  const accessStore = useAccessStore.getState();
+  const configStore = useAppConfig.getState();
+
+  const allModals = collectModels(
+    configStore.models,
+    [configStore.customModels, accessStore.customModels].join(","),
+  );
+
+  const modelMeta = allModals.find((m) => m.name === modelName);
+
+  return (
+    modelName.startsWith("claude") &&
+    modelMeta &&
+    modelMeta.provider?.providerType === "anthropic"
+  );
+}

app/utils/model.ts

@@ -22,6 +22,12 @@ export function collectModelTable(
     };
   });
 
+  const customProvider = (modelName: string) => ({
+    id: modelName,
+    providerName: "",
+    providerType: "custom",
+  });
+
   // server custom models
   customModels
     .split(",")
@@ -42,7 +48,7 @@ export function collectModelTable(
           name,
           displayName: displayName || name,
           available,
-          provider: modelTable[name]?.provider, // Use optional chaining
+          provider: modelTable[name]?.provider ?? customProvider(name), // Use optional chaining
         };
       }
     });

app/utils/object.ts

@@ -0,0 +1,17 @@
+export function omit<T extends object, U extends (keyof T)[]>(
+  obj: T,
+  ...keys: U
+): Omit<T, U[number]> {
+  const ret: any = { ...obj };
+  keys.forEach((key) => delete ret[key]);
+  return ret;
+}
+
+export function pick<T extends object, U extends (keyof T)[]>(
+  obj: T,
+  ...keys: U
+): Pick<T, U[number]> {
+  const ret: any = {};
+  keys.forEach((key) => (ret[key] = obj[key]));
+  return ret;
+}