rapidata 2.4.1__tar.gz → 2.5.0__tar.gz

{rapidata-2.4.1 → rapidata-2.5.0}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rapidata"
-version = "2.4.1"
+version = "2.5.0"
 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.4.1 → rapidata-2.5.0}/src/rapidata/rapidata_client/validation/rapidata_validation_set.py

@@ -1,3 +1,6 @@
+from rapidata.rapidata_client.validation.rapids.rapids import Rapid
+from rapidata.service.openapi_service import OpenAPIService
+
 class RapidataValidationSet:
     """A class for interacting with a Rapidata validation set.
 
@@ -10,9 +13,18 @@ class RapidataValidationSet:
         name (str): The name of the validation set.
     """
 
-    def __init__(self, validation_set_id, name: str):
+    def __init__(self, validation_set_id, name: str, openapi_service: OpenAPIService):
         self.id = validation_set_id
         self.name = name
+        self.__openapi_service = openapi_service
+    
+    def add_rapid(self, rapid: Rapid):
+        """Add a Rapid to the validation set.
+
+        Args:
+            rapid (Rapid): The Rapid to add to the validation set.
+        """
+        rapid._add_to_validation_set(self.id, self.__openapi_service)
 
     def __str__(self):
         return f"name: '{self.name}' id: {self.id}"

{rapidata-2.4.1 → rapidata-2.5.0}/src/rapidata/rapidata_client/validation/rapids/rapids.py

@@ -20,6 +20,7 @@ from rapidata.api_client.models.datapoint_metadata_model_metadata_inner import (
     DatapointMetadataModelMetadataInner,
 )
 
+from rapidata.service.openapi_service import OpenAPIService
 
 class Rapid():
     def __init__(self, asset: MediaAsset | TextAsset | MultiAsset, metadata: Sequence[Metadata], payload: Any, truth: Any, randomCorrectProbability: float, explanation: str | None):
@@ -30,7 +31,22 @@ class Rapid():
         self.randomCorrectProbability = randomCorrectProbability
         self.explanation = explanation 
 
-    def to_media_model(self, validationSetId: str) -> tuple[AddValidationRapidModel, list[StrictStr | tuple[StrictStr, StrictBytes] | StrictBytes]]:
+    def _add_to_validation_set(self, validationSetId: str, openapi_service: OpenAPIService):
+        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(
+                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(
+                model=model[0], files=model[1]
+            )
+            
+        else:
+            raise TypeError("The asset must be a MediaAsset, TextAsset, or MultiAsset")
+
+    def __to_media_model(self, validationSetId: str) -> tuple[AddValidationRapidModel, list[StrictStr | tuple[StrictStr, StrictBytes] | StrictBytes]]:
         assets: list[MediaAsset] = [] 
         if isinstance(self.asset, MultiAsset):
             for asset in self.asset.assets:
@@ -57,7 +73,7 @@ class Rapid():
             explanation=self.explanation
         ), [asset.to_file() for asset in assets])
 
-    def to_text_model(self, validationSetId: str) -> AddValidationTextRapidModel:
+    def __to_text_model(self, validationSetId: str) -> AddValidationTextRapidModel:
         texts: list[str] = []
         if isinstance(self.asset, MultiAsset):
             for asset in self.asset.assets:

{rapidata-2.4.1 → rapidata-2.5.0}/src/rapidata/rapidata_client/validation/rapids/rapids_manager.py

@@ -132,7 +132,7 @@ class RapidsManager:
         asset = MediaAsset(datapoint)
         transcription_words = [
             TranscriptionWord(word=word, wordIndex=i)
-            for i, word in enumerate(sentence)
+            for i, word in enumerate(sentence.split(" "))
         ]
 
         correct_transcription_words: list[TranscriptionWord] = []

{rapidata-2.4.1 → rapidata-2.5.0}/src/rapidata/rapidata_client/validation/validation_set_manager.py

@@ -85,7 +85,7 @@ class ValidationSetManager:
                 )
             )
 
-        return self._submit(name=name, data_type=data_type, rapids=rapids, print_confirmation=print_confirmation)
+        return self._submit(name=name, rapids=rapids, print_confirmation=print_confirmation)
 
     def create_compare_set(self,
         name: str,
@@ -142,7 +142,7 @@ class ValidationSetManager:
                 )
             )
  
-        return self._submit(name=name, data_type=data_type, rapids=rapids, print_confirmation=print_confirmation)
+        return self._submit(name=name, rapids=rapids, print_confirmation=print_confirmation)
   
     def create_select_words_set(self,
         name: str,
@@ -197,7 +197,7 @@ class ValidationSetManager:
                 )
             )
 
-        return self._submit(name=name, data_type=RapidataDataTypes.MEDIA, rapids=rapids, print_confirmation=print_confirmation)
+        return self._submit(name=name, rapids=rapids, print_confirmation=print_confirmation)
 
     def create_locate_set(self,
         name: str,
@@ -249,7 +249,7 @@ class ValidationSetManager:
                 )
             )
         
-        return self._submit(name=name, data_type=RapidataDataTypes.MEDIA, rapids=rapids, print_confirmation=print_confirmation)
+        return self._submit(name=name, rapids=rapids, print_confirmation=print_confirmation)
     
     def create_draw_set(self,
         name: str,
@@ -300,7 +300,7 @@ class ValidationSetManager:
                 )
             )
 
-        return self._submit(name=name, data_type=RapidataDataTypes.MEDIA, rapids=rapids, print_confirmation=print_confirmation)
+        return self._submit(name=name, rapids=rapids, print_confirmation=print_confirmation)
 
     def create_timestamp_set(self,
         name: str,
@@ -352,11 +352,10 @@ class ValidationSetManager:
                 )
             )
 
-        return self._submit(name=name, data_type=RapidataDataTypes.MEDIA, rapids=rapids, print_confirmation=print_confirmation)
+        return self._submit(name=name, rapids=rapids, print_confirmation=print_confirmation)
     
     def create_mixed_set(self,
         name: str,
-        data_type: str,
         rapids: list[Rapid],
         print_confirmation: bool = True
     ) -> RapidataValidationSet:
@@ -368,7 +367,7 @@ class ValidationSetManager:
             print_confirmation (bool, optional): Whether to print a confirmation message that validation set has been created. Defaults to True.
         """
 
-        return self._submit(name, data_type, rapids, print_confirmation)
+        return self._submit(name, rapids, print_confirmation)
     
     def get_validation_set_by_id(self, validation_set_id: str) -> RapidataValidationSet:
         """Get a validation set by ID.
@@ -384,9 +383,9 @@ class ValidationSetManager:
         except Exception:
             raise ValueError(f"ValidationSet with ID {validation_set_id} not found.")
         
-        return RapidataValidationSet(validation_set_id, validation_set.name)
+        return RapidataValidationSet(validation_set_id, validation_set.name, self.__openapi_service)
 
-    def _submit(self, name: str, data_type: str, rapids: list[Rapid], print_confirmation: bool) -> RapidataValidationSet:
+    def _submit(self, name: str, rapids: list[Rapid], print_confirmation: bool) -> RapidataValidationSet:
         validation_set_id = (
             self.__openapi_service.validation_api.validation_create_validation_set_post(
                 name=name
@@ -399,22 +398,17 @@ class ValidationSetManager:
         if print_confirmation:
             print(f"Validation set '{name}' created with ID {validation_set_id}")
 
-        for rapid in rapids:
-            if data_type == RapidataDataTypes.TEXT:
-                self.__openapi_service.validation_api.validation_add_validation_text_rapid_post(
-                    add_validation_text_rapid_model=rapid.to_text_model(validation_set_id)
-                )
-            else:
-                model = rapid.to_media_model(validation_set_id)
-                self.__openapi_service.validation_api.validation_add_validation_rapid_post(
-                   model=model[0], files=model[1]
-                )
-
-        return RapidataValidationSet(
+        validation_set = RapidataValidationSet(
             name=name,
             validation_set_id=validation_set_id,
+            openapi_service=self.__openapi_service
         )
 
+        for rapid in rapids:
+            validation_set.add_rapid(rapid)
+        
+        return validation_set
+
 
     def find_validation_sets(self, name: str = "", amount: int = 1) -> list[RapidataValidationSet]:
         """Find validation sets by name.