Skip to content

Commit

Permalink
feat: anythingllm integration, v0.2.4 bump
Browse files Browse the repository at this point in the history
  • Loading branch information
av committed Oct 2, 2024
1 parent 1f2fa66 commit eb60c73
Show file tree
Hide file tree
Showing 15 changed files with 59 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,7 @@ jupyter/workspace/*
.history

# Boost
boost/src/**/__pycache__/
boost/src/**/__pycache__/

# AnythingLLM
anythingllm/storage/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Harbor is a containerized LLM toolkit that allows you to run LLMs and additional

##### UIs

[Open WebUI](https://github.com/av/harbor/wiki/2.1.1-Frontend:-Open-WebUI) ⦁︎ [ComfyUI](https://github.com/av/harbor/wiki/2.1.2-Frontend:-ComfyUI) ⦁︎ [LibreChat](https://github.com/av/harbor/wiki/2.1.3-Frontend:-LibreChat) ⦁︎ [HuggingFace ChatUI](https://github.com/av/harbor/wiki/2.1.4-Frontend:-ChatUI) ⦁︎ [Lobe Chat](https://github.com/av/harbor/wiki/2.1.5-Frontend:-Lobe-Chat) ⦁︎ [Hollama](https://github.com/av/harbor/wiki/2.1.6-Frontend:-hollama) ⦁︎ [parllama](https://github.com/av/harbor/wiki/2.1.7-Frontend:-parllama) ⦁︎ [BionicGPT](https://github.com/av/harbor/wiki/2.1.8-Frontend:-BionicGPT)
[Open WebUI](https://github.com/av/harbor/wiki/2.1.1-Frontend:-Open-WebUI) ⦁︎ [ComfyUI](https://github.com/av/harbor/wiki/2.1.2-Frontend:-ComfyUI) ⦁︎ [LibreChat](https://github.com/av/harbor/wiki/2.1.3-Frontend:-LibreChat) ⦁︎ [HuggingFace ChatUI](https://github.com/av/harbor/wiki/2.1.4-Frontend:-ChatUI) ⦁︎ [Lobe Chat](https://github.com/av/harbor/wiki/2.1.5-Frontend:-Lobe-Chat) ⦁︎ [Hollama](https://github.com/av/harbor/wiki/2.1.6-Frontend:-hollama) ⦁︎ [parllama](https://github.com/av/harbor/wiki/2.1.7-Frontend:-parllama) ⦁︎ [BionicGPT](https://github.com/av/harbor/wiki/2.1.8-Frontend:-BionicGPT) ⦁︎ [AnythingLLM](https://github.com/av/harbor/wiki/2.1.9-Frontend:-AnythingLLM)

##### Backends

Expand Down
2 changes: 2 additions & 0 deletions anythingllm/override.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# This file can be used for additional environment
# variables for the anythingllm service
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@av/harbor-app",
"private": true,
"version": "0.2.3",
"version": "0.2.4",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
2 changes: 1 addition & 1 deletion app/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "harbor-app"
version = "0.2.3"
version = "0.2.4"
description = "A companion app for Harbor LLM toolkit"
authors = ["av"]
edition = "2021"
Expand Down
3 changes: 3 additions & 0 deletions app/src/serviceMetadata.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,8 @@ export const serviceMetadata: Record<string, Partial<HarborService>> = {
},
litlytics: {
tags: [HST.satellite, HST.partial],
},
anythingllm: {
tags: [HST.frontend, HST.partial]
}
};
19 changes: 19 additions & 0 deletions compose.anythingllm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
services:
anythingllm:
container_name: ${HARBOR_CONTAINER_PREFIX}.anythingllm
env_file:
- ./.env
- ./anythingllm/override.env
image: ${HARBOR_ANYTHINGLLM_IMAGE}:${HARBOR_ANYTHINGLLM_VERSION}
ports:
- ${HARBOR_ANYTHINGLLM_HOST_PORT}:3001
volumes:
- ./anythingllm/storage:/app/server/storage
cap_add:
- SYS_ADMIN
environment:
- STORAGE_DIR=/app/server/storage
- VECTOR_DB=lancedb
- PASSWORDMINCHAT=8
networks:
- harbor-network
6 changes: 6 additions & 0 deletions compose.x.anythingllm.llamacpp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
services:
anythingllm:
environment:
- LLM_PROVIDER=generic-openai
- GENERIC_OPEN_AI_BASE_PATH=http://llamacpp:8080/v1
- GENERIC_OPEN_AI_API_KEY=sk-llamacpp
7 changes: 7 additions & 0 deletions compose.x.anythingllm.ollama.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
services:
anythingllm:
environment:
- LLM_PROVIDER=ollama
- OLLAMA_BASE_PATH=${HARBOR_OLLAMA_INTERNAL_URL}
- EMBEDDING_ENGINE=ollama
- EMBEDDING_BASE_PATH=${HARBOR_OLLAMA_INTERNAL_URL}
4 changes: 4 additions & 0 deletions compose.x.anythingllm.searxng.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
services:
anythingllm:
environment:
- AGENT_SEARXNG_API_URL=http://searxng:8080
3 changes: 2 additions & 1 deletion harbor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1637,6 +1637,7 @@ fix_fs_acl() {
docker_fsacl ./bench
docker_fsacl ./jupyter
docker_fsacl ./ktransformers
docker_fsacl ./anythingllm

docker_fsacl $(eval echo "$(env_manager get hf.cache)")
docker_fsacl $(eval echo "$(env_manager get vllm.cache)")
Expand Down Expand Up @@ -3340,7 +3341,7 @@ run_stt_command() {
# ========================================================================

# Globals
version="0.2.3"
version="0.2.4"
harbor_repo_url="https://github.com/av/harbor.git"
harbor_release_url="https://api.github.com/repos/av/harbor/releases/latest"
delimiter="|"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@av/harbor",
"version": "0.2.3",
"version": "0.2.4",
"bin": {
"harbor": "./bin/harbor"
}
Expand Down
6 changes: 6 additions & 0 deletions profiles/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,12 @@ HARBOR_STT_MODEL="Systran/faster-distil-whisper-large-v3"
HARBOR_LITLYTICS_HOST_PORT=34161
HARBOR_LITLYTICS_VERSION="latest"

# AnythingLLM
HARBOR_ANYTHINGLLM_HOST_PORT=34171
HARBOR_ANYTHINGLLM_IMAGE="mintplexlabs/anythingllm"
HARBOR_ANYTHINGLLM_VERSION="latest"
HARBOR_ANYTHINGLLM_JWT_SECRET="sk-anythingllm-jwt"

# ============================================
# Service Configuration.
# You can specify any of the service's own environment variables here.
Expand Down
2 changes: 1 addition & 1 deletion searxng/settings.yml.new
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ server:
# If your instance owns a /etc/searxng/settings.yml file, then set the following
# values there.

secret_key: "3af0fffe5074568b6e26828123c9595f150fa35bffaad0ac1d975475d4f508d8" # Is overwritten by ${SEARXNG_SECRET}
secret_key: "dee52de1cc979941035b8528ac6a3d8a26b0f5b563bfebe2a6c17fb5e35d0aff" # Is overwritten by ${SEARXNG_SECRET}
# Proxy image results through SearXNG. Is overwritten by ${SEARXNG_IMAGE_PROXY}
image_proxy: false
# 1.0 and 1.1 are supported
Expand Down

0 comments on commit eb60c73

Please sign in to comment.