logos-sdk 0.0.25.dev6__tar.gz → 0.0.25.dev8__tar.gz

{logos_sdk-0.0.25.dev6 → logos_sdk-0.0.25.dev8}/PKG-INFO

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

{logos_sdk-0.0.25.dev6 → logos_sdk-0.0.25.dev8}/logos_sdk/services/Collabim.py

@@ -1,4 +1,4 @@
-from requests import request
+"""from requests import request
 from typing import List, Dict
 from logos_sdk.services import get_headers
 from http import HTTPStatus
@@ -208,3 +208,4 @@ class CollabimService:
             return service_response["data"]
 
         raise CollabimServiceException(service_response)
+"""

{logos_sdk-0.0.25.dev6 → logos_sdk-0.0.25.dev8}/logos_sdk/services/MarketMiner.py

@@ -1,3 +1,4 @@
+"""
 from requests import request
 from typing import List
 from logos_sdk.services import get_headers
@@ -18,12 +19,12 @@ class MarketMiner:
         self._SEARCH_VOLUME = self._URL + "/search-volume-data"
 
     def search_volume_data(self, lang: str, keywords: List[str]) -> List:
-        """
+
         Function to call mm api point
         :param lang: Language can be "cs", "sk", "us", "pl", "gb"
         :param keywords: List of keywords you want search volume
         :return:
-        """
+
         body = {
             "lang": lang,
             "keywords": keywords
@@ -37,3 +38,4 @@ class MarketMiner:
             return service_response["data"]
         
         raise MarketMinerServiceException(service_response)
+"""

{logos_sdk-0.0.25.dev6 → logos_sdk-0.0.25.dev8}/logos_sdk/services/MicrosoftAdvertising.py

@@ -25,6 +25,7 @@ class MicrosoftAdvertising:
         self._GET_ACCESSIBLE_ACCOUNTS = self._URL + "/accessible-accounts"
         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_BUDGET_SUMMARY_REPORT = self._URL + "/budget-summary-report"
 
     def get_destination_url_report(
@@ -74,6 +75,52 @@ class MicrosoftAdvertising:
         else:
             raise MicrosoftAdvertisingException(response.content)
 
+    def get_geographic_report(
+        self,
+        account_id: str,
+        secret_id: str,
+        date_from: str,
+        date_to: str,
+        report_columns: List[str],
+        entity_statuses: dict = None,
+    ) -> List:
+        """
+        Calls endpoint for getting geographic 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 entity_statuses: dict containing status ad_group_status, campaign_status and account_status
+        :return: List of campaigns and their geographic stats
+        """
+        if entity_statuses is None:
+            entity_statuses = {
+                "ad_group_status": EntityStatus.ACTIVE,
+                "campaign_status": EntityStatus.ACTIVE,
+                "account_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
+
+        header = get_headers(self._GET_GEOGRAPHIC_PERFORMANCE_REPORT)
+        response = 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_campaign_performance_report(
         self,
         account_id: str,

{logos_sdk-0.0.25.dev6 → logos_sdk-0.0.25.dev8}/logos_sdk/services/Sklik.py

@@ -46,6 +46,21 @@ def get_session_if_malformed(wrapped_function):
 
     return inner
 
+def get_report_results_if_expired(wrapped_function):
+    @wraps(wrapped_function)
+    def inner(*args, **kwargs):
+        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.":
+                print("Report expired, creating new report")
+                args[0].get_session(args[0]._secret_id, args[0]._account_email)
+                return wrapped_function(*args, **kwargs)
+            else:
+                raise err
+
+    return inner
+
 
 class SklikService:
     def __init__(self, url=None):
@@ -95,6 +110,7 @@ class SklikService:
             pass
 
     @get_session_if_malformed
+    @get_report_results_if_expired
     def get_report_results(
         self,
         secret_id: str,

{logos_sdk-0.0.25.dev6 → logos_sdk-0.0.25.dev8}/logos_sdk.egg-info/PKG-INFO

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