Compare commits
1 Commits
claude/iss
...
claude/iss
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
52babff31f |
@@ -2,23 +2,6 @@ import { makeLogger } from "./logger.js";
|
|||||||
|
|
||||||
const logger = makeLogger("agent");
|
const logger = makeLogger("agent");
|
||||||
|
|
||||||
// ── Image request detection ───────────────────────────────────────────────────
|
|
||||||
|
|
||||||
const IMAGE_INTENT_RE =
|
|
||||||
/\b(draw|illustrate|create\s+an?\s+image\s+of|generate\s+an?\s+image\s+of|visualize|visualise|make\s+an?\s+image\s+of|paint\s+me|sketch|render\s+an?\s+image\s+of|picture\s+of)\b/i;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if the request text signals an image-generation intent.
|
|
||||||
*/
|
|
||||||
export function detectImageRequest(text: string): boolean {
|
|
||||||
return IMAGE_INTENT_RE.test(text);
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ImageWorkResult {
|
|
||||||
b64_json: string;
|
|
||||||
mimeType: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface EvalResult {
|
export interface EvalResult {
|
||||||
accepted: boolean;
|
accepted: boolean;
|
||||||
reason: string;
|
reason: string;
|
||||||
@@ -459,36 +442,6 @@ Respond ONLY with valid JSON: {"accepted": true/false, "reason": "..."}`,
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate an image via Gemini for the given prompt.
|
|
||||||
* Falls back to a stub 1×1 transparent PNG when Gemini credentials are absent.
|
|
||||||
*/
|
|
||||||
async executeImageWork(prompt: string): Promise<ImageWorkResult> {
|
|
||||||
const geminiAvailable =
|
|
||||||
!!process.env["AI_INTEGRATIONS_GEMINI_API_KEY"] &&
|
|
||||||
!!process.env["AI_INTEGRATIONS_GEMINI_BASE_URL"];
|
|
||||||
|
|
||||||
if (!geminiAvailable) {
|
|
||||||
logger.warn("Gemini credentials absent — returning stub image", { component: "agent" });
|
|
||||||
// 1×1 transparent PNG (base64)
|
|
||||||
return {
|
|
||||||
b64_json:
|
|
||||||
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==",
|
|
||||||
mimeType: "image/png",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const mod = (await import("@workspace/integrations-gemini-ai")) as {
|
|
||||||
generateImage: (prompt: string) => Promise<{ b64_json: string; mimeType: string }>;
|
|
||||||
};
|
|
||||||
return await mod.generateImage(prompt);
|
|
||||||
} catch (err) {
|
|
||||||
logger.error("Gemini image generation failed", { error: String(err) });
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const agentService = new AgentService();
|
export const agentService = new AgentService();
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { EventEmitter } from "events";
|
|||||||
export type JobEvent =
|
export type JobEvent =
|
||||||
| { type: "job:state"; jobId: string; state: string }
|
| { type: "job:state"; jobId: string; state: string }
|
||||||
| { type: "job:paid"; jobId: string; invoiceType: "eval" | "work" }
|
| { type: "job:paid"; jobId: string; invoiceType: "eval" | "work" }
|
||||||
| { type: "job:completed"; jobId: string; result: string; mediaUrl?: string; mediaType?: string }
|
| { type: "job:completed"; jobId: string; result: string }
|
||||||
| { type: "job:failed"; jobId: string; reason: string };
|
| { type: "job:failed"; jobId: string; reason: string };
|
||||||
|
|
||||||
export type SessionEvent =
|
export type SessionEvent =
|
||||||
|
|||||||
@@ -62,11 +62,6 @@ const DO_INFRA_PER_REQUEST_USD = DO_MONTHLY_COST_USD / DO_MONTHLY_REQUESTS;
|
|||||||
|
|
||||||
const ORIGINATOR_MARGIN_PCT = envFloat("ORIGINATOR_MARGIN_PCT", 25);
|
const ORIGINATOR_MARGIN_PCT = envFloat("ORIGINATOR_MARGIN_PCT", 25);
|
||||||
|
|
||||||
// ── Image generation flat rate ────────────────────────────────────────────────
|
|
||||||
// Charged in addition to eval fee; covers Gemini imagen costs + margin.
|
|
||||||
|
|
||||||
const IMAGE_GENERATION_FLAT_RATE_USD = envFloat("IMAGE_GENERATION_FLAT_RATE_USD", 0.04);
|
|
||||||
|
|
||||||
// ── Fixed fees ────────────────────────────────────────────────────────────────
|
// ── Fixed fees ────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
const EVAL_FEE_SATS = envInt("EVAL_FEE_SATS", 10);
|
const EVAL_FEE_SATS = envInt("EVAL_FEE_SATS", 10);
|
||||||
@@ -100,25 +95,6 @@ export class PricingService {
|
|||||||
return BOOTSTRAP_FEE_SATS;
|
return BOOTSTRAP_FEE_SATS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Flat USD cost for a single image generation request (covers Gemini + margin).
|
|
||||||
*/
|
|
||||||
calculateImageFeeUsd(): number {
|
|
||||||
return IMAGE_GENERATION_FLAT_RATE_USD * (1 + this.marginPct / 100);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert image flat rate to sats. Includes infra amortisation and margin.
|
|
||||||
* Returns the same shape as calculateWorkFeeSats() for drop-in use.
|
|
||||||
*/
|
|
||||||
async calculateImageFeeSats(): Promise<WorkFeeBreakdown> {
|
|
||||||
const rawCostUsd = IMAGE_GENERATION_FLAT_RATE_USD + DO_INFRA_PER_REQUEST_USD;
|
|
||||||
const estimatedCostUsd = rawCostUsd * (1 + this.marginPct / 100);
|
|
||||||
const btcPriceUsd = await getBtcPriceUsd();
|
|
||||||
const amountSats = usdToSats(estimatedCostUsd, btcPriceUsd);
|
|
||||||
return { amountSats, estimatedCostUsd, marginPct: this.marginPct, btcPriceUsd };
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Token estimation ─────────────────────────────────────────────────────
|
// ── Token estimation ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Router, type Request, type Response } from "express";
|
import { Router, type Request, type Response } from "express";
|
||||||
import { pricingService } from "../lib/pricing.js";
|
import { pricingService } from "../lib/pricing.js";
|
||||||
import { agentService, detectImageRequest } from "../lib/agent.js";
|
import { agentService } from "../lib/agent.js";
|
||||||
import { getBtcPriceUsd, usdToSats } from "../lib/btc-oracle.js";
|
import { getBtcPriceUsd, usdToSats } from "../lib/btc-oracle.js";
|
||||||
import { freeTierService } from "../lib/free-tier.js";
|
import { freeTierService } from "../lib/free-tier.js";
|
||||||
import { trustService } from "../lib/trust.js";
|
import { trustService } from "../lib/trust.js";
|
||||||
@@ -25,27 +25,10 @@ router.get("/estimate", async (req: Request, res: Response) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const isImageRequest = detectImageRequest(requestText);
|
const { estimatedInputTokens: inputTokens, estimatedOutputTokens: outputTokens, estimatedCostUsd: costUsd } =
|
||||||
|
pricingService.estimateRequestCost(requestText, agentService.workModel);
|
||||||
let inputTokens = 0;
|
const btcPriceUsd = await getBtcPriceUsd();
|
||||||
let outputTokens = 0;
|
const estimatedSats = usdToSats(costUsd, btcPriceUsd);
|
||||||
let costUsd: number;
|
|
||||||
let btcPriceUsd: number;
|
|
||||||
let estimatedSats: number;
|
|
||||||
|
|
||||||
if (isImageRequest) {
|
|
||||||
const imageBreakdown = await pricingService.calculateImageFeeSats();
|
|
||||||
costUsd = imageBreakdown.estimatedCostUsd;
|
|
||||||
btcPriceUsd = imageBreakdown.btcPriceUsd;
|
|
||||||
estimatedSats = imageBreakdown.amountSats;
|
|
||||||
} else {
|
|
||||||
const estimate = pricingService.estimateRequestCost(requestText, agentService.workModel);
|
|
||||||
inputTokens = estimate.estimatedInputTokens;
|
|
||||||
outputTokens = estimate.estimatedOutputTokens;
|
|
||||||
costUsd = estimate.estimatedCostUsd;
|
|
||||||
btcPriceUsd = await getBtcPriceUsd();
|
|
||||||
estimatedSats = usdToSats(costUsd, btcPriceUsd);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optionally resolve Nostr identity from query param or header for free-tier preview
|
// Optionally resolve Nostr identity from query param or header for free-tier preview
|
||||||
const rawToken =
|
const rawToken =
|
||||||
@@ -76,11 +59,10 @@ router.get("/estimate", async (req: Request, res: Response) => {
|
|||||||
estimatedSats,
|
estimatedSats,
|
||||||
estimatedCostUsd: costUsd,
|
estimatedCostUsd: costUsd,
|
||||||
btcPriceUsd,
|
btcPriceUsd,
|
||||||
...(isImageRequest ? { mediaType: "image" } : {}),
|
|
||||||
tokenEstimate: {
|
tokenEstimate: {
|
||||||
inputTokens,
|
inputTokens,
|
||||||
outputTokens,
|
outputTokens,
|
||||||
model: isImageRequest ? "gemini-2.5-flash-image" : agentService.workModel,
|
model: agentService.workModel,
|
||||||
},
|
},
|
||||||
identity: {
|
identity: {
|
||||||
trust_tier: trustTier,
|
trust_tier: trustTier,
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import { Router, type Request, type Response } from "express";
|
import { Router, type Request, type Response } from "express";
|
||||||
import { randomUUID, createHash } from "crypto";
|
import { randomUUID, createHash } from "crypto";
|
||||||
import { db, jobs, invoices, jobDebates, jobMedia, type Job } from "@workspace/db";
|
import { db, jobs, invoices, jobDebates, type Job } from "@workspace/db";
|
||||||
import { eq, and } from "drizzle-orm";
|
import { eq, and } from "drizzle-orm";
|
||||||
import { CreateJobBody, GetJobParams } from "@workspace/api-zod";
|
import { CreateJobBody, GetJobParams } from "@workspace/api-zod";
|
||||||
import { lnbitsService } from "../lib/lnbits.js";
|
import { lnbitsService } from "../lib/lnbits.js";
|
||||||
import { agentService, detectImageRequest } from "../lib/agent.js";
|
import { agentService } from "../lib/agent.js";
|
||||||
import { pricingService } from "../lib/pricing.js";
|
import { pricingService } from "../lib/pricing.js";
|
||||||
import { jobsLimiter } from "../lib/rate-limiter.js";
|
import { jobsLimiter } from "../lib/rate-limiter.js";
|
||||||
import { eventBus } from "../lib/event-bus.js";
|
import { eventBus } from "../lib/event-bus.js";
|
||||||
@@ -110,18 +110,12 @@ async function runEvalInBackground(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (evalResult.accepted) {
|
if (evalResult.accepted) {
|
||||||
// Detect image-generation requests and flag job accordingly
|
const { estimatedInputTokens, estimatedOutputTokens } = pricingService.estimateRequestCost(request, agentService.workModel);
|
||||||
const isImageJob = detectImageRequest(request);
|
const breakdown = await pricingService.calculateWorkFeeSats(
|
||||||
if (isImageJob) {
|
estimatedInputTokens,
|
||||||
await db.update(jobs).set({ mediaType: "image", updatedAt: new Date() }).where(eq(jobs.id, jobId));
|
estimatedOutputTokens,
|
||||||
}
|
agentService.workModel,
|
||||||
|
);
|
||||||
const breakdown = isImageJob
|
|
||||||
? await pricingService.calculateImageFeeSats()
|
|
||||||
: await (async () => {
|
|
||||||
const { estimatedInputTokens, estimatedOutputTokens } = pricingService.estimateRequestCost(request, agentService.workModel);
|
|
||||||
return pricingService.calculateWorkFeeSats(estimatedInputTokens, estimatedOutputTokens, agentService.workModel);
|
|
||||||
})();
|
|
||||||
|
|
||||||
// ── Free-tier gate ──────────────────────────────────────────────────
|
// ── Free-tier gate ──────────────────────────────────────────────────
|
||||||
const ftDecision = await freeTierService.decide(nostrPubkey, breakdown.amountSats);
|
const ftDecision = await freeTierService.decide(nostrPubkey, breakdown.amountSats);
|
||||||
@@ -260,49 +254,18 @@ async function runWorkInBackground(
|
|||||||
try {
|
try {
|
||||||
eventBus.publish({ type: "job:state", jobId, state: "executing" });
|
eventBus.publish({ type: "job:state", jobId, state: "executing" });
|
||||||
|
|
||||||
// Check if this is an image job
|
const workResult = await agentService.executeWorkStreaming(request, (delta) => {
|
||||||
const jobRow = await getJobById(jobId);
|
streamRegistry.write(jobId, delta);
|
||||||
const isImageJob = jobRow?.mediaType === "image";
|
});
|
||||||
|
|
||||||
let resultText = "";
|
|
||||||
let mediaUrl: string | undefined;
|
|
||||||
let inputTokensUsed = 0;
|
|
||||||
let outputTokensUsed = 0;
|
|
||||||
|
|
||||||
if (isImageJob) {
|
|
||||||
// Generate image via Gemini
|
|
||||||
const imageResult = await agentService.executeImageWork(request);
|
|
||||||
const mediaId = randomUUID();
|
|
||||||
const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000); // 7 days
|
|
||||||
|
|
||||||
await db.insert(jobMedia).values({
|
|
||||||
id: mediaId,
|
|
||||||
entityId: jobId,
|
|
||||||
entityType: "job",
|
|
||||||
mediaType: "image",
|
|
||||||
mimeType: imageResult.mimeType,
|
|
||||||
data: imageResult.b64_json,
|
|
||||||
expiresAt,
|
|
||||||
});
|
|
||||||
|
|
||||||
mediaUrl = `/api/jobs/${jobId}/media`;
|
|
||||||
resultText = `Image generated. View at: ${mediaUrl}`;
|
|
||||||
streamRegistry.write(jobId, resultText);
|
|
||||||
} else {
|
|
||||||
const workResult = await agentService.executeWorkStreaming(request, (delta) => {
|
|
||||||
streamRegistry.write(jobId, delta);
|
|
||||||
});
|
|
||||||
resultText = workResult.result;
|
|
||||||
inputTokensUsed = workResult.inputTokens;
|
|
||||||
outputTokensUsed = workResult.outputTokens;
|
|
||||||
}
|
|
||||||
|
|
||||||
streamRegistry.end(jobId);
|
streamRegistry.end(jobId);
|
||||||
latencyHistogram.record("work_phase", Date.now() - workStart);
|
latencyHistogram.record("work_phase", Date.now() - workStart);
|
||||||
|
|
||||||
const actualCostUsd = isImageJob
|
const actualCostUsd = pricingService.calculateActualCostUsd(
|
||||||
? pricingService.calculateImageFeeUsd()
|
workResult.inputTokens,
|
||||||
: pricingService.calculateActualCostUsd(inputTokensUsed, outputTokensUsed, agentService.workModel);
|
workResult.outputTokens,
|
||||||
|
agentService.workModel,
|
||||||
|
);
|
||||||
|
|
||||||
const lockedBtcPrice = btcPriceUsd ?? 100_000;
|
const lockedBtcPrice = btcPriceUsd ?? 100_000;
|
||||||
const actualTotalCostSats = pricingService.calculateActualChargeSats(actualCostUsd, lockedBtcPrice);
|
const actualTotalCostSats = pricingService.calculateActualChargeSats(actualCostUsd, lockedBtcPrice);
|
||||||
@@ -325,9 +288,9 @@ async function runWorkInBackground(
|
|||||||
.update(jobs)
|
.update(jobs)
|
||||||
.set({
|
.set({
|
||||||
state: "complete",
|
state: "complete",
|
||||||
result: resultText,
|
result: workResult.result,
|
||||||
actualInputTokens: isImageJob ? null : inputTokensUsed,
|
actualInputTokens: workResult.inputTokens,
|
||||||
actualOutputTokens: isImageJob ? null : outputTokensUsed,
|
actualOutputTokens: workResult.outputTokens,
|
||||||
actualCostUsd,
|
actualCostUsd,
|
||||||
actualAmountSats,
|
actualAmountSats,
|
||||||
refundAmountSats,
|
refundAmountSats,
|
||||||
@@ -339,14 +302,13 @@ async function runWorkInBackground(
|
|||||||
logger.info("work completed", {
|
logger.info("work completed", {
|
||||||
jobId,
|
jobId,
|
||||||
isFree,
|
isFree,
|
||||||
isImageJob,
|
inputTokens: workResult.inputTokens,
|
||||||
inputTokens: inputTokensUsed,
|
outputTokens: workResult.outputTokens,
|
||||||
outputTokens: outputTokensUsed,
|
|
||||||
actualAmountSats,
|
actualAmountSats,
|
||||||
refundAmountSats,
|
refundAmountSats,
|
||||||
refundState,
|
refundState,
|
||||||
});
|
});
|
||||||
eventBus.publish({ type: "job:completed", jobId, result: resultText, ...(mediaUrl ? { mediaUrl, mediaType: "image" } : {}) });
|
eventBus.publish({ type: "job:completed", jobId, result: workResult.result });
|
||||||
// Emit final actual cost for the UI cost ticker
|
// Emit final actual cost for the UI cost ticker
|
||||||
if (!isFree && actualAmountSats > 0) {
|
if (!isFree && actualAmountSats > 0) {
|
||||||
eventBus.publish({ type: "cost:update", jobId, sats: actualAmountSats, phase: "work", isFinal: true });
|
eventBus.publish({ type: "cost:update", jobId, sats: actualAmountSats, phase: "work", isFinal: true });
|
||||||
@@ -705,7 +667,6 @@ router.get("/jobs/:id", async (req: Request, res: Response) => {
|
|||||||
res.json({
|
res.json({
|
||||||
...base,
|
...base,
|
||||||
result: job.result ?? undefined,
|
result: job.result ?? undefined,
|
||||||
...(job.mediaType === "image" ? { mediaType: "image", mediaUrl: `/api/jobs/${job.id}/media` } : {}),
|
|
||||||
...(job.actualCostUsd != null ? {
|
...(job.actualCostUsd != null ? {
|
||||||
costLedger: {
|
costLedger: {
|
||||||
// Token usage
|
// Token usage
|
||||||
@@ -745,44 +706,6 @@ router.get("/jobs/:id", async (req: Request, res: Response) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── GET /jobs/:id/media ───────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
router.get("/jobs/:id/media", async (req: Request, res: Response) => {
|
|
||||||
const paramResult = GetJobParams.safeParse(req.params);
|
|
||||||
if (!paramResult.success) { res.status(400).json({ error: "Invalid job id" }); return; }
|
|
||||||
const { id } = paramResult.data;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const rows = await db
|
|
||||||
.select()
|
|
||||||
.from(jobMedia)
|
|
||||||
.where(eq(jobMedia.entityId, id))
|
|
||||||
.limit(1);
|
|
||||||
|
|
||||||
const media = rows[0];
|
|
||||||
if (!media) {
|
|
||||||
res.status(404).json({ error: "No media found for this job" });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (new Date() > media.expiresAt) {
|
|
||||||
res.status(410).json({ error: "Media has expired" });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
res.json({
|
|
||||||
jobId: id,
|
|
||||||
mediaType: media.mediaType,
|
|
||||||
mimeType: media.mimeType,
|
|
||||||
data: media.data,
|
|
||||||
expiresAt: media.expiresAt.toISOString(),
|
|
||||||
});
|
|
||||||
} catch (err) {
|
|
||||||
const message = err instanceof Error ? err.message : "Failed to fetch media";
|
|
||||||
res.status(500).json({ error: message });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// ── POST /jobs/:id/refund ─────────────────────────────────────────────────────
|
// ── POST /jobs/:id/refund ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
router.post("/jobs/:id/refund", async (req: Request, res: Response) => {
|
router.post("/jobs/:id/refund", async (req: Request, res: Response) => {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import { Router, type Request, type Response } from "express";
|
import { Router, type Request, type Response } from "express";
|
||||||
import { randomBytes, randomUUID, createHash } from "crypto";
|
import { randomBytes, randomUUID, createHash } from "crypto";
|
||||||
import { db, sessions, sessionRequests, sessionMessages, jobMedia, getSessionHistory, type Session } from "@workspace/db";
|
import { db, sessions, sessionRequests, sessionMessages, getSessionHistory, type Session } from "@workspace/db";
|
||||||
import { eq, and } from "drizzle-orm";
|
import { eq, and } from "drizzle-orm";
|
||||||
import { lnbitsService } from "../lib/lnbits.js";
|
import { lnbitsService } from "../lib/lnbits.js";
|
||||||
import { sessionsLimiter } from "../lib/rate-limiter.js";
|
import { sessionsLimiter } from "../lib/rate-limiter.js";
|
||||||
import { eventBus } from "../lib/event-bus.js";
|
import { eventBus } from "../lib/event-bus.js";
|
||||||
import { agentService, detectImageRequest } from "../lib/agent.js";
|
import { agentService } from "../lib/agent.js";
|
||||||
import { pricingService } from "../lib/pricing.js";
|
import { pricingService } from "../lib/pricing.js";
|
||||||
import { getBtcPriceUsd, usdToSats } from "../lib/btc-oracle.js";
|
import { getBtcPriceUsd, usdToSats } from "../lib/btc-oracle.js";
|
||||||
import { trustService } from "../lib/trust.js";
|
import { trustService } from "../lib/trust.js";
|
||||||
@@ -336,11 +336,6 @@ router.post("/sessions/:id/request", async (req: Request, res: Response) => {
|
|||||||
let finalState: "complete" | "rejected" | "failed" = "rejected";
|
let finalState: "complete" | "rejected" | "failed" = "rejected";
|
||||||
let reason: string | null = null;
|
let reason: string | null = null;
|
||||||
let errorMessage: string | null = null;
|
let errorMessage: string | null = null;
|
||||||
let mediaUrl: string | null = null;
|
|
||||||
let mediaType: string | null = null;
|
|
||||||
|
|
||||||
// Detect image generation intent before pricing estimate
|
|
||||||
const isImageRequest = detectImageRequest(requestText);
|
|
||||||
|
|
||||||
// ── Pre-gate: free-tier decision on ESTIMATED cost before executing work ──
|
// ── Pre-gate: free-tier decision on ESTIMATED cost before executing work ──
|
||||||
// Estimate total request cost (work portion) pre-execution to determine subsidy.
|
// Estimate total request cost (work portion) pre-execution to determine subsidy.
|
||||||
@@ -350,59 +345,26 @@ router.post("/sessions/:id/request", async (req: Request, res: Response) => {
|
|||||||
let ftDecision: import("../lib/free-tier.js").FreeTierDecision | null = null;
|
let ftDecision: import("../lib/free-tier.js").FreeTierDecision | null = null;
|
||||||
if (evalResult.accepted && session.nostrPubkey) {
|
if (evalResult.accepted && session.nostrPubkey) {
|
||||||
// estimateRequestCost includes infra + margin. Convert to sats for decide().
|
// estimateRequestCost includes infra + margin. Convert to sats for decide().
|
||||||
let estimatedSats: number;
|
const { estimatedCostUsd } = pricingService.estimateRequestCost(requestText, agentService.workModel);
|
||||||
if (isImageRequest) {
|
const estimatedSats = usdToSats(estimatedCostUsd, btcPriceUsd);
|
||||||
const imageBreakdown = await pricingService.calculateImageFeeSats();
|
|
||||||
estimatedSats = imageBreakdown.amountSats;
|
|
||||||
} else {
|
|
||||||
const { estimatedCostUsd } = pricingService.estimateRequestCost(requestText, agentService.workModel);
|
|
||||||
estimatedSats = usdToSats(estimatedCostUsd, btcPriceUsd);
|
|
||||||
}
|
|
||||||
ftDecision = await freeTierService.decide(session.nostrPubkey, estimatedSats);
|
ftDecision = await freeTierService.decide(session.nostrPubkey, estimatedSats);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (evalResult.accepted) {
|
if (evalResult.accepted) {
|
||||||
if (isImageRequest) {
|
try {
|
||||||
try {
|
const workResult = await agentService.executeWork(requestText, history);
|
||||||
const imageResult = await agentService.executeImageWork(requestText);
|
workInputTokens = workResult.inputTokens;
|
||||||
const mediaId = randomUUID();
|
workOutputTokens = workResult.outputTokens;
|
||||||
const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000); // 7 days
|
workCostUsd = pricingService.calculateActualCostUsd(
|
||||||
|
workResult.inputTokens,
|
||||||
await db.insert(jobMedia).values({
|
workResult.outputTokens,
|
||||||
id: mediaId,
|
agentService.workModel,
|
||||||
entityId: requestId,
|
);
|
||||||
entityType: "session_request",
|
result = workResult.result;
|
||||||
mediaType: "image",
|
finalState = "complete";
|
||||||
mimeType: imageResult.mimeType,
|
} catch (err) {
|
||||||
data: imageResult.b64_json,
|
errorMessage = err instanceof Error ? err.message : "Execution error";
|
||||||
expiresAt,
|
finalState = "failed";
|
||||||
});
|
|
||||||
|
|
||||||
mediaUrl = `/api/sessions/${id}/requests/${requestId}/media`;
|
|
||||||
mediaType = "image";
|
|
||||||
workCostUsd = pricingService.calculateImageFeeUsd();
|
|
||||||
result = `Image generated. View at: ${mediaUrl}`;
|
|
||||||
finalState = "complete";
|
|
||||||
} catch (err) {
|
|
||||||
errorMessage = err instanceof Error ? err.message : "Image generation error";
|
|
||||||
finalState = "failed";
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
const workResult = await agentService.executeWork(requestText, history);
|
|
||||||
workInputTokens = workResult.inputTokens;
|
|
||||||
workOutputTokens = workResult.outputTokens;
|
|
||||||
workCostUsd = pricingService.calculateActualCostUsd(
|
|
||||||
workResult.inputTokens,
|
|
||||||
workResult.outputTokens,
|
|
||||||
agentService.workModel,
|
|
||||||
);
|
|
||||||
result = workResult.result;
|
|
||||||
finalState = "complete";
|
|
||||||
} catch (err) {
|
|
||||||
errorMessage = err instanceof Error ? err.message : "Execution error";
|
|
||||||
finalState = "failed";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
reason = evalResult.reason;
|
reason = evalResult.reason;
|
||||||
@@ -529,7 +491,6 @@ router.post("/sessions/:id/request", async (req: Request, res: Response) => {
|
|||||||
...(result ? { result } : {}),
|
...(result ? { result } : {}),
|
||||||
...(reason ? { reason } : {}),
|
...(reason ? { reason } : {}),
|
||||||
...(errorMessage ? { errorMessage } : {}),
|
...(errorMessage ? { errorMessage } : {}),
|
||||||
...(mediaUrl ? { mediaUrl, mediaType } : {}),
|
|
||||||
debitedSats,
|
debitedSats,
|
||||||
balanceRemaining: newBalance,
|
balanceRemaining: newBalance,
|
||||||
...(freeTierServed ? { free_tier: true, absorbed_sats: absorbedSats } : {}),
|
...(freeTierServed ? { free_tier: true, absorbed_sats: absorbedSats } : {}),
|
||||||
@@ -647,43 +608,4 @@ router.delete("/sessions/:id/history", async (req: Request, res: Response) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── GET /sessions/:id/requests/:requestId/media ───────────────────────────────
|
|
||||||
|
|
||||||
router.get("/sessions/:id/requests/:requestId/media", async (req: Request, res: Response) => {
|
|
||||||
const sessionId = req.params.id as string;
|
|
||||||
const requestId = req.params.requestId as string;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const session = await getSessionById(sessionId);
|
|
||||||
if (!session) { res.status(404).json({ error: "Session not found" }); return; }
|
|
||||||
|
|
||||||
const rows = await db
|
|
||||||
.select()
|
|
||||||
.from(jobMedia)
|
|
||||||
.where(eq(jobMedia.entityId, requestId))
|
|
||||||
.limit(1);
|
|
||||||
|
|
||||||
const media = rows[0];
|
|
||||||
if (!media) {
|
|
||||||
res.status(404).json({ error: "No media found for this request" });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (new Date() > media.expiresAt) {
|
|
||||||
res.status(410).json({ error: "Media has expired" });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
res.json({
|
|
||||||
requestId,
|
|
||||||
mediaType: media.mediaType,
|
|
||||||
mimeType: media.mimeType,
|
|
||||||
data: media.data,
|
|
||||||
expiresAt: media.expiresAt.toISOString(),
|
|
||||||
});
|
|
||||||
} catch (err) {
|
|
||||||
res.status(500).json({ error: err instanceof Error ? err.message : "Failed to fetch media" });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
-- Migration: Image generation media storage (#19)
|
|
||||||
-- Adds job_media table for storing generated images (base64) with 7-day TTL.
|
|
||||||
-- Also adds media_type column to jobs table to flag image-type work.
|
|
||||||
|
|
||||||
-- ── job_media ─────────────────────────────────────────────────────────────────
|
|
||||||
-- Stores generated media for both standalone jobs and session requests.
|
|
||||||
-- entity_id is polymorphic: job ID or session request ID.
|
|
||||||
-- expires_at is set to NOW + 7 days at insert time.
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS job_media (
|
|
||||||
id TEXT PRIMARY KEY,
|
|
||||||
entity_id TEXT NOT NULL, -- job ID or session request ID
|
|
||||||
entity_type TEXT NOT NULL, -- 'job' | 'session_request'
|
|
||||||
media_type TEXT NOT NULL, -- 'image'
|
|
||||||
mime_type TEXT NOT NULL, -- e.g. 'image/png'
|
|
||||||
data TEXT NOT NULL, -- base64-encoded image data
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
|
||||||
expires_at TIMESTAMPTZ NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_job_media_entity_id ON job_media(entity_id);
|
|
||||||
|
|
||||||
-- ── jobs.media_type ───────────────────────────────────────────────────────────
|
|
||||||
-- Nullable flag set during eval phase for image-generation requests.
|
|
||||||
|
|
||||||
ALTER TABLE jobs ADD COLUMN IF NOT EXISTS media_type TEXT;
|
|
||||||
@@ -14,4 +14,3 @@ export * from "./relay-accounts";
|
|||||||
export * from "./relay-event-queue";
|
export * from "./relay-event-queue";
|
||||||
export * from "./job-debates";
|
export * from "./job-debates";
|
||||||
export * from "./session-messages";
|
export * from "./session-messages";
|
||||||
export * from "./job-media";
|
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
import { pgTable, text, timestamp } from "drizzle-orm/pg-core";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* job_media — stores generated media (images) for jobs and session requests.
|
|
||||||
* entityId is polymorphic: it can be a job ID or a session request ID.
|
|
||||||
* expiresAt is set to NOW + 7 days; a cleanup job should purge expired rows.
|
|
||||||
*/
|
|
||||||
export const jobMedia = pgTable("job_media", {
|
|
||||||
id: text("id").primaryKey(),
|
|
||||||
entityId: text("entity_id").notNull(), // job ID or session request ID
|
|
||||||
entityType: text("entity_type").notNull(), // 'job' | 'session_request'
|
|
||||||
mediaType: text("media_type").notNull(), // 'image'
|
|
||||||
mimeType: text("mime_type").notNull(), // e.g. 'image/png'
|
|
||||||
data: text("data").notNull(), // base64-encoded image data
|
|
||||||
createdAt: timestamp("created_at", { withTimezone: true }).defaultNow().notNull(),
|
|
||||||
expiresAt: timestamp("expires_at", { withTimezone: true }).notNull(),
|
|
||||||
});
|
|
||||||
|
|
||||||
export type JobMedia = typeof jobMedia.$inferSelect;
|
|
||||||
@@ -52,9 +52,6 @@ export const jobs = pgTable("jobs", {
|
|||||||
refundState: text("refund_state").$type<"not_applicable" | "pending" | "paid">(),
|
refundState: text("refund_state").$type<"not_applicable" | "pending" | "paid">(),
|
||||||
refundPaymentHash: text("refund_payment_hash"),
|
refundPaymentHash: text("refund_payment_hash"),
|
||||||
|
|
||||||
// ── Image generation (set during eval if request is an image job) ───────────
|
|
||||||
mediaType: text("media_type"), // 'image' | null
|
|
||||||
|
|
||||||
createdAt: timestamp("created_at", { withTimezone: true }).defaultNow().notNull(),
|
createdAt: timestamp("created_at", { withTimezone: true }).defaultNow().notNull(),
|
||||||
updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow().notNull(),
|
updatedAt: timestamp("updated_at", { withTimezone: true }).defaultNow().notNull(),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -157,20 +157,15 @@ export async function sessionSendHandler(text) {
|
|||||||
_saveToStorage();
|
_saveToStorage();
|
||||||
_applySessionUI();
|
_applySessionUI();
|
||||||
|
|
||||||
if (data.mediaType === 'image' && data.mediaUrl) {
|
const reply = data.result || data.reason || '…';
|
||||||
// Fetch image data and render inline
|
setSpeechBubble(reply);
|
||||||
_renderImageResponse(data.mediaUrl, text);
|
appendSystemMessage('Timmy: ' + reply.slice(0, 80));
|
||||||
} else {
|
|
||||||
const reply = data.result || data.reason || '…';
|
|
||||||
setSpeechBubble(reply);
|
|
||||||
appendSystemMessage('Timmy: ' + reply.slice(0, 80));
|
|
||||||
|
|
||||||
// Sentiment-driven mood on inbound Timmy reply
|
// Sentiment-driven mood on inbound Timmy reply
|
||||||
sentiment(reply).then(s => {
|
sentiment(reply).then(s => {
|
||||||
setMood(s.label);
|
setMood(s.label);
|
||||||
setTimeout(() => setMood(null), 10_000);
|
setTimeout(() => setMood(null), 10_000);
|
||||||
}).catch(() => {});
|
}).catch(() => {});
|
||||||
}
|
|
||||||
|
|
||||||
// Update active-step balance if panel is open
|
// Update active-step balance if panel is open
|
||||||
_updateActiveStep();
|
_updateActiveStep();
|
||||||
@@ -183,66 +178,6 @@ export async function sessionSendHandler(text) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Image rendering ───────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
async function _renderImageResponse(mediaUrl, prompt) {
|
|
||||||
const $log = document.getElementById('event-log');
|
|
||||||
if (!$log) return;
|
|
||||||
|
|
||||||
setSpeechBubble('✨ Here is your image!');
|
|
||||||
appendSystemMessage('Timmy: ✨ Image generated!');
|
|
||||||
|
|
||||||
try {
|
|
||||||
const res = await fetch(mediaUrl);
|
|
||||||
if (!res.ok) {
|
|
||||||
appendSystemMessage('Timmy: Image ready — ' + mediaUrl);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const data = await res.json();
|
|
||||||
const src = `data:${data.mimeType};base64,${data.data}`;
|
|
||||||
|
|
||||||
const container = document.createElement('div');
|
|
||||||
container.className = 'log-entry timmy-image-result';
|
|
||||||
container.style.cssText = [
|
|
||||||
'margin:6px 0;padding:6px;',
|
|
||||||
'border:1px solid #336655;border-radius:4px;',
|
|
||||||
'background:#0a1a14;',
|
|
||||||
].join('');
|
|
||||||
|
|
||||||
const img = document.createElement('img');
|
|
||||||
img.src = src;
|
|
||||||
img.alt = prompt.slice(0, 60);
|
|
||||||
img.style.cssText = [
|
|
||||||
'max-width:100%;max-height:240px;',
|
|
||||||
'display:block;border-radius:3px;',
|
|
||||||
'cursor:pointer;',
|
|
||||||
].join('');
|
|
||||||
img.title = 'Click to view full size';
|
|
||||||
|
|
||||||
const dlBtn = document.createElement('a');
|
|
||||||
dlBtn.href = src;
|
|
||||||
dlBtn.download = 'timmy-image.png';
|
|
||||||
dlBtn.textContent = '⬇ Download';
|
|
||||||
dlBtn.style.cssText = [
|
|
||||||
'display:inline-block;margin-top:4px;',
|
|
||||||
'font-size:10px;color:#44cc88;',
|
|
||||||
'text-decoration:none;letter-spacing:1px;',
|
|
||||||
].join('');
|
|
||||||
|
|
||||||
container.appendChild(img);
|
|
||||||
container.appendChild(dlBtn);
|
|
||||||
|
|
||||||
const entries = $log.querySelectorAll('.log-entry');
|
|
||||||
if (entries.length >= 6) {
|
|
||||||
$log.removeChild(entries[0]);
|
|
||||||
}
|
|
||||||
$log.appendChild(container);
|
|
||||||
$log.scrollTop = $log.scrollHeight;
|
|
||||||
} catch {
|
|
||||||
appendSystemMessage('Timmy: Image generated — ' + mediaUrl);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Panel open/close ──────────────────────────────────────────────────────────
|
// ── Panel open/close ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
function _openPanel() {
|
function _openPanel() {
|
||||||
|
|||||||
Reference in New Issue
Block a user