From ac366716ee47083ae74710019b655611691c33f8 Mon Sep 17 00:00:00 2001 From: Daniel Tomlinson Date: Fri, 11 Oct 2019 02:30:09 +0100 Subject: [PATCH] create test-run script --- .../prd/11-10-2019_01:47:12.json | 1 + .../prd/11-10-2019_01:47:23.json | 1 + .../prd/11-10-2019_01:47:27.json | 1 + .../prd/11-10-2019_01:47:35.json | 1 + .../traffic-scraper/prd/receiveFromSQS.py | 2 +- slack-bot/traffic-scraper/prd/sendToSQS.py | 16 ++++----- slack-bot/traffic-scraper/prd/test-run.py | 36 +++++++++++++++++++ 7 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 slack-bot/traffic-scraper/prd/11-10-2019_01:47:12.json create mode 100644 slack-bot/traffic-scraper/prd/11-10-2019_01:47:23.json create mode 100644 slack-bot/traffic-scraper/prd/11-10-2019_01:47:27.json create mode 100644 slack-bot/traffic-scraper/prd/11-10-2019_01:47:35.json create mode 100644 slack-bot/traffic-scraper/prd/test-run.py diff --git a/slack-bot/traffic-scraper/prd/11-10-2019_01:47:12.json b/slack-bot/traffic-scraper/prd/11-10-2019_01:47:12.json new file mode 100644 index 0000000..e137bdb --- /dev/null +++ b/slack-bot/traffic-scraper/prd/11-10-2019_01:47:12.json @@ -0,0 +1 @@ +["START", "Did someone say M62!? \ud83d\ude27 Let's check the latest updates from Highways England as of 01:47:03! \ud83d\ude93\ud83d\udea8", "There are currently no reported congestion incidents on the M62 \ud83e\udd14", "There are currently no reported accident incidents on the M62 \ud83e\udd14", "Don't fret, Andy can always work from home! \ud83c\udfe1", "END", "START", "Did someone say M62!? \ud83d\ude27 Let's check the latest updates from Highways England as of 01:47:03! \ud83d\ude93\ud83d\udea8", "There are currently no reported congestion incidents on the M62 \ud83e\udd14", "There are currently no reported accident incidents on the M62 \ud83e\udd14", "Don't fret, Andy can always work from home! \ud83c\udfe1", "END"] \ No newline at end of file diff --git a/slack-bot/traffic-scraper/prd/11-10-2019_01:47:23.json b/slack-bot/traffic-scraper/prd/11-10-2019_01:47:23.json new file mode 100644 index 0000000..5c9f81f --- /dev/null +++ b/slack-bot/traffic-scraper/prd/11-10-2019_01:47:23.json @@ -0,0 +1 @@ +["START"] \ No newline at end of file diff --git a/slack-bot/traffic-scraper/prd/11-10-2019_01:47:27.json b/slack-bot/traffic-scraper/prd/11-10-2019_01:47:27.json new file mode 100644 index 0000000..a3f8861 --- /dev/null +++ b/slack-bot/traffic-scraper/prd/11-10-2019_01:47:27.json @@ -0,0 +1 @@ +["Did someone say M62!? \ud83d\ude27 Let's check the latest updates from Highways England as of 01:47:03! \ud83d\ude93\ud83d\udea8"] \ No newline at end of file diff --git a/slack-bot/traffic-scraper/prd/11-10-2019_01:47:35.json b/slack-bot/traffic-scraper/prd/11-10-2019_01:47:35.json new file mode 100644 index 0000000..55ced93 --- /dev/null +++ b/slack-bot/traffic-scraper/prd/11-10-2019_01:47:35.json @@ -0,0 +1 @@ +["There are currently no reported congestion incidents on the M62 \ud83e\udd14", "There are currently no reported accident incidents on the M62 \ud83e\udd14", "Don't fret, Andy can always work from home! \ud83c\udfe1", "END"] \ No newline at end of file diff --git a/slack-bot/traffic-scraper/prd/receiveFromSQS.py b/slack-bot/traffic-scraper/prd/receiveFromSQS.py index d2f92b7..387856c 100644 --- a/slack-bot/traffic-scraper/prd/receiveFromSQS.py +++ b/slack-bot/traffic-scraper/prd/receiveFromSQS.py @@ -149,7 +149,7 @@ inst = receiveFromSQS.createSession( '.com/745437999005/slack-bot.fifo', ) -output = inst.receiveNMessages(numberOfMessages=6).generateOutput(type='json') +output = inst.receiveNMessages(numberOfMessages=4).generateOutput(type='json') inst.savetoDisk( '/Users/dtomlinson/OneDrive - William Hill' ' Organisation Limited/Mac/git_repos/python-VM/slack-bot/traffic-scraper' diff --git a/slack-bot/traffic-scraper/prd/sendToSQS.py b/slack-bot/traffic-scraper/prd/sendToSQS.py index 7bf1997..0a8eb8f 100644 --- a/slack-bot/traffic-scraper/prd/sendToSQS.py +++ b/slack-bot/traffic-scraper/prd/sendToSQS.py @@ -15,7 +15,7 @@ class sendToSQS(object): def __init__(self, session, queueURL): super(sendToSQS, self).__init__() self.session = session - self.sqs = session.client("sqs") + self.sqs = session.client('sqs') self.queueURL = queueURL @classmethod @@ -24,7 +24,7 @@ class sendToSQS(object): return cls(session, queueURL) def sendMessage(self, message, messageGroupId, b64=True, dedup=False): - currentTime = datetime.now().strftime("%H:%M:%S.%f") + currentTime = datetime.now().strftime('%H:%M:%S.%f') if b64: message = (base64.b64encode(message.encode())).decode() if not dedup: @@ -42,17 +42,17 @@ class sendToSQS(object): MessageGroupId=messageGroupId, ) if msg is not None: - print(msg["MessageId"]) + print(msg['MessageId']) inst = sendToSQS.createSession( - profileName="plex-aws", - queueURL="https://sqs.eu-west-1.amazonaws.com" - "/745437999005/slack-bot.fifo", + profileName='plex-aws', + queueURL='https://sqs.eu-west-1.amazonaws.com' + '/745437999005/slack-bot.fifo', ) instM = ( - getTrafficInfo.getTrafficURL("M62") + getTrafficInfo.getTrafficURL('M62') .findIncidents() .getIncidentInformation() .generateOutput() @@ -60,4 +60,4 @@ instM = ( for _ in range(0, 5): for item in instM.output: - inst.sendMessage(message=item, messageGroupId="slack-bot-M62") + inst.sendMessage(message=item, messageGroupId='slack-bot-M62') diff --git a/slack-bot/traffic-scraper/prd/test-run.py b/slack-bot/traffic-scraper/prd/test-run.py new file mode 100644 index 0000000..b38a7d3 --- /dev/null +++ b/slack-bot/traffic-scraper/prd/test-run.py @@ -0,0 +1,36 @@ +import os +import sys + +sys.path.append(os.getcwd()) +from getTrafficInfo import getTrafficInfo +from sendToSQS import sendToSQS +from receiveFromSQS import receiveFromSQS + +inst = ( + getTrafficInfo.getTrafficURL('M62') + .findIncidents() + .getIncidentInformation() + .generateOutput() +) + +instSend = sendToSQS.createSession( + profileName='plex-aws', + queueURL='https://sqs.eu-west-1.amazonaws.com' + '/745437999005/slack-bot.fifo', +) + +for item in instSend.output: + inst.sendMessage(message=item, messageGroupId='slack-bot-M62') + +instReceive = receiveFromSQS( + instSend.session, + queueURL='https://sqs.eu-west-1.amazonaws.com/745437999005' + '/slack-bot.fifo', +) + +output = instReceive.receiveNMessages(numberOfMessages=4).generateOutput( + type='json' +) +instReceive.savetoDisk( + f'{os.getcwd()}' +)