Add tags to channels

gui/af.py

@@ -5,53 +5,22 @@
 from pandas import DataFrame, concat
 environ['DJANGO_SETTINGS_MODULE'] = 'lndg.settings'
 django.setup()
-from gui.models import Forwards, Channels, LocalSettings, FailedHTLCs
+from gui.models import Forwards, Channels, Groups, Settings, FailedHTLCs
 
-def main(channels):
-    channels_df = DataFrame.from_records(channels.values())
+def main(group: Groups):
+    channels_df = DataFrame.from_records(group.channels.filter(is_open=True, private=False).values())
     filter_1day = datetime.now() - timedelta(days=1)
     filter_7day = datetime.now() - timedelta(days=7)
     if channels_df.shape[0] > 0:
-        if LocalSettings.objects.filter(key='AF-MaxRate').exists():
-            max_rate = int(LocalSettings.objects.filter(key='AF-MaxRate')[0].value)
-        else:
-            LocalSettings(key='AF-MaxRate', value='2500').save()
-            max_rate = 2500
-        if LocalSettings.objects.filter(key='AF-MinRate').exists():
-            min_rate = int(LocalSettings.objects.filter(key='AF-MinRate')[0].value)
-        else:
-            LocalSettings(key='AF-MinRate', value='0').save()
-            min_rate = 0
-        if LocalSettings.objects.filter(key='AF-Increment').exists():
-            increment = int(LocalSettings.objects.filter(key='AF-Increment')[0].value)
-        else:
-            LocalSettings(key='AF-Increment', value='5').save()
-            increment = 5
-        if LocalSettings.objects.filter(key='AF-Multiplier').exists():
-            multiplier = int(LocalSettings.objects.filter(key='AF-Multiplier')[0].value)
-        else:
-            LocalSettings(key='AF-Multiplier', value='5').save()
-            multiplier = 5
-        if LocalSettings.objects.filter(key='AF-FailedHTLCs').exists():
-            failed_htlc_limit = int(LocalSettings.objects.filter(key='AF-FailedHTLCs')[0].value)
-        else:
-            LocalSettings(key='AF-FailedHTLCs', value='25').save()
-            failed_htlc_limit = 25
-        if LocalSettings.objects.filter(key='AF-UpdateHours').exists():
-            update_hours = int(LocalSettings.objects.filter(key='AF-UpdateHours').get().value)
-        else:
-            LocalSettings(key='AF-UpdateHours', value='24').save()
-            update_hours = 24
-        if LocalSettings.objects.filter(key='AF-LowLiqLimit').exists():
-            lowliq_limit = int(LocalSettings.objects.filter(key='AF-LowLiqLimit').get().value)
-        else:
-            LocalSettings(key='AF-LowLiqLimit', value='5').save()
-            lowliq_limit = 5
-        if LocalSettings.objects.filter(key='AF-ExcessLimit').exists():
-            excess_limit = int(LocalSettings.objects.filter(key='AF-ExcessLimit').get().value)
-        else:
-            LocalSettings(key='AF-ExcessLimit', value='95').save()
-            excess_limit = 95
+        max_rate = int(group.settings_set.filter(key='AF-MaxRate')[0].value if group.settings_set.filter(key='AF-MaxRate').exists() else Settings.objects.filter(group_id=0,key='AF-MaxRate')[0].value)
+        min_rate = int(group.settings_set.filter(key='AF-MinRate')[0].value if group.settings_set.filter(key='AF-MinRate').exists() else Settings.objects.filter(group_id=0,key='AF-MinRate')[0].value)
+        increment = int(group.settings_set.filter(key='AF-Increment')[0].value if group.settings_set.filter(key='AF-Increment').exists() else Settings.objects.filter(group_id=0,key='AF-Increment')[0].value)
+        multiplier = int(group.settings_set.filter(key='AF-Multiplier')[0].value if group.settings_set.filter(key='AF-Multiplier').exists() else Settings.objects.filter(group_id=0,key='AF-Multiplier')[0].value)
+        failed_htlc_limit = int(group.settings_set.filter(key='AF-FailedHTLCs')[0].value if group.settings_set.filter(key='AF-FailedHTLCs').exists() else Settings.objects.filter(group_id=0,key='AF-FailedHTLCs')[0].value)
+        update_hours = int(group.settings_set.filter(key='AF-UpdateHours').get().value if group.settings_set.filter(key='AF-UpdateHours').exists() else Settings.objects.filter(group_id=0,key='AF-UpdateHours')[0].value)
+        lowliq_limit = int(group.settings_set.filter(key='AF-LowLiqLimit').get().value if group.settings_set.filter(key='AF-LowLiqLimit').exists() else Settings.objects.filter(group_id=0,key='AF-LowLiqLimit')[0].value)
+        excess_limit = int(group.settings_set.filter(key='AF-ExcessLimit').get().value if group.settings_set.filter(key='AF-ExcessLimit').exists() else Settings.objects.filter(group_id=0,key='AF-ExcessLimit')[0].value)
+
         if lowliq_limit >= excess_limit:
             print('Invalid thresholds detected, using defaults...')
             lowliq_limit = 5

gui/forms.py

@@ -63,7 +63,9 @@ class Meta:
     last_hop_pubkey = forms.CharField(label='funding_txid', max_length=66, required=False)
     duration = forms.IntegerField(label='duration')
 
-class AutoRebalanceForm(forms.Form):	
+class AutoRebalanceForm(forms.Form):
+    group_id = forms.IntegerField(label="group_id", required=True)
+    group_name = forms.CharField(label="group_name", min_length=1, max_length=20, required=False)
     enabled = forms.IntegerField(label='enabled', required=False)	
     target_percent = forms.FloatField(label='target_percent', required=False)	
     target_time = forms.IntegerField(label='target_time', required=False)	
@@ -93,7 +95,7 @@ class GUIForm(AutoFeesForm):
     gui_graphLinks = forms.CharField(label='gui_graphLinks', required=False)	
     gui_netLinks = forms.CharField(label='gui_netLinks', required=False)	
 
-class LocalSettingsForm(GUIForm):	
+class SettingsForm(GUIForm):	
     lnd_cleanPayments = forms.IntegerField(label='lnd_cleanPayments', required=False)	
     lnd_retentionDays = forms.IntegerField(label='lnd_retentionDays', required=False)	
 

gui/migrations/0037_groups_settings_delete_localsettings_channels_groups.py

@@ -0,0 +1,77 @@
+# Generated by Django 4.1.5 on 2023-08-06 17:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+from gui.models import Groups, Channels, Settings
+
+def migrate_update_channels(apps, schema_editor):
+    channels = Channels.objects.all()
+    lndg_default = Groups(name="", id=0) # default
+    lndg_default.save()
+    for ch in channels:
+        lndg_default.channels.add(ch)
+    lndg_default.save()
+
+    print('\nInitializing default settings...')
+    Settings(key='AF-MaxRate', value='2500',group=lndg_default).save()
+    Settings(key='AF-MinRate', value='0',group=lndg_default).save()
+    Settings(key='AF-Increment', value='5',group=lndg_default).save()
+    Settings(key='AF-Multiplier', value='5',group=lndg_default).save()
+    Settings(key='AF-FailedHTLCs', value='25',group=lndg_default).save()
+    Settings(key='AF-UpdateHours', value='24',group=lndg_default).save()
+    Settings(key='AF-LowLiqLimit', value='5',group=lndg_default).save()
+    Settings(key='AF-ExcessLimit', value='95',group=lndg_default).save()
+    Settings(key='AF-Enabled', value='0',group=lndg_default).save()
+    Settings(key='GUI-GraphLinks', value='https://amboss.space',group=lndg_default).save()
+    Settings(key='GUI-NetLinks', value='https://mempool.space',group=lndg_default).save()
+    Settings(key='LND-CleanPayments', value='0',group=lndg_default).save()
+    Settings(key='LND-RetentionDays', value='30',group=lndg_default).save()
+    Settings(key='AR-Outbound%', value='75',group=lndg_default).save()
+    Settings(key='AR-Inbound%', value='100',group=lndg_default).save()
+    Settings(key='AR-Target%', value='5',group=lndg_default).save()
+    Settings(key='AR-MaxCost%', value='65',group=lndg_default).save()
+    Settings(key='AR-Enabled', value='0',group=lndg_default).save()
+    Settings(key='AR-MaxFeeRate', value='100',group=lndg_default).save()
+    Settings(key='AR-Variance', value='0',group=lndg_default).save()
+    Settings(key='AR-WaitPeriod', value='30',group=lndg_default).save()
+    Settings(key='AR-Time', value='5',group=lndg_default).save()
+    Settings(key='AR-Autopilot', value='0',group=lndg_default).save()
+    Settings(key='AR-APDays', value='7',group=lndg_default).save()
+    Settings(key='AR-Workers', value='1',group=lndg_default).save()
+
+    print('\nApplying custom settings if user has any...')
+    for sett in apps.get_model('gui', 'localsettings').objects.all():
+        setting = lndg_default.settings_set.get(key=sett.key)
+        setting.value = sett.value
+        setting.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gui', '0036_peers'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Groups',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=20, unique=True)),
+                ('channels', models.ManyToManyField(related_name='channels_list', to='gui.channels')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Settings',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('key', models.CharField(default=None, max_length=20)),
+                ('value', models.CharField(default=None, max_length=50)),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gui.groups')),
+            ],
+        ),
+        migrations.RunPython(migrate_update_channels, migrations.RunPython.noop),
+        migrations.DeleteModel(
+            name='LocalSettings',
+        )
+    ]

gui/models.py

@@ -110,43 +110,12 @@ class Channels(models.Model):
     auto_fees = models.BooleanField()
     notes = models.TextField(default='', blank=True)
 
-    def save(self, *args, **kwargs):
-        if self.auto_fees is None:
-            if LocalSettings.objects.filter(key='AF-Enabled').exists():
-                enabled = int(LocalSettings.objects.filter(key='AF-Enabled')[0].value)
-            else:
-                LocalSettings(key='AF-Enabled', value='0').save()
-                enabled = 0
-            self.auto_fees = False if enabled == 0 else True
-        if not self.ar_out_target:
-            if LocalSettings.objects.filter(key='AR-Outbound%').exists():
-                outbound_setting = int(LocalSettings.objects.filter(key='AR-Outbound%')[0].value)
-            else:
-                LocalSettings(key='AR-Outbound%', value='75').save()
-                outbound_setting = 75
-            self.ar_out_target = outbound_setting
-        if not self.ar_in_target:
-            if LocalSettings.objects.filter(key='AR-Inbound%').exists():
-                inbound_setting = int(LocalSettings.objects.filter(key='AR-Inbound%')[0].value)
-            else:
-                LocalSettings(key='AR-Inbound%', value='100').save()
-                inbound_setting = 100
-            self.ar_in_target = inbound_setting
-        if not self.ar_amt_target:
-            if LocalSettings.objects.filter(key='AR-Target%').exists():
-                amt_setting = float(LocalSettings.objects.filter(key='AR-Target%')[0].value)
-            else:
-                LocalSettings(key='AR-Target%', value='5').save()
-                amt_setting = 5
-            self.ar_amt_target = int((amt_setting/100) * self.capacity)
-        if not self.ar_max_cost:
-            if LocalSettings.objects.filter(key='AR-MaxCost%').exists():
-                cost_setting = int(LocalSettings.objects.filter(key='AR-MaxCost%')[0].value)
-            else:
-                LocalSettings(key='AR-MaxCost%', value='65').save()
-                cost_setting = 65
-            self.ar_max_cost = cost_setting
-        super(Channels, self).save(*args, **kwargs)
+    class Meta:
+        app_label = 'gui'
+
+class Groups(models.Model):
+    name = models.CharField(max_length=20, unique=True)
+    channels = models.ManyToManyField(Channels, related_name="channels_list",)
 
     class Meta:
         app_label = 'gui'
@@ -181,9 +150,10 @@ class Rebalancer(models.Model):
     class Meta:
         app_label = 'gui'
 
-class LocalSettings(models.Model):
-    key = models.CharField(primary_key=True, default=None, max_length=20)
+class Settings(models.Model):
+    key = models.CharField(max_length=20,default=None)
     value = models.CharField(default=None, max_length=50)
+    group = models.ForeignKey(Groups, on_delete=models.CASCADE)
     class Meta:
         app_label = 'gui'
 

gui/serializers.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
 from rest_framework.relations import PrimaryKeyRelatedField
-from .models import LocalSettings, Payments, PaymentHops, Invoices, Forwards, Channels, Rebalancer, Peers, Onchain, PendingHTLCs, FailedHTLCs, Closures, Resolutions, PeerEvents
+from .models import Settings, Payments, PaymentHops, Invoices, Forwards, Channels, Rebalancer, Peers, Onchain, PendingHTLCs, FailedHTLCs, Closures, Resolutions, PeerEvents
 
 ##FUTURE UPDATE 'exclude' TO 'fields'
 
@@ -170,10 +170,10 @@ class Meta:
         model = PaymentHops
         exclude = []
 
-class LocalSettingsSerializer(serializers.HyperlinkedModelSerializer):
+class SettingsSerializer(serializers.HyperlinkedModelSerializer):
     key = serializers.ReadOnlyField()
     class Meta:
-        model = LocalSettings
+        model = Settings
         exclude = []
 
 class PendingHTLCSerializer(serializers.HyperlinkedModelSerializer):

gui/static/api.js

@@ -21,9 +21,9 @@ async function DELETE(url, {method = 'DELETE'} = {}){
 }
 
 async function call({url, method, data, body, headers = {'Content-Type':'application/json'}}){
-    if(url.charAt(url.length-1) != '/') url += '/'
+    if(!url.endsWith('/')) url += '/'
     if(method != 'GET') headers['X-CSRFToken'] = document.getElementById('api').dataset.token
-    const result = await fetch(`api/${url}${data ? '?': ''}${new URLSearchParams(data).toString()}`, {method, body: JSON.stringify(body), headers})
+    const result = await fetch(`${window.location.origin}/api/${url}${data ? '?': ''}${new URLSearchParams(data).toString()}`, {method, body: JSON.stringify(body), headers})
     return result.json()
 }
 

gui/static/helpers.js

@@ -46,15 +46,15 @@ async function toggle(button){
 }
 function use(template){
   return { 
-    render: function(object, id='id', row = null){
+    render: function(object, id='id', columnType = "td", row = undefined){
       const tr = row ?? document.createElement("tr")
       tr.objId = object[id]
       for (key in template){
-        const transforms = template[key](object)
-        const td = document.createElement("td")
-        td.setAttribute('name', key)
-        td.render(transforms)
-        tr.append(td)
+        const transforms = template[key](object, key)
+        const col = document.createElement(columnType)
+        col.setAttribute('name', key)
+        col.render(transforms)
+        tr.append(col)
       }
       return tr
     }

gui/templates/advanced.html

@@ -209,13 +209,10 @@ <h2>Advanced Channel Settings</h2>
     </table>
   </div>
 </div>
-{% endif %}
-{% if not channels %}
+{% else %}
 <div class="w3-container w3-padding-small">
   <center><h1>You dont have any channels to setup yet!</h1></center>
 </div>
 {% endif %}
-{% if local_settings %}
-{% include 'local_settings.html' with settings=local_settings title='Update Local' %}
-{% endif %}
+{% include 'settings.html' with configs="'AF-,AR-,GUI-,LND-'" title='Update' %}
 {% endblock %}

gui/templates/base.html

@@ -72,7 +72,7 @@
         {% for message in messages %}
         <div class="w3-panel w3-orange w3-display-container w3-padding">
           <span onclick="this.parentElement.style.display='none'" class="w3-button w3-hover-red w3-display-topright">X</span>
-          <h1 style="word-wrap:break-word">{{ message.message }}</h1>
+          <h1 style="word-wrap:break-word">{{ message.message |safe }}</h1>
           {% with sliced_msg=message.message|slice:":17" %}
             {% if sliced_msg == "Deposit Address: " or sliced_msg == "Invoice created! " %}
               {% qr_from_text message.message|slice:"17:" size="s" image_format="png" error_correction="L" %}

gui/templates/fee_rates.html

@@ -84,7 +84,5 @@ <h2>Suggested Fee Rates</h2>
   <center><h1>You dont have any channels to analyze yet!</h1></center>
 </div>
 {% endif %}
-{% if local_settings %}
-{% include 'local_settings.html' with settings=local_settings title='Auto-Fees' postURL='update_setting' %}
-{% endif %}
+{% include 'settings.html' with configs="'AF-'" title='Auto-Fees' postURL='update_setting' %}
 {% endblock %}

gui/templates/home.html

@@ -388,7 +388,7 @@ <h6 style="display: none" id="private_stats">
     </tfoot>
   </table>
 </div>
-{% include 'local_settings.html' with settings=local_settings title="Auto-Rebalancer" url='rebalancing' %}
+{% include 'settings.html' with configs="'AR-'" title="Auto-Rebalancer" url='rebalancing' %}
 <div class="w3-container w3-padding-small">
   <h2>Connect to a Peer</h2>
   <div class="w3-container w3-padding-small">

gui/templates/rebalancing.html

@@ -182,5 +182,5 @@ <h5 style="float:left" title="Select outgoing channels above">Manual Rebalance R
   }
 </script>
 {% include 'rebalances_table.html' with count=20 load_count=10 title='<a href="/rebalances" target="_blank">Rebalance Requests</a>' %}
-{% include 'local_settings.html' with settings=local_settings title='Auto-Rebalancer' %}
+{% include 'settings.html' with settings=local_settings title='Auto-Rebalancer' %}
 {% endblock %}