rapidata 2.25.0__py3-none-any.whl → 2.26.1__py3-none-any.whl

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/rapidata_client/__init__.py

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

rapidata/rapidata_client/filter/_base_filter.py

@@ -8,3 +8,34 @@ class RapidataFilter:
     @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/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/rapidata_client/logging/__init__.py

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

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/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/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/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/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.dist-info → rapidata-2.26.1.dist-info}/METADATA

@@ -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.dist-info → rapidata-2.26.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-rapidata/__init__.py,sha256=h35IV8W3cyvTJCT58i-ci0E6ywwLn_GhAOxorAHTgs4,803
+rapidata/__init__.py,sha256=E6KiyHYdwdMkex7C_M9aNYkG2PAhNdhAWe7ePp3MpxI,811
 rapidata/api_client/__init__.py,sha256=ueQCSv2aouXRHG6n2VdmXKMWq8_nguUeoA9oV9L8PQ4,27456
 rapidata/api_client/api/__init__.py,sha256=kxo-WoJb_QrJccktYJgKVVc674eT-scwggMvMZ3Spj8,1211
 rapidata/api_client/api/campaign_api.py,sha256=1ajX0hSnA4O5GacJLIGkAgorPlNDRVaEZY029Pkutl4,71353
@@ -427,7 +427,7 @@ rapidata/api_client/models/workflow_split_model_filter_configs_inner.py,sha256=1
 rapidata/api_client/models/workflow_state.py,sha256=5LAK1se76RCoozeVB6oxMPb8p_5bhLZJqn7q5fFQWis,850
 rapidata/api_client/rest.py,sha256=rtIMcgINZOUaDFaJIinJkXRSddNJmXvMRMfgO2Ezk2o,10835
 rapidata/api_client_README.md,sha256=1GZEvjvNdHtkVFndp26uSCA6FpzrApoNIvTMDRrwZjM,54986
-rapidata/rapidata_client/__init__.py,sha256=7MXEDdib_ZKH3IEXcfaRYJ_AO0BrWtMYOHprH72wjkE,1071
+rapidata/rapidata_client/__init__.py,sha256=TeuZfkXtIJuFrcS23ATnKN17iVxSKf3z0gZ9eWOb82A,1079
 rapidata/rapidata_client/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/rapidata_client/api/rapidata_exception.py,sha256=BIdmHRrJUGW-Mqhp1H_suemZaR6w9TgjWq-ZW5iUPdQ,3878
 rapidata/rapidata_client/assets/__init__.py,sha256=eQkqUrYFME1FCxPY2Xh2bbonKVPnsFElJ6aPFcsWGxI,361
@@ -442,7 +442,7 @@ rapidata/rapidata_client/country_codes/country_codes.py,sha256=ePHqeb7y9DWQZAndd
 rapidata/rapidata_client/demographic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/rapidata_client/demographic/demographic_manager.py,sha256=RE4r6NNAXinNAlRMgAcG4te4pF4whv81xbyAW2V9XMM,1192
 rapidata/rapidata_client/filter/__init__.py,sha256=SqxlEotA_O1Lgw3Um6VPBE2P5Hw7OUVZRSBbsv1GJbI,514
-rapidata/rapidata_client/filter/_base_filter.py,sha256=ytiSyeb9dvNZf93zwgb4PRDzf9ebsAu4wHBn4x49Re0,195
+rapidata/rapidata_client/filter/_base_filter.py,sha256=EytjAqeDX_x3D5WoFwwtr8L2ok5-Ga-JEvkRnkuBQbw,1433
 rapidata/rapidata_client/filter/age_filter.py,sha256=oRjGY65gE_X8oa0D0XRyvKAb4_Z6XOOaGTWykRSfLFA,739
 rapidata/rapidata_client/filter/campaign_filter.py,sha256=6ZT11-gub8349QcRwuHt8AcBY18F7BdLRZ2Ch_vjLyU,735
 rapidata/rapidata_client/filter/country_filter.py,sha256=JqCzxePRizXQbN4YzwLmrx9ozKgw0ra6N_enEq36imI,948
@@ -455,12 +455,12 @@ rapidata/rapidata_client/filter/models/gender.py,sha256=aXg6Kql2BIy8d5d1lCVi1axM
 rapidata/rapidata_client/filter/new_user_filter.py,sha256=qU7d6cSslGEO_N1tYPS4Ru3cGbQYH2_I5dJPNPHvtCM,369
 rapidata/rapidata_client/filter/not_filter.py,sha256=I7crEyOCs53uS0VI48s9EqC6PAFfV9EZG3upwFBJwZo,1189
 rapidata/rapidata_client/filter/or_filter.py,sha256=u6vkXMTG_j15SbY3bkbnXbxJMDgEsH5rdoFLbuoLQmo,1345
-rapidata/rapidata_client/filter/rapidata_filters.py,sha256=HaH5QEpSU-0URjoivCU452FMZ0HqGPD2qqbfSDIIqB0,1444
+rapidata/rapidata_client/filter/rapidata_filters.py,sha256=mx_r6rqEtm6pEe8d0hCEamk2nyplzZ9Hp-AlH98IhRU,1910
 rapidata/rapidata_client/filter/response_count_filter.py,sha256=sDv9Dvy0FbnIQRSAxFGrUf9SIMISTNxnlAQcrFKBjXE,1989
 rapidata/rapidata_client/filter/user_score_filter.py,sha256=2C78zkWm5TnfkxGbV1ER2xB7s9ynpacaibzyRZKG8Cc,1566
-rapidata/rapidata_client/logging/__init__.py,sha256=WXXytdvJxZyE84tIFt4DGFqkqjmyyRdWBjET3RCbOVY,101
+rapidata/rapidata_client/logging/__init__.py,sha256=ip_DwOOMwdj2TdMUcJqigke7q-1A7PIGrQweZNk39D8,109
 rapidata/rapidata_client/logging/logger.py,sha256=CR_FJRVkHi1tVcJ42aYNj75HX7kr5trKBCXvPLCsnSk,1368
-rapidata/rapidata_client/logging/output_manager.py,sha256=2swwqSSZ3B1tyXgEB5LnPIL8YjtqR786iaA5dhCheYo,329
+rapidata/rapidata_client/logging/output_manager.py,sha256=4T9_NFDulnz1FJof9Cpdy2hPL-VdCvVXtV_mYDlE0hI,345
 rapidata/rapidata_client/metadata/__init__.py,sha256=G_mnLo2q4S_V9BjTCTJVNZZqnmwU6OaHNkuxNSNnRQA,302
 rapidata/rapidata_client/metadata/_base_metadata.py,sha256=t2kFqaz5BkEaYYj93Pw3h7zWVDq_S5ZkDxjDIRd21_I,189
 rapidata/rapidata_client/metadata/_media_asset_metadata.py,sha256=muyWV9QAdz_8s6N0Zp8qzqDXiNI0N54HS-3K5hDRG5c,529
@@ -469,10 +469,10 @@ rapidata/rapidata_client/metadata/_prompt_metadata.py,sha256=ecycAq_t2HCEptxgNxy
 rapidata/rapidata_client/metadata/_public_text_metadata.py,sha256=uXavDp1ucy_9u5n0girqWD_SkFr7tplGMK_2aqyyHIA,529
 rapidata/rapidata_client/metadata/_select_words_metadata.py,sha256=-MK5yQDi_G3BKEes6aaVyCcobB-sEy29b6bfo5f4pic,594
 rapidata/rapidata_client/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rapidata/rapidata_client/order/_rapidata_dataset.py,sha256=f09QfLvCmjTUEhZUOtduSXK-b1h_w1PxueTKrijVq5E,19815
+rapidata/rapidata_client/order/_rapidata_dataset.py,sha256=BSyY2J-l-W59IZp59rG4UJA4D1Ui_4B2Yn-eFj1Oqmc,19921
 rapidata/rapidata_client/order/_rapidata_order_builder.py,sha256=x-2lpW6Jwlq-9XRz91beWNv2TgdEA-q4b_RhOSr7vhQ,14405
-rapidata/rapidata_client/order/rapidata_order.py,sha256=EA81_0cO2GIJVPl7XVpyaH20PWN_mxwp6hIQuqUNy9g,12341
-rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=ABWm-ASZuXvD5BEFbsGDt29fYZVTZIj-MdprrlymzZU,38209
+rapidata/rapidata_client/order/rapidata_order.py,sha256=V1CUXqjYRN_phSv3May2N5KHpM_wSeLDiPVH0KXM4Fc,12413
+rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=fVMgz-HwtfXKBpWZIytc6O9UiRhH5r0IRWjd0Xx747E,38210
 rapidata/rapidata_client/order/rapidata_results.py,sha256=UllYpuqpm2inKdRNhClaUwApuxsMLrvrGDsrHA5KqbY,8111
 rapidata/rapidata_client/rapidata_client.py,sha256=iAycSS8Dyt0_xnILpU5N9DoeGlB3v2UtlinmxcFh-eo,4029
 rapidata/rapidata_client/referee/__init__.py,sha256=q0Hv9nmfEpyChejtyMLT8hWKL0vTTf_UgUXPYNJ-H6M,153
@@ -508,7 +508,7 @@ rapidata/rapidata_client/validation/rapids/__init__.py,sha256=WU5PPwtTJlte6U90MD
 rapidata/rapidata_client/validation/rapids/box.py,sha256=t3_Kn6doKXdnJdtbwefXnYKPiTKHneJl9E2inkDSqL8,589
 rapidata/rapidata_client/validation/rapids/rapids.py,sha256=e8XHYf0QdCsyDGUnrmZvGHRUp9h-WXh1n5R-LdTB3ZQ,4936
 rapidata/rapidata_client/validation/rapids/rapids_manager.py,sha256=s5VAq8H5CKACWfmIQuz9kHC8t2nd-xEHGGUj9pIfXKI,14386
-rapidata/rapidata_client/validation/validation_set_manager.py,sha256=AZRpDe0aaINvjLBER4lfml6w3D5H5Vtk7CaUySlECfY,25695
+rapidata/rapidata_client/validation/validation_set_manager.py,sha256=ToKIaMGEsFRQ2XjZ6RjMrWXmwBxaMqtoQSYw-b8VFEY,25696
 rapidata/rapidata_client/workflow/__init__.py,sha256=7nXcY91xkxjHudBc9H0fP35eBBtgwHGWTQKbb-M4h7Y,477
 rapidata/rapidata_client/workflow/_base_workflow.py,sha256=XyIZFKS_RxAuwIHS848S3AyLEHqd07oTD_5jm2oUbsw,762
 rapidata/rapidata_client/workflow/_classify_workflow.py,sha256=9bT54wxVJgxC-zLk6MVNbseFpzYrvFPjt7DHvxqYfnk,1736
@@ -524,7 +524,7 @@ rapidata/service/__init__.py,sha256=s9bS1AJZaWIhLtJX_ZA40_CK39rAAkwdAmymTMbeWl4,
 rapidata/service/credential_manager.py,sha256=FAH9PJreDAw3G9cJ_iwzvz99s9RnFDrxxV0BHb2VYAI,8698
 rapidata/service/local_file_service.py,sha256=pgorvlWcx52Uh3cEG6VrdMK_t__7dacQ_5AnfY14BW8,877
 rapidata/service/openapi_service.py,sha256=J07TB4P3cz9KCU7k_fwuMQwGXlq_nJx_m1_xHbZoCg0,4867
-rapidata-2.25.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-rapidata-2.25.0.dist-info/METADATA,sha256=nVc2cYGcY7Ql3y1PB1RiMEnIi9PLVXsdJBtYi5OvEmQ,1268
-rapidata-2.25.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-rapidata-2.25.0.dist-info/RECORD,,
+rapidata-2.26.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+rapidata-2.26.1.dist-info/METADATA,sha256=n01LS9Pbys9zwObwNuKrZxSQBaTk6vP0_tfPKaC4bdg,1268
+rapidata-2.26.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+rapidata-2.26.1.dist-info/RECORD,,