@vibes.diy/api-svc 5.5.17 → 6.0.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/intern/backend-policy-version.d.ts +1 -1
- package/intern/backend-policy-version.js +1 -1
- package/intern/egress-platform-list.js +2 -0
- package/intern/egress-platform-list.js.map +1 -1
- package/intern/first-message-embedding.d.ts +19 -3
- package/intern/first-message-embedding.js +50 -11
- package/intern/first-message-embedding.js.map +1 -1
- package/package.json +11 -11
- package/usage-report/backfill-first-message-embeddings.js +23 -9
- package/usage-report/backfill-first-message-embeddings.js.map +1 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const EGRESS_POLICY_VERSION = "
|
|
1
|
+
export declare const EGRESS_POLICY_VERSION = "e4";
|
|
2
2
|
export declare function computeBackendPolicyVersion(envBase: string | undefined): string;
|
|
@@ -4,6 +4,8 @@ export const PLATFORM_EGRESS_LIST = [
|
|
|
4
4
|
{ host: "api.linkedin.com", path: "/v2/userinfo", methods: ["GET"] },
|
|
5
5
|
{ host: "api.linkedin.com", path: "/rest/images", search: "?action=initializeUpload", methods: ["POST"] },
|
|
6
6
|
{ host: "www.linkedin.com", pathPrefix: "/dms-uploads/", methods: ["PUT"] },
|
|
7
|
+
{ host: "public.api.bsky.app", path: "/xrpc/app.bsky.feed.searchPosts", methods: ["GET"] },
|
|
8
|
+
{ host: "public.api.bsky.app", path: "/xrpc/app.bsky.feed.getAuthorFeed", methods: ["GET"] },
|
|
7
9
|
];
|
|
8
10
|
export function hostMatchesAllowEntry(host, pattern) {
|
|
9
11
|
const h = host.toLowerCase();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"egress-platform-list.js","sourceRoot":"","sources":["../../jsr/intern/egress-platform-list.ts"],"names":[],"mappings":"AA6BA,MAAM,CAAC,MAAM,oBAAoB,GAAmC;IAElE,EAAE,IAAI,EAAE,gBAAgB,EAAE;IAQ1B,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE;IACpE,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE;IAiBpE,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,0BAA0B,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE;IACzG,EAAE,IAAI,EAAE,kBAAkB,EAAE,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"egress-platform-list.js","sourceRoot":"","sources":["../../jsr/intern/egress-platform-list.ts"],"names":[],"mappings":"AA6BA,MAAM,CAAC,MAAM,oBAAoB,GAAmC;IAElE,EAAE,IAAI,EAAE,gBAAgB,EAAE;IAQ1B,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE;IACpE,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE;IAiBpE,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,0BAA0B,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE;IACzG,EAAE,IAAI,EAAE,kBAAkB,EAAE,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE;IAS3E,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,iCAAiC,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE;IAC1F,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,mCAAmC,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE;CAC7F,CAAC;AASF,MAAM,UAAU,qBAAqB,CAAC,IAAY,EAAE,OAAe;IACjE,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC7B,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAChC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;YAAE,OAAO,KAAK,CAAC;QAC5C,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAC/C,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,CAAC;AACjB,CAAC;AAQD,MAAM,UAAU,mBAAmB,CACjC,GAAQ,EACR,MAAc,EACd,IAAI,GAAmC,oBAAoB;IAE3D,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC;YAAE,SAAS;QAC/D,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,QAAQ,KAAK,KAAK,CAAC,IAAI;YAAE,SAAS;QACtE,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC;YAAE,SAAS;QAC3F,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAAE,SAAS;QACxE,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAAE,SAAS;QAC3F,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1,17 +1,32 @@
|
|
|
1
1
|
import { Result } from "@adviser/cement";
|
|
2
|
-
import {
|
|
2
|
+
import { type S3Api } from "@vibes.diy/api-types";
|
|
3
|
+
import { CreateSQLPeerParams, DBFlavour, VibesApiTables, VibesSqlite } from "@vibes.diy/api-sql";
|
|
4
|
+
import type { SuperThis } from "@vibes.diy/identity";
|
|
3
5
|
export declare const EMBEDDING_MODEL = "openai/text-embedding-3-small";
|
|
4
6
|
export interface FirstMessageEmbeddingDeps {
|
|
5
7
|
readonly db: VibesSqlite;
|
|
6
8
|
readonly tables: VibesApiTables;
|
|
7
9
|
readonly flavour: DBFlavour;
|
|
10
|
+
readonly sthis: SuperThis;
|
|
11
|
+
readonly storageSystems: {
|
|
12
|
+
readonly sql: CreateSQLPeerParams;
|
|
13
|
+
readonly s3?: S3Api;
|
|
14
|
+
};
|
|
8
15
|
readonly llmBackendUrl: string;
|
|
9
16
|
readonly llmBackendApiKey: string;
|
|
10
17
|
}
|
|
11
|
-
export type PopulateOutcome = "embedded" | "unchanged" | "empty" | "skipped-non-pg";
|
|
18
|
+
export type PopulateOutcome = "embedded" | "unchanged" | "empty" | "deferred" | "skipped-non-pg";
|
|
19
|
+
type EmbedSource = {
|
|
20
|
+
readonly kind: "text";
|
|
21
|
+
readonly text: string;
|
|
22
|
+
} | {
|
|
23
|
+
readonly kind: "empty";
|
|
24
|
+
} | {
|
|
25
|
+
readonly kind: "storage-unavailable";
|
|
26
|
+
};
|
|
12
27
|
export declare function firstMessageContentHash(model: string, prose: string): string;
|
|
13
28
|
export declare function embedText(deps: FirstMessageEmbeddingDeps, input: string): Promise<Result<number[]>>;
|
|
14
|
-
export declare function
|
|
29
|
+
export declare function loadFirstMessageEmbedText(deps: FirstMessageEmbeddingDeps, ownerHandle: string, appSlug: string): Promise<EmbedSource>;
|
|
15
30
|
export declare function populateFirstMessageEmbedding(deps: FirstMessageEmbeddingDeps, args: {
|
|
16
31
|
ownerHandle: string;
|
|
17
32
|
appSlug: string;
|
|
@@ -19,3 +34,4 @@ export declare function populateFirstMessageEmbedding(deps: FirstMessageEmbeddin
|
|
|
19
34
|
promptId?: string;
|
|
20
35
|
now?: string;
|
|
21
36
|
}): Promise<Result<PopulateOutcome>>;
|
|
37
|
+
export {};
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import { exception2Result, Result } from "@adviser/cement";
|
|
1
|
+
import { exception2Result, Result, stream2uint8array } from "@adviser/cement";
|
|
2
2
|
import { bytesToHex, utf8ToBytes } from "@noble/hashes/utils.js";
|
|
3
3
|
import { sha256 } from "@noble/hashes/sha2.js";
|
|
4
|
-
import { and, eq } from "drizzle-orm/sql/expressions";
|
|
5
|
-
import {
|
|
4
|
+
import { and, desc, eq } from "drizzle-orm/sql/expressions";
|
|
5
|
+
import { fileSystemItem, firstMessageProse, isFetchErrResult, isFetchNotFoundResult, parseArray, parseArrayWarning, PromptAndBlockMsgs, } from "@vibes.diy/api-types";
|
|
6
|
+
import { createSQLPeer } from "@vibes.diy/api-sql";
|
|
7
|
+
import { ensureStorage } from "@vibes.diy/api-pkg";
|
|
8
|
+
import { createS3Peer } from "../peers/s3.js";
|
|
6
9
|
export const EMBEDDING_MODEL = "openai/text-embedding-3-small";
|
|
7
10
|
function embeddingsUrl(backendUrl) {
|
|
8
11
|
const suffix = "/chat/completions";
|
|
@@ -35,7 +38,36 @@ export async function embedText(deps, input) {
|
|
|
35
38
|
return embedding;
|
|
36
39
|
});
|
|
37
40
|
}
|
|
38
|
-
|
|
41
|
+
const CODE_SNIPPET_CHARS = 100;
|
|
42
|
+
async function loadAppJsxSnippet(deps, ownerHandle, appSlug) {
|
|
43
|
+
const { db, tables } = deps;
|
|
44
|
+
const rows = await db
|
|
45
|
+
.select({ fileSystem: tables.apps.fileSystem })
|
|
46
|
+
.from(tables.apps)
|
|
47
|
+
.where(and(eq(tables.apps.ownerHandle, ownerHandle), eq(tables.apps.appSlug, appSlug), eq(tables.apps.mode, "production")))
|
|
48
|
+
.orderBy(desc(tables.apps.releaseSeq))
|
|
49
|
+
.limit(1);
|
|
50
|
+
if (rows[0] === undefined)
|
|
51
|
+
return { kind: "empty" };
|
|
52
|
+
const items = parseArray(rows[0].fileSystem, fileSystemItem);
|
|
53
|
+
const appItem = items.find((f) => f.entryPoint === true && f.fileName === "/App.jsx") ??
|
|
54
|
+
items.find((f) => f.fileName === "/App.jsx") ??
|
|
55
|
+
items.find((f) => /\.(jsx|tsx|js|ts)$/.test(f.fileName));
|
|
56
|
+
if (appItem === undefined)
|
|
57
|
+
return { kind: "empty" };
|
|
58
|
+
const storage = deps.storageSystems.s3 !== undefined
|
|
59
|
+
? ensureStorage({}, createSQLPeer(deps.storageSystems.sql), createS3Peer({ s3: deps.storageSystems.s3 }))
|
|
60
|
+
: ensureStorage({}, createSQLPeer(deps.storageSystems.sql));
|
|
61
|
+
const rFetch = await storage.fetch(appItem.assetURI);
|
|
62
|
+
if (isFetchErrResult(rFetch) || isFetchNotFoundResult(rFetch))
|
|
63
|
+
return { kind: "storage-unavailable" };
|
|
64
|
+
const code = deps.sthis.txt.decode(await stream2uint8array(rFetch.data)).trim();
|
|
65
|
+
if (code.length === 0)
|
|
66
|
+
return { kind: "empty" };
|
|
67
|
+
const snippet = code.length <= CODE_SNIPPET_CHARS * 2 ? code : `${code.slice(0, CODE_SNIPPET_CHARS)}\n…\n${code.slice(-CODE_SNIPPET_CHARS)}`;
|
|
68
|
+
return { kind: "text", text: snippet };
|
|
69
|
+
}
|
|
70
|
+
export async function loadFirstMessageEmbedText(deps, ownerHandle, appSlug) {
|
|
39
71
|
const { db, tables } = deps;
|
|
40
72
|
const rows = await db
|
|
41
73
|
.select({
|
|
@@ -72,18 +104,25 @@ export async function loadFirstMessageProse(deps, ownerHandle, appSlug) {
|
|
|
72
104
|
turn.sections.sort((a, b) => a.blockSeq - b.blockSeq);
|
|
73
105
|
}
|
|
74
106
|
const orderedTurns = Array.from(turns.values()).sort((a, b) => (a.created < b.created ? 1 : a.created > b.created ? -1 : 0));
|
|
75
|
-
|
|
107
|
+
const prose = firstMessageProse(orderedTurns);
|
|
108
|
+
if (prose !== "")
|
|
109
|
+
return { kind: "text", text: prose };
|
|
110
|
+
return await loadAppJsxSnippet(deps, ownerHandle, appSlug);
|
|
76
111
|
}
|
|
77
112
|
export async function populateFirstMessageEmbedding(deps, args) {
|
|
78
113
|
if (deps.flavour !== "pg") {
|
|
79
114
|
return Result.Ok("skipped-non-pg");
|
|
80
115
|
}
|
|
81
116
|
return exception2Result(async () => {
|
|
82
|
-
const
|
|
83
|
-
if (
|
|
117
|
+
const source = await loadFirstMessageEmbedText(deps, args.ownerHandle, args.appSlug);
|
|
118
|
+
if (source.kind === "storage-unavailable") {
|
|
119
|
+
return "deferred";
|
|
120
|
+
}
|
|
121
|
+
if (source.kind === "empty") {
|
|
84
122
|
return "empty";
|
|
85
123
|
}
|
|
86
|
-
const
|
|
124
|
+
const text = source.text;
|
|
125
|
+
const contentHash = firstMessageContentHash(EMBEDDING_MODEL, text);
|
|
87
126
|
const { db, tables } = deps;
|
|
88
127
|
const existing = await db
|
|
89
128
|
.select({ contentHash: tables.appFirstMessageEmbeddings.contentHash })
|
|
@@ -93,7 +132,7 @@ export async function populateFirstMessageEmbedding(deps, args) {
|
|
|
93
132
|
if (existing[0]?.contentHash === contentHash) {
|
|
94
133
|
return "unchanged";
|
|
95
134
|
}
|
|
96
|
-
const rEmbedding = await embedText(deps,
|
|
135
|
+
const rEmbedding = await embedText(deps, text);
|
|
97
136
|
if (rEmbedding.isErr()) {
|
|
98
137
|
throw rEmbedding.Err();
|
|
99
138
|
}
|
|
@@ -108,14 +147,14 @@ export async function populateFirstMessageEmbedding(deps, args) {
|
|
|
108
147
|
promptId: args.promptId ?? "",
|
|
109
148
|
model: EMBEDDING_MODEL,
|
|
110
149
|
contentHash,
|
|
111
|
-
proseText:
|
|
150
|
+
proseText: text,
|
|
112
151
|
embedding,
|
|
113
152
|
created: now,
|
|
114
153
|
updated: now,
|
|
115
154
|
})
|
|
116
155
|
.onConflictDoUpdate({
|
|
117
156
|
target: [tables.appFirstMessageEmbeddings.ownerHandle, tables.appFirstMessageEmbeddings.appSlug],
|
|
118
|
-
set: { model: EMBEDDING_MODEL, contentHash, proseText:
|
|
157
|
+
set: { model: EMBEDDING_MODEL, contentHash, proseText: text, embedding, updated: now },
|
|
119
158
|
});
|
|
120
159
|
return "embedded";
|
|
121
160
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"first-message-embedding.js","sourceRoot":"","sources":["../../jsr/intern/first-message-embedding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"first-message-embedding.js","sourceRoot":"","sources":["../../jsr/intern/first-message-embedding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACV,iBAAiB,EACjB,kBAAkB,GAInB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAuB,aAAa,EAA0C,MAAM,oBAAoB,CAAC;AAChH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAa9C,MAAM,CAAC,MAAM,eAAe,GAAG,+BAA+B,CAAC;AAyC/D,SAAS,aAAa,CAAC,UAAkB;IACvC,MAAM,MAAM,GAAG,mBAAmB,CAAC;IACnC,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAChC,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;IAC7D,CAAC;IACD,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC;AACxD,CAAC;AAGD,MAAM,UAAU,uBAAuB,CAAC,KAAa,EAAE,KAAa;IAClE,OAAO,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,KAAK,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;AAC/D,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,IAA+B,EAAE,KAAa;IAC5E,OAAO,gBAAgB,CAAC,KAAK,IAAI,EAAE;QACjC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;YACzD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,IAAI,CAAC,gBAAgB,EAAE;gBAChD,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC;SAClF,CAAC,CAAC;QACH,IAAI,GAAG,CAAC,EAAE,KAAK,KAAK,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,CAAC,MAAM,KAAK,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA0C,CAAC;QACzE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;QAC5C,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,KAAK,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAID,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAa/B,KAAK,UAAU,iBAAiB,CAAC,IAA+B,EAAE,WAAmB,EAAE,OAAe;IACpG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAS5B,MAAM,IAAI,GAAG,MAAM,EAAE;SAClB,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;SAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;SACjB,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;SAC1H,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACrC,KAAK,CAAC,CAAC,CAAC,CAAC;IACZ,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAEpD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAG7D,MAAM,OAAO,GACX,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC;QACrE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC;QAC5C,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3D,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAEpD,MAAM,OAAO,GACX,IAAI,CAAC,cAAc,CAAC,EAAE,KAAK,SAAS;QAClC,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;QACzG,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAIrD,IAAI,gBAAgB,CAAC,MAAM,CAAC,IAAI,qBAAqB,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;IACtG,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAChF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAChD,MAAM,OAAO,GACX,IAAI,CAAC,MAAM,IAAI,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAC/H,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AACzC,CAAC;AAYD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAA+B,EAC/B,WAAmB,EACnB,OAAe;IAEf,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,EAAE;SAClB,MAAM,CAAC;QACN,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM;QAClC,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ;QACtC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI;QAChC,aAAa,EAAE,MAAM,CAAC,cAAc,CAAC,OAAO;QAC5C,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,OAAO;QAC3C,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ;QACtC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM;KACnC,CAAC;SACD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;SACzB,SAAS,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SAC1F,QAAQ,CACP,MAAM,CAAC,cAAc,EACrB,GAAG,CACD,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,EAC5D,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CACjE,CACF;SACA,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAI1G,MAAM,KAAK,GAAG,IAAI,GAAG,EAA+B,CAAC;IACrD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,IAAI,GAAG;gBACL,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,OAAO,EAAE,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,cAAc;gBAChD,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1E,QAAQ,EAAE,EAAE;aACb,CAAC;YACF,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAChC,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAC/E,MAAM,OAAO,GAA2B,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QAC3E,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAI7H,MAAM,KAAK,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACvD,OAAO,MAAM,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,IAA+B,EAC/B,IAAgG;IAEhG,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,gBAAgB,CAAC,KAAK,IAAI,EAAE;QACjC,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACrF,IAAI,MAAM,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAC1C,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,MAAM,WAAW,GAAG,uBAAuB,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAE5B,MAAM,QAAQ,GAAG,MAAM,EAAE;aACtB,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,yBAAyB,CAAC,WAAW,EAAE,CAAC;aACrE,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC;aACtC,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,EAClE,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAC3D,CACF;aACA,KAAK,CAAC,CAAC,CAAC,CAAC;QACZ,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,KAAK,WAAW,EAAE,CAAC;YAC7C,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC;YACvB,MAAM,UAAU,CAAC,GAAG,EAAE,CAAC;QACzB,CAAC;QACD,MAAM,SAAS,GAAG,UAAU,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAEjD,MAAM,EAAE;aACL,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC;aACxC,MAAM,CAAC;YACN,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;YAC7B,KAAK,EAAE,eAAe;YACtB,WAAW;YACX,SAAS,EAAE,IAAI;YACf,SAAS;YACT,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,GAAG;SACb,CAAC;aACD,kBAAkB,CAAC;YAClB,MAAM,EAAE,CAAC,MAAM,CAAC,yBAAyB,CAAC,WAAW,EAAE,MAAM,CAAC,yBAAyB,CAAC,OAAO,CAAC;YAChG,GAAG,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE;SACvF,CAAC,CAAC;QACL,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/api-svc",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./index.js",
|
|
@@ -20,18 +20,18 @@
|
|
|
20
20
|
"@libsql/client": "~0.17.4",
|
|
21
21
|
"@neondatabase/serverless": "~1.1.0",
|
|
22
22
|
"@noble/hashes": "~2.2.0",
|
|
23
|
-
"@vibes.diy/api-pkg": "
|
|
24
|
-
"@vibes.diy/api-sql": "
|
|
25
|
-
"@vibes.diy/api-types": "
|
|
26
|
-
"@vibes.diy/call-ai-v2": "
|
|
27
|
-
"@vibes.diy/identity": "
|
|
28
|
-
"@vibes.diy/prompts": "
|
|
29
|
-
"@vibes.diy/vibe-db-explorer": "
|
|
30
|
-
"@vibes.diy/vibe-runtime": "
|
|
31
|
-
"@vibes.diy/vibe-types": "
|
|
23
|
+
"@vibes.diy/api-pkg": "6.0.0",
|
|
24
|
+
"@vibes.diy/api-sql": "6.0.0",
|
|
25
|
+
"@vibes.diy/api-types": "6.0.0",
|
|
26
|
+
"@vibes.diy/call-ai-v2": "6.0.0",
|
|
27
|
+
"@vibes.diy/identity": "6.0.0",
|
|
28
|
+
"@vibes.diy/prompts": "6.0.0",
|
|
29
|
+
"@vibes.diy/vibe-db-explorer": "6.0.0",
|
|
30
|
+
"@vibes.diy/vibe-runtime": "6.0.0",
|
|
31
|
+
"@vibes.diy/vibe-types": "6.0.0",
|
|
32
32
|
"acorn": "~8.17.0",
|
|
33
33
|
"arktype": "~2.2.3",
|
|
34
|
-
"call-ai": "
|
|
34
|
+
"call-ai": "6.0.0",
|
|
35
35
|
"cookie": "~2.0.1",
|
|
36
36
|
"drizzle-orm": "~0.45.2",
|
|
37
37
|
"jose": "~6.2.2",
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Pool } from "@neondatabase/serverless";
|
|
2
2
|
import { drizzle as drizzleNeon } from "drizzle-orm/neon-serverless";
|
|
3
3
|
import { Result, exception2Result } from "@adviser/cement";
|
|
4
|
+
import { ensureSuperThis } from "@vibes.diy/identity";
|
|
4
5
|
import { createVibesApiTables } from "@vibes.diy/api-sql";
|
|
5
|
-
import { EMBEDDING_MODEL,
|
|
6
|
+
import { EMBEDDING_MODEL, loadFirstMessageEmbedText, populateFirstMessageEmbedding, } from "../intern/first-message-embedding.js";
|
|
6
7
|
import { formatError, loadDevVars } from "./usage-report-util.js";
|
|
7
8
|
function printUsage() {
|
|
8
9
|
console.log(`
|
|
@@ -54,10 +55,14 @@ async function run() {
|
|
|
54
55
|
return Result.Err("LLM_BACKEND_URL and LLM_BACKEND_API_KEY are required for --apply");
|
|
55
56
|
}
|
|
56
57
|
const pool = new Pool({ connectionString });
|
|
58
|
+
const db = drizzleNeon(pool);
|
|
59
|
+
const tables = createVibesApiTables("pg");
|
|
57
60
|
const deps = {
|
|
58
|
-
db
|
|
59
|
-
tables
|
|
61
|
+
db,
|
|
62
|
+
tables,
|
|
60
63
|
flavour: "pg",
|
|
64
|
+
sthis: ensureSuperThis(),
|
|
65
|
+
storageSystems: { sql: { flavour: "pg", db, assets: tables.assets } },
|
|
61
66
|
llmBackendUrl: llmBackendUrl ?? "",
|
|
62
67
|
llmBackendApiKey: llmBackendApiKey ?? "",
|
|
63
68
|
};
|
|
@@ -66,17 +71,21 @@ async function run() {
|
|
|
66
71
|
if (limit !== undefined)
|
|
67
72
|
apps = apps.slice(0, limit);
|
|
68
73
|
console.log(`${apps.length} app(s) with a codegen chat${limit !== undefined ? ` (capped at ${limit})` : ""}\n`);
|
|
69
|
-
const counts = { embedded: 0, unchanged: 0, empty: 0, error: 0 };
|
|
74
|
+
const counts = { embedded: 0, unchanged: 0, empty: 0, deferred: 0, error: 0 };
|
|
70
75
|
for (const app of apps) {
|
|
71
76
|
const label = `@${app.ownerHandle}/${app.appSlug}`;
|
|
72
77
|
if (apply === false) {
|
|
73
|
-
const
|
|
74
|
-
if (
|
|
78
|
+
const source = await loadFirstMessageEmbedText(deps, app.ownerHandle, app.appSlug);
|
|
79
|
+
if (source.kind === "storage-unavailable") {
|
|
80
|
+
counts.deferred += 1;
|
|
81
|
+
console.log(`DEFER ${label} (App.jsx in R2 — not readable here; indexes via the queue)`);
|
|
82
|
+
}
|
|
83
|
+
else if (source.kind === "empty") {
|
|
75
84
|
counts.empty += 1;
|
|
76
|
-
console.log(`EMPTY ${label} (no
|
|
85
|
+
console.log(`EMPTY ${label} (no prose and no production App.jsx)`);
|
|
77
86
|
}
|
|
78
87
|
else {
|
|
79
|
-
console.log(`PLAN ${label} ${
|
|
88
|
+
console.log(`PLAN ${label} ${source.text.length} chars: ${JSON.stringify(source.text.slice(0, 80))}…`);
|
|
80
89
|
}
|
|
81
90
|
continue;
|
|
82
91
|
}
|
|
@@ -93,13 +102,18 @@ async function run() {
|
|
|
93
102
|
counts.unchanged += 1;
|
|
94
103
|
else if (outcome === "empty")
|
|
95
104
|
counts.empty += 1;
|
|
105
|
+
else if (outcome === "deferred")
|
|
106
|
+
counts.deferred += 1;
|
|
96
107
|
console.log(`${outcome.toUpperCase().padEnd(6)}${label}`);
|
|
97
108
|
}
|
|
98
109
|
if (apply === false) {
|
|
99
110
|
console.log(`\nDry run — nothing embedded or written. Model: ${EMBEDDING_MODEL}. Re-run with --apply.`);
|
|
100
111
|
return;
|
|
101
112
|
}
|
|
102
|
-
console.log(`\nApplied. embedded=${counts.embedded} unchanged=${counts.unchanged} empty=${counts.empty} error=${counts.error}`);
|
|
113
|
+
console.log(`\nApplied. embedded=${counts.embedded} unchanged=${counts.unchanged} empty=${counts.empty} deferred=${counts.deferred} error=${counts.error}`);
|
|
114
|
+
if (counts.deferred > 0) {
|
|
115
|
+
console.log(` note: ${counts.deferred} app(s) deferred (R2-backed App.jsx) — they index via the queue on next publish.`);
|
|
116
|
+
}
|
|
103
117
|
if (counts.error > 0) {
|
|
104
118
|
throw new Error(`backfill finished with ${counts.error} row error(s) — historical holes remain; re-run until error=0`);
|
|
105
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfill-first-message-embeddings.js","sourceRoot":"","sources":["../../jsr/usage-report/backfill-first-message-embeddings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAe,MAAM,oBAAoB,CAAC;AACvE,OAAO,EACL,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"backfill-first-message-embeddings.js","sourceRoot":"","sources":["../../jsr/usage-report/backfill-first-message-embeddings.ts"],"names":[],"mappings":"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"}
|