Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed milvus port conflict issues during deployment #183

Merged
merged 4 commits into from
Jun 17, 2024
Merged

fixed milvus port conflict issues during deployment #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
163e2b0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 15, 2024
f84decc
fixed milvus port conflict issues during deployment
jinjunzh Jun 15, 2024
c709e43
align port for unified retrieval microservice
jinjunzh Jun 17, 2024
14608b9
Merge branch 'main' of https://github.com/jinjunzh/GenAIComps into main
jinjunzh Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions comps/dataprep/milvus/prepare_doc_milvus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
from comps.cores.mega.micro_service import opea_microservices, register_microservice
from comps.cores.proto.docarray import DocPath
from comps.cores.telemetry.opea_telemetry import opea_telemetry
from comps.dataprep.utils import document_loader

current_script_path = os.path.dirname(os.path.abspath(__file__))
parent_dir = os.path.dirname(current_script_path)
sys.path.append(parent_dir)
from utils import document_loader
# current_script_path = os.path.dirname(os.path.abspath(__file__))
# parent_dir = os.path.dirname(current_script_path)
# sys.path.append(parent_dir)
# from utils import document_loader


@register_microservice(
Expand Down
4 changes: 2 additions & 2 deletions comps/vectorstores/langchain/milvus/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ services:
- ./milvus.yaml:/milvus/configs/milvus.yaml
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/milvus:/var/lib/milvus
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9091/healthz"]
test: ["CMD", "curl", "-f", "http://localhost:9092/healthz"]
interval: 30s
start_period: 90s
timeout: 20s
retries: 3
ports:
- "19530:19530"
- "9091:9091"
- "9092:9092"
depends_on:
- "etcd"
- "minio"
Expand Down
2 changes: 1 addition & 1 deletion comps/vectorstores/langchain/milvus/milvus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ proxy:
port: # high-level restful api
acceptTypeAllowInt64: true # high-level restful api, whether http client can deal with int64
enablePprof: true # Whether to enable pprof middleware on the metrics port
ip: # if not specified, use the first unicastable address
ip: 0.0.0.0 # if not specified, use the first unicastable address
port: 19530
internalPort: 19529
grpc:
Expand Down
Loading