From fa44651cad2d693893155ce7d8a0866f451b49bf Mon Sep 17 00:00:00 2001
From: David HERNANDEZ <davidusb@gmail.com>
Date: Thu, 21 Apr 2022 22:54:17 +0200
Subject: [PATCH] Fix - Solving issues with correct returns

---
 emhass/CHANGELOG.md     |  9 ++++++++-
 emhass/app_server.py    | 10 ++++------
 emhass/config.yml       |  2 +-
 emhass/requirements.txt |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/emhass/CHANGELOG.md b/emhass/CHANGELOG.md
index 67a763d..55add07 100644
--- a/emhass/CHANGELOG.md
+++ b/emhass/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.27] - 2022-04-21
+### Fix
+- Fixing flask redirects and correct response returns.
+- Updated to new emhass version using now pandas get_indexer method.
+
 ## [0.1.26] - 2022-04-21
 ### Fix
 - Fixed missing imports in flask app.
@@ -71,4 +76,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [0.1.22]: https://github.com/davidusb-geek/emhass-add-on/releases/tag/v0.1.22
 [0.1.23]: https://github.com/davidusb-geek/emhass-add-on/releases/tag/v0.1.23
 [0.1.24]: https://github.com/davidusb-geek/emhass-add-on/releases/tag/v0.1.24
-[0.1.25]: https://github.com/davidusb-geek/emhass-add-on/releases/tag/v0.1.25
\ No newline at end of file
+[0.1.25]: https://github.com/davidusb-geek/emhass-add-on/releases/tag/v0.1.25
+[0.1.26]: https://github.com/davidusb-geek/emhass-add-on/releases/tag/v0.1.26
+[0.1.27]: https://github.com/davidusb-geek/emhass-add-on/releases/tag/v0.1.27
\ No newline at end of file
diff --git a/emhass/app_server.py b/emhass/app_server.py
index dd17955..eac0f68 100644
--- a/emhass/app_server.py
+++ b/emhass/app_server.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from flask import Flask, make_response, render_template, request, redirect, url_for
+from flask import Flask, make_response, request, redirect, url_for
 from flask_caching import Cache
 from jinja2 import Environment, FileSystemLoader
 from requests import get
@@ -68,7 +68,7 @@ def get_forecast_dates(freq, delta_forecast, timedelta_days = 0):
     with options_json.open('r') as data:
         options = json.load(data)
 else:
-    app.logger.error("ERROR: options.json does not exists")
+    app.logger.error("options.json does not exists")
 
 # Read example config file
 if config_path.exists():
@@ -78,7 +78,7 @@ def get_forecast_dates(freq, delta_forecast, timedelta_days = 0):
     optim_conf = config['optim_conf']
     plant_conf = config['plant_conf']
 else:
-    app.logger.error("ERROR: config_emhass.json does not exists")
+    app.logger.error("config_emhass.json does not exists")
 
 params = {}
 params['retrieve_hass_conf'] = retrieve_hass_conf
@@ -102,7 +102,7 @@ def get_forecast_dates(freq, delta_forecast, timedelta_days = 0):
 def index():
     app.logger.info("EMHASS server online, serving index.html...")
     source_html = cache.get("source_html")
-    return source_html
+    return make_response(source_html)
 
 @app.route('/action/<name>', methods=['POST'])
 def action_call(name):
@@ -155,8 +155,6 @@ def action_call(name):
     else:
         app.logger.error("ERROR: passed action is not valid")
         return redirect(url_for(".index"))
-    msg = f'EMHASS >> Action {name} received... \n'
-    return make_response(msg, 201)
 
 def main():
     # Parsing arguments
diff --git a/emhass/config.yml b/emhass/config.yml
index 0fa0551..5dc0c3a 100644
--- a/emhass/config.yml
+++ b/emhass/config.yml
@@ -1,7 +1,7 @@
 name: EMHASS
 description: Energy Management for Home Assistant
 url: https://github.com/davidusb-geek/emhass
-version: 0.1.26
+version: 0.1.27
 slug: emhass
 arch:
   - aarch64
diff --git a/emhass/requirements.txt b/emhass/requirements.txt
index 6a59085..ecf47db 100644
--- a/emhass/requirements.txt
+++ b/emhass/requirements.txt
@@ -13,5 +13,5 @@ tables>=3.6.1
 flask>=2.0.3
 Flask-Caching>=1.10.1
 plotly>=5.6.0
-emhass==0.2.8
+emhass==0.2.9
 #git+https://github.com/davidusb-geek/emhass.git@0f67c27
\ No newline at end of file