weco 0.1.8__tar.gz → 0.1.10__tar.gz

{weco-0.1.8 → weco-0.1.10}/.github/workflows/release.yml

@@ -79,7 +79,7 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
       run: >-
         gh release create
-        'v0.1.8'
+        'v0.1.10'
         --repo '${{ github.repository }}'
         --notes ""
     - name: Upload artifact signatures to GitHub Release
@@ -90,5 +90,5 @@ jobs:
       # sigstore-produced signatures and certificates.
       run: >-
         gh release upload
-        'v0.1.8' dist/**
+        'v0.1.9' dist/**
         --repo '${{ github.repository }}'

{weco-0.1.8 → weco-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weco
-Version: 0.1.8
+Version: 0.1.10
 Summary: A client facing API for interacting with the WeCo AI function builder service.
 Author-email: WeCo AI Team <dhruv@weco.ai>
 License: MIT

{weco-0.1.8 → weco-0.1.10}/pyproject.toml

@@ -10,7 +10,7 @@ authors = [
 ]
 description = "A client facing API for interacting with the WeCo AI function builder service."
 readme = "README.md"
-version = "0.1.8"
+version = "0.1.10"
 license = {text = "MIT"}
 requires-python = ">=3.8"
 dependencies = ["asyncio", "httpx[http2]", "pillow"]

{weco-0.1.8 → weco-0.1.10}/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=[

{weco-0.1.8 → weco-0.1.10}/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)
 

{weco-0.1.8 → weco-0.1.10}/tests/test_reasoning.py

@@ -7,7 +7,8 @@ def assert_query_response(query_response):
     assert isinstance(query_response, dict)
     assert isinstance(query_response["output"], dict)
     assert isinstance(query_response["reasoning_steps"], list)
-    for step in query_response["reasoning_steps"]: assert isinstance(step, str)
+    for step in query_response["reasoning_steps"]:
+        assert isinstance(step, str)
     assert isinstance(query_response["in_tokens"], int)
     assert isinstance(query_response["out_tokens"], int)
     assert isinstance(query_response["latency_ms"], float)
@@ -24,11 +25,14 @@ 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)
+    query_response = query(
+        fn_name=fn_name, version=-1, version_number=version_number, text_input="I love this product!", return_reasoning=True
+    )
 
     assert_query_response(query_response)
     assert set(query_response["output"].keys()) == {"sentiment", "explanation"}
 
+
 @pytest.fixture
 def vision_reasoning_evaluator():
     fn_name, version_number, fn_desc = build(
@@ -42,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=[

{weco-0.1.8 → weco-0.1.10}/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-0.1.8 → weco-0.1.10}/weco/client.py

@@ -68,6 +68,7 @@ class WecoAI:
         self.http2 = http2
         self.timeout = timeout
         self.base_url = "https://function.api.weco.ai"
+
         # Setup clients
         self.client = httpx.Client(http2=http2, timeout=timeout)
         self.async_client = httpx.AsyncClient(http2=http2, timeout=timeout)
@@ -246,18 +247,12 @@ class WecoAI:
         """
         return self._build(task_description=task_description, multimodal=multimodal, is_async=False)
 
-    def _upload_image(self, fn_name: str, version_number: int, upload_id: str, image_info: Dict[str, Any]) -> str:
+    def _upload_image(self, image_info: Dict[str, Any]) -> str:
         """
         Uploads an image to an S3 bucket and returns the URL of the uploaded image.
 
         Parameters
         ----------
-        fn_name : str
-            The name of the function for which the image is being uploaded.
-        version_number : int
-            The version number of the function for which the image is being uploaded.
-        upload_id: str
-            A unique identifier for the image upload.
         image_info : Dict[str, Any]
             A dictionary containing the image metadata.
 
@@ -290,7 +285,7 @@ class WecoAI:
 
         # Request a presigned URL from the server
         endpoint = "upload_link"
-        request_data = {"fn_name": fn_name, "version_number": version_number, "upload_id": upload_id, "file_type": file_type}
+        request_data = {"file_type": file_type}
         # This needs to be a synchronous request since we need the presigned URL to upload the image
         response = self._make_request(endpoint=endpoint, data=request_data, is_async=False)
 
@@ -393,10 +388,11 @@ class WecoAI:
         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]
+        return_reasoning: Optional[bool],
     ) -> Union[Dict[str, Any], Coroutine[Any, Any, Dict[str, Any]]]:
         """Internal method to handle both synchronous and asynchronous query requests.
 
@@ -406,6 +402,8 @@ class WecoAI:
             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
@@ -430,17 +428,23 @@ class WecoAI:
 
         # Create links for all images that are not public URLs and upload images
         image_urls = []
-        upload_id = generate_random_base16_code()
         for i, info in enumerate(image_info):
             if info["source"] == "url" or info["source"] == "base64" or info["source"] == "local":
-                url = self._upload_image(fn_name=fn_name, version_number=version_number, upload_id=upload_id, image_info=info)
+                url = self._upload_image(image_info=info)
             else:
                 raise ValueError(f"Image at index {i} must be a public URL or a path to a local image file.")
             image_urls.append(url)
 
         # Make the request
         endpoint = "query"
-        data = {"name": fn_name, "text": text_input, "images": image_urls, "version_number": version_number, "return_reasoning": return_reasoning}
+        data = {
+            "name": fn_name,
+            "version": version,
+            "version_number": version_number,
+            "text": text_input,
+            "images": image_urls,
+            "return_reasoning": return_reasoning,
+        }
         request = self._make_request(endpoint=endpoint, data=data, is_async=is_async)
 
         if is_async:
@@ -457,10 +461,11 @@ class WecoAI:
     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]] = [],
-        return_reasoning: Optional[bool] = False
+        return_reasoning: Optional[bool] = False,
     ) -> Dict[str, Any]:
         """Asynchronously queries a function with the given function ID and input.
 
@@ -468,6 +473,8 @@ class WecoAI:
         ----------
         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
@@ -484,16 +491,23 @@ class WecoAI:
             and the latency in milliseconds.
         """
         return await self._query(
-            fn_name=fn_name, version_number=version_number, text_input=text_input, images_input=images_input, return_reasoning=return_reasoning, is_async=True
+            fn_name=fn_name,
+            version=version,
+            version_number=version_number,
+            text_input=text_input,
+            images_input=images_input,
+            return_reasoning=return_reasoning,
+            is_async=True,
         )
 
     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]] = [],
-        return_reasoning: Optional[bool] = False
+        return_reasoning: Optional[bool] = False,
     ) -> Dict[str, Any]:
         """Synchronously queries a function with the given function ID and input.
 
@@ -517,11 +531,22 @@ class WecoAI:
             and the latency in milliseconds.
         """
         return self._query(
-            fn_name=fn_name, version_number=version_number, text_input=text_input, images_input=images_input, return_reasoning=return_reasoning, is_async=False
+            fn_name=fn_name,
+            version=version,
+            version_number=version_number,
+            text_input=text_input,
+            images_input=images_input,
+            return_reasoning=return_reasoning,
+            is_async=False,
         )
 
     def batch_query(
-        self, fn_name: str, batch_inputs: List[Dict[str, Any]], version_number: Optional[int] = -1, return_reasoning: Optional[bool] = False
+        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]]:
         """Batch queries a function version with a list of inputs.
 
@@ -533,6 +558,8 @@ class WecoAI:
             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
@@ -547,7 +574,12 @@ class WecoAI:
 
         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), batch_inputs)
+                map(
+                    lambda fn_input: self.aquery(
+                        fn_name=fn_name, version=version, version_number=version_number, return_reasoning=return_reasoning, **fn_input
+                    ),
+                    batch_inputs,
+                )
             )
             return await asyncio.gather(*tasks)
 

{weco-0.1.8 → weco-0.1.10}/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
@@ -79,12 +82,20 @@ def query(
         and the latency in milliseconds.
     """
     client = WecoAI(api_key=api_key)
-    response = client.query(fn_name=fn_name, version_number=version_number, text_input=text_input, images_input=images_input, return_reasoning=return_reasoning)
+    response = client.query(
+        fn_name=fn_name,
+        version=version,
+        version_number=version_number,
+        text_input=text_input,
+        images_input=images_input,
+        return_reasoning=return_reasoning,
+    )
     return response
 
 
 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]] = [],
@@ -97,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
@@ -116,13 +129,23 @@ async def aquery(
     """
     client = WecoAI(api_key=api_key)
     response = await client.aquery(
-        fn_name=fn_name, version_number=version_number, text_input=text_input, images_input=images_input, return_reasoning=return_reasoning
+        fn_name=fn_name,
+        version=version,
+        version_number=version_number,
+        text_input=text_input,
+        images_input=images_input,
+        return_reasoning=return_reasoning,
     )
     return response
 
 
 def batch_query(
-    fn_name: str, batch_inputs: List[Dict[str, Any]], version_number: Optional[int] = -1, return_reasoning: Optional[bool] = False, api_key: Optional[str] = None
+    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,
 ) -> List[Dict[str, Any]]:
     """Synchronously queries multiple functions using asynchronous calls internally.
 
@@ -139,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
@@ -153,5 +178,7 @@ def batch_query(
         in the same order as the input queries.
     """
     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)
+    responses = client.batch_query(
+        fn_name=fn_name, version=version, version_number=version_number, batch_inputs=batch_inputs, return_reasoning=return_reasoning
+    )
     return responses

{weco-0.1.8 → weco-0.1.10}/weco.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weco
-Version: 0.1.8
+Version: 0.1.10
 Summary: A client facing API for interacting with the WeCo AI function builder service.
 Author-email: WeCo AI Team <dhruv@weco.ai>
 License: MIT