rapidata 2.25.0__tar.gz → 2.26.1__tar.gz

{rapidata-2.25.0 → rapidata-2.26.1}/PKG-INFO

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

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

@@ -1,4 +1,4 @@
-__version__ = "2.25.0"
+__version__ = "2.26.1"
 
 from .rapidata_client import (
     RapidataClient,
@@ -37,5 +37,5 @@ from .rapidata_client import (
     PromptMetadata,
     logger,
     configure_logger,
-    OutputManger,
+    RapidataOutputManger,
 )

{rapidata-2.25.0 → rapidata-2.26.1}/src/rapidata/rapidata_client/__init__.py

@@ -49,7 +49,7 @@ from .filter import (
 from .logging import (
     configure_logger, 
     logger,
-    OutputManger
+    RapidataOutputManger
 )
 
 from .validation import Box

rapidata-2.26.1/src/rapidata/rapidata_client/filter/_base_filter.py

@@ -0,0 +1,41 @@
+from abc import abstractmethod
+from typing import Any
+
+
+class RapidataFilter:
+    """The base class for all Rapidata Filters."""
+
+    @abstractmethod
+    def _to_model(self) -> Any:
+        pass
+
+    def __or__(self, other):
+        """Enable the | operator to create OrFilter combinations."""
+        if not isinstance(other, RapidataFilter):
+            return NotImplemented
+        
+        from rapidata.rapidata_client.filter.or_filter import OrFilter
+        
+        # If self is already an OrFilter, extend its filters list
+        if isinstance(self, OrFilter):
+            if isinstance(other, OrFilter):
+                return OrFilter(self.filters + other.filters)
+            else:
+                return OrFilter(self.filters + [other])
+        # If other is an OrFilter, prepend self to its filters
+        elif isinstance(other, OrFilter):
+            return OrFilter([self] + other.filters)
+        # Neither is an OrFilter, create a new one
+        else:
+            return OrFilter([self, other])
+
+    def __invert__(self):
+        """Enable the ~ operator to create NotFilter negations."""
+        from rapidata.rapidata_client.filter.not_filter import NotFilter
+        
+        # If self is already a NotFilter, return the original filter (double negation)
+        if isinstance(self, NotFilter):
+            return self.filter
+        # Create a new NotFilter
+        else:
+            return NotFilter(self)

{rapidata-2.25.0 → rapidata-2.26.1}/src/rapidata/rapidata_client/filter/rapidata_filters.py

@@ -33,6 +33,17 @@ class RapidataFilters:
         ```
 
         This ensures the order is only shown to users in the US and Germany whose phones are set to English.
+
+    Info:        
+        The or and not filter support the | and ~ operators respectively.
+        The and is given by the elements in the list.
+
+        ```python
+        from rapidata import AgeFilter, LanguageFilter, CountryFilter
+        filters=[~AgeFilter([AgeGroup.UNDER_18]), CountryFilter(["US"]) | LanguageFilter(["en"])]
+        ```
+
+        This would return users who are not under 18 years old and are from the US or whose phones are set to English.
     """
     user_score = UserScoreFilter
     age = AgeFilter 

rapidata-2.26.1/src/rapidata/rapidata_client/logging/__init__.py

@@ -0,0 +1,2 @@
+from .logger import configure_logger, logger
+from .output_manager import managed_print, RapidataOutputManger

{rapidata-2.25.0 → rapidata-2.26.1}/src/rapidata/rapidata_client/logging/output_manager.py

@@ -1,4 +1,4 @@
-class OutputManger:
+class RapidataOutputManger:
     silent_mode = False
     
     @classmethod
@@ -10,7 +10,7 @@ class OutputManger:
         cls.silent_mode = False
 
 def managed_print(*args, **kwargs):
-    if not OutputManger.silent_mode:
+    if not RapidataOutputManger.silent_mode:
         print(*args, **kwargs)
 
 

{rapidata-2.25.0 → rapidata-2.26.1}/src/rapidata/rapidata_client/order/_rapidata_dataset.py

@@ -17,7 +17,7 @@ from tqdm import tqdm
 
 from pydantic import StrictStr
 from typing import cast, Sequence, Generator
-from rapidata.rapidata_client.logging import logger
+from rapidata.rapidata_client.logging import logger, RapidataOutputManger
 import time
 import threading
 
@@ -76,7 +76,7 @@ class RapidataDataset:
                 for i, (text_asset, metadata) in enumerate(zip_longest(text_assets, metadata_list or []))
             ]
 
-            with tqdm(total=total_uploads, desc="Uploading text datapoints") as pbar:
+            with tqdm(total=total_uploads, desc="Uploading text datapoints", disable=RapidataOutputManger.silent_mode) as pbar:
                 for future in as_completed(futures):
                     future.result()  # This will raise any exceptions that occurred during execution
                     pbar.update(1)
@@ -183,7 +183,7 @@ class RapidataDataset:
         def progress_tracking_thread():
             try:
                 # Initialize progress bar with 0 completions
-                with tqdm(total=total_uploads, desc="Uploading datapoints") as pbar:
+                with tqdm(total=total_uploads, desc="Uploading datapoints", disable=RapidataOutputManger.silent_mode) as pbar:
                     prev_ready = 0
                     prev_failed = 0
                     stall_count = 0

{rapidata-2.25.0 → rapidata-2.26.1}/src/rapidata/rapidata_client/order/rapidata_order.py

@@ -16,7 +16,7 @@ from rapidata.api_client.models.preliminary_download_model import PreliminaryDow
 from rapidata.api_client.models.workflow_artifact_model import WorkflowArtifactModel
 from rapidata.rapidata_client.order.rapidata_results import RapidataResults
 from rapidata.service.openapi_service import OpenAPIService
-from rapidata.rapidata_client.logging import logger, managed_print
+from rapidata.rapidata_client.logging import logger, managed_print, RapidataOutputManger
 
 
 class RapidataOrder:
@@ -125,8 +125,8 @@ class RapidataOrder:
                 "To speed up the process, contact support (info@rapidata.ai).\n"
                 "Once started, run this method again to display the progress bar."
             )
-
-        with tqdm(total=100, desc="Processing order", unit="%", bar_format="{desc}: {percentage:3.0f}%|{bar}| completed [{elapsed}<{remaining}, {rate_fmt}]") as pbar:
+        
+        with tqdm(total=100, desc="Processing order", unit="%", bar_format="{desc}: {percentage:3.0f}%|{bar}| completed [{elapsed}<{remaining}, {rate_fmt}]", disable=RapidataOutputManger.silent_mode) as pbar:
             last_percentage = 0
             while True:
                 current_percentage = self._workflow_progress.completion_percentage

{rapidata-2.25.0 → rapidata-2.26.1}/src/rapidata/rapidata_client/order/rapidata_order_manager.py

@@ -28,9 +28,8 @@ from rapidata.rapidata_client.filter import RapidataFilter
 from rapidata.rapidata_client.filter.rapidata_filters import RapidataFilters
 from rapidata.rapidata_client.settings import RapidataSettings, RapidataSetting
 from rapidata.rapidata_client.selection.rapidata_selections import RapidataSelections
-from rapidata.rapidata_client.logging import logger
+from rapidata.rapidata_client.logging import logger, RapidataOutputManger
 
-from rapidata.api_client.exceptions import BadRequestException
 from rapidata.api_client.models.query_model import QueryModel
 from rapidata.api_client.models.page_info import PageInfo
 from rapidata.api_client.models.root_filter import RootFilter
@@ -604,7 +603,7 @@ class RapidataOrderManager:
 
         assets = [MediaAsset(path=path) for path in datapoints]
 
-        for asset in tqdm(assets, desc="Downloading assets and checking duration"):
+        for asset in tqdm(assets, desc="Downloading assets and checking duration", disable=RapidataOutputManger.silent_mode):
             if not asset.get_duration():
                 raise ValueError("The datapoints for this order must have a duration. (e.g. video or audio)")
 

{rapidata-2.25.0 → rapidata-2.26.1}/src/rapidata/rapidata_client/validation/validation_set_manager.py

@@ -11,12 +11,11 @@ from rapidata.api_client.models.page_info import PageInfo
 from rapidata.api_client.models.root_filter import RootFilter
 from rapidata.api_client.models.filter import Filter
 from rapidata.api_client.models.sort_criterion import SortCriterion
-from rapidata.api_client.exceptions import BadRequestException
 from urllib3._collections import HTTPHeaderDict # type: ignore[import]
 
 from rapidata.rapidata_client.validation.rapids.box import Box
 
-from rapidata.rapidata_client.logging import logger, managed_print
+from rapidata.rapidata_client.logging import logger, managed_print, RapidataOutputManger
 from tqdm import tqdm
 
 
@@ -453,7 +452,7 @@ class ValidationSetManager:
         )
 
         logger.debug("Adding rapids to validation set")
-        for rapid in tqdm(rapids, desc="Uploading validation tasks"):
+        for rapid in tqdm(rapids, desc="Uploading validation tasks", disable=RapidataOutputManger.silent_mode):
             validation_set.add_rapid(rapid)
         
         managed_print()

rapidata-2.25.0/src/rapidata/rapidata_client/filter/_base_filter.py

@@ -1,10 +0,0 @@
-from abc import abstractmethod
-from typing import Any
-
-
-class RapidataFilter:
-    """The base class for all Rapidata Filters."""
-
-    @abstractmethod
-    def _to_model(self) -> Any:
-        pass

rapidata-2.25.0/src/rapidata/rapidata_client/logging/__init__.py

@@ -1,2 +0,0 @@
-from .logger import configure_logger, logger
-from .output_manager import managed_print, OutputManger