logos-sdk 0.0.25.dev11__tar.gz → 0.0.25.dev13__tar.gz

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: logos-sdk
-Version: 0.0.25.dev11
+Version: 0.0.25.dev13
 Summary: SDK for Logos platform
 Home-page: https://bitbucket.org/databy/logos-sdk-pip/src/master/
 Author: Databy.io

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/logos_sdk/services/CampaignManager.py

@@ -5,8 +5,7 @@ import os
 import time
 
 from random import randint
-from logos_sdk.services import get_headers
-from requests import request
+from logos_sdk.services import get_headers, get_retry_session
 from typing import Dict, List
 from http import HTTPStatus
 from googleapiclient.http import MediaIoBaseDownload, HttpRequest
@@ -21,6 +20,7 @@ class CampaignManagerServiceException(Exception):
 class CampaignManagerService:
     def __init__(self, url: str = None):
         load_dotenv()
+        self.session = get_retry_session()
         self._URL = url or os.environ.get("CM360_SERVICE_PATH")
         self._CREATE_REPORT = self._URL + "/create-report"
         self._GET_REPORT = self._URL + "/get-report"
@@ -67,7 +67,7 @@ class CampaignManagerService:
             "secret_id": secret_id,
         }
         header = get_headers(self._CREATE_REPORT)
-        response = request(
+        response = self.session.request(
             method="post", url=self._CREATE_REPORT, json=body, headers=header
         )
 
@@ -92,7 +92,7 @@ class CampaignManagerService:
         }
 
         header = get_headers(self._GET_REPORT)
-        response = request("post", url=self._GET_REPORT, json=body, headers=header)
+        response = self.session.request("post", url=self._GET_REPORT, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -114,7 +114,7 @@ class CampaignManagerService:
             "secret_id": secret_id,
         }
         header = get_headers(self._RUN_REPORT)
-        response = request("post", url=self._RUN_REPORT, json=body, headers=header)
+        response = self.session.request("post", url=self._RUN_REPORT, json=body, headers=header)
         service_response = response.json()
 
         if response.status_code == HTTPStatus.OK:
@@ -173,7 +173,7 @@ class CampaignManagerService:
         """
         body = {"report_id": report_id, "file_id": file_id, "secret_id": secret_id}
         header = get_headers(self._GET_FILE)
-        response = request("post", url=self._GET_FILE, json=body, headers=header)
+        response = self.session.request("post", url=self._GET_FILE, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -215,7 +215,7 @@ class CampaignManagerService:
         header = get_headers(self._GET_FILE_MEDIA_REQUEST)
 
         # fetch the authorized request from our service for downloading the report from API
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_FILE_MEDIA_REQUEST, json=body, headers=header
         )
 
@@ -283,7 +283,7 @@ class CampaignManagerService:
             "secret_id": secret_id,
         }
         header = get_headers(self._DELETE_REPORT)
-        response = request("post", url=self._DELETE_REPORT, json=body, headers=header)
+        response = self.session.request("post", url=self._DELETE_REPORT, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             return True
@@ -325,7 +325,7 @@ class CampaignManagerService:
         }
 
         header = get_headers(self._QUERY_DIMENSION_VALUES)
-        response = request(
+        response = self.session.request(
             "post", url=self._QUERY_DIMENSION_VALUES, json=body, headers=header
         )
 
@@ -338,7 +338,7 @@ class CampaignManagerService:
         # if there was a last page response is empty string
         while service_response["data"]["nextPageToken"]:
             body["page_token"] = service_response["data"]["nextPageToken"]
-            response = request(
+            response = self.session.request(
                 "post", url=self._QUERY_DIMENSION_VALUES, json=body, headers=header
             )
 
@@ -411,7 +411,7 @@ class CampaignManagerService:
         header = get_headers(self._GET_ACCESSIBLE_PARENT_ACCOUNTS)
         body = {"secret_id": secret_id}
 
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCESSIBLE_PARENT_ACCOUNTS, json=body, headers=header
         )
 
@@ -436,7 +436,7 @@ class CampaignManagerService:
             },
         }
 
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCESSIBLE_ADVERTISERS, json=body, headers=header
         )
 
@@ -460,7 +460,7 @@ class CampaignManagerService:
             "advertiser_id": advertiser_id
         }
         header = get_headers(self._GET_ACCOUNT_ACCESSIBILITY)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCOUNT_ACCESSIBILITY, json=body, headers=header
         )
 

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/logos_sdk/services/DV360.py

@@ -1,5 +1,4 @@
-from logos_sdk.services import get_headers
-from requests import request
+from logos_sdk.services import get_headers, get_retry_session
 from http import HTTPStatus
 from time import sleep
 from random import randint
@@ -17,6 +16,7 @@ class DV360ServiceException(Exception):
 class DV360Service:
     def __init__(self, url=None):
         load_dotenv()
+        self.session = get_retry_session()
         self._URL = url or os.environ.get("DV360_SERVICE_PATH")
         self._LIST_LINE_ITEMS = self._URL + "/line-items"
         self._BULK_LIST_LINE_ITEM_ASSIGNED_TARGETING_OPTIONS = (
@@ -52,7 +52,7 @@ class DV360Service:
         if filter_string is not None:
             body["filter"] = filter_string
 
-        response = request("post", url=self._LIST_LINE_ITEMS, json=body, headers=header)
+        response = self.session.request("post", url=self._LIST_LINE_ITEMS, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -75,7 +75,7 @@ class DV360Service:
         :param filter_string: Allows filtering by line item fields
         :return List of AssignedTargetingOption objects
         """
-        header = get_headers(self._BULK_EDIT_LINE_ITEM_ASSIGNED_TARGETING_OPTIONS)
+        header = get_headers(self._BULK_LIST_LINE_ITEM_ASSIGNED_TARGETING_OPTIONS)
         body = {
             "advertiser_id": advertiser_id,
             "secret_id": secret_id,
@@ -83,7 +83,7 @@ class DV360Service:
             "filter": filter_string,
         }
 
-        response = request(
+        response = self.session.request(
             "post",
             url=self._BULK_LIST_LINE_ITEM_ASSIGNED_TARGETING_OPTIONS,
             json=body,
@@ -128,7 +128,7 @@ class DV360Service:
         if create_requests is not None:
             body["create_requests"] = create_requests
 
-        response = request(
+        response = self.session.request(
             "post",
             url=self._BULK_EDIT_LINE_ITEM_ASSIGNED_TARGETING_OPTIONS,
             json=body,
@@ -152,7 +152,7 @@ class DV360Service:
         header = get_headers(self._CREATE_CHANNEL)
         body = {"advertiser_id": advertiser_id, "secret_id": secret_id, "name": name}
 
-        response = request("post", url=self._CREATE_CHANNEL, json=body, headers=header)
+        response = self.session.request("post", url=self._CREATE_CHANNEL, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -174,7 +174,7 @@ class DV360Service:
         if filter_string is not None:
             body["filter"] = filter_string
 
-        response = request("post", url=self._LIST_CHANNELS, json=body, headers=header)
+        response = self.session.request("post", url=self._LIST_CHANNELS, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -203,7 +203,7 @@ class DV360Service:
         if filter_string is not None:
             body["filter"] = filter_string
 
-        response = request(
+        response = self.session.request(
             "post", url=self._LIST_CHANNEL_SITES, json=body, headers=header
         )
 
@@ -243,7 +243,7 @@ class DV360Service:
         if created_sites is not None:
             body["created_sites"] = created_sites
 
-        response = request(
+        response = self.session.request(
             "post",
             url=self._BULK_EDIT_CHANNEL_SITES,
             json=body,
@@ -277,7 +277,7 @@ class DV360Service:
             "metrics_names": metrics_names,
         }
 
-        response = request("post", url=self._CREATE_QUERY, json=body, headers=header)
+        response = self.session.request("post", url=self._CREATE_QUERY, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -296,7 +296,7 @@ class DV360Service:
         header = get_headers(self._RUN_QUERY)
         body = {"secret_id": secret_id, "query_id": query_id}
 
-        response = request("post", url=self._RUN_QUERY, json=body, headers=header)
+        response = self.session.request("post", url=self._RUN_QUERY, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -319,7 +319,7 @@ class DV360Service:
             },
         }
 
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCESSIBLE_PARTNERS, json=body, headers=header
         )
 
@@ -344,7 +344,7 @@ class DV360Service:
             },
         }
 
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCESSIBLE_ADVERTISERS, json=body, headers=header
         )
 
@@ -366,7 +366,7 @@ class DV360Service:
             "advertiser_id": advertiser_id
         }
         header = get_headers(self._GET_ACCOUNT_ACCESSIBILITY)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCOUNT_ACCESSIBILITY, json=body, headers=header
         )
 
@@ -408,7 +408,7 @@ class DV360Service:
         header = get_headers(self._GET_QUERY_METADATA)
         body = {"secret_id": secret_id, "query_id": query_id, "report_id": report_id}
 
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_QUERY_METADATA, json=body, headers=header
         )
 
@@ -464,7 +464,7 @@ class DV360Service:
         header = get_headers(self._DELETE_QUERY)
         body = {"secret_id": secret_id, "query_id": query_id}
 
-        response = request("post", url=self._DELETE_QUERY, json=body, headers=header)
+        response = self.session.request("post", url=self._DELETE_QUERY, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             return True

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/logos_sdk/services/Facebook.py

@@ -1,6 +1,5 @@
-from requests import request
 from typing import List, Dict, Optional
-from logos_sdk.services import get_headers
+from logos_sdk.services import get_headers, get_retry_session
 from http import HTTPStatus
 from random import randint
 from dotenv import load_dotenv
@@ -15,6 +14,7 @@ class FacebookServiceException(Exception):
 class FacebookService:
     def __init__(self, url=None):
         load_dotenv()
+        self.session = get_retry_session()
         self._URL = url or os.environ.get("FACEBOOK_SERVICE_PATH")
         self._ACCESSIBLE_ACCOUNTS = self._URL + "/accessible-accounts"
         self._INSIGHTS = self._URL + "/insights"
@@ -48,7 +48,7 @@ class FacebookService:
 
         header = get_headers(self._ACCESSIBLE_ACCOUNTS)
 
-        response = request(
+        response = self.session.request(
             "post",
             url=self._ACCESSIBLE_ACCOUNTS,
             json=body,
@@ -74,7 +74,7 @@ class FacebookService:
             "account_id": account_id
         }
         header = get_headers(self._GET_ACCOUNT_ACCESSIBILITY)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCOUNT_ACCESSIBILITY, json=body, headers=header
         )
 
@@ -121,7 +121,7 @@ class FacebookService:
             body["level"] = level
         header = get_headers(self._INSIGHTS)
 
-        response = request(
+        response = self.session.request(
             "post", url=self._INSIGHTS, json=body, headers=header, timeout=timeout
         )
         if response.status_code == HTTPStatus.OK:
@@ -162,7 +162,7 @@ class FacebookService:
 
         header = get_headers(self._LINK_URLS)
 
-        response = request(
+        response = self.session.request(
             "post", url=self._LINK_URLS, json=body, headers=header, timeout=timeout
         )
 
@@ -187,7 +187,7 @@ class FacebookService:
 
         header = get_headers(self._ACCESSIBLE_BUSINESSES)
 
-        response = request(
+        response = self.session.request(
             "post",
             url=self._ACCESSIBLE_BUSINESSES,
             json=body,
@@ -226,7 +226,7 @@ class FacebookService:
 
         header = get_headers(self._PRODUCT_CATALOGS)
 
-        response = request(
+        response = self.session.request(
             "post",
             url=self._PRODUCT_CATALOGS,
             json=body,
@@ -262,7 +262,7 @@ class FacebookService:
 
         header = get_headers(self._PRODUCT_CATALOG)
 
-        response = request(
+        response = self.session.request(
             "post",
             url=self._PRODUCT_CATALOG,
             json=body,
@@ -304,7 +304,7 @@ class FacebookService:
 
         header = get_headers(self._PRODUCTS)
 
-        response = request(
+        response = self.session.request(
             "post", url=self._PRODUCTS, json=body, headers=header, timeout=timeout
         )
         if response.status_code == HTTPStatus.OK:
@@ -325,7 +325,7 @@ class FacebookService:
         body = {"secret_id": secret_id, "catalog_id": catalog_id}
 
         header = get_headers(self._FEEDS)
-        response = request(
+        response = self.session.request(
             "post", url=self._FEEDS, json=body, headers=header, timeout=timeout
         )
 
@@ -348,7 +348,7 @@ class FacebookService:
         body = {"secret_id": secret_id, "feed_id": feed_id}
 
         header = get_headers(self._FEED_ERRORS)
-        response = request(
+        response = self.session.request(
             "post", url=self._FEED_ERRORS, json=body, headers=header, timeout=timeout
         )
 
@@ -370,7 +370,7 @@ class FacebookService:
         body = {"secret_id": secret_id, "feed_id": feed_id}
 
         header = get_headers(self._FEED_ERRORS_REPORT_STATUS)
-        response = request(
+        response = self.session.request(
             "post",
             url=self._FEED_ERRORS_REPORT_STATUS,
             json=body,
@@ -398,7 +398,7 @@ class FacebookService:
         body = {"secret_id": secret_id, "feed_id": feed_id}
 
         header = get_headers(self._FEED_ERRORS_REPORT)
-        response = request(
+        response = self.session.request(
             "post",
             url=self._FEED_ERRORS_REPORT,
             json=body,

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/logos_sdk/services/GoogleAds.py

@@ -1,7 +1,6 @@
-from requests import request
 from requests.exceptions import Timeout
 from typing import List, Union, Dict
-from logos_sdk.services import get_headers
+from logos_sdk.services import get_headers, get_retry_session
 from http import HTTPStatus
 from dotenv import load_dotenv
 import os
@@ -16,6 +15,7 @@ class GoogleAdsServiceException(Exception):
 class GoogleAdsService:
     def __init__(self, url=None):
         load_dotenv()
+        self.session = get_retry_session()
         self._URL = url or os.environ.get("GOOGLE_ADS_SERVICE_PATH")
         self._SEARCH_STREAM = self._URL + "/search-stream"
         self._SEARCH = self._URL + "/search"
@@ -24,11 +24,10 @@ class GoogleAdsService:
         self._GET_ACCESSIBLE_ACCOUNTS = self._URL + "/list-accessible-accounts"
         self._GET_ACCOUNT_ACCESSIBILITY = self._URL + "/get-account-accessibility"
 
-    @staticmethod
-    def fetch_with_retry_on_timeout(url, json, headers):
+    def fetch_with_retry_on_timeout(self,url, json, headers):
         for attempt in range(5):
             try:
-                return request("post", url, json=json, headers=headers, timeout=25)
+                return self.session.request("post", url, json=json, headers=headers, timeout=25)
             except Timeout:
                 delay = 2 * (2 ** attempt) + random.randint(0, 9)
                 print(
@@ -103,7 +102,7 @@ class GoogleAdsService:
         # if there was a last page response is empty string
         while service_response["data"]["next_page_token"]:
             body["page_token"] = service_response["data"]["next_page_token"]
-            response = request("post", url=self._SEARCH, json=body, headers=header)
+            response = self.session.request("post", url=self._SEARCH, json=body, headers=header)
 
             if response.status_code != HTTPStatus.OK:
                 raise GoogleAdsServiceException(response.content)
@@ -130,7 +129,7 @@ class GoogleAdsService:
         }
 
         header = get_headers(self._EXCLUDE_FOR_ACCOUNT)
-        response = request(
+        response = self.session.request(
             "post", url=self._EXCLUDE_FOR_ACCOUNT, json=body, headers=header
         )
 
@@ -163,7 +162,7 @@ class GoogleAdsService:
         }
 
         header = get_headers(self._EXCLUDE_FOR_AD_GROUP)
-        response = request(
+        response = self.session.request(
             "post", url=self._EXCLUDE_FOR_AD_GROUP, json=body, headers=header
         )
 
@@ -199,7 +198,7 @@ class GoogleAdsService:
 
         while service_response["data"]["next_page_token"]:
             body["page_token"] = service_response["data"]["next_page_token"]
-            response = request(
+            response = self.session.request(
                 "post", url=self._GET_ACCESSIBLE_ACCOUNTS, json=body, headers=header
             )
 
@@ -223,7 +222,7 @@ class GoogleAdsService:
             "account_id": account_id
         }
         header = get_headers(self._GET_ACCOUNT_ACCESSIBILITY)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCOUNT_ACCESSIBILITY, json=body, headers=header
         )
 

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/logos_sdk/services/MerchantCenter.py

@@ -1,6 +1,5 @@
 from http import HTTPStatus
-from requests import request
-from logos_sdk.services import get_headers
+from logos_sdk.services import get_headers, get_retry_session
 from dotenv import load_dotenv
 import os
 
@@ -12,6 +11,7 @@ class MerchantServiceException(Exception):
 class MerchantCenterService:
     def __init__(self, url=None):
         load_dotenv()
+        self.session = get_retry_session()
         self._URL = url or os.environ.get("MERCHANT_CENTER_SERVICE_PATH")
         self._LIST_ACCOUNTS = self._URL + "/account-service/accounts"
         self._LIST_ACCESSIBLE_ACCOUNTS = self._URL + "/account-service/list-accessible-accounts"
@@ -30,7 +30,7 @@ class MerchantCenterService:
         """
         body = {"merchant_account_id": merchant_account_id, "secret_id": secret_id}
         header = get_headers(self._LIST_ACCOUNTS)
-        response = request("post", url=self._LIST_ACCOUNTS, json=body, headers=header)
+        response = self.session.request("post", url=self._LIST_ACCOUNTS, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -46,7 +46,7 @@ class MerchantCenterService:
         """
         body = {"secret_id": secret_id}
         header = get_headers(self._LIST_ACCESSIBLE_ACCOUNTS)
-        response = request("post", url=self._LIST_ACCESSIBLE_ACCOUNTS, json=body, headers=header)
+        response = self.session.request("post", url=self._LIST_ACCESSIBLE_ACCOUNTS, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -70,7 +70,7 @@ class MerchantCenterService:
             "secret_id": secret_id,
         }
         header = get_headers(self._LIST_ACCOUNT_STATUSES)
-        response = request(
+        response = self.session.request(
             "post", url=self._LIST_ACCOUNT_STATUSES, json=body, headers=header
         )
 
@@ -90,7 +90,7 @@ class MerchantCenterService:
         """
         body = {"merchant_account_id": merchant_account_id, "secret_id": secret_id, "page_size": page_size}
         header = get_headers(self._LIST_PRODUCTS)
-        response = request("post", url=self._LIST_PRODUCTS, json=body, headers=header)
+        response = self.session.request("post", url=self._LIST_PRODUCTS, json=body, headers=header)
 
         if response.status_code != HTTPStatus.OK:
             raise MerchantServiceException(response.content)
@@ -100,7 +100,7 @@ class MerchantCenterService:
 
         while service_response["data"]["nextPageToken"] is not None:
             body["page_token"] = service_response["data"]["nextPageToken"]
-            response = request(
+            response = self.session.request(
                 "post", url=self._LIST_PRODUCTS, json=body, headers=header
             )
 
@@ -121,7 +121,7 @@ class MerchantCenterService:
         """
         body = {"merchant_account_id": merchant_account_id, "secret_id": secret_id, "page_size": page_size}
         header = get_headers(self._LIST_PRODUCT_STATUSES)
-        response = request(
+        response = self.session.request(
             "post", url=self._LIST_PRODUCT_STATUSES, json=body, headers=header
         )
 
@@ -133,7 +133,7 @@ class MerchantCenterService:
 
         while service_response["data"]["nextPageToken"] is not None:
             body["page_token"] = service_response["data"]["nextPageToken"]
-            response = request(
+            response = self.session.request(
                 "post", url=self._LIST_PRODUCT_STATUSES, json=body, headers=header
             )
 
@@ -159,7 +159,7 @@ class MerchantCenterService:
             "page_size": page_size,
         }
         header = get_headers(self._REPORTS_SEARCH)
-        response = request("post", url=self._REPORTS_SEARCH, json=body, headers=header)
+        response = self.session.request("post", url=self._REPORTS_SEARCH, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -181,7 +181,7 @@ class MerchantCenterService:
             "page_size": page_size,
         }
         header = get_headers(self._REPORTS_SEARCH)
-        response = request("post", url=self._REPORTS_SEARCH, json=body, headers=header)
+        response = self.session.request("post", url=self._REPORTS_SEARCH, json=body, headers=header)
 
         if response.status_code != HTTPStatus.OK:
             raise MerchantServiceException(response.content)
@@ -191,7 +191,7 @@ class MerchantCenterService:
 
         while service_response["data"]["nextPageToken"] is not None:
             body["page_token"] = service_response["data"]["nextPageToken"]
-            response = request(
+            response = self.session.request(
                 "post", url=self._REPORTS_SEARCH, json=body, headers=header
             )
 
@@ -215,7 +215,7 @@ class MerchantCenterService:
             "account_id": account_id
         }
         header = get_headers(self._GET_ACCOUNT_ACCESSIBILITY)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCOUNT_ACCESSIBILITY, json=body, headers=header
         )
 

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/logos_sdk/services/MicrosoftAdvertising.py

@@ -1,6 +1,5 @@
 from http import HTTPStatus
-from requests import request
-from logos_sdk.services import get_headers
+from logos_sdk.services import get_headers, get_retry_session
 from typing import List
 from dotenv import load_dotenv
 import os
@@ -18,16 +17,28 @@ class EntityStatus:
     PAUSED = "Paused"
 
 
+class BidMatchType:
+    EXACT = "Exact"
+    PHRASE = "Phrase"
+    BROAD = "Broad"
+
+
 class MicrosoftAdvertising:
     def __init__(self, url=None):
         load_dotenv()
+        self.session = get_retry_session()
         self._URL = url or os.environ.get("MICROSOFT_ADVERTISING_PATH")
         self._GET_ACCESSIBLE_ACCOUNTS = self._URL + "/accessible-accounts"
         self._GET_ACCOUNT_ACCESSIBILITY = self._URL + "/get-account-accessibility"
         self._GET_DESTINATION_URL_REPORT = self._URL + "/destination-url-report"
-        self._GET_CAMPAIGN_PERFORMANCE_REPORT = self._URL + "/campaign-performance-report"
-        self._GET_GEOGRAPHIC_PERFORMANCE_REPORT = self._URL + "/geographic-performance-report"
+        self._GET_CAMPAIGN_PERFORMANCE_REPORT = (
+            self._URL + "/campaign-performance-report"
+        )
+        self._GET_GEOGRAPHIC_PERFORMANCE_REPORT = (
+            self._URL + "/geographic-performance-report"
+        )
         self._GET_BUDGET_SUMMARY_REPORT = self._URL + "/budget-summary-report"
+        self._GET_SHARE_OF_VOICE_REPORT = self._URL + "/share-of-voice-report"
 
     def get_destination_url_report(
         self,
@@ -66,7 +77,7 @@ class MicrosoftAdvertising:
         } | entity_statuses
 
         header = get_headers(self._GET_DESTINATION_URL_REPORT)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_DESTINATION_URL_REPORT, json=body, headers=header
         )
 
@@ -112,8 +123,70 @@ class MicrosoftAdvertising:
         } | entity_statuses
 
         header = get_headers(self._GET_GEOGRAPHIC_PERFORMANCE_REPORT)
-        response = request(
-            "post", url=self._GET_GEOGRAPHIC_PERFORMANCE_REPORT, json=body, headers=header
+        response = self.session.request(
+            "post",
+            url=self._GET_GEOGRAPHIC_PERFORMANCE_REPORT,
+            json=body,
+            headers=header,
+        )
+
+        if response.status_code == HTTPStatus.OK:
+            service_response = response.json()
+            return service_response["data"]
+        else:
+            raise MicrosoftAdvertisingException(response.content)
+
+    def get_share_of_voice_report(
+        self,
+        account_id: str,
+        secret_id: str,
+        date_from: str,
+        date_to: str,
+        report_columns: List[str],
+        bid_match_type: str = None,
+        filter_keywords: List[str] = None,
+        entity_statuses: dict = None,
+    ) -> List:
+        """
+        Calls endpoint for getting share of voice stats
+        https://learn.microsoft.com/en-us/advertising/reporting-service/geographicperformancereportrequest?view=bingads-13&tabs=xml
+        :param account_id: The ID of the account in Microsoft Advertising
+        :param secret_id: The ID of the secret in secret manager
+        :param date_from: The date we want the report to start from. Must be before date to
+        :param date_to: The date we want the report to end at
+        :param report_columns: stats we want included in the report
+        :param bid_match_type: keywords with this bid match type will be returned
+        :param filter_keywords: just keywords from this list will be returned
+        :param entity_statuses: dict containing status ad_group_status, campaign_status, keyword_status and account_status
+        :return: List of share of voice stats
+        """
+        if entity_statuses is None:
+            entity_statuses = {
+                "ad_group_status": EntityStatus.ACTIVE,
+                "campaign_status": EntityStatus.ACTIVE,
+                "account_status": EntityStatus.ACTIVE,
+                "keyword_status": EntityStatus.ACTIVE,
+            }
+
+        body = {
+            "account_id": account_id,
+            "secret_id": secret_id,
+            "date_from": date_from,
+            "date_to": date_to,
+            "report_columns": report_columns,
+        } | entity_statuses
+
+        if bid_match_type:
+            body["bid_match_type"] = bid_match_type
+        if filter_keywords:
+            body["filter_keywords"] = filter_keywords
+
+        header = get_headers(self._GET_SHARE_OF_VOICE_REPORT)
+        response = self.session.request(
+            "post",
+            url=self._GET_SHARE_OF_VOICE_REPORT,
+            json=body,
+            headers=header,
         )
 
         if response.status_code == HTTPStatus.OK:
@@ -157,7 +230,7 @@ class MicrosoftAdvertising:
         } | entity_statuses
 
         header = get_headers(self._GET_CAMPAIGN_PERFORMANCE_REPORT)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_CAMPAIGN_PERFORMANCE_REPORT, json=body, headers=header
         )
 
@@ -173,7 +246,7 @@ class MicrosoftAdvertising:
         secret_id: str,
         date_from: str,
         date_to: str,
-        report_columns: List[str]
+        report_columns: List[str],
     ):
         """
         Calls endpoint for getting budget summary
@@ -195,7 +268,7 @@ class MicrosoftAdvertising:
         }
 
         header = get_headers(self._GET_BUDGET_SUMMARY_REPORT)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_BUDGET_SUMMARY_REPORT, json=body, headers=header
         )
 
@@ -211,14 +284,9 @@ class MicrosoftAdvertising:
         :param secret_id: The ID of the secret in secret manager
         :return: List of dicts with account_id and name keys
         """
-        body = {
-            "secret_id": secret_id,
-            "filters": {
-                "hide_inactive": True
-            }
-        }
+        body = {"secret_id": secret_id, "filters": {"hide_inactive": True}}
         header = get_headers(self._GET_ACCESSIBLE_ACCOUNTS)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCESSIBLE_ACCOUNTS, json=body, headers=header
         )
 
@@ -235,12 +303,9 @@ class MicrosoftAdvertising:
         :param account_id: The ID of the account in Microsoft Advertising
         :return: True if account has access
         """
-        body = {
-            "secret_id": secret_id,
-            "account_id": account_id
-        }
+        body = {"secret_id": secret_id, "account_id": account_id}
         header = get_headers(self._GET_ACCOUNT_ACCESSIBILITY)
-        response = request(
+        response = self.session.request(
             "post", url=self._GET_ACCOUNT_ACCESSIBILITY, json=body, headers=header
         )
 

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/logos_sdk/services/Sklik.py

@@ -1,5 +1,5 @@
 from typing import List, Dict, Union
-from logos_sdk.services import execute_request
+from logos_sdk.services import get_retry_session, get_headers
 from http import HTTPStatus
 
 import logging
@@ -38,7 +38,10 @@ def get_session_if_malformed(wrapped_function):
         try:
             return wrapped_function(*args, **kwargs)
         except SklikServiceException as err:
-            if json.loads(err.args[0].decode("utf8")).get("detail") == "Session has expired or is malformed.":
+            if (
+                json.loads(err.args[0].decode("utf8")).get("detail")
+                == "Session has expired or is malformed."
+            ):
                 args[0].get_session(args[0]._secret_id, args[0]._account_email)
                 return wrapped_function(*args, **kwargs)
             else:
@@ -53,8 +56,10 @@ def get_report_results_if_expired(wrapped_function):
         try:
             return wrapped_function(*args, **kwargs)
         except SklikServiceException as err:
-            if json.loads(err.args[0].decode("utf8")).get(
-                    "detail") == "Requested report has expired. Please create a new report by calling createReport endpoint.":
+            if (
+                json.loads(err.args[0].decode("utf8")).get("detail")
+                == "Requested report has expired. Please create a new report by calling createReport endpoint."
+            ):
                 print("Report expired, creating new report")
                 args[0].get_session(args[0]._secret_id, args[0]._account_email)
                 return wrapped_function(*args, **kwargs)
@@ -67,6 +72,7 @@ def get_report_results_if_expired(wrapped_function):
 class SklikService:
     def __init__(self, url=None):
         load_dotenv()
+        self.request_session = get_retry_session()
         self._URL = url or os.environ.get("SKLIK_SERVICE_PATH")
         self._CREATE_REPORT = self._URL + "/create-report"
         self._READ_REPORT = self._URL + "/read-report"
@@ -89,7 +95,10 @@ class SklikService:
         :return: Dict
         """
         body = {"account_email": account_email, "secret_id": secret_id}
-        response = execute_request("post", url=self._GET_SESSION, json=body)
+        header = get_headers(self._GET_SESSION)
+        response = self.request_session.request(
+            "post", url=self._GET_SESSION, json=body, timeout=70, headers=header
+        )
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -109,7 +118,14 @@ class SklikService:
         :return: Dict
         """
         body = {"secret_id": secret_id}
-        response = execute_request("post", url=self._GET_SESSION_WITHOUT_ACCOUNT, json=body)
+        header = get_headers(self._GET_SESSION_WITHOUT_ACCOUNT)
+        response = self.request_session.request(
+            "post",
+            url=self._GET_SESSION_WITHOUT_ACCOUNT,
+            json=body,
+            timeout=70,
+            headers=header,
+        )
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -128,22 +144,30 @@ class SklikService:
         """
         try:
             if self.session is not None:
-                execute_request("post", url=self._LOGOUT, json=self.session)
+                header = get_headers(self._LOGOUT)
+                self.request_session.request(
+                    "post",
+                    url=self._LOGOUT,
+                    json=self.session,
+                    timeout=70,
+                    headers=header,
+                )
+
         except:
             pass
 
     @get_session_if_malformed
     @get_report_results_if_expired
     def get_report_results(
-            self,
-            secret_id: str,
-            account_email: str,
-            report_type: str,
-            date_from: str,
-            date_to: str,
-            columns: List[str],
-            create_params: Dict[str, Union[int, str]] = None,
-            read_params: Dict[str, Union[int, str]] = None,
+        self,
+        secret_id: str,
+        account_email: str,
+        report_type: str,
+        date_from: str,
+        date_to: str,
+        columns: List[str],
+        create_params: Dict[str, Union[int, str]] = None,
+        read_params: Dict[str, Union[int, str]] = None,
     ) -> List[Dict]:
         """
         It creates sklik report with /create-report call in sklik service and reads sklik report with pagination
@@ -174,10 +198,14 @@ class SklikService:
             if read_params:
                 body.update({"params": read_params})
 
-            response = execute_request(
-                "post", url=self._READ_REPORT, json=body | self.session
+            header = get_headers(self._READ_REPORT)
+            response = self.request_session.request(
+                "post", url=self._READ_REPORT, json=body | self.session,
+                timeout=70,
+                headers=header,
             )
 
+
             if response.status_code == HTTPStatus.OK:
                 service_response = response.json()
                 result.extend(service_response["data"])
@@ -188,14 +216,14 @@ class SklikService:
 
     @get_session_if_malformed
     def get_streamed_report_results(
-            self,
-            secret_id: str,
-            account_email: str,
-            report_type: str,
-            date_from: str,
-            date_to: str,
-            columns: List[str],
-            create_params: Dict[str, Union[int, str]] = None,
+        self,
+        secret_id: str,
+        account_email: str,
+        report_type: str,
+        date_from: str,
+        date_to: str,
+        columns: List[str],
+        create_params: Dict[str, Union[int, str]] = None,
     ) -> List[Dict]:
         """
         It creates sklik report with /create-report call in sklik service and reads sklik report with pagination
@@ -224,8 +252,11 @@ class SklikService:
                 "columns": columns,
             }
 
-            response = execute_request(
-                "post", url=self._READ_REPORT, json=body | self.session
+            header = get_headers(self._READ_REPORT)
+            response = self.request_session.request(
+                "post", url=self._READ_REPORT, json=body | self.session,
+                timeout=70,
+                headers=header,
             )
 
             if response.status_code == HTTPStatus.OK:
@@ -235,13 +266,13 @@ class SklikService:
                 raise SklikServiceException(response.content)
 
     def _create_report(
-            self,
-            secret_id: str,
-            account_email: str,
-            report_type: str,
-            date_from: str,
-            date_to: str,
-            params: Dict[str, Union[int, str]] = None,
+        self,
+        secret_id: str,
+        account_email: str,
+        report_type: str,
+        date_from: str,
+        date_to: str,
+        params: Dict[str, Union[int, str]] = None,
     ) -> Dict:
         """
          Function creates sklik report with /create-report call
@@ -266,8 +297,11 @@ class SklikService:
         }
         body = self.params_
 
-        response = execute_request(
-            "post", url=self._CREATE_REPORT, json=body | self.session
+        header = get_headers(self._CREATE_REPORT)
+        response = self.request_session.request(
+            "post", url=self._CREATE_REPORT, json=body | self.session,
+            timeout=70,
+            headers=header,
         )
 
         if response.status_code == HTTPStatus.OK:
@@ -278,7 +312,7 @@ class SklikService:
 
     @get_session_if_malformed
     def call_api(
-            self, secret_id: str, account_email: str, method: str, params: List[Dict]
+        self, secret_id: str, account_email: str, method: str, params: List[Dict]
     ) -> Union[List, Dict]:
         """
         Function to call SklikService get-api route
@@ -297,7 +331,13 @@ class SklikService:
             "params": params,
         }
 
-        response = execute_request("post", url=self._API, json=body | self.session)
+        header = get_headers(self._API)
+        response = self.request_session.request(
+            "post", url=self._API, json=body | self.session,
+            timeout=70,
+            headers=header,
+        )
+
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -307,9 +347,9 @@ class SklikService:
 
     @get_session_if_malformed
     def get_client(
-            self,
-            secret_id: str,
-            account_email: str,
+        self,
+        secret_id: str,
+        account_email: str,
     ) -> Union[List, Dict]:
         """
         Function to call SklikService get-client route
@@ -321,12 +361,16 @@ class SklikService:
         if self.session is None:
             self.get_session(secret_id, account_email)
 
-        response = execute_request(
+        header = get_headers(self._GET_CLIENT)
+        response = self.request_session.request(
             "post",
             url=self._GET_CLIENT,
             json={"sklik_session": self.session["sklik_session"]},
+            timeout=70,
+            headers=header,
         )
 
+
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
             return service_response["data"]
@@ -335,8 +379,8 @@ class SklikService:
 
     @get_session_if_malformed
     def get_accessible_accounts(
-            self,
-            secret_id: str,
+        self,
+        secret_id: str,
     ) -> Union[List, Dict]:
         """
         Function to retrieve accessible accounts
@@ -347,37 +391,41 @@ class SklikService:
         if self.session is None:
             self.get_session_without_account(secret_id)
 
-        response = execute_request(
+        header = get_headers(self._GET_CLIENT)
+        response = self.request_session.request(
             "post",
             url=self._GET_CLIENT,
             json={
                 "sklik_session": self.session["sklik_session"],
-                "filters": {
-                    "hide_inactive": True
-                }
+                "filters": {"hide_inactive": True},
             },
+            timeout=70,
+            headers=header,
         )
 
+
         if response.status_code == HTTPStatus.OK:
             accounts = []
             service_response = response.json()
             data = service_response["data"]
             for account in data["foreignAccounts"]:
-                accounts.append({
-                    "id": account['userId'],
-                    "name": account['username'],
-                    "active": account["relationStatus"] == "live"
-                })
+                accounts.append(
+                    {
+                        "id": account["userId"],
+                        "name": account["username"],
+                        "active": account["relationStatus"] == "live",
+                    }
+                )
             return accounts
         else:
             raise SklikServiceException(response.content)
 
     @get_session_if_malformed
     def check_data_ready(
-            self,
-            secret_id: str,
-            account_email: str,
-            date: str = None,
+        self,
+        secret_id: str,
+        account_email: str,
+        date: str = None,
     ) -> int:
         """
         Checks if data on server are ready
@@ -391,15 +439,19 @@ class SklikService:
             self.get_session(secret_id, account_email)
 
         date = date or (
-                datetime.now(timezone("UTC")).astimezone(timezone("Europe/Prague"))
-                - timedelta(days=1)
+            datetime.now(timezone("UTC")).astimezone(timezone("Europe/Prague"))
+            - timedelta(days=1)
         ).strftime("%Y-%m-%d")
 
         body = {"date": date}
 
-        response = execute_request(
-            "post", url=self._CHECK_DATA_READY, json=body | self.session
+        header = get_headers(self._CHECK_DATA_READY)
+        response = self.request_session.request(
+            "post", url=self._CHECK_DATA_READY, json=body | self.session,
+            timeout=70,
+            headers=header,
         )
+
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
             if service_response["data"] == DataStatus.PENDING:
@@ -413,9 +465,9 @@ class SklikService:
 
     @get_session_if_malformed
     def fetch_api_limits(
-            self,
-            secret_id: str,
-            account_email: str,
+        self,
+        secret_id: str,
+        account_email: str,
     ) -> Union[List, Dict]:
         """
         Function to call SklikService api/limits route
@@ -427,7 +479,12 @@ class SklikService:
         if self.session is None:
             self.get_session(secret_id, account_email)
 
-        response = execute_request("post", url=self._API_LIMITS, json=self.session)
+        header = get_headers(self._API_LIMITS)
+        response = self.request_session.request(
+            "post", url=self._API_LIMITS, json=self.session,
+            timeout=70,
+            headers=header,
+        )
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -443,9 +500,19 @@ class SklikService:
         :return: True if account has access
         """
         body = {"account_email": account_email, "secret_id": secret_id}
-        response = execute_request("post", url=self._GET_SESSION, json=body)
+        header = get_headers(self._GET_SESSION)
+        response = self.request_session.request(
+            "post", url=self._GET_SESSION, json=body,
+            timeout=70,
+            headers=header,
+        )
+
         if response.status_code == 200:
             return True
-        if response.status_code == 401 or response.status_code == 403 or response.status_code == 404:
+        if (
+            response.status_code == 401
+            or response.status_code == 403
+            or response.status_code == 404
+        ):
             return False
         raise SklikServiceException(response.content)

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/logos_sdk/services/__init__.py

@@ -15,21 +15,19 @@ def get_headers(route):
     }
 
 
-def execute_request(method, url, json):
+def get_retry_session():
+    session = requests.Session()
+
     retry_strategy = Retry(
         total=3,
         raise_on_status=False,
-        status_forcelist=[429, 500, 502, 503, 504],
-        backoff_factor=1,
-        allowed_methods=None
+        status_forcelist=[104,400,429, 500, 502, 503, 504],
+        allowed_methods=None,
+        backoff_factor=1
     )
+
     adapter = HTTPAdapter(max_retries=retry_strategy)
-    http = requests.Session()
-    http.mount("https://", adapter)
-    http.mount("http://", adapter)
-    header = get_headers(url)
-    # 70 is magic number, we tolerate the API to tell us to wait 60 seconds max,
-    # otherwise we kill it
-    response = http.request(method, url=url, json=json, timeout=70, headers=header)
+    session.mount("http://", adapter)
+    session.mount("https://", adapter)
 
-    return response
+    return session

{logos_sdk-0.0.25.dev11 → logos_sdk-0.0.25.dev13}/logos_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: logos-sdk
-Version: 0.0.25.dev11
+Version: 0.0.25.dev13
 Summary: SDK for Logos platform
 Home-page: https://bitbucket.org/databy/logos-sdk-pip/src/master/
 Author: Databy.io