Browse Source

enhancement:support Qdrant gRPC mode (#3929)

tags/0.6.6
呆萌闷油瓶 1 year ago
parent
commit
0940f01634
No account linked to committer's email address

+ 3
- 1
api/.env.example View File

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
API_TOOL_DEFAULT_READ_TIMEOUT=60 API_TOOL_DEFAULT_READ_TIMEOUT=60


# Log file path # Log file path
LOG_FILE=
LOG_FILE=

+ 3
- 0
api/config.py View File

'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': '',
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')

+ 5
- 1
api/core/rag/datasource/vdb/qdrant/qdrant_vector.py View File

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:'):
'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
} }





+ 3
- 1
api/core/rag/datasource/vdb/vector_factory.py View File

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":

+ 1
- 0
docker/docker-compose.middleware.yaml View File

# QDRANT_API_KEY: 'difyai123456' # QDRANT_API_KEY: 'difyai123456'
# ports: # ports:
# - "6333:6333" # - "6333:6333"
# - "6334:6334"

+ 1
- 0
docker/docker-compose.qdrant.yaml View File

QDRANT_API_KEY: 'difyai123456' QDRANT_API_KEY: 'difyai123456'
ports: ports:
- "6333:6333" - "6333:6333"
- "6334:6334"

+ 10
- 1
docker/docker-compose.yaml View File

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
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
# # 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…
Cancel
Save