Merge pull request #7600 from sagemathinc/llm-upd-20240531

llm/npm: updating packages

Author: williamstein

src/packages/frontend/admin/llm/index.tsx

@@ -9,11 +9,12 @@ import {
 import { Paragraph, Title } from "@cocalc/frontend/components";
 import { LLMModelName } from "@cocalc/frontend/components/llm-name";
 import {
-  LanguageModelCore,
   LLMServiceName,
   LLM_PROVIDER,
+  LanguageModelCore,
   USER_SELECTABLE_LLMS_BY_VENDOR,
   isCoreLanguageModel,
+  toCustomOpenAIModel,
   toOllamaModel,
 } from "@cocalc/util/db-schema/llm-utils";
 import { getRandomColor, trunc_middle } from "@cocalc/util/misc";
@@ -26,6 +27,7 @@ export function TestLLMAdmin() {
   const globallyEnabledLLMs = customize.getEnabledLLMs();
   const selectableLLMs = useTypedRedux("customize", "selectable_llms");
   const ollama = useTypedRedux("customize", "ollama");
+  const custom_openai = useTypedRedux("customize", "custom_openai");
   const [test, setTest] = useState<number | null>(0);
   // TODO: this is used to trigger sending queries – makes no sense that all of them disable it. fix this.
   const [querying, setQuerying] = useState<boolean>();
@@ -66,6 +68,70 @@ export function TestLLMAdmin() {
     );
   }
 
+  function renderCustomOpenAI() {
+    return (
+      <Col key={"custom_openai"} md={12} xs={24}>
+        <Title level={5}>Custom OpenAI</Title>
+        {Object.entries(custom_openai?.toJS() ?? {}).map(([key, _val]) => {
+          const model = toCustomOpenAIModel(key);
+
+          return (
+            <Row
+              gutter={[10, 20]}
+              style={llmStyle(model)}
+              key={`custom_openai-${key}`}
+            >
+              <Col md={24}>
+                <Space>
+                  <Value val={true} /> <LLMModelName model={model} />
+                </Space>
+              </Col>
+              <Col md={24}>
+                <TestLLM
+                  test={test}
+                  model={model}
+                  queryState={[querying, setQuerying]}
+                />
+              </Col>
+            </Row>
+          );
+        })}
+      </Col>
+    );
+  }
+
+  function renderOllama() {
+    return (
+      <Col key={"ollama"} md={12} xs={24}>
+        <Title level={5}>Ollama</Title>
+        {Object.entries(ollama?.toJS() ?? {}).map(([key, _val]) => {
+          const model = toOllamaModel(key);
+
+          return (
+            <Row
+              gutter={[10, 20]}
+              style={llmStyle(model)}
+              key={`ollama-${key}`}
+            >
+              <Col md={24}>
+                <Space>
+                  <Value val={true} /> <LLMModelName model={model} />
+                </Space>
+              </Col>
+              <Col md={24}>
+                <TestLLM
+                  test={test}
+                  model={model}
+                  queryState={[querying, setQuerying]}
+                />
+              </Col>
+            </Row>
+          );
+        })}
+      </Col>
+    );
+  }
+
   return (
     <div>
       <Paragraph>
@@ -108,7 +174,7 @@ export function TestLLMAdmin() {
         <Row gutter={[10, 10]}>
           {Object.entries(USER_SELECTABLE_LLMS_BY_VENDOR).map(
             ([vendor, llms]) =>
-              vendor !== "ollama" ? (
+              vendor !== "ollama" && vendor !== "custom_openai" ? (
                 <Col key={vendor} md={12} xs={24}>
                   <Title level={5}>{LLM_PROVIDER[vendor].name}</Title>
                   {llms
@@ -117,38 +183,15 @@ export function TestLLMAdmin() {
                 </Col>
               ) : undefined,
           )}
-          <Col key={"ollama"} md={12} xs={24}>
-            <Title level={5}>Ollama</Title>
-            {Object.entries(ollama?.toJS() ?? {}).map(([key, val]) => {
-              const model = toOllamaModel(val.model);
-
-              return (
-                <Row
-                  gutter={[10, 20]}
-                  style={llmStyle(model)}
-                  key={`ollama-${key}`}
-                >
-                  <Col md={24}>
-                    <Space>
-                      <Value val={true} /> <LLMModelName model={model} />
-                    </Space>
-                  </Col>
-                  <Col md={24}>
-                    <TestLLM
-                      test={test}
-                      model={model}
-                      queryState={[querying, setQuerying]}
-                    />
-                  </Col>
-                </Row>
-              );
-            })}
-          </Col>
+          {renderOllama()}
+          {renderCustomOpenAI()}
         </Row>
       </Paragraph>
 
       <Title level={5}>Ollama configuration</Title>
       <Value val={ollama} />
+      <Title level={5}>Custom OpenAI API</Title>
+      <Value val={custom_openai} />
     </div>
   );
 }

src/packages/frontend/components/llm-name.tsx

@@ -19,10 +19,6 @@ export function LLMModelName(
   const custom_openai = useTypedRedux("customize", "custom_openai");
 
   function renderTitle() {
-    if (isLanguageModel(model)) {
-      return modelToName(model);
-    }
-
     if (isOllamaLLM(model)) {
       const om = ollama?.get(fromOllamaModel(model));
       if (om) {
@@ -37,6 +33,10 @@ export function LLMModelName(
       }
     }
 
+    if (isLanguageModel(model)) {
+      return modelToName(model);
+    }
+
     return model;
   }
 

src/packages/package.json

@@ -20,9 +20,8 @@
       "undici@<5.28.3": "^5.28.4",
       "postcss@<8.4.31": "^8.4.31",
       "retry-request@<7.0.1": "^7.0.2",
-      "@langchain/core": "^0.1.63",
-      "katex@<0.16.9": "^0.16.10",
-      "@mistralai/mistralai": "^0.2.0"
+      "@langchain/core": "^0.2.5",
+      "katex@<0.16.9": "^0.16.10"
     }
   }
 }