mirror of
https://github.com/alexhopeoconnor/SunGather.git
synced 2026-10-04 02:48:12 +10:00
Move JSON into Webserver, readonly config site
This commit is contained in:
bohdan-s
@@ -1,51 +0,0 @@
|
||||
from http.server import BaseHTTPRequestHandler, HTTPServer
|
||||
import json
|
||||
from threading import Thread
|
||||
from version import __version__
|
||||
|
||||
|
||||
import logging
|
||||
|
||||
class export_jsonserver(object):
|
||||
html_body = "Pending Data Retrieval"
|
||||
def __init__(self):
|
||||
False
|
||||
|
||||
# Configure Webserver
|
||||
def configure(self, config, inverter):
|
||||
try:
|
||||
self.webServer = HTTPServer(('', config.get('port',8082)), MyServer)
|
||||
self.t = Thread(target=self.webServer.serve_forever)
|
||||
self.t.daemon = True # Make it a deamon, so if main loop ends the webserver dies
|
||||
self.t.start()
|
||||
logging.info(f"JSON-Export: Configured")
|
||||
except Exception as err:
|
||||
logging.error(f"JSON-Export: Error: {err}")
|
||||
return False
|
||||
return True
|
||||
|
||||
def publish(self, inverter):
|
||||
json_cache={"registers":{}, "client_config":{}, "inverter_config":{}}
|
||||
|
||||
for register, value in inverter.latest_scrape.items():
|
||||
json_cache["registers"][str(inverter.getRegisterAddress(register))]={"register": str(register), "value":str(value), "unit": str(inverter.getRegisterUnit(register))}
|
||||
|
||||
# Client Config
|
||||
for setting, value in inverter.client_config.items():
|
||||
json_cache["client_config"][str(setting)]=str(value)
|
||||
|
||||
# Inverter Config
|
||||
for setting, value in inverter.inverter_config.items():
|
||||
json_cache["inverter_config"][str(setting)]=str(value)
|
||||
|
||||
export_jsonserver.html_body = json.dumps(json_cache)
|
||||
return True
|
||||
|
||||
class MyServer(BaseHTTPRequestHandler):
|
||||
def do_GET(self):
|
||||
self.send_response(200)
|
||||
self.send_header("Content-type", "application/json")
|
||||
self.end_headers()
|
||||
self.wfile.write(bytes(export_jsonserver.html_body, "utf-8"))
|
||||
def log_message(self, format, *args):
|
||||
pass
|
||||
@@ -1,9 +1,11 @@
|
||||
from http.server import BaseHTTPRequestHandler, HTTPServer
|
||||
from threading import Thread
|
||||
from version import __version__
|
||||
from urllib.parse import parse_qs, urlparse
|
||||
|
||||
|
||||
import json
|
||||
import logging
|
||||
import urllib
|
||||
|
||||
class export_webserver(object):
|
||||
html_body = "Pending Data Retrieval"
|
||||
@@ -22,36 +24,76 @@ class export_webserver(object):
|
||||
except Exception as err:
|
||||
logging.error(f"Webserver: Error: {err}")
|
||||
return False
|
||||
pending_config = False
|
||||
config_body = f"""
|
||||
<h3>SunGather v{__version__}</h3></p>
|
||||
<h4>Configuration changes require a restart to take effect!</h4>
|
||||
<form action="/config">
|
||||
<label>Inverter Settings:</label><br>
|
||||
<table><tr><th>Option</th><th>Setting</th><th>Update?</th></tr>
|
||||
"""
|
||||
for setting, value in inverter.client_config.items():
|
||||
config_body += f'<tr><td><label for="{str(setting)}">{str(setting)}:</label></td>'
|
||||
config_body += f'<td><input type="text" id="{str(setting)}" name="{str(setting)}" value="{str(value)}"></td>'
|
||||
config_body += f'<td><input type="checkbox" id="update_{str(setting)}" name="update_{str(setting)}" value="False"></td></tr>'
|
||||
for setting, value in inverter.inverter_config.items():
|
||||
config_body += f'<tr><td><label for="{str(setting)}">{str(setting)}:</label></td>'
|
||||
config_body += f'<td><input type="text" id="{str(setting)}" name="{str(setting)}" value="{str(value)}"></td>'
|
||||
config_body += f'<td><input type="checkbox" id="update_{str(setting)}" name="update_{str(setting)}" value="False"></td></tr>'
|
||||
#config_body += f'</table><input type="submit" value="Submit"></form>'
|
||||
config_body += f'</table>Currently ReadOnly, No save function yet :(</form>'
|
||||
export_webserver.config = config_body
|
||||
|
||||
return True
|
||||
|
||||
def publish(self, inverter):
|
||||
body = "<h3>SunGather v" + __version__ + "</h3></p>"
|
||||
body += "<h4>Need Help? <href a='https://github.com/bohdan-s/SunGather'>https://github.com/bohdan-s/SunGather</a></h4></p>"
|
||||
body += "<h4>NEW HomeAssistant Add-on: <href a='https://github.com/bohdan-s/hassio-repository'>https://github.com/bohdan-s/SunGather</a></h4></p>"
|
||||
body += "<table><th>Address</th><tr><th>Register</th><th>Value</th></tr>"
|
||||
metrics = ""
|
||||
json_array={"registers":{}, "client_config":{}, "inverter_config":{}}
|
||||
metrics_body = ""
|
||||
main_body = f"""
|
||||
<h3>SunGather v{__version__}</h3></p>
|
||||
<h4>Need Help? <href a='https://github.com/bohdan-s/SunGather'>https://github.com/bohdan-s/SunGather</a></h4></p>
|
||||
<h4>NEW HomeAssistant Add-on: <href a='https://github.com/bohdan-s/hassio-repository'>https://github.com/bohdan-s/SunGather</a></h4></p>
|
||||
"""
|
||||
main_body += "<table><th>Address</th><tr><th>Register</th><th>Value</th></tr>"
|
||||
for register, value in inverter.latest_scrape.items():
|
||||
body += f"<tr><td>{str(inverter.getRegisterAddress(register))}</td><td>{str(register)}</td><td>{str(value)} {str(inverter.getRegisterUnit(register))}</td></tr>"
|
||||
metrics += f"{str(register)}{{address=\"{str(inverter.getRegisterAddress(register))}\", unit=\"{str(inverter.getRegisterUnit(register))}\"}} {str(value)}\n"
|
||||
export_webserver.html_body = body + f"</table><p>Total {len(inverter.latest_scrape)} registers"
|
||||
export_webserver.metrics = metrics
|
||||
main_body += f"<tr><td>{str(inverter.getRegisterAddress(register))}</td><td>{str(register)}</td><td>{str(value)} {str(inverter.getRegisterUnit(register))}</td></tr>"
|
||||
metrics_body += f"{str(register)}{{address=\"{str(inverter.getRegisterAddress(register))}\", unit=\"{str(inverter.getRegisterUnit(register))}\"}} {str(value)}\n"
|
||||
json_array["registers"][str(inverter.getRegisterAddress(register))]={"register": str(register), "value":str(value), "unit": str(inverter.getRegisterUnit(register))}
|
||||
main_body += f"</table><p>Total {len(inverter.latest_scrape)} registers"
|
||||
|
||||
body = "</p></p><table><tr><th>Configuration</th><th>Value</th></tr>"
|
||||
main_body += "</p></p><table><tr><th>Configuration</th><th>Value</th></tr>"
|
||||
for setting, value in inverter.client_config.items():
|
||||
body = body + f"<tr><td>{str(setting)}</td><td>{str(value)}</td></tr>"
|
||||
main_body += f"<tr><td>{str(setting)}</td><td>{str(value)}</td></tr>"
|
||||
json_array["client_config"][str(setting)]=str(value)
|
||||
for setting, value in inverter.inverter_config.items():
|
||||
body = body + f"<tr><td>{str(setting)}</td><td>{str(value)}</td></tr>"
|
||||
export_webserver.html_body = export_webserver.html_body + body + f"</table></p>"
|
||||
main_body += f"<tr><td>{str(setting)}</td><td>{str(value)}</td></tr>"
|
||||
json_array["inverter_config"][str(setting)]=str(value)
|
||||
main_body += f"</table></p>"
|
||||
|
||||
export_webserver.main = main_body
|
||||
export_webserver.metrics = metrics_body
|
||||
export_webserver.json = json.dumps(json_array)
|
||||
return True
|
||||
|
||||
class MyServer(BaseHTTPRequestHandler):
|
||||
def do_GET(self):
|
||||
if self.path == '/metrics':
|
||||
if self.path.startswith('/metrics'):
|
||||
self.send_response(200)
|
||||
self.send_header("Content-type", "text/plain")
|
||||
self.end_headers()
|
||||
self.wfile.write(bytes(export_webserver.metrics, "utf-8"))
|
||||
elif self.path.startswith('/config'):
|
||||
self.send_response(200)
|
||||
self.send_header("Content-type", "text/html")
|
||||
self.end_headers()
|
||||
self.wfile.write(bytes(export_webserver.config, "utf-8"))
|
||||
parsed_data = parse_qs(urlparse(self.path).query)
|
||||
logging.info(f"{parsed_data}")
|
||||
elif self.path.startswith('/json'):
|
||||
self.send_response(200)
|
||||
self.send_header("Content-type", "application/json")
|
||||
self.end_headers()
|
||||
self.wfile.write(bytes(export_webserver.json, "utf-8"))
|
||||
else:
|
||||
self.send_response(200)
|
||||
self.send_header("Content-type", "text/html")
|
||||
@@ -61,10 +103,15 @@ class MyServer(BaseHTTPRequestHandler):
|
||||
self.wfile.write(bytes('<style media = "all"> body { background-color: black; color: white; } @media screen and (prefers-color-scheme: light) { body { background-color: white; color: black; } } </style>', "utf-8"))
|
||||
self.wfile.write(bytes("</head>", "utf-8"))
|
||||
self.wfile.write(bytes("<body>", "utf-8"))
|
||||
self.wfile.write(bytes(export_webserver.html_body, "utf-8"))
|
||||
self.wfile.write(bytes(export_webserver.main, "utf-8"))
|
||||
self.wfile.write(bytes("</table>", "utf-8"))
|
||||
self.wfile.write(bytes("</body></html>", "utf-8"))
|
||||
|
||||
def do_POST(self):
|
||||
length = int(self.headers['Content-Length'])
|
||||
post_data = urllib.parse.parse_qs(self.rfile.read(length).decode('utf-8'))
|
||||
logging.info(f"{post_data}")
|
||||
self.wfile.write(post_data.encode("utf-8"))
|
||||
|
||||
def log_message(self, format, *args):
|
||||
pass
|
||||
|
||||
Reference in New Issue
Block a user