rapidata 1.4.3__tar.gz → 1.4.5__tar.gz

{rapidata-1.4.3 → rapidata-1.4.5}/PKG-INFO

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

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

@@ -10,7 +10,7 @@ from .rapidata_client import (
     ConditionalValidationSelection,
     CappedSelection,
     NaiveReferee,
-    ClassifyEarlyStoppingReferee,
+    EarlyStoppingReferee,
     PrivateTextMetadata,
     PublicTextMetadata,
     PromptMetadata,

{rapidata-1.4.3 → rapidata-1.4.5}/src/rapidata/rapidata_client/__init__.py

@@ -12,7 +12,7 @@ from .selection import (
     ConditionalValidationSelection,
     CappedSelection,
 )
-from .referee import NaiveReferee, ClassifyEarlyStoppingReferee
+from .referee import NaiveReferee, EarlyStoppingReferee
 from .metadata import (
     PrivateTextMetadata,
     PublicTextMetadata,

{rapidata-1.4.3 → rapidata-1.4.5}/src/rapidata/rapidata_client/order/rapidata_order.py

@@ -1,4 +1,4 @@
-import time
+from time import sleep
 from rapidata.rapidata_client.dataset.rapidata_dataset import RapidataDataset
 from rapidata.service.openapi_service import OpenAPIService
 import json
@@ -61,11 +61,11 @@ class RapidataOrder:
         :param refresh_rate: How often to refresh the progress bar, in seconds.
         :type refresh_rate: float
         """
-        total_rapids = self._get_total_rapids()
+        total_rapids = self._get_workflow_progress().total
         with tqdm(total=total_rapids, desc="Processing order", unit="rapids") as pbar:
             completed_rapids = 0
             while True:
-                current_completed = self._get_completed_rapids()
+                current_completed = self._get_workflow_progress().completed
                 if current_completed > completed_rapids:
                     pbar.update(current_completed - completed_rapids)
                     completed_rapids = current_completed
@@ -73,7 +73,7 @@ class RapidataOrder:
                 if completed_rapids >= total_rapids:
                     break
 
-                time.sleep(refresh_rate)
+                sleep(refresh_rate)
 
     def _get_workflow_id(self):
         if self._workflow_id:
@@ -86,31 +86,38 @@ class RapidataOrder:
                 self._workflow_id = cast(WorkflowArtifactModel, pipeline.artifacts["workflow-artifact"].actual_instance).workflow_id
                 break
             except Exception:
-                time.sleep(2)
+                sleep(2)
         if not self._workflow_id:
-            raise Exception("Order has not started yet. Please wait for a few seconds and try again.")
+            raise Exception("Order has not started yet. Please start it or wait for a few seconds and try again.")
         return self._workflow_id
-
-    def _get_total_rapids(self):
-        workflow_id = self._get_workflow_id()
-        return self.openapi_service.workflow_api.workflow_get_progress_get(workflow_id).total
-
-    def _get_completed_rapids(self):
+    
+    def _get_workflow_progress(self):
         workflow_id = self._get_workflow_id()
-        return self.openapi_service.workflow_api.workflow_get_progress_get(workflow_id).completed
+        progress = None
+        for _ in range(2):
+            try:
+                progress = self.openapi_service.workflow_api.workflow_get_progress_get(workflow_id)
+                break
+            except Exception:
+                sleep(5)
 
-    def get_progress_percentage(self):
-        workflow_id = self._get_workflow_id()
-        progress = self.openapi_service.workflow_api.workflow_get_progress_get(workflow_id)
-        return progress.completion_percentage
+        if not progress:
+            raise Exception(f"Failed to get progress. Please try again in a few seconds.")
+        
+        return progress
 
+        
     def get_results(self):
         """
-        Gets the results of the order.
+        Gets the results of the order. 
+        If the order is still processing, this method will block until the order is completed and then return the results.
 
         :return: The results of the order.
         :rtype: dict
         """
+        while self.get_status().state == "Processing":
+            sleep(5)
+
         try:
             # Get the raw result string
             result_str = self.openapi_service.order_api.order_result_get(id=self.order_id)

{rapidata-1.4.3 → rapidata-1.4.5}/src/rapidata/rapidata_client/rapidata_client.py

@@ -28,8 +28,8 @@ class RapidataClient:
         self,
         client_id: str,
         client_secret: str,
-        endpoint: str = "https://api.app.rapidata.ai",
-        token_url: str = "https://api.app.rapidata.ai/connect/token",
+        endpoint: str = "https://auth.rapidata.ai",
+        token_url: str = "https://auth.rapidata.ai/connect/token",
         oauth_scope: str = "openid",
         cert_path: str | None = None,
     ):

{rapidata-1.4.3 → rapidata-1.4.5}/src/rapidata/rapidata_client/referee/__init__.py

@@ -1,3 +1,3 @@
 from .base_referee import Referee
 from .naive_referee import NaiveReferee #as MaxVoteReferee
-from .classify_early_stopping_referee import ClassifyEarlyStoppingReferee
+from .early_stopping_referee import EarlyStoppingReferee

rapidata-1.4.3/src/rapidata/rapidata_client/referee/classify_early_stopping_referee.py → rapidata-1.4.5/src/rapidata/rapidata_client/referee/early_stopping_referee.py

@@ -5,7 +5,7 @@ from rapidata.api_client.models.early_stopping_referee_model import (
 )
 
 
-class ClassifyEarlyStoppingReferee(Referee):
+class EarlyStoppingReferee(Referee):
     """A referee that stops the task when confidence in the winning category exceeds a threshold.
 
     This referee implements an early stopping mechanism for classification tasks.
@@ -15,6 +15,8 @@ class ClassifyEarlyStoppingReferee(Referee):
     The threshold behaves logarithmically, meaning small increments (e.g., from 0.99
     to 0.999) can significantly impact the stopping criteria.
 
+    This referee is supported for the classification and compare tasks.
+
     Attributes:
         threshold (float): The confidence threshold for early stopping.
         max_vote_count (int): The maximum number of votes allowed before stopping.

{rapidata-1.4.3 → rapidata-1.4.5}/src/rapidata/rapidata_client/referee/naive_referee.py

@@ -3,31 +3,31 @@ from rapidata.rapidata_client.referee.base_referee import Referee
 
 
 class NaiveReferee(Referee):
-    """A simple referee that completes a task after a fixed number of guesses.
+    """A simple referee that completes a task after a fixed number of responses.
 
     This referee implements a straightforward approach to task completion,
     where the task is considered finished after a predetermined number of
-    guesses have been made, regardless of the content or quality of those guesses.
+    responses have been made, regardless of the content or quality of those responses.
 
     Attributes:
-        required_guesses (int): The number of guesses required to complete the task.
+        responses (int): The number of responses required to complete the task.
     """
 
-    def __init__(self, required_guesses: int = 10):
+    def __init__(self, responses: int = 10):
         """Initialize the NaiveReferee.
 
         Args:
-            required_guesses (int, optional): The number of guesses required
-                to complete the task. Defaults to 10.
+            responses (int, optional): The number of responses required
+                to complete the task. Defaults to 10. This is per media item.
         """
         super().__init__()
-        self.required_guesses = required_guesses
+        self.responses = responses
 
     def to_dict(self):
         return {
             "_t": "NaiveRefereeConfig",
-            "guessesRequired": self.required_guesses,
+            "guessesRequired": self.responses,
         }
 
     def to_model(self):
-        return NaiveRefereeModel(_t="NaiveReferee", totalVotes=self.required_guesses)
+        return NaiveRefereeModel(_t="NaiveReferee", totalVotes=self.responses)

{rapidata-1.4.3 → rapidata-1.4.5}/src/rapidata/rapidata_client/simple_builders/simple_classification_builders.py

@@ -1,7 +1,7 @@
 from rapidata.rapidata_client.order.rapidata_order_builder import RapidataOrderBuilder
 from rapidata.rapidata_client.metadata.base_metadata import Metadata
 from rapidata.rapidata_client.referee.naive_referee import NaiveReferee
-from rapidata.rapidata_client.referee.classify_early_stopping_referee import ClassifyEarlyStoppingReferee
+from rapidata.rapidata_client.referee.early_stopping_referee import EarlyStoppingReferee
 from rapidata.rapidata_client.selection.base_selection import Selection
 from rapidata.rapidata_client.workflow.classify_workflow import ClassifyWorkflow
 from rapidata.rapidata_client.selection.validation_selection import ValidationSelection
@@ -43,13 +43,13 @@ class ClassificationOrderBuilder:
 
     def create(self, submit: bool = True, max_upload_workers: int = 10):
         if self._probability_threshold and self._responses_required:
-            referee = ClassifyEarlyStoppingReferee(
+            referee = EarlyStoppingReferee(
                 max_vote_count=self._responses_required,
                 threshold=self._probability_threshold
             )
 
         else:
-            referee = NaiveReferee(required_guesses=self._responses_required)
+            referee = NaiveReferee(responses=self._responses_required)
 
         assets = [MediaAsset(path=media_path) for media_path in self._media_paths]
 

{rapidata-1.4.3 → rapidata-1.4.5}/src/rapidata/rapidata_client/simple_builders/simple_compare_builders.py

@@ -2,7 +2,7 @@ from rapidata.service.openapi_service import OpenAPIService
 from rapidata.rapidata_client.metadata import Metadata
 from rapidata.rapidata_client.order.rapidata_order_builder import RapidataOrderBuilder
 from rapidata.rapidata_client.workflow.compare_workflow import CompareWorkflow
-from rapidata.rapidata_client.referee.naive_referee import NaiveReferee
+from rapidata.rapidata_client.referee import NaiveReferee, EarlyStoppingReferee
 from rapidata.rapidata_client.selection.validation_selection import ValidationSelection
 from rapidata.rapidata_client.selection.labeling_selection import LabelingSelection
 from rapidata.rapidata_client.selection.base_selection import Selection
@@ -18,6 +18,7 @@ class CompareOrderBuilder:
         self._responses_required = 10
         self._metadata = None
         self._validation_set_id = None
+        self._probability_threshold = None
 
     def responses(self, responses_required: int) -> 'CompareOrderBuilder':
         """Set the number of resoonses required per matchup/pairing for the comparison order."""
@@ -34,7 +35,20 @@ class CompareOrderBuilder:
         self._validation_set_id = validation_set_id
         return self
     
+    def probability_threshold(self, probability_threshold: float) -> 'CompareOrderBuilder':
+        """Set the probability threshold for early stopping."""
+        self._probability_threshold = probability_threshold
+        return self
+    
     def create(self, submit: bool = True, max_upload_workers: int = 10):
+        if self._probability_threshold and self._responses_required:
+            referee = EarlyStoppingReferee(
+                max_vote_count=self._responses_required,
+                threshold=self._probability_threshold
+            )
+
+        else:
+            referee = NaiveReferee(responses=self._responses_required)
         selection: list[Selection] = ([ValidationSelection(amount=1, validation_set_id=self._validation_set_id), LabelingSelection(amount=2)] 
                      if self._validation_set_id 
                      else [LabelingSelection(amount=3)])
@@ -46,7 +60,7 @@ class CompareOrderBuilder:
                     criteria=self._criteria
                 )
             )
-            .referee(NaiveReferee(required_guesses=self._responses_required))
+            .referee(referee)
             .media(media_paths, metadata=self._metadata) # type: ignore
             .selections(selection)
             .create(submit=submit, max_workers=max_upload_workers))