rapidata 2.23.0__py3-none-any.whl → 2.23.2__py3-none-any.whl

rapidata/__init__.py

@@ -22,7 +22,9 @@ from .rapidata_client import (
     CustomFilter,
     NotFilter,
     OrFilter,
+    AgeFilter,
     AgeGroup,
+    GenderFilter,
     Gender,
     CountryCodes,
     MediaAsset,

rapidata/rapidata_client/filter/__init__.py

@@ -9,3 +9,4 @@ from .custom_filter import CustomFilter
 from .not_filter import NotFilter
 from .or_filter import OrFilter
 from .response_count_filter import ResponseCountFilter
+from .new_user_filter import NewUserFilter

rapidata/rapidata_client/filter/new_user_filter.py

@@ -0,0 +1,13 @@
+from rapidata.rapidata_client.filter._base_filter import RapidataFilter
+from rapidata.api_client.models.new_user_filter_model import NewUserFilterModel
+
+class NewUserFilter(RapidataFilter):
+    """NewUserFilter Class
+    
+    Can be used to filter new users.
+    """
+
+    def _to_model(self):
+        return NewUserFilterModel(
+            _t="NewUserFilter"
+        )

rapidata/rapidata_client/order/_rapidata_order_builder.py

@@ -123,7 +123,7 @@ class RapidataOrderBuilder:
                 isinstance(item, MultiAsset) for item in self.__assets
             ), "The media paths must be of type MultiAsset for comparison tasks."
 
-        result = self.__openapi_service.order_api.order_create_post(
+        result = self.__openapi_service.order_api.order_post(
             create_order_model=order_model
         )
 

rapidata/rapidata_client/order/rapidata_order.py

@@ -61,7 +61,7 @@ class RapidataOrder:
     def pause(self) -> None:
         """Pauses the order."""
         logger.info(f"Pausing order '{self}'")
-        self.__openapi_service.order_api.order_pause_post(self.order_id)
+        self.__openapi_service.order_api.order_order_id_pause_post(self.order_id)
         logger.debug(f"Order '{self}' has been paused.")
         managed_print(f"Order '{self}' has been paused.")
 

rapidata/rapidata_client/order/rapidata_order_manager.py

@@ -604,7 +604,7 @@ class RapidataOrderManager:
             list[RapidataOrder]: A list of RapidataOrder instances.
         """
         try:
-            order_page_result = self._openapi_service.order_api.order_query_get(QueryModel(
+            order_page_result = self._openapi_service.order_api.orders_get(QueryModel(
                 page=PageInfo(index=1, size=amount),
                 filter=RootFilter(filters=[Filter(field="OrderName", operator="Contains", value=name)]),
                 sortCriteria=[SortCriterion(direction="Desc", propertyName="OrderDate")]

rapidata/rapidata_client/selection/retrieval_modes.py

@@ -1,9 +1,18 @@
 from enum import Enum
 
 class RetrievalMode(Enum):
-    # Will just randomly shuffle the datapoints. This is the default and will NOT take into account the "max_iterations" parameter.
+    """
+    Enum for defining retrieval modes for datapoints.
+    """
     Random = "Random"
-    # Will shuffle the datapoints randomly for each user. The user will then see the datapoints in that order. This will take into account the "max_iterations" parameter.
+    """
+    Will just randomly shuffle the datapoints. This is the default and will NOT take into account the "max_iterations" parameter.
+    """
     Shuffled = "Shuffled"
-    # Will show the datapoints in the order they are in the dataset. This will take into account the "max_iterations" parameter.
-    Sequential = "Sequential"
+    """
+    Will shuffle the datapoints randomly for each user. The user will then see the datapoints in that order. This will take into account the "max_iterations" parameter.
+    """
+    Sequential = "Sequential"
+    """
+    Will show the datapoints in the order they are in the dataset. This will take into account the "max_iterations" parameter.
+    """

rapidata/rapidata_client/validation/rapids/rapids.py

@@ -34,13 +34,15 @@ class Rapid():
 
     def _add_to_validation_set(self, validationSetId: str, openapi_service: OpenAPIService) -> None:
         if isinstance(self.asset, TextAsset) or (isinstance(self.asset, MultiAsset) and isinstance(self.asset.assets[0], TextAsset)):
-            openapi_service.validation_api.validation_add_validation_text_rapid_post(
+            openapi_service.validation_api.validation_set_validation_set_id_rapid_texts_post(
+                validation_set_id=validationSetId,
                 add_validation_text_rapid_model=self.__to_text_model(validationSetId)
             )
 
         elif isinstance(self.asset, MediaAsset) or (isinstance(self.asset, MultiAsset) and isinstance(self.asset.assets[0], MediaAsset)):
             model = self.__to_media_model(validationSetId)
-            openapi_service.validation_api.validation_add_validation_rapid_post(
+            openapi_service.validation_api.validation_set_validation_set_id_rapid_files_post(
+                validation_set_id=validationSetId,
                 model=model[0], files=model[1]
             )
             
@@ -63,7 +65,7 @@ class Rapid():
             assets = [self.asset]
 
         return (AddValidationRapidModel(
-            validationSetId=validationSetId,
+            validationSetId=validationSetId, # will be removed in the future
             payload=AddValidationRapidModelPayload(self.payload),
             truth=AddValidationRapidModelTruth(self.truth),
             metadata=[
@@ -90,7 +92,7 @@ class Rapid():
             texts = [self.asset.text]
 
         return AddValidationTextRapidModel(
-          validationSetId=validationSetId,
+          validationSetId=validationSetId, # will be removed in the future
           payload=AddValidationRapidModelPayload(self.payload),
           truth=AddValidationRapidModelTruth(self.truth),
           metadata=[

rapidata/rapidata_client/validation/validation_set_manager.py

@@ -1,5 +1,6 @@
 from rapidata.api_client import QueryModel
 from rapidata.rapidata_client.validation.rapidata_validation_set import RapidataValidationSet
+from rapidata.api_client.models.create_validation_set_model import CreateValidationSetModel
 from rapidata.service.openapi_service import OpenAPIService
 from rapidata.rapidata_client.assets.data_type_enum import RapidataDataTypes
 from rapidata.rapidata_client.validation.rapids.rapids_manager import RapidsManager
@@ -427,28 +428,14 @@ class ValidationSetManager:
         """
 
         return self._submit(name=name, rapids=rapids, dimensions=dimensions)
-    
-    def get_validation_set_by_id(self, validation_set_id: str) -> RapidataValidationSet:
-        """Get a validation set by ID.
-
-        Args:
-            validation_set_id (str): The ID of the validation set.
-
-        Returns:
-            RapidataValidationSet: The ValidationSet instance.
-        """
-        try:
-            validation_set = self.__openapi_service.validation_api.validation_get_by_id_get(id=validation_set_id)
-        except Exception:
-            raise ValueError(f"ValidationSet with ID {validation_set_id} not found.")
-        
-        return RapidataValidationSet(validation_set_id, str(validation_set.name), self.__openapi_service)
 
     def _submit(self, name: str, rapids: list[Rapid], dimensions: list[str] | None) -> RapidataValidationSet:
         logger.debug("Creating validation set")
         validation_set_id = (
-            self.__openapi_service.validation_api.validation_create_validation_set_post(
-                name=name
+            self.__openapi_service.validation_api.validation_set_post(
+                create_validation_set_model=CreateValidationSetModel(
+                    name=name
+                )
             )
         ).validation_set_id
 
@@ -478,6 +465,22 @@ class ValidationSetManager:
             validation_set.update_dimensions(dimensions)
         
         return validation_set
+    
+    def get_validation_set_by_id(self, validation_set_id: str) -> RapidataValidationSet:
+        """Get a validation set by ID.
+
+        Args:
+            validation_set_id (str): The ID of the validation set.
+
+        Returns:
+            RapidataValidationSet: The ValidationSet instance.
+        """
+        try:
+            validation_set = self.__openapi_service.validation_api.validation_set_validation_set_id_get(validation_set_id=validation_set_id)
+        except Exception:
+            raise ValueError(f"ValidationSet with ID {validation_set_id} not found.")
+        
+        return RapidataValidationSet(validation_set_id, str(validation_set.name), self.__openapi_service)
 
 
     def find_validation_sets(self, name: str = "", amount: int = 1) -> list[RapidataValidationSet]:
@@ -491,7 +494,7 @@ class ValidationSetManager:
             list[RapidataValidationSet]: The list of validation sets.
         """
         try:
-            validation_page_result = self.__openapi_service.validation_api.validation_query_validation_sets_get(QueryModel(
+            validation_page_result = self.__openapi_service.validation_api.validation_sets_get(QueryModel(
                 page=PageInfo(index=1, size=amount),
                 filter=RootFilter(filters=[Filter(field="Name", operator="Contains", value=name)]),
                 sortCriteria=[SortCriterion(direction="Desc", propertyName="CreatedAt")]

rapidata/service/openapi_service.py

@@ -6,7 +6,7 @@ from rapidata.api_client.api.dataset_api import DatasetApi
 from rapidata.api_client.api.order_api import OrderApi
 from rapidata.api_client.api.pipeline_api import PipelineApi
 from rapidata.api_client.api.rapid_api import RapidApi
-from rapidata.api_client.api.validation_api import ValidationApi
+from rapidata.api_client.api.validation_set_api import ValidationSetApi
 from rapidata.api_client.api.workflow_api import WorkflowApi
 from rapidata.api_client.configuration import Configuration
 from rapidata.service.credential_manager import CredentialManager
@@ -89,8 +89,8 @@ class OpenAPIService:
         return DatasetApi(self.api_client)
 
     @property
-    def validation_api(self) -> ValidationApi:
-        return ValidationApi(self.api_client)
+    def validation_api(self) -> ValidationSetApi:
+        return ValidationSetApi(self.api_client)
 
     @property
     def rapid_api(self) -> RapidApi:

{rapidata-2.23.0.dist-info → rapidata-2.23.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rapidata
-Version: 2.23.0
+Version: 2.23.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.23.0.dist-info → rapidata-2.23.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-rapidata/__init__.py,sha256=sjsQ3uR6cZ7rqXfQQlYRyVGY0AoyJASIkvBPxhidjcY,746
+rapidata/__init__.py,sha256=UtlVqb_iIvsZDlyITqKQZNb864p2cGluEdsB0sw6Lt8,779
 rapidata/api_client/__init__.py,sha256=HLyBE43YUIOhAETBIYQtCP_Qw4oJzdclvsRqFgJ1TRM,26807
 rapidata/api_client/api/__init__.py,sha256=kxo-WoJb_QrJccktYJgKVVc674eT-scwggMvMZ3Spj8,1211
 rapidata/api_client/api/campaign_api.py,sha256=1ajX0hSnA4O5GacJLIGkAgorPlNDRVaEZY029Pkutl4,71353
@@ -17,7 +17,6 @@ rapidata/api_client/api/rapid_api.py,sha256=2omzmCbZxfseGTwEMFGESrkSH-FlkP0JmqIW
 rapidata/api_client/api/rapidata_identity_api_api.py,sha256=-kgoDuLdh-R4MQ7JPi3kQ0WDFKbmI0MkCjxwHXBmksA,9824
 rapidata/api_client/api/simple_workflow_api.py,sha256=yauSlkSwoZOl4P-1Wu0yU92GcEArpEd3xjFqImU2K1g,12763
 rapidata/api_client/api/user_info_api.py,sha256=FuuA95Beeky-rnqIoSUe2-WQ7oVTfq0RElX0jfKXT0w,10042
-rapidata/api_client/api/validation_api.py,sha256=XET31snfRc78TJre3jGOlb0bAs8wr82qhRiURiitUaE,98706
 rapidata/api_client/api/validation_set_api.py,sha256=p3VeYzM9jIkT8csO3Af5fZmIFRRifDcNIibbs1VmpQQ,234035
 rapidata/api_client/api/workflow_api.py,sha256=a4LSlqk4X08YEKm4pS7wQeK1tK3JPKJ2xW0ye252r7A,98898
 rapidata/api_client/api_client.py,sha256=EDhxAOUc5JFWvFsF1zc726Q7GoEFkuB8uor5SlGx9K4,27503
@@ -436,7 +435,7 @@ rapidata/rapidata_client/country_codes/__init__.py,sha256=FB9Dcks44J6C6YBSYmTmNZ
 rapidata/rapidata_client/country_codes/country_codes.py,sha256=ePHqeb7y9DWQZAnddBzPx1puYBcrgUjdR2sbFijuFD8,283
 rapidata/rapidata_client/demographic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/rapidata_client/demographic/demographic_manager.py,sha256=RE4r6NNAXinNAlRMgAcG4te4pF4whv81xbyAW2V9XMM,1192
-rapidata/rapidata_client/filter/__init__.py,sha256=uHemzncxZrrs3fiKQ-spbNe6EJZ1aWxHIH6DVy2pLUo,471
+rapidata/rapidata_client/filter/__init__.py,sha256=SqxlEotA_O1Lgw3Um6VPBE2P5Hw7OUVZRSBbsv1GJbI,514
 rapidata/rapidata_client/filter/_base_filter.py,sha256=ytiSyeb9dvNZf93zwgb4PRDzf9ebsAu4wHBn4x49Re0,195
 rapidata/rapidata_client/filter/age_filter.py,sha256=oRjGY65gE_X8oa0D0XRyvKAb4_Z6XOOaGTWykRSfLFA,739
 rapidata/rapidata_client/filter/campaign_filter.py,sha256=6ZT11-gub8349QcRwuHt8AcBY18F7BdLRZ2Ch_vjLyU,735
@@ -447,6 +446,7 @@ rapidata/rapidata_client/filter/language_filter.py,sha256=reQHirEGXUBQaLwtEznK5O
 rapidata/rapidata_client/filter/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/rapidata_client/filter/models/age_group.py,sha256=9Lk_zvuGqJZNij_CLFNLwE07piUaDrZMyAXzFAk6FKc,1203
 rapidata/rapidata_client/filter/models/gender.py,sha256=aXg6Kql2BIy8d5d1lCVi1axMWnyN1FFgPDU6fh2hYUM,627
+rapidata/rapidata_client/filter/new_user_filter.py,sha256=qU7d6cSslGEO_N1tYPS4Ru3cGbQYH2_I5dJPNPHvtCM,369
 rapidata/rapidata_client/filter/not_filter.py,sha256=I7crEyOCs53uS0VI48s9EqC6PAFfV9EZG3upwFBJwZo,1189
 rapidata/rapidata_client/filter/or_filter.py,sha256=u6vkXMTG_j15SbY3bkbnXbxJMDgEsH5rdoFLbuoLQmo,1345
 rapidata/rapidata_client/filter/rapidata_filters.py,sha256=ZOayFtIlACfegZSoA94YFZ-fJmqr5Pf161Z_IjiZWPg,1559
@@ -463,9 +463,9 @@ rapidata/rapidata_client/metadata/_public_text_metadata.py,sha256=uXavDp1ucy_9u5
 rapidata/rapidata_client/metadata/_select_words_metadata.py,sha256=-MK5yQDi_G3BKEes6aaVyCcobB-sEy29b6bfo5f4pic,594
 rapidata/rapidata_client/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/rapidata_client/order/_rapidata_dataset.py,sha256=okwIN6e-a2cR-0KbLbwk8ULM3hEg2ls91foCjFsu36Y,20230
-rapidata/rapidata_client/order/_rapidata_order_builder.py,sha256=E3ZEH80DYpqhz0VHKSl-wcj8KRHE6iqYRiwAaUjwE8I,14412
-rapidata/rapidata_client/order/rapidata_order.py,sha256=zfBtOCmoWT2kjFQInaFpfbuKK8sTgtZjdzvXiCCo_Ho,11680
-rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=_rPv_2LksQEP4sq8sByzPqnVCxwo8CBbfAiBsLRflYk,34415
+rapidata/rapidata_client/order/_rapidata_order_builder.py,sha256=x-2lpW6Jwlq-9XRz91beWNv2TgdEA-q4b_RhOSr7vhQ,14405
+rapidata/rapidata_client/order/rapidata_order.py,sha256=qloZIWNHG0790WOHMRzqQHcjOgpnFtJNFU1XIlWH0pE,11689
+rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=LLBbRQslRdnkGKQ7E5GzwlnjOyvb2GWgpizg5GYTQ6k,34410
 rapidata/rapidata_client/order/rapidata_results.py,sha256=UllYpuqpm2inKdRNhClaUwApuxsMLrvrGDsrHA5KqbY,8111
 rapidata/rapidata_client/rapidata_client.py,sha256=rbu3JBEVUyqs-HfJ1pdLsXM_8tp6JsCedKr-2gs9MwA,3141
 rapidata/rapidata_client/referee/__init__.py,sha256=q0Hv9nmfEpyChejtyMLT8hWKL0vTTf_UgUXPYNJ-H6M,153
@@ -480,7 +480,7 @@ rapidata/rapidata_client/selection/conditional_validation_selection.py,sha256=Oc
 rapidata/rapidata_client/selection/demographic_selection.py,sha256=l4vnNbzlf9ED6BKqN4k5cZXShkXu9L1C5DtO78Vwr5M,1454
 rapidata/rapidata_client/selection/labeling_selection.py,sha256=i_E3dUdSC16tmebcK9lMXG1MG1oFhrDfNlkNPaLkVv8,1297
 rapidata/rapidata_client/selection/rapidata_selections.py,sha256=Azh0ntBZp9EQNL19imIItotQ8QW3B1gEs5YmuTvUn6U,1526
-rapidata/rapidata_client/selection/retrieval_modes.py,sha256=Nigx_dQp-z6-wZ53wWwhHd3GNpTuP2fvStSyb1XbsDI,559
+rapidata/rapidata_client/selection/retrieval_modes.py,sha256=vZ6JuMdz5l1AJM7hY7rqBevnsD7bIdpWjpiLDVNKqmA,672
 rapidata/rapidata_client/selection/shuffling_selection.py,sha256=FzOp7mnBLxNzM5at_-935wd77IHyWnFR1f8uqokiMOg,1201
 rapidata/rapidata_client/selection/static_selection.py,sha256=POhVLjzHcUIuU_GCvRxMuCb27m7CkLxaQPwgf20Xo9o,681
 rapidata/rapidata_client/selection/validation_selection.py,sha256=sedeIa8lpXVXKtFJA9IDeRvo9A1Ne4ZGcepaWDUGhCU,851
@@ -499,9 +499,9 @@ rapidata/rapidata_client/validation/__init__.py,sha256=s5wHVtcJkncXSFuL9I0zNwccN
 rapidata/rapidata_client/validation/rapidata_validation_set.py,sha256=PgsutRTpzJ_e_H-xJxibSKHTskcM43aNwnm9dFhpMpw,1812
 rapidata/rapidata_client/validation/rapids/__init__.py,sha256=WU5PPwtTJlte6U90MDakzx4I8Y0laj7siw9teeXj5R0,21
 rapidata/rapidata_client/validation/rapids/box.py,sha256=t3_Kn6doKXdnJdtbwefXnYKPiTKHneJl9E2inkDSqL8,589
-rapidata/rapidata_client/validation/rapids/rapids.py,sha256=Y00cB9T7Te9nWCmYH28Z_WoVtEnlDIdrApdqpPXstHo,4749
+rapidata/rapidata_client/validation/rapids/rapids.py,sha256=e8XHYf0QdCsyDGUnrmZvGHRUp9h-WXh1n5R-LdTB3ZQ,4936
 rapidata/rapidata_client/validation/rapids/rapids_manager.py,sha256=s5VAq8H5CKACWfmIQuz9kHC8t2nd-xEHGGUj9pIfXKI,14386
-rapidata/rapidata_client/validation/validation_set_manager.py,sha256=j6oor5AYkng8gW5VQ1dmHhPtyWyxspNgegP7U9J7EnU,25959
+rapidata/rapidata_client/validation/validation_set_manager.py,sha256=4bguQRmmtyIs4-OkqQNXTPh1GknbOaCHr1GS4XaOOhk,26135
 rapidata/rapidata_client/workflow/__init__.py,sha256=7nXcY91xkxjHudBc9H0fP35eBBtgwHGWTQKbb-M4h7Y,477
 rapidata/rapidata_client/workflow/_base_workflow.py,sha256=XyIZFKS_RxAuwIHS848S3AyLEHqd07oTD_5jm2oUbsw,762
 rapidata/rapidata_client/workflow/_classify_workflow.py,sha256=9bT54wxVJgxC-zLk6MVNbseFpzYrvFPjt7DHvxqYfnk,1736
@@ -516,8 +516,8 @@ rapidata/rapidata_client/workflow/_timestamp_workflow.py,sha256=tPi2zu1-SlE_ppbG
 rapidata/service/__init__.py,sha256=s9bS1AJZaWIhLtJX_ZA40_CK39rAAkwdAmymTMbeWl4,68
 rapidata/service/credential_manager.py,sha256=FAH9PJreDAw3G9cJ_iwzvz99s9RnFDrxxV0BHb2VYAI,8698
 rapidata/service/local_file_service.py,sha256=pgorvlWcx52Uh3cEG6VrdMK_t__7dacQ_5AnfY14BW8,877
-rapidata/service/openapi_service.py,sha256=bSxIgQEUHyxfkgUhS5dc_B8u_iIokDfX0c3jWJiVyjk,4854
-rapidata-2.23.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-rapidata-2.23.0.dist-info/METADATA,sha256=CSgI9Ha8GL5RygMbWJPLGASkRj6A6RC98eBsz_JJiho,1228
-rapidata-2.23.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-rapidata-2.23.0.dist-info/RECORD,,
+rapidata/service/openapi_service.py,sha256=J07TB4P3cz9KCU7k_fwuMQwGXlq_nJx_m1_xHbZoCg0,4867
+rapidata-2.23.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+rapidata-2.23.2.dist-info/METADATA,sha256=vSicSQOhjcmyF2YsiA5Gp-KIUs7axpuQTDEZryLQSeU,1228
+rapidata-2.23.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+rapidata-2.23.2.dist-info/RECORD,,