Merge remote-tracking branch 'origin/master' into onprem-gpu

Author: haraldschilly

src/packages/frontend/account/chatbot.ts

@@ -8,6 +8,9 @@ When new models are added, e.g., Claude soon (!), they will go here.
 */
 
 import { redux } from "@cocalc/frontend/app-framework";
+import {
+  getUserDefinedLLMByModel
+} from "@cocalc/frontend/frame-editors/llm/use-userdefined-llm";
 import {
   LANGUAGE_MODELS,
   LANGUAGE_MODEL_PREFIXES,
@@ -20,6 +23,7 @@ import {
   isCustomOpenAI,
   isMistralService,
   isOllamaLLM,
+  isUserDefinedModel
 } from "@cocalc/util/db-schema/llm-utils";
 
 // we either check if the prefix is one of the known ones (used in some circumstances)
@@ -30,7 +34,8 @@ export function isChatBot(account_id?: string): boolean {
     LANGUAGE_MODEL_PREFIXES.some((prefix) => account_id?.startsWith(prefix)) ||
     LANGUAGE_MODELS.some((model) => account_id === model) ||
     isOllamaLLM(account_id) ||
-    isCustomOpenAI(account_id)
+    isCustomOpenAI(account_id) ||
+    isUserDefinedModel(account_id)
   );
 }
 
@@ -62,5 +67,9 @@ export function chatBotName(account_id?: string): string {
     const key = fromCustomOpenAIModel(account_id);
     return custom_openai[key]?.display ?? "OpenAI (custom)";
   }
+  if (isUserDefinedModel(account_id)) {
+    const um = getUserDefinedLLMByModel(account_id);
+    return um?.display ?? "ChatBot";
+  }
   return "ChatBot";
 }

src/packages/frontend/account/custom-llm.tsx

@@ -7,7 +7,7 @@ import { Card, InputNumber } from "antd";
 import { Map } from "immutable";
 
 import { Checkbox, Panel } from "@cocalc/frontend/antd-bootstrap";
-import { Rendered, redux } from "@cocalc/frontend/app-framework";
+import { Rendered, redux, useTypedRedux } from "@cocalc/frontend/app-framework";
 import {
   A,
   Icon,
@@ -30,10 +30,10 @@ import {
   VBAR_OPTIONS,
   getValidVBAROption,
 } from "../project/page/vbar";
-import { CustomLLM } from "./custom-llm";
 import { dark_mode_mins, get_dark_mode_config } from "./dark-mode";
 import Tours from "./tours";
 import { useLanguageModelSetting } from "./useLanguageModelSetting";
+import { UserDefinedLLMComponent } from "./user-defined-llm";
 
 interface Props {
   other_settings: Map<string, any>;
@@ -42,6 +42,8 @@ interface Props {
 }
 
 export function OtherSettings(props: Readonly<Props>): JSX.Element {
+  const isCoCalcCom = useTypedRedux("customize", "is_cocalc_com");
+  const user_defined_llm = useTypedRedux("customize", "user_defined_llm");
   const [model, setModel] = useLanguageModelSetting();
 
   function on_change(name: string, value: any): void {
@@ -391,10 +393,9 @@ export function OtherSettings(props: Readonly<Props>): JSX.Element {
   }
 
   function render_custom_llm(): Rendered {
-    // This is disabled for now, will be enabled in a future PR
-    return;
-    // @ts-ignore
-    return <CustomLLM on_change={on_change} />;
+    // on cocalc.com, do not even show that they're disabled
+    if (isCoCalcCom && !user_defined_llm) return;
+    return <UserDefinedLLMComponent on_change={on_change} />;
   }
 
   if (props.other_settings == null) {

src/packages/frontend/account/other-settings.tsx

@@ -10,6 +10,7 @@ import { MessageInfo } from "@cocalc/frontend/client/hub";
 import {
   NEW_FILENAMES,
   NewFilenameTypes,
+  OTHER_SETTINGS_USERDEFINED_LLM,
 } from "@cocalc/util/db-schema/defaults";
 import { LanguageModel } from "@cocalc/util/db-schema/llm-utils";
 import { PassportStrategyFrontend } from "@cocalc/util/types/passport-types";
@@ -46,6 +47,7 @@ export interface AccountState {
     dark_mode_sepia: number;
     dark_mode_grayscale: number;
     news_read_until: number; // JavaScript timestamp in milliseconds
+    [OTHER_SETTINGS_USERDEFINED_LLM]: string; // string is JSON: CustomLLM[]
   }>;
   stripe_customer?: TypedMap<{
     subscriptions: { data: Map<string, any> };

src/packages/frontend/account/types.ts

@@ -1,4 +1,5 @@
 import { redux, useMemo, useTypedRedux } from "@cocalc/frontend/app-framework";
+import { getUserDefinedLLM } from "@cocalc/frontend/frame-editors/llm/use-userdefined-llm";
 import {
   LLMServicesAvailable,
   LanguageService,
@@ -7,6 +8,8 @@ import {
   getValidLanguageModelName,
   isCustomOpenAI,
   isOllamaLLM,
+  isUserDefinedModel,
+  unpackUserDefinedLLMModel,
 } from "@cocalc/util/db-schema/llm-utils";
 
 export const SETTINGS_LANGUAGE_MODEL_KEY = "language_model";
@@ -78,11 +81,21 @@ export function setDefaultLLM(llm: LanguageService) {
     isCustomOpenAI(llm) &&
     custom_openai?.get(fromCustomOpenAIModel(llm))
   ) {
-    // ... or a custom_openai llm
+    redux
+      .getActions("account")
+      .set_other_settings(SETTINGS_LANGUAGE_MODEL_KEY, llm);
+  } else if (isUserDefinedModel(llm) && userDefinedLLMExists(llm)) {
     redux
       .getActions("account")
       .set_other_settings(SETTINGS_LANGUAGE_MODEL_KEY, llm);
   } else {
     console.warn(`setDefaultLLM: LLM "${llm}" is unknown.`);
   }
 }
+
+function userDefinedLLMExists(model: string): boolean {
+  const user_llm = getUserDefinedLLM();
+  const um = unpackUserDefinedLLMModel(model);
+  if (um == null) return false;
+  return user_llm.some((m) => m.service === um.service && m.model === um.model);
+}