Update query endpoint to use version instead of version number. This enables aliasing for version name.

Author: DhruvSrikanth

tests/test_asynchronous.py

@@ -35,7 +35,7 @@ async def text_evaluator():
 @pytest.mark.asyncio
 async def test_text_aquery(text_evaluator):
     fn_name, version_number, _ = await text_evaluator
-    query_response = await aquery(fn_name=fn_name, version_number=version_number, text_input="I love this product!")
+    query_response = await aquery(fn_name=fn_name, version=-1, version_number=version_number, text_input="I love this product!")
 
     await assert_query_response(query_response)
     assert set(query_response["output"].keys()) == {"sentiment", "explanation"}
@@ -55,6 +55,7 @@ async def test_image_aquery(image_evaluator):
     fn_name, version_number, _ = await image_evaluator
     query_response = await aquery(
         fn_name=fn_name,
+        version=-1,
         version_number=version_number,
         images_input=[
             "https://www.integratedtreatmentservices.co.uk/wp-content/uploads/2013/12/Objects-of-Reference.jpg",
@@ -80,6 +81,7 @@ async def test_text_and_image_aquery(text_and_image_evaluator):
     fn_name, version_number, _ = await text_and_image_evaluator
     query_response = await aquery(
         fn_name=fn_name,
+        version=-1,
         version_number=version_number,
         text_input="Find x and y.",
         images_input=[

tests/test_batching.py

@@ -49,7 +49,7 @@ def test_batch_query_text(ml_task_evaluator, ml_task_inputs):
     fn_name, version_number = ml_task_evaluator
     batch_inputs = ml_task_inputs
 
-    query_responses = batch_query(fn_name=fn_name, version_number=version_number, batch_inputs=batch_inputs)
+    query_responses = batch_query(fn_name=fn_name, version=-1, version_number=version_number, batch_inputs=batch_inputs)
 
     assert len(query_responses) == len(batch_inputs)
 
@@ -67,7 +67,7 @@ def test_batch_query_image(image_evaluator, image_inputs):
     fn_name, version_number = image_evaluator
     batch_inputs = image_inputs
 
-    query_responses = batch_query(fn_name=fn_name, version_number=version_number, batch_inputs=batch_inputs)
+    query_responses = batch_query(fn_name=fn_name, version=-1, version_number=version_number, batch_inputs=batch_inputs)
 
     assert len(query_responses) == len(batch_inputs)
 

tests/test_reasoning.py

@@ -26,7 +26,7 @@ def text_reasoning_evaluator():
 def test_text_reasoning_query(text_reasoning_evaluator):
     fn_name, version_number, _ = text_reasoning_evaluator
     query_response = query(
-        fn_name=fn_name, version_number=version_number, text_input="I love this product!", return_reasoning=True
+        fn_name=fn_name, version=-1, version_number=version_number, text_input="I love this product!", return_reasoning=True
     )
 
     assert_query_response(query_response)
@@ -46,6 +46,7 @@ def test_vision_reasoning_query(vision_reasoning_evaluator):
     fn_name, version_number, _ = vision_reasoning_evaluator
     query_response = query(
         fn_name=fn_name,
+        version=-1,
         version_number=version_number,
         text_input="Find x and y.",
         images_input=[

tests/test_synchronous.py

@@ -33,7 +33,7 @@ def text_evaluator():
 
 def test_text_query(text_evaluator):
     fn_name, version_number, _ = text_evaluator
-    query_response = query(fn_name=fn_name, version_number=version_number, text_input="I love this product!")
+    query_response = query(fn_name=fn_name, version=-1, version_number=version_number, text_input="I love this product!")
 
     assert_query_response(query_response)
     assert set(query_response["output"].keys()) == {"sentiment", "explanation"}
@@ -52,6 +52,7 @@ def test_image_query(image_evaluator):
     fn_name, version_number, _ = image_evaluator
     query_response = query(
         fn_name=fn_name,
+        version=-1,
         version_number=version_number,
         images_input=[
             "https://www.integratedtreatmentservices.co.uk/wp-content/uploads/2013/12/Objects-of-Reference.jpg",
@@ -76,6 +77,7 @@ def test_text_and_image_query(text_and_image_evaluator):
     fn_name, version_number, _ = text_and_image_evaluator
     query_response = query(
         fn_name=fn_name,
+        version=-1,
         version_number=version_number,
         text_input="Find x and y.",
         images_input=[

weco/client.py

@@ -388,7 +388,8 @@ def _query(
         self,
         is_async: bool,
         fn_name: str,
-        version_number: Optional[int],
+        version: Union[str, int],
+        version_number: int,
         text_input: Optional[str],
         images_input: Optional[List[str]],
         return_reasoning: Optional[bool],
@@ -401,6 +402,8 @@ def _query(
             Whether to perform an asynchronous request.
         fn_name : str
             The name of the function to query.
+        version : Union[str, int]
+            The version alias or number of the function to query. 
         version_number : int, optional
             The version number of the function to query.
         text_input : str, optional
@@ -436,9 +439,10 @@ def _query(
         endpoint = "query"
         data = {
             "name": fn_name,
+            "version": version,
+            "version_number": version_number,
             "text": text_input,
             "images": image_urls,
-            "version_number": version_number,
             "return_reasoning": return_reasoning,
         }
         request = self._make_request(endpoint=endpoint, data=data, is_async=is_async)
@@ -457,6 +461,7 @@ async def _async_query():
     async def aquery(
         self,
         fn_name: str,
+        version: Optional[Union[str, int]] = -1,
         version_number: Optional[int] = -1,
         text_input: Optional[str] = "",
         images_input: Optional[List[str]] = [],
@@ -468,6 +473,8 @@ async def aquery(
         ----------
         fn_name : str
             The name of the function to query.
+        version : Union[str, int], optional
+            The version alias or number of the function to query. If not provided, the latest version will be used. Pass -1 to use the latest version.
         version_number : int, optional
             The version number of the function to query. If not provided, the latest version will be used. Pass -1 to use the latest version.
         text_input : str, optional
@@ -485,6 +492,7 @@ async def aquery(
         """
         return await self._query(
             fn_name=fn_name,
+            version=version,
             version_number=version_number,
             text_input=text_input,
             images_input=images_input,
@@ -495,6 +503,7 @@ async def aquery(
     def query(
         self,
         fn_name: str,
+        version: Optional[Union[str, int]] = -1,
         version_number: Optional[int] = -1,
         text_input: Optional[str] = "",
         images_input: Optional[List[str]] = [],
@@ -523,6 +532,7 @@ def query(
         """
         return self._query(
             fn_name=fn_name,
+            version=version,
             version_number=version_number,
             text_input=text_input,
             images_input=images_input,
@@ -534,6 +544,7 @@ def batch_query(
         self,
         fn_name: str,
         batch_inputs: List[Dict[str, Any]],
+        version: Optional[Union[str, int]] = -1,
         version_number: Optional[int] = -1,
         return_reasoning: Optional[bool] = False,
     ) -> List[Dict[str, Any]]:
@@ -547,6 +558,8 @@ def batch_query(
             A list of inputs for the functions to query. The input must be a dictionary containing the data to be processed. e.g.,
             when providing for a text input, the dictionary should be {"text_input": "input text"}, for an image input, the dictionary should be {"images_input": ["url1", "url2", ...]}
             and for a combination of text and image inputs, the dictionary should be {"text_input": "input text", "images_input": ["url1", "url2", ...]}.
+        version : Union[str, int], optional
+            The version alias or number of the function to query. If not provided, the latest version will be used. Pass -1 to use the latest version.
         version_number : int, optional
             The version number of the function to query. If not provided, the latest version will be used. Pass -1 to use the latest version.
         return_reasoning : bool, optional
@@ -563,7 +576,7 @@ async def run_queries():
             tasks = list(
                 map(
                     lambda fn_input: self.aquery(
-                        fn_name=fn_name, version_number=version_number, return_reasoning=return_reasoning, **fn_input
+                        fn_name=fn_name, version=version, version_number=version_number, return_reasoning=return_reasoning, **fn_input
                     ),
                     batch_inputs,
                 )

weco/functional.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from .client import WecoAI
 
@@ -49,6 +49,7 @@ async def abuild(task_description: str, multimodal: bool = False, api_key: str =
 
 def query(
     fn_name: str,
+    version: Optional[Union[str, int]] = -1,
     version_number: Optional[int] = -1,
     text_input: Optional[str] = "",
     images_input: Optional[List[str]] = [],
@@ -61,6 +62,8 @@ def query(
     ----------
     fn_name : str
         The name of the function to query.
+    version : str | int, optional
+        The version alias or number of the function to query. If not provided, the latest version is used. Default is -1 for the same behavior.
     version_number : int, optional
         The version number of the function to query. If not provided, the latest version is used. Default is -1 for the same behavior.
     text_input : str, optional
@@ -81,6 +84,7 @@ def query(
     client = WecoAI(api_key=api_key)
     response = client.query(
         fn_name=fn_name,
+        version=version,
         version_number=version_number,
         text_input=text_input,
         images_input=images_input,
@@ -91,6 +95,7 @@ def query(
 
 async def aquery(
     fn_name: str,
+    version: Optional[Union[str, int]] = -1,
     version_number: Optional[int] = -1,
     text_input: Optional[str] = "",
     images_input: Optional[List[str]] = [],
@@ -103,6 +108,8 @@ async def aquery(
     ----------
     fn_name : str
         The name of the function to query.
+    version: str | int, optional
+        The version number or alias of the function to query. If not provided, the latest version is used. Default is -1 for the same behavior.
     version_number : int, optional
         The version number of the function to query. If not provided, the latest version is used. Default is -1 for the same behavior.
     text_input : str, optional
@@ -123,6 +130,7 @@ async def aquery(
     client = WecoAI(api_key=api_key)
     response = await client.aquery(
         fn_name=fn_name,
+        version=version,
         version_number=version_number,
         text_input=text_input,
         images_input=images_input,
@@ -134,6 +142,7 @@ async def aquery(
 def batch_query(
     fn_name: str,
     batch_inputs: List[Dict[str, Any]],
+    version: Optional[Union[str, int]] = -1,
     version_number: Optional[int] = -1,
     return_reasoning: Optional[bool] = False,
     api_key: Optional[str] = None,
@@ -153,6 +162,8 @@ def batch_query(
        A list of inputs for the functions to query. The input must be a dictionary containing the data to be processed. e.g.,
        when providing for a text input, the dictionary should be {"text_input": "input text"}, for an image input, the dictionary should be {"images_input": ["url1", "url2", ...]}
        and for a combination of text and image inputs, the dictionary should be {"text_input": "input text", "images_input": ["url1", "url2", ...]}.
+    version : str | int, optional
+        The version number or alias of the function to query. If not provided, the latest version is used. Default is -1 for the same behavior.
     version_number : int, optional
         The version number of the function to query. If not provided, the latest version is used. Default is -1 for the same behavior.
     return_reasoning : bool, optional
@@ -168,6 +179,6 @@ def batch_query(
     """
     client = WecoAI(api_key=api_key)
     responses = client.batch_query(
-        fn_name=fn_name, version_number=version_number, batch_inputs=batch_inputs, return_reasoning=return_reasoning
+        fn_name=fn_name, version=version, version_number=version_number, batch_inputs=batch_inputs, return_reasoning=return_reasoning
     )
     return responses