UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-11-21 15:47:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refac: rename build hash vars

Browse Source
This commit is contained in:
Jun Siang Cheah 2024-05-26 08:49:30 +01:00
parent a579f5f8cf
commit 4fdb26fdc4
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -26,7 +26,7 @@ COPY package.json package-lock.json ./
RUN npm ci RUN npm ci
COPY . . COPY . .
ENV WEBUI_VERSION=${BUILD_HASH} ENV APP_BUILD_HASH=${BUILD_HASH}
RUN npm run build RUN npm run build
######## WebUI backend ######## ######## WebUI backend ########
@ -159,6 +159,6 @@ HEALTHCHECK CMD curl --silent --fail http://localhost:8080/health | jq -e '.stat
USER $UID:$GID USER $UID:$GID
ENV WEBUI_VERSION=${BUILD_HASH} ENV WEBUI_BUILD_VERSION=${BUILD_HASH}
CMD [ "bash", "start.sh"] CMD [ "bash", "start.sh"]

2
backend/apps/web/main.py
View File

@ -13,7 +13,7 @@ from apps.web.routers import (
utils, utils,
) )
from config import ( from config import (
WEBUI_VERSION, WEBUI_BUILD_HASH,
WEBUI_AUTH, WEBUI_AUTH,
DEFAULT_MODELS, DEFAULT_MODELS,
DEFAULT_PROMPT_SUGGESTIONS, DEFAULT_PROMPT_SUGGESTIONS,

4
backend/config.py
View File

@ -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 # DATA/FRONTEND BUILD DIR

4
backend/main.py
View File

@ -61,7 +61,7 @@ from config import (
WEBHOOK_URL, WEBHOOK_URL,
ENABLE_ADMIN_EXPORT, ENABLE_ADMIN_EXPORT,
AppConfig, AppConfig,
WEBUI_VERSION, WEBUI_BUILD_HASH,
) )
from constants import ERROR_MESSAGES from constants import ERROR_MESSAGES
@ -92,7 +92,7 @@ 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 ""} {f"Commit: {WEBUI_BUILD_HASH}" if WEBUI_BUILD_HASH != "dev-build" else ""}
https://github.com/open-webui/open-webui https://github.com/open-webui/open-webui
""" """
) )

2
hatch_build.py
View File

@ -19,5 +19,5 @@ class CustomBuildHook(BuildHookInterface):
stderr.write("### npm install\n") stderr.write("### npm install\n")
subprocess.run([npm, "install"], check=True) # noqa: S603 subprocess.run([npm, "install"], check=True) # noqa: S603
stderr.write("\n### npm run build\n") 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 subprocess.run([npm, "run", "build"], check=True) # noqa: S603

4
src/lib/components/chat/Settings/About.svelte
View File

@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import { getVersionUpdates } from '$lib/apis'; import { getVersionUpdates } from '$lib/apis';
import { getOllamaVersion } from '$lib/apis/ollama'; 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 { WEBUI_NAME, config, showChangelog } from '$lib/stores';
import { compareVersion } from '$lib/utils'; import { compareVersion } from '$lib/utils';
import { onMount, getContext } from 'svelte'; import { onMount, getContext } from 'svelte';
@ -54,7 +54,7 @@
<div class="flex w-full justify-between items-center"> <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 flex-col text-xs text-gray-700 dark:text-gray-200">
<div class="flex gap-1"> <div class="flex gap-1">
<Tooltip content={WEBUI_HASH}> <Tooltip content={WEBUI_BUILD_HASH}>
v{WEBUI_VERSION} v{WEBUI_VERSION}
</Tooltip> </Tooltip>

2
src/lib/constants.ts
View File

@ -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 RAG_API_BASE_URL = `${WEBUI_BASE_URL}/rag/api/v1`;
export const WEBUI_VERSION = APP_VERSION; 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 REQUIRED_OLLAMA_VERSION = '0.1.16';
export const SUPPORTED_FILE_TYPE = [ export const SUPPORTED_FILE_TYPE = [

2
vite.config.ts
View File

@ -19,7 +19,7 @@ export default defineConfig({
plugins: [sveltekit()], plugins: [sveltekit()],
define: { 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') APP_BUILD_HASH: JSON.stringify(process.env.APP_BUILD_HASH || 'dev-build')
}, },
worker: { worker: {
format: 'es' format: 'es'