Replaced hard coded ports with dynamically assigned values from set_env file

comps/asr/whisper/asr.py

@@ -28,7 +28,7 @@
     service_type=ServiceType.ASR,
     endpoint="/v1/audio/transcriptions",
     host="0.0.0.0",
-    port=9099,
+    port=int(os.getenv("ASR_PORT", 9099)),
     input_datatype=Base64ByteStrDoc,
     output_datatype=LLMParamsDoc,
 )
@@ -48,6 +48,7 @@ async def audio_to_text(audio: Base64ByteStrDoc):
 
 
 if __name__ == "__main__":
-    asr_endpoint = os.getenv("ASR_ENDPOINT", "http://localhost:7066")
+    whisper_port = int(os.getenv("WHISPER_PORT", 7066))
+    asr_endpoint = os.getenv("ASR_ENDPOINT", f"http://localhost:{whisper_port}")
     logger.info("[asr - router] ASR initialized.")
     opea_microservices["opea_service@asr"].start()

comps/asr/whisper/dependency/whisper_server.py

@@ -106,7 +106,7 @@ async def audio_transcriptions(
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("--host", type=str, default="0.0.0.0")
-    parser.add_argument("--port", type=int, default=7066)
+    parser.add_argument("--port", type=int, default=os.getenv("WHISPER_PORT", 7066))
     parser.add_argument("--model_name_or_path", type=str, default="openai/whisper-small")
     parser.add_argument("--language", type=str, default="english")
     parser.add_argument("--device", type=str, default="cpu")

comps/dataprep/multimodal/redis/langchain/prepare_videodoc_redis.py

@@ -335,7 +335,7 @@ def drop_index(index_name, redis_url=REDIS_URL):
 
 
 @register_microservice(
-    name="opea_service@prepare_videodoc_redis", endpoint="/v1/generate_transcripts", host="0.0.0.0", port=6007
+    name="opea_service@prepare_videodoc_redis", endpoint="/v1/generate_transcripts", host="0.0.0.0", port=int(os.getenv("DATAPREP_MMR_PORT", 6007))
 )
 async def ingest_generate_transcripts(files: List[UploadFile] = File(None)):
     """Upload videos or audio files with speech, generate transcripts using whisper and ingest into redis."""
@@ -444,7 +444,7 @@ async def ingest_generate_transcripts(files: List[UploadFile] = File(None)):
 
 
 @register_microservice(
-    name="opea_service@prepare_videodoc_redis", endpoint="/v1/generate_captions", host="0.0.0.0", port=6007
+    name="opea_service@prepare_videodoc_redis", endpoint="/v1/generate_captions", host="0.0.0.0", port=int(os.getenv("DATAPREP_MMR_PORT", 6007))
 )
 async def ingest_generate_caption(files: List[UploadFile] = File(None)):
     """Upload images and videos without speech (only background music or no audio), generate captions using lvm microservice and ingest into redis."""
@@ -506,7 +506,7 @@ async def ingest_generate_caption(files: List[UploadFile] = File(None)):
     name="opea_service@prepare_videodoc_redis",
     endpoint="/v1/ingest_with_text",
     host="0.0.0.0",
-    port=6007,
+    port=int(os.getenv("DATAPREP_MMR_PORT", 6007)),
 )
 async def ingest_with_text(files: List[UploadFile] = File(None)):
     if files:
@@ -602,7 +602,7 @@ async def ingest_with_text(files: List[UploadFile] = File(None)):
 
 
 @register_microservice(
-    name="opea_service@prepare_videodoc_redis", endpoint="/v1/dataprep/get_files", host="0.0.0.0", port=6007
+    name="opea_service@prepare_videodoc_redis", endpoint="/v1/dataprep/get_files", host="0.0.0.0", port=int(os.getenv("DATAPREP_MMR_PORT", 6007))
 )
 async def rag_get_file_structure():
     """Returns list of names of uploaded videos saved on the server."""
@@ -616,7 +616,7 @@ async def rag_get_file_structure():
 
 
 @register_microservice(
-    name="opea_service@prepare_videodoc_redis", endpoint="/v1/dataprep/delete_files", host="0.0.0.0", port=6007
+    name="opea_service@prepare_videodoc_redis", endpoint="/v1/dataprep/delete_files", host="0.0.0.0", port=int(os.getenv("DATAPREP_MMR_PORT", 6007))
 )
 async def delete_files():
     """Delete all uploaded files along with redis index."""

comps/embeddings/multimodal/multimodal_langchain/mm_embedding_mmei.py

@@ -25,7 +25,7 @@
 
 logger = CustomLogger("multimodal_embedding_mmei_langchain")
 logflag = os.getenv("LOGFLAG", False)
-port = int(os.getenv("MM_EMBEDDING_PORT_MICROSERVICE", 6600))
+port = int(os.getenv("MM_EMBEDDING_PORT_MICROSERVICE", 6000))
 headers = {"Content-Type": "application/json"}
 
 
@@ -86,7 +86,7 @@ def embedding(input: MultimodalDoc) -> Union[EmbedDoc, EmbedMultimodalDoc]:
 
 if __name__ == "__main__":
     url_endpoint = os.getenv("MMEI_EMBEDDING_HOST_ENDPOINT", "http://0.0.0.0")
-    port_endpoint = os.getenv("MMEI_EMBEDDING_PORT_ENDPOINT", "8080")
+    port_endpoint = os.getenv("MMEI_EMBEDDING_PORT_ENDPOINT", "6006")
     path_endpoint = os.getenv("MMEI_EMBEDDING_PATH_ENDPOINT", "/v1/encode")
 
     mmei_embedding_endpoint = os.getenv("MMEI_EMBEDDING_ENDPOINT", f"{url_endpoint}:{port_endpoint}{path_endpoint}")

comps/lvms/llava/dependency/llava_server.py

@@ -6,6 +6,7 @@
 import base64
 import time
 from io import BytesIO
+import os
 
 import PIL.Image
 import requests
@@ -201,7 +202,7 @@ async def generate(request: Request) -> Response:  # FIXME batch_size=1 for now
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument("--host", type=str, default="0.0.0.0")
-    parser.add_argument("--port", type=int, default=8399)
+    parser.add_argument("--port", type=int, default=os.getenv("LLAVA_SERVER_PORT", 8399))
     parser.add_argument("--model_name_or_path", type=str, default="llava-hf/llava-1.5-7b-hf")
     parser.add_argument("--use_hpu_graphs", default=False, action="store_true")
     parser.add_argument("--warmup", type=int, default=1, help="Number of warmup iterations for benchmarking.")

comps/lvms/llava/lvm.py

@@ -37,7 +37,7 @@
     service_type=ServiceType.LVM,
     endpoint="/v1/lvm",
     host="0.0.0.0",
-    port=9399,
+    port=int(os.getenv("LVM_PORT", 9399)),
 )
 @register_statistics(names=["opea_service@lvm"])
 async def lvm(request: Union[LVMDoc, LVMSearchedMultimodalDoc]) -> Union[TextDoc, MetadataTextDoc]:

comps/lvms/tgi-llava/lvm_tgi.py

@@ -36,7 +36,7 @@
     service_type=ServiceType.LVM,
     endpoint="/v1/lvm",
     host="0.0.0.0",
-    port=9399,
+    port=int(os.getenv("LVM_PORT", 9399)),
     input_datatype=LVMDoc,
     output_datatype=TextDoc,
 )

comps/retrievers/redis/langchain/retriever_redis.py

@@ -40,7 +40,7 @@
     service_type=ServiceType.RETRIEVER,
     endpoint="/v1/retrieval",
     host="0.0.0.0",
-    port=7000,
+    port=int(os.getenv("REDIS_RETRIEVER_PORT", 7000)),
 )
 @register_statistics(names=["opea_service@retriever_redis"])
 async def retrieve(