rapidata 1.2.4__tar.gz → 1.3.0__tar.gz

{rapidata-1.2.4 → rapidata-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rapidata
-Version: 1.2.4
+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.4 → rapidata-1.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rapidata"
-version = "1.2.4"
+version = "1.3.0"
 description = "Rapidata package containing the Rapidata Python Client to interact with the Rapidata Web API in an easy way."
 authors = ["Rapidata AG <info@rapidata.ai>"]
 license = "Apache-2.0"

{rapidata-1.2.4 → rapidata-1.3.0}/src/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-1.2.4 → rapidata-1.3.0}/src/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}")
+