rapidata 0.1.10__tar.gz → 0.1.12__tar.gz

{rapidata-0.1.10 → rapidata-0.1.12}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rapidata"
-version = "0.1.10"
+version = "0.1.12"
 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-0.1.10/rapidata/rapidata_client/order → rapidata-0.1.12/rapidata/rapidata_client}/dataset/rapidata_dataset.py

@@ -1,6 +1,5 @@
 from itertools import zip_longest
 import os
-from typing import List
 
 from rapidata.api_client.models.datapoint_metadata_model import DatapointMetadataModel
 from rapidata.api_client.models.datapoint_metadata_model_metadata_inner import (
@@ -10,6 +9,7 @@ from rapidata.api_client.models.upload_text_sources_to_dataset_model import (
     UploadTextSourcesToDatasetModel,
 )
 from rapidata.rapidata_client.metadata.base_metadata import Metadata
+from rapidata.rapidata_client.types import RapidAsset
 from rapidata.service import LocalFileService
 from rapidata.service.openapi_service import OpenAPIService
 
@@ -31,22 +31,34 @@ class RapidataDataset:
 
     def add_media_from_paths(
         self,
-        image_paths: list[str],
-        metadata: List[Metadata] | None = None,
+        image_paths: list[RapidAsset],
+        metadata: list[Metadata] | None = None,
     ):
         if metadata is not None and len(metadata) != len(image_paths):
             raise ValueError(
                 "metadata must be None or have the same length as image_paths"
             )
 
-        for image_path, meta in zip_longest(image_paths, metadata or []):
-            if not os.path.exists(image_path):
-                raise FileNotFoundError(f"File not found: {image_path}")
-            
+        for media_paths_rapid, meta in zip_longest(image_paths, metadata or []):
+
+            if isinstance(media_paths_rapid, list) and not all(
+                os.path.exists(media_path) for media_path in media_paths_rapid
+            ):
+                raise FileNotFoundError(f"File not found: {media_paths_rapid}")
+
+            elif isinstance(media_paths_rapid, str) and not os.path.exists(
+                media_paths_rapid
+            ):
+                raise FileNotFoundError(f"File not found: {media_paths_rapid}")
+
             meta_model = meta.to_model() if meta else None
             model = DatapointMetadataModel(
                 datasetId=self.dataset_id,
-                metadata=[DatapointMetadataModelMetadataInner(meta_model)] if meta_model else [],
+                metadata=(
+                    [DatapointMetadataModelMetadataInner(meta_model)]
+                    if meta_model
+                    else []
+                ),
             )
 
-            self.openapi_service.dataset_api.dataset_create_datapoint_post(model=model, files=[image_path])  # type: ignore
+            self.openapi_service.dataset_api.dataset_create_datapoint_post(model=model, files=media_paths_rapid if isinstance(media_paths_rapid, list) else [media_paths_rapid])  # type: ignore

rapidata-0.1.12/rapidata/rapidata_client/dataset/rapidata_validation_set.py

@@ -0,0 +1,78 @@
+from typing import Any
+from rapidata.api_client.models.add_validation_rapid_model import (
+    AddValidationRapidModel,
+)
+from rapidata.api_client.models.add_validation_rapid_model_payload import (
+    AddValidationRapidModelPayload,
+)
+from rapidata.api_client.models.add_validation_rapid_model_truth import (
+    AddValidationRapidModelTruth,
+)
+from rapidata.api_client.models.attach_category_truth import AttachCategoryTruth
+from rapidata.api_client.models.bounding_box_payload import BoundingBoxPayload
+from rapidata.api_client.models.bounding_box_truth import BoundingBoxTruth
+from rapidata.api_client.models.classify_payload import ClassifyPayload
+from rapidata.api_client.models.compare_payload import ComparePayload
+from rapidata.api_client.models.compare_truth import CompareTruth
+from rapidata.api_client.models.empty_validation_truth import EmptyValidationTruth
+from rapidata.api_client.models.free_text_payload import FreeTextPayload
+from rapidata.api_client.models.line_payload import LinePayload
+from rapidata.api_client.models.line_truth import LineTruth
+from rapidata.api_client.models.locate_box_truth import LocateBoxTruth
+from rapidata.api_client.models.locate_payload import LocatePayload
+from rapidata.api_client.models.named_entity_payload import NamedEntityPayload
+from rapidata.api_client.models.named_entity_truth import NamedEntityTruth
+from rapidata.api_client.models.polygon_payload import PolygonPayload
+from rapidata.api_client.models.polygon_truth import PolygonTruth
+from rapidata.api_client.models.transcription_payload import TranscriptionPayload
+from rapidata.api_client.models.transcription_truth import TranscriptionTruth
+from rapidata.rapidata_client.dataset.validation_rapid_parts import ValidatioRapidParts
+from rapidata.rapidata_client.types import RapidAsset
+from rapidata.service.openapi_service import OpenAPIService
+
+
+class RapidataValidationSet:
+
+    def __init__(self, validation_set_id, openapi_service: OpenAPIService):
+        self.id = validation_set_id
+        self.openapi_service = openapi_service
+
+    def add_validation_rapid(
+        self,
+        payload: (
+            BoundingBoxPayload
+            | ClassifyPayload
+            | ComparePayload
+            | FreeTextPayload
+            | LinePayload
+            | LocatePayload
+            | NamedEntityPayload
+            | PolygonPayload
+            | TranscriptionPayload
+        ),
+        truths: (
+            AttachCategoryTruth
+            | BoundingBoxTruth
+            | CompareTruth
+            | EmptyValidationTruth
+            | LineTruth
+            | LocateBoxTruth
+            | NamedEntityTruth
+            | PolygonTruth
+            | TranscriptionTruth
+        ),
+        metadata: Any,
+        media_paths: RapidAsset,
+        randomCorrectProbability: float,
+    ):
+        model = AddValidationRapidModel(
+            validationSetId=self.id,
+            payload=AddValidationRapidModelPayload(payload),
+            truth=AddValidationRapidModelTruth(truths),
+            metadata=metadata or [],
+            randomCorrectProbability=randomCorrectProbability,
+        )
+
+        self.openapi_service.validation_api.validation_add_validation_rapid_post(
+            model=model, files=media_paths if isinstance(media_paths, list) else [media_paths]  # type: ignore
+        )

rapidata-0.1.12/rapidata/rapidata_client/dataset/validation_rapid_parts.py

@@ -0,0 +1,52 @@
+from dataclasses import dataclass
+from typing import Any
+
+from rapidata.api_client.models.attach_category_truth import AttachCategoryTruth
+from rapidata.api_client.models.bounding_box_payload import BoundingBoxPayload
+from rapidata.api_client.models.bounding_box_truth import BoundingBoxTruth
+from rapidata.api_client.models.classify_payload import ClassifyPayload
+from rapidata.api_client.models.compare_payload import ComparePayload
+from rapidata.api_client.models.compare_truth import CompareTruth
+from rapidata.api_client.models.empty_validation_truth import EmptyValidationTruth
+from rapidata.api_client.models.free_text_payload import FreeTextPayload
+from rapidata.api_client.models.line_payload import LinePayload
+from rapidata.api_client.models.line_truth import LineTruth
+from rapidata.api_client.models.locate_box_truth import LocateBoxTruth
+from rapidata.api_client.models.locate_payload import LocatePayload
+from rapidata.api_client.models.named_entity_payload import NamedEntityPayload
+from rapidata.api_client.models.named_entity_truth import NamedEntityTruth
+from rapidata.api_client.models.polygon_payload import PolygonPayload
+from rapidata.api_client.models.polygon_truth import PolygonTruth
+from rapidata.api_client.models.transcription_payload import TranscriptionPayload
+from rapidata.api_client.models.transcription_truth import TranscriptionTruth
+from rapidata.rapidata_client.types import RapidAsset
+
+
+@dataclass
+class ValidatioRapidParts:
+    question: str
+    media_paths: RapidAsset
+    payload: (
+        BoundingBoxPayload
+        | ClassifyPayload
+        | ComparePayload
+        | FreeTextPayload
+        | LinePayload
+        | LocatePayload
+        | NamedEntityPayload
+        | PolygonPayload
+        | TranscriptionPayload
+    )
+    truths: (
+        AttachCategoryTruth
+        | BoundingBoxTruth
+        | CompareTruth
+        | EmptyValidationTruth
+        | LineTruth
+        | LocateBoxTruth
+        | NamedEntityTruth
+        | PolygonTruth
+        | TranscriptionTruth
+    )
+    metadata: Any
+    randomCorrectProbability: float

{rapidata-0.1.10/rapidata/rapidata_client/order → rapidata-0.1.12/rapidata/rapidata_client}/dataset/validation_set_builder.py

@@ -9,55 +9,18 @@ from rapidata.api_client.models.add_validation_rapid_model_truth import (
     AddValidationRapidModelTruth,
 )
 from rapidata.api_client.models.attach_category_truth import AttachCategoryTruth
-from rapidata.api_client.models.bounding_box_payload import BoundingBoxPayload
-from rapidata.api_client.models.bounding_box_truth import BoundingBoxTruth
 from rapidata.api_client.models.classify_payload import ClassifyPayload
 from rapidata.api_client.models.compare_payload import ComparePayload
 from rapidata.api_client.models.compare_truth import CompareTruth
-from rapidata.api_client.models.empty_validation_truth import EmptyValidationTruth
-from rapidata.api_client.models.free_text_payload import FreeTextPayload
-from rapidata.api_client.models.line_payload import LinePayload
-from rapidata.api_client.models.line_truth import LineTruth
-from rapidata.api_client.models.locate_box_truth import LocateBoxTruth
-from rapidata.api_client.models.locate_payload import LocatePayload
-from rapidata.api_client.models.named_entity_payload import NamedEntityPayload
-from rapidata.api_client.models.named_entity_truth import NamedEntityTruth
-from rapidata.api_client.models.polygon_payload import PolygonPayload
-from rapidata.api_client.models.polygon_truth import PolygonTruth
 from rapidata.api_client.models.transcription_payload import TranscriptionPayload
 from rapidata.api_client.models.transcription_truth import TranscriptionTruth
 from rapidata.api_client.models.transcription_word import TranscriptionWord
+from rapidata.rapidata_client.dataset.rapidata_validation_set import RapidataValidationSet
+from rapidata.rapidata_client.dataset.validation_rapid_parts import ValidatioRapidParts
 from rapidata.service.openapi_service import OpenAPIService
 
 
-@dataclass
-class ValidatioRapidParts:
-    question: str
-    media_paths: str | list[str]
-    payload: Union[
-        BoundingBoxPayload,
-        ClassifyPayload,
-        ComparePayload,
-        FreeTextPayload,
-        LinePayload,
-        LocatePayload,
-        NamedEntityPayload,
-        PolygonPayload,
-        TranscriptionPayload,
-    ]
-    truths: Union[
-        AttachCategoryTruth,
-        BoundingBoxTruth,
-        CompareTruth,
-        EmptyValidationTruth,
-        LineTruth,
-        LocateBoxTruth,
-        NamedEntityTruth,
-        PolygonTruth,
-        TranscriptionTruth,
-    ]
-    metadata: Any
-    randomCorrectProbability: float
+
 
 
 class ValidationSetBuilder:
@@ -79,20 +42,18 @@ class ValidationSetBuilder:
         if self.validation_set_id is None:
             raise ValueError("Failed to create validation set")
 
+        validation_set = RapidataValidationSet(validation_set_id=self.validation_set_id, openapi_service=self.openapi_service)
+
         for rapid_part in self._rapid_parts:
-            model = AddValidationRapidModel(
-                validationSetId=self.validation_set_id,
-                payload=AddValidationRapidModelPayload(rapid_part.payload),
-                truth=AddValidationRapidModelTruth(rapid_part.truths),
-                metadata=rapid_part.metadata or [],
+            validation_set.add_validation_rapid(
+                payload=rapid_part.payload,
+                truths=rapid_part.truths,
+                metadata=rapid_part.metadata,
+                media_paths=rapid_part.media_paths,
                 randomCorrectProbability=rapid_part.randomCorrectProbability,
             )
-
-            self.openapi_service.validation_api.validation_add_validation_rapid_post(
-                model=model, files=rapid_part.media_paths if isinstance(rapid_part.media_paths, list) else [rapid_part.media_paths]  # type: ignore
-            )
-
-        return str(self.validation_set_id)
+            
+        return validation_set
 
     def add_classify_rapid(
         self, media_path: str, question: str, categories: list[str], truths: list[str]
@@ -119,6 +80,8 @@ class ValidationSetBuilder:
 
     def add_compare_rapid(self, media_paths: list[str], question: str, truth: str):
         payload = ComparePayload(_t="ComparePayload", criteria=question)
+        # take only last part of truth path
+        truth = os.path.basename(truth)
         model_truth = CompareTruth(_t="CompareTruth", winnerId=truth)
 
         if len(media_paths) != 2:
@@ -129,8 +92,6 @@ class ValidationSetBuilder:
             if not os.path.exists(media_path):
                 raise FileNotFoundError(f"File not found: {media_path}")
             
-        # take only last part of truth path
-        truth = os.path.basename(truth)
 
         self._rapid_parts.append(
             ValidatioRapidParts(

{rapidata-0.1.10 → rapidata-0.1.12}/rapidata/rapidata_client/feature_flags/feature_flags.py

@@ -9,7 +9,7 @@ class FeatureFlags:
         return [FeatureFlagModel(key=name, value=value) for name, value in self._flags.items()]
 
     def alert_on_fast_response(self, value: int):
-        self._flags["aler_on_fast_response"] = str(value)
+        self._flags["alert_on_fast_response"] = str(value)
         return self
 
     def disable_translation(self, value: bool = True):

{rapidata-0.1.10 → rapidata-0.1.12}/rapidata/rapidata_client/order/rapidata_order.py

@@ -1,7 +1,7 @@
 import time
 from rapidata.api_client.models.create_order_model_referee import CreateOrderModelReferee
 from rapidata.api_client.models.create_order_model_workflow import CreateOrderModelWorkflow
-from rapidata.rapidata_client.order.dataset.rapidata_dataset import RapidataDataset
+from rapidata.rapidata_client.dataset.rapidata_dataset import RapidataDataset
 from rapidata.rapidata_client.workflow import Workflow
 from rapidata.api_client.models.create_order_model import CreateOrderModel
 from rapidata.rapidata_client.referee import Referee

{rapidata-0.1.10 → rapidata-0.1.12}/rapidata/rapidata_client/order/rapidata_order_builder.py

@@ -1,18 +1,21 @@
-from rapidata.api_client.api_client import ApiClient
 from rapidata.api_client.models.aggregator_type import AggregatorType
 from rapidata.api_client.models.create_order_model import CreateOrderModel
-from rapidata.api_client.models.create_order_model_referee import CreateOrderModelReferee
-from rapidata.api_client.models.create_order_model_workflow import CreateOrderModelWorkflow
+from rapidata.api_client.models.create_order_model_referee import (
+    CreateOrderModelReferee,
+)
+from rapidata.api_client.models.create_order_model_workflow import (
+    CreateOrderModelWorkflow,
+)
 from rapidata.rapidata_client.feature_flags import FeatureFlags
 from rapidata.rapidata_client.metadata.base_metadata import Metadata
-from rapidata.rapidata_client.order.dataset.rapidata_dataset import RapidataDataset
+from rapidata.rapidata_client.dataset.rapidata_dataset import RapidataDataset
 from rapidata.rapidata_client.referee.naive_referee import NaiveReferee
+from rapidata.rapidata_client.types import RapidAsset
 from rapidata.rapidata_client.workflow import Workflow
 from rapidata.rapidata_client.order.rapidata_order import RapidataOrder
 from rapidata.rapidata_client.referee import Referee
 from rapidata.service.openapi_service import OpenAPIService
 
-
 class RapidataOrderBuilder:
     """
     Builder object for creating Rapidata orders.
@@ -34,8 +37,8 @@ class RapidataOrderBuilder:
         self._openapi_service = openapi_service
         self._workflow: Workflow | None = None
         self._referee: Referee | None = None
-        self._media_paths: list[str] = []
-        self._metadata: list[Metadata] | None = None 
+        self._media_paths: list[RapidAsset] = []
+        self._metadata: list[Metadata] | None = None
         self._aggregator: AggregatorType | None = None
         self._validation_set_id: str | None = None
         self._feature_flags: FeatureFlags | None = None
@@ -61,7 +64,11 @@ class RapidataOrderBuilder:
             userFilters=[],
             referee=CreateOrderModelReferee(self._referee.to_model()),
             validationSetId=self._validation_set_id,
-            featureFlags=self._feature_flags.to_list() if self._feature_flags is not None else None,
+            featureFlags=(
+                self._feature_flags.to_list()
+                if self._feature_flags is not None
+                else None
+            ),
         )
 
         result = self._openapi_service.order_api.order_create_post(
@@ -70,7 +77,11 @@ class RapidataOrderBuilder:
 
         self.order_id = result.order_id
         self._dataset = RapidataDataset(result.dataset_id, self._openapi_service)
-        order = RapidataOrder(order_id=self.order_id, dataset=self._dataset, openapi_service=self._openapi_service)
+        order = RapidataOrder(
+            order_id=self.order_id,
+            dataset=self._dataset,
+            openapi_service=self._openapi_service,
+        )
 
         order.dataset.add_media_from_paths(self._media_paths, self._metadata)
 
@@ -104,7 +115,10 @@ class RapidataOrderBuilder:
         return self
 
     def media(
-        self, media_paths: list[str], metadata: list[Metadata] | None = None):
+        self,
+        media_paths: list[RapidAsset],
+        metadata: list[Metadata] | None = None,
+    ):
         """
         Set the media assets for the order.
 
@@ -157,7 +171,7 @@ class RapidataOrderBuilder:
         """
         self._aggregator = aggregator
         return self
-    
+
     def validation_set(self, validation_set_id: str):
         """
         Set the validation set for the order.

{rapidata-0.1.10 → rapidata-0.1.12}/rapidata/rapidata_client/rapidata_client.py

@@ -1,7 +1,11 @@
-from rapidata.rapidata_client.order.dataset.validation_set_builder import ValidationSetBuilder
+from rapidata.rapidata_client.dataset.rapidata_validation_set import (
+    RapidataValidationSet,
+)
+from rapidata.rapidata_client.dataset.validation_set_builder import ValidationSetBuilder
 from rapidata.rapidata_client.order.rapidata_order_builder import RapidataOrderBuilder
 from rapidata.service.openapi_service import OpenAPIService
 
+
 class RapidataClient:
     """
     A client for interacting with the Rapidata API.
@@ -24,8 +28,6 @@ class RapidataClient:
             client_id=client_id, client_secret=client_secret, endpoint=endpoint
         )
 
-        
-
     def new_order(self, name: str) -> RapidataOrderBuilder:
         """
         Create a new order using a RapidataOrderBuilder instance.
@@ -34,7 +36,6 @@ class RapidataClient:
         :return: A RapidataOrderBuilder instance.
         """
         return RapidataOrderBuilder(openapi_service=self.openapi_service, name=name)
-    
 
     def new_validation_set(self, name: str) -> ValidationSetBuilder:
         """
@@ -44,3 +45,12 @@ class RapidataClient:
         :return: A ValidationDatasetBuilder instance.
         """
         return ValidationSetBuilder(name=name, openapi_service=self.openapi_service)
+
+    def get_validation_set(self, validation_set_id: str) -> RapidataValidationSet:
+        """
+        Get a validation set by ID.
+
+        :param validation_set_id: The ID of the validation set.
+        :return: The ValidationSet instance.
+        """
+        return RapidataValidationSet(validation_set_id, self.openapi_service)

rapidata-0.1.12/rapidata/rapidata_client/types/__init__.py

@@ -0,0 +1 @@
+type RapidAsset = str | list[str]