Code/dependency cleanup

Author: AllenAnthes

Pipfile

@@ -15,7 +15,6 @@ cchardet = "*"
 zipcodes = "*"
 
 [dev-packages]
-requests = "*"
 pytest = "*"
 pytest-mock = "*"
 pytest-asyncio = "*"

Pipfile.lock

@@ -1,14 +1,14 @@
 import os
 import yaml
 import logging.config
-from aiohttp.web_response import Response
 from raven.conf import setup_logging
 from raven.handlers.logging import SentryHandler
 from raven.processors import SanitizePasswordsProcessor
 from sirbot.plugins.slack import SlackPlugin
 from sirbot import SirBot
 import raven
 
+from pybot.endpoints import handle_health_check
 from . import endpoints
 from .plugins import AirtablePlugin
 from pybot.endpoints.slack.utils import PORT, HOST
@@ -34,7 +34,9 @@ def make_sentry_logger():
         with open(
             os.path.join(os.path.dirname(os.path.realpath(__file__)), "../logging.yml")
         ) as log_configfile:
-            logging.config.dictConfig(yaml.load(log_configfile.read()))
+            logging.config.dictConfig(
+                yaml.load(log_configfile.read(), Loader=yaml.SafeLoader)
+            )
     except Exception as e:
         logging.basicConfig(level=logging.DEBUG)
         logger.exception(e)
@@ -53,7 +55,7 @@ def make_sentry_logger():
     bot.load_plugin(airtable)
 
     # Add route to respond to AWS health check
-    bot.router.add_get("/health", lambda request: Response(status=200))
+    bot.router.add_get("/health", handle_health_check)
     logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
 
     bot.start(host=HOST, port=PORT, print=logger.info)

pybot/__main__.py

@@ -1 +1,7 @@
+from aiohttp.web_response import Response
+
 from . import slack, airtable
+
+
+async def handle_health_check(request):
+    return Response(status=200)

pybot/endpoints/__init__.py

@@ -65,7 +65,7 @@ def mentor_request_attachments(services, mentors, skillsets):
                     "text": "Specific Mentor",
                     "name": "mentor",
                     "options": [
-                        *[{"text": mentor, "value": mentor} for mentor in mentors],
+                        {"text": mentor, "value": mentor} for mentor in mentors
                     ],
                 },
                 {

pybot/endpoints/slack/message_templates/commands.py

@@ -1,3 +1,4 @@
+import functools
 import logging
 from collections import defaultdict
 
@@ -99,7 +100,7 @@ async def find_mentors_with_matching_skillsets(self, skillsets):
 
         return complete_match or partial_match
 
-    async def find_records(self, table_name, field, value: str) -> list:
+    async def find_records(self, table_name: str, field: str, value: str) -> list:
         url = self.table_url(table_name)
 
         params = {"filterByFormula": f"FIND(LOWER('{value}'), LOWER({{{field}}}))"}
@@ -109,7 +110,7 @@ async def find_records(self, table_name, field, value: str) -> list:
             return response["records"]
         except Exception as ex:
             logger.exception(
-                "Exception when attempting to get mentor id from slack email.", ex
+                f"Exception when attempting to get {field} from {table_name}.", ex
             )
             return []