From 71edaf7969a143adfad5b523ba2197435cdda4ef Mon Sep 17 00:00:00 2001 From: Tiffany Zhao Date: Mon, 6 Nov 2023 07:26:34 +0000 Subject: [PATCH 1/4] add test coverage --- .circleci/config.yml | 3 ++- model-engine/requirements-test.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 63763deac..b10843eb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -260,5 +260,6 @@ commands: name: Unit Tests command: | pushd model-engine - GIT_TAG=$(git rev-parse HEAD) WORKSPACE=.. pytest + GIT_TAG=$(git rev-parse HEAD) WORKSPACE=.. pytest --cov --cov-report=xml + diff-cover coverage.xml --compare-branch=origin/main --fail-under=80 popd diff --git a/model-engine/requirements-test.txt b/model-engine/requirements-test.txt index 9ad7b6e22..e694968d8 100644 --- a/model-engine/requirements-test.txt +++ b/model-engine/requirements-test.txt @@ -2,6 +2,7 @@ multiprocess==0.70.14 pytest==7.2.0 pytest-asyncio==0.20.1 pytest-cov==2.10.0 +diff-cover==8.0.0 moto==3.1.12 coverage==5.5 mypy==1.3.0 From 4eaec10b9cab0b44eb06c1158c9e5dcaa2085037 Mon Sep 17 00:00:00 2001 From: Tiffany Zhao Date: Mon, 6 Nov 2023 07:30:21 +0000 Subject: [PATCH 2/4] temp --- model-engine/model_engine_server/api/llms_v1.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/model-engine/model_engine_server/api/llms_v1.py b/model-engine/model_engine_server/api/llms_v1.py index 9e811f919..b3a29c2d7 100644 --- a/model-engine/model_engine_server/api/llms_v1.py +++ b/model-engine/model_engine_server/api/llms_v1.py @@ -192,6 +192,23 @@ async def list_model_endpoints( return await use_case.execute(user=auth, name=name, order_by=order_by) +@llm_router_v1.get("hello", response_model=ListLLMModelEndpointsV1Response) +async def hello( + name: Optional[str] = Query(default=None), + order_by: Optional[ModelEndpointOrderBy] = Query(default=None), + auth: User = Depends(verify_authentication), + external_interfaces: ExternalInterfaces = Depends(get_external_interfaces_read_only), +) -> ListLLMModelEndpointsV1Response: + """ + Lists the LLM model endpoints owned by the current owner, plus all public_inference LLMs. + """ + logger.info(f"GET /llm/model-endpoints?name={name}&order_by={order_by} for {auth}") + use_case = ListLLMModelEndpointsV1UseCase( + llm_model_endpoint_service=external_interfaces.llm_model_endpoint_service, + ) + return await use_case.execute(user=auth, name=name, order_by=order_by) + + @llm_router_v1.get( "/model-endpoints/{model_endpoint_name}", response_model=GetLLMModelEndpointV1Response ) From 0126283aadd1b7e9a885fef2507b0eb57415329d Mon Sep 17 00:00:00 2001 From: Tiffany Zhao Date: Mon, 6 Nov 2023 07:32:12 +0000 Subject: [PATCH 3/4] change diff cover version --- model-engine/requirements-test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model-engine/requirements-test.txt b/model-engine/requirements-test.txt index e694968d8..158e07435 100644 --- a/model-engine/requirements-test.txt +++ b/model-engine/requirements-test.txt @@ -2,7 +2,7 @@ multiprocess==0.70.14 pytest==7.2.0 pytest-asyncio==0.20.1 pytest-cov==2.10.0 -diff-cover==8.0.0 +diff-cover==7.7.0 moto==3.1.12 coverage==5.5 mypy==1.3.0 From 75d94e7a8d02b0cfa654f673b54ea70202089ae4 Mon Sep 17 00:00:00 2001 From: Tiffany Zhao Date: Mon, 6 Nov 2023 07:40:00 +0000 Subject: [PATCH 4/4] Revert "temp" This reverts commit 4eaec10b9cab0b44eb06c1158c9e5dcaa2085037. --- model-engine/model_engine_server/api/llms_v1.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/model-engine/model_engine_server/api/llms_v1.py b/model-engine/model_engine_server/api/llms_v1.py index b3a29c2d7..9e811f919 100644 --- a/model-engine/model_engine_server/api/llms_v1.py +++ b/model-engine/model_engine_server/api/llms_v1.py @@ -192,23 +192,6 @@ async def list_model_endpoints( return await use_case.execute(user=auth, name=name, order_by=order_by) -@llm_router_v1.get("hello", response_model=ListLLMModelEndpointsV1Response) -async def hello( - name: Optional[str] = Query(default=None), - order_by: Optional[ModelEndpointOrderBy] = Query(default=None), - auth: User = Depends(verify_authentication), - external_interfaces: ExternalInterfaces = Depends(get_external_interfaces_read_only), -) -> ListLLMModelEndpointsV1Response: - """ - Lists the LLM model endpoints owned by the current owner, plus all public_inference LLMs. - """ - logger.info(f"GET /llm/model-endpoints?name={name}&order_by={order_by} for {auth}") - use_case = ListLLMModelEndpointsV1UseCase( - llm_model_endpoint_service=external_interfaces.llm_model_endpoint_service, - ) - return await use_case.execute(user=auth, name=name, order_by=order_by) - - @llm_router_v1.get( "/model-endpoints/{model_endpoint_name}", response_model=GetLLMModelEndpointV1Response )