casualos 3.4.1-alpha.14318904853 → 3.4.4-alpha.14502478455

package/dist/cli.js

@@ -98081,7 +98081,7 @@ var trace = TraceAPI.getInstance();
 function hashLowEntropyPasswordWithSalt2(password, salt) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v3.4.1-alpha.14318904853"
+    false ? void 0 : "v3.4.4-alpha.14502478455"
   );
   return tracer.startActiveSpan(
     "hashLowEntropyPasswordWithSalt",
@@ -98099,7 +98099,7 @@ function hashLowEntropyPasswordWithSalt2(password, salt) {
 function hashHighEntropyPasswordWithSalt2(password, salt) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v3.4.1-alpha.14318904853"
+    false ? void 0 : "v3.4.4-alpha.14502478455"
   );
   return tracer.startActiveSpan(
     "hashHighEntropyPasswordWithSalt",
@@ -98117,7 +98117,7 @@ function hashHighEntropyPasswordWithSalt2(password, salt) {
 function verifyPasswordAgainstHashes2(password, salt, hashes) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v3.4.1-alpha.14318904853"
+    false ? void 0 : "v3.4.4-alpha.14502478455"
   );
   return tracer.startActiveSpan(
     "verifyPasswordAgainstHashes",
@@ -105069,7 +105069,7 @@ var import_semantic_conventions = __toESM(require_src3());
 function traced(tracerName, options = {}, metricOptions = {}) {
   const tracer = trace.getTracer(
     tracerName,
-    false ? void 0 : "v3.4.1-alpha.14318904853"
+    false ? void 0 : "v3.4.4-alpha.14502478455"
   );
   return function(target, propertyKey, descriptor) {
     const originalMethod = descriptor.value;
@@ -105147,7 +105147,7 @@ function getHistogram(meter) {
   }
   return metrics.getMeter(
     meter.meter,
-    false ? void 0 : "v3.4.1-alpha.14318904853"
+    false ? void 0 : "v3.4.4-alpha.14502478455"
   ).createHistogram(meter.name, meter.options);
 }
 function getCounter(meter) {
@@ -105156,7 +105156,7 @@ function getCounter(meter) {
   }
   return metrics.getMeter(
     meter.meter,
-    false ? void 0 : "v3.4.1-alpha.14318904853"
+    false ? void 0 : "v3.4.4-alpha.14502478455"
   ).createCounter(meter.name, meter.options);
 }
 function traceHttpResponse(options = {}) {
@@ -117263,7 +117263,7 @@ var RecordsServer = class {
     this._notificationsController = notificationsController;
     this._tracer = trace.getTracer(
       "RecordsServer",
-      false ? void 0 : "v3.4.1-alpha.14318904853"
+      false ? void 0 : "v3.4.4-alpha.14502478455"
     );
     this._procedures = this._createProcedures();
     this._setupRoutes();
@@ -119668,8 +119668,8 @@ var RecordsServer = class {
         return {
           success: true,
           ...metadata,
-          version: true ? "v3.4.1-alpha.14318904853" : void 0,
-          versionHash: true ? "ef806e4fe519d1e572a721a6e35671d16462d913" : void 0
+          version: true ? "v3.4.4-alpha.14502478455" : void 0,
+          versionHash: true ? "b407322cf3257d6e15ddbc347b6e3152e1a45fdc" : void 0
         };
       })
     };
@@ -130023,17 +130023,35 @@ var SPAN_OPTIONS = {
   }
 };
 var OpenAIChatInterface = class {
+  get _baseUrl() {
+    return this._options.baseUrl ?? "https://api.openai.com/v1/";
+  }
+  get _name() {
+    return this._options.name ?? "OpenAIChatInterface";
+  }
   constructor(options) {
     this._options = options;
     this._client = new openai_default({
-      apiKey: options.apiKey
+      apiKey: options.apiKey,
+      baseURL: this._options.baseUrl ?? void 0
     });
+    this._additionalProperties = options.additionalProperties ?? {};
   }
   async chat(request2) {
     try {
+      if (this._options.name) {
+        const span = trace.getActiveSpan();
+        if (span) {
+          span.setAttribute(
+            "chat.interface.name",
+            this._options.name
+          );
+        }
+      }
       const result = await axios_default.post(
-        "https://api.openai.com/v1/chat/completions",
+        `${this._baseUrl}chat/completions`,
         {
+          ...this._additionalProperties,
           model: request2.model,
           messages: request2.messages.map((m2) => ({
             role: m2.role,
@@ -130070,10 +130088,10 @@ var OpenAIChatInterface = class {
         }
       );
       console.log(
-        `[OpenAIChatInterface] [${request2.userId}] [chat]: Total tokens: ${result.data.usage.total_tokens}`
+        `[${this._name}] [${request2.userId}] [chat]: Total tokens: ${result.data.usage.total_tokens}`
       );
       console.log(
-        `[OpenAIChatInterface] [${request2.userId}] [chat]: Usage:`,
+        `[${this._name}] [${request2.userId}] [chat]: Usage:`,
         result.data.usage
       );
       let choices = result.data.choices.map(
@@ -130087,7 +130105,7 @@ var OpenAIChatInterface = class {
       );
       return {
         choices,
-        totalTokens: result.data.usage.total_tokens
+        totalTokens: result.data.usage?.total_tokens ?? 0
       };
     } catch (err) {
       if (axios_default.isAxiosError(err)) {
@@ -130096,7 +130114,7 @@ var OpenAIChatInterface = class {
           span?.recordException(err);
           span?.setStatus({ code: SpanStatusCode.ERROR });
           console.error(
-            `[OpenAIChatInterface] [${request2.userId}] [chat]: Bad request: ${err.response.data.error.message}`
+            `[${this._name}] [${request2.userId}] [chat]: Bad request: ${err.response.data.error.message}`
           );
           return {
             choices: [
@@ -130113,7 +130131,14 @@ var OpenAIChatInterface = class {
     }
   }
   async *chatStream(request2) {
+    if (this._options.name) {
+      const span = trace.getActiveSpan();
+      if (span) {
+        span.setAttribute("chat.interface.name", this._options.name);
+      }
+    }
     const res = await this._client.chat.completions.create({
+      ...this._additionalProperties,
       model: request2.model,
       messages: request2.messages.map((m2) => ({
         role: m2.role,
@@ -135623,8 +135648,8 @@ var sloydAiSchema = z.object({
 });
 var aiSchema = z.object({
   chat: z.object({
-    provider: z.enum(["openai", "google", "anthropic"]).describe(
-      "The provider that should be used by default for Chat AI request models that dont have an associated provider."
+    provider: z.string().describe(
+      "The provider that should be used by default for Chat AI request models that dont have an associated provider. If you want to point to a custom provider, then use the name for the provider."
     ),
     defaultModel: z.string().describe(
       "The model that should be used for Chat AI requests when one is not specified."
@@ -135635,6 +135660,26 @@ var aiSchema = z.object({
         z.object({
           provider: z.enum(["openai", "google", "anthropic"]).optional(),
           model: z.string().nonempty()
+        }),
+        z.object({
+          provider: z.literal("custom-openai-completions").describe(
+            "Defines that the provider points to a custom implementation of the OpenAI Completions API"
+          ),
+          name: z.string().describe(
+            "The name that should be used for this provider"
+          ).nonempty().default("custom-openai-completions"),
+          apiKey: z.string().describe(
+            "The API key that should be used to communicate with the custom API."
+          ).nonempty(),
+          baseUrl: z.string().describe(
+            'The endpoint that should be used to communicate with the custom API. (e.g. "https://api.openai.com/v1/" for OpenAIs API)'
+          ).nonempty(),
+          models: z.array(z.string().nonempty()).describe(
+            "The list of models that should be mapped to this provider"
+          ),
+          additionalProperties: z.object({}).passthrough().describe(
+            "The additional properties that should be included in requests."
+          ).optional()
         })
       ])
     ).describe(
@@ -148725,7 +148770,7 @@ var config = new Conf({
   projectName: "casualos-cli"
 });
 var program2 = new Command();
-program2.name("casualos").description("A CLI for CasualOS").version("v3.4.1-alpha.14318904853").option(
+program2.name("casualos").description("A CLI for CasualOS").version("v3.4.4-alpha.14502478455").option(
   "-e, --endpoint <url>",
   "The endpoint to use for queries. Can be used to override the current endpoint."
 );

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "casualos",
-    "version": "3.4.1-alpha.14318904853",
+    "version": "3.4.4-alpha.14502478455",
     "description": "Command line interface for CasualOS.",
     "main": "./dist/index.js",
     "types": "index.d.ts",
@@ -35,8 +35,8 @@
         "access": "public"
     },
     "dependencies": {
-        "@casual-simulation/aux-common": "^3.4.1-alpha.14318904853",
-        "@casual-simulation/aux-records": "^3.4.1-alpha.14318904853",
+        "@casual-simulation/aux-common": "^3.4.0",
+        "@casual-simulation/aux-records": "^3.4.4-alpha.14502478455",
         "@octokit/app": "^15.1.0",
         "@octokit/auth-oauth-device": "^7.1.1",
         "@octokit/core": "^6.1.2",
@@ -63,5 +63,5 @@
         "**/*.def",
         "templates/**"
     ],
-    "gitHead": "ef806e4fe519d1e572a721a6e35671d16462d913"
+    "gitHead": "b407322cf3257d6e15ddbc347b6e3152e1a45fdc"
 }