logos-sdk 0.0.25.dev2__tar.gz → 0.0.25.dev4__tar.gz

{logos_sdk-0.0.25.dev2 → logos_sdk-0.0.25.dev4}/PKG-INFO

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

{logos_sdk-0.0.25.dev2 → logos_sdk-0.0.25.dev4}/logos_sdk/__init__.py

@@ -1,4 +1,4 @@
-PRODUCTION = "PRODUCTION"
-DEVELOPMENT = "DEVELOPMENT"
-TESTING = "TESTING"
+PRODUCTION = "PRODUCTION"
+DEVELOPMENT = "DEVELOPMENT"
+TESTING = "TESTING"
 CLOUD_DEVELOPMENT = "CLOUD_DEVELOPMENT"

{logos_sdk-0.0.25.dev2 → logos_sdk-0.0.25.dev4}/logos_sdk/big_query/__init__.py

@@ -1,22 +1,22 @@
-from functools import wraps
-from google.api_core.exceptions import NotFound
-import time
-
-MAX_NUMBER_OF_ATTEMPTS = 2
-
-
-def retry_on_not_found(wrapped_function):
-    """This decorator retry call when table is not found. Insert into newly created table often fails with error
-    because API probably needs few seconds to see new created table"""
-
-    @wraps(wrapped_function)
-    def inner(*args, **kwargs):
-        for i in range(1, MAX_NUMBER_OF_ATTEMPTS + 1):
-            try:
-                kwargs["attempts"] = i
-                return wrapped_function(*args, **kwargs)
-                # this is because all request share same service
-            except NotFound as err:
-                time.sleep(2)
-
-    return inner
+from functools import wraps
+from google.api_core.exceptions import NotFound
+import time
+
+MAX_NUMBER_OF_ATTEMPTS = 2
+
+
+def retry_on_not_found(wrapped_function):
+    """This decorator retry call when table is not found. Insert into newly created table often fails with error
+    because API probably needs few seconds to see new created table"""
+
+    @wraps(wrapped_function)
+    def inner(*args, **kwargs):
+        for i in range(1, MAX_NUMBER_OF_ATTEMPTS + 1):
+            try:
+                kwargs["attempts"] = i
+                return wrapped_function(*args, **kwargs)
+                # this is because all request share same service
+            except NotFound as err:
+                time.sleep(2)
+
+    return inner

{logos_sdk-0.0.25.dev2 → logos_sdk-0.0.25.dev4}/logos_sdk/logging/LogosLogger.py

@@ -6,7 +6,6 @@ from logos_sdk import DEVELOPMENT, TESTING, CLOUD_DEVELOPMENT, PRODUCTION
 
 
 class LogosLogger:
-
     def __init__(self, name="logos-logging", labels=None, trace=None):
 
         load_dotenv()
@@ -44,23 +43,41 @@ class LogosLogger:
     def get_name(self):
         return self.name
 
-    def log(self, message, severity, log_type=None):
-        labels = self.labels if log_type is None else {"log_type": log_type, **(self.labels or {})}
+    def log(self, message, results, version, issues, severity, log_type=None):
+        labels = (
+            self.labels
+            if log_type is None
+            else {"log_type": log_type, **(self.labels or {})}
+        )
         if self.env == DEVELOPMENT or self.env == TESTING:
             self.stream_logger.log(
-                msg={"message": message, "settings": self.settings, "accesses": self.accesses},
+                msg={
+                    "message": message,
+                    "settings": self.settings,
+                    "accesses": self.accesses,
+                    "result": results,
+                    "issues": issues,
+                    "result_version": version,
+                },
                 level=severity,
                 extra={
                     "json_fields": {
                         "logging.googleapis.com/trace": self.trace,
-                        "logging.googleapis.com/labels": labels
+                        "logging.googleapis.com/labels": labels,
                     }
-                }
+                },
             )
         else:
             self.cloud_logger.log_struct(
-                info={"message": message, "settings": self.settings, "accesses": self.accesses},
+                info={
+                    "message": message,
+                    "settings": self.settings,
+                    "accesses": self.accesses,
+                    "result": results,
+                    "issues": issues,
+                    "result_version": version,
+                },
                 labels=labels,
                 severity=logging.getLevelName(severity),
-                trace=self.trace
+                trace=self.trace,
             )

{logos_sdk-0.0.25.dev2 → logos_sdk-0.0.25.dev4}/logos_sdk/logging/__init__.py

@@ -7,6 +7,7 @@ DEBUG = "debug"
 RESULT = "result"
 RESULT_UI_ONLY = "result-ui-only"
 
+
 def setup_from_request(request, logger_name="logos-logging"):
     # We want to parse as much as possible without raising an exception.
     # we want to be able to at least create a complete notification log, for this we need labels without accesses and trace.
@@ -24,7 +25,14 @@ def setup_from_request(request, logger_name="logos-logging"):
         body = request.get_json()
     except Exception as err:
         message = f"Unable to parse request body as a valid json ({err})"
-        logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
+        logger.log(
+            message=message,
+            results={},
+            issues=[],
+            version="1.0",
+            severity=logging.ERROR,
+            log_type=NOTIFICATION,
+        )
         raise Exception(message)
 
     try:
@@ -37,7 +45,14 @@ def setup_from_request(request, logger_name="logos-logging"):
         logger.labels = labels
     except Exception as err:
         message = f"Unable to create labels, missing key ({err})"
-        logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
+        logger.log(
+            message=message,
+            results={},
+            issues=[],
+            version="1.0",
+            severity=logging.ERROR,
+            log_type=NOTIFICATION,
+        )
         raise Exception(message)
 
     # To run the script itself, we need the rest. If we are not able to run it,
@@ -47,30 +62,53 @@ def setup_from_request(request, logger_name="logos-logging"):
         logger.settings = body["settings"]
     except Exception as err:
         message = f"Missing required settings ({err})"
-        logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
+        logger.log(
+            message=message,
+            results={},
+            issues=[],
+            version="1.0",
+            severity=logging.ERROR,
+            log_type=NOTIFICATION,
+        )
         raise Exception(message)
 
     try:
         accesses = {
-            str(access["platform"]["short_name"]): str(access["account"]["account_platform_id"]) for access in
-            body["accesses"]
+            str(access["platform"]["short_name"]): str(
+                access["account"]["account_platform_id"]
+            )
+            for access in body["accesses"]
         }
         labels = {**labels, **accesses}
         logger.labels = labels
         logger.accesses = body["accesses"]
     except Exception as err:
         message = f"Unable to parse accesses ({err})"
-        logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
+        logger.log(
+            message=message,
+            results={},
+            issues=[],
+            version="1.0",
+            severity=logging.ERROR,
+            log_type=NOTIFICATION,
+        )
         raise Exception(message)
 
     try:
         secrets = {
-            str(access["platform"]["short_name"]): str(access["secret"]["name"]) for access in body["accesses"]
+            str(access["platform"]["short_name"]): str(access["secret"]["name"])
+            for access in body["accesses"]
         }
     except Exception as err:
         message = f"Unable to parse secrets ({err})"
-        logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
+        logger.log(
+            message=message,
+            results={},
+            issues=[],
+            version="1.0",
+            severity=logging.ERROR,
+            log_type=NOTIFICATION,
+        )
         raise Exception(message)
 
-
     return logger, labels, settings, secrets

{logos_sdk-0.0.25.dev2 → logos_sdk-0.0.25.dev4}/logos_sdk/services/CampaignManager.py

@@ -194,7 +194,7 @@ class CampaignManagerService:
             if self.check_report_ready(report_id, file_id, secret_id):
                 return True
             else:
-                time.sleep((2 ** attempt) + randint(1, 20))
+                time.sleep((2**attempt) + randint(1, 20))
 
         return False
 
@@ -344,3 +344,56 @@ class CampaignManagerService:
 
             service_response = response.json()
             yield service_response["data"]["items"]
+
+    def create_and_get_report_results(
+        self,
+        account_id: str,
+        name: str,
+        start_date: str,
+        end_date: str,
+        dimensions: list,
+        metrics_names: list,
+        dimension_filters: list,
+        secret_id: str,
+        backoff_attempts: int,
+    ) -> Dict:
+        """
+        Method to create report, run it and fetch results in one go
+        """
+        report = {}
+        try:
+            report = self.create_report(
+                account_id=account_id,
+                name=name,
+                start_date=start_date,
+                end_date=end_date,
+                dimensions=dimensions,
+                metrics_names=metrics_names,
+                dimension_filters=dimension_filters,
+                secret_id=secret_id,
+            )
+            run_report = self.run_report(
+                account_id=account_id,
+                report_id=report["id"],
+                secret_id=secret_id,
+            )
+            if self.check_report_ready_with_exponential_backoff(
+                report_id=report["id"],
+                file_id=run_report["id"],
+                secret_id=secret_id,
+                backoff_attempts=backoff_attempts,
+            ):
+                return self.get_report_results(
+                    report_id=report["id"],
+                    file_id=run_report["id"],
+                    secret_id=secret_id,
+                )
+        except CampaignManagerServiceException as err:
+            raise err
+        finally:
+            if report:
+                self.delete_report(
+                    account_id=account_id,
+                    report_id=report["id"],
+                    secret_id=secret_id,
+                )