@llmops/core 0.1.5 → 0.1.6

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { A as object, C as zod_default, D as boolean, E as array, M as string, N as union, O as literal, P as unknown, S as workspaceSettingsSchema, T as any, _ as llmRequestsSchema, a as matchType, b as variantVersionsSchema, c as parsePartialTableData, d as validateTableData, f as SCHEMA_METADATA, g as environmentsSchema, h as environmentSecretsSchema, i as getMigrations, j as record, k as number, l as parseTableData, m as configsSchema, n as createDatabaseFromConnection, o as runAutoMigrations, p as configVariantsSchema, r as detectDatabaseType, s as logger, t as createDatabase, u as validatePartialTableData, v as schemas, w as _enum, x as variantsSchema, y as targetingRulesSchema } from "./db-DSzwrW4p.mjs";
+import { A as object, C as zod_default, D as boolean, E as array, M as string, N as union, O as literal, P as unknown, S as workspaceSettingsSchema, T as any, _ as llmRequestsSchema, a as matchType, b as variantVersionsSchema, c as parsePartialTableData, d as validateTableData, f as SCHEMA_METADATA, g as environmentsSchema, h as environmentSecretsSchema, i as getMigrations, j as record, k as number, l as parseTableData, m as configsSchema, n as createDatabaseFromConnection, o as runAutoMigrations, p as configVariantsSchema, r as detectDatabaseType, s as logger, t as createDatabase, u as validatePartialTableData, v as schemas, w as _enum, x as variantsSchema, y as targetingRulesSchema } from "./db-D78x_Elf.mjs";
 import gateway from "@llmops/gateway";
 import { sql } from "kysely";
 import * as fs from "node:fs/promises";
@@ -1283,7 +1283,8 @@ const createConfigVariantDataLayer = (db) => {
 			return {
 				...versionData,
 				configId: resolvedConfigId,
-				variantId: configVariant.variantId
+				variantId: configVariant.variantId,
+				environmentId
 			};
 		}
 	};
@@ -1453,6 +1454,7 @@ const insertLLMRequestSchema = zod_default.object({
 	requestId: zod_default.string().uuid(),
 	configId: zod_default.string().uuid().nullable().optional(),
 	variantId: zod_default.string().uuid().nullable().optional(),
+	environmentId: zod_default.string().uuid().nullable().optional(),
 	provider: zod_default.string(),
 	model: zod_default.string(),
 	promptTokens: zod_default.number().int().default(0),
@@ -1476,17 +1478,24 @@ const listRequestsSchema = zod_default.object({
 	limit: zod_default.number().int().positive().max(1e3).default(100),
 	offset: zod_default.number().int().nonnegative().default(0),
 	configId: zod_default.string().uuid().optional(),
+	variantId: zod_default.string().uuid().optional(),
+	environmentId: zod_default.string().uuid().optional(),
 	provider: zod_default.string().optional(),
 	model: zod_default.string().optional(),
 	startDate: zod_default.date().optional(),
-	endDate: zod_default.date().optional()
+	endDate: zod_default.date().optional(),
+	tags: zod_default.record(zod_default.string(), zod_default.array(zod_default.string())).optional()
 });
 /**
-* Schema for date range queries
+* Schema for date range queries with optional filters
 */
 const dateRangeSchema = zod_default.object({
 	startDate: zod_default.date(),
-	endDate: zod_default.date()
+	endDate: zod_default.date(),
+	configId: zod_default.string().uuid().optional(),
+	variantId: zod_default.string().uuid().optional(),
+	environmentId: zod_default.string().uuid().optional(),
+	tags: zod_default.record(zod_default.string(), zod_default.array(zod_default.string())).optional()
 });
 /**
 * Schema for cost summary with grouping
@@ -1494,6 +1503,10 @@ const dateRangeSchema = zod_default.object({
 const costSummarySchema = zod_default.object({
 	startDate: zod_default.date(),
 	endDate: zod_default.date(),
+	configId: zod_default.string().uuid().optional(),
+	variantId: zod_default.string().uuid().optional(),
+	environmentId: zod_default.string().uuid().optional(),
+	tags: zod_default.record(zod_default.string(), zod_default.array(zod_default.string())).optional(),
 	groupBy: zod_default.enum([
 		"day",
 		"hour",
@@ -1523,6 +1536,7 @@ const createLLMRequestsDataLayer = (db) => {
 				requestId: req.requestId,
 				configId: req.configId ?? null,
 				variantId: req.variantId ?? null,
+				environmentId: req.environmentId ?? null,
 				provider: req.provider,
 				model: req.model,
 				promptTokens: req.promptTokens,
@@ -1554,6 +1568,7 @@ const createLLMRequestsDataLayer = (db) => {
 				requestId: req.requestId,
 				configId: req.configId ?? null,
 				variantId: req.variantId ?? null,
+				environmentId: req.environmentId ?? null,
 				provider: req.provider,
 				model: req.model,
 				promptTokens: req.promptTokens,
@@ -1576,14 +1591,43 @@ const createLLMRequestsDataLayer = (db) => {
 		listRequests: async (params) => {
 			const result = await listRequestsSchema.safeParseAsync(params || {});
 			if (!result.success) throw new LLMOpsError(`Invalid parameters: ${result.error.message}`);
-			const { limit, offset, configId, provider, model, startDate, endDate } = result.data;
+			const { limit, offset, configId, variantId, environmentId, provider, model, startDate, endDate, tags } = result.data;
+			console.log("[listRequests] Parsed filters:", {
+				configId,
+				variantId,
+				environmentId,
+				provider,
+				model
+			});
 			let baseQuery = db.selectFrom("llm_requests");
-			if (configId) baseQuery = baseQuery.where("configId", "=", configId);
+			if (configId) {
+				console.log("[listRequests] Adding configId filter:", configId);
+				baseQuery = baseQuery.where("configId", "=", configId);
+			}
+			if (variantId) {
+				console.log("[listRequests] Adding variantId filter:", variantId);
+				baseQuery = baseQuery.where("variantId", "=", variantId);
+			}
+			if (environmentId) {
+				console.log("[listRequests] Adding environmentId filter:", environmentId);
+				baseQuery = baseQuery.where("environmentId", "=", environmentId);
+			}
 			if (provider) baseQuery = baseQuery.where("provider", "=", provider);
 			if (model) baseQuery = baseQuery.where("model", "=", model);
 			if (startDate) baseQuery = baseQuery.where(sql`${col("createdAt")} >= ${startDate.toISOString()}`);
 			if (endDate) baseQuery = baseQuery.where(sql`${col("createdAt")} <= ${endDate.toISOString()}`);
-			const countResult = await baseQuery.select(sql`COUNT(*)`.as("total")).executeTakeFirst();
+			if (tags && Object.keys(tags).length > 0) for (const [key, values] of Object.entries(tags)) {
+				if (values.length === 0) continue;
+				if (values.length === 1) baseQuery = baseQuery.where(sql`${col("tags")}->>${key} = ${values[0]}`);
+				else {
+					const valueList = sql.join(values.map((v) => sql`${v}`));
+					baseQuery = baseQuery.where(sql`${col("tags")}->>${key} IN (${valueList})`);
+				}
+			}
+			const countQuery = baseQuery.select(sql`COUNT(*)`.as("total"));
+			console.log("[listRequests] Count SQL:", countQuery.compile().sql);
+			console.log("[listRequests] Count params:", countQuery.compile().parameters);
+			const countResult = await countQuery.executeTakeFirst();
 			const total = Number(countResult?.total ?? 0);
 			return {
 				data: await baseQuery.selectAll().orderBy("createdAt", "desc").limit(limit).offset(offset).execute(),
@@ -1598,8 +1642,8 @@ const createLLMRequestsDataLayer = (db) => {
 		getTotalCost: async (params) => {
 			const result = await dateRangeSchema.safeParseAsync(params);
 			if (!result.success) throw new LLMOpsError(`Invalid parameters: ${result.error.message}`);
-			const { startDate, endDate } = result.data;
-			return await db.selectFrom("llm_requests").select([
+			const { startDate, endDate, configId, variantId, environmentId, tags } = result.data;
+			let query = db.selectFrom("llm_requests").select([
 				sql`COALESCE(SUM(${col("cost")}), 0)`.as("totalCost"),
 				sql`COALESCE(SUM(${col("inputCost")}), 0)`.as("totalInputCost"),
 				sql`COALESCE(SUM(${col("outputCost")}), 0)`.as("totalOutputCost"),
@@ -1607,7 +1651,19 @@ const createLLMRequestsDataLayer = (db) => {
 				sql`COALESCE(SUM(${col("completionTokens")}), 0)`.as("totalCompletionTokens"),
 				sql`COALESCE(SUM(${col("totalTokens")}), 0)`.as("totalTokens"),
 				sql`COUNT(*)`.as("requestCount")
-			]).where(sql`${col("createdAt")} >= ${startDate.toISOString()}`).where(sql`${col("createdAt")} <= ${endDate.toISOString()}`).executeTakeFirst();
+			]).where(sql`${col("createdAt")} >= ${startDate.toISOString()}`).where(sql`${col("createdAt")} <= ${endDate.toISOString()}`);
+			if (configId) query = query.where("configId", "=", configId);
+			if (variantId) query = query.where("variantId", "=", variantId);
+			if (environmentId) query = query.where("environmentId", "=", environmentId);
+			if (tags && Object.keys(tags).length > 0) for (const [key, values] of Object.entries(tags)) {
+				if (values.length === 0) continue;
+				if (values.length === 1) query = query.where(sql`${col("tags")}->>${key} = ${values[0]}`);
+				else {
+					const valueList = sql.join(values.map((v) => sql`${v}`));
+					query = query.where(sql`${col("tags")}->>${key} IN (${valueList})`);
+				}
+			}
+			return await query.executeTakeFirst();
 		},
 		getCostByModel: async (params) => {
 			const result = await dateRangeSchema.safeParseAsync(params);
@@ -1673,18 +1729,31 @@ const createLLMRequestsDataLayer = (db) => {
 		getCostSummary: async (params) => {
 			const result = await costSummarySchema.safeParseAsync(params);
 			if (!result.success) throw new LLMOpsError(`Invalid parameters: ${result.error.message}`);
-			const { startDate, endDate, groupBy } = result.data;
-			const baseQuery = db.selectFrom("llm_requests").where(sql`${col("createdAt")} >= ${startDate.toISOString()}`).where(sql`${col("createdAt")} <= ${endDate.toISOString()}`);
+			const { startDate, endDate, groupBy, configId, variantId, environmentId, tags } = result.data;
+			let baseQuery = db.selectFrom("llm_requests").where(sql`${col("createdAt")} >= ${startDate.toISOString()}`).where(sql`${col("createdAt")} <= ${endDate.toISOString()}`);
+			if (configId) baseQuery = baseQuery.where("configId", "=", configId);
+			if (variantId) baseQuery = baseQuery.where("variantId", "=", variantId);
+			if (environmentId) baseQuery = baseQuery.where("environmentId", "=", environmentId);
+			if (tags && Object.keys(tags).length > 0) for (const [key, values] of Object.entries(tags)) {
+				if (values.length === 0) continue;
+				if (values.length === 1) baseQuery = baseQuery.where(sql`${col("tags")}->>${key} = ${values[0]}`);
+				else {
+					const valueList = sql.join(values.map((v) => sql`${v}`));
+					baseQuery = baseQuery.where(sql`${col("tags")}->>${key} IN (${valueList})`);
+				}
+			}
 			switch (groupBy) {
 				case "day": return baseQuery.select([
 					sql`DATE(${col("createdAt")})`.as("groupKey"),
 					sql`COALESCE(SUM(${col("cost")}), 0)`.as("totalCost"),
-					sql`COUNT(*)`.as("requestCount")
+					sql`COUNT(*)`.as("requestCount"),
+					sql`COALESCE(SUM(${col("totalTokens")}), 0)`.as("totalTokens")
 				]).groupBy(sql`DATE(${col("createdAt")})`).orderBy(sql`DATE(${col("createdAt")})`, "asc").execute();
 				case "hour": return baseQuery.select([
 					sql`DATE_TRUNC('hour', ${col("createdAt")})`.as("groupKey"),
 					sql`COALESCE(SUM(${col("cost")}), 0)`.as("totalCost"),
-					sql`COUNT(*)`.as("requestCount")
+					sql`COUNT(*)`.as("requestCount"),
+					sql`COALESCE(SUM(${col("totalTokens")}), 0)`.as("totalTokens")
 				]).groupBy(sql`DATE_TRUNC('hour', ${col("createdAt")})`).orderBy(sql`DATE_TRUNC('hour', ${col("createdAt")})`, "asc").execute();
 				case "model": return baseQuery.select([
 					sql`${col("provider")} || '/' || ${col("model")}`.as("groupKey"),
@@ -1711,8 +1780,8 @@ const createLLMRequestsDataLayer = (db) => {
 		getRequestStats: async (params) => {
 			const result = await dateRangeSchema.safeParseAsync(params);
 			if (!result.success) throw new LLMOpsError(`Invalid parameters: ${result.error.message}`);
-			const { startDate, endDate } = result.data;
-			return await db.selectFrom("llm_requests").select([
+			const { startDate, endDate, configId, variantId, environmentId, tags } = result.data;
+			let query = db.selectFrom("llm_requests").select([
 				sql`COUNT(*)`.as("totalRequests"),
 				sql`COUNT(CASE WHEN ${col("statusCode")} >= 200 AND ${col("statusCode")} < 300 THEN 1 END)`.as("successfulRequests"),
 				sql`COUNT(CASE WHEN ${col("statusCode")} >= 400 THEN 1 END)`.as("failedRequests"),
@@ -1720,7 +1789,27 @@ const createLLMRequestsDataLayer = (db) => {
 				sql`AVG(${col("latencyMs")})`.as("avgLatencyMs"),
 				sql`MAX(${col("latencyMs")})`.as("maxLatencyMs"),
 				sql`MIN(${col("latencyMs")})`.as("minLatencyMs")
-			]).where(sql`${col("createdAt")} >= ${startDate.toISOString()}`).where(sql`${col("createdAt")} <= ${endDate.toISOString()}`).executeTakeFirst();
+			]).where(sql`${col("createdAt")} >= ${startDate.toISOString()}`).where(sql`${col("createdAt")} <= ${endDate.toISOString()}`);
+			if (configId) query = query.where("configId", "=", configId);
+			if (variantId) query = query.where("variantId", "=", variantId);
+			if (environmentId) query = query.where("environmentId", "=", environmentId);
+			if (tags && Object.keys(tags).length > 0) for (const [key, values] of Object.entries(tags)) {
+				if (values.length === 0) continue;
+				if (values.length === 1) query = query.where(sql`${col("tags")}->>${key} = ${values[0]}`);
+				else {
+					const valueList = sql.join(values.map((v) => sql`${v}`));
+					query = query.where(sql`${col("tags")}->>${key} IN (${valueList})`);
+				}
+			}
+			return await query.executeTakeFirst();
+		},
+		getDistinctTags: async () => {
+			return (await sql`
+        SELECT DISTINCT key, value
+        FROM llm_requests, jsonb_each_text(tags) AS t(key, value)
+        WHERE tags != '{}'::jsonb
+        ORDER BY key, value
+      `.execute(db)).rows;
 		}
 	};
 };

package/dist/{node-sqlite-dialect-b2V910TJ.cjs → node-sqlite-dialect-BSbNUAzj.cjs}

@@ -1,4 +1,4 @@
-const require_db = require('./db-eEfIe5dO.cjs');
+const require_db = require('./db-C_u1BuaR.cjs');
 let kysely = require("kysely");
 
 //#region src/db/node-sqlite-dialect.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llmops/core",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Core LLMOps functionality and utilities",
   "type": "module",
   "license": "Apache-2.0",
@@ -51,7 +51,7 @@
     "hono": "^4.10.7",
     "kysely": "^0.28.8",
     "pino": "^10.1.0",
-    "@llmops/gateway": "^0.1.5"
+    "@llmops/gateway": "^0.1.6"
   },
   "scripts": {
     "build": "tsdown",