data-analyst-mcp 0.8.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/adapters/rma.d.ts +10 -0
- package/dist/adapters/rma.js +40 -0
- package/dist/adapters/rma.js.map +1 -0
- package/dist/adapters/sba.d.ts +20 -2
- package/dist/adapters/sba.js +104 -8
- package/dist/adapters/sba.js.map +1 -1
- package/dist/analysis/rerun_job.js +2 -0
- package/dist/analysis/rerun_job.js.map +1 -1
- package/dist/analysis/tools.d.ts +35 -4
- package/dist/analysis/tools.js +31 -12
- package/dist/analysis/tools.js.map +1 -1
- package/dist/core/context.d.ts +6 -0
- package/dist/core/context.js +14 -0
- package/dist/core/context.js.map +1 -1
- package/dist/core/generic-rest.js +7 -2
- package/dist/core/generic-rest.js.map +1 -1
- package/dist/core/http.js +6 -2
- package/dist/core/http.js.map +1 -1
- package/dist/core/packs.d.ts +3 -0
- package/dist/core/packs.js +6 -1
- package/dist/core/packs.js.map +1 -1
- package/dist/core/tabular.d.ts +2 -0
- package/dist/core/tabular.js +14 -3
- package/dist/core/tabular.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/report/audit_report.js +3 -0
- package/dist/report/audit_report.js.map +1 -1
- package/dist/server.d.ts +5 -1
- package/dist/server.js +73 -18
- package/dist/server.js.map +1 -1
- package/dist/session.d.ts +2 -0
- package/dist/session.js +2 -0
- package/dist/session.js.map +1 -1
- package/guide/references/routing.md +4 -1
- package/package.json +1 -1
- package/packs/bea/policy.json +5 -1
- package/packs/cbp/source.md +1 -1
- package/packs/cdc-wonder/source.md +1 -1
- package/packs/port.json +5 -0
- package/packs/rma/endpoints.json +44 -0
- package/packs/rma/policy.json +94 -0
- package/packs/rma/source.md +78 -0
- package/packs/sba/endpoints.json +17 -0
- package/packs/sba/source.md +19 -3
- package/packs/uscourts/source.md +1 -1
package/README.md
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
An MCP server for official U.S. government data. It asks the user the questions that change a headline
|
|
4
4
|
number before fetching anything, gets the data from the agency at call time, packages it (CSV, data
|
|
5
|
-
dictionary, provenance) and cites every result. It covers
|
|
5
|
+
dictionary, provenance) and cites every result. It covers 77 sources.
|
|
6
6
|
|
|
7
|
-
> **Status: 0.3.** All
|
|
7
|
+
> **Status: 0.3.** All 77 sources work, along with the analysis and audit tools, hosted mode (streamable HTTP, a
|
|
8
8
|
> claude.ai connector) and per-user keys. The test suite runs offline on recorded fixtures.
|
|
9
9
|
> One gap remains: usda-fna's three PDF endpoints need a PDF text reader, and return `not_supported`.
|
|
10
10
|
> Four sources are manual only, because their sites refuse scripts: cdc-wonder, hud-ahar, foreign-assistance and
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* USDA Risk Management Agency public files (pubfs-rma.fpac.usda.gov/pub/Web_Data_Files). Verified 2026-11-11:
|
|
3
|
+
* Summary_of_Business/state_county_crop/sobcov_<year>.zip (1989 on) holds one pipe-delimited .txt with no header,
|
|
4
|
+
* 28 fields as the layout document SOB_State_County_Crop_with_Coverage_Level_1989_Forward.pdf lists them
|
|
5
|
+
* (endpoints.json names them); Reinsurance_Reports/standard_reinsurance_agreement_reports/<year>_Standard_
|
|
6
|
+
* Reinsurance_Report_<National|State>.xls (2014 on) has its header on row 7, then footnotes. Filters here.
|
|
7
|
+
*/
|
|
8
|
+
import type { Adapter } from "../core/packs.js";
|
|
9
|
+
declare const adapter: Adapter;
|
|
10
|
+
export default adapter;
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { pyStr } from "../core/py.js";
|
|
2
|
+
const list = (v) => (Array.isArray(v) ? v : v === undefined || v === null || v === "" ? [] : [v])
|
|
3
|
+
.map((x) => pyStr(x).trim().toLowerCase()).filter(Boolean);
|
|
4
|
+
// each filter matches any of its columns (a name or its code)
|
|
5
|
+
const FILTERS = [["state", ["Location State Abbreviation", "Location State Code", "State"]],
|
|
6
|
+
["county", ["Location County Code"]], ["commodity", ["Commodity Name", "Commodity Code"]],
|
|
7
|
+
["plan", ["Insurance Plan Name Abbreviation", "Insurance Plan Code"]], ["coverage_category", ["Coverage Category"]],
|
|
8
|
+
["delivery_type", ["Delivery Type"]]];
|
|
9
|
+
function checkSpec(spec) {
|
|
10
|
+
const bad = [];
|
|
11
|
+
for (const r of spec.requests || []) {
|
|
12
|
+
const p = r.params || {};
|
|
13
|
+
if ((r.endpoint === "coverage" || r.endpoint === "reinsurance") && !/^\d{4}$/.test(pyStr(p.year ?? ""))) {
|
|
14
|
+
bad.push(`request ${JSON.stringify(r.name)}: year is a 4-digit year, e.g. 2024`);
|
|
15
|
+
}
|
|
16
|
+
if (r.endpoint === "reinsurance" && !["National", "State"].includes(pyStr(p.level ?? ""))) {
|
|
17
|
+
bad.push(`request ${JSON.stringify(r.name)}: level is National or State`);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return bad;
|
|
21
|
+
}
|
|
22
|
+
function normalize(req, _ep, rows) {
|
|
23
|
+
// the files pad names with spaces (county, commodity, plan, state); the reinsurance sheets end in footnotes
|
|
24
|
+
let out = rows.map((r) => Object.fromEntries(Object.entries(r).map(([k, v]) => [k.trim(), typeof v === "string" ? v.trim() : v])));
|
|
25
|
+
if (req.endpoint === "reinsurance") {
|
|
26
|
+
// a fund row has its gross liability; the sheet's blank first column comes through unnamed (col1)
|
|
27
|
+
out = out.filter((r) => /^-?\d/.test(pyStr(r["Gross Liability"] ?? "")));
|
|
28
|
+
const blank = Object.keys(out[0] || {}).filter((k) => /^col\d+$/.test(k) && out.every((r) => pyStr(r[k] ?? "") === ""));
|
|
29
|
+
if (blank.length)
|
|
30
|
+
out = out.map((r) => Object.fromEntries(Object.entries(r).filter(([k]) => !blank.includes(k))));
|
|
31
|
+
}
|
|
32
|
+
const p = req.params || {};
|
|
33
|
+
const wants = FILTERS.map(([k, cols]) => [cols, list(p[k])]).filter(([, v]) => v.length);
|
|
34
|
+
if (!wants.length)
|
|
35
|
+
return out;
|
|
36
|
+
return out.filter((r) => wants.every(([cols, v]) => cols.some((c) => c in r && v.includes(pyStr(r[c] ?? "").toLowerCase()))));
|
|
37
|
+
}
|
|
38
|
+
const adapter = { checkSpec, normalize };
|
|
39
|
+
export default adapter;
|
|
40
|
+
//# sourceMappingURL=rma.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rma.js","sourceRoot":"","sources":["../../src/adapters/rma.ts"],"names":[],"mappings":"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"}
|
package/dist/adapters/sba.d.ts
CHANGED
|
@@ -2,8 +2,26 @@ import { Readable } from "node:stream";
|
|
|
2
2
|
import type { Adapter, Row } from "../core/packs.js";
|
|
3
3
|
/** The row filter of a foia request. */
|
|
4
4
|
export declare function keeper(p: Record<string, unknown>): (r: Row) => boolean;
|
|
5
|
-
|
|
6
|
-
export declare
|
|
5
|
+
export declare const STATUS_CODES: string[];
|
|
6
|
+
export declare const statusCode: (v: unknown) => string;
|
|
7
|
+
export declare const GROUPS: string[];
|
|
8
|
+
/** Totals per approval fiscal year (cohort) and group: loan counts by status, approved and guaranteed dollars for
|
|
9
|
+
* all and for disbursed loans, and the gross charge-off amount. */
|
|
10
|
+
export declare class Cohorts {
|
|
11
|
+
groups: string[];
|
|
12
|
+
cells: Map<string, {
|
|
13
|
+
key: string[];
|
|
14
|
+
c: Record<string, number | string>;
|
|
15
|
+
}>;
|
|
16
|
+
guaranty: boolean;
|
|
17
|
+
constructor(groups: string[]);
|
|
18
|
+
add(r: Row): void;
|
|
19
|
+
/** One row per cohort and group, sorted; the 504 files have no guaranty column, so neither does their table. */
|
|
20
|
+
table(): Row[];
|
|
21
|
+
}
|
|
22
|
+
/** Parse a CSV stream, keeping the rows that pass `keep` (the header names the columns), or summing them into
|
|
23
|
+
* `agg`. [rows, cut at max] */
|
|
24
|
+
export declare function streamRows(src: Readable, keep: (r: Row) => boolean, max: number, agg?: Cohorts): Promise<[Row[], boolean]>;
|
|
7
25
|
/** One row per file in data.sba.gov's catalog (data.json); `file` is set for CSVs (the foia request's path). */
|
|
8
26
|
export declare function catalogRows(cat: any, search: string): Row[];
|
|
9
27
|
declare const adapter: Adapter;
|
package/dist/adapters/sba.js
CHANGED
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
* - the 7(a) and 504 FOIA CSVs are under /sites/default/files/uploaded_resources/, named with their as-of date
|
|
5
5
|
* (FOIA_504_FY2010_Present_asof_260930.csv) and 60 to 255 MB each.
|
|
6
6
|
* list_files reads the catalog. foia streams the CSV through the parser and keeps only the rows that pass the
|
|
7
|
-
* filters, so a 255 MB file never becomes a full table in memory; a filter is required.
|
|
7
|
+
* filters, so a 255 MB file never becomes a full table in memory; a filter is required. cohorts sums the same
|
|
8
|
+
* rows per ApprovalFY (and group_by columns) while reading, so a whole file can be totalled.
|
|
8
9
|
*/
|
|
9
10
|
import fs from "node:fs";
|
|
10
11
|
import { Readable } from "node:stream";
|
|
@@ -34,8 +35,81 @@ export function keeper(p) {
|
|
|
34
35
|
return true;
|
|
35
36
|
};
|
|
36
37
|
}
|
|
37
|
-
/**
|
|
38
|
-
|
|
38
|
+
/** The published LoanStatus without spaces ("P I F" is PIF), with both undisbursed codes (7(a) COMMIT, 504 NOT
|
|
39
|
+
* FUNDED) as UNDISBURSED. */
|
|
40
|
+
const STATUS = { COMMIT: "UNDISBURSED", NOTFUNDED: "UNDISBURSED" };
|
|
41
|
+
export const STATUS_CODES = ["CANCLD", "CHGOFF", "CLOSED", "EXEMPT", "PIF", "UNDISBURSED"];
|
|
42
|
+
export const statusCode = (v) => {
|
|
43
|
+
const k = pyStr(v ?? "").replace(/\s+/g, "").toUpperCase();
|
|
44
|
+
return STATUS[k] ?? k;
|
|
45
|
+
};
|
|
46
|
+
export const GROUPS = ["BorrState", "ProjectState", "ProcessingMethod", "naics2", "NaicsCode", "BusinessType", "BusinessAge",
|
|
47
|
+
"FixedorVariableInterestInd", "TermInMonths", "RevolverStatus", "SoldSecMrktInd", "loan_status_code"];
|
|
48
|
+
const NOT_DISBURSED = ["CANCLD", "UNDISBURSED"];
|
|
49
|
+
const num = (v) => {
|
|
50
|
+
const x = Number(pyStr(v ?? "").trim());
|
|
51
|
+
return pyStr(v ?? "").trim() === "" || !Number.isFinite(x) ? 0 : x;
|
|
52
|
+
};
|
|
53
|
+
const fmt = (x) => (Number.isInteger(x) ? String(x) : x.toFixed(2).replace(/0+$/, "").replace(/\.$/, ""));
|
|
54
|
+
/** Totals per approval fiscal year (cohort) and group: loan counts by status, approved and guaranteed dollars for
|
|
55
|
+
* all and for disbursed loans, and the gross charge-off amount. */
|
|
56
|
+
export class Cohorts {
|
|
57
|
+
groups;
|
|
58
|
+
cells = new Map();
|
|
59
|
+
guaranty = false;
|
|
60
|
+
constructor(groups) {
|
|
61
|
+
this.groups = groups;
|
|
62
|
+
}
|
|
63
|
+
add(r) {
|
|
64
|
+
const g = this.groups.map((k) => (k === "naics2" ? pyStr(r.NaicsCode ?? "").trim().slice(0, 2)
|
|
65
|
+
: k === "loan_status_code" ? statusCode(r.LoanStatus) : pyStr(r[k] ?? "").trim()));
|
|
66
|
+
const key = [pyStr(r.ApprovalFY ?? "").trim(), ...g];
|
|
67
|
+
const id = JSON.stringify(key);
|
|
68
|
+
if ("SBAGuaranteedApproval" in r)
|
|
69
|
+
this.guaranty = true;
|
|
70
|
+
let cell = this.cells.get(id);
|
|
71
|
+
if (!cell) {
|
|
72
|
+
cell = { key, c: { as_of: pyStr(r.AsOfDate ?? "").trim(), loans: 0, gross_approval: 0, sba_guaranteed: 0, loans_disbursed: 0,
|
|
73
|
+
disbursed_gross_approval: 0, disbursed_sba_guaranteed: 0, ...Object.fromEntries(STATUS_CODES.map((s) => [`loans_${s.toLowerCase()}`, 0])),
|
|
74
|
+
gross_chargeoff_amount: 0, loans_other_status: 0 } };
|
|
75
|
+
this.cells.set(id, cell);
|
|
76
|
+
}
|
|
77
|
+
const c = cell.c;
|
|
78
|
+
const st = statusCode(r.LoanStatus), ga = num(r.GrossApproval), gu = num(r.SBAGuaranteedApproval);
|
|
79
|
+
c.loans += 1;
|
|
80
|
+
c.gross_approval += ga;
|
|
81
|
+
c.sba_guaranteed += gu;
|
|
82
|
+
if (STATUS_CODES.includes(st))
|
|
83
|
+
c[`loans_${st.toLowerCase()}`] += 1;
|
|
84
|
+
else
|
|
85
|
+
c.loans_other_status += 1;
|
|
86
|
+
if (!NOT_DISBURSED.includes(st)) {
|
|
87
|
+
c.loans_disbursed += 1;
|
|
88
|
+
c.disbursed_gross_approval += ga;
|
|
89
|
+
c.disbursed_sba_guaranteed += gu;
|
|
90
|
+
}
|
|
91
|
+
c.gross_chargeoff_amount += num(r.GrossChargeOffAmount);
|
|
92
|
+
}
|
|
93
|
+
/** One row per cohort and group, sorted; the 504 files have no guaranty column, so neither does their table. */
|
|
94
|
+
table() {
|
|
95
|
+
const out = [];
|
|
96
|
+
const cells = [...this.cells.entries()].sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)).map(([, x]) => x);
|
|
97
|
+
for (const { key, c } of cells) {
|
|
98
|
+
const row = { ApprovalFY: key[0] };
|
|
99
|
+
this.groups.forEach((g, i) => (row[g] = key[i + 1]));
|
|
100
|
+
for (const [k, v] of Object.entries(c)) {
|
|
101
|
+
if (!this.guaranty && (k === "sba_guaranteed" || k === "disbursed_sba_guaranteed"))
|
|
102
|
+
continue;
|
|
103
|
+
row[k] = typeof v === "number" ? fmt(v) : v;
|
|
104
|
+
}
|
|
105
|
+
out.push(row);
|
|
106
|
+
}
|
|
107
|
+
return out;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
/** Parse a CSV stream, keeping the rows that pass `keep` (the header names the columns), or summing them into
|
|
111
|
+
* `agg`. [rows, cut at max] */
|
|
112
|
+
export async function streamRows(src, keep, max, agg) {
|
|
39
113
|
const out = [];
|
|
40
114
|
let cols = [];
|
|
41
115
|
let cut = false;
|
|
@@ -49,6 +123,10 @@ export async function streamRows(src, keep, max) {
|
|
|
49
123
|
cols.forEach((c, i) => (r[c] = i < rec.length ? rec[i] : ""));
|
|
50
124
|
if (!keep(r))
|
|
51
125
|
continue;
|
|
126
|
+
if (agg) {
|
|
127
|
+
agg.add(r);
|
|
128
|
+
continue;
|
|
129
|
+
}
|
|
52
130
|
if (out.length >= max) {
|
|
53
131
|
cut = true;
|
|
54
132
|
break;
|
|
@@ -57,14 +135,20 @@ export async function streamRows(src, keep, max) {
|
|
|
57
135
|
}
|
|
58
136
|
return [withColumns(out, cols), cut];
|
|
59
137
|
}
|
|
138
|
+
const groupsOf = (p) => (Array.isArray(p.group_by) ? p.group_by : p.group_by === undefined || p.group_by === "" ? [] : [p.group_by]).map((x) => pyStr(x));
|
|
60
139
|
function checkSpec(spec) {
|
|
61
140
|
const bad = [];
|
|
62
141
|
for (const r of spec.requests || []) {
|
|
63
142
|
const p = r.params || {};
|
|
64
|
-
if (r.endpoint
|
|
143
|
+
if (r.endpoint === "cohorts") {
|
|
144
|
+
const badg = groupsOf(p).filter((x) => !GROUPS.includes(x));
|
|
145
|
+
if (badg.length)
|
|
146
|
+
bad.push(`request ${JSON.stringify(r.name)}: group_by ${JSON.stringify(badg)} not one of ${GROUPS.join(", ")}`);
|
|
147
|
+
}
|
|
148
|
+
else if (r.endpoint !== "foia")
|
|
65
149
|
continue;
|
|
66
|
-
if (!["state", "fiscal_year", "from", "naics"].some((k) => p[k] !== undefined && p[k] !== "")) {
|
|
67
|
-
bad.push(`request ${JSON.stringify(r.name)}: give state, fiscal_year, from or naics (the files hold hundreds of thousands of loans)`);
|
|
150
|
+
if (r.endpoint === "foia" && !["state", "fiscal_year", "from", "naics"].some((k) => p[k] !== undefined && p[k] !== "")) {
|
|
151
|
+
bad.push(`request ${JSON.stringify(r.name)}: give state, fiscal_year, from or naics (the files hold hundreds of thousands of loans), or use cohorts for totals`);
|
|
68
152
|
}
|
|
69
153
|
if (p.file !== undefined && (!/^[\w./-]+$/.test(pyStr(p.file)) || pyStr(p.file).includes(".."))) {
|
|
70
154
|
bad.push(`request ${JSON.stringify(r.name)}: file is a path from list_files`);
|
|
@@ -105,7 +189,13 @@ async function fetch(spec, pack) {
|
|
|
105
189
|
const [p] = gr.split(ep, params);
|
|
106
190
|
const resp = await c.request("GET", p, null);
|
|
107
191
|
const max = Number(r.max_rows || ep.max_rows || 1000000);
|
|
108
|
-
const
|
|
192
|
+
const agg = r.endpoint === "cohorts" ? new Cohorts(groupsOf(params)) : undefined;
|
|
193
|
+
let [rows, cut] = await streamRows(Readable.from([resp.body]), keeper(params), max, agg);
|
|
194
|
+
if (agg) {
|
|
195
|
+
rows = agg.table();
|
|
196
|
+
const asOf = rows.length ? pyStr(rows[0].as_of) : "";
|
|
197
|
+
notes.push(`${r.name}: ${rows.length.toLocaleString("en-US")} cohort rows; LoanStatus and charge-offs as of ${asOf || "the file's AsOfDate"}, so recent cohorts have had less time to default; dollars nominal`);
|
|
198
|
+
}
|
|
109
199
|
if (cut)
|
|
110
200
|
notes.push(`${r.name}: stopped at ${rows.length.toLocaleString("en-US")} rows (max_rows); the source has more. Narrow the filter or raise max_rows.`);
|
|
111
201
|
if (!rows.length && !r.allow_empty) {
|
|
@@ -116,9 +206,15 @@ async function fetch(spec, pack) {
|
|
|
116
206
|
return [tables, notes];
|
|
117
207
|
}
|
|
118
208
|
async function parseUpload(pack, req, files) {
|
|
119
|
-
if (req.endpoint !== "foia")
|
|
209
|
+
if (req.endpoint !== "foia" && req.endpoint !== "cohorts")
|
|
120
210
|
return gr.parseUpload(pack, req, files);
|
|
121
211
|
const [, params] = gr.resolve(pack, req);
|
|
212
|
+
if (req.endpoint === "cohorts") {
|
|
213
|
+
const agg = new Cohorts(groupsOf(params));
|
|
214
|
+
for (const f of [...files].sort())
|
|
215
|
+
await streamRows(fs.createReadStream(f), keeper(params), 1000000, agg);
|
|
216
|
+
return agg.table();
|
|
217
|
+
}
|
|
122
218
|
const rows = [];
|
|
123
219
|
let cols = [];
|
|
124
220
|
for (const f of [...files].sort()) {
|
package/dist/adapters/sba.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sba.js","sourceRoot":"","sources":["../../src/adapters/sba.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sba.js","sourceRoot":"","sources":["../../src/adapters/sba.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ import os from "node:os";
|
|
|
15
15
|
import path from "node:path";
|
|
16
16
|
import v8 from "node:v8";
|
|
17
17
|
import { Worker } from "node:worker_threads";
|
|
18
|
+
import { progress } from "../core/context.js";
|
|
18
19
|
import { rerunWorkspace } from "./rerun.js";
|
|
19
20
|
/** How long a tool call waits for the rerun before answering "in progress" (seconds; under the 60 s clients wait). */
|
|
20
21
|
export function rerunWaitMs() {
|
|
@@ -159,6 +160,7 @@ export async function awaitRerun(workspace, until = Date.now() + rerunWaitMs())
|
|
|
159
160
|
if (!job)
|
|
160
161
|
return rerunWorkspace(path.resolve(workspace));
|
|
161
162
|
if (job.finished === undefined) {
|
|
163
|
+
progress("replaying the exhibit recipes (the rerun)");
|
|
162
164
|
const left = until - Date.now();
|
|
163
165
|
let timer;
|
|
164
166
|
await Promise.race([job.done, new Promise((r) => (timer = setTimeout(r, Math.max(0, left))))]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rerun_job.js","sourceRoot":"","sources":["../../src/analysis/rerun_job.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rerun_job.js","sourceRoot":"","sources":["../../src/analysis/rerun_job.ts"],"names":[],"mappings":"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"}
|
package/dist/analysis/tools.d.ts
CHANGED
|
@@ -14,7 +14,26 @@ export declare function computeTool(s: Session, a: any): {
|
|
|
14
14
|
notes: string[];
|
|
15
15
|
next: string;
|
|
16
16
|
};
|
|
17
|
-
|
|
17
|
+
/** The facts tool. `all`: list every fact on every call (the library, which has no earlier results to look back on). */
|
|
18
|
+
export declare function factsTool(s: Session, a: any, all?: boolean): {
|
|
19
|
+
status: string;
|
|
20
|
+
summary: {
|
|
21
|
+
added: {};
|
|
22
|
+
};
|
|
23
|
+
facts: {
|
|
24
|
+
name: string;
|
|
25
|
+
value: any;
|
|
26
|
+
text: any;
|
|
27
|
+
}[];
|
|
28
|
+
facts_total: number;
|
|
29
|
+
files: string[];
|
|
30
|
+
notes: never[];
|
|
31
|
+
} | {
|
|
32
|
+
facts_total: number;
|
|
33
|
+
files: string[];
|
|
34
|
+
notes: string[];
|
|
35
|
+
next: string;
|
|
36
|
+
facts?: undefined;
|
|
18
37
|
status: string;
|
|
19
38
|
summary: {
|
|
20
39
|
added: {
|
|
@@ -25,14 +44,26 @@ export declare function factsTool(s: Session, a: any): {
|
|
|
25
44
|
};
|
|
26
45
|
};
|
|
27
46
|
};
|
|
47
|
+
} | {
|
|
48
|
+
facts_total: number;
|
|
49
|
+
files: string[];
|
|
50
|
+
notes: string[];
|
|
51
|
+
next: string;
|
|
28
52
|
facts: {
|
|
29
53
|
name: string;
|
|
30
54
|
value: any;
|
|
31
55
|
text: any;
|
|
32
56
|
}[];
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
57
|
+
status: string;
|
|
58
|
+
summary: {
|
|
59
|
+
added: {
|
|
60
|
+
[k: string]: {
|
|
61
|
+
pack?: any;
|
|
62
|
+
value: any;
|
|
63
|
+
text: any;
|
|
64
|
+
};
|
|
65
|
+
};
|
|
66
|
+
};
|
|
36
67
|
};
|
|
37
68
|
export declare function rerunTool(s: Session): Promise<{
|
|
38
69
|
status: string;
|
package/dist/analysis/tools.js
CHANGED
|
@@ -30,21 +30,39 @@ export function computeTool(s, a) {
|
|
|
30
30
|
"so the answer and report quote it and the rerun gate reproduces it.",
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
|
-
|
|
33
|
+
/** The facts tool. `all`: list every fact on every call (the library, which has no earlier results to look back on). */
|
|
34
|
+
export function factsTool(s, a, all = false) {
|
|
35
|
+
const file = path.join(s.workspace, "facts.json");
|
|
36
|
+
const read = () => {
|
|
37
|
+
try {
|
|
38
|
+
return JSON.parse(fs.readFileSync(file, "utf8"));
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
return {}; // none yet
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
// a call that changes nothing lists the facts and writes nothing (a rewritten facts.json would start the rerun over)
|
|
45
|
+
if (!a?.add?.length && !a?.derived?.length && !a?.remove?.length) {
|
|
46
|
+
const saved = read();
|
|
47
|
+
const names = Object.keys(saved);
|
|
48
|
+
return { status: "ok", summary: { added: {} },
|
|
49
|
+
facts: names.map((n) => ({ name: n, value: saved[n]?.value ?? null, text: saved[n]?.text ?? null })),
|
|
50
|
+
facts_total: names.length, files: fs.existsSync(file) ? [file] : [], notes: [] };
|
|
51
|
+
}
|
|
34
52
|
try {
|
|
35
53
|
const r = registerFacts(s.workspace, a);
|
|
36
54
|
// each fact as the answer must print it (the audit matches the text exactly)
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
catch { /* none yet */ }
|
|
42
|
-
// compact: each fact's value and the text the model quotes, and only value/text/pack for the ones just added (the
|
|
43
|
-
// rest of each record is its own input echoed back)
|
|
44
|
-
const facts = r.names.map((n) => ({ name: n, value: saved[n]?.value ?? null, text: saved[n]?.text ?? null }));
|
|
55
|
+
const saved = read();
|
|
56
|
+
// compact: value, text (what the model quotes) and pack of the facts this call registered (the rest of each
|
|
57
|
+
// record is its own input echoed back). The facts of earlier calls are unchanged and were returned then: they
|
|
58
|
+
// are listed again only by a call that registers none (no arguments lists every fact).
|
|
45
59
|
const added = Object.fromEntries(Object.entries(r.added).map(([n, rec]) => [n, { value: rec?.value ?? null, text: rec?.text ?? null, ...(rec && "pack" in rec ? { pack: rec.pack } : {}) }]));
|
|
46
|
-
|
|
47
|
-
|
|
60
|
+
const names = r.names;
|
|
61
|
+
const listed = Object.keys(added).length && !all ? {}
|
|
62
|
+
: { facts: names.map((n) => ({ name: n, value: saved[n]?.value ?? null, text: saved[n]?.text ?? null })) };
|
|
63
|
+
return { status: "ok", summary: { added }, ...listed, facts_total: names.length, files: [r.file], notes: r.notes,
|
|
64
|
+
next: "Quote each fact's text in the answer exactly (or {{name}} / {{name|fmt}} in report.json). facts with no " +
|
|
65
|
+
"arguments lists every fact registered so far." };
|
|
48
66
|
}
|
|
49
67
|
catch (e) {
|
|
50
68
|
if (e instanceof FactError) {
|
|
@@ -145,7 +163,8 @@ export const TOOLS = [
|
|
|
145
163
|
"a derivation: written as an expression over fact names (\"deaths_2024 / deaths_2020 - 1\") it is computed here, so " +
|
|
146
164
|
"leave value out; a prose derivation needs value. Refuses empty cells and NaN, an ambiguous pack, unknown formats and " +
|
|
147
165
|
"units slips (a share given to pct100, millions given to usd_b ...); nothing is saved when any fact is refused. " +
|
|
148
|
-
"Returns
|
|
166
|
+
"Returns this call's facts with their text (the value as the answer prints it: quote it exactly) and notes " +
|
|
167
|
+
"(rounding ties); with no arguments, every fact registered so far. " +
|
|
149
168
|
"fmt codes: raw, num:0, pct:1 (share 0-1), pct100:1 (already percent), pp:1, pp100:1, bp:0, dollars:0, thousands:-3, " +
|
|
150
169
|
"millions:1, billions:1, usd_b:1 (value in dollars), usd_b_scaled:1 (already billions), ratio:2, index:1, year; " +
|
|
151
170
|
"prefixes signed:, abs:, from_millions: ...; suffix :abs. pack is inferred from data/<id>/ or the exhibit's lineage.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/analysis/tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/analysis/tools.ts"],"names":[],"mappings":"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"}
|
package/dist/core/context.d.ts
CHANGED
|
@@ -10,3 +10,9 @@ export type SourceRecord = {
|
|
|
10
10
|
export declare function withRun<T>(fn: () => T): T;
|
|
11
11
|
/** The requests made so far in this call (a live array: slice it to keep a part). */
|
|
12
12
|
export declare function trail(): SourceRecord[];
|
|
13
|
+
type Reporter = (message: string) => void;
|
|
14
|
+
/** Run fn with a progress reporter: the server gives one to a tool call whose client asked for progress. */
|
|
15
|
+
export declare function withProgress<T>(report: Reporter, fn: () => T): T;
|
|
16
|
+
/** Say what a long call is doing now. Nothing happens when the client did not ask for progress; never throws. */
|
|
17
|
+
export declare function progress(message: string): void;
|
|
18
|
+
export {};
|
package/dist/core/context.js
CHANGED
|
@@ -12,4 +12,18 @@ export function withRun(fn) {
|
|
|
12
12
|
export function trail() {
|
|
13
13
|
return (store.getStore() ?? fallback).sources;
|
|
14
14
|
}
|
|
15
|
+
const reporter = new AsyncLocalStorage();
|
|
16
|
+
/** Run fn with a progress reporter: the server gives one to a tool call whose client asked for progress. */
|
|
17
|
+
export function withProgress(report, fn) {
|
|
18
|
+
return reporter.run(report, fn);
|
|
19
|
+
}
|
|
20
|
+
/** Say what a long call is doing now. Nothing happens when the client did not ask for progress; never throws. */
|
|
21
|
+
export function progress(message) {
|
|
22
|
+
try {
|
|
23
|
+
reporter.getStore()?.(message);
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
/* a progress line never fails the call */
|
|
27
|
+
}
|
|
28
|
+
}
|
|
15
29
|
//# sourceMappingURL=context.js.map
|
package/dist/core/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAOrD,MAAM,KAAK,GAAG,IAAI,iBAAiB,EAAO,CAAC;AAC3C,MAAM,QAAQ,GAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AAEtC,MAAM,UAAU,OAAO,CAAI,EAAW;IACpC,OAAO,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,KAAK;IACnB,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,QAAQ,CAAC,CAAC,OAAO,CAAC;AAChD,CAAC"}
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAOrD,MAAM,KAAK,GAAG,IAAI,iBAAiB,EAAO,CAAC;AAC3C,MAAM,QAAQ,GAAQ,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AAEtC,MAAM,UAAU,OAAO,CAAI,EAAW;IACpC,OAAO,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,KAAK;IACnB,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,QAAQ,CAAC,CAAC,OAAO,CAAC;AAChD,CAAC;AAGD,MAAM,QAAQ,GAAG,IAAI,iBAAiB,EAAY,CAAC;AAEnD,4GAA4G;AAC5G,MAAM,UAAU,YAAY,CAAI,MAAgB,EAAE,EAAW;IAC3D,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAClC,CAAC;AAED,iHAAiH;AACjH,MAAM,UAAU,QAAQ,CAAC,OAAe;IACtC,IAAI,CAAC;QACH,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,0CAA0C;IAC5C,CAAC;AACH,CAAC"}
|
|
@@ -33,6 +33,7 @@
|
|
|
33
33
|
import fs from "node:fs";
|
|
34
34
|
import path from "node:path";
|
|
35
35
|
import { Cache } from "./cache.js";
|
|
36
|
+
import { progress } from "./context.js";
|
|
36
37
|
import { workspaceFile } from "./guard.js";
|
|
37
38
|
import { Client, DataError } from "./http.js";
|
|
38
39
|
import { parsePyJson, pyJsonDumps, pyQuote, pyStr, pyUrlencode, sleep } from "./py.js";
|
|
@@ -299,7 +300,8 @@ export function records(ep, resp) {
|
|
|
299
300
|
for (const c of columnsOf(part) || [])
|
|
300
301
|
if (!order.includes(c))
|
|
301
302
|
order.push(c);
|
|
302
|
-
|
|
303
|
+
for (const r of part)
|
|
304
|
+
rows.push(r); // not push(...part): a member can hold more rows than the stack takes
|
|
303
305
|
}
|
|
304
306
|
return order.length ? withColumns(rows, order) : rows;
|
|
305
307
|
}
|
|
@@ -456,6 +458,7 @@ async function fetchPatiently(c, ep, params, maxRows, waits = [20, 60]) {
|
|
|
456
458
|
if (wait === null || !(e instanceof DataError) || e.kind !== "http" || ![500, 502, 503, 504].includes(e.status ?? 0) ||
|
|
457
459
|
process.env.DATA_ANALYST_FIXTURES)
|
|
458
460
|
throw e;
|
|
461
|
+
progress(`the source is busy (HTTP ${e.status}); trying again in ${wait} s`);
|
|
459
462
|
await sleep(wait * 1000);
|
|
460
463
|
}
|
|
461
464
|
}
|
|
@@ -501,7 +504,9 @@ export async function fetchSpec(pack, spec, client) {
|
|
|
501
504
|
const tables = {};
|
|
502
505
|
const notes = [];
|
|
503
506
|
const miss = new Misses();
|
|
504
|
-
for (const r of spec.requests) {
|
|
507
|
+
for (const [i, r] of spec.requests.entries()) {
|
|
508
|
+
if (spec.requests.length > 1)
|
|
509
|
+
progress(`${pack.id}: request ${i + 1} of ${spec.requests.length} (${r.name})`);
|
|
505
510
|
const [ep, params0, probs] = resolve(pack, r);
|
|
506
511
|
if (probs.length)
|
|
507
512
|
throw new DataError(probs.join("; "), "bad_request");
|