Weekly graph

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "metrika/sdk"]
-	path = metrika/sdk
-	url = git@github.com:codex-bot/sdk-python.git
+    path = metrika/sdk
+    url = https://github.com/codex-bot/sdk-python.git

metrika/commands/help.py

@@ -15,7 +15,8 @@ async def __call__(self, payload):
                   "/metrika_subscriptions - настройка ежедневных отчётов\n" \
                   "/metrika_stop - отключение счетчиков\n" \
                   "/metrika_counters - список подключенных счётчиков\n" \
-                  "/metrika_access - отключение пользователей от чата"
+                  "/metrika_access - отключение пользователей от чата\n" \
+                  "/today, /weekly, /monthly - получить статистику посещений за сегодняшний день/неделю/месяц"
 
         await self.sdk.send_text_to_chat(
             payload["chat"],

metrika/commands/statistics.py

@@ -1,6 +1,11 @@
+import io
+
 from .base import CommandBase
 import requests
 from datetime import datetime, timedelta
+import matplotlib.pyplot as plt
+import numpy as np
+import pycapella
 
 
 class CommandStatistics(CommandBase):
@@ -49,23 +54,45 @@ async def stats(self, payload):
                                                                       date['hour'],
                                                                       date['minute'])
 
+        await self.sdk.send_text_to_chat(payload["chat"], message)
+
         for counter in counters:
             user_data = self.sdk.db.find_one(self.COLLECTIONS['tokens'], {
                 'user_id': counter['user_id']
             })
 
             token = user_data['access_token']
 
-            hits, users = self.get_stats(counter['counter_id'], token, period)
+            hits, users, _ = self.get_stats(counter['counter_id'], token, period)
 
-            message += "{}:\n" \
+            await self.sdk.send_text_to_chat(payload["chat"],
+                       "{}:\n" \
                        "{} уникальных посетителей\n" \
-                       "{} просмотров\n\n".format(counter['counter_name'], int(users), int(hits))
-
-        await self.sdk.send_text_to_chat(
-            payload["chat"],
-            message
-        )
+                       "{} просмотров\n\n".format(counter['counter_name'], int(users), int(hits)))
+
+            if payload['command'] == 'weekly':
+                try:
+                    _, _, users_day = self.get_stats(counter['counter_id'], token, '6daysAgo')
+                    url = self.get_graph(users_day)
+                    if url:
+                        await self.sdk.send_image_to_chat(payload["chat"], url)
+                except:
+                    pass
+
+    def get_graph(self, users_day):
+        now = datetime.now()
+        axes_labels = [(now - timedelta(i)).strftime("%d.%m") for i in range(6, -1, -1)]
+        fig = plt.figure(figsize=(6, 3), dpi=80)
+        ax = fig.add_subplot(111)
+        ax.plot(axes_labels, np.array(users_day), 'b')
+        buf = io.BytesIO()
+        fig.savefig(buf, format='png')
+        try:
+            response = pycapella.Capella().upload_file(buf.getvalue(), raw_input=True)
+        except:
+            return None
+        else:
+            return response['url']
 
     def get_stats(self, counter, token, date1):
         """
@@ -82,13 +109,16 @@ def get_stats(self, counter, token, date1):
             'oauth_token': token,
             'metrics': 'ym:s:pageviews,ym:s:users',
             'date1': date1,
-            'date2': 'today'
+            'date2': 'today',
+            'group': 'day'
         }
 
         statistic = requests.get(self.API_URL, params=params, timeout=5).json()
 
         hits, users = statistic['totals'][0]
-        return hits, users
+        users_day = statistic['data'][0]['metrics'][1]
+
+        return hits, users,users_day
 
     @staticmethod
     def get_date():

metrika/main.py

@@ -1,3 +1,5 @@
+import matplotlib
+matplotlib.use('Agg')
 from commands.subscribe import CommandSubscribe
 from commands.statistics import CommandStatistics
 from commands.unsubscribe import CommandUnsubscribe

requirements.txt

@@ -18,3 +18,5 @@ setuptools==35.0.2
     - six [required: Any, installed: 1.10.0]
   - six [required: >=1.6.0, installed: 1.10.0]
 wheel==0.29.0
+pycapella
+matplotlib==2.2.2