Rfaulk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/80531
Change subject: mod - change refs to aggregator constants in metrics.
......................................................................
mod - change refs to aggregator constants in metrics.
Change-Id: I727f6e0210f92c5a221b25278fc1072884d1d348
---
M user_metrics/metrics/blocks.py
M user_metrics/metrics/edit_rate.py
M user_metrics/metrics/live_account.py
M user_metrics/metrics/namespace_of_edits.py
M user_metrics/metrics/pages_created.py
M user_metrics/metrics/revert_rate.py
M user_metrics/metrics/survival.py
M user_metrics/metrics/threshold.py
M user_metrics/metrics/time_to_threshold.py
9 files changed, 48 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/user-metrics
refs/changes/31/80531/1
diff --git a/user_metrics/metrics/blocks.py b/user_metrics/metrics/blocks.py
index 5e56f77..ecea99c 100644
--- a/user_metrics/metrics/blocks.py
+++ b/user_metrics/metrics/blocks.py
@@ -3,10 +3,10 @@
__date__ = "October 3rd, 2012"
__license__ = "GPL (version 2 or later)"
-from user_metrics.config import logging
-
from collections import namedtuple
-import user_metric as um
+from user_metrics.etl.aggregator import METRIC_AGG_METHOD_FLAG, \
+ METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD
+from user_metrics.metrics import user_metric as um
from user_metrics.metrics import query_mod
from user_metrics.etl.aggregator import weighted_rate, decorator_builder,\
boolean_rate
@@ -156,9 +156,9 @@
block_prop_agg = boolean_rate
block_prop_agg = decorator_builder(Blocks.header())(block_prop_agg)
-setattr(block_prop_agg, um.METRIC_AGG_METHOD_FLAG, True)
-setattr(block_prop_agg, um.METRIC_AGG_METHOD_NAME, 'b_prop_agg')
-setattr(block_prop_agg, um.METRIC_AGG_METHOD_HEAD, ['total_users',
+setattr(block_prop_agg, METRIC_AGG_METHOD_FLAG, True)
+setattr(block_prop_agg, METRIC_AGG_METHOD_NAME, 'b_prop_agg')
+setattr(block_prop_agg, METRIC_AGG_METHOD_HEAD, ['total_users',
'total_blocks',
'proportion'])
setattr(block_prop_agg, um.METRIC_AGG_METHOD_KWARGS, {
diff --git a/user_metrics/metrics/edit_rate.py
b/user_metrics/metrics/edit_rate.py
index 99dca5d..b27a38b 100644
--- a/user_metrics/metrics/edit_rate.py
+++ b/user_metrics/metrics/edit_rate.py
@@ -5,6 +5,8 @@
from copy import deepcopy
from dateutil.parser import parse as date_parse
+from user_metrics.etl.aggregator import METRIC_AGG_METHOD_FLAG,\
+ METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD, METRIC_AGG_METHOD_KWARGS
import user_metric as um
import edit_count as ec
from user_metrics.etl.aggregator import weighted_rate, decorator_builder, \
@@ -12,7 +14,6 @@
from numpy import median, min, max, mean, std
from user_metrics.metrics.users import USER_METRIC_PERIOD_TYPE as umpt
from user_metrics.utils import enum, format_mediawiki_timestamp
-from user_metrics.metrics.user_metric import METRIC_AGG_METHOD_KWARGS
class EditRate(um.UserMetric):
@@ -150,11 +151,11 @@
edit_rate_agg = weighted_rate
edit_rate_agg = decorator_builder(EditRate.header())(edit_rate_agg)
-setattr(edit_rate_agg, um.METRIC_AGG_METHOD_FLAG, True)
-setattr(edit_rate_agg, um.METRIC_AGG_METHOD_NAME, 'edit_rate_agg')
-setattr(edit_rate_agg, um.METRIC_AGG_METHOD_HEAD, ['total_users',
+setattr(edit_rate_agg, METRIC_AGG_METHOD_FLAG, True)
+setattr(edit_rate_agg, METRIC_AGG_METHOD_NAME, 'edit_rate_agg')
+setattr(edit_rate_agg, METRIC_AGG_METHOD_HEAD, ['total_users',
'total_weight', 'rate'])
-setattr(edit_rate_agg, um.METRIC_AGG_METHOD_KWARGS, {
+setattr(edit_rate_agg, METRIC_AGG_METHOD_KWARGS, {
'val_idx': 2,
})
diff --git a/user_metrics/metrics/live_account.py
b/user_metrics/metrics/live_account.py
index 1a70227..724c302 100644
--- a/user_metrics/metrics/live_account.py
+++ b/user_metrics/metrics/live_account.py
@@ -6,6 +6,8 @@
from user_metrics.config import logging
+from user_metrics.etl.aggregator import METRIC_AGG_METHOD_FLAG,\
+ METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD, METRIC_AGG_METHOD_KWARGS
import user_metric as um
import user_metrics.utils.multiprocessing_wrapper as mpw
from collections import namedtuple
@@ -170,11 +172,11 @@
live_accounts_agg = boolean_rate
live_accounts_agg = decorator_builder(LiveAccount.header())(live_accounts_agg)
-setattr(live_accounts_agg, um.METRIC_AGG_METHOD_FLAG, True)
-setattr(live_accounts_agg, um.METRIC_AGG_METHOD_NAME, 'live_accounts_agg')
-setattr(live_accounts_agg, um.METRIC_AGG_METHOD_HEAD, ['total_users',
+setattr(live_accounts_agg, METRIC_AGG_METHOD_FLAG, True)
+setattr(live_accounts_agg, METRIC_AGG_METHOD_NAME, 'live_accounts_agg')
+setattr(live_accounts_agg, METRIC_AGG_METHOD_HEAD, ['total_users',
'is_live', 'rate'])
-setattr(live_accounts_agg, um.METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
+setattr(live_accounts_agg, METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
if __name__ == "__main__":
users = ['17792132', '17797320', '17792130', '17792131', '17792136',
diff --git a/user_metrics/metrics/namespace_of_edits.py
b/user_metrics/metrics/namespace_of_edits.py
index 226f392..9dcff5e 100644
--- a/user_metrics/metrics/namespace_of_edits.py
+++ b/user_metrics/metrics/namespace_of_edits.py
@@ -6,6 +6,8 @@
from user_metrics.config import logging
+from user_metrics.etl.aggregator import METRIC_AGG_METHOD_FLAG,\
+ METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD
import user_metric as um
import user_metrics.utils.multiprocessing_wrapper as mpw
from collections import namedtuple, OrderedDict
@@ -157,10 +159,10 @@
except (IndexError, TypeError):
continue
return summed_results
-setattr(namespace_edits_sum, um.METRIC_AGG_METHOD_FLAG, True)
-setattr(namespace_edits_sum, um.METRIC_AGG_METHOD_NAME,
+setattr(namespace_edits_sum, METRIC_AGG_METHOD_FLAG, True)
+setattr(namespace_edits_sum, METRIC_AGG_METHOD_NAME,
'namespace_edits_aggregates')
-setattr(namespace_edits_sum, um.METRIC_AGG_METHOD_HEAD, ['type',
+setattr(namespace_edits_sum, METRIC_AGG_METHOD_HEAD, ['type',
'total_revs',
'weighted_rate',
'total_editors',
diff --git a/user_metrics/metrics/pages_created.py
b/user_metrics/metrics/pages_created.py
index cc5bf7b..6cae313 100644
--- a/user_metrics/metrics/pages_created.py
+++ b/user_metrics/metrics/pages_created.py
@@ -119,7 +119,7 @@
# ==========================
from user_metrics.etl.aggregator import build_numpy_op_agg, build_agg_meta
-from user_metrics.metrics.user_metric import METRIC_AGG_METHOD_KWARGS
+from user_metrics.etl.aggregator import METRIC_AGG_METHOD_KWARGS
metric_header = PagesCreated.header()
diff --git a/user_metrics/metrics/revert_rate.py
b/user_metrics/metrics/revert_rate.py
index d9299d6..34c6e9f 100644
--- a/user_metrics/metrics/revert_rate.py
+++ b/user_metrics/metrics/revert_rate.py
@@ -7,6 +7,8 @@
from user_metrics.config import logging
from collections import namedtuple
+from user_metrics.etl.aggregator import METRIC_AGG_METHOD_FLAG,\
+ METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD, METRIC_AGG_METHOD_KWARGS
import user_metric as um
import os
import user_metrics.utils.multiprocessing_wrapper as mpw
@@ -16,7 +18,6 @@
from user_metrics.metrics import query_mod
from user_metrics.metrics.users import UMP_MAP
from user_metrics.utils import format_mediawiki_timestamp
-from user_metrics.metrics.user_metric import METRIC_AGG_METHOD_KWARGS
class RevertRate(um.UserMetric):
@@ -254,9 +255,9 @@
revert_prop_agg = decorator_builder(RevertRate.header())(
revert_prop_agg)
-setattr(revert_prop_agg, um.METRIC_AGG_METHOD_FLAG, True)
-setattr(revert_prop_agg, um.METRIC_AGG_METHOD_NAME, 'revert_prop_agg')
-setattr(revert_prop_agg, um.METRIC_AGG_METHOD_HEAD, ['total_users',
+setattr(revert_prop_agg, METRIC_AGG_METHOD_FLAG, True)
+setattr(revert_prop_agg, METRIC_AGG_METHOD_NAME, 'revert_prop_agg')
+setattr(revert_prop_agg, METRIC_AGG_METHOD_HEAD, ['total_users',
'total_reverted',
'rate', ])
-setattr(revert_prop_agg, um.METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
+setattr(revert_prop_agg, METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
diff --git a/user_metrics/metrics/survival.py b/user_metrics/metrics/survival.py
index 008ce55..6f276e8 100644
--- a/user_metrics/metrics/survival.py
+++ b/user_metrics/metrics/survival.py
@@ -3,6 +3,8 @@
__date__ = "December 6th, 2012"
__license__ = "GPL (version 2 or later)"
+from user_metrics.etl.aggregator import METRIC_AGG_METHOD_FLAG,\
+ METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD, METRIC_AGG_METHOD_KWARGS
import user_metric as um
import threshold as th
from user_metrics.etl.aggregator import decorator_builder, boolean_rate
@@ -95,10 +97,10 @@
survival_editors_agg = decorator_builder(Survival.header())(
survival_editors_agg)
-setattr(survival_editors_agg, um.METRIC_AGG_METHOD_FLAG, True)
-setattr(survival_editors_agg, um.METRIC_AGG_METHOD_NAME,
+setattr(survival_editors_agg, METRIC_AGG_METHOD_FLAG, True)
+setattr(survival_editors_agg, METRIC_AGG_METHOD_NAME,
'survival_editors_agg')
-setattr(survival_editors_agg, um.METRIC_AGG_METHOD_HEAD, ['total_users',
+setattr(survival_editors_agg, METRIC_AGG_METHOD_HEAD, ['total_users',
'has_survived',
'rate'])
-setattr(survival_editors_agg, um.METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
+setattr(survival_editors_agg, METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
diff --git a/user_metrics/metrics/threshold.py
b/user_metrics/metrics/threshold.py
index c385feb..afdd026 100644
--- a/user_metrics/metrics/threshold.py
+++ b/user_metrics/metrics/threshold.py
@@ -6,6 +6,8 @@
from user_metrics.config import logging
import os
+from user_metrics.etl.aggregator import METRIC_AGG_METHOD_FLAG,\
+ METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD, METRIC_AGG_METHOD_KWARGS
import user_metrics.utils.multiprocessing_wrapper as mpw
import user_metric as um
from user_metrics.etl.aggregator import decorator_builder, boolean_rate
@@ -155,13 +157,13 @@
threshold_editors_agg = decorator_builder(Threshold.header())(
threshold_editors_agg)
-setattr(threshold_editors_agg, um.METRIC_AGG_METHOD_FLAG, True)
-setattr(threshold_editors_agg, um.METRIC_AGG_METHOD_NAME,
+setattr(threshold_editors_agg, METRIC_AGG_METHOD_FLAG, True)
+setattr(threshold_editors_agg, METRIC_AGG_METHOD_NAME,
'threshold_editors_agg')
-setattr(threshold_editors_agg, um.METRIC_AGG_METHOD_HEAD, ['total_users',
+setattr(threshold_editors_agg, METRIC_AGG_METHOD_HEAD, ['total_users',
'threshold_reached',
'rate'])
-setattr(threshold_editors_agg, um.METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
+setattr(threshold_editors_agg, METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
# testing
if __name__ == "__main__":
diff --git a/user_metrics/metrics/time_to_threshold.py
b/user_metrics/metrics/time_to_threshold.py
index 5594c08..f7b09a9 100644
--- a/user_metrics/metrics/time_to_threshold.py
+++ b/user_metrics/metrics/time_to_threshold.py
@@ -8,6 +8,8 @@
from os import getpid
from dateutil.parser import parse as date_parse
+from user_metrics.etl.aggregator import METRIC_AGG_METHOD_FLAG,\
+ METRIC_AGG_METHOD_NAME, METRIC_AGG_METHOD_HEAD, METRIC_AGG_METHOD_KWARGS
import user_metric as um
from user_metrics.etl.aggregator import weighted_rate, decorator_builder, \
build_numpy_op_agg, build_agg_meta
@@ -180,12 +182,12 @@
ttt_avg_agg = weighted_rate
ttt_avg_agg = decorator_builder(TimeToThreshold.header())(ttt_avg_agg)
-setattr(ttt_avg_agg, um.METRIC_AGG_METHOD_FLAG, True)
-setattr(ttt_avg_agg, um.METRIC_AGG_METHOD_NAME, 'ttt_avg_agg')
-setattr(ttt_avg_agg, um.METRIC_AGG_METHOD_HEAD, ['total_users',
+setattr(ttt_avg_agg, METRIC_AGG_METHOD_FLAG, True)
+setattr(ttt_avg_agg, METRIC_AGG_METHOD_NAME, 'ttt_avg_agg')
+setattr(ttt_avg_agg, METRIC_AGG_METHOD_HEAD, ['total_users',
'total_weight',
'average'])
-setattr(ttt_avg_agg, um.METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
+setattr(ttt_avg_agg, METRIC_AGG_METHOD_KWARGS, {'val_idx': 1})
metric_header = TimeToThreshold.header()
--
To view, visit https://gerrit.wikimedia.org/r/80531
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I727f6e0210f92c5a221b25278fc1072884d1d348
Gerrit-PatchSet: 1
Gerrit-Project: analytics/user-metrics
Gerrit-Branch: master
Gerrit-Owner: Rfaulk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
