From 7ad26f4b6f5814b52d67b17be91686cd2c1b746d Mon Sep 17 00:00:00 2001 From: okhleif-IL Date: Thu, 19 Dec 2024 11:51:05 -0800 Subject: [PATCH 1/5] changed all hardcoded ports to getenv withh defaults instead Signed-off-by: okhleif-IL --- comps/asr/whisper/asr.py | 3 ++- .../redis/langchain/prepare_videodoc_redis.py | 10 +++++----- .../multimodal_langchain/mm_embedding_mmei.py | 4 ++-- comps/lvms/llava/dependency/llava_server.py | 3 ++- comps/lvms/llava/lvm.py | 2 +- comps/retrievers/redis/llama_index/retriever_redis.py | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/comps/asr/whisper/asr.py b/comps/asr/whisper/asr.py index 920c831526..8ca030bcb7 100644 --- a/comps/asr/whisper/asr.py +++ b/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=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__": + whisper_port = os.getenv("WHISPER_PORT", 7066) asr_endpoint = os.getenv("ASR_ENDPOINT", "http://localhost:7066") logger.info("[asr - router] ASR initialized.") opea_microservices["opea_service@asr"].start() diff --git a/comps/dataprep/multimodal/redis/langchain/prepare_videodoc_redis.py b/comps/dataprep/multimodal/redis/langchain/prepare_videodoc_redis.py index fa8ed4896e..d6382254b1 100644 --- a/comps/dataprep/multimodal/redis/langchain/prepare_videodoc_redis.py +++ b/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=os.getenv("REDIS_RETREIEVER_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=os.getenv("REDIS_RETREIEVER_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=os.getenv("REDIS_RETREIEVER_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=os.getenv("REDIS_RETREIEVER_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=os.getenv("REDIS_RETREIEVER_PORT", 6007) ) async def delete_files(): """Delete all uploaded files along with redis index.""" diff --git a/comps/embeddings/multimodal/multimodal_langchain/mm_embedding_mmei.py b/comps/embeddings/multimodal/multimodal_langchain/mm_embedding_mmei.py index cd052fc288..68b8dc6095 100644 --- a/comps/embeddings/multimodal/multimodal_langchain/mm_embedding_mmei.py +++ b/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}") diff --git a/comps/lvms/llava/dependency/llava_server.py b/comps/lvms/llava/dependency/llava_server.py index 4fc0043805..cd74328b87 100644 --- a/comps/lvms/llava/dependency/llava_server.py +++ b/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.") diff --git a/comps/lvms/llava/lvm.py b/comps/lvms/llava/lvm.py index 9d7bde0f90..98ad975797 100644 --- a/comps/lvms/llava/lvm.py +++ b/comps/lvms/llava/lvm.py @@ -37,7 +37,7 @@ service_type=ServiceType.LVM, endpoint="/v1/lvm", host="0.0.0.0", - port=9399, + port=os.getenv("LVM_PORT", 9399), ) @register_statistics(names=["opea_service@lvm"]) async def lvm(request: Union[LVMDoc, LVMSearchedMultimodalDoc]) -> Union[TextDoc, MetadataTextDoc]: diff --git a/comps/retrievers/redis/llama_index/retriever_redis.py b/comps/retrievers/redis/llama_index/retriever_redis.py index 1e36e07b62..31560f419b 100644 --- a/comps/retrievers/redis/llama_index/retriever_redis.py +++ b/comps/retrievers/redis/llama_index/retriever_redis.py @@ -20,7 +20,7 @@ service_type=ServiceType.RETRIEVER, endpoint="/v1/retrieval", host="0.0.0.0", - port=7000, + port=os.getenv("REDIS_RETREIEVER_PORT", 7000), ) async def retrieve(input: EmbedDoc) -> SearchedDoc: if logflag: From 46950259c118c6a5b93ce83dacef3c8623087634 Mon Sep 17 00:00:00 2001 From: okhleif-IL Date: Fri, 20 Dec 2024 14:38:35 -0800 Subject: [PATCH 2/5] removed hardcoded ports Signed-off-by: okhleif-IL --- comps/asr/whisper/asr.py | 2 +- comps/asr/whisper/dependency/whisper_server.py | 2 +- .../redis/langchain/prepare_videodoc_redis.py | 10 +++++----- comps/lvms/llava/lvm.py | 2 +- comps/retrievers/redis/langchain/retriever_redis.py | 2 +- comps/retrievers/redis/llama_index/retriever_redis.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/comps/asr/whisper/asr.py b/comps/asr/whisper/asr.py index 8ca030bcb7..afe0261292 100644 --- a/comps/asr/whisper/asr.py +++ b/comps/asr/whisper/asr.py @@ -48,7 +48,7 @@ async def audio_to_text(audio: Base64ByteStrDoc): if __name__ == "__main__": - whisper_port = os.getenv("WHISPER_PORT", 7066) + whisper_port = int(os.getenv("WHISPER_PORT", 7066)) asr_endpoint = os.getenv("ASR_ENDPOINT", "http://localhost:7066") logger.info("[asr - router] ASR initialized.") opea_microservices["opea_service@asr"].start() diff --git a/comps/asr/whisper/dependency/whisper_server.py b/comps/asr/whisper/dependency/whisper_server.py index dcb3dd19cb..979ece0d56 100644 --- a/comps/asr/whisper/dependency/whisper_server.py +++ b/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") diff --git a/comps/dataprep/multimodal/redis/langchain/prepare_videodoc_redis.py b/comps/dataprep/multimodal/redis/langchain/prepare_videodoc_redis.py index d6382254b1..fee9ac0c82 100644 --- a/comps/dataprep/multimodal/redis/langchain/prepare_videodoc_redis.py +++ b/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=os.getenv("REDIS_RETREIEVER_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=os.getenv("REDIS_RETREIEVER_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=os.getenv("REDIS_RETREIEVER_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=os.getenv("REDIS_RETREIEVER_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=os.getenv("REDIS_RETREIEVER_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.""" diff --git a/comps/lvms/llava/lvm.py b/comps/lvms/llava/lvm.py index 98ad975797..05ad07ae50 100644 --- a/comps/lvms/llava/lvm.py +++ b/comps/lvms/llava/lvm.py @@ -37,7 +37,7 @@ service_type=ServiceType.LVM, endpoint="/v1/lvm", host="0.0.0.0", - port=os.getenv("LVM_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]: diff --git a/comps/retrievers/redis/langchain/retriever_redis.py b/comps/retrievers/redis/langchain/retriever_redis.py index ada07d2366..f7549ce6bc 100644 --- a/comps/retrievers/redis/langchain/retriever_redis.py +++ b/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( diff --git a/comps/retrievers/redis/llama_index/retriever_redis.py b/comps/retrievers/redis/llama_index/retriever_redis.py index 31560f419b..1e36e07b62 100644 --- a/comps/retrievers/redis/llama_index/retriever_redis.py +++ b/comps/retrievers/redis/llama_index/retriever_redis.py @@ -20,7 +20,7 @@ service_type=ServiceType.RETRIEVER, endpoint="/v1/retrieval", host="0.0.0.0", - port=os.getenv("REDIS_RETREIEVER_PORT", 7000), + port=7000, ) async def retrieve(input: EmbedDoc) -> SearchedDoc: if logflag: From 6667126bdc6f1122119ae2538eef095c1ef9b8c1 Mon Sep 17 00:00:00 2001 From: okhleif-IL Date: Fri, 20 Dec 2024 15:05:19 -0800 Subject: [PATCH 3/5] added int() Signed-off-by: okhleif-IL --- comps/asr/whisper/asr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comps/asr/whisper/asr.py b/comps/asr/whisper/asr.py index afe0261292..978103a249 100644 --- a/comps/asr/whisper/asr.py +++ b/comps/asr/whisper/asr.py @@ -28,7 +28,7 @@ service_type=ServiceType.ASR, endpoint="/v1/audio/transcriptions", host="0.0.0.0", - port=os.getenv("ASR_PORT", 9099), + port=int(os.getenv("ASR_PORT", 9099)), input_datatype=Base64ByteStrDoc, output_datatype=LLMParamsDoc, ) From 79e96dd5585438780ba0337285cca9b7aea50ba6 Mon Sep 17 00:00:00 2001 From: okhleif-IL Date: Mon, 23 Dec 2024 10:15:37 -0800 Subject: [PATCH 4/5] removed hard coded whisper port Signed-off-by: okhleif-IL --- comps/asr/whisper/asr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comps/asr/whisper/asr.py b/comps/asr/whisper/asr.py index 978103a249..702564149d 100644 --- a/comps/asr/whisper/asr.py +++ b/comps/asr/whisper/asr.py @@ -49,6 +49,6 @@ async def audio_to_text(audio: Base64ByteStrDoc): if __name__ == "__main__": whisper_port = int(os.getenv("WHISPER_PORT", 7066)) - asr_endpoint = os.getenv("ASR_ENDPOINT", "http://localhost:7066") + asr_endpoint = os.getenv("ASR_ENDPOINT", f"http://localhost:{whisper_port}") logger.info("[asr - router] ASR initialized.") opea_microservices["opea_service@asr"].start() From 25e9a81373afc17042c04c13a6b0fa6ceec4e264 Mon Sep 17 00:00:00 2001 From: okhleif-IL Date: Mon, 23 Dec 2024 10:20:41 -0800 Subject: [PATCH 5/5] removed hard coded port for TGI Gaudi Signed-off-by: okhleif-IL --- comps/lvms/tgi-llava/lvm_tgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comps/lvms/tgi-llava/lvm_tgi.py b/comps/lvms/tgi-llava/lvm_tgi.py index 04ceee400c..2896ba8b0a 100644 --- a/comps/lvms/tgi-llava/lvm_tgi.py +++ b/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, )