Update/next2 (#3)

* use single open-webui ollama image

* Update bundling process to use Deno emit module

* Update long description and version bump

Author: k0gen

Dockerfile

@@ -1,39 +1,20 @@
-FROM ghcr.io/open-webui/open-webui:0.3.10 AS gui
-FROM ollama/ollama:0.2.8 AS ollama
-
-COPY --from=gui /app /app
-# COPY --from=gui /root/.cache/chroma/onnx_models/all-MiniLM-L6-v2/onnx /root/.cache/chroma/onnx_models/all-MiniLM-L6-v2/onnx
-
-WORKDIR /app/backend
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends python3.11 python3-pip pandoc netcat-openbsd curl ffmpeg libsm6 libxext6 && \
-    rm -rf /var/lib/apt/lists/* && \
-    mkdir -p /root/.cache/chroma/onnx_models/all-MiniLM-L6-v2 && \
-    chown root:root -R /root/.cache/chroma && \
-    pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu --no-cache-dir && \
-    pip3 install -r requirements.txt --no-cache-dir
-    # python -c "import os; from sentence_transformers import SentenceTransformer; SentenceTransformer(os.environ['RAG_EMBEDDING_MODEL'], device='cpu')" && \
-    # python -c "import os; from faster_whisper import WhisperModel; WhisperModel(os.environ['WHISPER_MODEL'], device='cpu', compute_type='int8', download_root=os.environ['WHISPER_MODEL_DIR'])"
+FROM ghcr.io/open-webui/open-webui:0.5.7-ollama
 
 ADD ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
 RUN chmod a+x /usr/local/bin/docker_entrypoint.sh
 COPY icon.png /app/build/static/favicon.png
 COPY icon.png /app/build/static/splash.png
 COPY icon.png /app/build/static/splash-dark.png
 
-RUN sed -i 's/WEBUI_NAME != "Open WebUI"/WEBUI_NAME != "FreeGPT-2"/g' /app/backend/config.py
-RUN sed -i 's#WEBUI_FAVICON_URL = "https://openwebui.com/favicon.png"#WEBUI_FAVICON_URL = "/static/favicon.png"#g' /app/backend/config.py
-RUN sed -i 's/flex w-full justify-between items-center/flex w-full justify-between items-center hidden/g' /app/build/_app/immutable/nodes/2.*.js
+# RUN sed -i 's/WEBUI_NAME = data\["name"\]/WEBUI_NAME = "FreeGPT-2"/g' /app/backend/open_webui/config.py
+# RUN sed -i 's#WEBUI_FAVICON_URL = "https://openwebui.com/favicon.png"#WEBUI_FAVICON_URL = "/static/favicon.png"#g' /app/backend/open_webui/config.py
+# RUN sed -i 's/flex w-full justify-between items-center/flex w-full justify-between items-center hidden/g' /app/build/_app/immutable/nodes/2.*.js
 ADD ./scripts/check-ui.sh /usr/local/bin/check-ui.sh
 RUN chmod a+x /usr/local/bin/check-ui.sh
 
 ENV ENV=prod
-ENV OPENAI_API_BASE_URL=""
-ENV OPENAI_API_KEY=""
 ENV WEBUI_NAME="FreeGPT-2"
-ENV WEBUI_SECRET_KEY=""
+ENV WEBUI_FAVICON_URL="/app/build/static/favicon.png"
 ENV SCARF_NO_ANALYTICS=true
 ENV DO_NOT_TRACK=true
-ENV RAG_EMBEDDING_MODEL="all-MiniLM-L6-v2"
-ENV RAG_EMBEDDING_MODEL_DEVICE_TYPE="cpu"
+ENV RAG_EMBEDDING_MODEL_DEVICE_TYPE="cpu"

Makefile

@@ -28,7 +28,7 @@ clean-manifest:
 	@echo; echo "Comments successfully removed from manifest.yaml file."; echo
 
 scripts/embassy.js: $(TS_FILES)
-	deno bundle scripts/embassy.ts scripts/embassy.js
+	deno run --allow-read --allow-write --allow-env --allow-net scripts/bundle.ts
 
 arm:
 	@rm -f docker-images/x86_64.tar

manifest.yaml

@@ -1,13 +1,10 @@
 id: free-gpt
 title: "FreeGPT-2"
-version: 2.208.0310
+version: 2.507.0507
 release-notes: |
   - Ollama update to the latest version
   - Updated UI to use latest version of Open WebUI
-  - Added support for NuExtract, Mathstral, GLM-4, CodeGeeX4 and Gemma 2 models.
-  - 🎙️ Hands-Free Voice Call Feature: Initiate voice calls without needing to use your hands, making interactions more seamless.
-  - 🎛️ Enhanced UI for Voice Recording: Improved user interface for the voice recording feature, making it more intuitive and user-friendly.
-  - And many, many more ...
+  - Update bundling process to use Deno emit module
 license: MIT
 wrapper-repo: "https://github.com/Start9Labs/freegpt2-startos"
 upstream-repo: "https://github.com/Start9Labs/freegpt2-startos"
@@ -17,7 +14,7 @@ build: ["make"]
 description:
   short: FreeGPT-2 is a tool for running large language models locally.
   long: |
-    FreeGPT-2 simplifies local language model usage. Get you up and running with Llama 2, Mistral, Llava and other large language models in an self sovereign fashion.
+    FreeGPT-2 combines the power of Ollama for running large language models locally with the user-friendly interface of Open WebUI. This combination provides a clean and intuitive experience for working with locally hosted language models in a sovereign fashion.
 assets:
   license: LICENSE
   icon: icon.png

scripts/bundle.ts

@@ -0,0 +1,6 @@
+// scripts/bundle.ts
+import { bundle } from "https://deno.land/x/emit@0.40.0/mod.ts";
+
+const result = await bundle("scripts/embassy.ts");
+
+await Deno.writeTextFile("scripts/embassy.js", result.code);

scripts/procedures/migrations.ts

@@ -1,4 +1,4 @@
 import { compat, types as T } from "../deps.ts";
 
 export const migration: T.ExpectedExports.migration = compat.migrations
-    .fromMapping({}, "2.208.0310" );
+    .fromMapping({}, "2.507.0507" );