rapidata 2.11.0__py3-none-any.whl → 2.11.1__py3-none-any.whl

rapidata/rapidata_client/assets/_media_asset.py

@@ -78,7 +78,7 @@ class MediaAsset(BaseAsset):
         
         self._url = None
         self._content = None
-        self._session: None | requests.Session  = None
+        self.session: None | requests.Session  = None
         
         if re.match(r'^https?://', path):
             self._url = path
@@ -238,11 +238,11 @@ class MediaAsset(BaseAsset):
             requests.exceptions.RequestException: If download fails after all retries
         """
         # Use existing session or throw error if not set
-        if self._session is None:
+        if self.session is None:
             raise RuntimeError("HTTP session not configured")
 
         try:
-            response = self._session.get(
+            response = self.session.get(
                 url, 
                 stream=False,
                 timeout=(5, 30)  # (connect timeout, read timeout)

rapidata/rapidata_client/order/_rapidata_dataset.py

@@ -136,14 +136,14 @@ class RapidataDataset:
             try:
                 # Get identifier for this upload (URL or file path)
                 if isinstance(media_asset, MediaAsset):
-                    media_asset._session = session
+                    media_asset.session = session
                     assets = [media_asset]
                     identifier = media_asset._url if media_asset._url else media_asset.path
                     identifiers_to_track = [identifier] if identifier else []
                 elif isinstance(media_asset, MultiAsset):
                     assets = cast(list[MediaAsset], media_asset.assets)
                     for asset in assets:
-                        asset._session = session
+                        asset.session = session
                     identifiers_to_track: list[str] = [
                         (asset._url if asset._url else cast(str, asset.path)) 
                         for asset in assets

rapidata/rapidata_client/validation/rapidata_validation_set.py

@@ -1,5 +1,7 @@
 from rapidata.rapidata_client.validation.rapids.rapids import Rapid
 from rapidata.service.openapi_service import OpenAPIService
+from requests.adapters import HTTPAdapter, Retry
+import requests
 
 class RapidataValidationSet:
     """A class for interacting with a Rapidata validation set.
@@ -17,6 +19,7 @@ class RapidataValidationSet:
         self.id = validation_set_id
         self.name = name
         self.__openapi_service = openapi_service
+        self.__session = self._get_session()
     
     def add_rapid(self, rapid: Rapid):
         """Add a Rapid to the validation set.
@@ -24,7 +27,37 @@ class RapidataValidationSet:
         Args:
             rapid (Rapid): The Rapid to add to the validation set.
         """
-        rapid._add_to_validation_set(self.id, self.__openapi_service)
+        rapid._add_to_validation_set(self.id, self.__openapi_service, self.__session)
+
+    def _get_session(self, max_retries: int = 5, max_workers: int = 10) -> requests.Session:   
+        """Get a requests session with retry logic.
+
+
+        Args:
+            max_retries (int): The maximum number of retries.
+            max_workers (int): The maximum number of workers.
+
+        Returns:
+            requests.Session: A requests session with retry logic.
+        """
+        session = requests.Session()
+        retries = Retry(
+            total=max_retries,
+            backoff_factor=1,
+            status_forcelist=[500, 502, 503, 504],
+            allowed_methods=["GET"],
+            respect_retry_after_header=True
+        )
+
+        adapter = HTTPAdapter(
+            pool_connections=max_workers * 2,
+            pool_maxsize=max_workers * 4,
+            max_retries=retries
+        )
+        session.mount('http://', adapter)
+        session.mount('https://', adapter)
+
+        return session
 
     def __str__(self):
         return f"name: '{self.name}' id: {self.id}"

rapidata/rapidata_client/validation/rapids/rapids.py

@@ -22,6 +22,8 @@ from rapidata.api_client.models.datapoint_metadata_model_metadata_inner import (
 
 from rapidata.service.openapi_service import OpenAPIService
 
+import requests
+
 class Rapid():
     def __init__(self, asset: MediaAsset | TextAsset | MultiAsset, metadata: Sequence[Metadata], payload: Any, truth: Any, randomCorrectProbability: float, explanation: str | None):
         self.asset = asset
@@ -31,14 +33,14 @@ class Rapid():
         self.randomCorrectProbability = randomCorrectProbability
         self.explanation = explanation 
 
-    def _add_to_validation_set(self, validationSetId: str, openapi_service: OpenAPIService):
+    def _add_to_validation_set(self, validationSetId: str, openapi_service: OpenAPIService, session: requests.Session) -> None:
         if isinstance(self.asset, TextAsset) or (isinstance(self.asset, MultiAsset) and isinstance(self.asset.assets[0], TextAsset)):
             openapi_service.validation_api.validation_add_validation_text_rapid_post(
                 add_validation_text_rapid_model=self.__to_text_model(validationSetId)
             )
 
         elif isinstance(self.asset, MediaAsset) or (isinstance(self.asset, MultiAsset) and isinstance(self.asset.assets[0], MediaAsset)):
-            model = self.__to_media_model(validationSetId)
+            model = self.__to_media_model(validationSetId, session=session)
             openapi_service.validation_api.validation_add_validation_rapid_post(
                 model=model[0], files=model[1]
             )
@@ -46,7 +48,7 @@ class Rapid():
         else:
             raise TypeError("The asset must be a MediaAsset, TextAsset, or MultiAsset")
 
-    def __to_media_model(self, validationSetId: str) -> tuple[AddValidationRapidModel, list[StrictStr | tuple[StrictStr, StrictBytes] | StrictBytes]]:
+    def __to_media_model(self, validationSetId: str, session: requests.Session) -> tuple[AddValidationRapidModel, list[StrictStr | tuple[StrictStr, StrictBytes] | StrictBytes]]:
         assets: list[MediaAsset] = [] 
         if isinstance(self.asset, MultiAsset):
             for asset in self.asset.assets:
@@ -61,6 +63,9 @@ class Rapid():
         if isinstance(self.asset, MediaAsset):
             assets = [self.asset]
 
+        for asset in assets:
+            asset.session = session
+
         return (AddValidationRapidModel(
             validationSetId=validationSetId,
             payload=AddValidationRapidModelPayload(self.payload),

{rapidata-2.11.0.dist-info → rapidata-2.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rapidata
-Version: 2.11.0
+Version: 2.11.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.11.0.dist-info → rapidata-2.11.1.dist-info}/RECORD

@@ -367,7 +367,7 @@ rapidata/api_client_README.md,sha256=CWOOzW4IbXMejePCHh5WxB_6mq_cTRsyZ6q9u6SIdR4
 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=QeZzixkkiZQ0RBE_ogeT6IRfoB4anpOO-bl-pRJ9n08,10255
+rapidata/rapidata_client/assets/_media_asset.py,sha256=gghPvK3_Ca5XR1oynyluWoDe4SYGZF0lZhHe4ku52ok,10252
 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
@@ -395,7 +395,7 @@ rapidata/rapidata_client/metadata/_prompt_metadata.py,sha256=ibuUBACKew8WEBJyIv9
 rapidata/rapidata_client/metadata/_public_text_metadata.py,sha256=nU846QBntBxwwJFPp3aFJro6dvy_IGFk0f2iyuoNvE4,512
 rapidata/rapidata_client/metadata/_select_words_metadata.py,sha256=n46UTaiJiTOXHAoFydQAQOy_5_cbCUCy_xHFb3u9HYs,727
 rapidata/rapidata_client/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rapidata/rapidata_client/order/_rapidata_dataset.py,sha256=rhZOJJaOFgKWUbcwgIWJmd4PXSSAQ5qj-8xFx8VEar4,9547
+rapidata/rapidata_client/order/_rapidata_dataset.py,sha256=GC9mbXt9wr4c6YusOXIG5OV2jL0xkezluq9pxvELMdw,9545
 rapidata/rapidata_client/order/_rapidata_order_builder.py,sha256=N6mqmgneJSsb_no_Ps9BG3EhDekLgKxFYpjDCN-VVeg,13095
 rapidata/rapidata_client/order/rapidata_order.py,sha256=XI9xeEtqZIwdAXLe9Pn4RO8iPNSoBToQ2WD62TRWzTE,9115
 rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=4wW5xtmEtdewFGGwMWSMbdLZpHvygtLCfYNv4lcHGg8,27271
@@ -426,10 +426,10 @@ rapidata/rapidata_client/settings/play_video_until_the_end.py,sha256=LLHx2_72k5Z
 rapidata/rapidata_client/settings/rapidata_settings.py,sha256=Kjxm4GStrpfLKylx84BiKdEQOjvNfO74DiSChmH63fg,1165
 rapidata/rapidata_client/settings/translation_behaviour.py,sha256=i9n_H0eKJyKW6m3MKH_Cm1XEKWVEWsAV_79xGmGIC-4,742
 rapidata/rapidata_client/validation/__init__.py,sha256=s5wHVtcJkncXSFuL9I0zNwccNOKpWAqxqUjkeohzi2E,24
-rapidata/rapidata_client/validation/rapidata_validation_set.py,sha256=IkHOdQX3ihBBHDvG2EE6wu1ZSG7evOWMYyOx9Lva0tw,1111
+rapidata/rapidata_client/validation/rapidata_validation_set.py,sha256=lYnLf87BvFHfeostlyq41nvikCo17ZGsjJdT5ZfCqlQ,2159
 rapidata/rapidata_client/validation/rapids/__init__.py,sha256=WU5PPwtTJlte6U90MDakzx4I8Y0laj7siw9teeXj5R0,21
 rapidata/rapidata_client/validation/rapids/box.py,sha256=t3_Kn6doKXdnJdtbwefXnYKPiTKHneJl9E2inkDSqL8,589
-rapidata/rapidata_client/validation/rapids/rapids.py,sha256=VkVweVizEf7_N79HI9ilxCPUWD48GTuUx2VO7pyd--Y,4438
+rapidata/rapidata_client/validation/rapids/rapids.py,sha256=i1VBD2Ha1DbWOqYZqmlWGmWPAJ-y5Wm5NypCExceYsI,4600
 rapidata/rapidata_client/validation/rapids/rapids_manager.py,sha256=F00lPYBUx5fTPRw50iZuobtdbjFo6ZHevPMk101JdaY,14271
 rapidata/rapidata_client/validation/validation_set_manager.py,sha256=NL0H390vcCgbDK-hufaMeXHCnl2x0hi1lmGx-y6aPGY,24895
 rapidata/rapidata_client/workflow/__init__.py,sha256=eFRx0fm280alXpds6hYcnxN_yERlabF9B5sTdPFsL1g,430
@@ -447,7 +447,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=C-8dN6P5TXCLANZCHWusmwAful5YBpKjKg0StQtajF0,6547
-rapidata-2.11.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-rapidata-2.11.0.dist-info/METADATA,sha256=VF_zzBe3NAZCSDCs-0fDixyH4X8E8rpFpPMNSZAfRJY,1147
-rapidata-2.11.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-rapidata-2.11.0.dist-info/RECORD,,
+rapidata-2.11.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+rapidata-2.11.1.dist-info/METADATA,sha256=BlBjGePHJmRdnCBvE0-cim0z57FY7Vu1oF7ThsE4fqs,1147
+rapidata-2.11.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+rapidata-2.11.1.dist-info/RECORD,,