rapidata 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

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/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/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/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/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/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/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,

{rapidata-2.1.0.dist-info → rapidata-2.1.2.dist-info}/METADATA

@@ -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.dist-info → rapidata-2.1.2.dist-info}/RECORD

@@ -1,15 +1,15 @@
 rapidata/__init__.py,sha256=fQDxHG9k8jBQ0Tm5f2XoKZwcEUaAXbUltwsoEXTBXRA,611
-rapidata/api_client/__init__.py,sha256=t-bruqGdZpvGWE_gMGaLaGIFSe36ec8H279Owlr2Uxk,25093
+rapidata/api_client/__init__.py,sha256=E95vH2Bo3S14UbnrP-4yUhQ5AnaLGiyO0sXdrRlmXz0,25007
 rapidata/api_client/api/__init__.py,sha256=h0wnYolEBVduAU_7YBLFnwHcwXgZg_krSgarsWxz4zs,1061
 rapidata/api_client/api/campaign_api.py,sha256=DxPFqt9F6c9OpXu_Uxhsrib2NVwnbcZFa3Vkrj7cIuA,40474
 rapidata/api_client/api/client_api.py,sha256=hJR9NO3YMHE-7SYwFM88p1aBW5qdmkOf7AKdq7-QZ4A,32719
 rapidata/api_client/api/coco_api.py,sha256=WQKGMJ568P5bcIDLyV8u6NAhp8URSItdY6PSeTgh5Go,23224
 rapidata/api_client/api/compare_workflow_api.py,sha256=2P5Z1zvlEc6zmrmeSN67l1LONpchz6g0v0olfD8M_o8,12652
 rapidata/api_client/api/datapoint_api.py,sha256=CdLFVMrVylj2_D6Ll58_4ME604-7mgWCyXF5SpKmyfI,31668
-rapidata/api_client/api/dataset_api.py,sha256=ZXMbpT3JuWDcFSQfP4S3XrInq5HuzMBEc5Z9jYOr7EU,92036
+rapidata/api_client/api/dataset_api.py,sha256=kV-xtqaaPz3xN21Iah9c5UnW32gRGMyA1grDB9BzHjE,92672
 rapidata/api_client/api/identity_api.py,sha256=HohN5Kgynss527TI91vtpZ8mgxlcCTeH6IdxxEGpOak,34859
 rapidata/api_client/api/newsletter_api.py,sha256=9ZqGDB4_AEQZfRA61RRYkyQ06WjXH-aCwJUe60c2H4w,22575
-rapidata/api_client/api/order_api.py,sha256=JGGwHq-WBa8lcPoTQExYzsTyrDfgwHBrqW_FUFtqSD4,209360
+rapidata/api_client/api/order_api.py,sha256=hLLlXQrt3y5ni0NALNiDoLd6HxhZ7RuTjyBqmK-osMM,209636
 rapidata/api_client/api/pipeline_api.py,sha256=8NjyfLWaX7DtaF6jWDS2rzqsWigWWYgyeoDLwPH4S9w,71566
 rapidata/api_client/api/rapid_api.py,sha256=3ttNQerbjI7djWxJ21XEG6pOKeME2VxP7tJsYMSjE3M,54063
 rapidata/api_client/api/rapidata_identity_api_api.py,sha256=-kgoDuLdh-R4MQ7JPi3kQ0WDFKbmI0MkCjxwHXBmksA,9824
@@ -21,7 +21,7 @@ rapidata/api_client/api_client.py,sha256=EDhxAOUc5JFWvFsF1zc726Q7GoEFkuB8uor5SlG
 rapidata/api_client/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
 rapidata/api_client/configuration.py,sha256=g472vHVPLBotq8EkfSXP4sbp7xnn-3sb8O8BBlRWK1I,15931
 rapidata/api_client/exceptions.py,sha256=eLLd1fxM0Ygf3IIG6aNx9hdy79drst5Cem0UjI_NamM,5978
-rapidata/api_client/models/__init__.py,sha256=oy2ai5E-FzTIEzCvBxQWE10E3VYf6EHiBkL7U082d4A,23491
+rapidata/api_client/models/__init__.py,sha256=vuSMMYnVJrdMjXCqpmA3OI_fjBFWJy3Iu1dX1wQNQP8,23405
 rapidata/api_client/models/add_campaign_artifact_result.py,sha256=4IvFVS-tLlL6eHsWp-IZ_ul5T30-h3YEwd2B5ioBbgY,2582
 rapidata/api_client/models/add_campaign_model.py,sha256=fAjWj_ahlVrXZzRaiL3mrcqXYZd5I93R8scwo8-JpXw,6873
 rapidata/api_client/models/add_validation_rapid_model.py,sha256=-HRHMK-o6dgGjUqfsP_woZcFxfN7nuJ-L1CUaK9nihY,4918
@@ -336,7 +336,7 @@ rapidata/api_client/models/workflow_split_model.py,sha256=zthOSaUl8dbLhLymLK_lrP
 rapidata/api_client/models/workflow_split_model_filter_configs_inner.py,sha256=1Fx9uZtztiiAdMXkj7YeCqt7o6VkG9lKf7D7UP_h088,7447
 rapidata/api_client/models/workflow_state.py,sha256=5LAK1se76RCoozeVB6oxMPb8p_5bhLZJqn7q5fFQWis,850
 rapidata/api_client/rest.py,sha256=zmCIFQC2l1t-KZcq-TgEm3vco3y_LK6vRm3Q07K-xRI,9423
-rapidata/api_client_README.md,sha256=Ki48n2aYaV02TygnZOsho07Hpn-_txhTP-IUg9t2hog,37942
+rapidata/api_client_README.md,sha256=tv9QpQH6NoyFe-AV5wK3o1dx-EJMMCgiwekTxDhgrdY,37864
 rapidata/rapidata_client/__init__.py,sha256=kkT6FMU4P8rTdYKTJgZNcyptr-Rq1iZmsyLIyRCwpYA,896
 rapidata/rapidata_client/assets/__init__.py,sha256=hKgrOSn8gJcBSULaf4auYhH1S1N5AfcwIhBSq1BOKwQ,323
 rapidata/rapidata_client/assets/_base_asset.py,sha256=B2YWH1NgaeYUYHDW3OPpHM_bqawHbH4EjnRCE2BYwiM,298
@@ -368,8 +368,8 @@ rapidata/rapidata_client/metadata/_select_words_metadata.py,sha256=I4qVtCkj60ljk
 rapidata/rapidata_client/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/rapidata_client/order/_rapidata_dataset.py,sha256=IU0N2_LksyEDlvLq56vCkiSR45kA9I6q4pqDoEpWmMw,5240
 rapidata/rapidata_client/order/_rapidata_order_builder.py,sha256=R4iOWy8nfIHpzqqqQcQhLgpdB8z_tUrkL2M_8rZUw9M,13121
-rapidata/rapidata_client/order/rapidata_order.py,sha256=3YI0pUy84B1wd0VmGAPNNiCLJjXVI68VRvSIDxImnjs,5591
-rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=cafGE546QQn0j-GBbKRCprZl6qz1jhFWuaEoDHU9Pu4,24551
+rapidata/rapidata_client/order/rapidata_order.py,sha256=e7ZMllbOaBFqPDVApL-kemAnFLbzF9rNWyTGOKuU8Qc,5741
+rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=ZTygrv5x7dWjWxXOgFcdtyei_ap6J33SJWuWB_AwXeg,24591
 rapidata/rapidata_client/rapidata_client.py,sha256=9SMOouDBwe-aIi9rnPtnL2vrqnlQHDKxOUpw-Eh3Fsg,1782
 rapidata/rapidata_client/referee/__init__.py,sha256=q0Hv9nmfEpyChejtyMLT8hWKL0vTTf_UgUXPYNJ-H6M,153
 rapidata/rapidata_client/referee/_base_referee.py,sha256=MdFOhdxt3sRnWXLDKLJZKFdVpjBGn9jypPnWWQ6msQA,496
@@ -417,7 +417,7 @@ rapidata/service/credential_manager.py,sha256=Of0BQs_V1T7rkrWX9groLX790nOknaARwn
 rapidata/service/local_file_service.py,sha256=pgorvlWcx52Uh3cEG6VrdMK_t__7dacQ_5AnfY14BW8,877
 rapidata/service/openapi_service.py,sha256=Z4NrAuilLlIWBdGOv6otz36tHS_vvU36w5jmvOUTmqo,3198
 rapidata/service/token_manager.py,sha256=JZ5YbR5Di8dO3H4kK11d0kzWlrXxjgCmeNkHA4AapCM,6425
-rapidata-2.1.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-rapidata-2.1.0.dist-info/METADATA,sha256=9zy9IubfXra_Qp8mnl9a6AhN-t3DO8fxpyNGkwuKNWY,1067
-rapidata-2.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-rapidata-2.1.0.dist-info/RECORD,,
+rapidata-2.1.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+rapidata-2.1.2.dist-info/METADATA,sha256=O4aUgrPzAWncA9iqhaQ3Vl7D9lctnjd6hOt27uUedgU,1067
+rapidata-2.1.2.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+rapidata-2.1.2.dist-info/RECORD,,

{rapidata-2.1.0.dist-info → rapidata-2.1.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.0
 Root-Is-Purelib: true
 Tag: py3-none-any