Command Usage
@@ -854,6 +882,10 @@ def generate_main_html(log_data, system_info):
const commandData = ${command_data};
const messageData = ${message_data};
const activityData = ${activity_data};
+ const packet1rxData = ${packet1rx_data};
+ const utilData = ${util_data};
+ const errorData = ${error_data};
+ const node1Data = ${node1_data};
const messageCountData = {
labels: ['BBSdm Messages', 'BBSdb Messages', 'Channel Messages'],
datasets: [{
@@ -905,7 +937,7 @@ def generate_main_html(log_data, system_info):
fill: false
}]
},
-options: {
+ options: {
...chartOptions,
scales: {
x: {
@@ -932,6 +964,132 @@ options: {
}
});
+ new Chart(document.getElementById('packetChart'), {
+ type: 'line',
+ data: {
+ labels: Object.keys(packet1rxData),
+ datasets: [{
+ label: 'TX/RX Count',
+ data: Object.entries(packet1rxData).map(([time, count]) => ({x: new Date(time), y: count})),
+ borderColor: 'rgba(153, 102, 255, 1)',
+ fill: false
+ }]
+ },
+ options: {
+ ...chartOptions,
+ scales: {
+ x: {
+ type: 'time',
+ time: {
+ unit: 'hour',
+ displayFormats: {
+ hour: 'MMM d, HH:mm'
+ }
+ },
+ title: {
+ display: true,
+ text: 'Time'
+ }
+ },
+ y: {
+ beginAtZero: true,
+ title: {
+ display: true,
+ text: 'TX/RX Packet Count'
+ }
+ }
+ }
+ }
+ });
+
+ new Chart(document.getElementById('utilChart'), {
+ type: 'line',
+ data: {
+ labels: Object.keys(utilData),
+ datasets: [{
+ label: 'Hourly Activity',
+ data: Object.entries(utilData).map(([time, count]) => ({x: new Date(time), y: count})),
+ borderColor: 'rgba(153, 102, 255, 1)',
+ fill: false
+ }]
+ },
+ options: {
+ ...chartOptions,
+ scales: {
+ x: {
+ type: 'time',
+ time: {
+ unit: 'hour',
+ displayFormats: {
+ hour: 'MMM d, HH:mm'
+ }
+ },
+ title: {
+ display: true,
+ text: 'Time'
+ }
+ },
+ y: {
+ beginAtZero: true,
+ title: {
+ display: true,
+ text: 'Activity %'
+ }
+ }
+ }
+ }
+ });
+
+ new Chart(document.getElementById('errorChart'), {
+ type: 'line',
+ data: {
+ labels: Object.keys(errorData),
+ datasets: [{
+ label: 'Hourly Activity',
+ data: Object.entries(errorData).map(([time, count]) => ({x: new Date(time), y: count})),
+ borderColor: 'rgba(153, 102, 255, 1)',
+ fill: false
+ }]
+ },
+ options: {
+ ...chartOptions,
+ scales: {
+ x: {
+ type: 'time',
+ time: {
+ unit: 'hour',
+ displayFormats: {
+ hour: 'MMM d, HH:mm'
+ }
+ },
+ title: {
+ display: true,
+ text: 'Time'
+ }
+ },
+ y: {
+ beginAtZero: true,
+ title: {
+ display: true,
+ text: 'Error Count'
+ }
+ }
+ }
+ }
+ });
+
+ new Chart(document.getElementById('nodeChart'), {
+ type: 'pie',
+ data: {
+ labels: Object.keys(node1Data),
+ datasets: [{
+ data: Object.values(node1Data),
+ backgroundColor: ['rgba(255, 99, 132, 0.6)', 'rgba(54, 162, 235, 0.6)']
+ }]
+ },
+ options: chartOptions
+ });
+
new Chart(document.getElementById('messageCountChart'), {
type: 'bar',
data: messageCountData,
@@ -1040,6 +1198,10 @@ options: {
command_data=json.dumps(log_data['command_counts']),
message_data=json.dumps(log_data['message_types']),
activity_data=json.dumps(log_data['hourly_activity']),
+ packet1rx_data=(log_data['rx1']),
+ util_data=json.dumps(log_data['channel_util']),
+ error_data=json.dumps(log_data['packet_errors']),
+ node1_data=json.dumps(log_data['nodeCount1']),
bbs_messages=log_data['bbs_messages'],
messages_waiting=log_data['messages_waiting'],
total_messages=log_data['total_messages'],
diff --git a/modules/llm.py b/modules/llm.py
index 6521543..7b59065 100644
--- a/modules/llm.py
+++ b/modules/llm.py
@@ -20,7 +20,7 @@ googleSearchResults = 3 # number of google search results to include in the cont
antiFloodLLM = []
llmChat_history = {}
trap_list_llm = ("ask:", "askai")
-ragDEV = True
+ragDEV = False
meshBotAI = """
FROM {llmModel}