dsh-vidi 0.6.0 → 0.6.2

package/lib/client.js

@@ -34609,6 +34609,61 @@ function RestreamPanel(props) {
 // src/client/Settings.tsx
 /** Who runs a speech engine (engines of one vendor share its key). */
 const vendorOf = (p) => p.vendor ?? p.id;
+/** The usual model makers, listed first whether or not they are set up in DSH yet (ids and names are matched loosely). */
+const MAKERS = [
+	{
+		id: "deepseek",
+		label: "DeepSeek",
+		re: /deepseek/
+	},
+	{
+		id: "openai",
+		label: "OpenAI",
+		re: /openai|chatgpt/
+	},
+	{
+		id: "anthropic",
+		label: "Anthropic",
+		re: /anthropic|claude/
+	},
+	{
+		id: "google",
+		label: "Google",
+		re: /google|gemini/
+	},
+	{
+		id: "qwen",
+		label: "Qwen",
+		re: /qwen|dashscope|aliyun|bailian|tongyi/
+	},
+	{
+		id: "glm",
+		label: "GLM",
+		re: /\bglm|zhipu|bigmodel|z\.ai/
+	},
+	{
+		id: "kimi",
+		label: "Kimi",
+		re: /kimi|moonshot/
+	},
+	{
+		id: "doubao",
+		label: "Doubao",
+		re: /doubao|volc|\bark\b/
+	},
+	{
+		id: "minimax",
+		label: "MiniMax",
+		re: /minimax/
+	},
+	{
+		id: "xai",
+		label: "xAI",
+		re: /\bxai\b|x\.ai|grok/
+	}
+];
+/** Which maker a DSH model provider belongs to; providers of no listed maker stand on their own. */
+const makerOf = (provider, name) => MAKERS.find((m) => m.re.test(`${provider} ${name}`.toLowerCase()))?.id ?? `p:${provider}`;
 /**
 * Subtitle models worth suggesting first: the fast, cheap tier of each family
 * (flash / mini / turbo / air / lite / haiku), newest first, and the one DSH
@@ -34616,8 +34671,12 @@ const vendorOf = (p) => p.vendor ?? p.id;
 */
 function recommended(models, fallback) {
 	const ver = (n) => Number(/(\d+(?:\.\d+)?)/.exec(n)?.[1] ?? 0);
-	const picks = models.filter((m) => /flash|mini|turbo|\bair\b|-air|lite|haiku/i.test(`${m.model} ${m.name}`) && !/embed|tts|audio|image|vision-preview|realtime/i.test(m.model)).sort((a, b) => ver(b.model) - ver(a.model)).slice(0, 2).map((m) => m.model);
-	if (fallback && models.some((m) => m.model === fallback)) picks.unshift(fallback);
+	const tier = /(^|[-_\s./])(flash|mini|turbo|air|lite|haiku)($|[-_\s./\d])/i;
+	const usable = models.filter((m) => !/embed|tts|audio|image-|realtime|rerank/i.test(m.model));
+	const fast = usable.filter((m) => tier.test(m.model) || tier.test(m.name));
+	const v = (m) => ver(m.name) || ver(m.model);
+	const picks = (fast.length ? fast : usable).slice().sort((a, b) => v(b) - v(a)).slice(0, fast.length ? 2 : 1).map((m) => m.model);
+	if (fallback && models.some((m) => m.model === fallback) && !picks.includes(fallback)) picks.unshift(fallback);
 	return new Set(picks);
 }
 const engineLabel = (t, id) => {
@@ -34688,6 +34747,22 @@ function Settings(props) {
 		id: m.provider,
 		name: m.providerName
 	}])]).values()];
+	const makerProviders = (maker) => providersOf.filter((p) => maker.startsWith("p:") ? `p:${p.id}` === maker : makerOf(p.id, p.name) === maker).map((p) => p.id);
+	const [makerPick, setMakerPick] = (0, react.useState)(null);
+	const shownMaker = makerPick ?? (current ? makerOf(current.provider, providersOf.find((p) => p.id === current.provider)?.name ?? "") : "deepseek");
+	const makerUnset = makerProviders(shownMaker).length === 0;
+	const chooseMaker = (maker) => {
+		const ids = makerProviders(maker);
+		if (!ids.length) {
+			setMakerPick(maker);
+			return;
+		}
+		setMakerPick(null);
+		const list = (models?.models ?? []).filter((m) => ids.includes(m.provider));
+		const rec = recommended(list, models?.fallback && ids.includes(models.fallback.provider) ? models.fallback.model : void 0);
+		const pick = list.find((m) => rec.has(m.model)) ?? list[0];
+		if (pick) chooseModel(modelKey(pick));
+	};
 	const sees = !!models?.models.find((x) => modelKey(x) === modelKey(current))?.image;
 	const saveKey = async (value) => {
 		if (!cur) return;
@@ -34743,8 +34818,7 @@ function Settings(props) {
 							options: vendors.map((p) => ({
 								value: vendorOf(p),
 								label: vendorName(vendorOf(p)),
-								hint: p.ready ? void 0 : t(p.online ? "set.engine.noKey" : "set.engine.notInstalled"),
-								group: p.online ? t(p.region === "cn" ? "set.engine.cn" : "set.engine.intl") : void 0
+								hint: p.ready ? void 0 : t(p.online ? "set.engine.noKey" : "set.engine.notInstalled")
 							}))
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pick, {
 							value: engine,
@@ -34832,47 +34906,59 @@ function Settings(props) {
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 							className: "duo",
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pick, {
-								value: current?.provider ?? "",
+								value: shownMaker,
 								placeholder: "…",
-								onChange: (v) => {
-									const list = (models?.models ?? []).filter((m) => m.provider === v);
-									const rec = recommended(list, models?.fallback?.provider === v ? models.fallback.model : void 0);
-									const pick = list.find((m) => rec.has(m.model)) ?? list[0];
-									if (pick) chooseModel(modelKey(pick));
-								},
-								options: providersOf.map((p) => ({
-									value: p.id,
-									label: p.name
-								}))
+								onChange: chooseMaker,
+								options: [...MAKERS.map((m) => ({
+									value: m.id,
+									label: t(`maker.${m.id}`) !== `maker.${m.id}` ? t(`maker.${m.id}`) : m.label,
+									hint: makerProviders(m.id).length ? void 0 : t("set.model.notSet")
+								})), ...providersOf.filter((p) => makerOf(p.id, p.name).startsWith("p:")).map((p) => ({
+									value: `p:${p.id}`,
+									label: p.name,
+									group: t("set.others")
+								}))]
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Pick, {
-								value: modelKey(current),
-								placeholder: "…",
+								value: makerUnset ? "" : modelKey(current),
+								placeholder: makerUnset ? "—" : "…",
+								disabled: makerUnset,
 								onChange: chooseModel,
 								options: (() => {
-									const listed = (models?.models ?? []).filter((m) => m.provider === current?.provider);
-									const list = current && !listed.some((m) => m.model === current.model) ? [{
+									const ids = makerProviders(shownMaker);
+									const listed = (models?.models ?? []).filter((m) => ids.includes(m.provider));
+									const list = current && ids.includes(current.provider) && !listed.some((m) => m.provider === current.provider && m.model === current.model) ? [{
 										provider: current.provider,
 										providerName: current.provider,
 										model: current.model,
 										name: current.model,
 										image: false
 									}, ...listed] : listed;
-									const rec = recommended(list, models?.fallback?.provider === current?.provider ? models?.fallback?.model : void 0);
-									const tag = (m) => [modelKey(m) === modelKey(models?.fallback) ? t("set.model.dshDefault") : "", m.image ? t("set.model.image") : ""].filter(Boolean).join(" · ") || void 0;
-									return [...list.filter((m) => rec.has(m.model)).map((m) => ({
+									const rec = recommended(list, models?.fallback && ids.includes(models.fallback.provider) ? models.fallback.model : void 0);
+									const several = ids.length > 1;
+									const tag = (m) => [
+										several ? m.providerName : "",
+										modelKey(m) === modelKey(models?.fallback) ? t("set.model.dshDefault") : "",
+										m.image ? t("set.model.image") : ""
+									].filter(Boolean).join(" · ") || void 0;
+									const top = list.filter((m) => rec.has(m.model));
+									return [...top.map((m) => ({
 										value: modelKey(m),
 										label: m.name,
 										hint: tag(m),
 										group: t("set.recommended")
-									})), ...list.filter((m) => !rec.has(m.model)).map((m) => ({
+									})), ...list.filter((m) => !top.includes(m)).map((m) => ({
 										value: modelKey(m),
 										label: m.name,
 										hint: tag(m),
-										group: rec.size ? t("set.allModels") : void 0
+										group: top.length ? several ? m.providerName : t("set.allModels") : void 0
 									}))];
 								})()
 							})]
 						}),
+						makerUnset && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "hint",
+							children: t("set.model.addInDsh").replace("{v}", MAKERS.find((m) => m.id === shownMaker)?.label ?? shownMaker)
+						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 							className: "hint",
 							children: t(sees ? "set.model.sees" : "set.model.text")
@@ -36924,6 +37010,16 @@ const en = {
 	"engine.openai-translate": "OpenAI live translation",
 	"set.engine.intl": "Online",
 	"set.recommended": "Recommended",
+	"set.others": "Other",
+	"set.model.notSet": "not set up",
+	"set.model.addInDsh": "{v} is not set up in DSH yet. Add it under DSH Settings → Models; it shows up here right after.",
+	"maker.qwen": "Qwen (Alibaba)",
+	"maker.glm": "GLM (Zhipu)",
+	"maker.kimi": "Kimi (Moonshot)",
+	"maker.doubao": "Doubao (ByteDance)",
+	"maker.xai": "xAI (Grok)",
+	"maker.anthropic": "Anthropic (Claude)",
+	"maker.google": "Google (Gemini)",
 	"set.allModels": "All models",
 	"set.model.dshDefault": "DSH default",
 	"engine.note.openai-translate": "listens and translates",
@@ -37283,6 +37379,16 @@ const zh = {
 	"engine.openai-translate": "OpenAI 实时翻译",
 	"set.engine.intl": "在线 · 海外",
 	"set.recommended": "推荐",
+	"set.others": "其他",
+	"set.model.notSet": "未配置",
+	"set.model.addInDsh": "还没在 DSH 里配置 {v}。到 DSH 设置 → 模型 里添加，加好后这里就能选。",
+	"maker.qwen": "通义千问",
+	"maker.glm": "智谱 GLM",
+	"maker.kimi": "Kimi",
+	"maker.doubao": "豆包",
+	"maker.xai": "xAI（Grok）",
+	"maker.anthropic": "Anthropic（Claude）",
+	"maker.google": "Google（Gemini）",
 	"set.allModels": "全部模型",
 	"set.model.dshDefault": "DSH 默认",
 	"engine.note.openai-translate": "边听边翻",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vidi",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "A video tool for DeepSeek Harness: watch live streams, videos and podcasts with real-time subtitles in any language, then clip and download",
   "type": "module",
   "license": "PolyForm-Noncommercial-1.0.0",