rewrote env parts and fixed some frigging issues
This commit is contained in:
parent
99ab5d334e
commit
f7042ed8a7
23 changed files with 3070 additions and 280 deletions
|
|
@ -23,37 +23,38 @@ YELLOW = f"{ANSI}33m"
|
|||
PURPLE = f"{ANSI}35m"
|
||||
DEBUG = f"{ANSI}1;30m"
|
||||
RESET = f"{ANSI}0m"
|
||||
|
||||
VERSION_URL = "https://raw.githubusercontent.com/gooberinc/version/main"
|
||||
UPDATE_URL = VERSION_URL+"/latest_version.json"
|
||||
print(UPDATE_URL)
|
||||
LOCAL_VERSION_FILE = "current_version.txt"
|
||||
TOKEN = os.getenv("DISCORDBOTTOKEN", "0")
|
||||
PREFIX = os.getenv("BOTPREFIX", "g.")
|
||||
PING_LINE = os.getenv("PINGLINE")
|
||||
CHECKS_DISABLED = os.getenv("CHECKSDISABLED")
|
||||
LOCALE = os.getenv("LOCALE", "en")
|
||||
gooberTOKEN = os.getenv("GOOBERTOKEN")
|
||||
splashtext = os.getenv("SPLASHTEXT")
|
||||
ownerid = int(os.getenv("OWNERID", "0"))
|
||||
showmemenabled = os.getenv("SHOWMEMENABLED")
|
||||
BLACKLISTED_USERS = os.getenv("BLACKLISTEDUSERS", "").split(",")
|
||||
USERTRAIN_ENABLED = os.getenv("USERTRAINENABLED", "true").lower() == "true"
|
||||
NAME = os.getenv("NAME")
|
||||
MEMORY_FILE = "memory.json"
|
||||
MEMORY_LOADED_FILE = "MEMORY_LOADED" # is this still even used?? okay just checked its used in the markov module
|
||||
ALIVEPING = os.getenv("ALIVEPING")
|
||||
AUTOUPDATE = os.getenv("AUTOUPDATE")
|
||||
|
||||
# TOKEN = os.getenv("DISCORDBOTTOKEN", "0")
|
||||
# PREFIX = os.getenv("BOTPREFIX", "g.")
|
||||
# PING_LINE = os.getenv("PINGLINE")
|
||||
# CHECKS_DISABLED = os.getenv("CHECKSDISABLED")
|
||||
# LOCALE = os.getenv("LOCALE", "en")
|
||||
# BLACKLISTED_USERS = os.getenv("BLACKLISTEDUSERS", "").split(",")
|
||||
# USERTRAIN_ENABLED = os.getenv("USERTRAINENABLED", "true").lower() == "true"
|
||||
# NAME = os.getenv("NAME")
|
||||
# MEMORY_FILE = "memory.json"
|
||||
# MEMORY_LOADED_FILE = "MEMORY_LOADED" # is this still even used?? okay just checked its used in the markov module
|
||||
# ALIVEPING = os.getenv("ALIVEPING")
|
||||
# AUTOUPDATE = os.getenv("AUTOUPDATE")
|
||||
# REACT = os.getenv("REACT")
|
||||
|
||||
# gooberTOKEN = os.getenv("GOOBERTOKEN")
|
||||
# splashtext = os.getenv("SPLASHTEXT")
|
||||
# ownerid = int(os.getenv("OWNERID", "0"))
|
||||
# showmemenabled = os.getenv("SHOWMEMENABLED")
|
||||
|
||||
|
||||
# IGNOREWARNING = False # is this either??? i don't think so?
|
||||
song = os.getenv("song")
|
||||
# song = os.getenv("song")
|
||||
arch = platform.machine()
|
||||
slash_commands_enabled = True # 100% broken, its a newer enough version so its probably enabled by default.... fix this at somepoint or hard code it in goober central code
|
||||
launched = False
|
||||
latest_version = "0.0.0"
|
||||
local_version = "2.3.3"
|
||||
os.environ['gooberlocal_version'] = local_version
|
||||
REACT = os.getenv("REACT")
|
||||
if get_git_branch() == "dev":
|
||||
beta = True
|
||||
# this makes goober think its a beta version, so it will not update to the latest stable version or run any version checks
|
||||
else:
|
||||
beta = False
|
||||
beta = get_git_branch() == "dev"
|
||||
|
|
|
|||
191
modules/key_compiler.py
Normal file
191
modules/key_compiler.py
Normal file
|
|
@ -0,0 +1,191 @@
|
|||
# The MIT License (MIT)
|
||||
|
||||
# Copyright (c) 2025 ctih1
|
||||
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
|
||||
# The above copyright notice and this permission notice shall be included in
|
||||
# all copies or substantial portions of the Software.
|
||||
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
# THE SOFTWARE.
|
||||
|
||||
import os
|
||||
from typing import Dict, List, Literal
|
||||
import json
|
||||
import sys
|
||||
import logging
|
||||
import time
|
||||
|
||||
NOTICE = """
|
||||
# This file was automatically created from localization JSON files.
|
||||
# DO NOT EDIT THIS FILE DIRECTLY. If you want to edit a translation, please use the language's JSON file.
|
||||
"""
|
||||
|
||||
|
||||
logging.basicConfig(
|
||||
level=logging.DEBUG,
|
||||
format="%(levelname)s: [%(filename)s:%(funcName)s] %(message)s",
|
||||
datefmt="%d/%m/%Y %H.%M.%S",
|
||||
stream=sys.stdout,
|
||||
)
|
||||
|
||||
logger = logging.getLogger("kaannos")
|
||||
|
||||
class LanguageCollector:
|
||||
def __init__(self, language_dir: str) -> None:
|
||||
self.path: str = language_dir
|
||||
self.languages: Dict[str, Dict[str,str]] = {}
|
||||
|
||||
for file in os.listdir(self.path):
|
||||
if not file.endswith(".json") or len(file) > 7:
|
||||
logger.debug(f"Skipping {file}")
|
||||
continue
|
||||
|
||||
locale: str = file.split(".json")[0]
|
||||
logger.info(f"Discovered {file}")
|
||||
with open(os.path.join(self.path, file), "r", encoding="UTF-8") as f:
|
||||
keys: Dict[str,str] = json.load(f)
|
||||
self.languages[locale] = keys
|
||||
|
||||
print(self.languages)
|
||||
self.find_missing_keys()
|
||||
|
||||
|
||||
def find_missing_keys(self) -> None:
|
||||
primary_language_keys: Dict[str, str] = self.languages["en"]
|
||||
|
||||
for key in primary_language_keys:
|
||||
for language in self.languages:
|
||||
if key not in self.languages[language]:
|
||||
logger.warning(f"Key {key} missing from {language}")
|
||||
|
||||
for language in self.languages:
|
||||
for key in self.languages[language]:
|
||||
if key not in primary_language_keys:
|
||||
logger.warning(f"Leftover key {key} found from {language}")
|
||||
|
||||
class Script:
|
||||
def __init__(self) -> None:
|
||||
self.script: str = ""
|
||||
|
||||
def add_line(self, content, indent: int=0, newline: bool = True) -> None:
|
||||
self.script += f"{'\t' * indent}{content}{'\n' if newline else ''}"
|
||||
|
||||
def process_name(key: str) -> str:
|
||||
return key.replace(" ", "_").replace(":","").lower()
|
||||
|
||||
def find_args(string: str) -> List[str]:
|
||||
variable_open: bool = False
|
||||
temp_content: str = ""
|
||||
|
||||
variables: List[str] = []
|
||||
for char in string:
|
||||
if variable_open:
|
||||
if char == "}":
|
||||
variable_open = False
|
||||
variables.append(temp_content)
|
||||
temp_content = ""
|
||||
continue
|
||||
|
||||
if char == "{":
|
||||
raise SyntaxError("Variable already open!")
|
||||
|
||||
temp_content += char
|
||||
|
||||
else:
|
||||
if char == "}":
|
||||
raise SyntaxError("Trying to close a nonexistant variable")
|
||||
|
||||
if char == "{":
|
||||
variable_open = True
|
||||
|
||||
return variables
|
||||
|
||||
def convert_args(inp: str, vars: List[str], mode: Literal["brackets", "none"] = "brackets") -> str:
|
||||
replacements = {
|
||||
".": "_",
|
||||
",": "_"
|
||||
}
|
||||
|
||||
for var in vars:
|
||||
cleaned_var = var
|
||||
for key, val in replacements.items():
|
||||
cleaned_var = cleaned_var.replace(key, val)
|
||||
|
||||
if mode == "none":
|
||||
inp = inp.replace(f"{var}", f"{cleaned_var}")
|
||||
else:
|
||||
inp = inp.replace(f"{{{var}}}", f"{{{cleaned_var}}}")
|
||||
|
||||
return inp
|
||||
|
||||
|
||||
|
||||
class GenerateScript:
|
||||
def __init__(self, primary_lang:str, language_data: Dict[str, Dict[str,str]], use_typing: bool = True, output_path: str = "out.py", generate_comments: bool = True):
|
||||
self.data = language_data
|
||||
self.primary = primary_lang
|
||||
self.script = Script()
|
||||
self.uses_typing: bool = use_typing
|
||||
self.output = output_path
|
||||
self.generate_comments = generate_comments
|
||||
|
||||
def create(self):
|
||||
# I really don't like this implementation but also it works
|
||||
self.script.add_line(NOTICE)
|
||||
if self.uses_typing:
|
||||
self.script.add_line("from typing import Literal, List")
|
||||
self.script.add_line(f"Language=Literal{list(self.data.keys())}")
|
||||
self.script.add_line(f"languages: List[Language] = {list(self.data.keys())}")
|
||||
self.script.add_line(f"default_lang: Language | str='{self.primary}'")
|
||||
self.script.add_line("def change_language(new_lang: Language | str) -> None: global default_lang; default_lang = new_lang")
|
||||
else:
|
||||
self.script.add_line(f"languages = {list(self.data.keys())}")
|
||||
self.script.add_line(f"default_lang='{self.primary}'")
|
||||
self.script.add_line("def change_language(new_lang): global default_lang; default_lang = new_lang")
|
||||
|
||||
|
||||
self.primary_data = self.data[self.primary]
|
||||
|
||||
for key in self.primary_data:
|
||||
args = find_args(self.primary_data[key])
|
||||
|
||||
self.script.add_line(f"def {process_name(key)}({convert_args(','.join([*args, "lang:str|None=None" if self.uses_typing else "lang"]), args, "none")}):")
|
||||
if self.generate_comments:
|
||||
self.script.add_line('"""', 1)
|
||||
self.script.add_line("### Locales", 1)
|
||||
for language in self.data:
|
||||
self.script.add_line(f'- {language.capitalize()}: **{self.data[language].get(key, self.primary_data[key])}**', 1)
|
||||
self.script.add_line('"""', 1)
|
||||
self.script.add_line("if not lang: lang=default_lang", 1)
|
||||
for language in self.data:
|
||||
formatted_map = "{"
|
||||
for arg in args:
|
||||
formatted_map += f'"{convert_args(arg, args, "none")}": {convert_args(arg, args, "none")},'
|
||||
formatted_map = formatted_map[:-1] + "}"
|
||||
self.script.add_line(f"""if lang == '{language}': return {convert_args(json.dumps(
|
||||
self.data[language].get(key,self.primary_data[key]),
|
||||
ensure_ascii=False
|
||||
), args)}{f'.format_map({formatted_map})' if len(args) > 0 else ''}""", 1)
|
||||
|
||||
self.script.add_line("else: raise ValueError(f'Invalid language {lang}')", 1)
|
||||
with open(self.output, "w", encoding="UTF-8") as f:
|
||||
f.write(self.script.script)
|
||||
|
||||
|
||||
def build_result(primary_lang: str, locale_dir: str, types: bool, output_path: str, generate_comments: bool = True):
|
||||
start = time.time()
|
||||
lc = LanguageCollector(locale_dir)
|
||||
GenerateScript(primary_lang, lc.languages, types, output_path, generate_comments).create()
|
||||
logger.info(f"Done in {time.time() - start}s")
|
||||
2306
modules/keys.py
Normal file
2306
modules/keys.py
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -3,8 +3,13 @@ import json
|
|||
import markovify
|
||||
import pickle
|
||||
from modules.globalvars import *
|
||||
from modules.volta.main import _
|
||||
import logging
|
||||
import modules.keys as k
|
||||
from modules.settings import Settings as SettingsManager
|
||||
settings_manager = SettingsManager()
|
||||
settings = settings_manager.settings
|
||||
|
||||
|
||||
logger = logging.getLogger("goober")
|
||||
# Get file size and line count for a given file path
|
||||
def get_file_info(file_path):
|
||||
|
|
@ -22,7 +27,7 @@ def load_memory():
|
|||
|
||||
# Try to load data from MEMORY_FILE
|
||||
try:
|
||||
with open(MEMORY_FILE, "r") as f:
|
||||
with open(settings["bot"]["active_memory"], "r") as f:
|
||||
data = json.load(f)
|
||||
except FileNotFoundError:
|
||||
pass
|
||||
|
|
@ -31,7 +36,7 @@ def load_memory():
|
|||
|
||||
# Save memory data to MEMORY_FILE
|
||||
def save_memory(memory):
|
||||
with open(MEMORY_FILE, "w") as f:
|
||||
with open(settings["bot"]["active_memory"], "w") as f:
|
||||
json.dump(memory, f, indent=4)
|
||||
|
||||
def train_markov_model(memory, additional_data=None):
|
||||
|
|
@ -57,8 +62,8 @@ def load_markov_model(filename='markov_model.pkl'):
|
|||
try:
|
||||
with open(filename, 'rb') as f:
|
||||
model = pickle.load(f)
|
||||
logger.info(f"{_('model_loaded')} {filename}.{RESET}")
|
||||
logger.info(f"{k.model_loaded()} {filename}.{RESET}")
|
||||
return model
|
||||
except FileNotFoundError:
|
||||
logger.error(f"{filename} {_('not_found')}{RESET}")
|
||||
logger.error(f"{filename} {k.not_found()}{RESET}")
|
||||
return None
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
from modules.globalvars import *
|
||||
from modules.volta.main import _, check_missing_translations
|
||||
import time
|
||||
import os
|
||||
import sys
|
||||
|
|
@ -11,6 +10,11 @@ import re
|
|||
from spacy.util import is_package
|
||||
import importlib.metadata
|
||||
import logging
|
||||
import modules.keys as k
|
||||
from modules.settings import Settings as SettingsManager
|
||||
settings_manager = SettingsManager()
|
||||
settings = settings_manager.settings
|
||||
|
||||
|
||||
logger = logging.getLogger("goober")
|
||||
|
||||
|
|
@ -21,7 +25,7 @@ try:
|
|||
import psutil
|
||||
except ImportError:
|
||||
psutilavaliable = False
|
||||
logger.error(_('missing_requests_psutil'))
|
||||
logger.error(k.missing_requests_psutil())
|
||||
|
||||
def check_for_model():
|
||||
if is_package("en_core_web_sm"):
|
||||
|
|
@ -34,7 +38,7 @@ def iscloned():
|
|||
if os.path.exists(".git"):
|
||||
return True
|
||||
else:
|
||||
logger.error(f"{_('not_cloned')}")
|
||||
logger.error(f"{k.not_cloned()}")
|
||||
sys.exit(1)
|
||||
|
||||
def get_stdlib_modules():
|
||||
|
|
@ -67,7 +71,7 @@ def check_requirements():
|
|||
requirements_path = os.path.abspath(os.path.join(parent_dir, '..', 'requirements.txt'))
|
||||
|
||||
if not os.path.exists(requirements_path):
|
||||
logger.error(f"{(_('requirements_not_found')).format(path=requirements_path)}")
|
||||
logger.error(f"{k.requirements_not_found(path=requirements_path)}")
|
||||
return
|
||||
|
||||
with open(requirements_path, 'r') as f:
|
||||
|
|
@ -85,24 +89,24 @@ def check_requirements():
|
|||
|
||||
for req in sorted(requirements):
|
||||
if req in STD_LIB_MODULES or req == 'modules':
|
||||
print((_('std_lib_local_skipped')).format(package=req))
|
||||
print(k.std_lib_local_skipped(package=req))
|
||||
continue
|
||||
|
||||
check_name = req.lower()
|
||||
|
||||
if check_name in installed_packages:
|
||||
logger.info(f"{_('ok_installed').format(package=check_name)} {check_name}")
|
||||
logger.info(f"{k.ok_installed()} {check_name}")
|
||||
else:
|
||||
logger.error(f"{(_('missing_package')).format(package=check_name)} {check_name} {(_('missing_package2'))}")
|
||||
logger.error(f"{k.missing_package()} {check_name} {k.missing_package2()}")
|
||||
missing.append(check_name)
|
||||
|
||||
if missing:
|
||||
logger.error(_('missing_packages_detected'))
|
||||
logger.error(k.missing_packages_detected())
|
||||
for pkg in missing:
|
||||
print(f" - {pkg}")
|
||||
sys.exit(1)
|
||||
else:
|
||||
logger.info(_('all_requirements_satisfied'))
|
||||
logger.info(k.all_requirements_satisfied())
|
||||
|
||||
def check_latency():
|
||||
host = "1.1.1.1"
|
||||
|
|
@ -132,16 +136,16 @@ def check_latency():
|
|||
match = re.search(latency_pattern, result.stdout)
|
||||
if match:
|
||||
latency_ms = float(match.group(1))
|
||||
logger.info((_('ping_to')).format(host=host, latency=latency_ms))
|
||||
logger.info(k.ping_to(host=host, latency=latency_ms))
|
||||
if latency_ms > 300:
|
||||
logger.warning(f"{(_('high_latency'))}")
|
||||
logger.warning(f"{k.high_latency()}")
|
||||
else:
|
||||
logger.warning((_('could_not_parse_latency')))
|
||||
logger.warning(k.could_not_parse_latency())
|
||||
else:
|
||||
print(result.stderr)
|
||||
logger.error(f"{(_('ping_failed')).format(host=host)}{RESET}")
|
||||
logger.error(f"{k.ping_failed(host=host)}{RESET}")
|
||||
except Exception as e:
|
||||
logger.error((_('error_running_ping')).format(error=e))
|
||||
logger.error(k.error_running_ping(error=e))
|
||||
|
||||
def check_memory():
|
||||
if psutilavaliable == False:
|
||||
|
|
@ -152,48 +156,48 @@ def check_memory():
|
|||
used_memory = memory_info.used / (1024 ** 3)
|
||||
free_memory = memory_info.available / (1024 ** 3)
|
||||
|
||||
logger.info((_('memory_usage')).format(used=used_memory, total=total_memory, percent=(used_memory / total_memory) * 100))
|
||||
logger.info(k.memory_usage(used=used_memory, total=total_memory, percent=(used_memory / total_memory) * 100))
|
||||
if used_memory > total_memory * 0.9:
|
||||
print(f"{YELLOW}{(_('memory_above_90')).format(percent=(used_memory / total_memory) * 100)}{RESET}")
|
||||
logger.info((_('total_memory')).format(total=total_memory))
|
||||
logger.info((_('used_memory')).format(used=used_memory))
|
||||
print(f"{YELLOW}{k.memory_above_90(percent=(used_memory / total_memory) * 100)}{RESET}")
|
||||
logger.info(k.total_memory(total=total_memory))
|
||||
logger.info(k.used_memory(used=used_memory))
|
||||
if free_memory < 1:
|
||||
logger.warning(f"{(_('low_free_memory')).format(free=free_memory)}")
|
||||
logger.warning(f"{k.low_free_memory(free=free_memory)}")
|
||||
sys.exit(1)
|
||||
except ImportError:
|
||||
logger.error(_('psutil_not_installed')) # todo: translate this into italian and put it in the translations "psutil is not installed. Memory check skipped."
|
||||
logger.error(k.psutil_not_installed()) # todo: translate this into italian and put it in the translations "psutil is not installed. Memory check skipped."
|
||||
|
||||
def check_cpu():
|
||||
if psutilavaliable == False:
|
||||
return
|
||||
logger.info((_('measuring_cpu')))
|
||||
logger.info(k.measuring_cpu())
|
||||
cpu_per_core = psutil.cpu_percent(interval=1, percpu=True) # type: ignore
|
||||
total_cpu = sum(cpu_per_core) / len(cpu_per_core)
|
||||
logger.info((_('total_cpu_usage')).format(usage=total_cpu))
|
||||
logger.info(k.total_cpu_usage(usage=total_cpu))
|
||||
if total_cpu > 85:
|
||||
logger.warning(f"{(_('high_avg_cpu')).format(usage=total_cpu)}")
|
||||
logger.warning(f"{k.high_avg_cpu(usage=total_cpu)}")
|
||||
if total_cpu > 95:
|
||||
logger.error(_('really_high_cpu'))
|
||||
logger.error(k.really_high_cpu())
|
||||
sys.exit(1)
|
||||
|
||||
def check_memoryjson():
|
||||
try:
|
||||
logger.info((_('memory_file')).format(size=os.path.getsize(MEMORY_FILE) / (1024 ** 2)))
|
||||
if os.path.getsize(MEMORY_FILE) > 1_073_741_824:
|
||||
logger.warning(f"{(_('memory_file_large'))}")
|
||||
logger.info(k.memory_file(size=os.path.getsize(settings["bot"]["active_memory"]) / (1024 ** 2)))
|
||||
if os.path.getsize(settings["bot"]["active_memory"]) > 1_073_741_824:
|
||||
logger.warning(f"{k.memory_file_large()}")
|
||||
try:
|
||||
with open(MEMORY_FILE, 'r', encoding='utf-8') as f:
|
||||
with open(settings["bot"]["active_memory"], 'r', encoding='utf-8') as f:
|
||||
json.load(f)
|
||||
except json.JSONDecodeError as e:
|
||||
logger.error(f"{(_('memory_file_corrupted')).format(error=e)}")
|
||||
logger.warning(f"{(_('consider_backup_memory'))}")
|
||||
logger.error(f"{k.memory_file_corrupted(error=e)}")
|
||||
logger.warning(f"{k.consider_backup_memory()}")
|
||||
except UnicodeDecodeError as e:
|
||||
logger.error(f"{(_('memory_file_encoding')).format(error=e)}")
|
||||
logger.warning(f"{(_('consider_backup_memory'))}")
|
||||
logger.error(f"{k.memory_file_encoding(error=e)}")
|
||||
logger.warning(f"{k.consider_backup_memory()}")
|
||||
except Exception as e:
|
||||
logger.error(f"{(_('error_reading_memory')).format(error=e)}")
|
||||
logger.error(f"{k.error_reading_memory(error=e)}")
|
||||
except FileNotFoundError:
|
||||
logger(f"{(_('memory_file_not_found'))}")
|
||||
logger.info(f"{k.memory_file_not_found()}")
|
||||
|
||||
def presskey2skip(timeout):
|
||||
if os.name == 'nt':
|
||||
|
|
@ -228,13 +232,13 @@ def presskey2skip(timeout):
|
|||
termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
|
||||
beta = beta
|
||||
def start_checks():
|
||||
if CHECKS_DISABLED == "True":
|
||||
logger.warning(f"{(_('checks_disabled'))}")
|
||||
if settings["disable_checks"]:
|
||||
logger.warning(f"{k.checks_disabled()}")
|
||||
return
|
||||
logger.info(_('running_prestart_checks'))
|
||||
|
||||
logger.info(k.running_prestart_checks())
|
||||
check_for_model()
|
||||
iscloned()
|
||||
check_missing_translations()
|
||||
check_requirements()
|
||||
check_latency()
|
||||
check_memory()
|
||||
|
|
@ -243,13 +247,15 @@ def start_checks():
|
|||
if os.path.exists(".env"):
|
||||
pass
|
||||
else:
|
||||
logger.warning(f"{(_('env_file_not_found'))}")
|
||||
logger.warning(f"{k.env_file_not_found()}")
|
||||
sys.exit(1)
|
||||
if beta == True:
|
||||
logger.warning(f"this build isnt finished yet, some things might not work as expected")
|
||||
else:
|
||||
pass
|
||||
logger.info(_('continuing_in_seconds').format(seconds=5))
|
||||
logger.info(k.continuing_in_seconds(seconds=5))
|
||||
presskey2skip(timeout=5)
|
||||
os.system('cls' if os.name == 'nt' else 'clear')
|
||||
print(splashtext)
|
||||
|
||||
with open(settings ["splash_text_loc"], "r") as f:
|
||||
print("".join(f.readlines()))
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
import re
|
||||
import discord.ext
|
||||
import discord.ext.commands
|
||||
from modules.globalvars import *
|
||||
from modules.volta.main import _
|
||||
|
||||
import spacy
|
||||
from spacy.tokens import Doc
|
||||
from spacytextblob.spacytextblob import SpacyTextBlob
|
||||
import discord
|
||||
import modules.keys as k
|
||||
|
||||
import logging
|
||||
logger = logging.getLogger("goober")
|
||||
|
|
@ -14,12 +16,12 @@ def check_resources():
|
|||
try:
|
||||
nlp = spacy.load("en_core_web_sm")
|
||||
except OSError:
|
||||
logging.critical((_('spacy_model_not_found')))
|
||||
spacy.cli.download("en_core_web_sm")
|
||||
logging.critical(k.spacy_model_not_found())
|
||||
spacy.cli.download("en_core_web_sm") # type: ignore
|
||||
nlp = spacy.load("en_core_web_sm")
|
||||
if "spacytextblob" not in nlp.pipe_names:
|
||||
nlp.add_pipe("spacytextblob")
|
||||
logger.info((_('spacy_initialized')))
|
||||
logger.info(k.spacy_initialized())
|
||||
|
||||
check_resources()
|
||||
|
||||
|
|
@ -31,35 +33,37 @@ def is_positive(sentence):
|
|||
doc = nlp(sentence)
|
||||
sentiment_score = doc._.polarity # from spacytextblob
|
||||
|
||||
debug_message = f"{(_('sentence_positivity'))} {sentiment_score}{RESET}"
|
||||
debug_message = f"{k.sentence_positivity()} {sentiment_score}{RESET}"
|
||||
logger.debug(debug_message)
|
||||
|
||||
return sentiment_score > 0.6 # had to raise the bar because it kept saying "death to jews" was fine and it kept reacting to them
|
||||
|
||||
async def send_message(ctx, message=None, embed=None, file=None, edit=False, message_reference=None):
|
||||
async def send_message(ctx: discord.ext.commands.Context,
|
||||
message: str | None = None,
|
||||
embed: discord.Embed | None = None,
|
||||
file: discord.File | None = None,
|
||||
edit: bool = False,
|
||||
message_reference: discord.Message | None = None
|
||||
) -> discord.Message | None:
|
||||
|
||||
sent_message: discord.Message | None = None
|
||||
|
||||
if edit and message_reference:
|
||||
try:
|
||||
await message_reference.edit(content=message, embed=embed)
|
||||
return message_reference
|
||||
except Exception as e:
|
||||
await ctx.send(f"{RED}{(_('edit_fail'))} {e}{RESET}")
|
||||
await ctx.send(f"{k.edit_fail()} {e}")
|
||||
return None
|
||||
|
||||
if embed:
|
||||
sent_message = await ctx.send(embed=embed, content=message)
|
||||
elif file:
|
||||
sent_message = await ctx.send(file=file, content=message)
|
||||
else:
|
||||
if hasattr(ctx, "respond"):
|
||||
sent_message = None
|
||||
if embed:
|
||||
sent_message = await ctx.respond(embed=embed, ephemeral=False)
|
||||
elif message:
|
||||
sent_message = await ctx.respond(message, ephemeral=False)
|
||||
if file:
|
||||
sent_message = await ctx.respond(file=file, ephemeral=False)
|
||||
else:
|
||||
sent_message = None
|
||||
if embed:
|
||||
sent_message = await ctx.send(embed=embed)
|
||||
elif message:
|
||||
sent_message = await ctx.send(message)
|
||||
if file:
|
||||
sent_message = await ctx.send(file=file)
|
||||
return sent_message
|
||||
sent_message = await ctx.send(content=message)
|
||||
|
||||
return sent_message
|
||||
|
||||
def append_mentions_to_18digit_integer(message):
|
||||
pattern = r'\b\d{18}\b'
|
||||
|
|
|
|||
58
modules/settings.py
Normal file
58
modules/settings.py
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
import json
|
||||
import os
|
||||
from typing import List, Mapping, Any, TypedDict
|
||||
from modules.keys import Language
|
||||
import logging
|
||||
import copy
|
||||
|
||||
logger = logging.getLogger("goober")
|
||||
|
||||
class MiscBotOptions(TypedDict):
|
||||
ping_line: str
|
||||
active_song: str
|
||||
positive_gifs: List[str]
|
||||
block_profanity: bool
|
||||
|
||||
class BotSettings(TypedDict):
|
||||
prefix: str
|
||||
owner_ids: List[int]
|
||||
blacklisted_users: List[int]
|
||||
user_training: bool
|
||||
allow_show_mem_command: bool
|
||||
react_to_messages: bool
|
||||
misc: MiscBotOptions
|
||||
enabled_cogs: List[str]
|
||||
active_memory: str
|
||||
|
||||
class SettingsType(TypedDict):
|
||||
bot: BotSettings
|
||||
locale: Language
|
||||
name: str
|
||||
auto_update: bool
|
||||
disable_checks: bool
|
||||
splash_text_loc: str
|
||||
|
||||
class Settings:
|
||||
def __init__(self) -> None:
|
||||
self.path: str = os.path.join(".", "settings", "settings.json")
|
||||
|
||||
if not os.path.exists(self.path):
|
||||
raise ValueError("settings.json file does not exist!")
|
||||
|
||||
self.settings: SettingsType
|
||||
self.original_settings: SettingsType
|
||||
|
||||
with open(self.path, "r") as f:
|
||||
self.__kv_store: dict = json.load(f)
|
||||
|
||||
self.settings = SettingsType(self.__kv_store) # type: ignore
|
||||
self.original_settings = copy.deepcopy(self.settings)
|
||||
|
||||
def commit(self) -> None:
|
||||
with open(self.path, "w") as f:
|
||||
json.dump(self.settings, f, indent=4)
|
||||
|
||||
self.original_settings = self.settings
|
||||
|
||||
def discard(self) -> None:
|
||||
self.settings = self.original_settings
|
||||
|
|
@ -1,8 +1,14 @@
|
|||
import sys
|
||||
import traceback
|
||||
import os
|
||||
from modules.globalvars import RED, RESET, splashtext
|
||||
from modules.volta.main import _
|
||||
from modules.settings import Settings as SettingsManager
|
||||
import logging
|
||||
from modules.globalvars import RED, RESET
|
||||
import modules.keys as k
|
||||
|
||||
settings_manager = SettingsManager()
|
||||
settings = settings_manager.settings
|
||||
logger = logging.getLogger("goober")
|
||||
|
||||
def handle_exception(exc_type, exc_value, exc_traceback, *, context=None):
|
||||
os.system('cls' if os.name == 'nt' else 'clear')
|
||||
|
|
@ -11,11 +17,13 @@ def handle_exception(exc_type, exc_value, exc_traceback, *, context=None):
|
|||
sys.__excepthook__(exc_type, exc_value, exc_traceback)
|
||||
return
|
||||
|
||||
print(splashtext)
|
||||
with open(settings['splash_text_loc'], "r") as f:
|
||||
print("".join(f.readlines()))
|
||||
|
||||
print(f"{RED}=====BEGINNING OF TRACEBACK====={RESET}")
|
||||
traceback.print_exception(exc_type, exc_value, exc_traceback)
|
||||
print(f"{RED}========END OF TRACEBACK========{RESET}")
|
||||
print(f"{RED}{_('unhandled_exception')}{RESET}")
|
||||
print(f"{RED}{k.unhandled_exception()}{RESET}")
|
||||
|
||||
|
||||
if context:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
from modules.volta.main import _
|
||||
from modules.globalvars import *
|
||||
import requests
|
||||
import subprocess
|
||||
import sys
|
||||
|
|
@ -7,6 +5,13 @@ import logging
|
|||
import json
|
||||
import time
|
||||
import random
|
||||
import modules.keys as k
|
||||
from modules.globalvars import *
|
||||
from modules.settings import Settings as SettingsManager
|
||||
|
||||
settings_manager = SettingsManager()
|
||||
settings = settings_manager.settings
|
||||
|
||||
logger = logging.getLogger("goober")
|
||||
launched = False
|
||||
|
||||
|
|
@ -24,18 +29,18 @@ def is_remote_ahead(branch='main', remote='origin'):
|
|||
# Automatically update the local repository if the remote is ahead
|
||||
def auto_update(branch='main', remote='origin'):
|
||||
if launched == True:
|
||||
print(_("already_started"))
|
||||
print(k.already_started())
|
||||
return
|
||||
if AUTOUPDATE != "True":
|
||||
if settings["auto_update"] != "True":
|
||||
pass # Auto-update is disabled
|
||||
if is_remote_ahead(branch, remote):
|
||||
print(_( "remote_ahead").format(remote=remote, branch=branch))
|
||||
logger.info(k.remote_ahead(remote, branch))
|
||||
pull_result = run_cmd(f'git pull {remote} {branch}')
|
||||
logger.info(pull_result)
|
||||
logger.info(_( "please_restart"))
|
||||
logger.info(k.please_restart())
|
||||
sys.exit(0)
|
||||
else:
|
||||
logger.info(_( "local_ahead").format(remote=remote, branch=branch))
|
||||
logger.info(k.local_ahead(remote, branch))
|
||||
|
||||
def get_latest_version_info():
|
||||
try:
|
||||
|
|
@ -75,31 +80,34 @@ def check_for_update():
|
|||
|
||||
latest_version_info = get_latest_version_info()
|
||||
if not latest_version_info:
|
||||
logger.error(f"{_('fetch_update_fail')}")
|
||||
return None, None
|
||||
logger.error(f"{k.fetch_update_fail()}")
|
||||
return None
|
||||
|
||||
latest_version = latest_version_info.get("version")
|
||||
os.environ['gooberlatest_version'] = latest_version
|
||||
download_url = latest_version_info.get("download_url")
|
||||
|
||||
if not latest_version or not download_url:
|
||||
logger.error(f"{RED}{_('invalid_server')}{RESET}")
|
||||
return None, None
|
||||
logger.error(k.invalid_server())
|
||||
return None
|
||||
|
||||
# Check if local_version is valid
|
||||
if local_version == "0.0.0" or None:
|
||||
logger.error(f"{RED}{_('cant_find_local_version')}{RESET}")
|
||||
logger.error(k.cant_find_local_version())
|
||||
return
|
||||
# Compare local and latest versions
|
||||
|
||||
if local_version < latest_version:
|
||||
logger.info(f"{YELLOW}{_('new_version').format(latest_version=latest_version, local_version=local_version)}{RESET}")
|
||||
logger.info(f"{YELLOW}{_('changelog').format(VERSION_URL=VERSION_URL)}{RESET}")
|
||||
logger.warning(k.new_version(latest_version=latest_version, local_version=local_version))
|
||||
logger.warning(k.changelog(VERSION_URL=VERSION_URL))
|
||||
auto_update()
|
||||
|
||||
elif beta == True:
|
||||
logger.warning(f"You are running an \"unstable\" version of Goober, do not expect it to work properly.\nVersion {local_version}\nServer: {latest_version}{RESET}")
|
||||
elif local_version > latest_version:
|
||||
logger.warning(f"{_('modification_warning')}")
|
||||
logger.warning(f"{k.modification_warning()}")
|
||||
elif local_version == latest_version:
|
||||
logger.info(f"{_('latest_version')} {local_version}")
|
||||
logger.info(f"{_('latest_version2').format(VERSION_URL=VERSION_URL)}\n\n")
|
||||
logger.info(f"{k.latest_version()} {local_version}")
|
||||
logger.info(f"{k.latest_version2(VERSION_URL=VERSION_URL)}\n\n")
|
||||
launched = True
|
||||
return latest_version
|
||||
Loading…
Add table
Add a link
Reference in a new issue