@morlay/dsh-web-search-ollama 0.0.5 → 0.0.7

package/dist/client.d.cts

@@ -8,7 +8,7 @@ declare const zh: {
   readonly baseURL: "端点";
   readonly baseURLHint: "端点根，`/api/web_search` 由 provider 拼；默认 https://ollama.com。";
   readonly maxResults: "默认结果数";
-  readonly maxResultsHint: "请求没带结果数时用它；留空就是让 Ollama 用自己的默认。";
+  readonly maxResultsHint: "请求没带结果数时用它；默认就是让 Ollama 用自己的默认。";
 };
 type WebSearchFieldLocaleKey = keyof typeof zh;
 //#endregion
@@ -22,4 +22,5 @@ declare module "@deepseek-ai/dsh-client-ui-slots" {
 }
 export declare const inject: string[];
 export declare function apply(ctx: Context): void;
-//#endregion
+//#endregion
+export {};

package/dist/client.d.mts

@@ -8,7 +8,7 @@ declare const zh: {
   readonly baseURL: "端点";
   readonly baseURLHint: "端点根，`/api/web_search` 由 provider 拼；默认 https://ollama.com。";
   readonly maxResults: "默认结果数";
-  readonly maxResultsHint: "请求没带结果数时用它；留空就是让 Ollama 用自己的默认。";
+  readonly maxResultsHint: "请求没带结果数时用它；默认就是让 Ollama 用自己的默认。";
 };
 type WebSearchFieldLocaleKey = keyof typeof zh;
 //#endregion
@@ -22,4 +22,5 @@ declare module "@deepseek-ai/dsh-client-ui-slots" {
 }
 export declare const inject: string[];
 export declare function apply(ctx: Context): void;
-//#endregion
+//#endregion
+export {};

package/dist/client.mjs

@@ -0,0 +1,51 @@
+//#region src/client/locales.ts
+const zh = {
+	apiKey: "API key",
+	apiKeyHint: "字面值；能走凭证服务时优先用下面的引用名，别把密钥写进配置文件。",
+	apiKeyEnv: "凭证引用名",
+	apiKeyEnvHint: "每次搜索经凭证服务解析一次；默认 `OLLAMA_API_KEY`。",
+	baseURL: "端点",
+	baseURLHint: "端点根，`/api/web_search` 由 provider 拼；默认 https://ollama.com。",
+	maxResults: "默认结果数",
+	maxResultsHint: "请求没带结果数时用它；默认就是让 Ollama 用自己的默认。"
+};
+const en = {
+	apiKey: "API key",
+	apiKeyHint: "Literal value; prefer the credential reference below and never inline secrets.",
+	apiKeyEnv: "Credential reference",
+	apiKeyEnvHint: "Resolved through the credentials service per search; defaults to `OLLAMA_API_KEY`.",
+	baseURL: "Endpoint",
+	baseURLHint: "Endpoint root; the provider appends `/api/web_search`. Defaults to https://ollama.com.",
+	maxResults: "Default result count",
+	maxResultsHint: "Used when a request carries none; the default keeps Ollama's own default."
+};
+//#endregion
+//#region src/client/index.ts
+const WEB_SEARCH_NS = "web-search-ollama";
+const NS = "settings.web-search-ollama";
+const FIELDS = [
+	"apiKey",
+	"apiKeyEnv",
+	"baseURL",
+	"maxResults"
+];
+const inject = ["locale"];
+function apply(ctx) {
+	const t = ctx.locale.bind(NS);
+	ctx.effect(() => ctx.locale.register(NS, {
+		zh,
+		en
+	}), "web-search-ollama: field locale");
+	ctx.inject(["schemaFormHints"], (scope) => scope.effect(() => {
+		const hints = scope.schemaFormHints;
+		const offs = FIELDS.map((key) => hints.describe(WEB_SEARCH_NS, [key], () => ({
+			label: t(key),
+			hint: t(`${key}Hint`)
+		})));
+		return () => {
+			for (const off of offs) off();
+		};
+	}, "web-search-ollama: field wording"));
+}
+//#endregion
+export { NS, WEB_SEARCH_NS, apply, inject };

package/dist/index.cjs

@@ -0,0 +1,191 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region \0rolldown/runtime.js
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+//#endregion
+let _deepseek_ai_dsh_credentials = require("@deepseek-ai/dsh-credentials");
+let _deepseek_ai_dsh_launch_environment = require("@deepseek-ai/dsh-launch-environment");
+let _deepseek_ai_schemastery = require("@deepseek-ai/schemastery");
+_deepseek_ai_schemastery = __toESM(_deepseek_ai_schemastery, 1);
+let _deepseek_ai_dsh_web = require("@deepseek-ai/dsh-web");
+//#region src/provider.ts
+const OLLAMA_PROVIDER_ID = "ollama";
+const OLLAMA_DEFAULT_BASE_URL = "https://ollama.com";
+const OLLAMA_DEFAULT_MAX_RESULTS = 5;
+const OLLAMA_MAX_RESULTS_LIMIT = 10;
+const USER_AGENT = "morlay-dsh-plugin/0.0.1";
+function mapOllamaResult(result) {
+	const url = result.url;
+	if (typeof url !== "string" || url.length === 0) return void 0;
+	const title = typeof result.title === "string" && result.title.length > 0 ? result.title : void 0;
+	const snippet = typeof result.content === "string" && result.content.length > 0 ? result.content : void 0;
+	return {
+		url,
+		...title === void 0 ? {} : { title },
+		...snippet === void 0 ? {} : { snippet }
+	};
+}
+function mapOllamaResponse(response) {
+	const results = response.results;
+	if (results !== void 0 && !Array.isArray(results)) throw new TypeError("Ollama returned a non-array `results` field");
+	return {
+		sources: (results ?? []).map((result) => mapOllamaResult(result)).filter((source) => source !== void 0),
+		truncated: false
+	};
+}
+var OllamaSearchProvider = class {
+	options;
+	id = OLLAMA_PROVIDER_ID;
+	constructor(options) {
+		this.options = options;
+	}
+	available() {
+		const { apiKey, resolveApiKey, baseURL, maxResults } = this.options;
+		return (apiKey !== void 0 && apiKey.length > 0 || resolveApiKey !== void 0) && URL.canParse(baseURL) && (maxResults === void 0 || isPositiveInteger(maxResults));
+	}
+	async search(request, signal) {
+		const apiKey = await this.apiKey();
+		const maxResults = clampMaxResults(request.maxResults ?? this.options.maxResults);
+		let response;
+		try {
+			response = await fetch(`${this.options.baseURL}/api/web_search`, {
+				method: "POST",
+				redirect: "error",
+				headers: {
+					authorization: `Bearer ${apiKey}`,
+					"content-type": "application/json",
+					accept: "application/json",
+					"user-agent": USER_AGENT
+				},
+				body: JSON.stringify({
+					query: request.query,
+					...maxResults === void 0 ? {} : { max_results: maxResults }
+				}),
+				...signal === void 0 ? {} : { signal }
+			});
+		} catch (error) {
+			if (isAbortError(error)) throw searchAborted(error);
+			throw new _deepseek_ai_dsh_web.WebError(`Ollama search request failed: ${String(error)}`, "WEB_PROVIDER_ERROR", { cause: error });
+		}
+		if (!response.ok) {
+			let message = `Ollama API error (HTTP ${response.status})`;
+			try {
+				const detail = (await response.json()).error;
+				if (typeof detail === "string" && detail.length > 0) message = detail;
+			} catch (error) {
+				if (isAbortError(error)) throw searchAborted(error);
+			}
+			throw new _deepseek_ai_dsh_web.WebError(message, "WEB_PROVIDER_ERROR");
+		}
+		try {
+			return mapOllamaResponse(await response.json());
+		} catch (error) {
+			if (isAbortError(error)) throw searchAborted(error);
+			throw new _deepseek_ai_dsh_web.WebError(`Ollama returned an unprocessable response body: ${String(error)}`, "WEB_PROVIDER_ERROR", { cause: error });
+		}
+	}
+	async apiKey() {
+		const literal = this.options.apiKey;
+		if (literal !== void 0 && literal.length > 0) return literal;
+		let resolved;
+		try {
+			resolved = await this.options.resolveApiKey?.();
+		} catch (error) {
+			if (isAbortError(error)) throw searchAborted(error);
+			throw new _deepseek_ai_dsh_web.WebError(`Ollama search credential resolution failed: ${String(error)}`, "WEB_PROVIDER_ERROR", { cause: error });
+		}
+		if (resolved !== void 0 && resolved.length > 0) return resolved;
+		throw new _deepseek_ai_dsh_web.WebError(`Ollama search has no API key for "${this.options.apiKeyEnv}"; store it through the credentials service (the web Models page writes it), export it in the launching environment, or set a literal "apiKey" in the web-search-ollama config`, "WEB_PROVIDER_CREDENTIAL_MISSING");
+	}
+};
+function clampMaxResults(maxResults) {
+	if (maxResults === void 0) return void 0;
+	return Math.min(maxResults, 10);
+}
+function isPositiveInteger(value) {
+	return Number.isInteger(value) && value > 0;
+}
+function isAbortError(error) {
+	return error instanceof DOMException && error.name === "AbortError";
+}
+function searchAborted(cause) {
+	return new _deepseek_ai_dsh_web.WebError("Ollama search aborted", "WEB_ABORTED", { cause });
+}
+//#endregion
+//#region src/index.ts
+const name = "web-search-ollama";
+const inject = ["web"];
+const DEFAULT_API_KEY_ENV = "OLLAMA_API_KEY";
+const localized = (text) => text;
+const Config = _deepseek_ai_schemastery.default.object({
+	apiKey: _deepseek_ai_schemastery.default.string().role("secret").description(localized({
+		zh: "Ollama 的 API key 字面值；能用凭证服务时优先用下面的引用名，别把密钥写进配置文件。",
+		en: "Literal Ollama API key. Prefer the credential reference below; do not put secrets in a config file."
+	})).volatile(),
+	apiKeyEnv: _deepseek_ai_schemastery.default.string().role("credential-ref").description(localized({
+		zh: "凭证引用名（默认 `OLLAMA_API_KEY`）：每次搜索经凭证服务解析一次。",
+		en: "Credential reference resolved through the credentials service on every search (default `OLLAMA_API_KEY`)."
+	})).volatile(),
+	baseURL: _deepseek_ai_schemastery.default.string().description(localized({
+		zh: "端点根，`/api/web_search` 由 provider 拼；默认 https://ollama.com。",
+		en: "Endpoint root; the provider appends `/api/web_search`. Defaults to https://ollama.com."
+	})).volatile(),
+	maxResults: _deepseek_ai_schemastery.default.number().step(1).min(1).description(localized({
+		zh: "请求没带结果数时用的默认值；省略就是让 Ollama 用自己的默认。",
+		en: "Default result count when a request carries none; unset keeps Ollama's own default."
+	})).volatile()
+});
+function apply(ctx, config) {
+	ctx.web.registerSearchProvider(new OllamaSearchProvider({
+		get apiKey() {
+			const literal = config.apiKey.get();
+			return literal !== void 0 && literal.length > 0 ? literal : void 0;
+		},
+		resolveApiKey: async () => {
+			const reference = (0, _deepseek_ai_dsh_credentials.credentialRef)(config.apiKeyEnv.get() ?? DEFAULT_API_KEY_ENV);
+			const credentials = ctx.get("credentials");
+			if (credentials !== void 0) return (await credentials.resolve(reference))?.value;
+			const ambient = (0, _deepseek_ai_dsh_launch_environment.launchEnvironmentOf)(ctx).get(reference);
+			return ambient !== void 0 && ambient.value.length > 0 ? ambient.value : void 0;
+		},
+		get apiKeyEnv() {
+			return config.apiKeyEnv.get() ?? DEFAULT_API_KEY_ENV;
+		},
+		get baseURL() {
+			return config.baseURL.get() ?? "https://ollama.com";
+		},
+		get maxResults() {
+			return config.maxResults.get();
+		}
+	}));
+}
+//#endregion
+exports.Config = Config;
+exports.OLLAMA_DEFAULT_BASE_URL = OLLAMA_DEFAULT_BASE_URL;
+exports.OLLAMA_DEFAULT_MAX_RESULTS = OLLAMA_DEFAULT_MAX_RESULTS;
+exports.OLLAMA_MAX_RESULTS_LIMIT = OLLAMA_MAX_RESULTS_LIMIT;
+exports.OLLAMA_PROVIDER_ID = OLLAMA_PROVIDER_ID;
+exports.OllamaSearchProvider = OllamaSearchProvider;
+exports.apply = apply;
+exports.inject = inject;
+exports.mapOllamaResponse = mapOllamaResponse;
+exports.mapOllamaResult = mapOllamaResult;
+exports.name = name;

package/dist/index.d.mts

@@ -1,7 +1,7 @@
+import { Volatile } from "@deepseek-ai/cosmokit";
+import { Context } from "@deepseek-ai/cordis";
 import z from "@deepseek-ai/schemastery";
 import { WebSearchProvider, WebSearchRequest, WebSearchResult, WebSearchSource } from "@deepseek-ai/dsh-web";
-import { Context } from "@deepseek-ai/cordis";
-import { Volatile } from "@deepseek-ai/cosmokit";
 //#region src/types.d.ts
 interface OllamaSearchResult {
   title?: string | null;

package/dist/rows.cjs

@@ -0,0 +1,10 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region src/rows.ts
+function webSearchRows() {
+	return [{ insert: [{
+		id: "web-search-ollama",
+		name: "@morlay/dsh-web-search-ollama"
+	}] }];
+}
+//#endregion
+exports.webSearchRows = webSearchRows;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/dsh-web-search-ollama",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Ollama-backed search provider for the DeepSeek Harness web seam (ctx.web): one web_search backend calling POST https://ollama.com/api/web_search.",
   "keywords": [
     "dsh",
@@ -21,32 +21,39 @@
   ],
   "type": "module",
   "exports": {
-    ".": "./dist/index.mjs",
-    "./rows": "./dist/rows.mjs",
+    ".": {
+      "types": "./dist/index.d.mts",
+      "default": "./dist/index.mjs"
+    },
+    "./rows": {
+      "types": "./dist/rows.d.mts",
+      "default": "./dist/rows.mjs"
+    },
     "./package.json": "./package.json",
     "./client": {
-      "types": "./dist/client.d.cts",
-      "default": "./dist/client.cjs"
+      "types": "./dist/client.d.mts",
+      "import": "./dist/client.mjs",
+      "default": "./dist/client.mjs"
     },
     "./locale/*.json": "./locale/*.json"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.4"
+    "@deepseek-ai/schemastery": "^3.18.5-alpha.2"
   },
   "devDependencies": {
-    "@deepseek-ai/cosmokit": "1.8.5",
-    "@deepseek-ai/dsh-client-locale": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.2",
-    "@morlay/dsh-client-ui-primitives": "0.0.7"
+    "@deepseek-ai/cosmokit": "1.8.6-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.2.1-alpha.5",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-alpha.5",
+    "@morlay/dsh-client-ui-primitives": "0.0.9"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/cosmokit": "^1.8.5",
-    "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-credentials": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-launch-environment": "^0.2.0-rc.2",
-    "@deepseek-ai/dsh-web": "^0.2.0-rc.2"
+    "@deepseek-ai/cordis": "^4.0.5-alpha.2",
+    "@deepseek-ai/cosmokit": "^1.8.6-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "^0.2.1-alpha.5",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.1-alpha.5",
+    "@deepseek-ai/dsh-credentials": "^0.2.1-alpha.5",
+    "@deepseek-ai/dsh-launch-environment": "^0.2.1-alpha.5",
+    "@deepseek-ai/dsh-web": "^0.2.1-alpha.5"
   },
   "dsh": {
     "client": {

package/src/client/index.ts

@@ -4,7 +4,6 @@
 import type { Context } from "@deepseek-ai/cordis";
 import type {} from "@deepseek-ai/dsh-client-locale/client";
 import type {} from "@deepseek-ai/dsh-client-ui-slots";
-import { apply as installUiPrimitives } from "@morlay/dsh-client-ui-primitives/client";
 import { en, zh, type WebSearchFieldLocaleKey } from "./locales.ts";
 
 // 本包 host 行 id：行配置页读的就是这个命名空间。
@@ -29,7 +28,6 @@ export const inject = ["locale"];
 // 给这一行的四个字段补文案。
 export function apply(ctx: Context): void {
   // 基础面随本包 inline（不再是装配行）：装上它提供的字典、字段槽与按行配置页；多份副本只装一次。
-  installUiPrimitives(ctx);
   const t = ctx.locale.bind(NS);
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), "web-search-ollama: field locale");
   // 提示面由行配置表单提供：等它可用再注册（`ctx.get` 在它还没提供时拿不到，注册会被静静跳过）。

package/src/client/locales.ts

@@ -8,7 +8,7 @@ export const zh = {
   baseURL: "端点",
   baseURLHint: "端点根，`/api/web_search` 由 provider 拼；默认 https://ollama.com。",
   maxResults: "默认结果数",
-  maxResultsHint: "请求没带结果数时用它；留空就是让 Ollama 用自己的默认。",
+  maxResultsHint: "请求没带结果数时用它；默认就是让 Ollama 用自己的默认。",
 } as const;
 
 export const en: Record<keyof typeof zh, string> = {
@@ -21,7 +21,7 @@ export const en: Record<keyof typeof zh, string> = {
   baseURLHint:
     "Endpoint root; the provider appends `/api/web_search`. Defaults to https://ollama.com.",
   maxResults: "Default result count",
-  maxResultsHint: "Used when a request carries none; unset keeps Ollama's own default.",
+  maxResultsHint: "Used when a request carries none; the default keeps Ollama's own default.",
 };
 
 export type WebSearchFieldLocaleKey = keyof typeof zh;

package/dist/index.d.cts

@@ -1,56 +0,0 @@
-import { Context } from "@deepseek-ai/cordis";
-import { Volatile } from "@deepseek-ai/cosmokit";
-import z from "@deepseek-ai/schemastery";
-import { WebSearchProvider, WebSearchRequest, WebSearchResult, WebSearchSource } from "@deepseek-ai/dsh-web";
-//#region src/types.d.ts
-interface OllamaSearchResult {
-  title?: string | null;
-  url?: string | null;
-  content?: string | null;
-}
-interface OllamaSearchResponse {
-  results?: OllamaSearchResult[];
-}
-//#endregion
-//#region src/provider.d.ts
-export declare const OLLAMA_PROVIDER_ID = "ollama";
-export declare const OLLAMA_DEFAULT_BASE_URL = "https://ollama.com";
-export declare const OLLAMA_DEFAULT_MAX_RESULTS = 5;
-export declare const OLLAMA_MAX_RESULTS_LIMIT = 10;
-interface OllamaSearchProviderOptions {
-  apiKey?: string | undefined;
-  resolveApiKey?: () => Promise<string | undefined>;
-  apiKeyEnv: string;
-  baseURL: string;
-  maxResults?: number | undefined;
-}
-export declare function mapOllamaResult(result: OllamaSearchResult): WebSearchSource | undefined;
-export declare function mapOllamaResponse(response: OllamaSearchResponse): WebSearchResult;
-export declare class OllamaSearchProvider implements WebSearchProvider {
-  private readonly options;
-  readonly id = "ollama";
-  constructor(options: OllamaSearchProviderOptions);
-  available(): boolean;
-  search(request: WebSearchRequest, signal?: AbortSignal): Promise<WebSearchResult>;
-  private apiKey;
-}
-//#endregion
-//#region src/index.d.ts
-export declare const name = "web-search-ollama";
-export declare const inject: string[];
-export interface Config {
-  apiKey?: string;
-  apiKeyEnv?: string;
-  baseURL?: string;
-  maxResults?: number;
-}
-export interface ResolvedConfig {
-  readonly apiKey: Volatile<string | undefined>;
-  readonly apiKeyEnv: Volatile<string | undefined>;
-  readonly baseURL: Volatile<string | undefined>;
-  readonly maxResults: Volatile<number | undefined>;
-}
-export declare const Config: z<Config, ResolvedConfig>;
-export declare function apply(ctx: Context, config: ResolvedConfig): void;
-//#endregion
-export type { OllamaSearchProviderOptions };

package/dist/rows.d.cts

@@ -1,12 +0,0 @@
-//#region src/rows.d.ts
-export interface PatchRow {
-  readonly id?: string;
-  readonly insert?: readonly RowEntry[];
-}
-export interface RowEntry {
-  readonly id: string;
-  readonly name: string;
-  readonly config?: Readonly<Record<string, unknown>>;
-}
-export declare function webSearchRows(): readonly PatchRow[];
-//#endregion