v0.5.0

kWeglinski · Jan 17, 2025 · a24b903 · a24b903
1 parent 4ec4c07
commit a24b903
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # NEW:
 
-Support for language tool has been added!
+- Support for language tool has been added!
+- Ollama for translation has been added!
 
 # Pole Language Frontend
 
@@ -29,10 +30,10 @@ Here's a sample docker compose:
   pole-libretranslate:
     restart: unless-stopped
     environment:
-      LTAPI: https://your.languagetool.instance
-      API: https://your.libretranslate.instance
+      LANGUAGE_TOOL: https://your.languagetool.instance
+      LIBRETRANSLATE: https://your.libretranslate.instance
+      OLLAMA: https://your.ollama.instance
       OLLAMA_MODEL: model_name
-      OLLAMA_API: https://your.ollama.instance
       # pick one of: 'pole' | 'light' | 'dark' 
       THEME: 'dark'
     ports:

diff --git a/index.cjs b/index.cjs
@@ -73,6 +73,15 @@ const handleFormDataPost = (url, req, res) => {
     });
 };
 
+app.get("/api/status", (req, res) => {
+  res.send({
+    LANGUAGE_TOOL,
+    LIBRETRANSLATE,
+    OLLAMA,
+    OLLAMA_MODEL,
+  });
+});
+
 app.get("/api/libretranslate/languages", (req, res) => {
   handleProxyGET(`${LIBRETRANSLATE}/languages`, res);
 });

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sth-libretranslate",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.5.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/src/switcher.tsx b/src/switcher.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import Tabs from "@mui/material/Tabs";
 import Tab from "@mui/material/Tab";
 import Box from "@mui/material/Box";
@@ -35,35 +35,31 @@ function a11yProps(index: number) {
   };
 }
 
-const hasLangTool = () => {
-  const urlParams = new URLSearchParams(window.location.search);
-  const languageCheckerUrl = urlParams.get("ltapi");
-
-  const baseUrl =
-    //@ts-expect-error: window
-    languageCheckerUrl ?? window._lturl;
-
-  return baseUrl !== "%LTAPI%";
-};
-
-const hasLibreTanslate = () => {
-  const urlParams = new URLSearchParams(window.location.search);
-  const libreUrl = urlParams.get("api");
-
-  //@ts-expect-error: window
-  const baseUrl = libreUrl ?? window._libreurl;
-
-  return baseUrl !== "%API%";
-};
-
 export const Switcher = () => {
   const initTab = parseInt(localStorage.getItem("tab") ?? "0");
+  const [status, setStatus] = useState({
+    libreTranslate: false,
+    languageTool: false,
+    ollama: false,
+  });
   const [tab, setTab] = useState(initTab);
   const tabSetter = (val: number) => {
     setTab(val);
     localStorage.setItem("tab", val.toString());
   };
 
+  useEffect(() => {
+    fetch("/api/status")
+      .then((data) => data.json())
+      .then((data) => {
+        setStatus({
+          libreTranslate: data.LIBRETRANSLATE,
+          languageTool: data.LANGUAGE_TOOL,
+          ollama: data.OLLAMA,
+        });
+      });
+  }, []);
+
   return (
     <>
       <Box sx={{ borderBottom: 1, borderColor: "divider" }}>
@@ -73,12 +69,12 @@ export const Switcher = () => {
           onChange={(_, val) => tabSetter(val)}
           aria-label="basic tabs example"
         >
-          {hasLibreTanslate() && <Tab label="Translate" {...a11yProps(0)} />}
-          {hasLangTool() && <Tab label="Language Check" {...a11yProps(1)} />}
+          {status.libreTranslate && <Tab label="Translate" {...a11yProps(0)} />}
+          {status.languageTool && <Tab label="Language Check" {...a11yProps(1)} />}
         </Tabs>
       </Box>
       <CustomTabPanel value={tab} index={0}>
-        <Translate />
+        <Translate ollama={status.ollama} />
       </CustomTabPanel>
       <CustomTabPanel value={tab} index={1}>
         <LangCheck />

diff --git a/src/translate/App.tsx b/src/translate/App.tsx
@@ -7,7 +7,7 @@ import { API } from "./API";
 import { TransBox } from "./TransBox";
 import { Lang, LangChoice, TranslationResponse } from "./types";
 
-function App() {
+function App({ ollama }: { ollama: boolean }) {
   const [loading, setLoading] = useState(false);
   const [question, setQuestion] = useState(
     localStorage.getItem("question") ?? ""
@@ -90,6 +90,7 @@ function App() {
         setSource={setSource}
         target={target}
         setTarget={setTarget}
+        ollama={ollama}
         useAi={useAI}
         setUseAi={setUseAi}
       />

diff --git a/src/translate/Settings.tsx b/src/translate/Settings.tsx
@@ -22,6 +22,7 @@ export const Settings = ({
   setTarget,
   useAi,
   setUseAi,
+  ollama,
 }: {
   languages: Lang[];
   source: LangChoice;
@@ -31,6 +32,7 @@ export const Settings = ({
   setTarget: React.Dispatch<React.SetStateAction<unknown>>;
   useAi: boolean;
   setUseAi: (val: boolean) => void;
+  ollama: boolean;
 }) => {
   const targets =
     source.code === AUTOMATIC.code
@@ -45,24 +47,26 @@ export const Settings = ({
 
   return langLoaded ? (
     <div>
-      <FormControlLabel
-        sx={{ float: "right" }}
-        control={
-          <Switch
-            checked={useAi}
-            onChange={() => setUseAi(!useAi)}
-            size="small"
-          />
-        }
-        label={
-          <Stack
-            direction="row"
-            sx={{ justifyContent: "center", alignItems: "center" }}
-          >
-            <span style={{ fontSize: "12px" }}>AI</span>
-          </Stack>
-        }
-      />
+      {ollama && (
+        <FormControlLabel
+          sx={{ float: "right" }}
+          control={
+            <Switch
+              checked={useAi}
+              onChange={() => setUseAi(!useAi)}
+              size="small"
+            />
+          }
+          label={
+            <Stack
+              direction="row"
+              sx={{ justifyContent: "center", alignItems: "center" }}
+            >
+              <span style={{ fontSize: "12px" }}>AI</span>
+            </Stack>
+          }
+        />
+      )}
       <div className="settings">
         <Stack
           direction={windowWidth > 800 ? "row" : "column"}