PyPI - rapidata - Versions diffs - 2.21.4__py3-none-any.whl → 2.21.5__py3-none-any.whl - Mend

rapidata 2.21.4py3-none-any.whl → 2.21.5py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of rapidata might be problematic. Click here for more details.

Files changed (12) hide show

rapidata/rapidata_client/assets/__init__.py CHANGED Viewed

@@ -7,3 +7,4 @@ from ._media_asset import MediaAsset
 from ._text_asset import TextAsset
 from ._multi_asset import MultiAsset
 from .data_type_enum import RapidataDataTypes
+from ._sessions import SessionManager

rapidata/rapidata_client/assets/_media_asset.py CHANGED Viewed

@@ -4,7 +4,7 @@ Defines the MediaAsset class for handling media file paths within assets.
 Implements lazy loading for URL-based media to prevent unnecessary downloads.
 """
-from typing import Optional, cast, Sequence
+from typing import Optional, cast
 import os
 from io import BytesIO
 from rapidata.rapidata_client.assets._base_asset import BaseAsset
@@ -16,8 +16,7 @@ import tempfile
 from pydantic import StrictStr, StrictBytes
 import logging
 from functools import cached_property
-from requests.adapters import HTTPAdapter
-from urllib3.util.retry import Retry
+from rapidata.rapidata_client.assets._sessions import SessionManager
 class MediaAsset(BaseAsset):
     """MediaAsset Class with Lazy Loading
@@ -78,7 +77,7 @@ class MediaAsset(BaseAsset):
         self._url = None
         self._content = None
-        self.session: None | requests.Session  = None
+        self.session: requests.Session  = SessionManager.get_session()
         if re.match(r'^https?://', path):
             self._url = path
@@ -130,11 +129,11 @@ class MediaAsset(BaseAsset):
                 tmp.flush()
                 tmp_path = tmp.name
-                try:
-                    tag = TinyTag.get(tmp_path)
-                finally:
-                    # Clean up the temporary file
-                    os.unlink(tmp_path)
+            try:
+                tag = TinyTag.get(tmp_path)
+            finally:
+                # Clean up the temporary file
+                os.unlink(tmp_path)
             if tag.duration is None:
                 raise ValueError("Could not read duration from file")

rapidata/rapidata_client/assets/_sessions.py ADDED Viewed

@@ -0,0 +1,35 @@
+import requests
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
+class SessionManager:
+    _session = None
+    @classmethod
+    def get_session(cls, ) -> requests.Session:
+        """Get a singleton requests session with retry logic.
+        Returns:
+            requests.Session: A singleton requests session with retry logic.
+        """
+        if cls._session is None:
+            max_retries: int = 5
+            max_workers: int = 10
+            cls._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
+            )
+            cls._session.mount('http://', adapter)
+            cls._session.mount('https://', adapter)
+        return cls._session

rapidata/rapidata_client/demographic/demographic_manager.py CHANGED Viewed

@@ -25,38 +25,6 @@ class DemographicManager:
                 title=instruction
             )
         )
-        session = self._get_session()
-        media.session = session
         self._openapi_service.rapid_api.rapid_demographic_post(model=model, file=[media.to_file()])
-    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

rapidata/rapidata_client/order/_rapidata_dataset.py CHANGED Viewed

@@ -89,7 +89,6 @@ class RapidataDataset:
             media_asset: MediaAsset or MultiAsset to upload
             meta: Optional metadata for the asset
             index: Sort index for the upload
-            session: Requests session for HTTP requests
         Returns:
             tuple[list[str], list[str]]: Lists of successful and failed identifiers
@@ -272,7 +271,6 @@ class RapidataDataset:
         Args:
             media_paths: List of assets to upload
             metadata: Optional sequence of metadata
-            session: Requests session for HTTP requests
             max_workers: Maximum number of concurrent workers
             chunk_size: Number of items to process in each batch
             stop_progress_tracking: Event to signal progress tracking to stop

rapidata/rapidata_client/order/rapidata_order.py CHANGED Viewed

@@ -50,7 +50,7 @@ class RapidataOrder:
     def run(self, print_link: bool = True) -> "RapidataOrder":
         """Runs the order to start collecting responses."""
-        self.__openapi_service.order_api.order_submit_post(self.order_id)
+        self.__openapi_service.order_api.order_order_id_submit_post(self.order_id)
         if print_link:
             print(f"Order '{self.name}' is now viewable under: {self.order_details_page}")
         return self

rapidata/rapidata_client/validation/rapidata_validation_set.py CHANGED Viewed

@@ -3,6 +3,7 @@ from rapidata.service.openapi_service import OpenAPIService
 from requests.adapters import HTTPAdapter, Retry
 import requests
 from rapidata.api_client.models.update_dimensions_model import UpdateDimensionsModel
+from rapidata.rapidata_client.assets._sessions import SessionManager
 class RapidataValidationSet:
     """A class for interacting with a Rapidata validation set.
@@ -20,7 +21,6 @@ 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.
@@ -28,7 +28,7 @@ class RapidataValidationSet:
         Args:
             rapid (Rapid): The Rapid to add to the validation set.
         """
-        rapid._add_to_validation_set(self.id, self.__openapi_service, self.__session)
+        rapid._add_to_validation_set(self.id, self.__openapi_service)
         return self
     def update_dimensions(self, dimensions: list[str]):
@@ -40,36 +40,6 @@ class RapidataValidationSet:
         self.__openapi_service.validation_api.validation_validation_set_id_dimensions_patch(self.id, UpdateDimensionsModel(dimensions=dimensions))
         return self
-    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 CHANGED Viewed

@@ -30,14 +30,14 @@ class Rapid():
         self.randomCorrectProbability = randomCorrectProbability
         self.explanation = explanation
-    def _add_to_validation_set(self, validationSetId: str, openapi_service: OpenAPIService, session: requests.Session) -> None:
+    def _add_to_validation_set(self, validationSetId: str, openapi_service: OpenAPIService) -> 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, session=session)
+            model = self.__to_media_model(validationSetId)
             openapi_service.validation_api.validation_add_validation_rapid_post(
                 model=model[0], files=model[1]
             )
@@ -45,7 +45,7 @@ class Rapid():
         else:
             raise TypeError("The asset must be a MediaAsset, TextAsset, or MultiAsset")
-    def __to_media_model(self, validationSetId: str, session: requests.Session) -> tuple[AddValidationRapidModel, list[StrictStr | tuple[StrictStr, StrictBytes] | StrictBytes]]:
+    def __to_media_model(self, validationSetId: str) -> tuple[AddValidationRapidModel, list[StrictStr | tuple[StrictStr, StrictBytes] | StrictBytes]]:
         assets: list[MediaAsset] = []
         if isinstance(self.asset, MultiAsset):
             for asset in self.asset.assets:
@@ -60,9 +60,6 @@ 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.21.4.dist-info → rapidata-2.21.5.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rapidata
-Version: 2.21.4
+Version: 2.21.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-2.21.4.dist-info → rapidata-2.21.5.dist-info}/RECORD RENAMED Viewed

@@ -417,16 +417,17 @@ rapidata/api_client_README.md,sha256=XxKjqTKsOlLbAyeUNmJWnQU2Kc7LYOsJLUZ0Q_SEIIo
 rapidata/rapidata_client/__init__.py,sha256=XP9btoeEBcUfLP_4Hi-tqmIsy__L7Q0l4LY1GRQZSKk,974
 rapidata/rapidata_client/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/rapidata_client/api/rapidata_exception.py,sha256=pJDMX5Pk1SSkxyt6PE0MCP2PQ13374qsi9SBWJYXbJI,3726
-rapidata/rapidata_client/assets/__init__.py,sha256=hKgrOSn8gJcBSULaf4auYhH1S1N5AfcwIhBSq1BOKwQ,323
+rapidata/rapidata_client/assets/__init__.py,sha256=eQkqUrYFME1FCxPY2Xh2bbonKVPnsFElJ6aPFcsWGxI,361
 rapidata/rapidata_client/assets/_base_asset.py,sha256=B2YWH1NgaeYUYHDW3OPpHM_bqawHbH4EjnRCE2BYwiM,298
-rapidata/rapidata_client/assets/_media_asset.py,sha256=9IKNKWarBJ-aAxfTjh80ScNsHlWGJnd55fsDbrf8x4s,10336
+rapidata/rapidata_client/assets/_media_asset.py,sha256=63I_l3E838M7ltqf3Bl8-PJOSm_h_FCeKYvUV52BwfI,10313
 rapidata/rapidata_client/assets/_multi_asset.py,sha256=92r6JsF9Sr93-9JyspoWw1_rNDC3pYInyfDAPybHYbU,2025
+rapidata/rapidata_client/assets/_sessions.py,sha256=Dgcb61Q4gLwU5hurnv6sN2Jvw-ZV7vjhVWXog5Wq4aw,1094
 rapidata/rapidata_client/assets/_text_asset.py,sha256=itoe3vicn41LbdJ7UeydImORUo9iDL0SZu-ptOlbMRM,618
 rapidata/rapidata_client/assets/data_type_enum.py,sha256=ELC-ymeKnQlfNAzfqsI7MmUuRiGYamCHVcTc0qR6Fm4,185
 rapidata/rapidata_client/country_codes/__init__.py,sha256=FB9Dcks44J6C6YBSYmTmNZ71tE130x6NO_3aLJ8fKzQ,40
 rapidata/rapidata_client/country_codes/country_codes.py,sha256=ePHqeb7y9DWQZAnddBzPx1puYBcrgUjdR2sbFijuFD8,283
 rapidata/rapidata_client/demographic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rapidata/rapidata_client/demographic/demographic_manager.py,sha256=XlgXngx-37Sow2B3jisVIWo6NrMWVI7aJqu9OwF9kCA,2143
+rapidata/rapidata_client/demographic/demographic_manager.py,sha256=nY0WpgItwc5q_Lf-bqM4HhestMKj3V20vX96TVzWdlk,1151
 rapidata/rapidata_client/filter/__init__.py,sha256=uHemzncxZrrs3fiKQ-spbNe6EJZ1aWxHIH6DVy2pLUo,471
 rapidata/rapidata_client/filter/_base_filter.py,sha256=ytiSyeb9dvNZf93zwgb4PRDzf9ebsAu4wHBn4x49Re0,195
 rapidata/rapidata_client/filter/age_filter.py,sha256=oRjGY65gE_X8oa0D0XRyvKAb4_Z6XOOaGTWykRSfLFA,739
@@ -450,9 +451,9 @@ 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=tjUfOyDjS94xVJsebjbE5Z18hYtpaL7jwMMVjbqHwc4,19498
+rapidata/rapidata_client/order/_rapidata_dataset.py,sha256=oT__-coaYV8OdsZmvEXLDqn49qfWd6UnbKS9dw9XJpk,19386
 rapidata/rapidata_client/order/_rapidata_order_builder.py,sha256=De-gNvOnuXHz6QaRdNpr0_3zOkIEKu8hgtZkatzxZQ4,13155
-rapidata/rapidata_client/order/rapidata_order.py,sha256=6Ak0fz0W_NUeRWz3gSTcirNTNbgEgMgruhwwEQ0BY4I,11050
+rapidata/rapidata_client/order/rapidata_order.py,sha256=BfyRmqCL3uZWfCZ4_vnZRyVGGGMh1XUFo87Ll3DBwyw,11059
 rapidata/rapidata_client/order/rapidata_order_manager.py,sha256=2HUo6d1z1qUw2PiETHlzh9fmBsCGNDPUPxVc_Udq4i8,30638
 rapidata/rapidata_client/order/rapidata_results.py,sha256=0y8EOiqUV7XuwpRJyV53mfo-ddRV1cUPdWexbPEVOHM,8044
 rapidata/rapidata_client/rapidata_client.py,sha256=fcWlmmNCZahK40Ox4aY153tEihIpwkUxYTuiypKF2SY,2857
@@ -483,10 +484,10 @@ rapidata/rapidata_client/settings/play_video_until_the_end.py,sha256=LLHx2_72k5Z
 rapidata/rapidata_client/settings/rapidata_settings.py,sha256=r6eDGo5YHMekOtWqPHD50uI8vEE9VoBJfaWEDFZ78RU,1430
 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=GaatGGuJCHRvdPbjzI0NRQhxzRftKzf-FkaFv25iB78,2649
+rapidata/rapidata_client/validation/rapidata_validation_set.py,sha256=Hpk445_-myEiDk1Kr91INVn9jLLmBR0GrLxF_VP44V0,1735
 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=uCKnoSn1RykNHgTFbrvCFlfzU8lF42cff-2I-Pd48w0,4620
+rapidata/rapidata_client/validation/rapids/rapids.py,sha256=2X-Rmt1K2rxzmwIiSoBVPvu_TW2qnvlCct-6KZdpJks,4483
 rapidata/rapidata_client/validation/rapids/rapids_manager.py,sha256=s5VAq8H5CKACWfmIQuz9kHC8t2nd-xEHGGUj9pIfXKI,14386
 rapidata/rapidata_client/validation/validation_set_manager.py,sha256=GCFDyruCz6EIN67cc2fwRjzirUoGfs3KLTIg7n6wXbI,26722
 rapidata/rapidata_client/workflow/__init__.py,sha256=7nXcY91xkxjHudBc9H0fP35eBBtgwHGWTQKbb-M4h7Y,477
@@ -504,7 +505,7 @@ rapidata/service/__init__.py,sha256=s9bS1AJZaWIhLtJX_ZA40_CK39rAAkwdAmymTMbeWl4,
 rapidata/service/credential_manager.py,sha256=3x-Fb6tyqmgtpjI1MSOtXWW_SkzTK8Lo7I0SSL2YD7E,8602
 rapidata/service/local_file_service.py,sha256=pgorvlWcx52Uh3cEG6VrdMK_t__7dacQ_5AnfY14BW8,877
 rapidata/service/openapi_service.py,sha256=nh7gAmNRdZ5qu3sG7khi-pZmXhfg5u8KHdmEDQd_z9U,4075
-rapidata-2.21.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-rapidata-2.21.4.dist-info/METADATA,sha256=TbjjHPE8Y_83p_j_bYKjTUG1KWdcFhlqkOxRFEfNKds,1227
-rapidata-2.21.4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rapidata-2.21.4.dist-info/RECORD,,
+rapidata-2.21.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+rapidata-2.21.5.dist-info/METADATA,sha256=bGj-l5qi005Z0QPBuKotjt9_ZlAicC_oW-Cj77htGho,1227
+rapidata-2.21.5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rapidata-2.21.5.dist-info/RECORD,,

{rapidata-2.21.4.dist-info → rapidata-2.21.5.dist-info}/LICENSE RENAMED Viewed

File without changes

{rapidata-2.21.4.dist-info → rapidata-2.21.5.dist-info}/WHEEL RENAMED Viewed

File without changes

rapidata 2.21.4__py3-none-any.whl → 2.21.5__py3-none-any.whl

Potentially problematic release.

rapidata 2.21.4py3-none-any.whl → 2.21.5py3-none-any.whl