Skip to content

Commit 9b1fe3a

Browse files
clean up code
1 parent 56c8959 commit 9b1fe3a

3 files changed

Lines changed: 132 additions & 40 deletions

File tree

examples/pulsar_decisions.py

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ def main():
7676
if time_data.get("data"):
7777
first_point = time_data["data"][0]
7878
print(f" First timestamp: {first_point.get('timestamp')}")
79-
print(f" Job counts at first point: {len(first_point.get('counts', []))}")
79+
print(
80+
f" Job counts at first point: {len(first_point.get('counts', []))}"
81+
)
8082
except Exception as e:
8183
print(f" Error: {e}")
8284

@@ -90,7 +92,9 @@ def main():
9092
)
9193
print(f" Areas found: {len(area_data.get('areas', []))}")
9294
for area in area_data.get("areas", [])[:3]: # Show first 3
93-
print(f" - {area.get('area_name')}: {area.get('count')} decisions")
95+
print(
96+
f" - {area.get('area_name')}: {area.get('count')} decisions"
97+
)
9498
except Exception as e:
9599
print(f" Error: {e}")
96100

@@ -124,7 +128,9 @@ def main():
124128
print(f" Time points: {len(results_time.get('data', []))}")
125129
if results_time.get("data"):
126130
first_point = results_time["data"][0]
127-
print(f" Results at first point: {len(first_point.get('results', []))}")
131+
print(
132+
f" Results at first point: {len(first_point.get('results', []))}"
133+
)
128134
except Exception as e:
129135
print(f" Error: {e}")
130136

@@ -156,7 +162,9 @@ def main():
156162
print(f" Time points: {len(filters_time.get('filters', []))}")
157163
if filters_time.get("filters"):
158164
first_point = filters_time["filters"][0]
159-
print(f" Filters at first point: {len(first_point.get('filters', {}))}")
165+
print(
166+
f" Filters at first point: {len(first_point.get('filters', {}))}"
167+
)
160168
except Exception as e:
161169
print(f" Error: {e}")
162170

@@ -171,7 +179,9 @@ def main():
171179
)
172180
print(f" Data points: {len(customer_data.get('data', []))}")
173181
if customer_data.get("data"):
174-
total = sum(point.get("total", 0) for point in customer_data["data"])
182+
total = sum(
183+
point.get("total", 0) for point in customer_data["data"]
184+
)
175185
print(f" Total decisions: {total}")
176186
except Exception as e:
177187
print(f" Error: {e}")
@@ -217,9 +227,9 @@ def main():
217227
)
218228
print(f" Total decisions: {records_data.get('total', 0)}")
219229
print(f" Number of records: {len(records_data.get('records', {}))}")
220-
for record_key, record_info in list(records_data.get("records", {}).items())[
221-
:3
222-
]:
230+
for record_key, record_info in list(
231+
records_data.get("records", {}).items()
232+
)[:3]:
223233
print(
224234
f" - {record_key}: {record_info.get('count')} decisions "
225235
f"({record_info.get('percentage_of_total', 0):.1f}%)"
@@ -236,9 +246,9 @@ def main():
236246
start=start_time, end=end_time
237247
)
238248
print(f" Number of records: {len(results_record.get('record', {}))}")
239-
for record_key, record_info in list(results_record.get("record", {}).items())[
240-
:3
241-
]:
249+
for record_key, record_info in list(
250+
results_record.get("record", {}).items()
251+
)[:3]:
242252
print(
243253
f" - {record_key}: {record_info.get('decision_count')} decisions, "
244254
f"{len(record_info.get('results', {}))} unique results"
@@ -259,7 +269,9 @@ def main():
259269
job="your-job-id", # Replace with actual job ID
260270
agg="sum",
261271
)
262-
print(f" Total decisions (filtered): {filtered_data.get('total', 0)}")
272+
print(
273+
f" Total decisions (filtered): {filtered_data.get('total', 0)}"
274+
)
263275
except Exception as e:
264276
print(f" Error: {e}")
265277

@@ -273,7 +285,9 @@ def main():
273285
end=end_time,
274286
jobs=["job1", "job2", "job3"], # Replace with actual job IDs
275287
)
276-
print(f" Total decisions (multi-job): {multi_job_data.get('total', 0)}")
288+
print(
289+
f" Total decisions (multi-job): {multi_job_data.get('total', 0)}"
290+
)
277291
except Exception as e:
278292
print(f" Error: {e}")
279293

ns1/rest/pulsar_decisions.py

Lines changed: 97 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -56,55 +56,92 @@ def _make_query_url(self, path, **kwargs):
5656
def get_decisions(self, callback=None, errback=None, **kwargs):
5757
path = self._make_query_url("decisions", **kwargs)
5858
return self._make_request(
59-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
59+
"GET",
60+
"%s/%s" % (self.ROOT, path),
61+
callback=callback,
62+
errback=errback,
6063
)
6164

62-
def get_decisions_graph_region(self, callback=None, errback=None, **kwargs):
65+
def get_decisions_graph_region(
66+
self, callback=None, errback=None, **kwargs
67+
):
6368
path = self._make_query_url("decisions/graph/region", **kwargs)
6469
return self._make_request(
65-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
70+
"GET",
71+
"%s/%s" % (self.ROOT, path),
72+
callback=callback,
73+
errback=errback,
6674
)
6775

6876
def get_decisions_graph_time(self, callback=None, errback=None, **kwargs):
6977
path = self._make_query_url("decisions/graph/time", **kwargs)
7078
return self._make_request(
71-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
79+
"GET",
80+
"%s/%s" % (self.ROOT, path),
81+
callback=callback,
82+
errback=errback,
7283
)
7384

7485
def get_decisions_area(self, callback=None, errback=None, **kwargs):
7586
path = self._make_query_url("decisions/area", **kwargs)
7687
return self._make_request(
77-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
88+
"GET",
89+
"%s/%s" % (self.ROOT, path),
90+
callback=callback,
91+
errback=errback,
7892
)
7993

8094
def get_decisions_asn(self, callback=None, errback=None, **kwargs):
8195
path = self._make_query_url("decisions/asn", **kwargs)
8296
return self._make_request(
83-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
97+
"GET",
98+
"%s/%s" % (self.ROOT, path),
99+
callback=callback,
100+
errback=errback,
84101
)
85102

86-
def get_decisions_results_time(self, callback=None, errback=None, **kwargs):
103+
def get_decisions_results_time(
104+
self, callback=None, errback=None, **kwargs
105+
):
87106
path = self._make_query_url("decisions/results/time", **kwargs)
88107
return self._make_request(
89-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
108+
"GET",
109+
"%s/%s" % (self.ROOT, path),
110+
callback=callback,
111+
errback=errback,
90112
)
91113

92-
def get_decisions_results_area(self, callback=None, errback=None, **kwargs):
114+
def get_decisions_results_area(
115+
self, callback=None, errback=None, **kwargs
116+
):
93117
path = self._make_query_url("decisions/results/area", **kwargs)
94118
return self._make_request(
95-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
119+
"GET",
120+
"%s/%s" % (self.ROOT, path),
121+
callback=callback,
122+
errback=errback,
96123
)
97124

98125
def get_filters_time(self, callback=None, errback=None, **kwargs):
99126
path = self._make_query_url("decisions/filters/time", **kwargs)
100127
return self._make_request(
101-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
128+
"GET",
129+
"%s/%s" % (self.ROOT, path),
130+
callback=callback,
131+
errback=errback,
102132
)
103133

104-
def get_decision_customer(self, customer_id, callback=None, errback=None, **kwargs):
105-
path = self._make_query_url("decision/customer/%s" % customer_id, **kwargs)
134+
def get_decision_customer(
135+
self, customer_id, callback=None, errback=None, **kwargs
136+
):
137+
path = self._make_query_url(
138+
"decision/customer/%s" % customer_id, **kwargs
139+
)
106140
return self._make_request(
107-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
141+
"GET",
142+
"%s/%s" % (self.ROOT, path),
143+
callback=callback,
144+
errback=errback,
108145
)
109146

110147
def get_decision_customer_undetermined(
@@ -114,48 +151,83 @@ def get_decision_customer_undetermined(
114151
"decision/customer/%s/undetermined" % customer_id, **kwargs
115152
)
116153
return self._make_request(
117-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
154+
"GET",
155+
"%s/%s" % (self.ROOT, path),
156+
callback=callback,
157+
errback=errback,
118158
)
119159

120160
def get_decision_record(
121-
self, customer_id, domain, rec_type, callback=None, errback=None, **kwargs
161+
self,
162+
customer_id,
163+
domain,
164+
rec_type,
165+
callback=None,
166+
errback=None,
167+
**kwargs
122168
):
123169
path = self._make_query_url(
124-
"decision/customer/%s/record/%s/%s" % (customer_id, domain, rec_type),
170+
"decision/customer/%s/record/%s/%s"
171+
% (customer_id, domain, rec_type),
125172
**kwargs
126173
)
127174
return self._make_request(
128-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
175+
"GET",
176+
"%s/%s" % (self.ROOT, path),
177+
callback=callback,
178+
errback=errback,
129179
)
130180

131181
def get_decision_record_undetermined(
132-
self, customer_id, domain, rec_type, callback=None, errback=None, **kwargs
182+
self,
183+
customer_id,
184+
domain,
185+
rec_type,
186+
callback=None,
187+
errback=None,
188+
**kwargs
133189
):
134190
path = self._make_query_url(
135191
"decision/customer/%s/record/%s/%s/undetermined"
136192
% (customer_id, domain, rec_type),
137193
**kwargs
138194
)
139195
return self._make_request(
140-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
196+
"GET",
197+
"%s/%s" % (self.ROOT, path),
198+
callback=callback,
199+
errback=errback,
141200
)
142201

143-
def get_decision_total(self, customer_id, callback=None, errback=None, **kwargs):
202+
def get_decision_total(
203+
self, customer_id, callback=None, errback=None, **kwargs
204+
):
144205
path = self._make_query_url(
145206
"decision/customer/%s/total" % customer_id, **kwargs
146207
)
147208
return self._make_request(
148-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
209+
"GET",
210+
"%s/%s" % (self.ROOT, path),
211+
callback=callback,
212+
errback=errback,
149213
)
150214

151215
def get_decisions_records(self, callback=None, errback=None, **kwargs):
152216
path = self._make_query_url("decisions/records", **kwargs)
153217
return self._make_request(
154-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
218+
"GET",
219+
"%s/%s" % (self.ROOT, path),
220+
callback=callback,
221+
errback=errback,
155222
)
156223

157-
def get_decisions_results_record(self, callback=None, errback=None, **kwargs):
224+
def get_decisions_results_record(
225+
self, callback=None, errback=None, **kwargs
226+
):
158227
path = self._make_query_url("decisions/results/record", **kwargs)
159228
return self._make_request(
160-
"GET", "%s/%s" % (self.ROOT, path), callback=callback, errback=errback
229+
"GET",
230+
"%s/%s" % (self.ROOT, path),
231+
callback=callback,
232+
errback=errback,
161233
)

tests/unit/test_pulsar_decisions.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,19 @@ def pulsar_decisions_config(config):
148148
),
149149
],
150150
)
151-
def test_rest_pulsar_decisions(pulsar_decisions_config, op, args, method, url, kwargs):
151+
def test_rest_pulsar_decisions(
152+
pulsar_decisions_config, op, args, method, url, kwargs
153+
):
152154
"""Test Pulsar Decisions REST API endpoints."""
153155
m = ns1.rest.pulsar_decisions.Decisions(pulsar_decisions_config)
154156
m._make_request = mock.MagicMock()
155157
operation = getattr(m, op)
156158
if args is not None:
157-
if isinstance(args, list) and len(args) == 1 and isinstance(args[0], dict):
159+
if (
160+
isinstance(args, list)
161+
and len(args) == 1
162+
and isinstance(args[0], dict)
163+
):
158164
# Handle kwargs case
159165
operation(**args[0])
160166
else:

0 commit comments

Comments
 (0)