Minor fixes

Author: wanhakim

WorkflowExecAgent/tests/2_start_vllm_service.sh

@@ -26,7 +26,7 @@ function build_vllm_docker_image() {
     else
         cd ./vllm
     fi
-    docker build -f Dockerfile.cpu -t vllm-cpu-env --shm-size=100g .
+    docker build -f docker/Dockerfile.cpu -t vllm-cpu-env --shm-size=100g .
     if [ $? -ne 0 ]; then
         echo "opea/vllm:cpu failed"
         exit 1
@@ -43,9 +43,12 @@ function start_vllm_service() {
     echo "Waiting vllm ready"
     n=0
     until [[ "$n" -ge 100 ]] || [[ $ready == true ]]; do
+        if docker logs test-comps-vllm-service| grep "Error response from daemon: No such container:"; then
+            exit 1
+        fi
         docker logs test-comps-vllm-service &> ${LOG_PATH}/vllm-service.log
         n=$((n+1))
-        if grep -q "Uvicorn running on" ${LOG_PATH}/vllm-service.log; then
+        if grep -q "Application startup complete." ${LOG_PATH}/vllm-service.log; then
             break
         fi
         if grep -q "No such container" ${LOG_PATH}/vllm-service.log; then

WorkflowExecAgent/tests/3_launch_agent_service.sh

@@ -27,7 +27,7 @@ function start_agent() {
     cd $WORKDIR/GenAIExamples/WorkflowExecAgent/docker_compose/intel/cpu/xeon
     WORKDIR=$WORKPATH/docker_image_build/ docker compose -f compose_vllm.yaml up -d
     echo "Waiting agent service ready"
-    sleep 5s
+    sleep 10s
 }
 
 function main() {

WorkflowExecAgent/tests/test_compose_vllm_example_wf_on_xeon.sh

@@ -7,7 +7,7 @@ wf_api_port=${wf_api_port}
 api_server_url=http://$(hostname -I | awk '{print $1}'):${wf_api_port}/
 workflow_id=10071
 query="I have a data with gender Female, tenure 55, MonthlyCharges 103.7, TotalCharges 1840.75. Predict if this entry will churn. My workflow id is ${workflow_id}."
-validate_result="the prediction is No"
+validate_result="is No"
 
 function stop_agent_and_api_server() {
     echo "Stopping Agent services"
@@ -42,9 +42,9 @@ echo "=================== #5 Start validate agent ===================="
 bash 4_validate_agent.sh "$query" "$validate_result"
 echo "=================== #5 Validate agent completed ===================="
 
-echo "=================== #4 Stop all services ===================="
+echo "=================== #6 Stop all services ===================="
 stop_agent_and_api_server
 stop_vllm_docker
-echo "=================== #4 All services stopped ===================="
+echo "=================== #6 All services stopped ===================="
 
 echo "ALL DONE!"

WorkflowExecAgent/tools/utils/handle_requests.py

@@ -21,8 +21,8 @@ def __init__(self, base_url: str, api_key: str):
     def _make_request(self, endpoint, method="GET", data=None, stream=False):
         url = f"{self.base_url}{endpoint}"
         headers = {"Content-Type": "application/json", "Authorization": f"Bearer {self.api_key}"}
-
         error = ""
+        print(f"Making {method} request to {url}")
 
         if method == "GET":
             response = requests.get(url, headers=headers)