rapidata 1.2.3__py3-none-any.whl → 1.3.0__py3-none-any.whl

rapidata/rapidata_client/dataset/rapidata_dataset.py

@@ -41,7 +41,7 @@ class RapidataDataset:
                 texts = [asset.text for asset in text_asset.assets if isinstance(asset, TextAsset)]
             else:
                 raise ValueError(f"Unsupported asset type: {type(text_asset)}")
-            
+
             model = UploadTextSourcesToDatasetModel(
                 datasetId=self.dataset_id,
                 textSources=texts
@@ -53,6 +53,7 @@ class RapidataDataset:
         with ThreadPoolExecutor(max_workers=max_workers) as executor:
             futures = [
                 executor.submit(upload_text_datapoint, text_asset)
+                for text_asset in text_assets
             ]
 
             with tqdm(total=total_uploads, desc="Uploading text datapoints") as pbar:
@@ -70,7 +71,7 @@ class RapidataDataset:
             raise ValueError(
                 "metadata must be None or have the same length as media_paths"
             )
-        
+
         for media_path in media_paths:
             if isinstance(media_path, MultiAsset):
                 assert all(
@@ -84,7 +85,7 @@ class RapidataDataset:
                 paths = [asset.path for asset in media_asset.assets if isinstance(asset, MediaAsset)]
             else:
                 raise ValueError(f"Unsupported asset type: {type(media_asset)}")
-            
+
             assert all(
                 os.path.exists(media_path) for media_path in paths
             ), "All media paths must exist on the local filesystem."

rapidata/rapidata_client/rapidata_client.py

@@ -11,7 +11,6 @@ from rapidata.rapidata_client.dataset.rapidata_dataset import RapidataDataset
 from rapidata.rapidata_client.simple_builders.simple_classification_builders import ClassificationQuestionBuilder
 from rapidata.rapidata_client.simple_builders.simple_compare_builders import CompareCriteriaBuilder
 
-
 class RapidataClient:
     """The Rapidata client is the main entry point for interacting with the Rapidata API. It allows you to create orders and validation sets. For creating a new order, check out `new_order()`. For creating a new validation set, check out `new_validation_set()`."""
 
@@ -20,6 +19,9 @@ class RapidataClient:
         client_id: str,
         client_secret: str,
         endpoint: str = "https://api.app.rapidata.ai",
+        token_url: str = "https://api.app.rapidata.ai/connect/token",
+        oauth_scope: str = "openid",
+        cert_path: str | None = None,
     ):
         """Initialize the RapidataClient. Best practice is to store the client ID and client secret in environment variables. Ask your Rapidata representative for the client ID and client secret.
 
@@ -29,7 +31,12 @@ class RapidataClient:
             endpoint (str, optional): The API endpoint URL.
         """
         self.openapi_service = OpenAPIService(
-            client_id=client_id, client_secret=client_secret, endpoint=endpoint
+            client_id=client_id,
+            client_secret=client_secret,
+            endpoint=endpoint,
+            token_url=token_url,
+            oauth_scope=oauth_scope,
+            cert_path=cert_path
         )
 
     def new_order(self, name: str) -> RapidataOrderBuilder:
@@ -64,7 +71,7 @@ class RapidataClient:
             RapidataValidationSet: The ValidationSet instance.
         """
         return RapidataValidationSet(validation_set_id, self.openapi_service)
-    
+
     def get_order(self, order_id: str) -> RapidataOrder:
         """Get an order by ID.
 

rapidata/service/openapi_service.py

@@ -1,13 +1,14 @@
+import json
+import requests
+from rapidata.api_client.api.campaign_api import CampaignApi
 from rapidata.api_client.api.dataset_api import DatasetApi
-from rapidata.api_client.api.identity_api import IdentityApi
 from rapidata.api_client.api.order_api import OrderApi
+from rapidata.api_client.api.pipeline_api import PipelineApi
 from rapidata.api_client.api.rapid_api import RapidApi
 from rapidata.api_client.api.validation_api import ValidationApi
+from rapidata.api_client.api.workflow_api import WorkflowApi
 from rapidata.api_client.api_client import ApiClient
 from rapidata.api_client.configuration import Configuration
-from rapidata.api_client.api.campaign_api import CampaignApi
-from rapidata.api_client.api.pipeline_api import PipelineApi
-from rapidata.api_client.api.workflow_api import WorkflowApi
 
 
 class OpenAPIService:
@@ -16,19 +17,17 @@ class OpenAPIService:
         self,
         client_id: str,
         client_secret: str,
-        endpoint: str = "https://api.rapidata.ai",
+        endpoint: str,
+        token_url: str,
+        oauth_scope: str,
+        cert_path: str | None = None,
     ):
-        client_configuration = Configuration(host=endpoint)
+        client_configuration = Configuration(host=endpoint, ssl_ca_cert=cert_path)
         self.api_client = ApiClient(configuration=client_configuration)
 
-        identity_api = IdentityApi(self.api_client)
+        token = self.__fetch_token(client_id, client_secret, oauth_scope, token_url, cert_path)
 
-        result = identity_api.identity_get_client_auth_token_post(
-            client_id=client_id,
-            _headers={"Authorization": f"Basic {client_secret}"},
-        )
-
-        client_configuration.api_key["bearer"] = f"Bearer {result.auth_token}"
+        client_configuration.api_key["bearer"] = f"Bearer {token}"
         self._api_client = ApiClient()
         self._order_api = OrderApi(self.api_client)
         self._dataset_api = DatasetApi(self.api_client)
@@ -48,15 +47,36 @@ class OpenAPIService:
     @property
     def rapid_api(self) -> RapidApi:
         return RapidApi(self.api_client)
-    
+
     @property
     def campaign_api(self) -> CampaignApi:
         return CampaignApi(self.api_client)
-    
+
     @property
     def pipeline_api(self) -> PipelineApi:
         return PipelineApi(self.api_client)
-    
+
     @property
     def workflow_api(self) -> WorkflowApi:
         return WorkflowApi(self.api_client)
+
+    @staticmethod
+    def __fetch_token(client_id: str, client_secret: str, scope: str, token_url: str, cert_path: str | None = None) -> str:
+        try:
+            return requests.post(
+                token_url,
+                data={
+                    'grant_type': 'client_credentials',
+                    'client_id': client_id,
+                    'client_secret': client_secret,
+                    'scope': scope,
+                },
+                verify=cert_path
+            ).json()['access_token']
+        except requests.RequestException as e:
+            raise Exception(f"Failed to fetch token: {e}")
+        except json.JSONDecodeError as e:
+            raise Exception(f"Failed to parse token response: {e}")
+        except KeyError as e:
+            raise Exception(f"Failed to extract token from response: {e}")
+

{rapidata-1.2.3.dist-info → rapidata-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rapidata
-Version: 1.2.3
+Version: 1.3.0
 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-1.2.3.dist-info → rapidata-1.3.0.dist-info}/RECORD

@@ -318,7 +318,7 @@ rapidata/rapidata_client/config.py,sha256=tQLgN6k_ATOX1GzZh38At2rgBDLStV6rJ6z0vs
 rapidata/rapidata_client/country_codes/__init__.py,sha256=FB9Dcks44J6C6YBSYmTmNZ71tE130x6NO_3aLJ8fKzQ,40
 rapidata/rapidata_client/country_codes/country_codes.py,sha256=Q0HMX7uHJQDeLCFPP5bq4iYi6pgcDWEcl2ONGhjgoeU,286
 rapidata/rapidata_client/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rapidata/rapidata_client/dataset/rapidata_dataset.py,sha256=mIQBh7pANhFe2u3xEgsdDG_ZY7i-o8lKDAaRfACipMU,4921
+rapidata/rapidata_client/dataset/rapidata_dataset.py,sha256=12mvcpHa-ZpDOFhSuqnSb6pFhR1q7rF98fgiDBuONdw,4935
 rapidata/rapidata_client/dataset/rapidata_validation_set.py,sha256=rSRZQ67-8XjLa1_pWutieBrQfmvPA0fOMK7QKQpxsX0,10970
 rapidata/rapidata_client/dataset/validation_rapid_parts.py,sha256=uzpOZFqQu8bG6vmjcWWUNJPZsRe28OmnyalRE6ry8tk,2317
 rapidata/rapidata_client/dataset/validation_set_builder.py,sha256=xPZBzNRPausIbYNRVinIhsVGnKSIIuxP5tjKkV4hOyo,7990
@@ -341,7 +341,7 @@ rapidata/rapidata_client/metadata/transcription_metadata.py,sha256=THtDEVCON4Ulc
 rapidata/rapidata_client/order/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/rapidata_client/order/rapidata_order.py,sha256=Q2orpb1NV7XiEAOJD0md93uLpYI1RFfr7mqDJDLk4m4,4643
 rapidata/rapidata_client/order/rapidata_order_builder.py,sha256=YBTQ7iXsMF2ALjDRE_NRApKJJYvsJ1fGniJGrDJEN_g,15868
-rapidata/rapidata_client/rapidata_client.py,sha256=s3TlhYlvMuxcyEDIFDqpwRsP0SIi9b158uIHLUyV1gY,4699
+rapidata/rapidata_client/rapidata_client.py,sha256=d8r9C3PCXdqnV7k3xY5A4fUh_96pCro9VWzLTae--l4,4966
 rapidata/rapidata_client/referee/__init__.py,sha256=Ow9MQsONhF4sX2wFK9jbvSBrpcJgtq3OglIQMkBUdIY,167
 rapidata/rapidata_client/referee/base_referee.py,sha256=bMy7cw0a-pGNbFu6u_1_Jplu0A483Ubj4oDQzh8vu8k,493
 rapidata/rapidata_client/referee/classify_early_stopping_referee.py,sha256=B5wsqKM3_Oc1TU_MFGiIyiXjwK1LcmaVjhzLdaL8Cgw,1797
@@ -366,10 +366,10 @@ rapidata/rapidata_client/workflow/free_text_workflow.py,sha256=VaypoG3yKgsbtVyqx
 rapidata/rapidata_client/workflow/transcription_workflow.py,sha256=_KDtGCdRhauJm3jQHpwhY-Hq79CLg5I8q2RgOz5lo1g,1404
 rapidata/service/__init__.py,sha256=s9bS1AJZaWIhLtJX_ZA40_CK39rAAkwdAmymTMbeWl4,68
 rapidata/service/local_file_service.py,sha256=pgorvlWcx52Uh3cEG6VrdMK_t__7dacQ_5AnfY14BW8,877
-rapidata/service/openapi_service.py,sha256=KwFJmgnyfrzmSjs6wGh5J6ESMLvtKazGcYoewWeL8PU,2038
+rapidata/service/openapi_service.py,sha256=pGcOCttKZW0PVCSM7Kfehe5loh7CxmmDDbu4UJbamnI,2770
 rapidata/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rapidata/utils/image_utils.py,sha256=TldO3eJWG8IhfJjm5MfNGO0mEDm1mQTsRoA0HLU1Uxs,404
-rapidata-1.2.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-rapidata-1.2.3.dist-info/METADATA,sha256=nsayylvqwD1vgLqMk5oQM7IWUNaP9n-WvlSfc57L0I0,1012
-rapidata-1.2.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-rapidata-1.2.3.dist-info/RECORD,,
+rapidata-1.3.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+rapidata-1.3.0.dist-info/METADATA,sha256=wFSO1-QAg27tUA9W1zmrbWpoUWcs_HJIKLw1FfHgGrk,1012
+rapidata-1.3.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+rapidata-1.3.0.dist-info/RECORD,,