feat: always enqueue analyze jobs as background, save jobId to DB, reuse active jobs, cleanup stale jobs
This commit is contained in:
+49
-73
@@ -2,6 +2,8 @@
|
||||
|
||||
// Server-only imports are loaded dynamically inside the action to avoid client bundling issues
|
||||
|
||||
const JOB_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
|
||||
|
||||
export async function action({ request }: { request: Request }) {
|
||||
const body = await request.json();
|
||||
|
||||
@@ -12,66 +14,58 @@ export async function action({ request }: { request: Request }) {
|
||||
return Response.json({ error: "ticker is required" }, { status: 400 });
|
||||
}
|
||||
|
||||
// Load server-only modules dynamically to prevent them from being included in client bundles
|
||||
const { buildTradingGraph } = await import("../../lib/tradingConfig.server");
|
||||
const { db } = await import("../../lib/db.server");
|
||||
const { fetchAccount, fetchRecentCloses, fetchBars } = await import("../../lib/alpacaClient");
|
||||
const { getJob, listRecentJobs, cancelJob } = await import("../../lib/queue");
|
||||
|
||||
const apiKey = process.env.OPENROUTER_API_KEY;
|
||||
|
||||
if (!apiKey || apiKey === "your_openrouter_api_key_here") {
|
||||
const mockDecision = {
|
||||
action: "hold" as const,
|
||||
confidence: 0.75,
|
||||
reasoning: `${ticker} analysis - Mock mode: positive momentum detected with neutral technical signals`,
|
||||
agentSignals: [
|
||||
{
|
||||
agent: "fundamentals" as const,
|
||||
signal: "bullish" as const,
|
||||
confidence: 0.7,
|
||||
reasoning: "Strong fundamentals with positive earnings outlook",
|
||||
timestamp: new Date().toISOString(),
|
||||
},
|
||||
{
|
||||
agent: "technical" as const,
|
||||
signal: "neutral" as const,
|
||||
confidence: 0.6,
|
||||
reasoning: "Mixed technical indicators",
|
||||
timestamp: new Date().toISOString(),
|
||||
},
|
||||
],
|
||||
debateRounds: [
|
||||
{
|
||||
bullishView: "Bullish case supported by fundamentals and momentum",
|
||||
bearishView: "Bearish case from mixed technical signals",
|
||||
researcher: "bullish" as const,
|
||||
},
|
||||
],
|
||||
};
|
||||
return Response.json(mockDecision);
|
||||
}
|
||||
// Clean up old unfinished jobs for this ticker (older than timeout)
|
||||
try {
|
||||
const recentJobs = await listRecentJobs(ticker, 50);
|
||||
for (const j of recentJobs) {
|
||||
if (j.state === "waiting" || j.state === "active" || j.state === "delayed") {
|
||||
// Check if the job is too old
|
||||
const jobCreatedAt = j.data?.timestamp;
|
||||
if (jobCreatedAt && Date.now() - jobCreatedAt > JOB_TIMEOUT_MS) {
|
||||
await cancelJob(j.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) { /* ignore cleanup errors */ }
|
||||
|
||||
const { graph, config } = await buildTradingGraph(apiKey);
|
||||
// Check if there's a recent unfinished job that can be reused
|
||||
try {
|
||||
const recentJobs = await listRecentJobs(ticker, 10);
|
||||
const activeJob = recentJobs.find((j: any) => j.state === "waiting" || j.state === "active");
|
||||
if (activeJob) {
|
||||
// Return existing job ID instead of creating a new one
|
||||
const jobId = activeJob.id;
|
||||
// Update the stock record with this job ID
|
||||
await db.stock.upsert({
|
||||
where: { ticker },
|
||||
update: { lastJobId: jobId },
|
||||
create: { ticker, lastJobId: jobId },
|
||||
});
|
||||
return Response.json({ status: "queued", jobId }, { status: 202 });
|
||||
}
|
||||
} catch (e) { /* ignore */ }
|
||||
|
||||
// Fetch latest Alpaca account and recent prices; abort if unavailable
|
||||
// Fetch latest Alpaca account and recent prices
|
||||
let account: any = undefined;
|
||||
let prices: number[] = [];
|
||||
let recentBars: any[] = [];
|
||||
try {
|
||||
account = await fetchAccount();
|
||||
prices = await fetchRecentCloses(ticker);
|
||||
// Also fetch recent intraday bars to enable deterministic execution plan calculation
|
||||
try {
|
||||
recentBars = await fetchBars(ticker, '1Min', { limit: 200 });
|
||||
// derive prices from bars if available (prefer freshest closes)
|
||||
if (recentBars && recentBars.length) {
|
||||
prices = recentBars.map((b: any) => (typeof b.ClosePrice === 'number' ? b.ClosePrice : (typeof b.c === 'number' ? b.c : 0))).filter((p: number) => p > 0);
|
||||
}
|
||||
} catch (barErr) {
|
||||
console.warn('[analyze] Failed to fetch recent bars for deterministic execution plan:', barErr);
|
||||
console.warn('[analyze] Failed to fetch recent bars:', barErr);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error("[analyze] Failed to fetch Alpaca data before analysis:", e);
|
||||
console.error("[analyze] Failed to fetch Alpaca data:", e);
|
||||
return Response.json({ error: "Failed to fetch Alpaca data: " + String(e) }, { status: 502 });
|
||||
}
|
||||
|
||||
@@ -90,42 +84,24 @@ export async function action({ request }: { request: Request }) {
|
||||
source: "news" as const,
|
||||
},
|
||||
account,
|
||||
timestamp: Date.now(),
|
||||
};
|
||||
|
||||
// Always enqueue as background job
|
||||
try {
|
||||
if (body.background) {
|
||||
// Enqueue background analyze job and return 202 immediately
|
||||
try {
|
||||
const { enqueueAnalyze } = await import("../../lib/queue");
|
||||
const jobId = await enqueueAnalyze(ticker, input);
|
||||
return Response.json({ status: "queued", jobId }, { status: 202 });
|
||||
} catch (enqueueErr) {
|
||||
console.error("[analyze] enqueue error:", enqueueErr);
|
||||
return Response.json({ error: "failed to enqueue" }, { status: 500 });
|
||||
}
|
||||
}
|
||||
const { enqueueAnalyze } = await import("../../lib/queue");
|
||||
const jobId = await enqueueAnalyze(ticker, input);
|
||||
|
||||
let decision = await graph.propagate(ticker, input);
|
||||
// Enrich executionPlan deterministically on server-side
|
||||
try {
|
||||
const { enrichExecutionPlan, verifyExecutionPlanWithLLM } = await import("../../lib/execution");
|
||||
decision = enrichExecutionPlan(decision, input);
|
||||
// Optionally ask LLM to verify/adjust the computed plan if API key is present
|
||||
if (process.env.OPENROUTER_API_KEY) {
|
||||
try {
|
||||
decision = await verifyExecutionPlanWithLLM(decision, input, config.model);
|
||||
} catch (e) {
|
||||
console.warn("LLM verification failed:", e);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn("Failed to enrich execution plan:", e);
|
||||
}
|
||||
// Save jobId to DB stock record
|
||||
await db.stock.upsert({
|
||||
where: { ticker },
|
||||
update: { lastJobId: jobId },
|
||||
create: { ticker, lastJobId: jobId },
|
||||
});
|
||||
|
||||
return Response.json(decision);
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : "Unknown error";
|
||||
console.error("[analyze] Error:", error);
|
||||
return Response.json({ error: message }, { status: 500 });
|
||||
return Response.json({ status: "queued", jobId }, { status: 202 });
|
||||
} catch (enqueueErr) {
|
||||
console.error("[analyze] enqueue error:", enqueueErr);
|
||||
return Response.json({ error: "failed to enqueue" }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user