@nemesis-oss/ollama-sdk 1.17.0 → 1.18.0

package/dist/index.cjs

@@ -4179,7 +4179,7 @@ var SystemOneNoulQuestionSchema = zod.z.object({
 var SystemOneScoreQuestionSchema = zod.z.object({
   type: zod.z.enum(["score"]),
   instructions: SystemOneContentSchema,
-  criteria: zod.z.array(zod.z.string()).min(2).max(26)
+  criteria: zod.z.array(zod.z.string()).min(2).max(10)
 });
 
 // src/generated/models/SystemOneRequest.schema.ts
@@ -4214,7 +4214,7 @@ var SystemOneNoulAnswerSchema = zod.z.object({
 });
 var SystemOneScoreAnswerSchema = zod.z.object({
   type: zod.z.enum(["score"]),
-  score: zod.z.number().min(0).max(25),
+  score: zod.z.number().min(0).max(9),
   legend: zod.z.object({}).catchall(zod.z.string()),
   probabilities: SystemOneProbabilitiesSchema,
   confidence: SystemOneConfidenceSchema
@@ -5525,9 +5525,16 @@ var FailoverHttpClient = class {
 };
 
 // src/decision.ts
+function validateThreshold(value, name) {
+  if (value === void 0) return;
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0 || value > 1) {
+    throw new RangeError(`${name} must be a number in (0, 1] \u2014 got ${String(value)}`);
+  }
+}
 function createDecision(client) {
   return {
     async choice(params) {
+      validateThreshold(params.minConfidence, "minConfidence");
       const response = await client.systemOne({
         model: params.model,
         state: params.state,
@@ -5546,10 +5553,12 @@ function createDecision(client) {
         choice: answer.choice,
         probabilities: answer.probabilities,
         confidence: answer.confidence,
+        ...params.minConfidence !== void 0 ? { isConfident: answer.confidence >= params.minConfidence } : {},
         usage: response.usage
       };
     },
     async noul(params) {
+      validateThreshold(params.minProbability, "minProbability");
       const response = await client.systemOne({
         model: params.model,
         state: params.state,
@@ -5565,11 +5574,12 @@ function createDecision(client) {
       const answer = response.answers.decision;
       return {
         noul: answer.noul,
-        bool: answer.noul >= 0.5,
+        bool: answer.noul >= (params.minProbability ?? 0.5),
         usage: response.usage
       };
     },
     async score(params) {
+      validateThreshold(params.minConfidence, "minConfidence");
       const response = await client.systemOne({
         model: params.model,
         state: params.state,
@@ -5589,10 +5599,12 @@ function createDecision(client) {
         legend: answer.legend,
         probabilities: answer.probabilities,
         confidence: answer.confidence,
+        ...params.minConfidence !== void 0 ? { isConfident: answer.confidence >= params.minConfidence } : {},
         usage: response.usage
       };
     },
     async route(params) {
+      validateThreshold(params.minConfidence, "minConfidence");
       const response = await client.systemOne({
         model: params.model,
         state: params.state,
@@ -5609,10 +5621,12 @@ function createDecision(client) {
       const answer = response.answers.decision;
       return {
         route: answer.choice,
-        confidence: answer.confidence
+        confidence: answer.confidence,
+        ...params.minConfidence !== void 0 ? { isConfident: answer.confidence >= params.minConfidence } : {}
       };
     },
     async verify(params) {
+      validateThreshold(params.minProbability, "minProbability");
       const state = {
         claim: params.claim,
         evidence: params.evidence
@@ -5631,11 +5645,12 @@ function createDecision(client) {
       });
       const answer = response.answers.decision;
       return {
-        verified: answer.noul >= 0.5,
+        verified: answer.noul >= (params.minProbability ?? 0.5),
         probability: answer.noul
       };
     },
     async rank(params) {
+      validateThreshold(params.minConfidence, "minConfidence");
       const promises = params.candidates.map(async (candidate) => {
         const response = await client.systemOne({
           model: params.model,
@@ -5654,7 +5669,8 @@ function createDecision(client) {
         return {
           candidate: candidate.id,
           score: answer.score,
-          confidence: answer.confidence
+          confidence: answer.confidence,
+          ...params.minConfidence !== void 0 ? { isConfident: answer.confidence >= params.minConfidence } : {}
         };
       });
       const results = await Promise.all(promises);
@@ -6786,6 +6802,64 @@ function toResponse(stream, init = {}) {
   return new Response(body, { ...init, headers });
 }
 
+// src/streaming/progress.ts
+function computeProgressPercent(chunk) {
+  if (typeof chunk.total !== "number" || typeof chunk.completed !== "number") return void 0;
+  if (chunk.total <= 0) return void 0;
+  const ratio = chunk.completed / chunk.total;
+  const clamped = Math.max(0, Math.min(1, ratio));
+  return Math.round(clamped * 1e4) / 100;
+}
+function toPullProgressEvent(chunk) {
+  return {
+    status: chunk.status,
+    ...chunk.digest !== void 0 ? { digest: chunk.digest } : {},
+    ...chunk.total !== void 0 ? { total: chunk.total } : {},
+    ...chunk.completed !== void 0 ? { completed: chunk.completed } : {},
+    percent: computeProgressPercent(chunk),
+    raw: chunk
+  };
+}
+function createProgressSpeedTracker() {
+  let epochDigest;
+  let epochStartMs = 0;
+  let epochStartCompleted = 0;
+  return (chunk) => {
+    if (typeof chunk.completed !== "number") return {};
+    const digestChanged = chunk.digest !== void 0 && chunk.digest !== epochDigest;
+    const regressed = chunk.completed < epochStartCompleted;
+    if (digestChanged || regressed) {
+      epochDigest = chunk.digest;
+      epochStartMs = performance.now();
+      epochStartCompleted = chunk.completed;
+      return {};
+    }
+    const elapsedSeconds = (performance.now() - epochStartMs) / 1e3;
+    if (elapsedSeconds <= 0) return {};
+    const transferred = chunk.completed - epochStartCompleted;
+    if (transferred <= 0) return {};
+    const bytesPerSecond = transferred / elapsedSeconds;
+    const etaSeconds = typeof chunk.total === "number" ? Math.max(0, (chunk.total - chunk.completed) / bytesPerSecond) : void 0;
+    return { bytesPerSecond, etaSeconds };
+  };
+}
+async function onProgress(stream, callback) {
+  void stream.finalResult.catch(() => void 0);
+  const speed = createProgressSpeedTracker();
+  for await (const event of stream) {
+    if (event.type === "message") {
+      callback({ ...toPullProgressEvent(event.data.chunk), ...speed(event.data.chunk) });
+    }
+    if (event.type === "done") {
+      return event.data.result;
+    }
+    if (event.type === "error") {
+      throw event.data.error;
+    }
+  }
+  throw new OllamaStreamError("Pull/push stream ended before reporting success");
+}
+
 // src/streaming/observe.ts
 async function* observeStream(source, callbacks = {}) {
   const { onChunk, onError, onDone, onAbandon, onListenerError } = callbacks;
@@ -8289,11 +8363,13 @@ exports.checkGenerateContext = checkGenerateContext;
 exports.compactConversationHistory = compactConversationHistory;
 exports.compareDraftPerformance = compareDraftPerformance;
 exports.composeMiddleware = composeMiddleware;
+exports.computeProgressPercent = computeProgressPercent;
 exports.contextWarningMessage = contextWarningMessage;
 exports.createConsoleLogger = createConsoleLogger;
 exports.createDecision = createDecision;
 exports.createModelAffinityScheduler = createModelAffinityScheduler;
 exports.createOllamaCloudFreeTierQuota = createOllamaCloudFreeTierQuota;
+exports.createProgressSpeedTracker = createProgressSpeedTracker;
 exports.createTimeoutSignal = createTimeoutSignal;
 exports.createWebFetchTool = createWebFetchTool;
 exports.createWebSearchTool = createWebSearchTool;
@@ -8335,6 +8411,7 @@ exports.normalizeGenerateStream = normalizeGenerateStream;
 exports.normalizeKeepAlive = normalizeKeepAlive;
 exports.normalizeProgressStream = normalizeProgressStream;
 exports.observeStream = observeStream;
+exports.onProgress = onProgress;
 exports.parseFrontmatter = parseFrontmatter;
 exports.parseNdjsonStream = parseNdjsonStream;
 exports.parseSseStream = parseSseStream;
@@ -8347,6 +8424,7 @@ exports.resolveImageInput = resolveImageInput;
 exports.sanitizeHistoryForNextTurn = sanitizeHistoryForNextTurn;
 exports.setSpanError = setSpanError;
 exports.toDataStream = toDataStream;
+exports.toPullProgressEvent = toPullProgressEvent;
 exports.toResponse = toResponse;
 exports.toTextStream = toTextStream;
 exports.withRetry = withRetry;