Vertexai fixes (#988)

* vertexai updates

* lint

* fix test

* more obvious version placeholder in test

Author: bkorycki

plugins/vertexai/modelgauge/suts/vertexai_client.py

@@ -57,7 +57,7 @@ def _build_endpoint_url(self) -> str:
         project_fragment = f"projects/{self.project_id}"
         location_fragment = f"locations/{self.region}"
         specifier = "streamRawPredict" if self.streaming else "rawPredict"
-        model_fragment = f"publishers/{self.publisher}/models/{self.model_name}@{self.model_version}"
+        model_fragment = f"publishers/{self.publisher}/models/{self.model_name}-{self.model_version}"
         url = f"{base_url}{'/'.join([project_fragment, location_fragment, model_fragment])}:{specifier}"
         return url
 

plugins/vertexai/modelgauge/suts/vertexai_mistral_sut.py

@@ -74,7 +74,10 @@ def client(self) -> VertexAIClient:
         return self._client
 
     def translate_text_prompt(self, prompt: TextPrompt, options: SUTOptions) -> VertexAIMistralRequest:
-        args = {"model": self.model_name, "messages": [{"role": _USER_ROLE, "content": prompt.text}]}
+        args = {
+            "model": f"{self.model_name}-{self.model_version}",
+            "messages": [{"role": _USER_ROLE, "content": prompt.text}],
+        }
         if options.temperature is not None:
             args["temperature"] = options.temperature
         if options.max_tokens is not None:
@@ -97,7 +100,7 @@ def translate_response(self, request: VertexAIMistralRequest, response: VertexAI
 VERTEX_REGION = InjectSecret(VertexAIRegion)
 
 model_name = "mistral-large"
-model_version = "2407"
+model_version = "2411"  # 2407 is no longer available.
 model_uid = f"vertexai-{model_name}-{model_version}"
 # If you prefer to use MistralAI, please see plugins/mistral
 # Authentication required using https://cloud.google.com/docs/authentication/application-default-credentials

plugins/vertexai/tests/test_vertexai_mistral_sut.py

@@ -7,11 +7,13 @@
     VertexAIMistralResponse,
 )
 
+VERSION = "1234"
+
 
 @pytest.fixture
 def req():
     return {
-        "model": "mistral-large",
+        "model": f"mistral-large-{VERSION}",
         "stream": False,
         "messages": [{"role": "user", "content": "Why did the chicken cross the road?"}],
         "safe_prompt": True,
@@ -46,9 +48,9 @@ def response():
 @pytest.fixture
 def sut():
     return VertexAIMistralAISut(
-        "vertexai-mistral-large-2407",
+        f"vertexai-mistral-large-{VERSION}",
         "mistral-large",
-        "2407",
+        VERSION,
         project_id=VertexAIProjectId("fake"),
         region=VertexAIRegion("us-central1"),
     )