Improvements in user_img including timeouts for bing responses, throt…

…tling

modules/user_img.py

@@ -1,6 +1,8 @@
 import json
 import base64
 import requests
+from datetime import datetime, timedelta
+from requests.exceptions import RequestException
 
 from modules.utils.data import prepare_binary_from_url
 
@@ -10,6 +12,11 @@ def check_store(bot, url):
         return bot.store.get(url)
 
 
+def response(bot, message):
+    bot.img_last_time = datetime.now()
+    return message
+
+
 def main(bot, *args):
     """
     img [query]
@@ -18,48 +25,55 @@ def main(bot, *args):
     See also: g
     """
 
+    global response
+
     query = ' '.join(args)
     last_query = getattr(bot, 'img_last_query', None)
     i = 0
 
+    last_time = getattr(bot, 'img_last_time', None)
+    if last_time and last_time > datetime.now() - timedelta(seconds=3):
+        return 
+
     if last_query == query or (not args and last_query):
         if not args:
             query = last_query
         i = bot.img_last_num + 1
     elif not args:
-        return 'Invalid syntax, read `/man img`'
+        return response(bot, 'Invalid syntax, read `/man img`')
 
     bot.img_last_query = query
 
     key = getattr(bot.settings, 'azure_bing_api_key', None)
     if not key:
-        return 'Azure Bing API Key is not specified in settings'
+        return response(bot, 'Azure Bing API Key is not specified in settings')
     auth = base64.b64encode(bytes('{0}:{0}'.format(key), 'utf-8'))
     headers = {'Authorization': 'Basic {}'.format(auth.decode('utf-8'))}
 
-    # Send custom chat action
-    bot.pre_send(action='upload_photo')
-
-    # Cache response to decrease number of requests to the bing api
+    # Cache return response to decrease number of requests to the bing api
     if last_query != query:
         # TODO: use `params` here, investigate 'Query is not of type String' error from azure
         try:
-            response = requests.get('https://api.datamarket.azure.com/Bing/Search/v1/Image?Market=%27ru-RU%27&Adult=%27Moderate%27&Query=%27{}%27&$format=json&$top=20'.format(query), headers=headers, timeout=4).content
+            azure_response = requests.get('https://api.datamarket.azure.com/Bing/Search/v1/Image?Market=%27ru-RU%27&Adult=%27Moderate%27&Query=%27{}%27&$format=json&$top=20'.format(query), headers=headers, timeout=(1, 2)).content
         except requests.exceptions.Timeout:
-            return 'Can not get results'
-        bot.img_last_response = response
+            return response(bot, 'Can not get results')
+        except RequestException:
+            return response(bot, 'Can not get results')
+        bot.img_last_response = azure_response
     else:
-        response = bot.img_last_response
+        azure_response = bot.img_last_response
 
     try:
-        search_data = json.loads(response.decode('utf-8'))
+        search_data = json.loads(azure_response.decode('utf-8'))
     except ValueError:
-        return 'Can not get results'
+        return response(bot, 'Can not get results')
 
     results = search_data.get('d', {}).get('results', [])
     if len(results) >= i + 1:
         while results[i - 1 if i > 1 else i:]:
             bot.img_last_num = i
+            if len(results) <= i:
+                return response(bot, 'No such images')
             url = results[i]['MediaUrl']
             ext = url.rsplit('.', 1)[1]
             if ext.lower() in ('jpg', 'jpeg', 'gif', 'png'):
@@ -69,7 +83,7 @@ def main(bot, *args):
                     break
             i += 1
         else:
-            return 'No such images'
+            return response(bot, 'No such images')
 
         data = {'chat_id': bot.chat_id}
         if file_id:
@@ -78,15 +92,21 @@ def main(bot, *args):
         else:
             files = {'photo': ('file.{}'.format(ext), photo, results[i]['ContentType'])}
 
-        response = bot.call(
+        # Send custom chat action
+        bot.pre_send(action='upload_photo')
+
+        telegram_response = bot.call(
             'sendPhoto',
             'POST',
             data=data,
             files=files
         )
-        if response and response.get('photo') and not file_id and bot.store:
-            bot.store.set(url, response['photo'][-1]['file_id'])
+        bot.img_last_time = datetime.now()
+        if telegram_response and telegram_response.get('photo') and not file_id and bot.store:
+            bot.store.set(url, telegram_response['photo'][-1]['file_id'])
+        elif not telegram_response or telegram_response.get('status_code') == 400:
+            return "Telegram can't process the image"
     else:
-        return 'No such images'
+        return response(bot, 'No such images')
 
 main.prevent_pre_send = True