Merge pull request #9 from GRIDAPPSD/der-updates

Der updates

Author: craig8

README.md

@@ -0,0 +1,44 @@
+from dataclasses import fields
+
+from nicegui import ui
+from session import backend_session, endpoint
+
+import ieee_2030_5.models as m
+
+columns = [
+    {'name': 'property', 'label': 'Property', 'field': 'property', 'required': False},
+    {'value': 'value', 'label': 'Value', 'field': 'property', 'required': False},
+]
+
+def show_end_device(enddevice: m.EndDevice):
+    ui.label(enddevice.href)
+
+def show_list(enddevices: m.EndDeviceList):
+    if len(enddevices.EndDevice) == 0:
+        ui.label(f"No EndDevice in list. all={enddevices.all}, results={enddevices.results}")
+    else:
+        
+        for ed in enddevices.EndDevice:
+            for fld in fields(ed):
+                with ui.row():
+                    value = getattr(ed, fld.name)
+                    if value and fld.type in ('Optional[str]', 'str'):
+                        if isinstance(value, str):
+                            ui.label(f"{fld.name}, {value}, {fld.type}")    
+                        else:
+                            ui.label(f"{fld.name}, {value.decode('utf-8')}, {fld.type}")
+                    # value = getattr(ed, fld.name)
+                    # if value and value.decode('utf-8'):
+                    #     ui.label(f"{fld.name} => {value.decode('utf-8')}")
+
+       
+def add_end_device():
+    
+    def submit_end_device(id, pin):
+        ui.label(f"Posted {id} and {pin}")
+    
+    with ui.column():
+        
+        id = ui.input(label="Id")
+        pin = ui.input(label="Pin")
+        ui.button("Save", on_click=lambda a: submit_end_device(id.value, pin.value))

gui/enddevices.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+
+from enddevices import add_end_device, show_list
+from nicegui import ui
+from router import Router
+
+from ieee_2030_5.utils import xml_to_dataclass
+
+router = Router()
+
+from session import backend_session, endpoint
+
+
+@router.add('/')
+async def show_one():
+    ui.label('Content One').classes('text-2xl')
+
+@router.add('/end-devices')
+async def show_end_devices():
+    # resp = requests.get("https://127.0.0.1:7443/admin/enddevices", 
+    #                     cert=('/home/os2004/tls/certs/admin.pem', '/home/os2004/tls/private/admin.pem'),
+    #                     verify="/home/os2004/tls/certs/ca.pem")
+    resp = backend_session.get(endpoint("enddevices"))
+    enddevices = xml_to_dataclass(resp.text)
+    show_list(enddevices)
+    
+@router.add('/end-devices/add')
+async def add_enddevice():
+    # resp = requests.get("https://127.0.0.1:7443/admin/enddevices", 
+    #                     cert=('/home/os2004/tls/certs/admin.pem', '/home/os2004/tls/private/admin.pem'),
+    #                     verify="/home/os2004/tls/certs/ca.pem")
+    #enddevices = xml_to_dataclass(resp.text)
+    #show_list(enddevices)
+    add_end_device()
+    
+    
+
+
+@router.add('/two')
+async def show_two():
+    ui.label('Content Two').classes('text-2xl')
+
+
+@router.add('/three')
+async def show_three():
+    ui.label('Content Three').classes('text-2xl')
+
+
+@ui.page('/')  # normal index page (eg. the entry point of the app)
+@ui.page('/{_:path}')  # all other pages will be handled by the router but must be registered to also show the SPA index page
+async def main():
+    
+    with ui.header(elevated=True).style('background-color: #3874c8').classes('items-center justify-between'):
+        ui.label('HEADER')
+
+    with ui.left_drawer(top_corner=True, bottom_corner=True).style('background-color: #d7e3f4'):
+        with ui.column():
+            ui.button("End Devices", on_click=lambda: router.open(show_end_devices)).classes('w-64')
+            ui.button("Add End Device", on_click=lambda: router.open(add_enddevice)).classes('w-64')
+            ui.button('One', on_click=lambda: router.open(show_one)).classes('w-64')
+            ui.button('Two', on_click=lambda: router.open(show_two)).classes('w-64')
+            ui.button('Three', on_click=lambda: router.open(show_three)).classes('w-64')
+    
+    with ui.footer().style('background-color: #3874c8'):
+        ui.label('FOOTER')
+    
+        
+
+    
+    # this places the content which should be displayed
+    router.frame().classes('w-full p-4 bg-gray-100')
+
+ui.run()

gui/main.py

@@ -0,0 +1,40 @@
+from typing import Awaitable, Callable, Dict, Union
+
+from nicegui import background_tasks, ui
+from nicegui.dependencies import register_component
+
+register_component('router_frame', __file__, 'router_frame.js')
+
+
+class Router():
+
+    def __init__(self) -> None:
+        self.routes: Dict[str, Callable] = {}
+        self.content: ui.element = None
+
+    def add(self, path: str):
+        def decorator(func: Callable):
+            self.routes[path] = func
+            return func
+        return decorator
+
+    def open(self, target: Union[Callable, str]):
+        if isinstance(target, str):
+            path = target
+            builder = self.routes[target]
+        else:
+            path = {v: k for k, v in self.routes.items()}[target]
+            builder = target
+
+        async def build():
+            with self.content:
+                await ui.run_javascript(f'history.pushState({{page: "{path}"}}, "", "{path}")', respond=False)
+                result = builder()
+                if isinstance(result, Awaitable):
+                    await result
+        self.content.clear()
+        background_tasks.create(build())
+
+    def frame(self) -> ui.element:
+        self.content = ui.element('router_frame').on('open', lambda msg: self.open(msg['args']))
+        return self.content

gui/router.py

@@ -0,0 +1,16 @@
+export default {
+    template: "<div><slot></slot></div>",
+    mounted() {
+        window.addEventListener("popstate", (event) => {
+            if (event.state?.page) {
+                this.$emit("open", event.state.page);
+            }
+        });
+        const connectInterval = setInterval(async () => {
+            if (window.socket.id === undefined) return;
+            this.$emit("open", window.location.pathname);
+            clearInterval(connectInterval);
+        }, 10);
+    },
+    props: {},
+};

gui/router_frame.js

@@ -0,0 +1,10 @@
+import requests
+
+backend_session = requests.Session()
+
+backend_session.cert = ('/home/os2004/tls/certs/admin.pem', '/home/os2004/tls/private/admin.pem')
+backend_session.verify = "/home/os2004/tls/certs/ca.pem"
+
+def endpoint(endpoint: str) -> str:
+    base_url = "https://127.0.0.1:7443/admin"
+    return f"{base_url}/{endpoint}"

gui/session.py

@@ -44,6 +44,7 @@
 import sys
 import threading
 from argparse import ArgumentParser
+from multiprocessing import Process
 from pathlib import Path
 from time import sleep
 
@@ -52,10 +53,9 @@
 
 import ieee_2030_5.hrefs as hrefs
 from ieee_2030_5.certs import TLSRepository
-from ieee_2030_5.config import ServerConfiguration
+from ieee_2030_5.config import InvalidConfigFile, ServerConfiguration
 from ieee_2030_5.data.indexer import add_href
 from ieee_2030_5.flask_server import run_server
-from ieee_2030_5.models.adapters import InvalidConfigFile
 from ieee_2030_5.server.server_constructs import initialize_2030_5
 
 _log = logging.getLogger()
@@ -121,6 +121,11 @@ def remove_stop_file():
         os.remove(pth)
 
 
+def _run_ui():
+    
+    os.system('python gui/spa/main.py')
+    
+
 def _main():
     parser = ArgumentParser()
 
@@ -189,11 +194,15 @@ def _main():
 
     #if not opts.production:
     try:
+        # p = Process(target = _run_ui)
+        # p.daemon = True
+        # p.start()
+        
         run_server(config,
                     tls_repo,
                     end_devices,
                     debug=opts.debug,
-                    use_reloader=False,
+                    use_reloader=True,
                     use_debugger=True,
                     threaded=False)
     except KeyboardInterrupt: