weco 0.1.9__py3-none-any.whl → 0.1.10__py3-none-any.whl

weco/client.py

@@ -247,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.
 
@@ -291,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)
 
@@ -394,7 +388,8 @@ 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],
@@ -407,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
@@ -431,10 +428,9 @@ 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)
@@ -443,9 +439,10 @@ class WecoAI:
         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)
@@ -464,6 +461,7 @@ 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]] = [],
@@ -475,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
@@ -492,6 +492,7 @@ class WecoAI:
         """
         return await self._query(
             fn_name=fn_name,
+            version=version,
             version_number=version_number,
             text_input=text_input,
             images_input=images_input,
@@ -502,6 +503,7 @@ class WecoAI:
     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]] = [],
@@ -530,6 +532,7 @@ class WecoAI:
         """
         return self._query(
             fn_name=fn_name,
+            version=version,
             version_number=version_number,
             text_input=text_input,
             images_input=images_input,
@@ -541,6 +544,7 @@ class WecoAI:
         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]]:
@@ -554,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
@@ -570,7 +576,7 @@ class WecoAI:
             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

{weco-0.1.9.dist-info → weco-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weco
-Version: 0.1.9
+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.10.dist-info/RECORD

@@ -0,0 +1,10 @@
+weco/__init__.py,sha256=qiKpnrm6t0n0bpAtXEKJO1Yz2xYXnJJRZBWt-cH7DdU,168
+weco/client.py,sha256=iJanKlSKlcg3x6V7rA0Bw7Px2nGy87766rePvGn-KzI,23013
+weco/constants.py,sha256=eoAq-9qN2aZrqyIWdrb3V1zomV5kp80PfxxoPoQNMNI,167
+weco/functional.py,sha256=CgQsBKppRmT1lAloEdTEbE1gOeCciK-H6RTUR6DDrrc,7706
+weco/utils.py,sha256=UUSw6ocqWdlSmIXVcH66DAL4NuLU2rFOyviD8aTWsv0,4371
+weco-0.1.10.dist-info/LICENSE,sha256=NvpxfBuSajszAczWBGKxhHe4gsvil1H63zmu8xXZdL0,1064
+weco-0.1.10.dist-info/METADATA,sha256=-6joUA_QvFIHrrXSe0LqbXbypW1PTW4d8keLneJ9fu0,5717
+weco-0.1.10.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+weco-0.1.10.dist-info/top_level.txt,sha256=F0N7v6e2zBSlsorFv-arAq2yDxQbzX3KVO8GxYhPUeE,5
+weco-0.1.10.dist-info/RECORD,,

{weco-0.1.9.dist-info → weco-0.1.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

weco-0.1.9.dist-info/RECORD

@@ -1,10 +0,0 @@
-weco/__init__.py,sha256=qiKpnrm6t0n0bpAtXEKJO1Yz2xYXnJJRZBWt-cH7DdU,168
-weco/client.py,sha256=mW0FRv6_ZEl1h12HfQ9Gfag84Nlzs6RFrXRNcW5vMBo,22782
-weco/constants.py,sha256=eoAq-9qN2aZrqyIWdrb3V1zomV5kp80PfxxoPoQNMNI,167
-weco/functional.py,sha256=v_YsR2jomckwDKRt-ZZtqC8-JmHJZ12tB6fJyCa6sYk,6964
-weco/utils.py,sha256=UUSw6ocqWdlSmIXVcH66DAL4NuLU2rFOyviD8aTWsv0,4371
-weco-0.1.9.dist-info/LICENSE,sha256=NvpxfBuSajszAczWBGKxhHe4gsvil1H63zmu8xXZdL0,1064
-weco-0.1.9.dist-info/METADATA,sha256=70IQjezjRB-dTf3jg0Owr892snZOHL_RY0rpwpXcvxo,5716
-weco-0.1.9.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-weco-0.1.9.dist-info/top_level.txt,sha256=F0N7v6e2zBSlsorFv-arAq2yDxQbzX3KVO8GxYhPUeE,5
-weco-0.1.9.dist-info/RECORD,,