[MediaWiki-commits] [Gerrit] fix. pep8. - change (analytics/user-metrics)
Rfaulk has submitted this change and it was merged.
Change subject: fix. pep8.
..
fix. pep8.
Change-Id: Ia1e37b2f1c9827b5f5d37a6f12f70d50b46a9586
---
M user_metrics/api/engine/request_meta.py
1 file changed, 20 insertions(+), 20 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
diff --git a/user_metrics/api/engine/request_meta.py
b/user_metrics/api/engine/request_meta.py
index 0c3af89..7e90356 100644
--- a/user_metrics/api/engine/request_meta.py
+++ b/user_metrics/api/engine/request_meta.py
@@ -61,6 +61,7 @@
}
}
+
def RequestMetaFactory(cohort_expr, cohort_gen_timestamp, metric_expr):
Dynamically builds a record type given a metric handle
@@ -86,9 +87,8 @@
additional_params = additional_params[:-1]
params = default_params + additional_params
-arg_list = ['cohort_expr', 'cohort_gen_timestamp', 'metric_expr'] +\
- ['None'] * \
- len(ParameterMapping.QUERY_PARAMS_BY_METRIC[metric_expr])
+arg_list = ['cohort_expr', 'cohort_gen_timestamp', 'metric_expr'] + \
+['None'] * len(ParameterMapping.QUERY_PARAMS_BY_METRIC[metric_expr])
arg_str = ( + ,.join(arg_list) + )
rt = recordtype(RequestMeta, params)
@@ -137,7 +137,8 @@
if not request_meta.project:
request_meta.project = DEFAULT_PROJECT
-if get_request_type(request_meta) != request_types.raw and not
request_meta.group in REQUEST_VALUE_MAPPING:
+grp_in_req = request_meta.group in REQUEST_VALUE_MAPPING
+if get_request_type(request_meta) != request_types.raw and not grp_in_req:
request_meta.group = DEFAULT_GROUP
# set the aggregator if there is one
@@ -233,9 +234,9 @@
class ParameterMapping(object):
-Using the **Mediator** model :: Defines the query parameters accepted
by
-each metric request. This is a dict keyed on metric that stores a list
-of tuples. Each tuple defines:
+Using the **Mediator** model :: Defines the query parameters accepted
+by each metric request. This is a dict keyed on metric that stores a
+list of tuples. Each tuple defines:
(name of allowable query string var, name of corresponding
metric param)
@@ -326,8 +327,7 @@
# Registered metrics types
-metric_dict =\
-{
+metric_dict = {
'threshold': Threshold,
'survival': Survival,
'revert_rate': RevertRate,
@@ -338,12 +338,11 @@
'namespace_edits': NamespaceEdits,
'live_account': LiveAccount,
'pages_created': PagesCreated,
-}
+}
# @TODO: let metric types handle this mapping themselves and obsolete this
#structure
-aggregator_dict =\
-{
+aggregator_dict = {
'sum+bytes_added': ba_sum_agg,
'mean+bytes_added': ba_mean_agg,
'std+bytes_added': ba_std_agg,
@@ -363,7 +362,7 @@
'proportion+blocks': block_prop_agg,
'dist+time_to_threshold': ttt_stats_agg,
'dist+pages_created': pages_created_stats_agg,
-}
+}
def get_metric_type(metric):
@@ -409,19 +408,20 @@
# Enumeration to store request types
request_types = enum(time_series='time_series',
-aggregator='aggregator',
-raw='raw')
+ aggregator='aggregator',
+ raw='raw')
def get_request_type(request_meta):
Determines request type.
-if request_meta.aggregator and request_meta.time_series \
- and request_meta.group and request_meta.slice and request_meta.start \
- and request_meta.end:
+
+cond = request_meta.aggregator and request_meta.time_series
+cond = cond and request_meta.group
+cond = cond and request_meta.slice and request_meta.start
+cond = cond and request_meta.end
+if cond:
return request_types.time_series
elif request_meta.aggregator:
return request_types.aggregator
else:
return request_types.raw
-
-
--
To view, visit https://gerrit.wikimedia.org/r/71963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1e37b2f1c9827b5f5d37a6f12f70d50b46a9586
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org
Gerrit-Reviewer: Rfaulk rfaulk...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix. pep8. - change (analytics/user-metrics)
Rfaulk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71963
Change subject: fix. pep8.
..
fix. pep8.
Change-Id: Ia1e37b2f1c9827b5f5d37a6f12f70d50b46a9586
---
M user_metrics/api/engine/request_meta.py
1 file changed, 20 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics
refs/changes/63/71963/1
diff --git a/user_metrics/api/engine/request_meta.py
b/user_metrics/api/engine/request_meta.py
index 0c3af89..7e90356 100644
--- a/user_metrics/api/engine/request_meta.py
+++ b/user_metrics/api/engine/request_meta.py
@@ -61,6 +61,7 @@
}
}
+
def RequestMetaFactory(cohort_expr, cohort_gen_timestamp, metric_expr):
Dynamically builds a record type given a metric handle
@@ -86,9 +87,8 @@
additional_params = additional_params[:-1]
params = default_params + additional_params
-arg_list = ['cohort_expr', 'cohort_gen_timestamp', 'metric_expr'] +\
- ['None'] * \
- len(ParameterMapping.QUERY_PARAMS_BY_METRIC[metric_expr])
+arg_list = ['cohort_expr', 'cohort_gen_timestamp', 'metric_expr'] + \
+['None'] * len(ParameterMapping.QUERY_PARAMS_BY_METRIC[metric_expr])
arg_str = ( + ,.join(arg_list) + )
rt = recordtype(RequestMeta, params)
@@ -137,7 +137,8 @@
if not request_meta.project:
request_meta.project = DEFAULT_PROJECT
-if get_request_type(request_meta) != request_types.raw and not
request_meta.group in REQUEST_VALUE_MAPPING:
+grp_in_req = request_meta.group in REQUEST_VALUE_MAPPING
+if get_request_type(request_meta) != request_types.raw and not grp_in_req:
request_meta.group = DEFAULT_GROUP
# set the aggregator if there is one
@@ -233,9 +234,9 @@
class ParameterMapping(object):
-Using the **Mediator** model :: Defines the query parameters accepted
by
-each metric request. This is a dict keyed on metric that stores a list
-of tuples. Each tuple defines:
+Using the **Mediator** model :: Defines the query parameters accepted
+by each metric request. This is a dict keyed on metric that stores a
+list of tuples. Each tuple defines:
(name of allowable query string var, name of corresponding
metric param)
@@ -326,8 +327,7 @@
# Registered metrics types
-metric_dict =\
-{
+metric_dict = {
'threshold': Threshold,
'survival': Survival,
'revert_rate': RevertRate,
@@ -338,12 +338,11 @@
'namespace_edits': NamespaceEdits,
'live_account': LiveAccount,
'pages_created': PagesCreated,
-}
+}
# @TODO: let metric types handle this mapping themselves and obsolete this
#structure
-aggregator_dict =\
-{
+aggregator_dict = {
'sum+bytes_added': ba_sum_agg,
'mean+bytes_added': ba_mean_agg,
'std+bytes_added': ba_std_agg,
@@ -363,7 +362,7 @@
'proportion+blocks': block_prop_agg,
'dist+time_to_threshold': ttt_stats_agg,
'dist+pages_created': pages_created_stats_agg,
-}
+}
def get_metric_type(metric):
@@ -409,19 +408,20 @@
# Enumeration to store request types
request_types = enum(time_series='time_series',
-aggregator='aggregator',
-raw='raw')
+ aggregator='aggregator',
+ raw='raw')
def get_request_type(request_meta):
Determines request type.
-if request_meta.aggregator and request_meta.time_series \
- and request_meta.group and request_meta.slice and request_meta.start \
- and request_meta.end:
+
+cond = request_meta.aggregator and request_meta.time_series
+cond = cond and request_meta.group
+cond = cond and request_meta.slice and request_meta.start
+cond = cond and request_meta.end
+if cond:
return request_types.time_series
elif request_meta.aggregator:
return request_types.aggregator
else:
return request_types.raw
-
-
--
To view, visit https://gerrit.wikimedia.org/r/71963
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1e37b2f1c9827b5f5d37a6f12f70d50b46a9586
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk rfaulk...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix. pep8 - change (analytics/user-metrics)
Rfaulk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71316
Change subject: fix. pep8
..
fix. pep8
Change-Id: Idf678bdd83c45328080691a355217d20ffa1ca80
---
M user_metrics/metrics/revert_rate.py
1 file changed, 25 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics
refs/changes/16/71316/1
diff --git a/user_metrics/metrics/revert_rate.py
b/user_metrics/metrics/revert_rate.py
index 768d7cd..d2d61d2 100644
--- a/user_metrics/metrics/revert_rate.py
+++ b/user_metrics/metrics/revert_rate.py
@@ -55,14 +55,14 @@
# Structure that defines parameters for RevertRate class
_param_types = {
-'init' : {
+'init': {
'look_ahead': [int, 'Number of revisions to look '
'ahead when computing revert.', 15],
'look_back': [int, 'Number of revisions to look '
'back when computing revert.', 15],
't': [int, 'Length of measurement period.', 168],
},
-'process' : {}
+'process': {}
}
# Define the metrics data model meta
@@ -70,24 +70,22 @@
'id_fields': [0],
'date_fields': [],
'float_fields': [],
-'integer_fields': [2,3],
+'integer_fields': [2, 3],
'boolean_fields': [1],
-}
+}
_agg_indices = {
-'list_sum_indices' : _data_model_meta['integer_fields'] +
- _data_model_meta['float_fields'],
-}
+'list_sum_indices': _data_model_meta['integer_fields'] +
+_data_model_meta['float_fields'],
+}
@um.pre_metrics_init
def __init__(self, **kwargs):
super(RevertRate, self).__init__(**kwargs)
@staticmethod
-def header(): return ['user_id',
- 'is_reverted',
- 'revert_count',
- 'revision_count']
+def header():
+return ['user_id', 'is_reverted', 'revert_count', 'revision_count']
@um.UserMetric.pre_process_metric_call
def process(self, user_handle, **kwargs):
@@ -114,7 +112,7 @@
for rev in __future(rev_id, page_id, metric_args.look_ahead,
metric_args.project, metric_args.namespace):
if rev[RevertRate.REV_SHA1_IDX] in history and \
- rev[RevertRate.REV_SHA1_IDX] != sha1:
+rev[RevertRate.REV_SHA1_IDX] != sha1:
if user_text == rev[RevertRate.REV_USER_TEXT_IDX]:
return None
else:
@@ -125,8 +123,8 @@
Produce the n revisions on a page before a given revision
Returns a generator of revision objects
try:
-history = query_mod.page_rev_hist_query(rev_id, page_id, n, project,
- namespace, look_ahead=False)
+history = query_mod.page_rev_hist_query(rev_id, page_id, n, project,
+namespace, look_ahead=False)
except query_mod.UMQueryCallError as e:
logging.error(__name__ + ' :: Failed to '
'get revision history: {0}'.format(e.message))
@@ -139,7 +137,7 @@
Returns a generator of revision objects
try:
future = query_mod.page_rev_hist_query(rev_id, page_id, n, project,
-namespace, look_ahead=True)
+ namespace, look_ahead=True)
except query_mod.UMQueryCallError as e:
logging.error(__name__ + ' :: Failed to '
'get revision future: {0}'.format(e.message))
@@ -158,8 +156,8 @@
if thread_args.log_:
logging.info(__name__ +
-' :: Computing reverts on %s users (PID %s)'
-% (len(users), str(os.getpid(
+ ' :: Computing reverts on %s users (PID %s)'
+ % (len(users), str(os.getpid(
results_agg = list()
dropped_users = 0
@@ -174,10 +172,11 @@
# 1. Obtain user registration date
# 2. Compute end date based on 't'
# 3. Get user revisions in time period
-query_args = namedtuple('QueryArgs', 'date_start date_end namespace')\
-(format_mediawiki_timestamp(user_data.start),
- format_mediawiki_timestamp(user_data.end),
- thread_args.namespace)
+query_args = namedtuple(
+'QueryArgs', 'date_start date_end namespace')(
+format_mediawiki_timestamp(user_data.start),
+format_mediawiki_timestamp(user_data.end),
+thread_args.namespace)
try:
revisions = query_mod.\
@@ -204,7 +203,7 @@
if thread_args.log_:
logging.debug(__name__ + ' :: PID {0} complete. Dropped users = {1}'.
-
[MediaWiki-commits] [Gerrit] fix. pep8 - change (analytics/user-metrics)
Rfaulk has submitted this change and it was merged.
Change subject: fix. pep8
..
fix. pep8
Change-Id: Idf678bdd83c45328080691a355217d20ffa1ca80
---
M user_metrics/metrics/revert_rate.py
1 file changed, 25 insertions(+), 27 deletions(-)
Approvals:
Rfaulk: Verified; Looks good to me, approved
diff --git a/user_metrics/metrics/revert_rate.py
b/user_metrics/metrics/revert_rate.py
index 768d7cd..d2d61d2 100644
--- a/user_metrics/metrics/revert_rate.py
+++ b/user_metrics/metrics/revert_rate.py
@@ -55,14 +55,14 @@
# Structure that defines parameters for RevertRate class
_param_types = {
-'init' : {
+'init': {
'look_ahead': [int, 'Number of revisions to look '
'ahead when computing revert.', 15],
'look_back': [int, 'Number of revisions to look '
'back when computing revert.', 15],
't': [int, 'Length of measurement period.', 168],
},
-'process' : {}
+'process': {}
}
# Define the metrics data model meta
@@ -70,24 +70,22 @@
'id_fields': [0],
'date_fields': [],
'float_fields': [],
-'integer_fields': [2,3],
+'integer_fields': [2, 3],
'boolean_fields': [1],
-}
+}
_agg_indices = {
-'list_sum_indices' : _data_model_meta['integer_fields'] +
- _data_model_meta['float_fields'],
-}
+'list_sum_indices': _data_model_meta['integer_fields'] +
+_data_model_meta['float_fields'],
+}
@um.pre_metrics_init
def __init__(self, **kwargs):
super(RevertRate, self).__init__(**kwargs)
@staticmethod
-def header(): return ['user_id',
- 'is_reverted',
- 'revert_count',
- 'revision_count']
+def header():
+return ['user_id', 'is_reverted', 'revert_count', 'revision_count']
@um.UserMetric.pre_process_metric_call
def process(self, user_handle, **kwargs):
@@ -114,7 +112,7 @@
for rev in __future(rev_id, page_id, metric_args.look_ahead,
metric_args.project, metric_args.namespace):
if rev[RevertRate.REV_SHA1_IDX] in history and \
- rev[RevertRate.REV_SHA1_IDX] != sha1:
+rev[RevertRate.REV_SHA1_IDX] != sha1:
if user_text == rev[RevertRate.REV_USER_TEXT_IDX]:
return None
else:
@@ -125,8 +123,8 @@
Produce the n revisions on a page before a given revision
Returns a generator of revision objects
try:
-history = query_mod.page_rev_hist_query(rev_id, page_id, n, project,
- namespace, look_ahead=False)
+history = query_mod.page_rev_hist_query(rev_id, page_id, n, project,
+namespace, look_ahead=False)
except query_mod.UMQueryCallError as e:
logging.error(__name__ + ' :: Failed to '
'get revision history: {0}'.format(e.message))
@@ -139,7 +137,7 @@
Returns a generator of revision objects
try:
future = query_mod.page_rev_hist_query(rev_id, page_id, n, project,
-namespace, look_ahead=True)
+ namespace, look_ahead=True)
except query_mod.UMQueryCallError as e:
logging.error(__name__ + ' :: Failed to '
'get revision future: {0}'.format(e.message))
@@ -158,8 +156,8 @@
if thread_args.log_:
logging.info(__name__ +
-' :: Computing reverts on %s users (PID %s)'
-% (len(users), str(os.getpid(
+ ' :: Computing reverts on %s users (PID %s)'
+ % (len(users), str(os.getpid(
results_agg = list()
dropped_users = 0
@@ -174,10 +172,11 @@
# 1. Obtain user registration date
# 2. Compute end date based on 't'
# 3. Get user revisions in time period
-query_args = namedtuple('QueryArgs', 'date_start date_end namespace')\
-(format_mediawiki_timestamp(user_data.start),
- format_mediawiki_timestamp(user_data.end),
- thread_args.namespace)
+query_args = namedtuple(
+'QueryArgs', 'date_start date_end namespace')(
+format_mediawiki_timestamp(user_data.start),
+format_mediawiki_timestamp(user_data.end),
+thread_args.namespace)
try:
revisions = query_mod.\
@@ -204,7 +203,7 @@
if thread_args.log_:
logging.debug(__name__ + ' :: PID {0} complete. Dropped users = {1}'.
-format(str(os.getpid()), dropped_users))
+
