From 2a36eaf00f238dde6b0a9c67311b024920c2652e Mon Sep 17 00:00:00 2001 From: Patrice Date: Sat, 6 Jul 2019 18:02:00 +0200 Subject: [PATCH] cleanup --- docker-nginx-reverse-proxy-ssl/Dockerfile | 17 ---------- reader/Dockerfile | 1 + reader/__pycache__/util.cpython-35.pyc | Bin 591 -> 752 bytes reader/app.py | 31 +++++++++++-------- reader/sentiment.py | 36 ---------------------- reader/util.py | 6 ++-- 6 files changed, 23 insertions(+), 68 deletions(-) delete mode 100644 docker-nginx-reverse-proxy-ssl/Dockerfile delete mode 100644 reader/sentiment.py diff --git a/docker-nginx-reverse-proxy-ssl/Dockerfile b/docker-nginx-reverse-proxy-ssl/Dockerfile deleted file mode 100644 index 631b81f..0000000 --- a/docker-nginx-reverse-proxy-ssl/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM nginx:1.7 - -# Copy in conf files -COPY nginx.conf /etc/nginx/nginx.conf -COPY mime.types /etc/nginx/mime.types -COPY ssl.conf /etc/nginx/ -COPY site.conf /etc/nginx/sites-enabled/ - -# COPY in certs -COPY ssl.crt /etc/nginx/ssl.crt -COPY ssl.key /etc/nginx/ssl.key - -# Expose both the HTTP (80) and HTTPS (443) ports -EXPOSE 80 443 - -CMD ["nginx"] - diff --git a/reader/Dockerfile b/reader/Dockerfile index 928e4db..2b17b1d 100644 --- a/reader/Dockerfile +++ b/reader/Dockerfile @@ -13,4 +13,5 @@ COPY ./ /app RUN python /app/nltkDown.py WORKDIR /app EXPOSE 5000 + CMD ["gunicorn", "-b", "0.0.0.0:5000", "app"] \ No newline at end of file diff --git a/reader/__pycache__/util.cpython-35.pyc b/reader/__pycache__/util.cpython-35.pyc index d26c0cce042eff8426a3d1941129df26551b3e71..a862eb64e90c1ec9e3e9f2e68e9dd5f67ea16f7e 100644 GIT binary patch delta 278 zcmX@l@`068oR^m?YnMXojES6O&ddzKnk-e8L8&FBMR~;vAw{LB3i(9}ZizX?sR~Jn z#i=O@`FRTEsU;byMG8Pdp)9c|GchSARUx$^v$&)<#LaJFdoni@0|P@b8<1dNn)uZt z7-Fg?8K!0=7K5!xttd!ME&n#_J7ZW9kBb2BqAFch-^2?oZ=289;vIDr~dK$;mRXET{_3nIy`VzT4~8^r len(links): return question("Dieser Artikel existiert leider nicht, versuchen Sie eine andere Nummer.") + art = obj.read_headlines(links[int(number)-1]) + response = "" for element in art: response += element @@ -132,7 +130,7 @@ def search_answer(number): session.attributes["lastCall"] = "search2" return question(response) - +# https://github.com/markuskiller/textblob-de @ask.intent('Senti', mapping={'number': 'Nummer'}, default={'number': 1}) def get_sentiment(number): site = util.get_session_value(session.attributes, "siteName") @@ -172,11 +170,16 @@ def get_sentiment(number): sent = newText.sentiment[0] if sent < 0: - good = "shit" + good = "eher negativ" else: - good = "nice" + good = "positiv" - return question(good) + return question("Das Sentiment ist " + good) + + +### ### +# DEFUALT # +### ### @ask.intent('AMAZON.HelpIntent') def help(): @@ -195,6 +198,10 @@ def launch(): def session_ended(): return "{}", 200 +### ### +# INIT # +### ### + if __name__ == '__main__': if 'ASK_VERIFY_REQUESTS' in os.environ: @@ -202,4 +209,4 @@ if __name__ == '__main__': if verify == 'false': application.config['ASK_VERIFY_REQUESTS'] = False - application.run(host='127.0.0.1',port=80) + application.run(host='0.0.0.0',port=80) diff --git a/reader/sentiment.py b/reader/sentiment.py deleted file mode 100644 index a5368e9..0000000 --- a/reader/sentiment.py +++ /dev/null @@ -1,36 +0,0 @@ -# http://www.ulliwaltinger.de/sentiment/ -# https://github.com/solariz/german_stopwords -#!/usr/bin/env python -# https://github.com/markuskiller/textblob-de -# -*- coding: utf-8 -*- -import nltk -import copy -import encodings -import csv -from siteobj import * -from nltk.corpus import treebank -from textblob_de import TextBlobDE as TextBlob - - -def get_sentiment(url): - NewsText = obj.read_article(url) - - newText = "" - for text in NewsText: - newText += text - - newText = TextBlob(newText) - - sent = newText.sentiment[0] - if sent < 0: - good = "shit" - else: - good = "nice" - print(good, newText.sentiment,"\n", link.split("/")[-1], "\n") - return good - -obj = Golem() -news, links = obj.get_news() - -for link in links: - get_sentiment(link) diff --git a/reader/util.py b/reader/util.py index 944e3c2..f507499 100644 --- a/reader/util.py +++ b/reader/util.py @@ -1,20 +1,20 @@ - def check_session_for(sessionAttributes, key): + """Returns True or False based on wether the variable exists""" if key in sessionAttributes: return True else: return False -# returns value to key in session if set -# returns None if not def session_value_is(sessionAttributes, key, value): + """Returns True or False based on wether the variable has the expected Value""" if key in sessionAttributes and sessionAttributes[key] == value: return True else: return False def get_session_value(sessionAttributes, key): + """Returns the Value or None""" if key in sessionAttributes: return sessionAttributes[key] else: