rapidata 2.23.0__tar.gz → 2.23.2__tar.gz

{rapidata-2.23.0 → rapidata-2.23.2}/PKG-INFO

@@ -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 → rapidata-2.23.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rapidata"
-version = "2.23.0"
+version = "2.23.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.23.0 → rapidata-2.23.2}/src/rapidata/__init__.py

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

{rapidata-2.23.0 → rapidata-2.23.2}/src/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-2.23.2/src/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-2.23.0 → rapidata-2.23.2}/src/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-2.23.0 → rapidata-2.23.2}/src/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-2.23.0 → rapidata-2.23.2}/src/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-2.23.2/src/rapidata/rapidata_client/selection/retrieval_modes.py

@@ -0,0 +1,18 @@
+from enum import Enum
+
+class RetrievalMode(Enum):
+    """
+    Enum for defining retrieval modes for datapoints.
+    """
+    Random = "Random"
+    """
+    Will just randomly shuffle the datapoints. This is the default and will NOT take into account the "max_iterations" parameter.
+    """
+    Shuffled = "Shuffled"
+    """
+    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-2.23.0 → rapidata-2.23.2}/src/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-2.23.0 → rapidata-2.23.2}/src/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-2.23.0 → rapidata-2.23.2}/src/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: