working version1.0

meteoDaniel · Jun 3, 2018 · 8738942 · 8738942
1 parent b9ea9eb
commit 8738942
Show file tree

Hide file tree

Showing 60 changed files with 437 additions and 297 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/insuranceDataProject.iml b/.idea/insuranceDataProject.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/data/probability_data/PALMA_DE_MALLORCA2018.p b/data/probability_data/PALMA_DE_MALLORCA2018.p
diff --git a/data/probability_data/PALMA_DE_MALLORCA_2018.p b/data/probability_data/PALMA_DE_MALLORCA_2018.p
diff --git a/data/report.html b/data/report.html
diff --git a/data/stations_list/stations_spain.csv b/data/stations_list/stations_spain.csv
diff --git a/data/stations_list/stations_spain.json b/data/stations_list/stations_spain.json
diff --git a/data/stationsliste_wind_daily.txt b/data/stationsliste_wind_daily.txt
diff --git a/data/stationsliste_wind_mean_hourly.txt b/data/stationsliste_wind_mean_hourly.txt
diff --git a/data/stationsliste_wind_vmax.txt b/data/stationsliste_wind_vmax.txt
diff --git a/data/wind_gutachten_plot.html b/data/wind_gutachten_plot.html
diff --git a/example_Report_dirty.zip b/example_Report_dirty.zip
diff --git a/pip-selfcheck.json b/pip-selfcheck.json
diff --git a/src/DataHandler/__init__.py b/src/DataHandler/__init__.py
diff --git a/src/DataHandler/aemetDataBaseConfig.py b/src/DataHandler/aemetDataBaseConfig.py
diff --git a/src/DataHandler/aemetDataHandler.py b/src/DataHandler/aemetDataHandler.py
diff --git a/src/DataHandler/dataServices.py b/src/DataHandler/dataServices.py
diff --git a/src/DataHandler/stationListHandler.py b/src/DataHandler/stationListHandler.py
diff --git a/src/Definitions/BeaufortScale.py b/src/Definitions/BeaufortScale.py
diff --git a/src/Definitions/__init__.py b/src/Definitions/__init__.py
diff --git a/src/Report/__init__.py b/src/Report/__init__.py
diff --git a/src/Report/reportServices.py b/src/Report/reportServices.py
diff --git a/src/RequestHandler/__init__.py b/src/RequestHandler/__init__.py
diff --git a/src/RequestHandler/requestHandler.py b/src/RequestHandler/requestHandler.py
@@ -3,8 +3,8 @@
 import datetime
 
 
-def prepare_data(destination: str, start_date: datetime.datetime,
-                 trip_duration: int, criterion_num_days: int, criterion_sunshine_day: int):
+def prepare_data(destination: str, arrival: datetime.datetime,
+                 trip_duration: int, criterion_num_days: int, criterion_sunshine_hours_per_day: int):
     """
 
     :param destination:
@@ -18,9 +18,9 @@ def prepare_data(destination: str, start_date: datetime.datetime,
         [1: <=1, 2:<=2, 3:<=3, 4:<=4, 5:<=5, 6:<=6]
     :return:
     """
-    path = '/home/d.lassahn/Schreibtisch/Wetterberatung/insuranceDataProject/data/probability_data/'
-    mean_days_lower_than = pd.read_pickle(path+destination + start_date.strftime('%Y') +'.p')
-    u = mean_days_lower_than.loc[start_date, trip_duration][0][str(criterion_sunshine_day)]
+    path = '../../data/probability_data/'
+    mean_days_lower_than = pd.read_pickle(path+destination + arrival.strftime('%Y') +'.p')
+    u = mean_days_lower_than.loc[arrival, trip_duration][0][str(criterion_sunshine_hours_per_day)]
     prob = poisson_probability(u, criterion_num_days) * 100
 
     return prob, u
diff --git a/src/RestAPI/__init__.py b/src/RestAPI/__init__.py
diff --git a/src/RestAPI/app.py b/src/RestAPI/app.py
@@ -1,31 +1,55 @@
-from flask import Flask, request
+from flask import Flask, request, jsonify
 from datetime import datetime
 from src.RequestHandler.requestHandler import prepare_data
-import json
+from config import VALID_API_KEYS
 app = Flask(__name__)
 
 
 @app.route('/')
 def hello_world():
     return 'Hello World!'
 
+
 @app.route('/request')
 def my_route():
-    try:
-        param = {
-            'destination': request.args.get('destination', default='PALMA_DE_MALLORCA', type=str),
-            'trip_duration': request.args.get('trip_duration', default=7, type=int),
-            'start_date': datetime.strptime(request.args['trip_start'], '%Y%m%d'),
-            'criterion_num_days': request.args.get('criterion_num_days', default=1, type=int),
-            'criterion_sunshine_day': request.args.get('criterion_sunshine_day', default=5, type=int)
-        }
-    except BaseException as e:
-        return json.dumps(e)
-
-    prob, u = prepare_data(**param)
-
-    return json.dumps({'Probability': prob.values[0],
-                      'Mean of Days criterion is True': u.values[0]})
+    if request.args.get('api_key', type=str) in VALID_API_KEYS:
+        print(request.args.get('trip_duration', type=int))
+        try:
+            param = {
+                'destination': request.args.get('destination', type=str),
+                'trip_duration': request.args.get('trip_duration', type=int),
+                'arrival': datetime.strptime(request.args.get('arrival', type=str), '%Y%m%d'),
+                'criterion_num_days': request.args.get('criterion_num_days', type=int),
+                'criterion_sunshine_hours_per_day': request.args.get('criterion_sunshine_hours_per_day', type=int)
+            }
+        except BaseException as e:
+            return jsonify(e)
+
+        prob, u = prepare_data(**param)
+
+        return jsonify({'result': {'probability': {'value': round(prob.values[0], 2),
+                                                      'unit': '%',
+                                                      'type': 'float'},
+                                      'Mean number of days where criterion is True in hist.Dataset': {'value': u.values[0],
+                                                                       'unit': 'days',
+                                                                       'type': 'float'}},
+                           'request': {'destination': {'value': param['destination'],
+                                                       'unit': 'None',
+                                                       'type': 'str'},
+                                       'trip_duration': {'value': param['trip_duration'],
+                                                         'unit': 'days',
+                                                         'type': 'int'},
+                                       'arrival': {'value': param['arrival'].strftime('%Y%m%d'),
+                                                   'unit': 'date',
+                                                   'type': 'datetime'},
+                                       'criterion_num_days': {'value': param['criterion_num_days'],
+                                                              'unit': 'days',
+                                                              'type': 'int'},
+                                       'criterion_sunshine_hours_per_day': {'value': param['criterion_sunshine_hours_per_day'],
+                                                                            'unit': 'hours',
+                                                                            'type': 'int'}}})
+    else:
+        return jsonify('Wrong Api-key, please contact: [email protected]')
 
 
 if __name__ == '__main__':

diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/.versions b/src/RestAPI/templates/Semantic-UI-CSS-master/.versions
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/LICENSE b/src/RestAPI/templates/Semantic-UI-CSS-master/LICENSE
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/README.md b/src/RestAPI/templates/Semantic-UI-CSS-master/README.md
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/colorize.js b/src/RestAPI/templates/Semantic-UI-CSS-master/components/colorize.js
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/colorize.min.js b/src/RestAPI/templates/Semantic-UI-CSS-master/components/colorize.min.js
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/container.css b/src/RestAPI/templates/Semantic-UI-CSS-master/components/container.css
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/container.min.css b/src/RestAPI/templates/Semantic-UI-CSS-master/components/container.min.css
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/embed.css b/src/RestAPI/templates/Semantic-UI-CSS-master/components/embed.css
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/embed.js b/src/RestAPI/templates/Semantic-UI-CSS-master/components/embed.js
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/embed.min.css b/src/RestAPI/templates/Semantic-UI-CSS-master/components/embed.min.css
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/embed.min.js b/src/RestAPI/templates/Semantic-UI-CSS-master/components/embed.min.js
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/visit.js b/src/RestAPI/templates/Semantic-UI-CSS-master/components/visit.js
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/components/visit.min.js b/src/RestAPI/templates/Semantic-UI-CSS-master/components/visit.min.js
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/npm-debug.log b/src/RestAPI/templates/Semantic-UI-CSS-master/npm-debug.log
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/package.js b/src/RestAPI/templates/Semantic-UI-CSS-master/package.js
diff --git a/src/RestAPI/templates/Semantic-UI-CSS-master/package.json b/src/RestAPI/templates/Semantic-UI-CSS-master/package.json
diff --git a/src/RestAPI/templates/insurance_request_dwd_report.html b/src/RestAPI/templates/insurance_request_dwd_report.html
diff --git a/src/Statistics/__init__.py b/src/Statistics/__init__.py
diff --git a/src/Statistics/statisticalCalculations.py b/src/Statistics/statisticalCalculations.py
diff --git a/src/ToolBox/__init__.py b/src/ToolBox/__init__.py
diff --git a/src/ToolBox/server_answer.json b/src/ToolBox/server_answer.json
diff --git a/src/ToolBox/testBed.py b/src/ToolBox/testBed.py
diff --git a/src/ToolBox/tools.py b/src/ToolBox/tools.py
diff --git a/src/__init__.py b/src/__init__.py
diff --git a/src/geo/__init__.py b/src/geo/__init__.py
diff --git a/src/geo/geoServices.py b/src/geo/geoServices.py
diff --git a/src/plot/__init__.py b/src/plot/__init__.py
diff --git a/src/plot/plotCreatorPlotly.py b/src/plot/plotCreatorPlotly.py
diff --git a/src/time/__init__.py b/src/time/__init__.py
diff --git a/src/time/timeHelper.py b/src/time/timeHelper.py