Skip to content

Commit 08b27db

Browse files
committed
Update test configuration for HF tokenizer dir
Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>
1 parent 6282e72 commit 08b27db

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

test/e2e/e2e_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,12 @@ func runCompletion(prompt string, theModel openai.CompletionNewParamsModel) (str
341341
Model: theModel,
342342
}
343343

344-
resp, err := openaiclient.Completions.New(testConfig.Context, completionParams, option.WithResponseInto(&httpResp))
344+
ginkgo.By(fmt.Sprintf("Sending Completion Request: (port %s) %#v", port, completionParams))
345+
346+
resp, err := openaiclient.Completions.New(testConfig.Context, completionParams, option.WithResponseInto(&httpResp), option.WithRequestTimeout(readyTimeout))
347+
348+
ginkgo.By(fmt.Sprintf("Verifying Completion Response: %#v", resp))
349+
345350
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
346351
gomega.Expect(resp.Choices).Should(gomega.HaveLen(1))
347352
gomega.Expect(resp.Choices[0].FinishReason).Should(gomega.Equal(openai.CompletionChoiceFinishReasonStop))
@@ -445,7 +450,8 @@ plugins:
445450
blockSize: 16 # must match vLLM block size if not default (16)
446451
hashSeed: "42" # must match PYTHONHASHSEED in vLLM pods
447452
tokenizersPoolConfig:
448-
tokenizersCacheDir: "/cache/tokenizers"
453+
hf:
454+
tokenizersCacheDir: "/cache/tokenizers"
449455
kvBlockIndexConfig:
450456
enableMetrics: false # enable kv-block index metrics (prometheus)
451457
metricsLoggingInterval: 6000000000 # log kv-block metrics as well (1m in nanoseconds)

test/e2e/utils_test.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ func scaleDeployment(objects []string, increment int) {
4646

4747
// getModelServerPods Returns the list of Prefill and Decode vLLM pods separately
4848
func getModelServerPods(podLabels, prefillLabels, decodeLabels map[string]string) ([]string, []string) {
49+
ginkgo.By("Getting Model server pods")
50+
4951
pods := getPods(podLabels)
5052

5153
prefillValidator, err := apilabels.ValidatedSelectorFromSet(prefillLabels)
@@ -98,17 +100,22 @@ func getPods(labels map[string]string) []corev1.Pod {
98100
}
99101

100102
func podsInDeploymentsReady(objects []string) {
101-
var deployment appsv1.Deployment
102-
helper := func(deploymentName string) bool {
103+
isDeploymentReady := func(deploymentName string) bool {
104+
var deployment appsv1.Deployment
103105
err := testConfig.K8sClient.Get(testConfig.Context, types.NamespacedName{Namespace: nsName, Name: deploymentName}, &deployment)
106+
ginkgo.By(fmt.Sprintf("Waiting for deployment %q to be ready (err: %v): replicas=%#v, status=%#v", deploymentName, err, *deployment.Spec.Replicas, deployment.Status))
104107
return err == nil && *deployment.Spec.Replicas == deployment.Status.Replicas &&
105108
deployment.Status.Replicas == deployment.Status.ReadyReplicas
106109
}
110+
107111
for _, kindAndName := range objects {
108112
split := strings.Split(kindAndName, "/")
109113
if strings.ToLower(split[0]) == deploymentKind {
110-
ginkgo.By(fmt.Sprintf("Waiting for pods of %s to be ready", split[1]))
111-
gomega.Eventually(helper, readyTimeout, interval).WithArguments(split[1]).Should(gomega.BeTrue())
114+
gomega.Eventually(isDeploymentReady).
115+
WithArguments(split[1]).
116+
WithPolling(interval).
117+
WithTimeout(readyTimeout).
118+
Should(gomega.BeTrue())
112119
}
113120
}
114121
}

0 commit comments

Comments
 (0)