diff --git a/src/utils/sentimentAnalyser.py b/src/utils/sentimentAnalyser.py index 12df199..44b7a57 100644 --- a/src/utils/sentimentAnalyser.py +++ b/src/utils/sentimentAnalyser.py @@ -10,10 +10,13 @@ class keys(): self.sentiment_analyser_uri = os.getenv("SENTIMENT_URL") def callSentimentAnalyser(tweet, syncId): - # log("Calling Sentiment Analyser for [{}]".format(tweet), 'INFO') + headers = { + "content-type":"text", + "X-CRYPTO-Sync-ID" : str(syncId) + } try: uri = keys().sentiment_analyser_uri + "/sentiment?tweet="+tweet - response = requests.get(uri, headers={"X-CRYPTO-Sync-ID" : syncId}) + response = requests.request("GET", url=uri, headers=headers) response = json.loads(response.text) @@ -21,5 +24,5 @@ def callSentimentAnalyser(tweet, syncId): return scores["pos"], scores["neu"], scores["neg"], scores["compound"] except: - log("Could not call Sentiment Analyser Service", 'ERR') + log("Could not call Sentiment Analyser Service with syncId of [{}]".format(syncId), 'ERR', syncId) return 0, 0, 0, 0 \ No newline at end of file diff --git a/src/utils/spamFilter.py b/src/utils/spamFilter.py index e06cafd..a24e33d 100644 --- a/src/utils/spamFilter.py +++ b/src/utils/spamFilter.py @@ -10,15 +10,17 @@ class keys(): self.spamFilter_uri = os.getenv("FILTER_URL") def callSpamFilter(tweet, syncId): + headers = { + "content-type":"text", + "X-CRYPTO-Sync-ID" : str(syncId) + } try: uri = keys().spamFilter_uri + "/predict?tweet="+tweet - response = requests.get(uri, headers={"X-CRYPTO-Sync-ID" : syncId}) + response = requests.request("GET", url=uri, headers=headers) response = json.loads(response.text) - # log("Spam Filter result for [{}] is [{}]".format(tweet, response["result"]), 'INFO') - return response["result"] except: - log("Could not call spam filter service", 'ERR') + log("Could not call spam filter service with syncId of [{}]".format(syncId), 'ERR', syncId) return "" \ No newline at end of file