Merge branch 'main' into fix-backends

This commit is contained in:
zrguo
2025-02-14 09:39:11 +08:00
committed by GitHub
6 changed files with 11 additions and 8 deletions

1
.dockerignore Normal file
View File

@@ -0,0 +1 @@
.env

View File

@@ -33,7 +33,6 @@ WORKDIR /app
COPY --from=builder /root/.local /root/.local COPY --from=builder /root/.local /root/.local
COPY ./lightrag ./lightrag COPY ./lightrag ./lightrag
COPY setup.py . COPY setup.py .
COPY .env .
RUN pip install . RUN pip install .
# Make sure scripts in .local are usable # Make sure scripts in .local are usable

View File

@@ -8,6 +8,7 @@ services:
volumes: volumes:
- ./data/rag_storage:/app/data/rag_storage - ./data/rag_storage:/app/data/rag_storage
- ./data/inputs:/app/data/inputs - ./data/inputs:/app/data/inputs
- .env:/app/.env
env_file: env_file:
- .env - .env
environment: environment:

View File

@@ -247,11 +247,11 @@ def display_splash_screen(args: argparse.Namespace) -> None:
ASCIIColors.yellow(f"{protocol}://<your-ip-address>:{args.port}") ASCIIColors.yellow(f"{protocol}://<your-ip-address>:{args.port}")
ASCIIColors.white(" ├─ API Documentation (local): ", end="") ASCIIColors.white(" ├─ API Documentation (local): ", end="")
ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/docs") ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/docs")
ASCIIColors.white(" ─ Alternative Documentation (local): ", end="") ASCIIColors.white(" ─ Alternative Documentation (local): ", end="")
ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/redoc") ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/redoc")
ASCIIColors.white(" ├─ WebUI (local): ", end="") ASCIIColors.white(" ├─ WebUI (local): ", end="")
ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/webui") ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/webui")
ASCIIColors.white(" ─ Graph Viewer (local): ", end="") ASCIIColors.white(" ─ Graph Viewer (local): ", end="")
ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/graph-viewer") ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/graph-viewer")
ASCIIColors.yellow("\n📝 Note:") ASCIIColors.yellow("\n📝 Note:")

View File

@@ -55,10 +55,12 @@ class Neo4JStorage(BaseGraphStorage):
PASSWORD = os.environ.get( PASSWORD = os.environ.get(
"NEO4J_PASSWORD", config.get("neo4j", "password", fallback=None) "NEO4J_PASSWORD", config.get("neo4j", "password", fallback=None)
) )
MAX_CONNECTION_POOL_SIZE = os.environ.get( MAX_CONNECTION_POOL_SIZE = int(
os.environ.get(
"NEO4J_MAX_CONNECTION_POOL_SIZE", "NEO4J_MAX_CONNECTION_POOL_SIZE",
config.get("neo4j", "connection_pool_size", fallback=800), config.get("neo4j", "connection_pool_size", fallback=800),
) )
)
DATABASE = os.environ.get( DATABASE = os.environ.get(
"NEO4J_DATABASE", re.sub(r"[^a-zA-Z0-9-]", "-", namespace) "NEO4J_DATABASE", re.sub(r"[^a-zA-Z0-9-]", "-", namespace)
) )

View File

@@ -69,7 +69,7 @@ STORAGE_IMPLEMENTATIONS = {
"VECTOR_STORAGE": { "VECTOR_STORAGE": {
"implementations": [ "implementations": [
"NanoVectorDBStorage", "NanoVectorDBStorage",
"MilvusVectorDBStorge", "MilvusVectorDBStorage",
"ChromaVectorDBStorage", "ChromaVectorDBStorage",
"TiDBVectorDBStorage", "TiDBVectorDBStorage",
"PGVectorStorage", "PGVectorStorage",
@@ -128,7 +128,7 @@ STORAGE_ENV_REQUIREMENTS = {
], ],
# Vector Storage Implementations # Vector Storage Implementations
"NanoVectorDBStorage": [], "NanoVectorDBStorage": [],
"MilvusVectorDBStorge": [], "MilvusVectorDBStorage": [],
"ChromaVectorDBStorage": [], "ChromaVectorDBStorage": [],
"TiDBVectorDBStorage": ["TIDB_USER", "TIDB_PASSWORD", "TIDB_DATABASE"], "TiDBVectorDBStorage": ["TIDB_USER", "TIDB_PASSWORD", "TIDB_DATABASE"],
"PGVectorStorage": ["POSTGRES_USER", "POSTGRES_PASSWORD", "POSTGRES_DATABASE"], "PGVectorStorage": ["POSTGRES_USER", "POSTGRES_PASSWORD", "POSTGRES_DATABASE"],