Update readme.md

Author: craig8

README.md

@@ -37,130 +37,6 @@ Both of these configuration files should be placed in the current working direct
 ### Example openssl.cnf
 
 ```ini
-#
-# OpenSSL example configuration file.
-# This is mostly being used for generation of certificate requests.
-#
-
-# This definition stops the following lines choking if HOME isn't
-# defined.
-HOME                    = .
-RANDFILE                = $ENV::HOME/.rnd
-
-# Extra OBJECT IDENTIFIER info:
-#oid_file               = $ENV::HOME/.oid
-oid_section             = new_oids
-
-# To use this configuration file with the "-extfile" option of the
-# "openssl x509" utility, name here the section containing the
-# X.509v3 extensions to use:
-# extensions            =
-# (Alternatively, use a configuration file that has only
-# X.509v3 extensions in its main [= default] section.)
-
-[ new_oids ]
-
-# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
-# Add a simple OID like this:
-# testoid1=1.2.3.4
-# Or use config file substitution like this:
-# testoid2=${testoid1}.5.6
-
-# Policies used by the TSA examples.
-tsa_policy1 = 1.2.3.4.1
-tsa_policy2 = 1.2.3.4.5.6
-tsa_policy3 = 1.2.3.4.5.7
-
-####################################################################
-[ ca ]
-default_ca      = CA_default            # The default ca section
-
-[ CA_default ]
-dir             = /home/gridappsd/tls             # Where everything is kept
-certs           = $dir/certs            # Where the issued certs are kept
-database        = $dir/index.txt        # database index file.
-                                        # several certs with same subject.
-new_certs_dir   = $dir/certs            # default place for new certs.
-certificate     = $dir/certs/ec-cacert.pem       # The CA certificate
-serial          = $dir/serial           # The current serial number
-crlnumber       = $dir/crlnumber        # the current crl number
-                                        # must be commented out to leave a V1 CRL
-private_key     = $dir/private/ec-cakey.pem # The private key
-
-name_opt        = ca_default            # Subject Name options
-cert_opt        = ca_default            # Certificate field options
-
-default_days    = 365                   # how long to certify for
-default_crl_days= 30                    # how long before next CRL
-default_md      = sha256                # use SHA-256 by default
-preserve        = no                    # keep passed DN ordering
-policy          = policy_match
-
-# For the CA policy
-[ policy_match ]
-countryName             = optional
-stateOrProvinceName     = optional
-organizationName        = optional
-organizationalUnitName  = optional
-commonName              = optional
-emailAddress            = optional
-
-[ policy_anything ]
-countryName             = optional
-stateOrProvinceName     = optional
-localityName            = optional
-organizationName        = optional
-organizationalUnitName  = optional
-commonName              = optional
-emailAddress            = optional
-
-####################################################################
-[ req ]
-default_bits            = 2048
-default_md              = sha256
-default_keyfile         = privkey.pem
-#distinguished_name      = req_distinguished_name
-#attributes              = req_attributes
-x509_extensions = v3_ca # The extentions to add to the self signed cert
-
-[ req_distinguished_name ]
-#countryName                     = Country Name (2 letter code)
-#countryName_default             = US
-#countryName_min                 = 2
-#countryName_max                 = 2
-#stateOrProvinceName             = State or Province Name (full name)
-#stateOrProvinceName_default     = Washington
-#localityName                    = Locality Name (eg, city)
-#localityName_default            = Richland
-#0.organizationName              = Organization Name (eg, company)
-#0.organizationName_default      =
-#organizationalUnitName          = Organizational Unit Name (eg, section)
-#commonName                      = Common Name (eg, your name or your server\'s hostname)
-#commonName_max                  = 64
-#emailAddress                    = Email Address
-#emailAddress_max                = 64
-
-[ req_attributes ]
-challengePassword               = A challenge password
-challengePassword_min           = 4
-challengePassword_max           = 20
-unstructuredName                = An optional company name
-
-
-[ v3_req ]
-# Extensions to add to a certificate request
-basicConstraints = CA:FALSE
-keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-
-[ v3_ca ]
-# Extensions for a typical CA
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid:always,issuer
-basicConstraints = critical,CA:true
-
-[ crl_ext ]
-# issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always#
 # OpenSSL example configuration file.
 # This is mostly being used for generation of certificate requests.
 #
@@ -199,7 +75,7 @@ tsa_policy3 = 1.2.3.4.5.7
 default_ca      = CA_default            # The default ca section
 
 [ CA_default ]
-dir             = /home/gridappsd/tls   # Where everything is kept
+dir             = $ENV::HOME/tls             # Where everything is kept
 certs           = $dir/certs            # Where the issued certs are kept
 database        = $dir/index.txt        # database index file.
                                         # several certs with same subject.

cli-client.py

@@ -0,0 +1,54 @@
+import textual
+import yaml
+from textual.app import App
+from textual.widget import Widget
+from textual.widgets import TreeItem, TreeWidget
+
+
+class MyTreeWidget(TreeWidget):
+
+    def __init__(self, data):
+        super().__init__(data)
+
+        # Create the root node of the tree
+        root = TreeItem(text="Root", expanded=True)
+        self.add_top_level_item(root)
+
+        # Recursively add child nodes to the root node
+        self._add_child_items(root, data)
+
+    def _add_child_items(self, parent_node, data):
+        # Loop through the keys and values in the current data object
+        for key, value in data.items():
+            # Create a new TreeItem for the current key
+            item = TreeItem(text=key)
+
+            # If the current value is a dictionary, recursively add its child nodes
+            if isinstance(value, dict):
+                self._add_child_items(item, value)
+
+            # Add the new TreeItem to the parent node
+            parent_node.add_child_item(item)
+
+
+class MyTreeWidgetContainer(Widget):
+
+    def __init__(self, data):
+        super().__init__()
+        self.tree_widget = MyTreeWidget(data)
+        self.add_subview(self.tree_widget)
+
+
+class MyCLIApp(App):
+
+    async def on_load(self, event):
+        # Load the data from the YAML file
+        with open("my_data.yaml") as file:
+            data = yaml.load(file, Loader=yaml.FullLoader)
+
+        # Create the tree widget container and add it to the app
+        tree_widget_container = MyTreeWidgetContainer(data)
+        self.add_root_widget(tree_widget_container)
+
+
+MyCLIApp.run()

config.yml

@@ -41,15 +41,16 @@ devices:
     deviceCategory: FUEL_CELL
     pin: 111115
 
-    programs:
-      - description: Program 1
+    # programs:
+    #   - description: Program 1
 
     # nameplate:
     #   rtgMaxW: 6000
     ders:
       - capabilities:
         modesSupported: "1110000000000000"
         type: 83
+        program: Program 1
 
       - capabilities:
         # Bitmask with the following structure.
@@ -182,7 +183,9 @@ programs:
       - Curve 1
     primacy: 89
 
-  # - description: Program 2
+  - description: Program 2
+    default_control: Control 3
+    primacy: 20
   #   default_control: Control 2
   # - description: Program 3
   #   default_control: Control 2
@@ -205,9 +208,6 @@ controls:
   - description: Control 2
   - description: Control 3
 
-events:
-  - control: 0
-
 curves:
   # Each element will can have the following structure.
   # autonomousVRefEnable: If the curveType is opModVoltVar, then
@@ -286,23 +286,3 @@ curves:
       - exitation: 10
         xvalue: 5
         yvalue: 5
-#{
-#    "devices": [
-#                    {
-#                        "sfdi": "097935300833",
-#                        "lfdi": "247bd68e3378fe57ba604e3c8bdf9e3f78a3d743",
-#                        "load_shed_device_category": "0200",
-#                        "pin_code": "130178"
-#                    },
-#                    {
-#                        "sfdi": "111576577659",
-#                        "lfdi": "2990c58a59935a7d5838c952b1a453c967341a07",
-#                        "load_shed_device_category": "0200",
-#                        "pin_code": "130178"
-#                    }
-#               ],
-#    "IEEE2030_5_server_sfdi": "413707194130",
-#    "IEEE2030_5_server_lfdi": "29834592834729384728374562039847629",
-#    "load_shed_device_category": "0020",
-#    "timezone": "America/Los_Angeles"
-#}

gui/der_programs.py

@@ -0,0 +1,95 @@
+import random
+import uuid
+from datetime import datetime, timedelta
+
+from nicegui import app, ui
+from router import global_router as router
+from session import backend_session, endpoint
+
+import ieee_2030_5.models as m
+from ieee_2030_5.utils import dataclass_to_xml, uuid_2030_5, xml_to_dataclass
+
+
+def datachange(data, prop, x):
+    if hasattr(x, "value"):
+        value = x.value
+    else:
+        value = x
+    setattr(data, prop, value)
+    return getattr(data, prop)
+
+def add_control_event(program_index: int):
+    der_control = m.DERControl()
+    
+    
+    def post_der_control():
+        resp = backend_session.post(endpoint(f'/derp/{program_index}/derc'), dataclass_to_xml(der_control))
+        if resp.ok:
+            ui.open("/derp")
+        
+        
+        
+    with ui.column():
+        with ui.row():
+            der_control.mRID = uuid_2030_5()
+            ui.input('mRID', value=der_control.mRID, on_change=lambda e: datachange(der_control, "mRID", e))
+        with ui.row():
+            currentdate = datetime.utcnow()
+            fmtstring = '%Y-%m-%d %H:%M:%S'
+            ui.label(f"Current time UTC: {currentdate.strftime(fmtstring)}")
+        with ui.row():
+            ui.input("Event Start Date Time", value=f"{(datetime.utcnow() + timedelta(seconds=90)).strftime(fmtstring)}", on_change=lambda e: datachange(der_control, "interval.start", e))
+        
+        with ui.row():            
+            duration = ui.input("duration", on_change=lambda e: datachange(der_control, "interval.duration", int(e.value)))
+        ui.button("Save", on_click=lambda: post_der_control())
+
+@router.add('/derp')
+def programs_list():
+    resp = backend_session.get(endpoint('/derp'))
+    derps: m.DERProgramList = xml_to_dataclass(resp.text)
+        
+    for index, derp in enumerate(derps.DERProgram):
+        router.add_route(f"/derp/{index}/derc/add", lambda: add_control_event(index))
+        with ui.row():
+            with ui.column():
+                ui.label(f"Description: {derp.description}")
+                ui.label(f"mRID: {derp.mRID}")                
+                ui.label(f"primacy: {derp.primacy}")
+                
+                if derp.ActiveDERControlListLink:
+                    ui.label(derp.ActiveDERControlListLink.href)
+                if derp.DefaultDERControlLink:
+                    ui.label(derp.DefaultDERControlLink.href)
+                if derp.DERControlListLink:
+                    ui.label(derp.DERControlListLink.href)
+                
+                ui.button('Control Event', on_click=lambda: router.open(f"/derp/{index}/derc/add"))
+
+    ui.button('Create New Program', on_click=lambda: router.open(f'/derp/add'))
+    
+@app.get('/derp/{max}')
+def generate_random_number(max: int):
+    with ui.column():
+        ui.label("foo")
+    #return {'min': 0, 'max': max, 'value': random.randint(0, max)}
+  
+
+@router.add('/derp/add')
+def program_add():
+    data = m.DERProgram()
+    
+    
+    def create_derp():
+        resp = backend_session.post(endpoint("derp"), data=dataclass_to_xml(data))
+        if resp.ok:
+            ui.open("/derp")
+        
+    with ui.column():
+        ui.input("mRID", on_change=lambda x: datachange(data, "mRID", x))
+        ui.input("description", on_change=lambda x: datachange(data, "description", x))
+        ui.input("primacy", on_change=lambda x: datachange(data, "primacy", x))
+        ui.button("Save", on_click=lambda: create_derp())
+
+#ui.run()
+

gui/enddevices.py

@@ -24,9 +24,21 @@ def show_list(enddevices: m.EndDeviceList):
                     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}")    
+                            ui.label(f"{fld.name} -> {value}")    
                         else:
-                            ui.label(f"{fld.name}, {value.decode('utf-8')}, {fld.type}")
+                            ui.label(f"{fld.name} -> {value.decode('utf-8')}")
+                    elif value and fld.type in ('int'):
+                        ui.label(f"{fld.name} -> {value}")
+                    elif value:
+                        
+                        if isinstance(value, bytes):
+                            ui.label(f"{fld.name} -> {value}")
+                        elif isinstance(value, int):
+                            ui.label(f"{fld.name} -> {value}")
+                        elif getattr(value, 'href'):
+                            ui.label(f"{fld.name} -> {getattr(value, 'href')}")
+                        else:
+                            ui.label(f"Type is: {fld.type}")
                     # value = getattr(ed, fld.name)
                     # if value and value.decode('utf-8'):
                     #     ui.label(f"{fld.name} => {value.decode('utf-8')}")