logos-sdk 0.0.25.dev3__tar.gz → 0.0.25.dev5__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.
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/PKG-INFO +1 -1
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/logging/LogosLogger.py +27 -8
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/logging/__init__.py +32 -9
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk.egg-info/PKG-INFO +1 -1
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/LICENSE +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/README.md +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/__init__.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/big_query/BigQuery.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/big_query/__init__.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/CampaignManager.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/Collabim.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/DV360.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/Facebook.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/GoogleAds.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/GoogleSheets.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/MarketMiner.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/MerchantCenter.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/MicrosoftAdvertising.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/Sklik.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk/services/__init__.py +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk.egg-info/SOURCES.txt +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk.egg-info/dependency_links.txt +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk.egg-info/requires.txt +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/logos_sdk.egg-info/top_level.txt +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/setup.cfg +0 -0
- {logos_sdk-0.0.25.dev3 → logos_sdk-0.0.25.dev5}/setup.py +0 -0
|
@@ -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,43 @@ class LogosLogger:
|
|
|
44
43
|
def get_name(self):
|
|
45
44
|
return self.name
|
|
46
45
|
|
|
47
|
-
def log(
|
|
48
|
-
|
|
46
|
+
def log(
|
|
47
|
+
self, message, severity, results=None, version="1.0", issues=None, log_type=None
|
|
48
|
+
):
|
|
49
|
+
labels = (
|
|
50
|
+
self.labels
|
|
51
|
+
if log_type is None
|
|
52
|
+
else {"log_type": log_type, **(self.labels or {})}
|
|
53
|
+
)
|
|
49
54
|
if self.env == DEVELOPMENT or self.env == TESTING:
|
|
50
55
|
self.stream_logger.log(
|
|
51
|
-
msg={
|
|
56
|
+
msg={
|
|
57
|
+
"message": message,
|
|
58
|
+
"settings": self.settings,
|
|
59
|
+
"accesses": self.accesses,
|
|
60
|
+
"result": results,
|
|
61
|
+
"issues": issues,
|
|
62
|
+
"result_version": version,
|
|
63
|
+
},
|
|
52
64
|
level=severity,
|
|
53
65
|
extra={
|
|
54
66
|
"json_fields": {
|
|
55
67
|
"logging.googleapis.com/trace": self.trace,
|
|
56
|
-
"logging.googleapis.com/labels": labels
|
|
68
|
+
"logging.googleapis.com/labels": labels,
|
|
57
69
|
}
|
|
58
|
-
}
|
|
70
|
+
},
|
|
59
71
|
)
|
|
60
72
|
else:
|
|
61
73
|
self.cloud_logger.log_struct(
|
|
62
|
-
info={
|
|
74
|
+
info={
|
|
75
|
+
"message": message,
|
|
76
|
+
"settings": self.settings,
|
|
77
|
+
"accesses": self.accesses,
|
|
78
|
+
"result": results,
|
|
79
|
+
"issues": issues,
|
|
80
|
+
"result_version": version,
|
|
81
|
+
},
|
|
63
82
|
labels=labels,
|
|
64
83
|
severity=logging.getLevelName(severity),
|
|
65
|
-
trace=self.trace
|
|
84
|
+
trace=self.trace,
|
|
66
85
|
)
|
|
@@ -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,11 @@ 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(
|
|
28
|
+
logger.log(
|
|
29
|
+
message=message,
|
|
30
|
+
severity=logging.ERROR,
|
|
31
|
+
log_type=NOTIFICATION,
|
|
32
|
+
)
|
|
28
33
|
raise Exception(message)
|
|
29
34
|
|
|
30
35
|
try:
|
|
@@ -37,7 +42,11 @@ def setup_from_request(request, logger_name="logos-logging"):
|
|
|
37
42
|
logger.labels = labels
|
|
38
43
|
except Exception as err:
|
|
39
44
|
message = f"Unable to create labels, missing key ({err})"
|
|
40
|
-
logger.log(
|
|
45
|
+
logger.log(
|
|
46
|
+
message=message,
|
|
47
|
+
severity=logging.ERROR,
|
|
48
|
+
log_type=NOTIFICATION,
|
|
49
|
+
)
|
|
41
50
|
raise Exception(message)
|
|
42
51
|
|
|
43
52
|
# To run the script itself, we need the rest. If we are not able to run it,
|
|
@@ -47,30 +56,44 @@ def setup_from_request(request, logger_name="logos-logging"):
|
|
|
47
56
|
logger.settings = body["settings"]
|
|
48
57
|
except Exception as err:
|
|
49
58
|
message = f"Missing required settings ({err})"
|
|
50
|
-
logger.log(
|
|
59
|
+
logger.log(
|
|
60
|
+
message=message,
|
|
61
|
+
severity=logging.ERROR,
|
|
62
|
+
log_type=NOTIFICATION,
|
|
63
|
+
)
|
|
51
64
|
raise Exception(message)
|
|
52
65
|
|
|
53
66
|
try:
|
|
54
67
|
accesses = {
|
|
55
|
-
str(access["platform"]["short_name"]): str(
|
|
56
|
-
|
|
68
|
+
str(access["platform"]["short_name"]): str(
|
|
69
|
+
access["account"]["account_platform_id"]
|
|
70
|
+
)
|
|
71
|
+
for access in body["accesses"]
|
|
57
72
|
}
|
|
58
73
|
labels = {**labels, **accesses}
|
|
59
74
|
logger.labels = labels
|
|
60
75
|
logger.accesses = body["accesses"]
|
|
61
76
|
except Exception as err:
|
|
62
77
|
message = f"Unable to parse accesses ({err})"
|
|
63
|
-
logger.log(
|
|
78
|
+
logger.log(
|
|
79
|
+
message=message,
|
|
80
|
+
severity=logging.ERROR,
|
|
81
|
+
log_type=NOTIFICATION,
|
|
82
|
+
)
|
|
64
83
|
raise Exception(message)
|
|
65
84
|
|
|
66
85
|
try:
|
|
67
86
|
secrets = {
|
|
68
|
-
str(access["platform"]["short_name"]): str(access["secret"]["name"])
|
|
87
|
+
str(access["platform"]["short_name"]): str(access["secret"]["name"])
|
|
88
|
+
for access in body["accesses"]
|
|
69
89
|
}
|
|
70
90
|
except Exception as err:
|
|
71
91
|
message = f"Unable to parse secrets ({err})"
|
|
72
|
-
logger.log(
|
|
92
|
+
logger.log(
|
|
93
|
+
message=message,
|
|
94
|
+
severity=logging.ERROR,
|
|
95
|
+
log_type=NOTIFICATION,
|
|
96
|
+
)
|
|
73
97
|
raise Exception(message)
|
|
74
98
|
|
|
75
|
-
|
|
76
99
|
return logger, labels, settings, secrets
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|