rapidata 2.1.0__tar.gz → 2.1.2__tar.gz

{rapidata-2.1.0 → rapidata-2.1.2}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rapidata"
-version = "2.1.0"
+version = "2.1.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-2.1.0 → rapidata-2.1.2}/src/rapidata/api_client/__init__.py

@@ -163,7 +163,6 @@ from rapidata.api_client.models.get_compare_workflow_result_overview_small_resul
 from rapidata.api_client.models.get_datapoints_by_dataset_id_result import GetDatapointsByDatasetIdResult
 from rapidata.api_client.models.get_dataset_by_id_result import GetDatasetByIdResult
 from rapidata.api_client.models.get_order_by_id_result import GetOrderByIdResult
-from rapidata.api_client.models.get_order_results_result import GetOrderResultsResult
 from rapidata.api_client.models.get_pipeline_by_id_result import GetPipelineByIdResult
 from rapidata.api_client.models.get_pipeline_by_id_result_artifacts_value import GetPipelineByIdResultArtifactsValue
 from rapidata.api_client.models.get_public_orders_result import GetPublicOrdersResult

{rapidata-2.1.0 → rapidata-2.1.2}/src/rapidata/api_client/api/dataset_api.py

@@ -1459,7 +1459,7 @@ class DatasetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> UploadDatapointsResult:
-        """Creates a new multi asset datapoint.
+        """(Deprecated) Creates a new multi asset datapoint.
 
 
         :param dataset_id: The id of the dataset to upload the datapoint to.
@@ -1487,6 +1487,7 @@ class DatasetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /Dataset/UploadDatapoint is deprecated.", DeprecationWarning)
 
         _param = self._dataset_upload_datapoint_post_serialize(
             dataset_id=dataset_id,
@@ -1529,7 +1530,7 @@ class DatasetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> ApiResponse[UploadDatapointsResult]:
-        """Creates a new multi asset datapoint.
+        """(Deprecated) Creates a new multi asset datapoint.
 
 
         :param dataset_id: The id of the dataset to upload the datapoint to.
@@ -1557,6 +1558,7 @@ class DatasetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /Dataset/UploadDatapoint is deprecated.", DeprecationWarning)
 
         _param = self._dataset_upload_datapoint_post_serialize(
             dataset_id=dataset_id,
@@ -1599,7 +1601,7 @@ class DatasetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Creates a new multi asset datapoint.
+        """(Deprecated) Creates a new multi asset datapoint.
 
 
         :param dataset_id: The id of the dataset to upload the datapoint to.
@@ -1627,6 +1629,7 @@ class DatasetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /Dataset/UploadDatapoint is deprecated.", DeprecationWarning)
 
         _param = self._dataset_upload_datapoint_post_serialize(
             dataset_id=dataset_id,
@@ -2030,7 +2033,7 @@ class DatasetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> None:
-        """Uploads images to a dataset.
+        """(Deprecated) Uploads images to a dataset.
 
         If multiple files are uploaded, a new datapoint will be created for each file.
 
@@ -2059,6 +2062,7 @@ class DatasetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /Dataset/UploadImagesToDataset is deprecated.", DeprecationWarning)
 
         _param = self._dataset_upload_images_to_dataset_post_serialize(
             dataset_id=dataset_id,
@@ -2101,7 +2105,7 @@ class DatasetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> ApiResponse[None]:
-        """Uploads images to a dataset.
+        """(Deprecated) Uploads images to a dataset.
 
         If multiple files are uploaded, a new datapoint will be created for each file.
 
@@ -2130,6 +2134,7 @@ class DatasetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /Dataset/UploadImagesToDataset is deprecated.", DeprecationWarning)
 
         _param = self._dataset_upload_images_to_dataset_post_serialize(
             dataset_id=dataset_id,
@@ -2172,7 +2177,7 @@ class DatasetApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Uploads images to a dataset.
+        """(Deprecated) Uploads images to a dataset.
 
         If multiple files are uploaded, a new datapoint will be created for each file.
 
@@ -2201,6 +2206,7 @@ class DatasetApi:
         :type _host_index: int, optional
         :return: Returns the result object.
         """ # noqa: E501
+        warnings.warn("POST /Dataset/UploadImagesToDataset is deprecated.", DeprecationWarning)
 
         _param = self._dataset_upload_images_to_dataset_post_serialize(
             dataset_id=dataset_id,

{rapidata-2.1.0 → rapidata-2.1.2}/src/rapidata/api_client/api/order_api.py

@@ -17,7 +17,7 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictStr
-from typing import Optional
+from typing import Any, Optional
 from typing_extensions import Annotated
 from rapidata.api_client.models.clone_order_model import CloneOrderModel
 from rapidata.api_client.models.clone_order_result import CloneOrderResult
@@ -28,7 +28,6 @@ from rapidata.api_client.models.create_order_result import CreateOrderResult
 from rapidata.api_client.models.create_unsupported_order_model import CreateUnsupportedOrderModel
 from rapidata.api_client.models.feedback_model import FeedbackModel
 from rapidata.api_client.models.get_order_by_id_result import GetOrderByIdResult
-from rapidata.api_client.models.get_order_results_result import GetOrderResultsResult
 from rapidata.api_client.models.get_public_orders_result import GetPublicOrdersResult
 from rapidata.api_client.models.order_model_paged_result import OrderModelPagedResult
 from rapidata.api_client.models.query_model import QueryModel
@@ -2209,9 +2208,10 @@ class OrderApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> GetOrderResultsResult:
+    ) -> object:
         """Aggregates the results of an order.
 
+        Returns the aggregated result as a file with a given name.  The annotated type of the response represents the content type of the file.
 
         :param id: The id of the order
         :type id: str
@@ -2246,7 +2246,7 @@ class OrderApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "GetOrderResultsResult",
+            '200': "object",
         }
         response_data = self.api_client.call_api(
             *_param,
@@ -2275,9 +2275,10 @@ class OrderApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[GetOrderResultsResult]:
+    ) -> ApiResponse[object]:
         """Aggregates the results of an order.
 
+        Returns the aggregated result as a file with a given name.  The annotated type of the response represents the content type of the file.
 
         :param id: The id of the order
         :type id: str
@@ -2312,7 +2313,7 @@ class OrderApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "GetOrderResultsResult",
+            '200': "object",
         }
         response_data = self.api_client.call_api(
             *_param,
@@ -2344,6 +2345,7 @@ class OrderApi:
     ) -> RESTResponseType:
         """Aggregates the results of an order.
 
+        Returns the aggregated result as a file with a given name.  The annotated type of the response represents the content type of the file.
 
         :param id: The id of the order
         :type id: str
@@ -2378,7 +2380,7 @@ class OrderApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "GetOrderResultsResult",
+            '200': "object",
         }
         response_data = self.api_client.call_api(
             *_param,

{rapidata-2.1.0 → rapidata-2.1.2}/src/rapidata/api_client/models/__init__.py

@@ -131,7 +131,6 @@ from rapidata.api_client.models.get_compare_workflow_result_overview_small_resul
 from rapidata.api_client.models.get_datapoints_by_dataset_id_result import GetDatapointsByDatasetIdResult
 from rapidata.api_client.models.get_dataset_by_id_result import GetDatasetByIdResult
 from rapidata.api_client.models.get_order_by_id_result import GetOrderByIdResult
-from rapidata.api_client.models.get_order_results_result import GetOrderResultsResult
 from rapidata.api_client.models.get_pipeline_by_id_result import GetPipelineByIdResult
 from rapidata.api_client.models.get_pipeline_by_id_result_artifacts_value import GetPipelineByIdResultArtifactsValue
 from rapidata.api_client.models.get_public_orders_result import GetPublicOrdersResult

{rapidata-2.1.0 → rapidata-2.1.2}/src/rapidata/api_client_README.md

@@ -265,7 +265,6 @@ Class | Method | HTTP request | Description
  - [GetDatapointsByDatasetIdResult](rapidata/api_client/docs/GetDatapointsByDatasetIdResult.md)
  - [GetDatasetByIdResult](rapidata/api_client/docs/GetDatasetByIdResult.md)
  - [GetOrderByIdResult](rapidata/api_client/docs/GetOrderByIdResult.md)
- - [GetOrderResultsResult](rapidata/api_client/docs/GetOrderResultsResult.md)
  - [GetPipelineByIdResult](rapidata/api_client/docs/GetPipelineByIdResult.md)
  - [GetPipelineByIdResultArtifactsValue](rapidata/api_client/docs/GetPipelineByIdResultArtifactsValue.md)
  - [GetPublicOrdersResult](rapidata/api_client/docs/GetPublicOrdersResult.md)

{rapidata-2.1.0 → rapidata-2.1.2}/src/rapidata/rapidata_client/order/rapidata_order.py

@@ -52,6 +52,13 @@ class RapidataOrder:
         self.__openapi_service.order_api.order_pause_post(self.order_id)
         print(f"Order '{self}' has been paused.")
 
+    def unpause(self):
+        """
+        Unpauses/resume the order.
+        """
+        self.__openapi_service.order_api.order_resume_post(self.order_id)
+        print(f"Order '{self}' has been unpaused.")
+
     def get_status(self) -> str:
         """
         Gets the status of the order.
@@ -129,9 +136,8 @@ class RapidataOrder:
 
         try:
             # Get the raw result string
-            result_str = self.__openapi_service.order_api.order_result_get(id=self.order_id)
-            # Parse the result string as JSON
-            return json.loads(result_str)
+            return self.__openapi_service.order_api.order_get_order_results_get(id=self.order_id) # type: ignore
+        
         except ApiException as e:
             # Handle API exceptions
             raise Exception(f"Failed to get order results: {str(e)}") from e

{rapidata-2.1.0 → rapidata-2.1.2}/src/rapidata/rapidata_client/order/rapidata_order_manager.py

@@ -332,7 +332,7 @@ class RapidataOrderManager:
     
     def create_locate_order(self,
             name: str,
-            target: str,
+            instruction: str,
             datapoints: list[str],
             responses_per_datapoint: int = 10,
             contexts: list[str] | None = None,
@@ -345,7 +345,7 @@ class RapidataOrderManager:
 
         Args:
             name (str): The name of the order.
-            target (str): The target what should be located. Will be shown along side each datapoint.
+            instruction (str): The instruction what should be located. Will be shown along side each datapoint.
             datapoints (list[str]): The list of datapoints for the locate - each datapoint will be labeled.
             responses_per_datapoint (int, optional): The number of responses that will be collected per datapoint. Defaults to 10.
             contexts (list[str], optional): The list of contexts for the comparison. Defaults to None.\n
@@ -362,7 +362,7 @@ class RapidataOrderManager:
 
         return self.__create_general_order(
             name=name,
-            workflow=LocateWorkflow(target=target),
+            workflow=LocateWorkflow(target=instruction),
             assets=assets,
             responses_per_datapoint=responses_per_datapoint,
             contexts=contexts,
@@ -374,7 +374,7 @@ class RapidataOrderManager:
 
     def create_draw_order(self,
             name: str,
-            target: str,
+            instruction: str,
             datapoints: list[str],
             responses_per_datapoint: int = 10,
             contexts: list[str] | None = None,
@@ -387,7 +387,7 @@ class RapidataOrderManager:
 
         Args:
             name (str): The name of the order.
-            target (str): The target for how the lines should be drawn. Will be shown along side each datapoint.
+            instruction (str): The instruction for how the lines should be drawn. Will be shown along side each datapoint.
             datapoints (list[str]): The list of datapoints for the draw lines - each datapoint will be labeled.
             responses_per_datapoint (int, optional): The number of responses that will be collected per datapoint. Defaults to 10.
             contexts (list[str], optional): The list of contexts for the comparison. Defaults to None.\n
@@ -404,7 +404,7 @@ class RapidataOrderManager:
 
         return self.__create_general_order(
             name=name,
-            workflow=DrawWorkflow(target=target),
+            workflow=DrawWorkflow(target=instruction),
             assets=assets,
             responses_per_datapoint=responses_per_datapoint,
             contexts=contexts,