From 713084c33662a8c3947f1c4e22e3f5ecd20a31e7 Mon Sep 17 00:00:00 2001
From: Daniel Tomlinson <dtomlinson@panaetius.co.uk>
Date: Mon, 7 Oct 2019 01:55:10 +0100
Subject: [PATCH] applying black to scripts

---
 .../pullTrafficInfo.cpython-37.pyc            | Bin 4912 -> 4973 bytes
 .../traffic-scraper/dev/sendToSQS_old.py      |   6 +-
 .../pullTrafficInfo.cpython-37.pyc            | Bin 4975 -> 5036 bytes
 .../traffic-scraper/prd/receiveFromSQS.py     |  53 +++++++++++++-----
 slack-bot/traffic-scraper/prd/sendToSQS.py    |   2 +-
 5 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/slack-bot/__pycache__/pullTrafficInfo.cpython-37.pyc b/slack-bot/__pycache__/pullTrafficInfo.cpython-37.pyc
index 49036d280b132cd7fa83d8b8cd675bbe027e3e39..5a5c7db91318837f98d70dd8b3507701b9e381fb 100644
GIT binary patch
delta 137
zcmdm>_EwF{iI<m)0SM+6Z{!kZ4KLOYElw>e)=w$P&&|oqE6&f;_s>gpDatHMRnS!k
z&&<imOw3jA0MZKnMd^uonZ=1EnfZANKAE|hC8;U;zKO~D>6s<*MX3e(#rg%6B^mj7
mx?#SXtywcU*;05V8ETj}ui{(4#CU77w;(Sgqxs}Wq3Zw^pDjuN

delta 76
zcmaE>wn2@{iI<m)0SIn!ZsZbYl`_-M$j?pHPbtaI&B@Fw&d<{?D9X=DO)e?kT)~>j
f$yUQG$&kXk`8nSLCdR1E9fG`!jAoOk30(&ORk;^L

diff --git a/slack-bot/traffic-scraper/dev/sendToSQS_old.py b/slack-bot/traffic-scraper/dev/sendToSQS_old.py
index 0e8d505..c0e1e6f 100644
--- a/slack-bot/traffic-scraper/dev/sendToSQS_old.py
+++ b/slack-bot/traffic-scraper/dev/sendToSQS_old.py
@@ -26,7 +26,7 @@ inst = getTrafficInfo.getTrafficURL(motorway).findIncidents() \
 queueURL = 'https://sqs.eu-west-1.amazonaws.com/745437999005/slack-bot.fifo'
 
 # message = sqs.send_message(QueueUrl=queueURL,
-#                            MessageBody='string',
+#                            MessageBofdy='string',
 #                            MessageGroupId='slack-bot-motorway')
 
 # response = sqs.receive_message(QueueUrl=queueURL,
@@ -51,6 +51,10 @@ queueURL = 'https://sqs.eu-west-1.amazonaws.com/745437999005/slack-bot.fifo'
 #     # print(encoded.encode())
 #     # print(base64.b64decode(encoded.encode()).decode())
 
+queueAttributes = sqs\
+    .get_queue_attributes(QueueUrl=queueURL,
+                          AttributeNames=['ApproximateNumberOfMessages'])
+
 
 response = sqs.receive_message(QueueUrl=queueURL,
                                MaxNumberOfMessages=10)
diff --git a/slack-bot/traffic-scraper/prd/__pycache__/pullTrafficInfo.cpython-37.pyc b/slack-bot/traffic-scraper/prd/__pycache__/pullTrafficInfo.cpython-37.pyc
index c32afae98b206e7876e5f7963b7fcf32918bff34..57f734c568748a593b41e128cbdcd01e53649d61 100644
GIT binary patch
delta 112
zcmaE_wnm-HiI<m)0SHRVHgbuxhPUg77N-^!>!+0D=jLSQ73b&a`{$*)6lIpBD(EVN
zXXfN&Cgv)50BHsPqV&YP%;Ln7%=|nBpUm9MlGGG^-^677^vsg@qSS)?V*P^3l8pR3
M-7w$H)~qIc001W?=Kufz

delta 51
zcmZ3Z{$7pCiI<m)0SM|MH*$%yN_pvL<maa9r<CO9=49p-=jZ7c6y;~7CYKa%u3$Cc
F0|0QB55xcf

diff --git a/slack-bot/traffic-scraper/prd/receiveFromSQS.py b/slack-bot/traffic-scraper/prd/receiveFromSQS.py
index affa03a..9d9f582 100644
--- a/slack-bot/traffic-scraper/prd/receiveFromSQS.py
+++ b/slack-bot/traffic-scraper/prd/receiveFromSQS.py
@@ -4,6 +4,7 @@ import base64
 
 class receiveFromSQS(object):
     """docstring for receiveFromSQS"""
+
     def __init__(self, session, queueURL):
         super(receiveFromSQS, self).__init__()
         self.session = session
@@ -15,25 +16,47 @@ class receiveFromSQS(object):
         session = boto3.Session(profile_name=profileName)
         return cls(session, queueURL)
 
+    def getQueueLength(self):
+        attributeNames = ['ApproximateNumberOfMessages']
+        self.queueAttributes = self.sqs.get_queue_attributes(
+            QueueUrl=self.queueURL,
+            AttributeNames=attributeNames,
+        )
+        self.queueLength = int(
+            self.queueAttributes['Attributes'][
+                'ApproximateNumberOfMessages'
+            ]
+        )
+        return self.queueLength
+
     def _receiveSQSMessage(self, maxNumberOfMessages=10):
-        response = self.sqs\
-            .receive_message(QueueUrl=self.queueURL,
-                             MaxNumberOfMessages=maxNumberOfMessages)
+        response = self.sqs.receive_message(
+            QueueUrl=self.queueURL,
+            MaxNumberOfMessages=maxNumberOfMessages,
+        )
         return response
 
     def _extractMessageFromSQS(self):
         pass
 
-    def receiveMessage(self, b64=True, MaxNumberOfMessages=10, delete=False,
-                       endString='END'):
+    def receiveMessage(
+        self,
+        b64=True,
+        MaxNumberOfMessages=10,
+        delete=False,
+        endString='END',
+    ):
         while True:
-            response = self.sqs\
-                .receive_message(QueueUrl=self.queueURL,
-                                 MaxNumberOfMessages=MaxNumberOfMessages)
+            response = self.sqs.receive_message(
+                QueueUrl=self.queueURL,
+                MaxNumberOfMessages=MaxNumberOfMessages,
+            )
             if 'Messages' in response:
                 for message in response['Messages']:
                     if b64:
-                        decoded = base64.b64decode(message['Body'])
+                        decoded = base64.b64decode(
+                            message['Body']
+                        )
                         msg = decoded.decode()
                         print(msg)
                         if msg == endString:
@@ -46,12 +69,14 @@ class receiveFromSQS(object):
                 print('Queue is empty')
                 break
 
-    def receiveAllMessages(self, b64=True, delete=None):
+    def receiveAllMessages(self, b64=True, delete=False):
         while True:
             self.response = self._receiveSQSMessage()
 
 
-inst = receiveFromSQS.createSession(profileName='plex-aws',
-                                    queueURL='https://sqs.eu-west-1.amazonaws'
-                                    '.com/745437999005/slack-bot.fifo')
-inst.receiveMessage()
+inst = receiveFromSQS.createSession(
+    profileName='plex-aws',
+    queueURL='https://sqs.eu-west-1.amazonaws'
+    '.com/745437999005/slack-bot.fifo',
+)
+inst.getQueueLength()
diff --git a/slack-bot/traffic-scraper/prd/sendToSQS.py b/slack-bot/traffic-scraper/prd/sendToSQS.py
index 0ffab11..332c79e 100644
--- a/slack-bot/traffic-scraper/prd/sendToSQS.py
+++ b/slack-bot/traffic-scraper/prd/sendToSQS.py
@@ -47,4 +47,4 @@ instM = getTrafficInfo.getTrafficURL('M62').findIncidents() \
     .getIncidentInformation().generateOutput()
 
 for item in instM.output:
-    inst.sendMessage(message=item, messageGroupId='slack-bot-M62', dedup=True)
+    inst.sendMessage(message=item, messageGroupId='slack-bot-M62')