prompt_registry: Unifying API endpoint port (#443)

* prompt_registry: Unifying API endpoint port Unifying all port for API endpoints for prompt registry services with recent register_microservice wrapper function update. Signed-off-by: Yeoh, Hoong Tee <hoong.tee.yeoh@intel.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Yeoh, Hoong Tee <hoong.tee.yeoh@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
opea-project · Aug 12, 2024 · 27a01ee · 27a01ee
1 parent 3ffcff4
commit 27a01ee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/comps/prompt_registry/mongo/README.md b/comps/prompt_registry/mongo/README.md
@@ -41,7 +41,7 @@ docker run -d -p 27017:27017 --name=mongo mongo:latest
 2. Run prompt_registry service
 
 ```bash
-docker run -d --name="promptregistry-mongo-server" -p 6012:6012 -p 6013:6013 -p 6014:6014 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e MONGO_HOST=${MONGO_HOST} -e MONGO_PORT=${MONGO_PORT} -e DB_NAME=${DB_NAME} -e COLLECTION_NAME=${COLLECTION_NAME} opea/promptregistry-mongo-server:latest
+docker run -d --name="promptregistry-mongo-server" -p 6012:6012 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e MONGO_HOST=${MONGO_HOST} -e MONGO_PORT=${MONGO_PORT} -e DB_NAME=${DB_NAME} -e COLLECTION_NAME=${COLLECTION_NAME} opea/promptregistry-mongo-server:latest
 ```
 
 ## Invoke Microservice
@@ -64,7 +64,7 @@ curl -X 'POST' \
 
 ```bash
 curl -X 'POST' \
-  http://{host_ip}:6013/v1/prompt/get \
+  http://{host_ip}:6012/v1/prompt/get \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
@@ -73,7 +73,7 @@ curl -X 'POST' \
 
 ```bash
 curl -X 'POST' \
-  http://{host_ip}:6013/v1/prompt/get \
+  http://{host_ip}:6012/v1/prompt/get \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
@@ -84,7 +84,7 @@ curl -X 'POST' \
 
 ```bash
 curl -X 'POST' \
-  http://{host_ip}:6013/v1/prompt/get \
+  http://{host_ip}:6012/v1/prompt/get \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
@@ -95,7 +95,7 @@ curl -X 'POST' \
 
 ```bash
 curl -X 'POST' \
-  http://{host_ip}:6014/v1/prompt/delete \
+  http://{host_ip}:6012/v1/prompt/delete \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{

diff --git a/comps/prompt_registry/mongo/docker/docker-compose-prompt-registry-mongo.yaml b/comps/prompt_registry/mongo/docker/docker-compose-prompt-registry-mongo.yaml
@@ -19,15 +19,14 @@ services:
     container_name: promptregistry-mongo-server
     ports:
       - "6012:6012"
-      - "6013:6013"
-      - "6014:6014"
     ipc: host
     environment:
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
       no_proxy: ${no_proxy}
       MONGO_HOST: ${MONGO_HOST}
       MONGO_PORT: ${MONGO_PORT}
+      DB_NAME: ${DB_NAME}
       COLLECTION_NAME: ${COLLECTION_NAME}
     restart: unless-stopped
 

diff --git a/comps/prompt_registry/mongo/prompt.py b/comps/prompt_registry/mongo/prompt.py
@@ -34,7 +34,7 @@ class PromptId(BaseModel):
 
 
 @register_microservice(
-    name="opea_service@prompt_mongo_create",
+    name="opea_service@prompt_mongo",
     endpoint="/v1/prompt/create",
     host="0.0.0.0",
     input_datatype=PromptCreate,
@@ -62,11 +62,11 @@ async def create_prompt(prompt: PromptCreate):
 
 
 @register_microservice(
-    name="opea_service@prompt_mongo_get",
+    name="opea_service@prompt_mongo",
     endpoint="/v1/prompt/get",
     host="0.0.0.0",
     input_datatype=PromptId,
-    port=6013,
+    port=6012,
 )
 async def get_prompt(prompt: PromptId):
     """Retrieves prompt from prompt store based on provided PromptId or user.
@@ -95,11 +95,11 @@ async def get_prompt(prompt: PromptId):
 
 
 @register_microservice(
-    name="opea_service@prompt_mongo_delete",
+    name="opea_service@prompt_mongo",
     endpoint="/v1/prompt/delete",
     host="0.0.0.0",
     input_datatype=PromptId,
-    port=6014,
+    port=6012,
 )
 async def delete_prompt(prompt: PromptId):
     """Delete a prompt from prompt store by given PromptId.
@@ -125,6 +125,4 @@ async def delete_prompt(prompt: PromptId):
 
 
 if __name__ == "__main__":
-    opea_microservices["opea_service@prompt_mongo_get"].start()
-    opea_microservices["opea_service@prompt_mongo_create"].start()
-    opea_microservices["opea_service@prompt_mongo_delete"].start()
+    opea_microservices["opea_service@prompt_mongo"].start()
diff --git a/tests/test_prompt_registry_mongo.sh b/tests/test_prompt_registry_mongo.sh
@@ -22,7 +22,7 @@ function build_docker_images() {
 
 function start_service() {
 
-    docker run -d --name="test-comps-promptregistry-mongo-server" -p 6012:6012 -p 6013:6013 -p 6014:6014 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e MONGO_HOST=${MONGO_HOST} -e MONGO_PORT=${MONGO_PORT} -e DB_NAME=${DB_NAME} -e COLLECTION_NAME=${COLLECTION_NAME} opea/promptregistry-mongo-server:latest
+    docker run -d --name="test-comps-promptregistry-mongo-server" -p 6012:6012 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e MONGO_HOST=${MONGO_HOST} -e MONGO_PORT=${MONGO_PORT} -e DB_NAME=${DB_NAME} -e COLLECTION_NAME=${COLLECTION_NAME} opea/promptregistry-mongo-server:latest
 
     sleep 10s
 }