brynq-sdk-salesforce 2.0.1__tar.gz → 3.0.0__tar.gz

{brynq_sdk_salesforce-2.0.1 → brynq_sdk_salesforce-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_salesforce
-Version: 2.0.1
+Version: 3.0.0
 Summary: Salesforce wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_salesforce-2.0.1 → brynq_sdk_salesforce-3.0.0}/brynq_sdk_salesforce/salesforce.py

@@ -3,7 +3,7 @@ import urllib.parse
 import warnings
 import requests
 import json
-from typing import Union, List
+from typing import Union, List, Literal, Optional
 import pandas as pd
 import os
 
@@ -13,21 +13,21 @@ class Salesforce(BrynQ):
     This class is meant to be a simple wrapper around the Salesforce API. In order to start using it, authorize your application is BrynQ.
     You will receive a code which you can use to obtain a refresh token using the get_refresh_token method. Use this refresh token to refresh your access token always before you make a data call.
     """
-    def __init__(self, label: Union[str, List], debug: bool = False, sandbox: bool = False):
+    def __init__(self, system_type: Optional[Literal['source', 'target']] = None, debug: bool = False, sandbox: bool = False):
         super().__init__()
         if sandbox:
             self.system = 'salesforce-sandbox'
         else:
             self.system = 'salesforce'
-        self.credentials = self.get_system_credential(system=self.system, label=label)
-        self.credential_id = self.credentials['id']
-        self.customer_url = self.credentials['auth']['instance_url']
+        credentials = self.interfaces.credentials.get(system=self.system, system_type=system_type)
+        self.credentials = credentials.get('data')
+        self.customer_url = self.credentials['instance_url']
         self.debug = debug
         self.api_version = 56.0
+        self.timeout = 3600
 
     def __get_headers(self) -> dict:
-        credentials = self.refresh_system_credential(system=self.system, system_id=self.credential_id)
-        headers = {"Authorization": f"Bearer {credentials['access_token']}",
+        headers = {"Authorization": f"Bearer {self.credentials['access_token']}",
                    "Content-Type": "application/json"}
         if self.debug:
             print(f"Headers: {headers}")
@@ -50,7 +50,7 @@ class Salesforce(BrynQ):
         done = False
         url = f"{self.customer_url}/services/data/v37.0/query/?"
         while done is False:
-            response = requests.get(url=url, params=params_str, headers=self.__get_headers())
+            response = requests.get(url=url, params=params_str, headers=self.__get_headers(), timeout=self.timeout)
             response.raise_for_status()
             response = response.json()
             done = response['done']
@@ -79,7 +79,7 @@ class Salesforce(BrynQ):
         done = False
         url = f"{self.customer_url}/services/data/v37.0/query/?"
         while done is False:
-            response = requests.get(url=url, params=params_str, headers=self.__get_headers())
+            response = requests.get(url=url, params=params_str, headers=self.__get_headers(), timeout=self.timeout)
             response.raise_for_status()
             response = response.json()
             done = response['done']
@@ -119,7 +119,7 @@ class Salesforce(BrynQ):
         if self.debug:
             print(f"Payload: {body}")
 
-        response = requests.post(url=f"{self.customer_url}/services/data/v37.0/sobjects/Contact", data=body, headers=self.__get_headers())
+        response = requests.post(url=f"{self.customer_url}/services/data/v37.0/sobjects/Contact", data=body, headers=self.__get_headers(), timeout=self.timeout)
         response.raise_for_status()
         if self.debug:
             print(f"Response: {response.content, response.text}")
@@ -156,7 +156,7 @@ class Salesforce(BrynQ):
         if self.debug:
             print(f"Payload: {body}")
 
-        response = requests.patch(url=f"{self.customer_url}/services/data/v37.0/sobjects/Contact/{data['contact_id']}", data=body, headers=self.__get_headers())
+        response = requests.patch(url=f"{self.customer_url}/services/data/v37.0/sobjects/Contact/{data['contact_id']}", data=body, headers=self.__get_headers(), timeout=self.timeout)
         response.raise_for_status()
         if self.debug:
             print(f"Response: {response.content, response.text}")
@@ -181,7 +181,7 @@ class Salesforce(BrynQ):
         :return: data or error
         """
         url = f"{self.customer_url}/services/data/v{self.api_version}/sobjects/{table}/describe/"
-        response = requests.get(url, headers=self.__get_headers())
+        response = requests.get(url, headers=self.__get_headers(), timeout=self.timeout)
         return response
 
     def query_table(self, data_dir: str, table: str, fields: Union[str, List], filter: str = None, filename: str = None) -> pd.DataFrame:
@@ -262,7 +262,7 @@ class Salesforce(BrynQ):
 
         # With the created URL and parameters, call the API
         while not done:
-            response = requests.get(url=url, params=params_str, headers=self.__get_headers())
+            response = requests.get(url=url, params=params_str, headers=self.__get_headers(), timeout=self.timeout)
             response.raise_for_status()
             done = response.json()['done']
             df_temp = pd.DataFrame(response.json()['records'])
@@ -287,7 +287,7 @@ class Salesforce(BrynQ):
             df_del = pd.DataFrame()
             url = f'{self.customer_url}/services/data/v{self.api_version}/queryAll/?'
             while done is False:
-                response = requests.get(url=url, params=params_str, headers=self.__get_headers())
+                response = requests.get(url=url, params=params_str, headers=self.__get_headers(), timeout=self.timeout)
                 response.raise_for_status()
                 done = response.json()['done']
                 df_temp = pd.DataFrame(response.json()['records'])

{brynq_sdk_salesforce-2.0.1 → brynq_sdk_salesforce-3.0.0}/brynq_sdk_salesforce.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-salesforce
-Version: 2.0.1
+Version: 3.0.0
 Summary: Salesforce wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_salesforce-2.0.1 → brynq_sdk_salesforce-3.0.0}/brynq_sdk_salesforce.egg-info/requires.txt

@@ -1,4 +1,4 @@
-brynq-sdk-brynq>=2
+brynq-sdk-brynq<5,>=4
 requests<=3,>=2
 pandas<3,>=1
 pyarrow>=10

{brynq_sdk_salesforce-2.0.1 → brynq_sdk_salesforce-3.0.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_salesforce',
-    version='2.0.1',
+    version='3.0.0',
     description='Salesforce wrapper from BrynQ',
     long_description='Salesforce wrapper from BrynQ',
     author='BrynQ',
@@ -10,7 +10,7 @@ setup(
     packages=find_namespace_packages(include=['brynq_sdk*']),
     license='BrynQ License',
     install_requires=[
-        'brynq-sdk-brynq>=2',
+        'brynq-sdk-brynq>=4,<5',
         'requests>=2,<=3',
         'pandas>=1,<3',
         'pyarrow>=10'