rapidata 2.7.0__py3-none-any.whl → 2.7.2__py3-none-any.whl

rapidata/rapidata_client/assets/_media_asset.py

@@ -1,6 +1,7 @@
-"""Media Asset Module
+"""Media Asset Module with Lazy Loading
 
 Defines the MediaAsset class for handling media file paths within assets.
+Implements lazy loading for URL-based media to prevent unnecessary downloads.
 """
 
 import os
@@ -12,18 +13,20 @@ from PIL import Image
 from tinytag import TinyTag
 import tempfile
 from pydantic import StrictStr, StrictBytes
-from typing import Optional
+from typing import Optional, cast
 import logging
+from functools import cached_property
 
 
 class MediaAsset(BaseAsset):
-    """MediaAsset Class
+    """MediaAsset Class with Lazy Loading
 
-    Represents a media asset by storing the file path.
+    Represents a media asset by storing the file path or URL.
+    Only downloads URL content when needed.
     Supports local files and URLs for images, MP3, and MP4.
 
     Args:
-        path (str): The file system path to the media asset.
+        path (str): The file system path to the media asset or URL.
 
     Raises:
         FileNotFoundError: If the provided file path does not exist.
@@ -67,23 +70,40 @@ class MediaAsset(BaseAsset):
 
         Raises:
             FileNotFoundError: If the provided file path does not exist.
-            ValueError: If media type is unsupported or duration exceeds 25 seconds.
+            ValueError: If path is not a string.
         """
         if not isinstance(path, str):
             raise ValueError("Media must be a string, either a local file path or a URL")
         
+        self._url = None
+        self._content = None
+        
         if re.match(r'^https?://', path):
-            self.path = self.__get_media_bytes(path)
+            self._url = path
             self.name = path.split('/')[-1]
             self.name = self.__check_name_ending(self.name)
+            self.path = None  # Will be set when content is downloaded
             return
         
         if not os.path.exists(path):
             raise FileNotFoundError(f"File not found: {path}")
         
-        self.path: str | bytes = path
+        self.path = path
         self.name = path
 
+    @cached_property
+    def content(self) -> bytes:
+        """
+        Lazy loader for URL content. Only downloads when first accessed.
+        Uses cached_property to store the result after first download.
+        """
+        if self._url is None:
+            self.path = cast(str, self.path)
+            with open(self.path, 'rb') as f:
+                return f.read()
+            
+        return self.__get_media_bytes(self._url)
+
     def get_duration(self) -> int:
         """
         Get the duration of audio/video files in milliseconds.
@@ -97,27 +117,22 @@ class MediaAsset(BaseAsset):
         """
         path_to_check = self.name.lower()
         
-        # Return 0 for other static images
+        # Return 0 for static images
         if any(path_to_check.endswith(ext) for ext in ('.jpg', '.jpeg', '.png', '.webp', '.gif')):
             return 0
 
         try:
-            # For URL downloads (bytes), write to temporary file first
-            if isinstance(self.path, bytes):
-                with tempfile.NamedTemporaryFile(suffix=os.path.splitext(self.name)[1], delete=False) as tmp:
-                    tmp.write(self.path)
-                    tmp.flush()
-                    # Close the file so it can be read
-                    tmp_path = tmp.name
+            # Create temporary file from content
+            with tempfile.NamedTemporaryFile(suffix=os.path.splitext(self.name)[1], delete=False) as tmp:
+                tmp.write(self.content)
+                tmp.flush()
+                tmp_path = tmp.name
                 
                 try:
                     tag = TinyTag.get(tmp_path)
                 finally:
                     # Clean up the temporary file
                     os.unlink(tmp_path)
-            else:
-                # For local files, use path directly
-                tag = TinyTag.get(self.path)
             
             if tag.duration is None:
                 raise ValueError("Could not read duration from file")
@@ -136,17 +151,14 @@ class MediaAsset(BaseAsset):
             return None
             
         try:
-            if isinstance(self.path, bytes):
-                img = Image.open(BytesIO(self.path))
-            else:
-                img = Image.open(self.path)
+            img = Image.open(BytesIO(self.content))
             return img.size
         except Exception:
             return None
 
     def set_custom_name(self, name: str) -> 'MediaAsset':
         """Set a custom name for the media asset (only works with URLs)."""
-        if isinstance(self.path, bytes):
+        if self._url is not None:
             self.name = self.__check_name_ending(name)
         else:
             raise ValueError("Custom name can only be set for URLs.")
@@ -265,8 +277,10 @@ class MediaAsset(BaseAsset):
         self._logger.error(error_msg)
         raise ValueError(error_msg)
     
-    def to_file(self) -> StrictStr | tuple[StrictStr, StrictBytes] | StrictBytes: # types for autogenerated models
-        if isinstance(self.path, str):
+    def to_file(self) -> StrictStr | tuple[StrictStr, StrictBytes] | StrictBytes:
+        """Convert the media asset to a file representation."""
+        if self._url is None:
+            self.path = cast(str, self.path)
             return self.path
-        else: # isinstance(self.path, bytes)
-            return (self.name, self.path)
+        else:
+            return (self.name, self.content)

rapidata/rapidata_client/order/rapidata_order_manager.py

@@ -36,6 +36,8 @@ 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 tqdm import tqdm
+
 
 class RapidataOrderManager:
     """
@@ -58,7 +60,7 @@ class RapidataOrderManager:
             return [ValidationSelection(validation_set_id=validation_set_id), LabelingSelection(amount=labeling_amount-1)]
         return [LabelingSelection(amount=labeling_amount)]
     
-    def __create_general_order(self,
+    def _create_general_order(self,
             name: str,
             workflow: Workflow,
             assets: list[MediaAsset] | list[TextAsset] | list[MultiAsset],
@@ -168,7 +170,7 @@ class RapidataOrderManager:
         else:
             raise ValueError(f"Unsupported data type: {data_type}, must be one of {RapidataDataTypes._possible_values()}")
         
-        return self.__create_general_order(
+        return self._create_general_order(
             name=name,
             workflow=ClassifyWorkflow(
                 instruction=instruction,
@@ -226,7 +228,7 @@ class RapidataOrderManager:
         else:
             raise ValueError(f"Unsupported data type: {data_type}, must be one of {RapidataDataTypes._possible_values()}")
         
-        return self.__create_general_order(
+        return self._create_general_order(
             name=name,
             workflow=CompareWorkflow(
                 instruction=instruction
@@ -273,7 +275,7 @@ class RapidataOrderManager:
         else:
             raise ValueError(f"Unsupported data type: {data_type}, must be one of {RapidataDataTypes._possible_values()}")
 
-        return self.__create_general_order(
+        return self._create_general_order(
             name=name,
             workflow=FreeTextWorkflow(
                 instruction=instruction
@@ -316,7 +318,7 @@ class RapidataOrderManager:
 
         assets = [MediaAsset(path=path) for path in datapoints]
         
-        return self.__create_general_order(
+        return self._create_general_order(
             name=name,
             workflow=SelectWordsWorkflow(
                 instruction=instruction
@@ -361,7 +363,7 @@ class RapidataOrderManager:
 
         assets = [MediaAsset(path=path) for path in datapoints]
 
-        return self.__create_general_order(
+        return self._create_general_order(
             name=name,
             workflow=LocateWorkflow(target=instruction),
             assets=assets,
@@ -403,7 +405,7 @@ class RapidataOrderManager:
 
         assets = [MediaAsset(path=path) for path in datapoints]
 
-        return self.__create_general_order(
+        return self._create_general_order(
             name=name,
             workflow=DrawWorkflow(target=instruction),
             assets=assets,
@@ -444,11 +446,11 @@ class RapidataOrderManager:
 
         assets = [MediaAsset(path=path) for path in datapoints]
 
-        for asset in assets:
+        for asset in tqdm(assets, desc="Downloading assets and checking duration"):
             if not asset.get_duration():
                 raise ValueError("The datapoints for this order must have a duration. (e.g. video or audio)")
 
-        return self.__create_general_order(
+        return self._create_general_order(
             name=name,
             workflow=TimestampWorkflow(
                 instruction=instruction

rapidata/rapidata_client/validation/validation_set_manager.py

@@ -15,6 +15,7 @@ from urllib3._collections import HTTPHeaderDict
 from rapidata.rapidata_client.validation.rapids.box import Box
 
 from rapidata.api_client.models.query_validation_set_model import QueryValidationSetModel
+from tqdm import tqdm
 
 
 class ValidationSetManager:
@@ -404,7 +405,7 @@ class ValidationSetManager:
             openapi_service=self.__openapi_service
         )
 
-        for rapid in rapids:
+        for rapid in tqdm(rapids, desc="Uploading validation tasks"):
             validation_set.add_rapid(rapid)
         
         return validation_set

{rapidata-2.7.0.dist-info → rapidata-2.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rapidata
-Version: 2.7.0
+Version: 2.7.2
 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.7.0.dist-info → rapidata-2.7.2.dist-info}/RECORD

@@ -366,7 +366,7 @@ rapidata/api_client_README.md,sha256=IM9O5YglCc-JICZZpH4XZvBI9vM5ZuZXU_4-ot_oulQ
 rapidata/rapidata_client/__init__.py,sha256=kkT6FMU4P8rTdYKTJgZNcyptr-Rq1iZmsyLIyRCwpYA,896
 rapidata/rapidata_client/assets/__init__.py,sha256=hKgrOSn8gJcBSULaf4auYhH1S1N5AfcwIhBSq1BOKwQ,323
 rapidata/rapidata_client/assets/_base_asset.py,sha256=B2YWH1NgaeYUYHDW3OPpHM_bqawHbH4EjnRCE2BYwiM,298
-rapidata/rapidata_client/assets/_media_asset.py,sha256=s7_bfhvYEFLIvpZvECsjtVSLnvZmi19xLJoOsDShzgk,9391
+rapidata/rapidata_client/assets/_media_asset.py,sha256=hzopr2J8_T2EJs0nIwNNtAzIqXR8xHiVi870lOPRrW0,9771
 rapidata/rapidata_client/assets/_multi_asset.py,sha256=o4_-OvovADSVpl0tr6fPzRR_gHCcIQKfeZKcoFDFBLo,1667
 rapidata/rapidata_client/assets/_text_asset.py,sha256=itoe3vicn41LbdJ7UeydImORUo9iDL0SZu-ptOlbMRM,618
 rapidata/rapidata_client/assets/data_type_enum.py,sha256=ELC-ymeKnQlfNAzfqsI7MmUuRiGYamCHVcTc0qR6Fm4,185
@@ -397,7 +397,7 @@ rapidata/rapidata_client/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 rapidata/rapidata_client/order/_rapidata_dataset.py,sha256=t1OFfHXz3Pe0S8qVGdReZm4aGVvxpVWH-VUgfnNtcgQ,5300
 rapidata/rapidata_client/order/_rapidata_order_builder.py,sha256=N6mqmgneJSsb_no_Ps9BG3EhDekLgKxFYpjDCN-VVeg,13095
 rapidata/rapidata_client/order/rapidata_order.py,sha256=Yf-GSlkFRRnC_dOh6VKKO_XJENu7sym77iO6u-q0R2Y,8497
-rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=0sbQWNHUjwKPTwAB-a_fOeOLuJYK7xl6rAj54BTn2gg,27201
+rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=4wW5xtmEtdewFGGwMWSMbdLZpHvygtLCfYNv4lcHGg8,27271
 rapidata/rapidata_client/rapidata_client.py,sha256=A9mnSX6wzVF9TxS1YH87hTi4jCn75dIuP3KZj5Y_vFg,1957
 rapidata/rapidata_client/referee/__init__.py,sha256=q0Hv9nmfEpyChejtyMLT8hWKL0vTTf_UgUXPYNJ-H6M,153
 rapidata/rapidata_client/referee/_base_referee.py,sha256=MdFOhdxt3sRnWXLDKLJZKFdVpjBGn9jypPnWWQ6msQA,496
@@ -429,7 +429,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=aWkcjWR6Pr2BFwz8a0MfqEkXnEJPkAbKMeQtGXnsags,4440
 rapidata/rapidata_client/validation/rapids/rapids_manager.py,sha256=4HOX6c42sCOfpGR2aDoiMgrfjontM8z2KEJwQp4ir6A,14247
-rapidata/rapidata_client/validation/validation_set_manager.py,sha256=RR3lP3VtOVCtmbKjEAFYVbQxZyUCXvOuWMqw8dGz-WA,22730
+rapidata/rapidata_client/validation/validation_set_manager.py,sha256=X3T1L41v-B1s2JpE8szOpQNOj2ns6leA3NvomNn9TS0,22793
 rapidata/rapidata_client/workflow/__init__.py,sha256=eFRx0fm280alXpds6hYcnxN_yERlabF9B5sTdPFsL1g,430
 rapidata/rapidata_client/workflow/_base_workflow.py,sha256=XyIZFKS_RxAuwIHS848S3AyLEHqd07oTD_5jm2oUbsw,762
 rapidata/rapidata_client/workflow/_classify_workflow.py,sha256=9bT54wxVJgxC-zLk6MVNbseFpzYrvFPjt7DHvxqYfnk,1736
@@ -445,7 +445,7 @@ rapidata/service/credential_manager.py,sha256=Of0BQs_V1T7rkrWX9groLX790nOknaARwn
 rapidata/service/local_file_service.py,sha256=pgorvlWcx52Uh3cEG6VrdMK_t__7dacQ_5AnfY14BW8,877
 rapidata/service/openapi_service.py,sha256=Z4NrAuilLlIWBdGOv6otz36tHS_vvU36w5jmvOUTmqo,3198
 rapidata/service/token_manager.py,sha256=JZ5YbR5Di8dO3H4kK11d0kzWlrXxjgCmeNkHA4AapCM,6425
-rapidata-2.7.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-rapidata-2.7.0.dist-info/METADATA,sha256=30UXvN02zlclEO7PGLNXf8LzcTHC6L25hUqL2TEyMhY,1107
-rapidata-2.7.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-rapidata-2.7.0.dist-info/RECORD,,
+rapidata-2.7.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+rapidata-2.7.2.dist-info/METADATA,sha256=HeqJI37CBd0dICVGEGPSTYst8fLtuz7N5O-OE5iNF6c,1107
+rapidata-2.7.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+rapidata-2.7.2.dist-info/RECORD,,