From 214f93b6244b33d2e572e3211a1c44e3db3ec56b Mon Sep 17 00:00:00 2001 From: decoded Date: Mon, 20 Mar 2023 13:37:19 -0500 Subject: [PATCH] update --- storage/bot/plugins/ansi_plugin.py | 2 +- storage/bot/plugins/auth_nickserv_plugin.py | 3 +- storage/bot/plugins/auth_sasl_plugin.py | 14 +-- storage/bot/plugins/boombox_plugin.py | 42 ++++----- storage/bot/plugins/cmd_irc_plugin.py | 18 ++-- storage/bot/plugins/core_plugin.py | 2 +- storage/bot/plugins/crypto_plugin.py | 2 +- storage/bot/plugins/depumper_plugin.py | 2 +- storage/bot/plugins/dsa_plugin.py | 10 +- storage/bot/plugins/maple_plugin.py | 48 +++++----- storage/bot/plugins/net_discord_plugin.py | 24 ++--- storage/bot/plugins/net_irc_plugin.py | 44 +++++---- storage/bot/plugins/net_matrix_plugin.py | 28 +++--- storage/bot/plugins/net_telegram_plugin.py | 18 ++-- storage/bot/plugins/openai_plugin.py | 10 +- storage/bot/plugins/tool_bus_plugin.py | 34 +++---- storage/bot/plugins/tool_colors_plugin.py | 23 +++-- storage/bot/plugins/tool_dims_plugin.py | 2 +- storage/bot/plugins/tool_guds_plugin.py | 12 +-- storage/bot/plugins/twitter_plugin.py | 2 +- storage/bot/plugins/txt2img_plugin.py | 2 +- storage/bot/plugins/youtube_plugin.py | 2 +- .../core/bot_maple__core__initial_plugins.txt | 76 +++++++-------- .../bot_maple__default__initial_plugins.txt | 90 +++++++++--------- .../bot/variants/dupe/bot_maple__devops.py | 18 ++-- .../bot_maple__devops__initial_plugins.txt | 88 +++++++++--------- .../bot/variants/dupe/bot_maple__services.py | 18 ++-- .../bot_maple__services__initial_plugins.txt | 92 +++++++++---------- 28 files changed, 367 insertions(+), 359 deletions(-) diff --git a/storage/bot/plugins/ansi_plugin.py b/storage/bot/plugins/ansi_plugin.py index 6f307b6..2cc076b 100644 --- a/storage/bot/plugins/ansi_plugin.py +++ b/storage/bot/plugins/ansi_plugin.py @@ -5,7 +5,7 @@ import irc3,re,os,sys,asyncio from datetime import datetime from irc3.plugins.command import command from irc3.plugins.cron import cron -from plugins.tool_colors_plugin import colorform as print +from tool_colors_plugin import colorform as print ########################################################################################### ########################################################################################### diff --git a/storage/bot/plugins/auth_nickserv_plugin.py b/storage/bot/plugins/auth_nickserv_plugin.py index 3149478..0dd77c7 100644 --- a/storage/bot/plugins/auth_nickserv_plugin.py +++ b/storage/bot/plugins/auth_nickserv_plugin.py @@ -12,7 +12,7 @@ if SERVICES_AUTHNICKSERV: from irc3.plugins.cron import cron import irc3, os, sys - from plugins.tool_colors_plugin import colorform as print + from tool_colors_plugin import colorform as print ################################################################################### ################################################################################### @@ -43,6 +43,7 @@ if SERVICES_AUTHNICKSERV: ########################################################################### def __init__(self,bot): + print('[ auth_nickserv initiated ]') self.bot=bot ########################################################################### diff --git a/storage/bot/plugins/auth_sasl_plugin.py b/storage/bot/plugins/auth_sasl_plugin.py index 64ba772..5c1036b 100644 --- a/storage/bot/plugins/auth_sasl_plugin.py +++ b/storage/bot/plugins/auth_sasl_plugin.py @@ -11,7 +11,7 @@ if SERVICES_AUTHSASL: ##################### import irc3,os,sys,base64 - from plugins.tool_colors_plugin import colorform as print + from tool_colors_plugin import colorform as print ####################################################################################### ####################################################################################### @@ -42,7 +42,7 @@ if SERVICES_AUTHSASL: ################################################################################### def __init__(self, bot): - print('<<< _sasl_custom_plugin >>> [ custom sasl initiated ]') + print('[ auth_sasl initiated ]') self.bot=bot self.auth=(f'{BOT_SASL_USERNAME}\0{BOT_SASL_USERNAME}\0{BOT_SASL_PASSWORD}') self.auth=base64.encodebytes(self.auth.encode('utf8')) @@ -77,7 +77,7 @@ if SERVICES_AUTHSASL: ################################################################################### def connection_ready(self, *args, **kwargs): - print('<<< _sasl_custom_plugin >>> [ CAP LS ]') + print('[ CAP LS ]') self.bot.send('CAP LS\r\n') self.bot.attach_events(*self.events) @@ -85,7 +85,7 @@ if SERVICES_AUTHSASL: ################################################################################### def cap_ls(self, data=None, **kwargs): - print('<<< _sasl_custom_plugin >>> [ CAP REQ :sasl ]') + print('[ CAP REQ :sasl ]') if 'sasl' in data.lower(): self.bot.send_line('CAP REQ :sasl') else: @@ -95,21 +95,21 @@ if SERVICES_AUTHSASL: ################################################################################### def cap_ack(self, **kwargs): - print('<<< _sasl_custom_plugin >>> [ AUTHENTICATE PLAIN ]') + print('[ AUTHENTICATE PLAIN ]') self.bot.send_line('AUTHENTICATE PLAIN') ################################################################################### ################################################################################### def authenticate(self, **kwargs): - print(f'<<< _sasl_custom_plugin >>> [ AUTHENTICATE ]') + print(f'[ AUTHENTICATE ]') self.bot.send_line(f'AUTHENTICATE {self.auth}\n') ################################################################################### ################################################################################### def cap_end(self, **kwargs): - print('<<< _sasl_custom_plugin >>> [ CAP END ]') + print('[ CAP END ]') self.bot.send_line('CAP END\r\n') self.bot.detach_events(*self.events) diff --git a/storage/bot/plugins/boombox_plugin.py b/storage/bot/plugins/boombox_plugin.py index 624a566..8566c40 100644 --- a/storage/bot/plugins/boombox_plugin.py +++ b/storage/bot/plugins/boombox_plugin.py @@ -7,7 +7,7 @@ ########################################################################################### import irc3 -from plugins.tool_colors_plugin import colorform as print +from tool_colors_plugin import colorform as print from irc3.plugins.command import command from urllib.parse import urlparse from datetime import datetime @@ -16,7 +16,7 @@ from typing import Type import random import string import os -from plugins.tool_dims_plugin import dims +from tool_dims_plugin import dims ################################################################# THE ASCII LOGO TO BE USED ################################################################# THE ASCII LOGO TO BE USED @@ -294,7 +294,7 @@ class Plugin: except TypeError: pass except Exception as e: - print(f'<<< _____boombox_plugin >>> boombox:last - error: {e}') + print(f'boombox:last - error: {e}') except Exception as e: pass @@ -611,14 +611,14 @@ class BOOMBOX_CONFIG: self.db=[] self.bot.bbdb=[] self.database_names=['bbs_data','bbs_last','bbs_nicks','bbs_sites','bbs_token','bbs_tokenmirror'] - print(f'<<< _____boombox_plugin >>> [ database diagnostics ]') + print(f'[ database diagnostics ]') for index,database in enumerate(self.database_names): db=self.bot.db.getlist(database) if not db: - print(f'<<< _____boombox_plugin >>> [ {index+1}/{len(self.database_names)} ] - [ missing database: {self.database_names[index]} ]') + print(f'[ {index+1}/{len(self.database_names)} ] - [ missing database: {self.database_names[index]} ]') self.db_diagnostics(database) else: - print(f'<<< _____boombox_plugin >>> [ {index+1}/{len(self.database_names)} ] - [ located database: {self.database_names[index]} ]') + print(f'[ {index+1}/{len(self.database_names)} ] - [ located database: {self.database_names[index]} ]') #print(f'{"#"*80} SOF') #print(f' pre - a database name: {database}') #print(f' pre - database memory: \n{self.db}') @@ -690,11 +690,11 @@ class BOOMBOX_CONFIG: db_stored=self.bot.db.getlist(database) db_memory=self.bot.bbdb[i] if not db_memory==db_stored: - self.bot.db.setlist(database,db_memory); # print('<<< _____boombox_plugin >>> success: storage database updated from memory') + self.bot.db.setlist(database,db_memory); # print('success: storage database updated from memory') else: - pass; # print('<<< _____boombox_plugin >>> aborted: storage database same as memory content') + pass; # print('aborted: storage database same as memory content') except Exception as e: - print('<<< _____boombox_plugin >>> dbsync:error - failed in writing to storage database from memory: {e}') + print('dbsync:error - failed in writing to storage database from memory: {e}') ######################################################## BOOMBOX CONFIG TEXT ALIGNMENTS ######################################################## BOOMBOX CONFIG TEXT ALIGNMENTS @@ -709,20 +709,20 @@ class BOOMBOX_CONFIG: return self.bot.bbdb[index] elif operation=='set': db_stored=self.bot.db.getlist(database) - # print(f'<<< _____boombox_plugin >>> pre:{database} db_stored: {db_stored}') - # print(f'<<< _____boombox_plugin >>> pre:{database} db_memory: {self.bot.bbdb[index]}') - # print(f'<<< _____boombox_plugin >>> pre:{database} db_sent: {data}') + # print(f'pre:{database} db_stored: {db_stored}') + # print(f'pre:{database} db_memory: {self.bot.bbdb[index]}') + # print(f'pre:{database} db_sent: {data}') self.bot.bbdb[index]=data - # print(f'<<< _____boombox_plugin >>> post:{database} db_memory: {self.bot.bbdb[index]}') - # print(f'<<< _____boombox_plugin >>> writing from memory to storage') + # print(f'post:{database} db_memory: {self.bot.bbdb[index]}') + # print(f'writing from memory to storage') self.dbsync(database) elif operation=='append': db_stored=self.bot.db.getlist(database) - # print(f'<<< _____boombox_plugin >>> pre:{database} db_stored: {db_stored}') - # print(f'<<< _____boombox_plugin >>> pre:{database} db_memory: {self.bot.bbdb[index]}') + # print(f'pre:{database} db_stored: {db_stored}') + # print(f'pre:{database} db_memory: {self.bot.bbdb[index]}') self.bot.bbdb[index].append(data) - # print(f'<<< _____boombox_plugin >>> post:{database} db_memory: {self.bot.bbdb[index]}') - # print(f'<<< _____boombox_plugin >>> writing from memory to storage') + # print(f'post:{database} db_memory: {self.bot.bbdb[index]}') + # print(f'writing from memory to storage') self.dbsync(database) #################################################### BOOMBOX CONFIG DATABASE OPERATIONS @@ -1017,12 +1017,12 @@ class BOOMBOX_CONFIG: if database_name==database: index=i break - print(f"<<< _____boombox_plugin >>> [ db_diagnostics - index: {index} - database: {database_name} ]") + print(f"[ db_diagnostics - index: {index} - database: {database_name} ]") ################################################################################### ################################################################################### - print(f'<<< _____boombox_plugin >>> [ {index+1}/{len(self.database_names)} ] - [ creating database: {self.database_names[index]} ]') + print(f'[ {index+1}/{len(self.database_names)} ] - [ creating database: {self.database_names[index]} ]') automation_flag=False ########################################################## database: 0/5 - bbs_data @@ -1128,7 +1128,7 @@ class BOOMBOX_CONFIG: ################################################################################### ################################################################################### - msg=f'<<< _____boombox_plugin >>> [ {index+1}/{len(self.database_names)} ] - [ {self.database_names[index]} created ]' + msg=f'[ {index+1}/{len(self.database_names)} ] - [ {self.database_names[index]} created ]' if automation_flag: status='+++ success +++' else: diff --git a/storage/bot/plugins/cmd_irc_plugin.py b/storage/bot/plugins/cmd_irc_plugin.py index efd0ded..f9280b1 100644 --- a/storage/bot/plugins/cmd_irc_plugin.py +++ b/storage/bot/plugins/cmd_irc_plugin.py @@ -19,10 +19,10 @@ from irc3.plugins.command import command ########################################################################################### ########################################################################################### -from plugins.tool_bus_plugin import BUS -from plugins.tool_colors_plugin import colorform as print -from plugins.tool_dims_plugin import dims -from plugins.tool_guds_plugin import guds +from tool_bus_plugin import BUS +from tool_colors_plugin import colorform as print +from tool_dims_plugin import dims +from tool_guds_plugin import guds ########################################################################################### ########################################################################################### @@ -95,7 +95,7 @@ class Plugin: ############################################################################### ############################################################################### - msg=f'<<< _____cmd_irc_plugin >>> [ ({sender_netroomchan})({sender_user})(listrooms)->({target}) ] - {room}' + msg=f'[ ({sender_netroomchan})({sender_user})(listrooms)->({target}) ] - {room}' print(msg) results.append(room) @@ -116,7 +116,7 @@ class Plugin: results=[] result=dims.list_channels_bridged() for _ in result: - msg=f'<<< _____cmd_irc_plugin >>> [ ({sender_netroomchan})({sender_user})(listbridges) ] - {_}' + msg=f'[ ({sender_netroomchan})({sender_user})(listbridges) ] - {_}' print(msg) if _[0]: channel=_[0] @@ -232,16 +232,16 @@ class Plugin: if SERVICES_DISCORD: #################### - msg=f'<<< _____cmd_irc_plugin >>> [ ({mask.nick}{target}).purgebridges()->({target}) ] - purging' + msg=f'[ ({mask.nick}{target}).purgebridges()->({target}) ] - purging' print(msg) - from plugins.net_discord_plugin import d_discord_cmd + from net_discord_plugin import d_discord_cmd d_discord_cmd(target,"purgebridges") ##### else: ##### - msg=f'<<< _____cmd_irc_plugin >>> [ ({mask.nick}{target}).purgebridges()->({target}) ] - command disabled, not servicing discord atm' + msg=f'[ ({mask.nick}{target}).purgebridges()->({target}) ] - command disabled, not servicing discord atm' print(msg) ###################################################################### NET IRC - MAIN [4/4] diff --git a/storage/bot/plugins/core_plugin.py b/storage/bot/plugins/core_plugin.py index dfb59ec..6f47642 100644 --- a/storage/bot/plugins/core_plugin.py +++ b/storage/bot/plugins/core_plugin.py @@ -3,7 +3,7 @@ from irc3 import event from irc3 import rfc -from plugins.tool_colors_plugin import colorform as print +from tool_colors_plugin import colorform as print __doc__ = ''' ============================================== diff --git a/storage/bot/plugins/crypto_plugin.py b/storage/bot/plugins/crypto_plugin.py index d9d6c68..69ed1e9 100644 --- a/storage/bot/plugins/crypto_plugin.py +++ b/storage/bot/plugins/crypto_plugin.py @@ -13,7 +13,7 @@ if SERVICES_CRYPTOCOMPARE: import sys from irc3.plugins.command import command import irc3,os,aiohttp, asyncio, async_timeout - from plugins.tool_colors_plugin import colorform as print + from tool_colors_plugin import colorform as print ####################################################################################### ####################################################################################### diff --git a/storage/bot/plugins/depumper_plugin.py b/storage/bot/plugins/depumper_plugin.py index 4c227f4..0124ba4 100644 --- a/storage/bot/plugins/depumper_plugin.py +++ b/storage/bot/plugins/depumper_plugin.py @@ -46,7 +46,7 @@ import requests from irc3.plugins.command import command from irc3.plugins.cron import cron -from plugins.tool_guds_plugin import guds +from tool_guds_plugin import guds ########################################################################################### ########################################################################################### diff --git a/storage/bot/plugins/dsa_plugin.py b/storage/bot/plugins/dsa_plugin.py index 4cfef26..01cfda0 100644 --- a/storage/bot/plugins/dsa_plugin.py +++ b/storage/bot/plugins/dsa_plugin.py @@ -13,7 +13,7 @@ from irc3.plugins.command import command import asyncio import irc3 -from plugins.tool_colors_plugin import colorform as print +from tool_colors_plugin import colorform as print import os import re from datetime import datetime, timedelta @@ -74,9 +74,9 @@ class Plugin: try: self.bot.dbio.hardchatters=self.bot.db.getlist("hardchatters", []) - print(f'<<< _________dsa_plugin >>> [ loaded database ] - hardchatters') + print(f'[ loaded database ] - hardchatters') except Exception as e: - print(f'<<< _________dsa_plugin >>> [ __init__ ] - hardchatter storage database: {e}') + print(f'[ __init__ ] - hardchatter storage database: {e}') self.bot.dbio.hardchatters=[] ################################################################################### @@ -84,9 +84,9 @@ class Plugin: try: self.bot.dbio.lurkers=self.bot.db.getlist("lurkers", []) - print(f'<<< _________dsa_plugin >>> [ loaded database ] - lurkers') + print(f'[ loaded database ] - lurkers') except Exception as e: - print(f'<<< _________dsa_plugin >>> [ __init__ ] - lurkers storage database: {e}') + print(f'[ __init__ ] - lurkers storage database: {e}') self.bot.dbio.lurkers=[] ####################################################################################### diff --git a/storage/bot/plugins/maple_plugin.py b/storage/bot/plugins/maple_plugin.py index 8e87e04..8f925b7 100644 --- a/storage/bot/plugins/maple_plugin.py +++ b/storage/bot/plugins/maple_plugin.py @@ -16,7 +16,7 @@ from time import time ########################################################################################### import irc3 -from plugins.tool_colors_plugin import colorform as print +from tool_colors_plugin import colorform as print ########################################################################################### ########################################################################################### @@ -219,7 +219,7 @@ class Plugin: os.makedirs(data_folder, exist_ok=True) target_folder_name=model_size+"_"+dataset+("_fs" if from_scratch else "_ft") target_folder=os.path.join(data_folder,target_folder_name) - print(f'<<< _______maple_plugin >>> [ downloading model files ] - path: {target_folder_name}') + print(f'[ downloading model files ] - path: {target_folder_name}') self.download_file(self.CONFIG_FILE[model_size],target_folder) self.download_file(self.VOCAB_FILE[model_size],target_folder) self.download_file(self.MERGE_FILE[model_size],target_folder) @@ -240,7 +240,7 @@ class Plugin: os.makedirs(data_folder,exist_ok=True) target_folder_name=model_size+'_reverse' target_folder=os.path.join(data_folder,target_folder_name) - print(f'<<< _______maple_plugin >>> [ downloading model files ] - path: {target_folder_name}') + print(f'[ downloading model files ] - path: {target_folder_name}') self.download_file(self.CONFIG_FILE[model_size],target_folder) self.download_file(self.VOCAB_FILE[model_size],target_folder) self.download_file(self.MERGE_FILE[model_size],target_folder) @@ -254,7 +254,7 @@ class Plugin: data_folder=config.get('model','data_folder') model_size=config.get('model','model_size') no_cuda=config.getboolean('model', 'no_cuda') - print(f'<<< _______maple_plugin >>> [ downloading model files ] - path: {target_folder_name}') + print(f'[ downloading model files ] - path: {target_folder_name}') device=torch.device("cuda" if torch.cuda.is_available() and not no_cuda else "cpu") target_folder=os.path.join(data_folder,target_folder_name) tokenizer=GPT2Tokenizer(os.path.join(target_folder, 'vocab.json'), os.path.join(target_folder,'merges.txt')) @@ -394,9 +394,9 @@ class Plugin: epoch_time_now=int(str(time()).split('.')[0]) if epoch_time_now-self.epoch_time_last>=30: self.epoch_time_boolean=False - print(f'<<< _______maple_plugin >>> [ turned off flood protection ]') + print(f'[ turned off flood protection ]') else: - print(f'<<< _______maple_plugin >>> [ flood protection still on ]') + print(f'[ flood protection still on ]') return data=data.strip().lower() self.bot.history.last_message=data @@ -413,12 +413,12 @@ class Plugin: if data.find('hang with us')>-1: msg="ok, i'll hang out for a bit" self.bot.privmsg(target,self.bot.emo(msg)) - print(f'<<< _______maple_plugin >>> [ maple is hanging out with us ]') + print(f'[ maple is hanging out with us ]') self.mode=1 if data.find('leave us alone')>-1: msg="ok, gotta go" self.bot.privmsg(target,self.bot.emo(msg)) - print(f'<<< _______maple_plugin >>> [ maple is no longer hanging out with us ]') + print(f'[ maple is no longer hanging out with us ]') self.mode=0 if self.mode==0: if not data.find(self.bot.config["nick"])>-1: @@ -433,7 +433,7 @@ class Plugin: self.epoch_time_last=self.epoch_time_now self.epoch_time_boolean=True msg=f"kind of busy at the moment {mask.nick}, i'll be right back" - print(f'<<< _______maple_plugin >>> [ turned on flood protection ]') + print(f'[ turned on flood protection ]') self.bot.privmsg(target,msg) ####################################################################################### @@ -446,13 +446,13 @@ class Plugin: net_src=net[1] net_dest=net[2] if self.epoch_time_boolean==True: - print(f'<<< _______maple_plugin >>> [ checking flood protection status ]') + print(f'[ checking flood protection status ]') epoch_time_now=int(str(time()).split('.')[0]) if epoch_time_now-self.epoch_time_last>=30: self.epoch_time_boolean=False - print(f'<<< _______maple_plugin >>> [ turned off flood protection ]') + print(f'[ turned off flood protection ]') else: - print(f'<<< _______maple_plugin >>> [ flood protection still on ]') + print(f'[ flood protection still on ]') return data=data.strip().lower() self.bot.history.last_message=data @@ -464,9 +464,9 @@ class Plugin: self.epoch_time_last=self.epoch_time_now self.epoch_time_boolean=True msg=f"kind of busy at the moment {net_user}, i'll be right back" - print(f'<<< _______maple_plugin >>> [ turned on flood protection ]') - from plugins.tool_bus_plugin import BUS - from plugins.tool_dims_plugin import dims + print(f'[ turned on flood protection ]') + from tool_bus_plugin import BUS + from tool_dims_plugin import dims netschanlist=dims.list_channels_bridged(netsrc=net_src) bridgedbus=(BUS(netschanlist)) await bridgedbus.input(net_src,net_user,msg,True) @@ -482,7 +482,7 @@ class Plugin: config.set('decoder','seed',f'{datetime.now().microsecond}') try: if not type(self.bot.history.bounce)==bool: - print(f'<<< _______maple_plugin >>> [ received bounce message ]') + print(f'[ received bounce message ]') USER=self.bot.history.bounce['user'] MESSAGE=self.bot.history.bounce['message'] TARGET=self.bot.history.bounce['target'] @@ -499,7 +499,7 @@ class Plugin: TARGET=maple_io['target'] except: return True - print(f'<<< _______maple_plugin >>> [ human > {MESSAGE} ] - {USER}{TARGET}') + print(f'[ human > {MESSAGE} ] - {USER}{TARGET}') self.bot.history.maple_message=MESSAGE if max_turns_history==0: @@ -547,7 +547,7 @@ class Plugin: for i in range(len(self.bot.history.maple_messages)): if self.bot.history.similar(maple_message,str(self.bot.history.maple_messages[i]))>0.9: self.maple_io.append({'user':USER,'message':f'{MESSAGE}','target':TARGET}) - print(f'<<< _______maple_plugin >>> [ maple - logic ! rejected ] - maple similarity - repeat of previous response') + print(f'[ maple - logic ! rejected ] - maple similarity - repeat of previous response') self.bot.history.loopcount+=1 return False @@ -556,7 +556,7 @@ class Plugin: if self.bot.history.similar(maple_message,MESSAGE)>0.9: self.maple_io.append({'user':USER,'message':f'{MESSAGE}','target':TARGET}) - print(f'<<< _______maple_plugin >>> [ maple - logic ! rejected ] - human mock - maple response same as human') + print(f'[ maple - logic ! rejected ] - human mock - maple response same as human') self.bot.history.loopcount+=1 return False @@ -567,7 +567,7 @@ class Plugin: i=len(set(maple_message.split())) if i>> [ maple - logic ! rejected ] - gpt loop glitch - reiterating same thing in multiples') + print(f'[ maple - logic ! rejected ] - gpt loop glitch - reiterating same thing in multiples') self.bot.history.loopcount+=1 return False @@ -577,15 +577,15 @@ class Plugin: n=len(maple_message.split()) if i<3: self.maple_io.append({'user':USER,'message':f'{MESSAGE}','target':TARGET}) - print(f'<<< _______maple_plugin >>> [ maple - logic ! rejected ] - limited response - skip an unfinished token chain') + print(f'[ maple - logic ! rejected ] - limited response - skip an unfinished token chain') self.bot.history.loopcount+=1 return False self.bot.history.push_maple_messages(maple_message) - print(f'<<< _______maple_plugin >>> [ maple > {maple_message} ]') + print(f'[ maple > {maple_message} ]') MAPLE_MESSAGE=maple_message.replace('lt 3','<3') msg=f'{MAPLE_MESSAGE}' - from plugins.tool_bus_plugin import BUS - from plugins.tool_dims_plugin import dims + from tool_bus_plugin import BUS + from tool_dims_plugin import dims netschanlist=dims.list_channels_bridged(netsrc=TARGET) netschanlist.append(TARGET) bridgedbus=(BUS(netschanlist)) diff --git a/storage/bot/plugins/net_discord_plugin.py b/storage/bot/plugins/net_discord_plugin.py index 77c4cef..817d1f9 100644 --- a/storage/bot/plugins/net_discord_plugin.py +++ b/storage/bot/plugins/net_discord_plugin.py @@ -23,7 +23,7 @@ if SERVICES_DISCORD: ####################################################################################### ####################################################################################### - from plugins.tool_colors_plugin import colorform as print + from tool_colors_plugin import colorform as print import irc3 ####################################################################################### @@ -40,9 +40,9 @@ if SERVICES_DISCORD: ####################################################################################### ####################################################################################### - from plugins.tool_bus_plugin import BUS - from plugins.tool_dims_plugin import dims - from plugins.tool_guds_plugin import guds + from tool_bus_plugin import BUS + from tool_dims_plugin import dims + from tool_guds_plugin import guds ####################################################################################### ####################################################################################### @@ -87,7 +87,7 @@ if SERVICES_DISCORD: ####################################################################################### def start_discordbot(self): - print(f'<<< _net_discord_plugin >>> [ discordbot started ]') + print(f'[ discordbot started ]') self.discordbot=DISCORDBOT() globals()['guds'].memories.append([self.discordbot,'net_discord_plugin:start_discordbot.self']) asyncio.set_event_loop(self.loop) @@ -120,13 +120,13 @@ if SERVICES_DISCORD: @client.event async def on_ready(): - print(f'<<< _net_discord_plugin >>> [ discordbot connection made as {globals()["DISCORDBOT"].client.user.name} ]') + print(f'[ discordbot connection made as {globals()["DISCORDBOT"].client.user.name} ]') ############################################################################### ############################################################################### async def listchannels(self): - print(f"<<< _net_discord_plugin >>> [ event: scanning channels ] - started") + print(f"[ event: scanning channels ] - started") discordchannels=list(globals()['DISCORDBOT'].client.get_all_channels()) if discordchannels[0].__class__.__name__=="CategoryChannel" and discordchannels[0].name=='bridged': for channel in discordchannels[0].channels: @@ -134,7 +134,7 @@ if SERVICES_DISCORD: result=dims.isdiscordchannel(channel_name) if not result: dims.__create__('discord',channel_name) - print(f"<<< _net_discord_plugin >>> [ event: new channel ] - dims.__create__(discord,{channel_name}) - active channel record created") + print(f"[ event: new channel ] - dims.__create__(discord,{channel_name}) - active channel record created") globals()['DISCORDBOT'].push(channel.id,channel.name) ############################################################################### @@ -150,11 +150,11 @@ if SERVICES_DISCORD: channel=client.get_channel(DISCORD__SCHAN) await asyncio.sleep(0.1) if not channel.last_message==None: - msg=f'<<< _net_discord_plugin >>> [ purging bridge ] - cycle: {purge_cycle}' + msg=f'[ purging bridge ] - cycle: {purge_cycle}' print(msg) await channel.purge() else: - msg=f'<<< _net_discord_plugin >>> [ purging bridge ] - completed' + msg=f'[ purging bridge ] - completed' print(msg) TRAP_FLAG=False @@ -176,7 +176,7 @@ if SERVICES_DISCORD: if not FLAG_FOUND: self.db.append([dc.id,f"^{dc.name}"]) self.ircbot.db.setlist(self.dbname,self.db) - print(f'<<< _net_discord_plugin >>> [ new database entry ] > [{dc.id},^{dc.name}]') + print(f'[ new database entry ] > [{dc.id},^{dc.name}]') ############################################################################### ############################################################################### @@ -200,7 +200,7 @@ if SERVICES_DISCORD: netschanlist.append(TARGET) bridgedbus=(BUS(netschanlist)) asyncio.run_coroutine_threadsafe(bridgedbus.input(TARGET,USER,message.content,True),ircbot.loop) - msg=f'<<< _net_discord_plugin >>> [ (d)({message.channel.id})({channel_name}) ] > {str(message.author)}: {message.content}' + msg=f'[ (d)({message.channel.id})({channel_name}) ] > {str(message.author)}: {message.content}' print(msg) ############################################################################### diff --git a/storage/bot/plugins/net_irc_plugin.py b/storage/bot/plugins/net_irc_plugin.py index 58168d9..c9641b3 100644 --- a/storage/bot/plugins/net_irc_plugin.py +++ b/storage/bot/plugins/net_irc_plugin.py @@ -22,10 +22,10 @@ if SERVICES_MATRIX: ########################################################################################### ########################################################################################### -from plugins.tool_dims_plugin import dims -from plugins.tool_guds_plugin import guds -from plugins.tool_bus_plugin import BUS -from plugins.tool_colors_plugin import colorform as print +from tool_dims_plugin import dims +from tool_guds_plugin import guds +from tool_bus_plugin import BUS +from tool_colors_plugin import colorform as print ########################################################################################### ########################################################################################### @@ -52,8 +52,6 @@ def config_ircbot(): autojoins = '#b0tsh0p' - '#tcpdirect' - '#PalletTown' flood_burst = 0 flood_rate = 1 @@ -105,7 +103,7 @@ def config_ircbot(): ########################################################################################### def start_ircbot(self): - print(f'<<< _____net_irc_plugin >>> [ ircbot started ]') + print(f'[ ircbot started ]') self.ircbot.loop=self.loop self.ircbot.run(forever=True) return self @@ -131,7 +129,7 @@ def d_irc_msg(target,msg,): class Plugin: def __init__(self,bot): self.bot=bot - print(f'<<< _____net_irc_plugin >>> [ plugin loaded ]') + print(f'[ plugin loaded ]') globals()['guds'].memories.append([self.bot,'net_irc_plugin:start_ircbot.self']) self.dbname="ircchat" @@ -139,26 +137,26 @@ class Plugin: ####################################################################################### def connection_made(self): - print(f'<<< _____net_irc_plugin >>> [ event: ircbot connection made ]') + print(f'[ event: ircbot connection made ]') ####################################################################################### ####################################################################################### def server_ready(self): - print(f'<<< _____net_irc_plugin >>> [ event: ircbot server ready ]') + print(f'[ event: ircbot server ready ]') ####################################################################################### ####################################################################################### def connection_lost(self): - print(f'<<< _____net_irc_plugin >>> [ event: ircbot connection lost ]') + print(f'[ event: ircbot connection lost ]') ####################################################################################### ####################################################################################### @irc3.event(irc3.rfc.PRIVMSG) async def on_privmsg(self, mask=None, target=None, data=None, **kw): - msg=f"<<< _____net_irc_plugin >>> [ (i)({self.bot.config['host']})({target}) ] > {mask.nick}: {regex.sub('',data)}" + msg=f"[ (i)({self.bot.config['host']})({target}) ] > {mask.nick}: {regex.sub('',data)}" print(msg) if not mask.nick==self.bot.config['nick']: # user if mask.nick.startswith('maple[m]'): return @@ -187,7 +185,7 @@ class Plugin: if not FLAG_FOUND: self.db.append([ircc.channel]) self.bot.db.setlist(self.dbname,self.db) - print(f'<<< _____net_irc_plugin >>> [ new database entry ] > [{ircc.channel}]') + print(f'[ new database entry ] > [{ircc.channel}]') ####################################################################################### ####################################################################################### @@ -196,27 +194,27 @@ class Plugin: def on_join_part_quit(self,mask=None,target=None,data=None,**kw): target=kw['channel'] if not mask.nick==self.bot.config['nick']: # this section is the user - msg=f'<<< _____net_irc_plugin >>> [ event: join_part_quit ] - nick: {mask.nick} - target: {target} - event: {kw["event"]} - data: {data}' + msg=f'[ event: join_part_quit ] - nick: {mask.nick} - target: {target} - event: {kw["event"]} - data: {data}' print(msg) else: if kw['event']=='JOIN': result,i=dims.isircchannel(channel=target,return_index=True) guds.mask=mask if not result: - msg=f'<<< _____net_irc_plugin >>> [ event: join_part_quit ] - nick: {mask.nick} - target: {target} - event: {kw["event"]} - data: {data}' + msg=f'[ event: join_part_quit ] - nick: {mask.nick} - target: {target} - event: {kw["event"]} - data: {data}' print(msg) dims.__create__('irc',target) print(f"<<< ___tool_dims_plugin >>> [ event: join ] - dims.__create__(irc,{target}) - active channel record created") self.push(target) elif kw['event']=='PART': result,i=dims.isircchannel(channel=target,return_index=True) - msg=f'<<< _____net_irc_plugin >>> [ event: join_part_quit ] - nick: {mask.nick} - target: {target} - event: {kw["event"]} - data: {data}' + msg=f'[ event: join_part_quit ] - nick: {mask.nick} - target: {target} - event: {kw["event"]} - data: {data}' print(msg) dims.__delete__('irc',i) print(f"<<< ___tool_dims_plugin >>> [ event: part ] - dims.__delete__(irc,{target}) - active channel record deleted") elif kw['event']=='QUIT': result,i=dims.isircchannel(target) - msg=f'<<< _____net_irc_plugin >>> [ event: join_part_quit ] - nick: {mask.nick} - target: {target} - event: {kw["event"]} - data: {data}' + msg=f'[ event: join_part_quit ] - nick: {mask.nick} - target: {target} - event: {kw["event"]} - data: {data}' print(msg) dims.__delete__('irc',i) print(f"<<< ___tool_dims_plugin >>> [ event: quit ] - dims.__delete__(irc,{target}) - active channel record deleted") @@ -228,7 +226,7 @@ class Plugin: def on_topic(self,mask=None,target=None,data=None,**kw): if not mask.nick==self.bot.config['nick']: msg=f"{mask.nick}: target: {target} - event: topic - data: {data}" - print("<<< _____net_irc_plugin >>> [ "+msg+" ]") + print("[ "+msg+" ]") ####################################################################################### ####################################################################################### @@ -237,7 +235,7 @@ class Plugin: def on_invite(self,mask=None,target=None,data=None,**kw): if not mask.nick==self.bot.config['nick']: msg=f"{mask.nick}: target: {target} - event: invite - data: {data}" - print("<<< _____net_irc_plugin >>> [ "+msg+" ]") + print("[ "+msg+" ]") ####################################################################################### ####################################################################################### @@ -247,7 +245,7 @@ class Plugin: try: if not mask.nick==self.bot.config['nick']: msg=f"{mask.nick}: target: {target} - event: kick - data: {data}" - print("<<< _____net_irc_plugin >>> [ "+msg+" ]") + print("[ "+msg+" ]") except: pass @@ -259,7 +257,7 @@ class Plugin: try: if not mask.nick==self.bot.config['nick']: msg=f"{mask.nick}: target: {target} - event: mode - data: {data}" - print("<<< _____net_irc_plugin >>> [ "+msg+" ]") + print("[ "+msg+" ]") except: pass @@ -271,7 +269,7 @@ class Plugin: try: if not mask.nick==self.bot.config['nick']: msg=f"{mask.nick}: target: {target} - event: new_nick - data: {data}" - print("<<< _____net_irc_plugin >>> [ "+msg+" ]") + print("[ "+msg+" ]") except: pass @@ -283,7 +281,7 @@ class Plugin: try: if not mask.nick==self.bot.config['nick']: msg=f"{mask.nick}: target: {target} - event: ctcp - data: {data}" - print("<<< _____net_irc_plugin >>> [ "+msg+" ]") + print("[ "+msg+" ]") except: pass diff --git a/storage/bot/plugins/net_matrix_plugin.py b/storage/bot/plugins/net_matrix_plugin.py index 80380d5..fe86923 100644 --- a/storage/bot/plugins/net_matrix_plugin.py +++ b/storage/bot/plugins/net_matrix_plugin.py @@ -12,12 +12,12 @@ if SERVICES_MATRIX: import irc3, asyncio, os, re, sys, aiofiles.os from nio import AsyncClient, MatrixRoom, RoomMessageText, UploadResponse - from plugins.tool_dims_plugin import dims - from plugins.tool_guds_plugin import guds + from tool_dims_plugin import dims + from tool_guds_plugin import guds from irc3.plugins.command import command - from plugins.tool_bus_plugin import BUS + from tool_bus_plugin import BUS from datetime import datetime - from plugins.tool_colors_plugin import colorform as print + from tool_colors_plugin import colorform as print ####################################################################################### ####################################################################################### @@ -49,7 +49,7 @@ if SERVICES_MATRIX: def add_credentials(credential): matrix_bot_credentials.append(credential) - print(f'<<< __net_matrix_plugin >>> [ add_credentials ] - added {credential} credentials to net_matrix_plugin.matrix_bot_credentials') + print(f'[ add_credentials ] - added {credential} credentials to net_matrix_plugin.matrix_bot_credentials') ####################################################################################### ####################################################################################### @@ -59,16 +59,16 @@ if SERVICES_MATRIX: for credential in matrix_bot_credentials: if not credential.find(against_credential): flag_match=True - print(f'<<< __net_matrix_plugin >>> [ check_credentials ] - found {credential} against {against_credential}') + print(f'[ check_credentials ] - found {credential} against {against_credential}') if not flag_match: - print(f'<<< __net_matrix_plugin >>> [ check_credentials ] - no credentials found matching {against_credential}') + print(f'[ check_credentials ] - no credentials found matching {against_credential}') return flag_match ####################################################################################### ####################################################################################### def start_matrixbot(self): - print(f'<<< __net_matrix_plugin >>> [ matrixbot started ]') + print(f'[ matrixbot started ]') add_credentials("@maple.or.g1mp:matrix.org") add_credentials("@maple:pcriot.org") self.matrixbot=MATRIXBOT() @@ -104,7 +104,7 @@ if SERVICES_MATRIX: self.dbname="matrixchat" self.db=self.ircbot.db.getlist(self.dbname) if not self.db: self.db=[] - print(f'<<< __net_matrix_plugin >>> [ plugin loaded ]') + print(f'[ plugin loaded ]') globals()['guds'].memories.append([self,'net_matrix_plugin:start_matrixbot.self']) ################################################################################### @@ -112,7 +112,7 @@ if SERVICES_MATRIX: async def message_callback(self,room: MatrixRoom, event: RoomMessageText) -> None: if guds.timestamp_check('matrix_boot')==False: return - print(f"<<< __net_matrix_plugin >>> [ (m)({room.room_id})({room.display_name}) ] > {room.user_name(event.sender)}: {event.body}") + print(f"[ (m)({room.room_id})({room.display_name}) ] > {room.user_name(event.sender)}: {event.body}") if event.sender==self.client.user_id or event.sender=="@ircd_maple:tcp.direct": return # ignore messages from self, e.g. @maple:pcriot.org user_src=str(event.sender)[1:].split(":")[0] @@ -132,7 +132,7 @@ if SERVICES_MATRIX: asyncio.run_coroutine_threadsafe(ircbot.indirect_maple([user_src,room.room_id,"#tcpdirect"],event.body),ircbot.loop) print('message_callback before ? check') if event.body.startswith("?"): - from plugins.cmd_irc_plugin import d_cmd_irc + from cmd_irc_plugin import d_cmd_irc if not event.body.find('listrooms')==-1: d_cmd_irc(room.room_id,event.sender,'!OftXgmqAFOPEatmvLU:pcriot.org','listrooms','') elif not event.body.find('purgebridges')==-1: @@ -154,7 +154,7 @@ if SERVICES_MATRIX: if not FLAG_FOUND: self.db.append([mc.room_id]) self.ircbot.db.setlist(self.dbname,self.db) - print(f'<<< __net_matrix_plugin >>> [ new database entry ] > [{mc.room_id}]') + print(f'[ new database entry ] > [{mc.room_id}]') ################################################################################### ################################################################################### @@ -167,12 +167,12 @@ if SERVICES_MATRIX: for _room in joined_rooms.rooms: result=dims.ismatrixroom(_room) if not result: - msg=f'<<< __net_matrix_plugin >>> [ event: join ] - user_id: {self.client.user_id} - target: {_room}' + msg=f'[ event: join ] - user_id: {self.client.user_id} - target: {_room}' print(msg) dims.__create__('matrix',_room) print(f"<<< ___tool_dims_plugin >>> [ event: join ] - dims.__create__(matrix,{_room}) - active room record created") self.push(_room) - print(f'<<< __net_matrix_plugin >>> [ await client.sync_forever(timeout=5000) ]') + print(f'[ await client.sync_forever(timeout=5000) ]') await self.client.sync_forever(timeout=5000) # milliseconds ########################################################################################### diff --git a/storage/bot/plugins/net_telegram_plugin.py b/storage/bot/plugins/net_telegram_plugin.py index eb4ac57..765c501 100644 --- a/storage/bot/plugins/net_telegram_plugin.py +++ b/storage/bot/plugins/net_telegram_plugin.py @@ -29,10 +29,10 @@ if SERVICES_TELEGRAM: ####################################################################################### ####################################################################################### - from plugins.tool_bus_plugin import BUS - from plugins.tool_dims_plugin import dims - from plugins.tool_guds_plugin import guds - from plugins.tool_colors_plugin import colorform as print + from tool_bus_plugin import BUS + from tool_dims_plugin import dims + from tool_guds_plugin import guds + from tool_colors_plugin import colorform as print ####################################################################################### ####################################################################################### @@ -56,7 +56,7 @@ if SERVICES_TELEGRAM: ####################################################################################### def start_telegrambot(self): - print(f'<<< net_telegram_plugin >>> [ telegrambot started ]') + print(f'[ telegrambot started ]') self.telegrambot=TELEGRAMBOT() globals()['guds'].memories.append([self.telegrambot,'net_telegram_plugin:start_telegrambot.self']) self.telegrambot.main() @@ -120,21 +120,21 @@ if SERVICES_TELEGRAM: if not FLAG_FOUND: self.db.append([tgc.id,f"${tgc.title}",tgc.type]) self.ircbot.db.setlist(self.dbname,self.db) - print(f'<<< net_telegram_plugin >>> [ new database entry ] > [{tgc.id},${tgc.title},{tgc.type}]') + print(f'[ new database entry ] > [{tgc.id},${tgc.title},{tgc.type}]') ################################################################################### ################################################################################### def echo(self,update,context): - from plugins.tool_bus_plugin import BUS - from plugins.tool_dims_plugin import dims + from tool_bus_plugin import BUS + from tool_dims_plugin import dims group_title=f"${self.api.get_chat(context._chat_id_and_data[0]).title}" result=dims.istelegramgroup(group_title) TARGET="$b0tsh0p" USER=update.message.from_user.username if not result: dims.__create__('telegram',group_title) - print(f"<<< net_telegram_plugin >>> [ event: new group ] - dims.__create__(telegram,{group_title}) - active group record created") + print(f"[ event: new group ] - dims.__create__(telegram,{group_title}) - active group record created") self.push(context._chat_id_and_data[0]) ircbot=guds.memory('ircbot') asyncio.run_coroutine_threadsafe(self.ircbot.indirect_maple([USER,"$b0tsh0p","#tcpdirect"],update.message.text),self.ircbot.loop) diff --git a/storage/bot/plugins/openai_plugin.py b/storage/bot/plugins/openai_plugin.py index ef0f9c1..5930f87 100644 --- a/storage/bot/plugins/openai_plugin.py +++ b/storage/bot/plugins/openai_plugin.py @@ -22,7 +22,7 @@ if SERVICES_OPENAI: from random import randint as rint from random import choices from glob import glob - from plugins.tool_colors_plugin import colorform as print + from tool_colors_plugin import colorform as print ####################################################################################### ####################################################################################### @@ -159,14 +159,14 @@ if SERVICES_OPENAI: term=' '.join(args['']) if not term[-1] == ".": term+="." openai.api_key = OPENAI_KEY - print(f"<<< openai: processing {target} {mask.nick.lower()} message: {term.lower()}") + print(f"processing {target} {mask.nick.lower()} message: {term.lower()}") MESSAGE_OK=True TRAP_OK=True LOOP_COUNT_LIMIT=5 LOOP_COUNT=0 while MESSAGE_OK: LOOP_COUNT+=1 - print(f'<<< loop: {LOOP_COUNT} >>>') + print(f'loop: {LOOP_COUNT}') prompt_text=f'{term}' self.lastterm=f'{term}' response=openai.Completion.create( @@ -197,9 +197,9 @@ if SERVICES_OPENAI: else: self.bot.privmsg(target, f"{COLOR}{_.strip()}\x0F") MESSAGE_OK=False - print('<<< openai finished >>>') + print('finished') if LOOP_COUNT > LOOP_COUNT_LIMIT: - print(f"<<< openai failed: bouncing to mapleai >>>") + print(f"failed: bouncing to mapleai") self.bot.history.bounce={'user':USER,'message':term,'target':target} break diff --git a/storage/bot/plugins/tool_bus_plugin.py b/storage/bot/plugins/tool_bus_plugin.py index 4a94162..b1b4723 100644 --- a/storage/bot/plugins/tool_bus_plugin.py +++ b/storage/bot/plugins/tool_bus_plugin.py @@ -15,9 +15,9 @@ if SERVICES_MATRIX: ########################################################################################### global bus, dims, ircbot -from plugins.tool_dims_plugin import dims -from plugins.tool_guds_plugin import guds -from plugins.tool_colors_plugin import colorform as print +from tool_dims_plugin import dims +from tool_guds_plugin import guds +from tool_colors_plugin import colorform as print from random import randint as rint import re @@ -68,7 +68,7 @@ class BUS: ####################################################################################### async def output(self,netschanroom_src,data): - from plugins.net_irc_plugin import d_irc_msg + from net_irc_plugin import d_irc_msg ################################################################################### ################################################################################### @@ -76,7 +76,7 @@ class BUS: if SERVICES_MATRIX: ################### - from plugins.net_matrix_plugin import d_matrix_msg + from net_matrix_plugin import d_matrix_msg ################################################################################### ################################################################################### @@ -93,7 +93,7 @@ class BUS: for _data in data: d_matrix_msg(target,regex.sub("",_data)) - msg=f"<<< ____tool_bus_plugin >>> [ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {regex.sub('',_data)}" + msg=f"[ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {regex.sub('',_data)}" ############################ elif target.startswith('#'): @@ -101,7 +101,7 @@ class BUS: for _data in data: d_irc_msg(target,_data) - msg=f'<<< ____tool_bus_plugin >>> [ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {_data}' + msg=f'[ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {_data}' ########################################################################### else: @@ -110,14 +110,14 @@ class BUS: ############################################## d_matrix_msg(target,regex.sub('',data)) - msg=f"<<< ____tool_bus_plugin >>> [ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {regex.sub('',data)}" + msg=f"[ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {regex.sub('',data)}" ############################ elif target.startswith('#'): ############################ d_irc_msg(target,data) - msg=f'<<< ____tool_bus_plugin >>> [ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {data}' + msg=f'[ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {data}' ########################################################################### ########################################################################### @@ -136,7 +136,7 @@ class BUS: ############################################## for _data in data: d_matrix_msg(target,regex.sub('',_data)) - msg=f"<<< ____tool_bus_plugin >>> [ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {regex.sub('',_data)}" + msg=f"[ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {regex.sub('',_data)}" ############################ elif target.startswith('#'): @@ -144,7 +144,7 @@ class BUS: for msg in data: d_irc_msg(target,_data) - msg=f'<<< ____tool_bus_plugin >>> [ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {_data}' + msg=f'[ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {_data}' ############################################################################### ############################################################################### @@ -156,14 +156,14 @@ class BUS: ############################################## d_matrix_msg(target,regex.sub('',data)) - msg=f"<<< ____tool_bus_plugin >>> [ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {regex.sub('',data)}" + msg=f"[ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {regex.sub('',data)}" ############################ elif target.startswith('#'): ############################ d_irc_msg(target,data) - msg=f'<<< ____tool_bus_plugin >>> [ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {data}' + msg=f'[ BUS.output ] - {self.sortnet(chanroom)}({chanroom})({usernick})->{self.sortnet(target)}({target}) > {data}' ############################################################################### ############################################################################### @@ -189,25 +189,25 @@ class BUS: #if prefix_src=="": return for network_chanroom_dest in self.bridged_network_roomchans: - from plugins.net_irc_plugin import d_irc_msg + from net_irc_plugin import d_irc_msg ################### if SERVICES_MATRIX: ################### - from plugins.net_matrix_plugin import d_matrix_msg + from net_matrix_plugin import d_matrix_msg #################### if SERVICES_DISCORD: #################### - from plugins.net_discord_plugin import d_discord_msg + from net_discord_plugin import d_discord_msg ##################### if SERVICES_TELEGRAM: ##################### - from plugins.net_telegram_plugin import d_telegram_msg + from net_telegram_plugin import d_telegram_msg #################################################################### ROUTER #################################################################### ROUTER diff --git a/storage/bot/plugins/tool_colors_plugin.py b/storage/bot/plugins/tool_colors_plugin.py index 84259b0..77a537b 100644 --- a/storage/bot/plugins/tool_colors_plugin.py +++ b/storage/bot/plugins/tool_colors_plugin.py @@ -30,6 +30,7 @@ def colorform(data): try: self_name = codeobj.co_varnames[0] except IndexError: + self_name = None caller = None raise Exception() try: @@ -61,7 +62,7 @@ def colorform(data): ################################################################################### ################################################################################### - self = "" + self = None ################################################################################### ################################################################################### @@ -74,7 +75,10 @@ def colorform(data): the_origin=codeobj.co_filename.split('/')[-1].replace('.py','') the_origin="_"*(19-len(the_origin))+the_origin - msg=f'{rgb(b=255)}<<<{rgb(g=255,b=255)} {the_origin} {rgb(b=255)}>>> ' + try: + msg=f'{rgb(b=255)}<<<{rgb(g=255,b=255)} {the_origin} {rgb(b=255)}>>> ' + except: + msg='break' if self and data and caller: the_class="" @@ -83,24 +87,29 @@ def colorform(data): msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{caller}.{the_class}.{the_call} {rgb(r=255)}]' else: origin=codeobj.co_filename.split('/')[-1].replace('.py','') - msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{origin}.{the_call}.{caller}.{__name__}.{the_class}.{the_function} {rgb(r=255)}]' + msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{the_call}.{caller} {rgb(r=255)}]' msg+=f'{rgb(b=255)} - ' msg+=f'{rgb(g=128,b=128,r=128)}{data}' else: - caller=str(self).split(f'<{__name__}.')[1].split()[0] + try: + caller=str(self).split(f'<{__name__}.')[1].split()[0] + except: + caller="" if not self_name and the_call=="": if codeobj.co_filename==the_caller_path_to_file: msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{__name__}.{caller}.{the_function} {rgb(r=255)}]' else: origin=codeobj.co_filename.split('/')[-1].replace('.py','') - msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{origin}.{__name__}.{caller}.{the_function} {rgb(r=255)}]' + msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{origin} {rgb(r=255)}]' + # msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{origin}.{__name__}.{caller}.{the_function} {rgb(r=255)}]' else: if codeobj.co_filename==the_caller_path_to_file: - msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{self_name}.{the_call}.{caller}.{the_function} {rgb(r=255)}]' + msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{the_call} {rgb(r=255)}]' + # msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{self_name}.{the_call}.{caller}.{the_function} {rgb(r=255)}]' else: caller=codeobj.co_filename.split('/')[-1].replace('.py','') the_origin=str(self_type).split("'")[1] - print(f'{rgb(r=255)}[ {rgb(r=255,b=255)}{the_origin}.{the_call}.{caller}.{the_function} {rgb(r=255)}]') + msg+=f'{rgb(r=255)}[ {rgb(r=255,b=255)}{the_origin}.{the_call} {rgb(r=255)}]'.replace(f'plugins.{caller}.Plugin.','').replace(f'plugins.{caller}.','') msg+=f'{rgb(b=255)} - ' msg+=f'{rgb(g=128,b=128,r=128)}{data}' print(msg) diff --git a/storage/bot/plugins/tool_dims_plugin.py b/storage/bot/plugins/tool_dims_plugin.py index 4833a62..f5f1282 100644 --- a/storage/bot/plugins/tool_dims_plugin.py +++ b/storage/bot/plugins/tool_dims_plugin.py @@ -9,7 +9,7 @@ ########################################################################################### from irc3.plugins.command import command -from plugins.tool_guds_plugin import guds +from tool_guds_plugin import guds import asyncio global dims diff --git a/storage/bot/plugins/tool_guds_plugin.py b/storage/bot/plugins/tool_guds_plugin.py index 2ca795b..534d5e9 100644 --- a/storage/bot/plugins/tool_guds_plugin.py +++ b/storage/bot/plugins/tool_guds_plugin.py @@ -4,7 +4,7 @@ from datetime import datetime from datetime import timedelta import timeago -from plugins.tool_colors_plugin import colorform as print +from tool_colors_plugin import colorform as print global guds # global unified data system 2 move instantiated data between processes/threads ########################################################################################### @@ -32,9 +32,9 @@ class GUDS: timestamp=datetime.now().timestamp() timestamp+=iseconds self.timestamped_alarm.append([reason,False,timestamp]) - print(f'<<< ________guds_plugin >>> [ timestamp_alarm ] - active: {reason} - alarm: {timestamp} - now: {datetime.now().timestamp()}') + print(f'[ timestamp_alarm ] - active: {reason} - alarm: {timestamp} - now: {datetime.now().timestamp()}') except: - print('<<< ________guds_plugin >>> [ timestamp_alarm ] - error') + print('[ timestamp_alarm ] - error') ####################################################################################### ####################################################################################### @@ -60,10 +60,10 @@ class GUDS: # print(f'timeleft on alarm: {timeago.format(then,now)} - {int(then-now)}') return False if REASON_FLAG: - print('<<< ________guds_plugin >>> [ timestamp_check ] timestamped reason not found') + print('[ timestamp_check ] timestamped reason not found') return -1 except: - print('<<< ________guds_plugin >>> [ timestamp_check ] timestamp_check error') + print('[ timestamp_check ] timestamp_check error') return -1 ####################################################################################### @@ -80,7 +80,7 @@ class GUDS: def push(self,data): self.push_index+=1 self.memories.append(data) - print(f'<<< ________guds_plugin >>> [ data pushed into guds.memories[{str(self.push_index)}]={guds.memories[-1]} ]') + print(f'[ data pushed into guds.memories[{str(self.push_index)}]={guds.memories[-1]} ]') ########################################################################################### ########################################################################################### diff --git a/storage/bot/plugins/twitter_plugin.py b/storage/bot/plugins/twitter_plugin.py index 30fea89..0f08a1c 100644 --- a/storage/bot/plugins/twitter_plugin.py +++ b/storage/bot/plugins/twitter_plugin.py @@ -23,7 +23,7 @@ if SERVICES_TWITTER: import requests from lxml.html import fromstring from difflib import SequenceMatcher - from plugins.tool_colors_plugin import colorform as print + from tool_colors_plugin import colorform as print ####################################################################################### ####################################################################################### diff --git a/storage/bot/plugins/txt2img_plugin.py b/storage/bot/plugins/txt2img_plugin.py index e2d363c..d9b2265 100644 --- a/storage/bot/plugins/txt2img_plugin.py +++ b/storage/bot/plugins/txt2img_plugin.py @@ -31,7 +31,7 @@ import io from irc3.plugins.command import command from irc3.plugins.cron import cron from PIL import Image, PngImagePlugin -from plugins.tool_colors_plugin import colorform as print +from tool_colors_plugin import colorform as print ########################################################################################### ########################################################################################### diff --git a/storage/bot/plugins/youtube_plugin.py b/storage/bot/plugins/youtube_plugin.py index 970faf2..13869b0 100644 --- a/storage/bot/plugins/youtube_plugin.py +++ b/storage/bot/plugins/youtube_plugin.py @@ -20,7 +20,7 @@ if SERVICES_YOUTUBE: import timeago import isodate from apiclient.discovery import build - from plugins.tool_colors_plugin import colorform as print + from tool_colors_plugin import colorform as print ####################################################################################### ####################################################################################### diff --git a/storage/bot/variants/core/bot_maple__core__initial_plugins.txt b/storage/bot/variants/core/bot_maple__core__initial_plugins.txt index bcb20b5..f9574f1 100644 --- a/storage/bot/variants/core/bot_maple__core__initial_plugins.txt +++ b/storage/bot/variants/core/bot_maple__core__initial_plugins.txt @@ -1,41 +1,41 @@ irc3.plugins.log irc3.plugins.logger irc3.plugins.command - plugins.storage_plugin - plugins.fifo_plugin - plugins.auth_sasl_plugin - plugins.auth_nickserv_plugin - plugins.net_hydra_plugin - plugins.tool_colors_plugin - plugins.tool_log_plugin - # plugins.timezonediff_plugin - # plugins.remind_plugin - # plugins.net_hydra_plugin - # plugins.ansi_plugin - # plugins.net_matrix_plugin - # plugins.net_discord_plugin - # plugins.net_telegram_plugin - # plugins.youtube_plugin - # plugins.crypto_plugin - # plugins.url_grabber_plugin - # plugins.notes_plugin - # plugins.quote_plugin - # plugins.ratesex_plugin - # plugins.sed_plugin - # plugins.seen_plugin - # plugins.strain_plugin - # plugins.tell_plugin - # plugins.twitter_plugin - # plugins.ud_plugin - # plugins.figlet_plugin - # plugins.soundcloud_plugin - # plugins.isup_plugin - # plugins.ip_plugin - # plugins.tcpac_plugin - # plugins.google_plugin - # plugins.highlight_plugin - # plugins.boombox_plugin - # plugins.whoami_plugin - # plugins.joke_plugin - # plugins.maple_plugin - # plugins.openai_plugin + storage_plugin + fifo_plugin + auth_sasl_plugin + auth_nickserv_plugin + net_hydra_plugin + tool_colors_plugin + tool_log_plugin + # timezonediff_plugin + # remind_plugin + # net_hydra_plugin + # ansi_plugin + # net_matrix_plugin + # net_discord_plugin + # net_telegram_plugin + # youtube_plugin + # crypto_plugin + # url_grabber_plugin + # notes_plugin + # quote_plugin + # ratesex_plugin + # sed_plugin + # seen_plugin + # strain_plugin + # tell_plugin + # twitter_plugin + # ud_plugin + # figlet_plugin + # soundcloud_plugin + # isup_plugin + # ip_plugin + # tcpac_plugin + # google_plugin + # highlight_plugin + # boombox_plugin + # whoami_plugin + # joke_plugin + # maple_plugin + # openai_plugin diff --git a/storage/bot/variants/default/bot_maple__default__initial_plugins.txt b/storage/bot/variants/default/bot_maple__default__initial_plugins.txt index cd1c754..5d4271b 100644 --- a/storage/bot/variants/default/bot_maple__default__initial_plugins.txt +++ b/storage/bot/variants/default/bot_maple__default__initial_plugins.txt @@ -6,48 +6,48 @@ irc3.plugins.log irc3.plugins.logger irc3.plugins.userlist - plugins.tool_dims_plugin - plugins.tool_guds_plugin - plugins.tool_bus_plugin - plugins.auth_sasl_plugin - plugins.auth_nickserv_plugin - plugins.net_irc_plugin - plugins.net_matrix_plugin - plugins.net_discord_plugin - plugins.net_telegram_plugin - plugins.cmd_irc_plugin - plugins.storage_plugin - plugins.base_plugin - plugins.emote_plugin - plugins.fifo_plugin - plugins.youtube_plugin - plugins.crypto_plugin - plugins.url_grabber_plugin - plugins.notes_plugin - plugins.quote_plugin - plugins.ratesex_plugin - plugins.remind_plugin - plugins.timezonediff_plugin - plugins.sed_plugin - plugins.seen_plugin - plugins.strain_plugin - plugins.tell_plugin - plugins.twitter_plugin - plugins.ud_plugin - plugins.figlet_plugin - plugins.soundcloud_plugin - plugins.isup_plugin - plugins.tcpac_plugin - plugins.google_plugin - plugins.highlight_plugin - plugins.boombox_plugin - plugins.whoami_plugin - plugins.joke_plugin - plugins.maple_plugin - plugins.openai_plugin - plugins.datetime_plugin - plugins.ip_plugin - plugins.tool_colors_plugin - plugins.tool_log_plugin - plugins.net_hydra_plugin - #plugins.ansi_plugin + tool_dims_plugin + tool_guds_plugin + tool_bus_plugin + auth_sasl_plugin + auth_nickserv_plugin + net_irc_plugin + net_matrix_plugin + net_discord_plugin + net_telegram_plugin + cmd_irc_plugin + storage_plugin + base_plugin + emote_plugin + fifo_plugin + youtube_plugin + crypto_plugin + url_grabber_plugin + notes_plugin + quote_plugin + ratesex_plugin + remind_plugin + timezonediff_plugin + sed_plugin + seen_plugin + strain_plugin + tell_plugin + twitter_plugin + ud_plugin + figlet_plugin + soundcloud_plugin + isup_plugin + tcpac_plugin + google_plugin + highlight_plugin + boombox_plugin + whoami_plugin + joke_plugin + maple_plugin + openai_plugin + datetime_plugin + ip_plugin + tool_colors_plugin + tool_log_plugin + net_hydra_plugin + # ansi_plugin diff --git a/storage/bot/variants/dupe/bot_maple__devops.py b/storage/bot/variants/dupe/bot_maple__devops.py index cdff465..4f1d093 100644 --- a/storage/bot/variants/dupe/bot_maple__devops.py +++ b/storage/bot/variants/dupe/bot_maple__devops.py @@ -19,30 +19,30 @@ from time import sleep if SERVICES_MATRIX: from nio import AsyncClient, MatrixRoom, RoomMessageText - from plugins.net_matrix_plugin import start_matrixbot + from net_matrix_plugin import start_matrixbot ########################################################################################### ########################################################################################### if SERVICES_DISCORD: - from plugins.net_discord_plugin import start_discordbot + from net_discord_plugin import start_discordbot ########################################################################################### ########################################################################################### if SERVICES_TELEGRAM: - from plugins.net_telegram_plugin import start_telegrambot + from net_telegram_plugin import start_telegrambot ########################################################################################### ########################################################################################### import irc3 -from plugins.net_irc_plugin import config_ircbot, start_ircbot -from plugins.tool_bus_plugin import BUS -from plugins.tool_dims_plugin import dims -from plugins.tool_guds_plugin import guds -from plugins.tool_colors_plugin import colorform as print -from plugins.tool_colors_plugin import COLORFORM as INFO +from net_irc_plugin import config_ircbot, start_ircbot +from tool_bus_plugin import BUS +from tool_dims_plugin import dims +from tool_guds_plugin import guds +from tool_colors_plugin import colorform as print +from tool_colors_plugin import COLORFORM as INFO ########################################################################################### ########################################################################################### diff --git a/storage/bot/variants/dupe/bot_maple__devops__initial_plugins.txt b/storage/bot/variants/dupe/bot_maple__devops__initial_plugins.txt index ae83e73..591c0f5 100644 --- a/storage/bot/variants/dupe/bot_maple__devops__initial_plugins.txt +++ b/storage/bot/variants/dupe/bot_maple__devops__initial_plugins.txt @@ -6,47 +6,47 @@ irc3.plugins.log irc3.plugins.logger irc3.plugins.userlist - plugins.tool_dims_plugin - plugins.tool_guds_plugin - plugins.tool_bus_plugin - plugins.auth_sasl_plugin - plugins.auth_nickserv_plugin - plugins.net_hydra_plugin - plugins.net_irc_plugin - plugins.cmd_irc_plugin - plugins.storage_plugin - plugins.base_plugin - plugins.emote_plugin - plugins.fifo_plugin - plugins.tool_colors_plugin - plugins.tool_log_plugin - plugins.net_hydra_plugin - # plugins.timezonediff_plugin - # plugins.remind_plugin - # plugins.ansi_plugin - # plugins.net_matrix_plugin - # plugins.net_discord_plugin - # plugins.net_telegram_plugin - # plugins.youtube_plugin - # plugins.crypto_plugin - # plugins.url_grabber_plugin - # plugins.notes_plugin - # plugins.quote_plugin - # plugins.ratesex_plugin - # plugins.sed_plugin - # plugins.seen_plugin - # plugins.strain_plugin - # plugins.tell_plugin - # plugins.twitter_plugin - # plugins.ud_plugin - # plugins.figlet_plugin - # plugins.soundcloud_plugin - # plugins.isup_plugin - # plugins.tcpac_plugin - # plugins.google_plugin - # plugins.highlight_plugin - # plugins.boombox_plugin - # plugins.whoami_plugin - # plugins.joke_plugin - # plugins.maple_plugin - # plugins.openai_plugin + tool_dims_plugin + tool_guds_plugin + tool_bus_plugin + auth_sasl_plugin + auth_nickserv_plugin + net_hydra_plugin + net_irc_plugin + cmd_irc_plugin + storage_plugin + base_plugin + emote_plugin + fifo_plugin + tool_colors_plugin + tool_log_plugin + net_hydra_plugin + # timezonediff_plugin + # remind_plugin + # ansi_plugin + # net_matrix_plugin + # net_discord_plugin + # net_telegram_plugin + # youtube_plugin + # crypto_plugin + # url_grabber_plugin + # notes_plugin + # quote_plugin + # ratesex_plugin + # sed_plugin + # seen_plugin + # strain_plugin + # tell_plugin + # twitter_plugin + # ud_plugin + # figlet_plugin + # soundcloud_plugin + # isup_plugin + # tcpac_plugin + # google_plugin + # highlight_plugin + # boombox_plugin + # whoami_plugin + # joke_plugin + # maple_plugin + # openai_plugin diff --git a/storage/bot/variants/dupe/bot_maple__services.py b/storage/bot/variants/dupe/bot_maple__services.py index cdff465..4f1d093 100644 --- a/storage/bot/variants/dupe/bot_maple__services.py +++ b/storage/bot/variants/dupe/bot_maple__services.py @@ -19,30 +19,30 @@ from time import sleep if SERVICES_MATRIX: from nio import AsyncClient, MatrixRoom, RoomMessageText - from plugins.net_matrix_plugin import start_matrixbot + from net_matrix_plugin import start_matrixbot ########################################################################################### ########################################################################################### if SERVICES_DISCORD: - from plugins.net_discord_plugin import start_discordbot + from net_discord_plugin import start_discordbot ########################################################################################### ########################################################################################### if SERVICES_TELEGRAM: - from plugins.net_telegram_plugin import start_telegrambot + from net_telegram_plugin import start_telegrambot ########################################################################################### ########################################################################################### import irc3 -from plugins.net_irc_plugin import config_ircbot, start_ircbot -from plugins.tool_bus_plugin import BUS -from plugins.tool_dims_plugin import dims -from plugins.tool_guds_plugin import guds -from plugins.tool_colors_plugin import colorform as print -from plugins.tool_colors_plugin import COLORFORM as INFO +from net_irc_plugin import config_ircbot, start_ircbot +from tool_bus_plugin import BUS +from tool_dims_plugin import dims +from tool_guds_plugin import guds +from tool_colors_plugin import colorform as print +from tool_colors_plugin import COLORFORM as INFO ########################################################################################### ########################################################################################### diff --git a/storage/bot/variants/dupe/bot_maple__services__initial_plugins.txt b/storage/bot/variants/dupe/bot_maple__services__initial_plugins.txt index 44d1587..ad6ce90 100644 --- a/storage/bot/variants/dupe/bot_maple__services__initial_plugins.txt +++ b/storage/bot/variants/dupe/bot_maple__services__initial_plugins.txt @@ -6,49 +6,49 @@ irc3.plugins.log irc3.plugins.logger irc3.plugins.userlist - plugins.tool_dims_plugin - plugins.tool_guds_plugin - plugins.tool_bus_plugin - plugins.auth_sasl_plugin - plugins.auth_nickserv_plugin - plugins.net_hydra_plugin - plugins.net_irc_plugin - plugins.net_matrix_plugin - plugins.net_discord_plugin - plugins.net_telegram_plugin - plugins.cmd_irc_plugin - plugins.storage_plugin - plugins.base_plugin - plugins.emote_plugin - plugins.fifo_plugin - plugins.youtube_plugin - plugins.crypto_plugin - plugins.url_grabber_plugin - plugins.notes_plugin - plugins.quote_plugin - plugins.ratesex_plugin - plugins.remind_plugin - plugins.timezonediff_plugin - plugins.sed_plugin - plugins.seen_plugin - plugins.strain_plugin - plugins.tell_plugin - plugins.twitter_plugin - plugins.ud_plugin - plugins.figlet_plugin - plugins.soundcloud_plugin - plugins.isup_plugin - plugins.tcpac_plugin - plugins.google_plugin - plugins.highlight_plugin - plugins.boombox_plugin - plugins.whoami_plugin - plugins.joke_plugin - plugins.maple_plugin - plugins.openai_plugin - plugins.datetime_plugin - plugins.ip_plugin - plugins.tool_colors_plugin - plugins.tool_log_plugin - #plugins.dsa_plugin - #plugins.ansi_plugin + tool_dims_plugin + tool_guds_plugin + tool_bus_plugin + auth_sasl_plugin + auth_nickserv_plugin + net_hydra_plugin + net_irc_plugin + net_matrix_plugin + net_discord_plugin + net_telegram_plugin + cmd_irc_plugin + storage_plugin + base_plugin + emote_plugin + fifo_plugin + youtube_plugin + crypto_plugin + url_grabber_plugin + notes_plugin + quote_plugin + ratesex_plugin + remind_plugin + timezonediff_plugin + sed_plugin + seen_plugin + strain_plugin + tell_plugin + twitter_plugin + ud_plugin + figlet_plugin + soundcloud_plugin + isup_plugin + tcpac_plugin + google_plugin + highlight_plugin + boombox_plugin + whoami_plugin + joke_plugin + maple_plugin + openai_plugin + datetime_plugin + ip_plugin + tool_colors_plugin + tool_log_plugin + # dsa_plugin + # ansi_plugin