rapidata 1.4.2__py3-none-any.whl → 1.4.4__py3-none-any.whl

rapidata/rapidata_client/order/rapidata_order.py

@@ -1,4 +1,4 @@
-import time
+from time import sleep
 from rapidata.rapidata_client.dataset.rapidata_dataset import RapidataDataset
 from rapidata.service.openapi_service import OpenAPIService
 import json
@@ -61,11 +61,11 @@ class RapidataOrder:
         :param refresh_rate: How often to refresh the progress bar, in seconds.
         :type refresh_rate: float
         """
-        total_rapids = self._get_total_rapids()
+        total_rapids = self._get_workflow_progress().total
         with tqdm(total=total_rapids, desc="Processing order", unit="rapids") as pbar:
             completed_rapids = 0
             while True:
-                current_completed = self._get_completed_rapids()
+                current_completed = self._get_workflow_progress().completed
                 if current_completed > completed_rapids:
                     pbar.update(current_completed - completed_rapids)
                     completed_rapids = current_completed
@@ -73,7 +73,7 @@ class RapidataOrder:
                 if completed_rapids >= total_rapids:
                     break
 
-                time.sleep(refresh_rate)
+                sleep(refresh_rate)
 
     def _get_workflow_id(self):
         if self._workflow_id:
@@ -86,31 +86,38 @@ class RapidataOrder:
                 self._workflow_id = cast(WorkflowArtifactModel, pipeline.artifacts["workflow-artifact"].actual_instance).workflow_id
                 break
             except Exception:
-                time.sleep(2)
+                sleep(2)
         if not self._workflow_id:
-            raise Exception("Order has not started yet. Please wait for a few seconds and try again.")
+            raise Exception("Order has not started yet. Please start it or wait for a few seconds and try again.")
         return self._workflow_id
-
-    def _get_total_rapids(self):
-        workflow_id = self._get_workflow_id()
-        return self.openapi_service.workflow_api.workflow_get_progress_get(workflow_id).total
-
-    def _get_completed_rapids(self):
+    
+    def _get_workflow_progress(self):
         workflow_id = self._get_workflow_id()
-        return self.openapi_service.workflow_api.workflow_get_progress_get(workflow_id).completed
+        progress = None
+        for _ in range(2):
+            try:
+                progress = self.openapi_service.workflow_api.workflow_get_progress_get(workflow_id)
+                break
+            except Exception:
+                sleep(5)
 
-    def get_progress_percentage(self):
-        workflow_id = self._get_workflow_id()
-        progress = self.openapi_service.workflow_api.workflow_get_progress_get(workflow_id)
-        return progress.completion_percentage
+        if not progress:
+            raise Exception(f"Failed to get progress. Please try again in a few seconds.")
+        
+        return progress
 
+        
     def get_results(self):
         """
-        Gets the results of the order.
+        Gets the results of the order. 
+        If the order is still processing, this method will block until the order is completed and then return the results.
 
         :return: The results of the order.
         :rtype: dict
         """
+        while self.get_status().state == "Processing":
+            sleep(5)
+
         try:
             # Get the raw result string
             result_str = self.openapi_service.order_api.order_result_get(id=self.order_id)

rapidata/rapidata_client/rapidata_client.py

@@ -107,13 +107,12 @@ class RapidataClient:
             name=order.order_name,
             openapi_service=self.openapi_service)
     
-    def find_orders(self, name: str = "", amount: int = 1, latest=True) -> list[RapidataOrder]:
-        """Find your orders given criteria. If nothing is provided, it will return the most recent order.
+    def find_orders(self, name: str = "", amount: int = 1) -> list[RapidataOrder]:
+        """Find your recent orders given criteria. If nothing is provided, it will return the most recent order.
 
         Args:
             name (str, optional): The name of the order - matching order will contain the name. Defaults to "" for any order.
             amount (int, optional): The amount of orders to return. Defaults to 1.
-            latest (bool, optional): If True, the most recent orders will be returned. If False, the oldest orders will be returned. Defaults to True.
 
         Returns:
             list[RapidataOrder]: A list of RapidataOrder instances.
@@ -122,7 +121,7 @@ class RapidataClient:
             order_page_result = self.openapi_service.order_api.order_query_get(QueryOrdersModel(
                 page=PageInfo(index=1, size=amount),
                 filter=RootFilter(filters=[Filter(field="OrderName", operator="Contains", value=name)]),
-                sortCriteria=[SortCriterion(direction="Desc" if latest else "Asc", propertyName="OrderDate")]
+                sortCriteria=[SortCriterion(direction="Desc", propertyName="OrderDate")]
                 ))
             
         except BadRequestException as e:

{rapidata-1.4.2.dist-info → rapidata-1.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rapidata
-Version: 1.4.2
+Version: 1.4.4
 Summary: Rapidata package containing the Rapidata Python Client to interact with the Rapidata Web API in an easy way.
 License: Apache-2.0
 Author: Rapidata AG

{rapidata-1.4.2.dist-info → rapidata-1.4.4.dist-info}/RECORD

@@ -341,9 +341,9 @@ rapidata/rapidata_client/metadata/prompt_metadata.py,sha256=_FypjKWrC3iKUO_G2CVw
 rapidata/rapidata_client/metadata/public_text_metadata.py,sha256=LTiBQHs6izxQ6-C84d6Pf7lL4ENTDgg__HZnDKvzvMc,511
 rapidata/rapidata_client/metadata/transcription_metadata.py,sha256=THtDEVCON4UlcXHmXrjilaOLHys4TrktUOPGWnXaCcc,631
 rapidata/rapidata_client/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rapidata/rapidata_client/order/rapidata_order.py,sha256=u0VhNgnbT0dn3AJiITqjtqn_OWgdwUcXrgU4iblPXZI,4663
+rapidata/rapidata_client/order/rapidata_order.py,sha256=IMozRlrYK_yqGLk0GQbLNYL_RRb7gUcSgDe6NUjOEEE,4812
 rapidata/rapidata_client/order/rapidata_order_builder.py,sha256=QvICzduLAuAkf8qFKxHV3zAag838WnV9lEzWdD4dxI0,15926
-rapidata/rapidata_client/rapidata_client.py,sha256=bW1kwb3EYI5dYftrFoWnQ8bVncSFEzLJezUuRvvmHsU,7134
+rapidata/rapidata_client/rapidata_client.py,sha256=UKFDbck3TOcSIRM31gHpl7vpSCHd3jPrjiTODfBPH44,6956
 rapidata/rapidata_client/referee/__init__.py,sha256=Ow9MQsONhF4sX2wFK9jbvSBrpcJgtq3OglIQMkBUdIY,167
 rapidata/rapidata_client/referee/base_referee.py,sha256=bMy7cw0a-pGNbFu6u_1_Jplu0A483Ubj4oDQzh8vu8k,493
 rapidata/rapidata_client/referee/classify_early_stopping_referee.py,sha256=B5wsqKM3_Oc1TU_MFGiIyiXjwK1LcmaVjhzLdaL8Cgw,1797
@@ -372,7 +372,7 @@ rapidata/service/local_file_service.py,sha256=pgorvlWcx52Uh3cEG6VrdMK_t__7dacQ_5
 rapidata/service/openapi_service.py,sha256=pGcOCttKZW0PVCSM7Kfehe5loh7CxmmDDbu4UJbamnI,2770
 rapidata/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/utils/image_utils.py,sha256=TldO3eJWG8IhfJjm5MfNGO0mEDm1mQTsRoA0HLU1Uxs,404
-rapidata-1.4.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-rapidata-1.4.2.dist-info/METADATA,sha256=VwoDi4szkVcBk-fmrFJD9tKTD6wMzfyDGxpQQtlsACM,1012
-rapidata-1.4.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-rapidata-1.4.2.dist-info/RECORD,,
+rapidata-1.4.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+rapidata-1.4.4.dist-info/METADATA,sha256=7i3T_HJVJpDWZuwxdzjy7al08xAY_yZCxZjMhdllncc,1012
+rapidata-1.4.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+rapidata-1.4.4.dist-info/RECORD,,