From a579f5f8cfb5d0f3794c0c0b05d4237b41fb3088 Mon Sep 17 00:00:00 2001
From: Jun Siang Cheah <git@jscheah.me>
Date: Wed, 22 May 2024 20:22:38 +0100
Subject: [PATCH 1/2] feat: add git hash of build everywhere

---
 .github/workflows/docker-build.yaml           | 10 ++++++++--
 Dockerfile                                    |  6 ++++++
 backend/main.py                               |  4 +++-
 hatch_build.py                                |  2 ++
 src/lib/components/chat/Settings/About.svelte |  4 ++--
 src/lib/constants.ts                          |  1 +
 vite.config.ts                                |  3 ++-
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index b5dd72192..86d27f4dc 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -84,6 +84,8 @@ jobs:
           outputs: type=image,name=${{ env.FULL_IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
           cache-from: type=registry,ref=${{ steps.cache-meta.outputs.tags }}
           cache-to: type=registry,ref=${{ steps.cache-meta.outputs.tags }},mode=max
+          build-args: |
+            BUILD_HASH=${{ github.sha }}
 
       - name: Export digest
         run: |
@@ -170,7 +172,9 @@ jobs:
           outputs: type=image,name=${{ env.FULL_IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
           cache-from: type=registry,ref=${{ steps.cache-meta.outputs.tags }}
           cache-to: type=registry,ref=${{ steps.cache-meta.outputs.tags }},mode=max
-          build-args: USE_CUDA=true
+          build-args: |
+            BUILD_HASH=${{ github.sha }}
+            USE_CUDA=true
 
       - name: Export digest
         run: |
@@ -257,7 +261,9 @@ jobs:
           outputs: type=image,name=${{ env.FULL_IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
           cache-from: type=registry,ref=${{ steps.cache-meta.outputs.tags }}
           cache-to: type=registry,ref=${{ steps.cache-meta.outputs.tags }},mode=max
-          build-args: USE_OLLAMA=true
+          build-args: |
+            BUILD_HASH=${{ github.sha }}
+            USE_OLLAMA=true
 
       - name: Export digest
         run: |
diff --git a/Dockerfile b/Dockerfile
index c2c42aa17..896c06960 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,12 +11,14 @@ ARG USE_CUDA_VER=cu121
 # IMPORTANT: If you change the embedding model (sentence-transformers/all-MiniLM-L6-v2) and vice versa, you aren't able to use RAG Chat with your previous documents loaded in the WebUI! You need to re-embed them.
 ARG USE_EMBEDDING_MODEL=sentence-transformers/all-MiniLM-L6-v2
 ARG USE_RERANKING_MODEL=""
+ARG BUILD_HASH=dev-build
 # Override at your own risk - non-root configurations are untested
 ARG UID=0
 ARG GID=0
 
 ######## WebUI frontend ########
 FROM --platform=$BUILDPLATFORM node:21-alpine3.19 as build
+ARG BUILD_HASH
 
 WORKDIR /app
 
@@ -24,6 +26,7 @@ COPY package.json package-lock.json ./
 RUN npm ci
 
 COPY . .
+ENV WEBUI_VERSION=${BUILD_HASH}
 RUN npm run build
 
 ######## WebUI backend ########
@@ -35,6 +38,7 @@ ARG USE_OLLAMA
 ARG USE_CUDA_VER
 ARG USE_EMBEDDING_MODEL
 ARG USE_RERANKING_MODEL
+ARG BUILD_HASH
 ARG UID
 ARG GID
 
@@ -155,4 +159,6 @@ HEALTHCHECK CMD curl --silent --fail http://localhost:8080/health | jq -e '.stat
 
 USER $UID:$GID
 
+ENV WEBUI_VERSION=${BUILD_HASH}
+
 CMD [ "bash", "start.sh"]
diff --git a/backend/main.py b/backend/main.py
index df79a3106..d244e18df 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -61,6 +61,7 @@ from config import (
     WEBHOOK_URL,
     ENABLE_ADMIN_EXPORT,
     AppConfig,
+    WEBUI_VERSION,
 )
 from constants import ERROR_MESSAGES
 
@@ -90,7 +91,8 @@ print(
       |_|                                               
 
       
-v{VERSION} - building the best open-source AI user interface.      
+v{VERSION} - building the best open-source AI user interface.
+{f"Commit: {WEBUI_VERSION}" if WEBUI_VERSION != "v1.0.0-alpha.100" else ""}
 https://github.com/open-webui/open-webui
 """
 )
diff --git a/hatch_build.py b/hatch_build.py
index 2fa9e4805..8728dc5c0 100644
--- a/hatch_build.py
+++ b/hatch_build.py
@@ -1,4 +1,5 @@
 # noqa: INP001
+import os
 import shutil
 import subprocess
 from sys import stderr
@@ -18,4 +19,5 @@ class CustomBuildHook(BuildHookInterface):
         stderr.write("### npm install\n")
         subprocess.run([npm, "install"], check=True)  # noqa: S603
         stderr.write("\n### npm run build\n")
+        os.environ["WEBUI_VERSION"] = version
         subprocess.run([npm, "run", "build"], check=True)  # noqa: S603
diff --git a/src/lib/components/chat/Settings/About.svelte b/src/lib/components/chat/Settings/About.svelte
index dad1f0ae6..51ad94a3c 100644
--- a/src/lib/components/chat/Settings/About.svelte
+++ b/src/lib/components/chat/Settings/About.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { getVersionUpdates } from '$lib/apis';
 	import { getOllamaVersion } from '$lib/apis/ollama';
-	import { WEBUI_VERSION } from '$lib/constants';
+	import { WEBUI_HASH, WEBUI_VERSION } from '$lib/constants';
 	import { WEBUI_NAME, config, showChangelog } from '$lib/stores';
 	import { compareVersion } from '$lib/utils';
 	import { onMount, getContext } from 'svelte';
@@ -54,7 +54,7 @@
 			<div class="flex w-full justify-between items-center">
 				<div class="flex flex-col text-xs text-gray-700 dark:text-gray-200">
 					<div class="flex gap-1">
-						<Tooltip content={WEBUI_VERSION === '0.1.117' ? "🪖 We're just getting started." : ''}>
+						<Tooltip content={WEBUI_HASH}>
 							v{WEBUI_VERSION}
 						</Tooltip>
 
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index a305bea7c..5dd870dda 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -14,6 +14,7 @@ export const IMAGES_API_BASE_URL = `${WEBUI_BASE_URL}/images/api/v1`;
 export const RAG_API_BASE_URL = `${WEBUI_BASE_URL}/rag/api/v1`;
 
 export const WEBUI_VERSION = APP_VERSION;
+export const WEBUI_HASH = APP_HASH;
 export const REQUIRED_OLLAMA_VERSION = '0.1.16';
 
 export const SUPPORTED_FILE_TYPE = [
diff --git a/vite.config.ts b/vite.config.ts
index d62954a4c..137f86ed6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -18,7 +18,8 @@ import { defineConfig } from 'vite';
 export default defineConfig({
 	plugins: [sveltekit()],
 	define: {
-		APP_VERSION: JSON.stringify(process.env.npm_package_version)
+		APP_VERSION: JSON.stringify(process.env.npm_package_version),
+		APP_HASH: JSON.stringify(process.env.WEBUI_VERSION || 'dev-build')
 	},
 	worker: {
 		format: 'es'

From 4fdb26fdc4e9360f28cdba9d44b4b8deaab79e1c Mon Sep 17 00:00:00 2001
From: Jun Siang Cheah <git@jscheah.me>
Date: Sun, 26 May 2024 08:49:30 +0100
Subject: [PATCH 2/2] refac: rename build hash vars

---
 Dockerfile                                    | 4 ++--
 backend/apps/web/main.py                      | 2 +-
 backend/config.py                             | 4 ++--
 backend/main.py                               | 4 ++--
 hatch_build.py                                | 2 +-
 src/lib/components/chat/Settings/About.svelte | 4 ++--
 src/lib/constants.ts                          | 2 +-
 vite.config.ts                                | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 896c06960..e3b2e64d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ COPY package.json package-lock.json ./
 RUN npm ci
 
 COPY . .
-ENV WEBUI_VERSION=${BUILD_HASH}
+ENV APP_BUILD_HASH=${BUILD_HASH}
 RUN npm run build
 
 ######## WebUI backend ########
@@ -159,6 +159,6 @@ HEALTHCHECK CMD curl --silent --fail http://localhost:8080/health | jq -e '.stat
 
 USER $UID:$GID
 
-ENV WEBUI_VERSION=${BUILD_HASH}
+ENV WEBUI_BUILD_VERSION=${BUILD_HASH}
 
 CMD [ "bash", "start.sh"]
diff --git a/backend/apps/web/main.py b/backend/apps/web/main.py
index 2b6966381..24f6b8b51 100644
--- a/backend/apps/web/main.py
+++ b/backend/apps/web/main.py
@@ -13,7 +13,7 @@ from apps.web.routers import (
     utils,
 )
 from config import (
-    WEBUI_VERSION,
+    WEBUI_BUILD_HASH,
     WEBUI_AUTH,
     DEFAULT_MODELS,
     DEFAULT_PROMPT_SUGGESTIONS,
diff --git a/backend/config.py b/backend/config.py
index 0b18eab43..8f259e1dc 100644
--- a/backend/config.py
+++ b/backend/config.py
@@ -162,10 +162,10 @@ CHANGELOG = changelog_json
 
 
 ####################################
-# WEBUI_VERSION
+# WEBUI_BUILD_HASH
 ####################################
 
-WEBUI_VERSION = os.environ.get("WEBUI_VERSION", "v1.0.0-alpha.100")
+WEBUI_BUILD_HASH = os.environ.get("WEBUI_BUILD_HASH", "dev-build")
 
 ####################################
 # DATA/FRONTEND BUILD DIR
diff --git a/backend/main.py b/backend/main.py
index d244e18df..bbc0110ae 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -61,7 +61,7 @@ from config import (
     WEBHOOK_URL,
     ENABLE_ADMIN_EXPORT,
     AppConfig,
-    WEBUI_VERSION,
+    WEBUI_BUILD_HASH,
 )
 from constants import ERROR_MESSAGES
 
@@ -92,7 +92,7 @@ print(
 
       
 v{VERSION} - building the best open-source AI user interface.
-{f"Commit: {WEBUI_VERSION}" if WEBUI_VERSION != "v1.0.0-alpha.100" else ""}
+{f"Commit: {WEBUI_BUILD_HASH}" if WEBUI_BUILD_HASH != "dev-build" else ""}
 https://github.com/open-webui/open-webui
 """
 )
diff --git a/hatch_build.py b/hatch_build.py
index 8728dc5c0..8ddaf0749 100644
--- a/hatch_build.py
+++ b/hatch_build.py
@@ -19,5 +19,5 @@ class CustomBuildHook(BuildHookInterface):
         stderr.write("### npm install\n")
         subprocess.run([npm, "install"], check=True)  # noqa: S603
         stderr.write("\n### npm run build\n")
-        os.environ["WEBUI_VERSION"] = version
+        os.environ["APP_BUILD_HASH"] = version
         subprocess.run([npm, "run", "build"], check=True)  # noqa: S603
diff --git a/src/lib/components/chat/Settings/About.svelte b/src/lib/components/chat/Settings/About.svelte
index 51ad94a3c..e49aaea68 100644
--- a/src/lib/components/chat/Settings/About.svelte
+++ b/src/lib/components/chat/Settings/About.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { getVersionUpdates } from '$lib/apis';
 	import { getOllamaVersion } from '$lib/apis/ollama';
-	import { WEBUI_HASH, WEBUI_VERSION } from '$lib/constants';
+	import { WEBUI_BUILD_HASH, WEBUI_VERSION } from '$lib/constants';
 	import { WEBUI_NAME, config, showChangelog } from '$lib/stores';
 	import { compareVersion } from '$lib/utils';
 	import { onMount, getContext } from 'svelte';
@@ -54,7 +54,7 @@
 			<div class="flex w-full justify-between items-center">
 				<div class="flex flex-col text-xs text-gray-700 dark:text-gray-200">
 					<div class="flex gap-1">
-						<Tooltip content={WEBUI_HASH}>
+						<Tooltip content={WEBUI_BUILD_HASH}>
 							v{WEBUI_VERSION}
 						</Tooltip>
 
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 5dd870dda..16ece9bb0 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -14,7 +14,7 @@ export const IMAGES_API_BASE_URL = `${WEBUI_BASE_URL}/images/api/v1`;
 export const RAG_API_BASE_URL = `${WEBUI_BASE_URL}/rag/api/v1`;
 
 export const WEBUI_VERSION = APP_VERSION;
-export const WEBUI_HASH = APP_HASH;
+export const WEBUI_BUILD_HASH = APP_BUILD_HASH;
 export const REQUIRED_OLLAMA_VERSION = '0.1.16';
 
 export const SUPPORTED_FILE_TYPE = [
diff --git a/vite.config.ts b/vite.config.ts
index 137f86ed6..dcf656019 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -19,7 +19,7 @@ export default defineConfig({
 	plugins: [sveltekit()],
 	define: {
 		APP_VERSION: JSON.stringify(process.env.npm_package_version),
-		APP_HASH: JSON.stringify(process.env.WEBUI_VERSION || 'dev-build')
+		APP_BUILD_HASH: JSON.stringify(process.env.APP_BUILD_HASH || 'dev-build')
 	},
 	worker: {
 		format: 'es'