hiddifypanel 10.30.0.dev1__py3-none-any.whl → 10.30.0.dev2__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.30.0.dev1
+10.30.0.dev2

hiddifypanel/VERSION.py

@@ -1,3 +1,3 @@
-__version__='10.30.0.dev1'
+__version__='10.30.0.dev2'
 from datetime import datetime
-__release_date__= datetime.strptime('2024-06-29','%Y-%m-%d')
+__release_date__= datetime.strptime('2024-06-30','%Y-%m-%d')

hiddifypanel/base.py

@@ -18,19 +18,19 @@ from loguru import logger
 from hiddifypanel.panel.init_db import init_db
 
 
-def init_logger():
-    def dynamic_formatter(record) -> str:
-        fmt = '<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>'
-        if record['extra']:
-            fmt += ' | <level>{extra}</level>'
-        return fmt + '\n'
+def logger_dynamic_formatter(record) -> str:
+    fmt = '<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>'
+    if record['extra']:
+        fmt += ' | <level>{extra}</level>'
+    return fmt + '\n'
 
+
+def init_logger(app, cli):
     # configure logger
-    from hiddifypanel.models import ConfigEnum, hconfig
     logger.remove()
-    logger.add(sys.stderr, format=dynamic_formatter, level=hconfig(ConfigEnum.log_level),
+    logger.add(sys.stderr if cli else sys.stdout, format=logger_dynamic_formatter, level=app.config['STDOUT_LOG_LEVEL'],
                colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
-    # logger.trace('Logger initiated :)')
+    logger.trace('Logger initiated :)')
 
 
 # TODO: refactor this function
@@ -87,12 +87,12 @@ def create_app(*args, cli=False, **config):
             v = True if v.lower() == "true" else (False if v.lower() == "false" else v)
 
         app.config[c] = v
-
+    init_logger(app, cli)
     hiddifypanel.database.init_app(app)
     with app.app_context():
         init_db()
-
-        init_logger()
+        logger.add(app.config['HIDDIFY_CONFIG_PATH'] + "/log/system/panel.log", format=logger_dynamic_formatter, level=hconfig(ConfigEnum.log_level),
+                   colorize=True, catch=True, enqueue=True, diagnose=False, backtrace=True)
 
     def get_locale():
         # Put your logic here. Application can store locale in

hiddifypanel/models/config.py

@@ -9,11 +9,7 @@ from hiddifypanel.models.child import Child, ChildMode
 from sqlalchemy import Column, String, Boolean, Enum, ForeignKey, Integer
 from strenum import StrEnum
 from sqlalchemy_serializer import SerializerMixin
-
-
-def error(st):
-    from hiddifypanel.hutils.utils import error as err
-    err(st)
+from loguru import logger
 
 
 class BoolConfig(db.Model, SerializerMixin):
@@ -74,15 +70,15 @@ def hconfig(key: ConfigEnum, child_id: Optional[int] = None):  # -> str | int |
             if bool_conf:
                 value = bool_conf.value
             else:
-                error(f'bool {key} not found ')
+                logger.warning(f'bool {key} not found ')
         else:
             str_conf = StrConfig.query.filter(StrConfig.key == key, StrConfig.child_id == child_id).first()
             if str_conf:
                 value = str_conf.value
             else:
-                error(f'str {key} not found ')
+                logger.warning(f'str {key} not found ')
     except BaseException:
-        error(f'{key} error!')
+        logger.exception(f'{key} error!')
         raise
     if value != None:
         if key.type == int:
@@ -97,7 +93,6 @@ def set_hconfig(key: ConfigEnum, value: str | int | bool, child_id: int | None =
     if child_id is None:
         child_id = Child.current().id
 
-    print(f"chainging .... {key}---{value}---{child_id}---{commit}")
     if key.type == int and value != None:
         int(value)  # for testing int
 
@@ -127,7 +122,7 @@ def set_hconfig(key: ConfigEnum, value: str | int | bool, child_id: int | None =
         else:
             old_v = dbconf.value
     dbconf.value = value
-    error(f"changing {key} from {old_v} to {value}")
+    logger.trace(f"changing {key} from {old_v} to {value}")
     Events.config_changed.notify(conf=dbconf, old_value=old_v)
 
     if child_id == 0 and key.hide_in_virtual_child:
@@ -171,11 +166,9 @@ def add_or_update_config(commit: bool = True, child_id: int | None = None, overr
 def bulk_register_configs(hconfigs, commit: bool = True, froce_child_unique_id: str | None = None, override_unique_id: bool = True):
     from hiddifypanel.panel import hiddify
     for conf in hconfigs:
-        # print(conf)
         if conf['key'] == ConfigEnum.unique_id and not override_unique_id:
             continue
         child_id = hiddify.get_child(unique_id=froce_child_unique_id)
-        # print(conf, child_id, conf.get('child_unique_id', None), override_child_unique_id)
         add_or_update_config(commit=False, child_id=child_id, **conf)
     if commit:
         db.session.commit()

hiddifypanel/panel/init_db.py

@@ -13,7 +13,7 @@ from hiddifypanel.panel import hiddify
 from hiddifypanel.database import db, db_execute
 from flask import g
 from sqlalchemy import text
-
+from loguru import logger
 MAX_DB_VERSION = 90
 
 
@@ -564,7 +564,6 @@ def add_config_if_not_exist(key: ConfigEnum, val: str | int, child_id: int | Non
         child_id = Child.current().id
 
     old_val = hconfig(key, child_id)
-    hutils.utils.error(f'{key}, {val}, {child_id}, {old_val}')
     if old_val is None:
         set_hconfig(key, val)
 
@@ -583,7 +582,7 @@ def execute(query: str):
 
         db_execute(query)
     except BaseException as e:
-        hutils.utils.error(e)
+        logger.debug(e)
         pass
 
 
@@ -599,7 +598,7 @@ def add_new_enum_values():
 
         # Get the existing values in the enum
         existing_values = [f'{e}' if isinstance(e, ConfigEnum) else e.value for e in enum_class]
-        # print("existing_values--------------", existing_values)
+
         # Get the values in the enum column in the database
         # result = db.engine.execute(f"SELECT DISTINCT `{column_name}` FROM {table_name}")
         # db_values = {row[0] for row in result}
@@ -616,7 +615,7 @@ def add_new_enum_values():
         # Find the new values that need to be added to the enum column in the database
         new_values = set(existing_values) - set(db_values)
         old_values = set(db_values) - set(existing_values)
-        # print('new_values-=-----------------', new_values)
+
         if len(new_values) == 0 and len(old_values) == 0:
             continue
 
@@ -642,14 +641,14 @@ def upgrade_database():
     if not os.path.isdir(backup_root) or len(os.listdir(backup_root)) == 0:
         if os.path.isfile(sqlite_db):
             os.rename(sqlite_db, sqlite_db + ".old")
-        hutils.utils.error("no backup found...")
+        logger.info("no backup found...")
         return
     if os.path.isfile(sqlite_db):
-        hutils.utils.error("Finding Old Version Database... importing configs from latest backup")
+        logger.info("Finding Old Version Database... importing configs from latest backup")
         newest_file = max([(f, os.path.getmtime(os.path.join(backup_root, f)))
                           for f in os.listdir(backup_root) if os.path.isfile(os.path.join(backup_root, f))], key=lambda x: x[1])[0]
         with open(f'{backup_root}{newest_file}', 'r') as f:
-            hutils.utils.error(f"importing configs from {newest_file}")
+            logger.info(f"importing configs from {newest_file}")
             json_data = json.load(f)
             hiddify.set_db_from_json(json_data,
                                      set_users=True,
@@ -667,7 +666,7 @@ def upgrade_database():
             os.rename(sqlite_db, sqlite_db + ".old")
             set_hconfig(ConfigEnum.db_version, db_version, commit=True)
 
-        hutils.utils.error("Upgrading to the new dataset succuess.")
+        logger.info("Upgrading to the new dataset succuess.")
 
 
 def init_db():
@@ -700,7 +699,7 @@ def init_db():
             if not db_action or (start_version == 0 and ver == 10):
                 continue
 
-            hutils.utils.error(f"Updating db from version {db_version} for node {child.id}")
+            logger.info(f"Updating db from version {db_version} for node {child.id}")
 
             if ver < 70:
                 if child.id != 0:
@@ -710,7 +709,7 @@ def init_db():
                 db_action(child.id)
 
             Events.db_init_event.notify(db_version=db_version)
-            hutils.utils.error(f"Updated successfuly db from version {db_version} to {ver}")
+            logger.info(f"Updated successfuly db from version {db_version} to {ver}")
 
             db_version = ver
             db.session.commit()

hiddifypanel/translations/en/LC_MESSAGES/messages.po

@@ -2414,13 +2414,13 @@ msgid "items"
 msgstr "items"
 
 msgid "lang.en"
-msgstr "🇺🇸 English - Английский"
+msgstr "🇺🇸 English - انگلیسی"
 
 msgid "lang.fa"
 msgstr "🇮🇷 Persian - فارسی"
 
 msgid "lang.pt"
-msgstr "🇵🇹 Portuguese - پرتغالی"
+msgstr "🇵🇹 Portuguese"
 
 msgid "lang.ru"
 msgstr "🇷🇺 Russian - Русский"

hiddifypanel/translations.i18n/en.json

@@ -1036,9 +1036,9 @@
   "ios": "iOS",
   "items": "items",
   "lang": {
-    "en": "🇺🇸 English - Английский",
+    "en": "🇺🇸 English - انگلیسی",
     "fa": "🇮🇷 Persian - فارسی",
-    "pt": "🇵🇹 Portuguese - پرتغالی",
+    "pt": "🇵🇹 Portuguese",
     "ru": "🇷🇺 Russian - Русский",
     "zh": "🇨🇳 Chinese - 简体中文"
   },

{hiddifypanel-10.30.0.dev1.dist-info → hiddifypanel-10.30.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.30.0.dev1
+Version: 10.30.0.dev2
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

{hiddifypanel-10.30.0.dev1.dist-info → hiddifypanel-10.30.0.dev2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=RPMmz10GytpfDTOS7Eo1JdhE5YEJXjE7XI849wFsw-U,13
-hiddifypanel/VERSION.py,sha256=t3LDoCq0Q-4w5owfE9IuLZnVv-K_yIA0cPk4OgKIr7c,118
+hiddifypanel/VERSION,sha256=XtMr0Vg7zjwygAHtbUcwUPAbYX6S81F0D-mItBSFQxY,13
+hiddifypanel/VERSION.py,sha256=UvSZ_NsijIVX1fFN3ezKJaC1v7wcCrunwmcA6Ci2-HM,118
 hiddifypanel/__init__.py,sha256=aLukp3ORszdcH4G9J-MlxhjHN6yFlOuOE6mm-L3aG_g,266
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=5GUwwKCRY90RS0WTKPfqzuOYuLuwGLpNLpnKmubf7DE,7405
-hiddifypanel/base.py,sha256=MrOtA0mfPR5E-oGodUS-USfy9bpBkUWF9CZ7Mri8xFI,5626
+hiddifypanel/base.py,sha256=uip2LpfS2KhkW31jNSHPbZ5qxbhwzhJiY7U8WNNrFdQ,5839
 hiddifypanel/cache.py,sha256=6snErbx9rD6XSC2fO79XZy3EGMJoZB-yhnAMEWTPWAg,880
 hiddifypanel/database.py,sha256=14sfbGEG-NCqkfUtyLvcO2JbkQ3-Fzs-MezPNkNbvgk,717
 hiddifypanel/drivers/abstract_driver.py,sha256=HpWkgbWVWF8n3WhDe0BlxsIF1WTWO57AQEAEb2ZVCPM,223
@@ -45,7 +45,7 @@ hiddifypanel/models/__init__.py,sha256=PngFjQL9WvQP4EioNHRz1tTeyIgLoNvZ7WpmAhwKH
 hiddifypanel/models/admin.py,sha256=shNbmaG1i79apfk7KCNr1Qwy_3UQFaTgG2j1wGNs_7g,7269
 hiddifypanel/models/base_account.py,sha256=xx1oO5OKtBPq4eaW9DgSgp3rOHfEOMkV0YpGT7wsoAM,3127
 hiddifypanel/models/child.py,sha256=ZFJaH-GWTKAGD0BGMH0iKEMipi37_cAk59OeJKt2IKA,3039
-hiddifypanel/models/config.py,sha256=68I_QrbVhnFDCsIVw66cpdRnqt18EruJdANljfVMlaM,6579
+hiddifypanel/models/config.py,sha256=-KKYqMkSEn2DabRxqBogSyA6xOU4ons6sa5CxxHAlAk,6373
 hiddifypanel/models/config_enum.py,sha256=iqPuwirmyMcQi20UBI-EngTPpn82ryC9kpsYWvGpXR4,15366
 hiddifypanel/models/domain.py,sha256=kpiyN7-HeDgKSPXia6fMgox5Onefg5FDjxxRkmAil5A,8017
 hiddifypanel/models/parent_domain.py,sha256=bs5F1neOAQu9XHEk3QQTBM4p2iuebM4cnAQqwfNjCtg,2291
@@ -63,7 +63,7 @@ hiddifypanel/panel/cli.py,sha256=-5giHEvYaaSz2yhH2HX16kUocnbLR0FwyfvjHoS7yq4,100
 hiddifypanel/panel/common.py,sha256=3jMmdoMk-qvdT8mSmIXEBh9y54P81EsWUKmGeK9qQKg,7593
 hiddifypanel/panel/custom_widgets.py,sha256=9qI_fNX8NKqB1r8ljgcaisGZaDM89_PM_rOBZbGaTYs,2506
 hiddifypanel/panel/hiddify.py,sha256=lr8k5mOymeNPIhBwBbRUcWObaNVoCDdjI-hprZOOcCc,14028
-hiddifypanel/panel/init_db.py,sha256=ULnm26ngb6PPPX5iqNAC-QbdwA5E_3lHDliWWibP1M4,33602
+hiddifypanel/panel/init_db.py,sha256=6VyWuJo-2JE_Eh39KM2pKmHWCZ97NxfgoEkro6QKZj0,33391
 hiddifypanel/panel/run_commander.py,sha256=D9y-My0xSe2adHWXKV5UPYGl-9WwKURzniq55MRu6tE,3259
 hiddifypanel/panel/usage.py,sha256=E7-kbqszFZjlmmLrjopVn-fqiidobe3HdBYdopPbRAs,5715
 hiddifypanel/panel/admin/Actions.py,sha256=D9Gc_Pl3llMbu3S9FZUCEfT8fRwihsVFG8IyuO-dEqw,8762
@@ -821,24 +821,24 @@ hiddifypanel/templates/redirect.html,sha256=K9x_O4P96vEkqBhOXIhoGrWw1KIqd2bL0BjI
 hiddifypanel/templates/static.html,sha256=jp6q4wtx-k2A_cjqJoNiMS7Ee30arE45qI3ev4d5ky4,165
 hiddifypanel/templates/hiddify-flask-admin/actions.html,sha256=2NeITe2e-lPKCk_o511tCIqVtrPu8LYHE1wTCtrFUrI,1331
 hiddifypanel/templates/hiddify-flask-admin/list.html,sha256=MBGrTqZpzNLe4sZy0RozvXNr8seFUQc2C6v88BJtNWc,11095
-hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=IVOjWoKapKMrpjLCB2CyDrjfd4KsVQL6OoTNsGpN69w,76462
-hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=XH-o-WUNGrfLlDONFi7NAZU6uJVg_LOQbwnM2KHj9XQ,79701
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=F_GqGDTB0PChY93xm7YQQ9PbfukjNYAPaPK9yF61vcE,96451
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=8CYmJ3sv061bnxLtqPothEu-WBQ5f9pJXh4_qVx-3nY,76439
+hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=OlKaiP7MYYeOomSJgo6sFSFRu3byBKvcxHg-uPEqpa4,79678
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=JbFpUypalPbBYBStQjcPat66qhXmwZKo-D6B54cC9wE,96451
 hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=8-KfPE3elLTi9jyX4mUa2zQTuwp_WA3HNkEEDdTMons,102102
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=ljVuX237eyU-eWxkBTSaUYzZAjWQy7eTGHBaS0D7TJg,60458
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=VxSgXV-yG9C0PRGp_oHPn2IoDNjjOwsUhQoBa-BOP4k,60458
 hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=PFVBTvQAKL4acU49xqf9G3z8WfypqBXzkHWmFb2Kmtc,70932
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=HlbtjiwCb2cVfATRKHw7xzZdfqVp9itYLb8KF-TC_pA,99878
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=D_haLHKXM4M_bKM9VCg4r4fXdnJ1wnwOGUqruq55s84,99878
 hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=uNNQ_jmPykCDIx13hQ3thDaur6XQ7N9lfukF3G_XEeA,106517
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=buRlOVh6VIbWn1NDY_01DyQ3hqf0oULAz3ybHfo5IIk,60737
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=JadP1yV5u2Nx3YOpzuZjebsvkS8o8rxA4p8RehGctJU,60737
 hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=_8pIQz7C8NtdOyEXxHT6pA7f5_W3Qotiz0Y2UJIc-sY,70116
-hiddifypanel/translations.i18n/en.json,sha256=wFHEoqtJkpv8qXIv7KCb5lhD89tmeNkca5CiUY6ivkg,69360
+hiddifypanel/translations.i18n/en.json,sha256=buYpaRx6aZZprYTSXVFuXTrcXo6SOfMHqS-VdqpHwU4,69337
 hiddifypanel/translations.i18n/fa.json,sha256=GsO1skyWExqBh56gO1SoI-Ab05Uh8NMPJoic1EFcFfQ,91749
 hiddifypanel/translations.i18n/pt.json,sha256=69muFjHkp60DDBt83mblENOF3_9Nr1ti13kE2wBH7ng,60927
 hiddifypanel/translations.i18n/ru.json,sha256=LT8A1eZOI0RIE4VW-aGS9rHQcSextutMIQNgsSwSFQY,96113
 hiddifypanel/translations.i18n/zh.json,sha256=xw9BJHGFbjgqA8dwl4fBCc0BZ9aopwzPtPkljpVJ9Fk,60357
-hiddifypanel-10.30.0.dev1.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.30.0.dev1.dist-info/METADATA,sha256=4L65g7wv3JYbuqyXFHHprpUZ1k-0_7xbpxpdkvspSC0,4044
-hiddifypanel-10.30.0.dev1.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-hiddifypanel-10.30.0.dev1.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.30.0.dev1.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.30.0.dev1.dist-info/RECORD,,
+hiddifypanel-10.30.0.dev2.dist-info/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.30.0.dev2.dist-info/METADATA,sha256=BDhlflL7GWUDAWK5XlvJdnPGkWhW__mQo2TmTieUCGo,4044
+hiddifypanel-10.30.0.dev2.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+hiddifypanel-10.30.0.dev2.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.30.0.dev2.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.30.0.dev2.dist-info/RECORD,,