drizzle-cube 0.5.7 → 0.6.0

package/dist/adapters/fastify/index.js

@@ -1,8 +1,8 @@
-import { a as e, f as t, i as n, o as r, r as i, u as a, w as o } from "../utils-DosuoabY.js";
-import { i as s, n as c, r as l, t as u } from "../locale-gU_d1Wja.js";
-import { C as d, S as f, _ as p, a as m, b as h, c as g, g as _, h as v, i as y, l as b, m as x, o as S, r as C, u as w, v as T, x as E, y as D } from "../mcp-transport-CVUiifEc.js";
+import { a as e, i as t, k as n, l as r, o as i, r as a, u as o } from "../utils-BPWZsX7k.js";
+import { i as s, n as c, r as l, t as u } from "../locale-DDvZDFVn.js";
+import { C as d, S as f, _ as p, a as m, b as h, c as g, g as _, h as v, i as y, l as b, m as x, o as S, r as C, u as w, v as T, x as E, y as D } from "../mcp-transport-H96VG3WY.js";
 //#region src/adapters/fastify/index.ts
-var O = function(o, O, k) {
+var O = function(n, O, k) {
 	let { cubes: A, drizzle: j, schema: M, extractSecurityContext: N, engineType: P, cors: F, basePath: I = "/cubejs-api/v1", bodyLimit: L = 10485760, cache: R, mcp: z = { enabled: !0 }, agent: B } = O;
 	if (!A || A.length === 0) return k(/* @__PURE__ */ Error("At least one cube must be provided in the cubes array"));
 	let V = async (e) => l(await N(e), c((t) => e.headers[t.toLowerCase()]));
@@ -11,9 +11,9 @@ var O = function(o, O, k) {
 			...F,
 			allowedHeaders: u(F.allowedHeaders)
 		};
-		o.register(import("@fastify/cors"), e);
+		n.register(import("@fastify/cors"), e);
 	}
-	o.addHook("onRequest", async (e, t) => {
+	n.addHook("onRequest", async (e, t) => {
 		e.method === "POST" && (e.body = void 0);
 	});
 	let H = new s({
@@ -25,41 +25,41 @@ var O = function(o, O, k) {
 	});
 	if (A.forEach((e) => {
 		H.registerCube(e);
-	}), o.post(`${I}/load`, {
+	}), n.post(`${I}/load`, {
 		bodyLimit: L,
 		schema: { body: {
 			type: "object",
 			additionalProperties: !0
 		} }
-	}, async (e, t) => {
+	}, async (e, n) => {
 		try {
-			let r = e.body, a = r.query || r, o = await V(e), s = H.validateQuery(a);
-			if (!s.isValid) return t.status(400).send(n(`Query validation failed: ${s.errors.join(", ")}`, 400));
+			let r = e.body, i = r.query || r, o = await V(e), s = H.validateQuery(i);
+			if (!s.isValid) return n.status(400).send(t(`Query validation failed: ${s.errors.join(", ")}`, 400));
 			let c = e.headers["x-cache-control"] === "no-cache";
-			return i(a, await H.executeMultiCubeQuery(a, o, { skipCache: c }), H);
+			return a(i, await H.executeMultiCubeQuery(i, o, { skipCache: c }), H);
 		} catch (r) {
-			return e.log.error(r, "Query execution error"), t.status(500).send(n(r instanceof Error ? r.message : "Query execution failed", 500));
+			return e.log.error(r, "Query execution error"), n.status(500).send(t(r instanceof Error ? r.message : "Query execution failed", 500));
 		}
-	}), o.get(`${I}/load`, { schema: { querystring: {
+	}), n.get(`${I}/load`, { schema: { querystring: {
 		type: "object",
 		properties: { query: { type: "string" } },
 		required: ["query"]
-	} } }, async (e, t) => {
+	} } }, async (e, n) => {
 		try {
-			let { query: r } = e.query, a;
+			let { query: r } = e.query, i;
 			try {
-				a = JSON.parse(r);
+				i = JSON.parse(r);
 			} catch {
-				return t.status(400).send(n("Invalid JSON in query parameter", 400));
+				return n.status(400).send(t("Invalid JSON in query parameter", 400));
 			}
-			let o = await V(e), s = H.validateQuery(a);
-			if (!s.isValid) return t.status(400).send(n(`Query validation failed: ${s.errors.join(", ")}`, 400));
-			let c = e.headers["x-cache-control"] === "no-cache", l = await H.executeMultiCubeQuery(a, o, { skipCache: c });
-			return i(a, l, H);
+			let o = await V(e), s = H.validateQuery(i);
+			if (!s.isValid) return n.status(400).send(t(`Query validation failed: ${s.errors.join(", ")}`, 400));
+			let c = e.headers["x-cache-control"] === "no-cache", l = await H.executeMultiCubeQuery(i, o, { skipCache: c });
+			return a(i, l, H);
 		} catch (r) {
-			return e.log.error(r, "Query execution error"), t.status(500).send(n(r instanceof Error ? r.message : "Query execution failed", 500));
+			return e.log.error(r, "Query execution error"), n.status(500).send(t(r instanceof Error ? r.message : "Query execution failed", 500));
 		}
-	}), o.post(`${I}/batch`, {
+	}), n.post(`${I}/batch`, {
 		bodyLimit: L,
 		schema: { body: {
 			type: "object",
@@ -69,82 +69,82 @@ var O = function(o, O, k) {
 				items: { type: "object" }
 			} }
 		} }
-	}, async (e, t) => {
+	}, async (e, n) => {
 		try {
-			let { queries: r } = e.body;
-			return !r || !Array.isArray(r) ? t.status(400).send(n("Request body must contain a \"queries\" array", 400)) : r.length === 0 ? t.status(400).send(n("Queries array cannot be empty", 400)) : await a(r, await V(e), H, { skipCache: e.headers["x-cache-control"] === "no-cache" });
+			let { queries: i } = e.body;
+			return !i || !Array.isArray(i) ? n.status(400).send(t("Request body must contain a \"queries\" array", 400)) : i.length === 0 ? n.status(400).send(t("Queries array cannot be empty", 400)) : await r(i, await V(e), H, { skipCache: e.headers["x-cache-control"] === "no-cache" });
 		} catch (r) {
-			return e.log.error(r, "Batch execution error"), t.status(500).send(n(r instanceof Error ? r.message : "Batch execution failed", 500));
+			return e.log.error(r, "Batch execution error"), n.status(500).send(t(r instanceof Error ? r.message : "Batch execution failed", 500));
 		}
-	}), o.get(`${I}/meta`, async (t, r) => {
+	}), n.get(`${I}/meta`, async (n, r) => {
 		try {
 			return e(H.getMetadata());
 		} catch (e) {
-			return t.log.error(e, "Metadata error"), r.status(500).send(n(e instanceof Error ? e.message : "Failed to fetch metadata", 500));
+			return n.log.error(e, "Metadata error"), r.status(500).send(t(e instanceof Error ? e.message : "Failed to fetch metadata", 500));
 		}
-	}), o.post(`${I}/sql`, {
+	}), n.post(`${I}/sql`, {
 		bodyLimit: L,
 		schema: { body: {
 			type: "object",
 			additionalProperties: !0
 		} }
-	}, async (e, t) => {
+	}, async (e, n) => {
 		try {
-			let i = e.body, a = await V(e), o = H.validateQuery(i);
-			if (!o.isValid) return t.status(400).send(n(`Query validation failed: ${o.errors.join(", ")}`, 400));
-			let s = i.measures?.[0] || i.dimensions?.[0];
-			if (!s) return t.status(400).send(n("No measures or dimensions specified", 400));
+			let r = e.body, a = await V(e), o = H.validateQuery(r);
+			if (!o.isValid) return n.status(400).send(t(`Query validation failed: ${o.errors.join(", ")}`, 400));
+			let s = r.measures?.[0] || r.dimensions?.[0];
+			if (!s) return n.status(400).send(t("No measures or dimensions specified", 400));
 			let c = s.split(".")[0];
-			return r(i, await H.generateSQL(c, i, a));
+			return i(r, await H.generateSQL(c, r, a));
 		} catch (r) {
-			return e.log.error({ err: String(r).replace(/\n|\r/g, "") }, "SQL generation error"), t.status(500).send(n(r instanceof Error ? r.message : "SQL generation failed", 500));
+			return e.log.error({ err: String(r).replace(/\n|\r/g, "") }, "SQL generation error"), n.status(500).send(t(r instanceof Error ? r.message : "SQL generation failed", 500));
 		}
-	}), o.get(`${I}/sql`, { schema: { querystring: {
+	}), n.get(`${I}/sql`, { schema: { querystring: {
 		type: "object",
 		properties: { query: { type: "string" } },
 		required: ["query"]
-	} } }, async (e, t) => {
+	} } }, async (e, n) => {
 		try {
-			let { query: i } = e.query, a = JSON.parse(i), o = await V(e), s = H.validateQuery(a);
-			if (!s.isValid) return t.status(400).send(n(`Query validation failed: ${s.errors.join(", ")}`, 400));
+			let { query: r } = e.query, a = JSON.parse(r), o = await V(e), s = H.validateQuery(a);
+			if (!s.isValid) return n.status(400).send(t(`Query validation failed: ${s.errors.join(", ")}`, 400));
 			let c = a.measures?.[0] || a.dimensions?.[0];
-			if (!c) return t.status(400).send(n("No measures or dimensions specified", 400));
+			if (!c) return n.status(400).send(t("No measures or dimensions specified", 400));
 			let l = c.split(".")[0];
-			return r(a, await H.generateSQL(l, a, o));
+			return i(a, await H.generateSQL(l, a, o));
 		} catch (r) {
-			return e.log.error({ err: String(r).replace(/\n|\r/g, "") }, "SQL generation error"), t.status(500).send(n(r instanceof Error ? r.message : "SQL generation failed", 500));
+			return e.log.error({ err: String(r).replace(/\n|\r/g, "") }, "SQL generation error"), n.status(500).send(t(r instanceof Error ? r.message : "SQL generation failed", 500));
 		}
-	}), o.post(`${I}/dry-run`, {
+	}), n.post(`${I}/dry-run`, {
 		bodyLimit: L,
 		schema: { body: {
 			type: "object",
 			additionalProperties: !0
 		} }
-	}, async (e, n) => {
+	}, async (e, t) => {
 		try {
-			let n = e.body;
-			return await t(n.query || n, await V(e), H);
-		} catch (t) {
-			return e.log.error(t, "Dry-run error"), n.status(400).send({
-				error: t instanceof Error ? t.message : "Dry-run validation failed",
+			let t = e.body;
+			return await o(t.query || t, await V(e), H);
+		} catch (n) {
+			return e.log.error(n, "Dry-run error"), t.status(400).send({
+				error: n instanceof Error ? n.message : "Dry-run validation failed",
 				valid: !1
 			});
 		}
-	}), o.get(`${I}/dry-run`, { schema: { querystring: {
+	}), n.get(`${I}/dry-run`, { schema: { querystring: {
 		type: "object",
 		properties: { query: { type: "string" } },
 		required: ["query"]
-	} } }, async (e, n) => {
+	} } }, async (e, t) => {
 		try {
-			let { query: n } = e.query;
-			return await t(JSON.parse(n), await V(e), H);
-		} catch (t) {
-			return e.log.error(t, "Dry-run error"), n.status(400).send({
-				error: t instanceof Error ? t.message : "Dry-run validation failed",
+			let { query: t } = e.query;
+			return await o(JSON.parse(t), await V(e), H);
+		} catch (n) {
+			return e.log.error(n, "Dry-run error"), t.status(400).send({
+				error: n instanceof Error ? n.message : "Dry-run validation failed",
 				valid: !1
 			});
 		}
-	}), o.post(`${I}/explain`, {
+	}), n.post(`${I}/explain`, {
 		bodyLimit: L,
 		schema: { body: {
 			type: "object",
@@ -157,7 +157,7 @@ var O = function(o, O, k) {
 		} catch (n) {
 			return e.log.error(n, "Explain error"), t.status(500).send({ error: n instanceof Error ? n.message : "Explain query failed" });
 		}
-	}), B && o.post(`${I}/agent/chat`, {
+	}), B && n.post(`${I}/agent/chat`, {
 		bodyLimit: L,
 		schema: { body: {
 			type: "object",
@@ -165,7 +165,7 @@ var O = function(o, O, k) {
 		} }
 	}, async (e, t) => {
 		try {
-			let { handleAgentChat: n } = await import("../handler-Dz1F4iwf.js"), { message: r, sessionId: i, history: a } = e.body;
+			let { handleAgentChat: n } = await import("../handler-CfgE0JSL.js"), { message: r, sessionId: i, history: a } = e.body;
 			if (!r || typeof r != "string") return t.status(400).send({ error: "message is required and must be a string" });
 			let o = (B.apiKey || "").trim();
 			if (B.allowClientApiKey) {
@@ -207,37 +207,37 @@ var O = function(o, O, k) {
 			if (e.log.error(n, "Agent chat error"), !t.raw.headersSent) return t.status(500).send({ error: n instanceof Error ? n.message : "Agent chat failed" });
 		}
 	}), z.enabled !== !1) {
-		let e = S(H, z.resources), t = D(z.prompts), n = T(z.instructions), r = z.basePath ?? "/mcp";
-		o.post(`${r}`, {
+		let e = S(H, z.resources), t = D(z.prompts), r = T(z.instructions), i = z.basePath ?? "/mcp";
+		n.post(`${i}`, {
 			bodyLimit: L,
 			schema: { body: {
 				type: "object",
 				additionalProperties: !0
 			} }
-		}, async (r, i) => {
-			if (z.resourceMetadataUrl && !w(r.headers.authorization)) return i.header("WWW-Authenticate", g(z.resourceMetadataUrl)), i.status(401).send({ error: "Bearer token required" });
-			let a = f(r.headers.origin, z.allowedOrigins ? { allowedOrigins: z.allowedOrigins } : {});
+		}, async (n, i) => {
+			if (z.resourceMetadataUrl && !w(n.headers.authorization)) return i.header("WWW-Authenticate", g(z.resourceMetadataUrl)), i.status(401).send({ error: "Bearer token required" });
+			let a = f(n.headers.origin, z.allowedOrigins ? { allowedOrigins: z.allowedOrigins } : {});
 			if (!a.valid) return i.status(403).send(y(null, -32600, a.reason));
-			let o = r.headers.accept;
+			let o = n.headers.accept;
 			if (!E(o)) return i.status(400).send(y(null, -32600, "Accept header must include both application/json and text/event-stream"));
-			let s = v(r.headers);
+			let s = v(n.headers);
 			if (!s.ok) return i.status(426).send({
 				error: "Unsupported MCP protocol version",
 				supported: s.supported
 			});
-			let c = _(r.body);
+			let c = _(n.body);
 			if (!c) return i.status(400).send(y(null, -32600, "Invalid JSON-RPC 2.0 request"));
 			let l = d(o), u = c.method === "initialize";
 			try {
 				let a = await b(c.method, c.params, {
 					semanticLayer: H,
 					extractSecurityContext: (e, t) => V(e),
-					rawRequest: r,
+					rawRequest: n,
 					rawResponse: i,
 					negotiatedProtocol: s.negotiated,
 					resources: e,
 					prompts: t,
-					instructions: n,
+					instructions: r,
 					appEnabled: !!z.app,
 					appConfig: typeof z.app == "object" ? z.app : void 0,
 					serverName: z.serverName
@@ -253,9 +253,9 @@ var O = function(o, O, k) {
 				}
 				return i.send(d);
 			} catch (e) {
-				if (x(c)) return r.log.error({ err: String(e).replace(/\n|\r/g, "") }, "MCP notification processing error"), i.status(202).send();
-				r.log.error({ err: String(e).replace(/\n|\r/g, "") }, "MCP RPC error");
-				let t = e?.code ?? -32603, n = e?.data, a = e.message || "MCP request failed", o = y(c.id ?? null, t, a, n);
+				if (x(c)) return n.log.error({ err: String(e).replace(/\n|\r/g, "") }, "MCP notification processing error"), i.status(202).send();
+				n.log.error({ err: String(e).replace(/\n|\r/g, "") }, "MCP RPC error");
+				let t = e?.code ?? -32603, r = e?.data, a = e.message || "MCP request failed", o = y(c.id ?? null, t, a, r);
 				if (l) {
 					let e = p();
 					i.header("Content-Type", "text/event-stream").header("Cache-Control", "no-cache").header("Connection", "keep-alive").send(`id: ${e}\n\n${h(o, e)}`);
@@ -263,7 +263,7 @@ var O = function(o, O, k) {
 				}
 				return i.send(o);
 			}
-		}), o.get(`${r}`, async (e, t) => {
+		}), n.get(`${i}`, async (e, t) => {
 			if (z.resourceMetadataUrl && !w(e.headers.authorization)) return t.header("WWW-Authenticate", g(z.resourceMetadataUrl)), t.status(401).send({ error: "Bearer token required" });
 			let n = p();
 			t.raw.writeHead(200, {
@@ -281,15 +281,15 @@ var O = function(o, O, k) {
 			e.raw.on("close", () => {
 				clearInterval(r);
 			});
-		}), o.delete(`${r}`, async (e, t) => z.resourceMetadataUrl && !w(e.headers.authorization) ? (t.header("WWW-Authenticate", g(z.resourceMetadataUrl)), t.status(401).send({ error: "Bearer token required" })) : t.status(405).send({ error: "Session termination not supported" }));
+		}), n.delete(`${i}`, async (e, t) => z.resourceMetadataUrl && !w(e.headers.authorization) ? (t.header("WWW-Authenticate", g(z.resourceMetadataUrl)), t.status(401).send({ error: "Bearer token required" })) : t.status(405).send({ error: "Session termination not supported" }));
 	}
-	o.setErrorHandler(async (e, t, r) => (t.log.error(e, "Fastify cube adapter error"), r.statusCode < 400 && r.status(500), n(e instanceof Error ? e : String(e), r.statusCode))), k();
+	n.setErrorHandler(async (e, n, r) => (n.log.error(e, "Fastify cube adapter error"), r.statusCode < 400 && r.status(500), t(e instanceof Error ? e : String(e), r.statusCode))), k();
 };
 async function k(e, t) {
 	await e.register(O, t);
 }
 function A(e) {
-	let t = o("fastify")({ logger: !0 });
+	let t = n("fastify")({ logger: !0 });
 	return t.register(O, e), t;
 }
 //#endregion

package/dist/adapters/google-BOnRIN1w.cjs

@@ -0,0 +1,2 @@
+function e(t){let n={};for(let[r,i]of Object.entries(t))if(r===`type`&&typeof i==`string`)n[r]=i.toUpperCase();else if(r===`properties`&&typeof i==`object`&&i){let t={};for(let[n,r]of Object.entries(i))typeof r==`object`&&r?t[n]=e(r):t[n]=r;n[r]=t}else r===`items`&&typeof i==`object`&&i?n[r]=e(i):n[r]=i;return n}function t(e){return e===`STOP`?`stop`:e===`MAX_TOKENS`?`max_tokens`:e}function*n(e){if(e.text&&!e.thought&&(yield{type:`text_delta`,text:e.text}),e.functionCall){let t=`gemini-tc-${Date.now()}-${Math.random().toString(36).slice(2,7)}`,n=e.thoughtSignature?{thoughtSignature:e.thoughtSignature}:void 0;yield{type:`tool_use_start`,id:t,name:e.functionCall.name,...n?{metadata:n}:{}},yield{type:`tool_input_delta`,json:JSON.stringify(e.functionCall.args||{})},yield{type:`tool_use_end`}}}function r(e){let t=e._toolResults;if(t&&t.length>0)return{role:`user`,parts:t.map(e=>({functionResponse:{name:e.toolName||e.toolUseId,response:{content:e.content,isError:e.isError||!1}}}))};let n=typeof e.content==`string`?e.content:JSON.stringify(e.content);return n?{role:`user`,parts:[{text:n}]}:null}function i(e){let t=[];for(let n of e)if(n.type===`text`&&n.text)t.push({text:n.text});else if(n.type===`tool_use`){let e={functionCall:{name:n.name,args:n.input||{}}};n.metadata?.thoughtSignature&&(e.thoughtSignature=n.metadata.thoughtSignature),t.push(e)}return t}function a(e){if(e.role===`tool_result`)return r(e);if(e.role===`user`)return{role:`user`,parts:[{text:typeof e.content==`string`?e.content:JSON.stringify(e.content)}]};if(e.role===`assistant`){if(typeof e.content==`string`)return{role:`model`,parts:[{text:e.content}]};let t=i(e.content);return t.length>0?{role:`model`,parts:t}:null}return null}var o=class{apiKey;sdk;initialized=!1;constructor(e){this.apiKey=e}async ensureSDK(){if(!this.initialized){try{this.sdk=await Promise.resolve().then(()=>require("./dist-BOdf-GQO.cjs"))}catch{throw Error(`@google/generative-ai is required for the Google provider. Install it with: npm install @google/generative-ai`)}this.initialized=!0}}async createStream(e){await this.ensureSDK();let{GoogleGenerativeAI:t}=this.sdk,n=new t(this.apiKey).getGenerativeModel({model:e.model,systemInstruction:e.system,generationConfig:{maxOutputTokens:e.maxTokens}}),{messages:r}=this.formatMessages(e.messages,e.system),i=this.formatTools(e.tools);return(await n.generateContentStream({contents:r,tools:i.length>0?[{functionDeclarations:i}]:void 0})).stream}async*parseStreamEvents(e){let r=`stop`,i=!1;for await(let a of e){let e=a;e.usageMetadata&&(yield{type:`message_meta`,inputTokens:e.usageMetadata.promptTokenCount,outputTokens:e.usageMetadata.candidatesTokenCount,stopReason:``});let o=e.candidates?.[0];if(!o)continue;o.finishReason&&(r=t(o.finishReason));let s=o.content?.parts;if(s)for(let e of s)for(let t of n(e))t.type===`tool_use_start`&&(i=!0),yield t}yield{type:`message_meta`,stopReason:i?`tool_use`:r}}formatTools(t){return t.map(t=>({name:t.name,description:t.description,parameters:e(t.parameters)}))}formatMessages(e,t){let n=[];for(let t of e){let e=a(t);e&&n.push(e)}return{messages:n}}formatToolResults(e){return{role:`tool_result`,content:e.map(e=>`${e.toolName||e.toolUseId}: ${e.content}`).join(`
+`),_toolResults:e}}shouldContinue(e){return e===`tool_use`}formatError(e){if(!e||!(e instanceof Error))return`Something went wrong. Please try again.`;let t=e.message||``,n=e;return n.status===429?`Too many requests. Please wait a moment and try again.`:n.status===403||n.status===401?`Authentication failed. Please check your API key configuration.`:n.status===503||n.status===500?`The AI service is temporarily unavailable. Please try again in a moment.`:t.includes(`SAFETY`)?`The request was blocked by safety filters. Please rephrase your request.`:t.includes(`RECITATION`)?`The response was blocked due to recitation concerns. Please try a different query.`:t.startsWith(`{`)||t.startsWith(`[`)?`The AI service encountered an error. Please try again.`:t}};exports.GoogleProvider=o;

package/dist/{server/google-CFYljAOF.js → adapters/google-CvKM9yVM.js}

@@ -9,7 +9,76 @@ function e(t) {
 	} else r === "items" && typeof i == "object" && i ? n[r] = e(i) : n[r] = i;
 	return n;
 }
-var t = class {
+function t(e) {
+	return e === "STOP" ? "stop" : e === "MAX_TOKENS" ? "max_tokens" : e;
+}
+function* n(e) {
+	if (e.text && !e.thought && (yield {
+		type: "text_delta",
+		text: e.text
+	}), e.functionCall) {
+		let t = `gemini-tc-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`, n = e.thoughtSignature ? { thoughtSignature: e.thoughtSignature } : void 0;
+		yield {
+			type: "tool_use_start",
+			id: t,
+			name: e.functionCall.name,
+			...n ? { metadata: n } : {}
+		}, yield {
+			type: "tool_input_delta",
+			json: JSON.stringify(e.functionCall.args || {})
+		}, yield { type: "tool_use_end" };
+	}
+}
+function r(e) {
+	let t = e._toolResults;
+	if (t && t.length > 0) return {
+		role: "user",
+		parts: t.map((e) => ({ functionResponse: {
+			name: e.toolName || e.toolUseId,
+			response: {
+				content: e.content,
+				isError: e.isError || !1
+			}
+		} }))
+	};
+	let n = typeof e.content == "string" ? e.content : JSON.stringify(e.content);
+	return n ? {
+		role: "user",
+		parts: [{ text: n }]
+	} : null;
+}
+function i(e) {
+	let t = [];
+	for (let n of e) if (n.type === "text" && n.text) t.push({ text: n.text });
+	else if (n.type === "tool_use") {
+		let e = { functionCall: {
+			name: n.name,
+			args: n.input || {}
+		} };
+		n.metadata?.thoughtSignature && (e.thoughtSignature = n.metadata.thoughtSignature), t.push(e);
+	}
+	return t;
+}
+function a(e) {
+	if (e.role === "tool_result") return r(e);
+	if (e.role === "user") return {
+		role: "user",
+		parts: [{ text: typeof e.content == "string" ? e.content : JSON.stringify(e.content) }]
+	};
+	if (e.role === "assistant") {
+		if (typeof e.content == "string") return {
+			role: "model",
+			parts: [{ text: e.content }]
+		};
+		let t = i(e.content);
+		return t.length > 0 ? {
+			role: "model",
+			parts: t
+		} : null;
+	}
+	return null;
+}
+var o = class {
 	apiKey;
 	sdk;
 	initialized = !1;
@@ -42,41 +111,24 @@ var t = class {
 		})).stream;
 	}
 	async *parseStreamEvents(e) {
-		let t = "stop", n = !1;
-		for await (let r of e) {
-			let e = r;
+		let r = "stop", i = !1;
+		for await (let a of e) {
+			let e = a;
 			e.usageMetadata && (yield {
 				type: "message_meta",
 				inputTokens: e.usageMetadata.promptTokenCount,
 				outputTokens: e.usageMetadata.candidatesTokenCount,
 				stopReason: ""
 			});
-			let i = e.candidates?.[0];
-			if (!i) continue;
-			i.finishReason && (t = i.finishReason === "STOP" ? "stop" : i.finishReason === "MAX_TOKENS" ? "max_tokens" : i.finishReason);
-			let a = i.content?.parts;
-			if (a) {
-				for (let e of a) if (e.text && !e.thought && (yield {
-					type: "text_delta",
-					text: e.text
-				}), e.functionCall) {
-					n = !0;
-					let t = `gemini-tc-${Date.now()}-${Math.random().toString(36).slice(2, 7)}`, r = e.thoughtSignature ? { thoughtSignature: e.thoughtSignature } : void 0;
-					yield {
-						type: "tool_use_start",
-						id: t,
-						name: e.functionCall.name,
-						...r ? { metadata: r } : {}
-					}, yield {
-						type: "tool_input_delta",
-						json: JSON.stringify(e.functionCall.args || {})
-					}, yield { type: "tool_use_end" };
-				}
-			}
+			let o = e.candidates?.[0];
+			if (!o) continue;
+			o.finishReason && (r = t(o.finishReason));
+			let s = o.content?.parts;
+			if (s) for (let e of s) for (let t of n(e)) t.type === "tool_use_start" && (i = !0), yield t;
 		}
 		yield {
 			type: "message_meta",
-			stopReason: n ? "tool_use" : t
+			stopReason: i ? "tool_use" : r
 		};
 	}
 	formatTools(t) {
@@ -88,49 +140,9 @@ var t = class {
 	}
 	formatMessages(e, t) {
 		let n = [];
-		for (let t of e) if (t.role === "tool_result") {
-			let e = t._toolResults;
-			if (e && e.length > 0) n.push({
-				role: "user",
-				parts: e.map((e) => ({ functionResponse: {
-					name: e.toolName || e.toolUseId,
-					response: {
-						content: e.content,
-						isError: e.isError || !1
-					}
-				} }))
-			});
-			else {
-				let e = typeof t.content == "string" ? t.content : JSON.stringify(t.content);
-				e && n.push({
-					role: "user",
-					parts: [{ text: e }]
-				});
-			}
-		} else if (t.role === "user") {
-			let e = typeof t.content == "string" ? t.content : JSON.stringify(t.content);
-			n.push({
-				role: "user",
-				parts: [{ text: e }]
-			});
-		} else if (t.role === "assistant") if (typeof t.content == "string") n.push({
-			role: "model",
-			parts: [{ text: t.content }]
-		});
-		else {
-			let e = t.content, r = [];
-			for (let t of e) if (t.type === "text" && t.text) r.push({ text: t.text });
-			else if (t.type === "tool_use") {
-				let e = { functionCall: {
-					name: t.name,
-					args: t.input || {}
-				} };
-				t.metadata?.thoughtSignature && (e.thoughtSignature = t.metadata.thoughtSignature), r.push(e);
-			}
-			r.length > 0 && n.push({
-				role: "model",
-				parts: r
-			});
+		for (let t of e) {
+			let e = a(t);
+			e && n.push(e);
 		}
 		return { messages: n };
 	}
@@ -151,4 +163,4 @@ var t = class {
 	}
 };
 //#endregion
-export { t as GoogleProvider };
+export { o as GoogleProvider };