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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/PKG-INFO +1 -1
  2. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/logging/LogosLogger.py +25 -8
  3. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/logging/__init__.py +47 -9
  4. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk.egg-info/PKG-INFO +1 -1
  5. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/LICENSE +0 -0
  6. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/README.md +0 -0
  7. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/__init__.py +0 -0
  8. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/big_query/BigQuery.py +0 -0
  9. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/big_query/__init__.py +0 -0
  10. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/CampaignManager.py +0 -0
  11. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/Collabim.py +0 -0
  12. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/DV360.py +0 -0
  13. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/Facebook.py +0 -0
  14. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/GoogleAds.py +0 -0
  15. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/GoogleSheets.py +0 -0
  16. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/MarketMiner.py +0 -0
  17. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/MerchantCenter.py +0 -0
  18. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/MicrosoftAdvertising.py +0 -0
  19. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/Sklik.py +0 -0
  20. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk/services/__init__.py +0 -0
  21. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk.egg-info/SOURCES.txt +0 -0
  22. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk.egg-info/dependency_links.txt +0 -0
  23. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk.egg-info/requires.txt +0 -0
  24. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/logos_sdk.egg-info/top_level.txt +0 -0
  25. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/setup.cfg +0 -0
  26. {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev4}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: logos-sdk
3
- Version: 0.0.25.dev3
3
+ Version: 0.0.25.dev4
4
4
  Summary: SDK for Logos platform
5
5
  Home-page: https://bitbucket.org/databy/logos-sdk-pip/src/master/
6
6
  Author: Databy.io
@@ -6,7 +6,6 @@ from logos_sdk import DEVELOPMENT, TESTING, CLOUD_DEVELOPMENT, PRODUCTION
6
6
 
7
7
 
8
8
  class LogosLogger:
9
-
10
9
  def __init__(self, name="logos-logging", labels=None, trace=None):
11
10
 
12
11
  load_dotenv()
@@ -44,23 +43,41 @@ class LogosLogger:
44
43
  def get_name(self):
45
44
  return self.name
46
45
 
47
- def log(self, message, severity, log_type=None):
48
- labels = self.labels if log_type is None else {"log_type": log_type, **(self.labels or {})}
46
+ def log(self, message, results, version, issues, severity, log_type=None):
47
+ labels = (
48
+ self.labels
49
+ if log_type is None
50
+ else {"log_type": log_type, **(self.labels or {})}
51
+ )
49
52
  if self.env == DEVELOPMENT or self.env == TESTING:
50
53
  self.stream_logger.log(
51
- msg={"message": message, "settings": self.settings, "accesses": self.accesses},
54
+ msg={
55
+ "message": message,
56
+ "settings": self.settings,
57
+ "accesses": self.accesses,
58
+ "result": results,
59
+ "issues": issues,
60
+ "result_version": version,
61
+ },
52
62
  level=severity,
53
63
  extra={
54
64
  "json_fields": {
55
65
  "logging.googleapis.com/trace": self.trace,
56
- "logging.googleapis.com/labels": labels
66
+ "logging.googleapis.com/labels": labels,
57
67
  }
58
- }
68
+ },
59
69
  )
60
70
  else:
61
71
  self.cloud_logger.log_struct(
62
- info={"message": message, "settings": self.settings, "accesses": self.accesses},
72
+ info={
73
+ "message": message,
74
+ "settings": self.settings,
75
+ "accesses": self.accesses,
76
+ "result": results,
77
+ "issues": issues,
78
+ "result_version": version,
79
+ },
63
80
  labels=labels,
64
81
  severity=logging.getLevelName(severity),
65
- trace=self.trace
82
+ trace=self.trace,
66
83
  )
@@ -7,6 +7,7 @@ DEBUG = "debug"
7
7
  RESULT = "result"
8
8
  RESULT_UI_ONLY = "result-ui-only"
9
9
 
10
+
10
11
  def setup_from_request(request, logger_name="logos-logging"):
11
12
  # We want to parse as much as possible without raising an exception.
12
13
  # 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"):
24
25
  body = request.get_json()
25
26
  except Exception as err:
26
27
  message = f"Unable to parse request body as a valid json ({err})"
27
- logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
28
+ logger.log(
29
+ message=message,
30
+ results={},
31
+ issues=[],
32
+ version="1.0",
33
+ severity=logging.ERROR,
34
+ log_type=NOTIFICATION,
35
+ )
28
36
  raise Exception(message)
29
37
 
30
38
  try:
@@ -37,7 +45,14 @@ def setup_from_request(request, logger_name="logos-logging"):
37
45
  logger.labels = labels
38
46
  except Exception as err:
39
47
  message = f"Unable to create labels, missing key ({err})"
40
- logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
48
+ logger.log(
49
+ message=message,
50
+ results={},
51
+ issues=[],
52
+ version="1.0",
53
+ severity=logging.ERROR,
54
+ log_type=NOTIFICATION,
55
+ )
41
56
  raise Exception(message)
42
57
 
43
58
  # 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"):
47
62
  logger.settings = body["settings"]
48
63
  except Exception as err:
49
64
  message = f"Missing required settings ({err})"
50
- logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
65
+ logger.log(
66
+ message=message,
67
+ results={},
68
+ issues=[],
69
+ version="1.0",
70
+ severity=logging.ERROR,
71
+ log_type=NOTIFICATION,
72
+ )
51
73
  raise Exception(message)
52
74
 
53
75
  try:
54
76
  accesses = {
55
- str(access["platform"]["short_name"]): str(access["account"]["account_platform_id"]) for access in
56
- body["accesses"]
77
+ str(access["platform"]["short_name"]): str(
78
+ access["account"]["account_platform_id"]
79
+ )
80
+ for access in body["accesses"]
57
81
  }
58
82
  labels = {**labels, **accesses}
59
83
  logger.labels = labels
60
84
  logger.accesses = body["accesses"]
61
85
  except Exception as err:
62
86
  message = f"Unable to parse accesses ({err})"
63
- logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
87
+ logger.log(
88
+ message=message,
89
+ results={},
90
+ issues=[],
91
+ version="1.0",
92
+ severity=logging.ERROR,
93
+ log_type=NOTIFICATION,
94
+ )
64
95
  raise Exception(message)
65
96
 
66
97
  try:
67
98
  secrets = {
68
- str(access["platform"]["short_name"]): str(access["secret"]["name"]) for access in body["accesses"]
99
+ str(access["platform"]["short_name"]): str(access["secret"]["name"])
100
+ for access in body["accesses"]
69
101
  }
70
102
  except Exception as err:
71
103
  message = f"Unable to parse secrets ({err})"
72
- logger.log(message=message, severity=logging.ERROR, log_type=NOTIFICATION)
104
+ logger.log(
105
+ message=message,
106
+ results={},
107
+ issues=[],
108
+ version="1.0",
109
+ severity=logging.ERROR,
110
+ log_type=NOTIFICATION,
111
+ )
73
112
  raise Exception(message)
74
113
 
75
-
76
114
  return logger, labels, settings, secrets
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: logos-sdk
3
- Version: 0.0.25.dev3
3
+ Version: 0.0.25.dev4
4
4
  Summary: SDK for Logos platform
5
5
  Home-page: https://bitbucket.org/databy/logos-sdk-pip/src/master/
6
6
  Author: Databy.io
File without changes