scaleapi 2.14.3__tar.gz → 2.15.0__tar.gz

{scaleapi-2.14.3 → scaleapi-2.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scaleapi
-Version: 2.14.3
+Version: 2.15.0
 Summary: The official Python client library for Scale AI, the Data Platform for AI
 Home-page: https://github.com/scaleapi/scaleapi-python-client
 Author: Scale AI

{scaleapi-2.14.3 → scaleapi-2.15.0}/scaleapi/__init__.py

@@ -269,6 +269,10 @@ class ScaleClient:
             limit (int):
                 Determines the page size (1-100)
 
+            include_attachment_url (bool):
+                If true, returns a pre-signed s3 url for the
+                attachment used to create the task.
+
             next_token (str):
                 Can be use to fetch the next page of tasks
         """
@@ -288,6 +292,7 @@ class ScaleClient:
             "updated_before",
             "updated_after",
             "unique_id",
+            "include_attachment_url",
         }
 
         for key in kwargs:
@@ -323,6 +328,7 @@ class ScaleClient:
         created_after: str = None,
         created_before: str = None,
         tags: Union[List[str], str] = None,
+        include_attachment_url: bool = True,
     ) -> Generator[Task, None, None]:
         """Retrieve all tasks as a `generator` method, with the
         given parameters. This methods handles pagination of
@@ -382,6 +388,11 @@ class ScaleClient:
                 The tags of a task; multiple tags can be
                 specified as a list.
 
+            include_attachment_url (bool):
+                If true, returns a pre-signed s3 url for the
+                attachment used to create the task.
+
+
         Yields:
             Generator[Task]:
                 Yields Task objects, can be iterated.
@@ -404,6 +415,7 @@ class ScaleClient:
             created_after,
             created_before,
             tags,
+            include_attachment_url,
         )
 
         while has_more:
@@ -431,6 +443,7 @@ class ScaleClient:
         created_after: str = None,
         created_before: str = None,
         tags: Union[List[str], str] = None,
+        include_attachment_url: bool = True,
     ) -> int:
         """Returns number of tasks with given filters.
 
@@ -485,6 +498,10 @@ class ScaleClient:
                 The tags of a task; multiple tags can be
                 specified as a list.
 
+            include_attachment_url (bool):
+                If true, returns a pre-signed s3 url for the
+                attachment used to create the task.
+
         Returns:
             int:
                 Returns number of tasks
@@ -504,6 +521,7 @@ class ScaleClient:
             created_after,
             created_before,
             tags,
+            include_attachment_url,
         )
 
         tasks_args["limit"] = 1
@@ -526,6 +544,7 @@ class ScaleClient:
         created_after: str = None,
         created_before: str = None,
         tags: Union[List[str], str] = None,
+        include_attachment_url: bool = True,
     ):
         """Generates args for /tasks endpoint."""
         tasks_args = {
@@ -539,6 +558,7 @@ class ScaleClient:
             "updated_before": updated_before,
             "updated_after": updated_after,
             "unique_id": unique_id,
+            "include_attachment_url": include_attachment_url,
         }
 
         if status:

{scaleapi-2.14.3 → scaleapi-2.15.0}/scaleapi/_version.py

@@ -1,2 +1,2 @@
-__version__ = "2.14.3"
+__version__ = "2.15.0"
 __package_name__ = "scaleapi"

{scaleapi-2.14.3 → scaleapi-2.15.0}/scaleapi/api.py

@@ -151,16 +151,22 @@ class Api:
             #   error=None,
             #   status=409,
             #   redirect_location=None)
-            if retry_history != ():
-                # See if the first retry was a 500 or 503 error
-                if retry_history[0][3] >= 500:
-                    uuid = body["unique_id"]
-                    newUrl = f"{self.base_api_url}/tasks?unique_id={uuid}"
-                    # grab task from api
-                    newRes = self._http_request(
-                        "GET", newUrl, headers=headers, auth=auth
-                    )
-                    json = newRes.json()["docs"][0]
+
+            if retry_history and retry_history[0][3] >= 500:
+                uuid = body["unique_id"]
+                new_url = f"{self.base_api_url}/tasks?unique_id={uuid}"
+
+                # Perform a GET request to retrieve task data
+                new_res = self._http_request("GET", new_url, headers=headers, auth=auth)
+
+                if new_res.status_code == 200:
+                    new_res_data = new_res.json()
+                    if new_res_data["docs"]:
+                        json = new_res_data["docs"][0]
+                    else:
+                        self._raise_on_respose(new_res)
+                else:
+                    self._raise_on_respose(new_res)
             else:
                 self._raise_on_respose(res)
         else:

{scaleapi-2.14.3 → scaleapi-2.15.0}/scaleapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scaleapi
-Version: 2.14.3
+Version: 2.15.0
 Summary: The official Python client library for Scale AI, the Data Platform for AI
 Home-page: https://github.com/scaleapi/scaleapi-python-client
 Author: Scale AI