From ffecd182db27e59660e129d49172df0572cb033e Mon Sep 17 00:00:00 2001 From: "Hoong Tee, Yeoh" Date: Tue, 1 Oct 2024 13:01:09 +0800 Subject: [PATCH] [ProductivitySuite]: Update service port number (#879) Signed-off-by: Yeoh, Hoong Tee --- .../docker_compose/intel/cpu/xeon/README.md | 12 ++++++------ .../docker_compose/intel/cpu/xeon/compose.yaml | 2 +- .../docker_compose/intel/cpu/xeon/set_env.sh | 4 ++-- .../intel/cpu/xeon/manifest/prompt_registry.yaml | 6 +++--- ProductivitySuite/tests/test_compose_on_xeon.sh | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md b/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md index 34a75658c..c5463ad10 100644 --- a/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md +++ b/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md @@ -168,8 +168,8 @@ export CHAT_HISTORY_CREATE_ENDPOINT="http://${host_ip}:6012/v1/chathistory/creat export CHAT_HISTORY_CREATE_ENDPOINT="http://${host_ip}:6012/v1/chathistory/create" export CHAT_HISTORY_DELETE_ENDPOINT="http://${host_ip}:6012/v1/chathistory/delete" export CHAT_HISTORY_GET_ENDPOINT="http://${host_ip}:6012/v1/chathistory/get" -export PROMPT_SERVICE_GET_ENDPOINT="http://${host_ip}:6015/v1/prompt/get" -export PROMPT_SERVICE_CREATE_ENDPOINT="http://${host_ip}:6015/v1/prompt/create" +export PROMPT_SERVICE_GET_ENDPOINT="http://${host_ip}:6018/v1/prompt/get" +export PROMPT_SERVICE_CREATE_ENDPOINT="http://${host_ip}:6018/v1/prompt/create" export KEYCLOAK_SERVICE_ENDPOINT="http://${host_ip}:8080" export LLM_SERVICE_HOST_PORT_FAQGEN=9002 export LLM_SERVICE_HOST_PORT_CODEGEN=9001 @@ -393,7 +393,7 @@ Please refer to **[keycloak_setup_guide](keycloak_setup_guide.md)** for more det ```bash curl -X 'POST' \ - http://{host_ip}:6015/v1/prompt/create \ + http://{host_ip}:6018/v1/prompt/create \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d '{ @@ -405,14 +405,14 @@ Please refer to **[keycloak_setup_guide](keycloak_setup_guide.md)** for more det ```bash curl -X 'POST' \ - http://{host_ip}:6015/v1/prompt/get \ + http://{host_ip}:6018/v1/prompt/get \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d '{ "user": "test"}' curl -X 'POST' \ - http://{host_ip}:6015/v1/prompt/get \ + http://{host_ip}:6018/v1/prompt/get \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d '{ @@ -423,7 +423,7 @@ Please refer to **[keycloak_setup_guide](keycloak_setup_guide.md)** for more det ```bash curl -X 'POST' \ - http://{host_ip}:6015/v1/prompt/delete \ + http://{host_ip}:6018/v1/prompt/delete \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d '{ diff --git a/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml b/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml index 479834a64..2e56d6584 100644 --- a/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml +++ b/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml @@ -319,7 +319,7 @@ services: image: ${REGISTRY:-opea}/promptregistry-mongo-server:${TAG:-latest} container_name: promptregistry-mongo-server ports: - - "6015:6012" + - "6018:6018" ipc: host environment: http_proxy: ${http_proxy} diff --git a/ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh b/ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh index ccc80d728..0139b532a 100644 --- a/ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh +++ b/ProductivitySuite/docker_compose/intel/cpu/xeon/set_env.sh @@ -39,8 +39,8 @@ export CHAT_HISTORY_CREATE_ENDPOINT="http://${host_ip}:6012/v1/chathistory/creat export CHAT_HISTORY_CREATE_ENDPOINT="http://${host_ip}:6012/v1/chathistory/create" export CHAT_HISTORY_DELETE_ENDPOINT="http://${host_ip}:6012/v1/chathistory/delete" export CHAT_HISTORY_GET_ENDPOINT="http://${host_ip}:6012/v1/chathistory/get" -export PROMPT_SERVICE_GET_ENDPOINT="http://${host_ip}:6015/v1/prompt/get" -export PROMPT_SERVICE_CREATE_ENDPOINT="http://${host_ip}:6015/v1/prompt/create" +export PROMPT_SERVICE_GET_ENDPOINT="http://${host_ip}:6018/v1/prompt/get" +export PROMPT_SERVICE_CREATE_ENDPOINT="http://${host_ip}:6018/v1/prompt/create" export KEYCLOAK_SERVICE_ENDPOINT="http://${host_ip}:8080" export LLM_SERVICE_HOST_PORT_FAQGEN=9002 export LLM_SERVICE_HOST_PORT_CODEGEN=9001 diff --git a/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/prompt_registry.yaml b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/prompt_registry.yaml index 972fc214e..faf04bb6a 100644 --- a/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/prompt_registry.yaml +++ b/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/prompt_registry.yaml @@ -28,8 +28,8 @@ metadata: spec: type: ClusterIP ports: - - port: 6012 - targetPort: 6012 + - port: 6018 + targetPort: 6018 protocol: TCP name: prompt-registry selector: @@ -69,7 +69,7 @@ spec: imagePullPolicy: IfNotPresent ports: - name: prompt-registry - containerPort: 6012 + containerPort: 6018 protocol: TCP resources: null --- diff --git a/ProductivitySuite/tests/test_compose_on_xeon.sh b/ProductivitySuite/tests/test_compose_on_xeon.sh index 566190a9b..7c18f35d4 100755 --- a/ProductivitySuite/tests/test_compose_on_xeon.sh +++ b/ProductivitySuite/tests/test_compose_on_xeon.sh @@ -64,8 +64,8 @@ function start_services() { export CHAT_HISTORY_CREATE_ENDPOINT="http://${ip_address}:6012/v1/chathistory/create" export CHAT_HISTORY_DELETE_ENDPOINT="http://${ip_address}:6012/v1/chathistory/delete" export CHAT_HISTORY_GET_ENDPOINT="http://${ip_address}:6012/v1/chathistory/get" - export PROMPT_SERVICE_GET_ENDPOINT="http://${ip_address}:6015/v1/prompt/get" - export PROMPT_SERVICE_CREATE_ENDPOINT="http://${ip_address}:6015/v1/prompt/create" + export PROMPT_SERVICE_GET_ENDPOINT="http://${ip_address}:6018/v1/prompt/get" + export PROMPT_SERVICE_CREATE_ENDPOINT="http://${ip_address}:6018/v1/prompt/create" export KEYCLOAK_SERVICE_ENDPOINT="http://${ip_address}:8080" export MONGO_HOST=${ip_address} export MONGO_PORT=27017 @@ -275,7 +275,7 @@ function validate_microservices() { fi result=$(curl -X 'POST' \ - http://$ip_address:6015/v1/prompt/create \ + http://$ip_address:6018/v1/prompt/create \ -H 'accept: application/json' \ -H 'Content-Type: application/json' \ -d '{