feat: 新版本

This commit is contained in:
2024-04-05 09:14:26 +08:00
parent d9a32328b2
commit 110b0cfc21
3 changed files with 4 additions and 3 deletions

View File

@ -12,7 +12,6 @@ from pydantic import BaseModel
class LiteModel(BaseModel):
TABLE_NAME: str = None
id: int = None
def dump(self, *args, **kwargs):
if pydantic.__version__ < "1.8.2":
return self.dict(*args, **kwargs)
@ -88,7 +87,7 @@ class Database:
if not model.TABLE_NAME:
raise ValueError(f"数据模型 {model.__class__.__name__} 未提供表名")
elif model.TABLE_NAME not in table_list:
raise ValueError(f"数据模型 {model.__class__.__name__} {model.TABLE_NAME} 不存在,请先迁移")
raise ValueError(f"数据模型 {model.__class__.__name__}{model.TABLE_NAME} 不存在,请先迁移")
else:
self._save(model.dump(by_alias=True))

View File

@ -42,6 +42,7 @@ def load_from_lang(file_path: str, lang_code: str = None):
if lang_code not in _language_data:
_language_data[lang_code] = {}
_language_data[lang_code].update(data)
nonebot.logger.debug(f"Loaded language data from {file_path}")
except Exception as e:
nonebot.logger.error(f"Failed to load language data from {file_path}: {e}")
@ -62,6 +63,7 @@ def load_from_json(file_path: str, lang_code: str = None):
if lang_code not in _language_data:
_language_data[lang_code] = {}
_language_data[lang_code].update(data)
nonebot.logger.debug(f"Loaded language data from {file_path}")
except Exception as e:
nonebot.logger.error(f"Failed to load language data from {file_path}: {e}")