Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
00f32e26
Unverified
Commit
00f32e26
authored
May 26, 2024
by
Timothy Jaeryang Baek
Committed by
GitHub
May 26, 2024
Browse files
Merge pull request #2562 from cheahjs/feat/include-git-hash-everywhere
feat: add git hash of build everywhere
parents
7b81271b
aba63088
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
9 deletions
+27
-9
.github/workflows/docker-build.yaml
.github/workflows/docker-build.yaml
+8
-2
Dockerfile
Dockerfile
+6
-0
backend/apps/webui/main.py
backend/apps/webui/main.py
+1
-1
backend/config.py
backend/config.py
+2
-2
backend/main.py
backend/main.py
+3
-1
hatch_build.py
hatch_build.py
+2
-0
src/lib/components/chat/Settings/About.svelte
src/lib/components/chat/Settings/About.svelte
+2
-2
src/lib/constants.ts
src/lib/constants.ts
+1
-0
vite.config.ts
vite.config.ts
+2
-1
No files found.
.github/workflows/docker-build.yaml
View file @
00f32e26
...
...
@@ -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
:
|
...
...
Dockerfile
View file @
00f32e26
...
...
@@ -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
APP_BUILD_HASH=${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
...
...
@@ -150,4 +154,6 @@ HEALTHCHECK CMD curl --silent --fail http://localhost:8080/health | jq -e '.stat
USER
$UID:$GID
ENV
WEBUI_BUILD_VERSION=${BUILD_HASH}
CMD
[ "bash", "start.sh"]
backend/apps/webui/main.py
View file @
00f32e26
...
...
@@ -13,7 +13,7 @@ from apps.webui.routers import (
utils
,
)
from
config
import
(
WEBUI_
VERSION
,
WEBUI_
BUILD_HASH
,
WEBUI_AUTH
,
DEFAULT_MODELS
,
DEFAULT_PROMPT_SUGGESTIONS
,
...
...
backend/config.py
View file @
00f32e26
...
...
@@ -166,10 +166,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
...
...
backend/main.py
View file @
00f32e26
...
...
@@ -55,6 +55,7 @@ from config import (
WEBHOOK_URL
,
ENABLE_ADMIN_EXPORT
,
AppConfig
,
WEBUI_BUILD_HASH
,
)
from
constants
import
ERROR_MESSAGES
...
...
@@ -85,6 +86,7 @@ print(
v
{
VERSION
}
- building the best open-source AI user interface.
{
f
"Commit:
{
WEBUI_BUILD_HASH
}
" if WEBUI_BUILD_HASH != "
dev
-
build
" else ""
}
https://github.com/open-webui/open-webui
"""
)
...
...
hatch_build.py
View file @
00f32e26
# 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
[
"APP_BUILD_HASH"
]
=
version
subprocess
.
run
([
npm
,
"run"
,
"build"
],
check
=
True
)
# noqa: S603
src/lib/components/chat/Settings/About.svelte
View file @
00f32e26
<script lang="ts">
import { getVersionUpdates } from '$lib/apis';
import { getOllamaVersion } from '$lib/apis/ollama';
import { 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_
VERSION === '0.1.117' ? "🪖 We're just getting started." : ''
}>
<Tooltip content={WEBUI_
BUILD_HASH
}>
v{WEBUI_VERSION}
</Tooltip>
...
...
src/lib/constants.ts
View file @
00f32e26
...
...
@@ -13,6 +13,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_BUILD_HASH
=
APP_BUILD_HASH
;
export
const
REQUIRED_OLLAMA_VERSION
=
'
0.1.16
'
;
export
const
SUPPORTED_FILE_TYPE
=
[
...
...
vite.config.ts
View file @
00f32e26
...
...
@@ -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_BUILD_HASH
:
JSON
.
stringify
(
process
.
env
.
APP_BUILD_HASH
||
'
dev-build
'
)
},
build
:
{
sourcemap
:
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment