mirror of
https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git
synced 2025-06-04 11:14:10 +08:00
enhancement:support Qdrant gRPC mode (#3929)
This commit is contained in:
parent
9d1cb1bc92
commit
0940f01634
@ -75,6 +75,8 @@ WEAVIATE_BATCH_SIZE=100
|
|||||||
QDRANT_URL=http://localhost:6333
|
QDRANT_URL=http://localhost:6333
|
||||||
QDRANT_API_KEY=difyai123456
|
QDRANT_API_KEY=difyai123456
|
||||||
QDRANT_CLIENT_TIMEOUT=20
|
QDRANT_CLIENT_TIMEOUT=20
|
||||||
|
QDRANT_GRPC_ENABLED=false
|
||||||
|
QDRANT_GRPC_PORT=6334
|
||||||
|
|
||||||
# Milvus configuration
|
# Milvus configuration
|
||||||
MILVUS_HOST=127.0.0.1
|
MILVUS_HOST=127.0.0.1
|
||||||
|
@ -37,6 +37,7 @@ DEFAULTS = {
|
|||||||
'WEAVIATE_GRPC_ENABLED': 'True',
|
'WEAVIATE_GRPC_ENABLED': 'True',
|
||||||
'WEAVIATE_BATCH_SIZE': 100,
|
'WEAVIATE_BATCH_SIZE': 100,
|
||||||
'QDRANT_CLIENT_TIMEOUT': 20,
|
'QDRANT_CLIENT_TIMEOUT': 20,
|
||||||
|
'QDRANT_GRPC_ENABLED': 'False',
|
||||||
'CELERY_BACKEND': 'database',
|
'CELERY_BACKEND': 'database',
|
||||||
'LOG_LEVEL': 'INFO',
|
'LOG_LEVEL': 'INFO',
|
||||||
'LOG_FILE': '',
|
'LOG_FILE': '',
|
||||||
@ -226,6 +227,8 @@ class Config:
|
|||||||
self.QDRANT_URL = get_env('QDRANT_URL')
|
self.QDRANT_URL = get_env('QDRANT_URL')
|
||||||
self.QDRANT_API_KEY = get_env('QDRANT_API_KEY')
|
self.QDRANT_API_KEY = get_env('QDRANT_API_KEY')
|
||||||
self.QDRANT_CLIENT_TIMEOUT = get_env('QDRANT_CLIENT_TIMEOUT')
|
self.QDRANT_CLIENT_TIMEOUT = get_env('QDRANT_CLIENT_TIMEOUT')
|
||||||
|
self.QDRANT_GRPC_ENABLED = get_env('QDRANT_GRPC_ENABLED')
|
||||||
|
self.QDRANT_GRPC_PORT = get_env('QDRANT_GRPC_PORT')
|
||||||
|
|
||||||
# milvus / zilliz setting
|
# milvus / zilliz setting
|
||||||
self.MILVUS_HOST = get_env('MILVUS_HOST')
|
self.MILVUS_HOST = get_env('MILVUS_HOST')
|
||||||
|
@ -36,6 +36,8 @@ class QdrantConfig(BaseModel):
|
|||||||
api_key: Optional[str]
|
api_key: Optional[str]
|
||||||
timeout: float = 20
|
timeout: float = 20
|
||||||
root_path: Optional[str]
|
root_path: Optional[str]
|
||||||
|
grpc_port: int = 6334
|
||||||
|
prefer_grpc: bool = False
|
||||||
|
|
||||||
def to_qdrant_params(self):
|
def to_qdrant_params(self):
|
||||||
if self.endpoint and self.endpoint.startswith('path:'):
|
if self.endpoint and self.endpoint.startswith('path:'):
|
||||||
@ -51,7 +53,9 @@ class QdrantConfig(BaseModel):
|
|||||||
'url': self.endpoint,
|
'url': self.endpoint,
|
||||||
'api_key': self.api_key,
|
'api_key': self.api_key,
|
||||||
'timeout': self.timeout,
|
'timeout': self.timeout,
|
||||||
'verify': self.endpoint.startswith('https')
|
'verify': self.endpoint.startswith('https'),
|
||||||
|
'grpc_port': self.grpc_port,
|
||||||
|
'prefer_grpc': self.prefer_grpc
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -86,7 +86,9 @@ class Vector:
|
|||||||
endpoint=config.get('QDRANT_URL'),
|
endpoint=config.get('QDRANT_URL'),
|
||||||
api_key=config.get('QDRANT_API_KEY'),
|
api_key=config.get('QDRANT_API_KEY'),
|
||||||
root_path=current_app.root_path,
|
root_path=current_app.root_path,
|
||||||
timeout=config.get('QDRANT_CLIENT_TIMEOUT')
|
timeout=config.get('QDRANT_CLIENT_TIMEOUT'),
|
||||||
|
grpc_port=config.get('QDRANT_GRPC_PORT'),
|
||||||
|
prefer_grpc=config.get('QDRANT_GRPC_ENABLED')
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
elif vector_type == "milvus":
|
elif vector_type == "milvus":
|
||||||
|
@ -80,3 +80,4 @@ services:
|
|||||||
# QDRANT_API_KEY: 'difyai123456'
|
# QDRANT_API_KEY: 'difyai123456'
|
||||||
# ports:
|
# ports:
|
||||||
# - "6333:6333"
|
# - "6333:6333"
|
||||||
|
# - "6334:6334"
|
||||||
|
@ -10,3 +10,4 @@ services:
|
|||||||
QDRANT_API_KEY: 'difyai123456'
|
QDRANT_API_KEY: 'difyai123456'
|
||||||
ports:
|
ports:
|
||||||
- "6333:6333"
|
- "6333:6333"
|
||||||
|
- "6334:6334"
|
||||||
|
@ -99,8 +99,12 @@ services:
|
|||||||
QDRANT_URL: http://qdrant:6333
|
QDRANT_URL: http://qdrant:6333
|
||||||
# The Qdrant API key.
|
# The Qdrant API key.
|
||||||
QDRANT_API_KEY: difyai123456
|
QDRANT_API_KEY: difyai123456
|
||||||
# The Qdrant clinet timeout setting.
|
# The Qdrant client timeout setting.
|
||||||
QDRANT_CLIENT_TIMEOUT: 20
|
QDRANT_CLIENT_TIMEOUT: 20
|
||||||
|
# The Qdrant client enable gRPC mode.
|
||||||
|
QDRANT_GRPC_ENABLED: 'false'
|
||||||
|
# The Qdrant server gRPC mode PORT.
|
||||||
|
QDRANT_GRPC_PORT: 6334
|
||||||
# Milvus configuration Only available when VECTOR_STORE is `milvus`.
|
# Milvus configuration Only available when VECTOR_STORE is `milvus`.
|
||||||
# The milvus host.
|
# The milvus host.
|
||||||
MILVUS_HOST: 127.0.0.1
|
MILVUS_HOST: 127.0.0.1
|
||||||
@ -214,6 +218,10 @@ services:
|
|||||||
QDRANT_API_KEY: difyai123456
|
QDRANT_API_KEY: difyai123456
|
||||||
# The Qdrant clinet timeout setting.
|
# The Qdrant clinet timeout setting.
|
||||||
QDRANT_CLIENT_TIMEOUT: 20
|
QDRANT_CLIENT_TIMEOUT: 20
|
||||||
|
# The Qdrant client enable gRPC mode.
|
||||||
|
QDRANT_GRPC_ENABLED: 'false'
|
||||||
|
# The Qdrant server gRPC mode PORT.
|
||||||
|
QDRANT_GRPC_PORT: 6334
|
||||||
# Milvus configuration Only available when VECTOR_STORE is `milvus`.
|
# Milvus configuration Only available when VECTOR_STORE is `milvus`.
|
||||||
# The milvus host.
|
# The milvus host.
|
||||||
MILVUS_HOST: 127.0.0.1
|
MILVUS_HOST: 127.0.0.1
|
||||||
@ -354,6 +362,7 @@ services:
|
|||||||
# # uncomment to expose qdrant port to host
|
# # uncomment to expose qdrant port to host
|
||||||
# # ports:
|
# # ports:
|
||||||
# # - "6333:6333"
|
# # - "6333:6333"
|
||||||
|
# # - "6334:6334"
|
||||||
|
|
||||||
# The nginx reverse proxy.
|
# The nginx reverse proxy.
|
||||||
# used for reverse proxying the API service and Web service.
|
# used for reverse proxying the API service and Web service.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user