rapidata 1.4.0__tar.gz → 1.4.2__tar.gz

{rapidata-1.4.0 → rapidata-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rapidata
-Version: 1.4.0
+Version: 1.4.2
 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.0 → rapidata-1.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rapidata"
-version = "1.4.0"
+version = "1.4.2"
 description = "Rapidata package containing the Rapidata Python Client to interact with the Rapidata Web API in an easy way."
 authors = ["Rapidata AG <info@rapidata.ai>"]
 license = "Apache-2.0"

{rapidata-1.4.0 → rapidata-1.4.2}/src/rapidata/rapidata_client/rapidata_client.py

@@ -11,10 +11,14 @@ from rapidata.rapidata_client.dataset.rapidata_dataset import RapidataDataset
 from rapidata.rapidata_client.simple_builders.simple_classification_builders import ClassificationQuestionBuilder
 from rapidata.rapidata_client.simple_builders.simple_compare_builders import CompareCriteriaBuilder
 
+from rapidata.api_client.exceptions import BadRequestException
+from urllib3._collections import HTTPHeaderDict
+
 from rapidata.api_client.models.query_orders_model import QueryOrdersModel
 from rapidata.api_client.models.page_info import PageInfo
 from rapidata.api_client.models.root_filter import RootFilter
 from rapidata.api_client.models.filter import Filter
+from rapidata.api_client.models.sort_criterion import SortCriterion
 
 
 class RapidataClient:
@@ -103,12 +107,13 @@ class RapidataClient:
             name=order.order_name,
             openapi_service=self.openapi_service)
     
-    def find_orders(self, name: str = "", amount: int = 1) -> list[RapidataOrder]:
-        """Find orders by name. If name is not provided, it will return the most recent order.
+    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.
 
         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.
@@ -116,9 +121,15 @@ class RapidataClient:
         try:
             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)])))
-        except Exception:
-            raise ValueError(f"Failed to find orders with name {name}.")
+                filter=RootFilter(filters=[Filter(field="OrderName", operator="Contains", value=name)]),
+                sortCriteria=[SortCriterion(direction="Desc" if latest else "Asc", propertyName="OrderDate")]
+                ))
+            
+        except BadRequestException as e:
+            raise ValueError(f"Error occured during request. \nError: {e.body} \nTraceid: {e.headers.get('X-Trace-Id') if isinstance(e.headers, HTTPHeaderDict) else 'Unknown'}")
+
+        except Exception as e:
+            raise ValueError(f"Unknown error occured: {e}")
         
         orders = [self.get_order(order.id) for order in order_page_result.items]
         return orders