@onyx.dev/onyx-database 1.2.0 → 2.0.1

package/dist/index.cjs

@@ -1,8 +1,13 @@
 'use strict';
 
+// package.json
+var name = "@onyx.dev/onyx-database";
+var version = "2.0.1";
+
 // src/config/defaults.ts
 var DEFAULT_BASE_URL = "https://api.onyx.dev";
 var DEFAULT_AI_BASE_URL = "https://ai.onyx.dev";
+var DEFAULT_AI_MODEL = "onyx";
 var sanitizeBaseUrl = (u) => u.replace(/\/+$/, "");
 
 // src/errors/config-error.ts
@@ -62,6 +67,7 @@ function readEnv(targetId) {
   const res = dropUndefined({
     baseUrl: pick("ONYX_DATABASE_BASE_URL"),
     aiBaseUrl: pick("ONYX_AI_BASE_URL"),
+    defaultModel: pick("ONYX_DEFAULT_MODEL"),
     databaseId: envId,
     apiKey: pick("ONYX_DATABASE_API_KEY"),
     apiSecret: pick("ONYX_DATABASE_API_SECRET")
@@ -199,6 +205,7 @@ async function resolveConfig(input) {
   const merged = {
     baseUrl: DEFAULT_BASE_URL,
     aiBaseUrl: DEFAULT_AI_BASE_URL,
+    defaultModel: DEFAULT_AI_MODEL,
     ...dropUndefined(home),
     ...dropUndefined(project),
     ...dropUndefined(cfgPath),
@@ -208,6 +215,7 @@ async function resolveConfig(input) {
   dbg("merged (pre-validate):", mask(merged));
   const baseUrl = sanitizeBaseUrl(merged.baseUrl ?? DEFAULT_BASE_URL);
   const aiBaseUrl = sanitizeBaseUrl(merged.aiBaseUrl ?? DEFAULT_AI_BASE_URL);
+  const defaultModel = typeof merged.defaultModel === "string" && merged.defaultModel.trim() ? merged.defaultModel.trim() : DEFAULT_AI_MODEL;
   const databaseId = merged.databaseId ?? "";
   const apiKey = merged.apiKey ?? "";
   const apiSecret = merged.apiSecret ?? "";
@@ -244,6 +252,7 @@ async function resolveConfig(input) {
   const resolved = {
     baseUrl,
     aiBaseUrl,
+    defaultModel,
     databaseId,
     apiKey,
     apiSecret,
@@ -255,6 +264,7 @@ async function resolveConfig(input) {
   const source = {
     databaseId: input?.databaseId ? "explicit config" : env.databaseId ? "env" : cfgPath.databaseId ? "env ONYX_CONFIG_PATH" : project.databaseId ? "project file" : home.databaseId ? "home profile" : "unknown",
     aiBaseUrl: input?.aiBaseUrl ? "explicit config" : env.aiBaseUrl ? "env" : cfgPath.aiBaseUrl ? "env ONYX_CONFIG_PATH" : project.aiBaseUrl ? "project file" : home.aiBaseUrl ? "home profile" : "default",
+    defaultModel: input?.defaultModel ? "explicit config" : env.defaultModel ? "env" : cfgPath.defaultModel ? "env ONYX_CONFIG_PATH" : project.defaultModel ? "project file" : home.defaultModel ? "home profile" : "default",
     apiKey: input?.apiKey ? "explicit config" : env.apiKey ? "env" : cfgPath.apiKey ? "env ONYX_CONFIG_PATH" : project.apiKey ? "project file" : home.apiKey ? "home profile" : "unknown",
     apiSecret: input?.apiSecret ? "explicit config" : env.apiSecret ? "env" : cfgPath.apiSecret ? "env ONYX_CONFIG_PATH" : project.apiSecret ? "project file" : home.apiSecret ? "home profile" : "unknown"
   };
@@ -945,8 +955,8 @@ var CascadeRelationshipBuilder = class {
    * builder.graph('programs');
    * ```
    */
-  graph(name) {
-    this.graphName = name;
+  graph(name2) {
+    this.graphName = name2;
     return this;
   }
   /**
@@ -1033,24 +1043,24 @@ function diffAttributes(apiAttrs, localAttrs) {
   const added = [];
   const removed = [];
   const changed = [];
-  for (const [name, local] of localMap.entries()) {
-    if (!apiMap.has(name)) {
+  for (const [name2, local] of localMap.entries()) {
+    if (!apiMap.has(name2)) {
       added.push(local);
       continue;
     }
-    const api = apiMap.get(name);
+    const api = apiMap.get(name2);
     const apiNull = Boolean(api.isNullable);
     const localNull = Boolean(local.isNullable);
     if (api.type !== local.type || apiNull !== localNull) {
       changed.push({
-        name,
+        name: name2,
         from: { type: api.type, isNullable: apiNull },
         to: { type: local.type, isNullable: localNull }
       });
     }
   }
-  for (const name of apiMap.keys()) {
-    if (!localMap.has(name)) removed.push(name);
+  for (const name2 of apiMap.keys()) {
+    if (!localMap.has(name2)) removed.push(name2);
   }
   added.sort((a, b) => a.name.localeCompare(b.name));
   removed.sort();
@@ -1064,22 +1074,22 @@ function diffIndexes(apiIndexes, localIndexes) {
   const added = [];
   const removed = [];
   const changed = [];
-  for (const [name, local] of localMap.entries()) {
-    if (!apiMap.has(name)) {
+  for (const [name2, local] of localMap.entries()) {
+    if (!apiMap.has(name2)) {
       added.push(local);
       continue;
     }
-    const api = apiMap.get(name);
+    const api = apiMap.get(name2);
     const apiType = api.type ?? "DEFAULT";
     const localType = local.type ?? "DEFAULT";
     const apiScore = api.minimumScore;
     const localScore = local.minimumScore;
     if (apiType !== localType || apiScore !== localScore) {
-      changed.push({ name, from: api, to: local });
+      changed.push({ name: name2, from: api, to: local });
     }
   }
-  for (const name of apiMap.keys()) {
-    if (!localMap.has(name)) removed.push(name);
+  for (const name2 of apiMap.keys()) {
+    if (!localMap.has(name2)) removed.push(name2);
   }
   added.sort((a, b) => a.name.localeCompare(b.name));
   removed.sort();
@@ -1093,18 +1103,18 @@ function diffResolvers(apiResolvers, localResolvers) {
   const added = [];
   const removed = [];
   const changed = [];
-  for (const [name, local] of localMap.entries()) {
-    if (!apiMap.has(name)) {
+  for (const [name2, local] of localMap.entries()) {
+    if (!apiMap.has(name2)) {
       added.push(local);
       continue;
     }
-    const api = apiMap.get(name);
+    const api = apiMap.get(name2);
     if (api.resolver !== local.resolver) {
-      changed.push({ name, from: api, to: local });
+      changed.push({ name: name2, from: api, to: local });
     }
   }
-  for (const name of apiMap.keys()) {
-    if (!localMap.has(name)) removed.push(name);
+  for (const name2 of apiMap.keys()) {
+    if (!localMap.has(name2)) removed.push(name2);
   }
   added.sort((a, b) => a.name.localeCompare(b.name));
   removed.sort();
@@ -1118,18 +1128,18 @@ function diffTriggers(apiTriggers, localTriggers) {
   const added = [];
   const removed = [];
   const changed = [];
-  for (const [name, local] of localMap.entries()) {
-    if (!apiMap.has(name)) {
+  for (const [name2, local] of localMap.entries()) {
+    if (!apiMap.has(name2)) {
       added.push(local);
       continue;
     }
-    const api = apiMap.get(name);
+    const api = apiMap.get(name2);
     if (api.event !== local.event || api.trigger !== local.trigger) {
-      changed.push({ name, from: api, to: local });
+      changed.push({ name: name2, from: api, to: local });
     }
   }
-  for (const name of apiMap.keys()) {
-    if (!localMap.has(name)) removed.push(name);
+  for (const name2 of apiMap.keys()) {
+    if (!localMap.has(name2)) removed.push(name2);
   }
   added.sort((a, b) => a.name.localeCompare(b.name));
   removed.sort();
@@ -1145,13 +1155,13 @@ function computeSchemaDiff(apiSchema, localSchema) {
   const newTables = [];
   const removedTables = [];
   const changedTables = [];
-  for (const [name, localEntity] of localMap.entries()) {
-    if (!apiMap.has(name)) {
-      newTables.push(name);
+  for (const [name2, localEntity] of localMap.entries()) {
+    if (!apiMap.has(name2)) {
+      newTables.push(name2);
       continue;
     }
-    const apiEntity = apiMap.get(name);
-    const tableDiff = { name };
+    const apiEntity = apiMap.get(name2);
+    const tableDiff = { name: name2 };
     const partitionFrom = normalizePartition(apiEntity.partition);
     const partitionTo = normalizePartition(localEntity.partition);
     if (partitionFrom !== partitionTo) {
@@ -1176,8 +1186,8 @@ function computeSchemaDiff(apiSchema, localSchema) {
       changedTables.push(tableDiff);
     }
   }
-  for (const name of apiMap.keys()) {
-    if (!localMap.has(name)) removedTables.push(name);
+  for (const name2 of apiMap.keys()) {
+    if (!localMap.has(name2)) removedTables.push(name2);
   }
   newTables.sort();
   removedTables.sort();
@@ -1277,58 +1287,64 @@ var OnyxDatabaseImpl = class {
   requestLoggingEnabled;
   responseLoggingEnabled;
   defaultPartition;
+  ai;
   constructor(config, resolveConfigWithCache) {
     this.requestLoggingEnabled = !!config?.requestLoggingEnabled;
     this.responseLoggingEnabled = !!config?.responseLoggingEnabled;
     this.defaultPartition = config?.partition;
     this.cfgPromise = resolveConfigWithCache(config);
+    this.ai = this.createAiFacade();
   }
-  async ensureClient() {
+  async resolveConfig() {
     if (!this.resolved) {
       this.resolved = await this.cfgPromise;
     }
+    return this.resolved;
+  }
+  async ensureClient() {
+    const cfg = await this.resolveConfig();
     if (!this.http) {
       this.http = new HttpClient({
-        baseUrl: this.resolved.baseUrl,
-        apiKey: this.resolved.apiKey,
-        apiSecret: this.resolved.apiSecret,
-        fetchImpl: this.resolved.fetch,
+        baseUrl: cfg.baseUrl,
+        apiKey: cfg.apiKey,
+        apiSecret: cfg.apiSecret,
+        fetchImpl: cfg.fetch,
         requestLoggingEnabled: this.requestLoggingEnabled,
         responseLoggingEnabled: this.responseLoggingEnabled,
-        retryEnabled: this.resolved.retryEnabled,
-        maxRetries: this.resolved.maxRetries,
-        retryInitialDelayMs: this.resolved.retryInitialDelayMs
+        retryEnabled: cfg.retryEnabled,
+        maxRetries: cfg.maxRetries,
+        retryInitialDelayMs: cfg.retryInitialDelayMs
       });
     }
     return {
       http: this.http,
-      fetchImpl: this.resolved.fetch,
-      baseUrl: this.resolved.baseUrl,
-      databaseId: this.resolved.databaseId
+      fetchImpl: cfg.fetch,
+      baseUrl: cfg.baseUrl,
+      databaseId: cfg.databaseId,
+      defaultModel: cfg.defaultModel ?? DEFAULT_AI_MODEL
     };
   }
   async ensureAiClient() {
-    if (!this.resolved) {
-      this.resolved = await this.cfgPromise;
-    }
+    const cfg = await this.resolveConfig();
     if (!this.aiHttp) {
       this.aiHttp = new HttpClient({
-        baseUrl: this.resolved.aiBaseUrl,
-        apiKey: this.resolved.apiKey,
-        apiSecret: this.resolved.apiSecret,
-        fetchImpl: this.resolved.fetch,
+        baseUrl: cfg.aiBaseUrl,
+        apiKey: cfg.apiKey,
+        apiSecret: cfg.apiSecret,
+        fetchImpl: cfg.fetch,
         requestLoggingEnabled: this.requestLoggingEnabled,
         responseLoggingEnabled: this.responseLoggingEnabled,
-        retryEnabled: this.resolved.retryEnabled,
-        maxRetries: this.resolved.maxRetries,
-        retryInitialDelayMs: this.resolved.retryInitialDelayMs
+        retryEnabled: cfg.retryEnabled,
+        maxRetries: cfg.maxRetries,
+        retryInitialDelayMs: cfg.retryInitialDelayMs
       });
     }
     return {
       http: this.aiHttp,
-      fetchImpl: this.resolved.fetch,
-      aiBaseUrl: this.resolved.aiBaseUrl,
-      databaseId: this.resolved.databaseId
+      fetchImpl: cfg.fetch,
+      aiBaseUrl: cfg.aiBaseUrl,
+      databaseId: cfg.databaseId,
+      defaultModel: cfg.defaultModel ?? DEFAULT_AI_MODEL
     };
   }
   registerStream(handle) {
@@ -1343,6 +1359,21 @@ var OnyxDatabaseImpl = class {
       }
     };
   }
+  createAiFacade() {
+    const chat = ((contentOrRequest, options) => {
+      if (typeof contentOrRequest === "string") {
+        return this.chatWithContent(contentOrRequest, options);
+      }
+      return this.getAiChatClient().create(contentOrRequest, options);
+    });
+    return {
+      chat,
+      chatClient: () => this.getAiChatClient(),
+      getModels: () => this.getModels(),
+      getModel: (modelId) => this.getModel(modelId),
+      requestScriptApproval: (input) => this.requestScriptApproval(input)
+    };
+  }
   getRequestLoggingEnabled() {
     return this.requestLoggingEnabled;
   }
@@ -1350,7 +1381,7 @@ var OnyxDatabaseImpl = class {
     return this.responseLoggingEnabled;
   }
   /** -------- IOnyxDatabase -------- */
-  chat() {
+  getAiChatClient() {
     return new AiChatClientImpl(
       () => this.ensureAiClient(),
       (handle) => this.registerStream(handle),
@@ -1358,6 +1389,32 @@ var OnyxDatabaseImpl = class {
       () => this.responseLoggingEnabled
     );
   }
+  async chatWithContent(content, options) {
+    const { defaultModel } = await this.ensureAiClient();
+    const stream = options?.stream ?? false;
+    const request = {
+      model: options?.model ?? defaultModel,
+      messages: [{ role: options?.role ?? "user", content }],
+      stream
+    };
+    if (options && "temperature" in options) {
+      request.temperature = options.temperature ?? null;
+    }
+    const result = await this.getAiChatClient().create(request, options);
+    if (stream) return result;
+    if (options?.raw) return result;
+    const first = result.choices?.[0]?.message?.content;
+    if (typeof first === "string" && first.trim().length > 0) {
+      return first;
+    }
+    throw new Error("Chat completion response is missing message content");
+  }
+  chat(content, options) {
+    if (typeof content === "string") {
+      return this.chatWithContent(content, options);
+    }
+    return this.getAiChatClient();
+  }
   async getModels() {
     const { http } = await this.ensureAiClient();
     return http.request("GET", "/v1/models");
@@ -2274,12 +2331,9 @@ var upper = (attribute) => `upper(${attribute})`;
 var lower = (attribute) => `lower(${attribute})`;
 var substring = (attribute, from, length) => `substring(${attribute},${from},${length})`;
 var replace = (attribute, pattern, repl) => `replace(${attribute}, '${pattern.replace(/'/g, "\\'")}', '${repl.replace(/'/g, "\\'")}')`;
+var format = (attribute, formatter) => `format(${attribute}, '${formatter.replace(/'/g, "\\'")}')`;
 var percentile = (attribute, p) => `percentile(${attribute}, ${p})`;
 
-// src/index.ts
-var sdkName = "@onyx.dev/onyx-database";
-var sdkVersion = "0.1.0";
-
 exports.QueryResults = QueryResults;
 exports.asc = asc;
 exports.avg = avg;
@@ -2289,6 +2343,7 @@ exports.containsIgnoreCase = containsIgnoreCase;
 exports.count = count;
 exports.desc = desc;
 exports.eq = eq;
+exports.format = format;
 exports.gt = gt;
 exports.gte = gte;
 exports.inOp = inOp;
@@ -2313,8 +2368,8 @@ exports.notWithin = notWithin;
 exports.onyx = onyx;
 exports.percentile = percentile;
 exports.replace = replace;
-exports.sdkName = sdkName;
-exports.sdkVersion = sdkVersion;
+exports.sdkName = name;
+exports.sdkVersion = version;
 exports.search = search;
 exports.startsWith = startsWith;
 exports.std = std;