hiddifypanel 10.85.0b4__py3-none-any.whl → 10.85.0b8__py3-none-any.whl

hiddifypanel/VERSION

@@ -1 +1 @@
-10.85.0b4
+10.85.0b8

hiddifypanel/VERSION.py

@@ -1,6 +1,6 @@
 # import importlib.metadata
 from datetime import datetime
 
-__version__ = '10.85.0b4'
-__release_time__= datetime.strptime('2025-04-14T00:42:11','%Y-%m-%dT%H:%M:%S')
+__version__ = '10.85.0b8'
+__release_time__= datetime.strptime('2025-04-17T10:03:18','%Y-%m-%dT%H:%M:%S')
 is_released_version=True

hiddifypanel/models/child.py

@@ -72,13 +72,12 @@ class Child(db.Model):  # type: ignore
         if has_app_context() and hasattr(g, "child"):
             return g.child
         child = Child.by_id(0)
-        if child is None:
-            tmp_uuid = str(uuid.uuid4())
-            db.session.add(Child(id=0, unique_id=tmp_uuid, name="Root"))
-            db.session.commit()
-            db_execute(f"update child set id=0 where unique_id='{tmp_uuid}'", commit=True)
-            child = Child.by_id(0)
-
+        # if child is None:
+        #     tmp_uuid = str(uuid.uuid4())
+        #     db.session.add(Child(id=0, unique_id=tmp_uuid, name="Root"))
+        #     db.session.commit()
+        #     db_execute(f"update child set id=0 where unique_id='{tmp_uuid}'", commit=True)
+        #     child = Child.by_id(0)
         return child
 
     @classmethod

hiddifypanel/models/config.py

@@ -107,7 +107,7 @@ def set_hconfig(key: ConfigEnum, value: str | int | bool, child_id: int | None =
     get_hconfigs.invalidate_all()
     old_v = None
     if key.type == bool:
-        dbconf = BoolConfig.query.filter(BoolConfig.key == key, BoolConfig.child_id == child_id).first()
+        dbconf = db.session.query(BoolConfig).filter(BoolConfig.key == key, BoolConfig.child_id == child_id).first()
         if not dbconf:
             dbconf = BoolConfig(key=key, value=value, child_id=child_id)
             db.session.add(dbconf)
@@ -115,7 +115,7 @@ def set_hconfig(key: ConfigEnum, value: str | int | bool, child_id: int | None =
             old_v = dbconf.value
     else:
         value = str(value)
-        dbconf = StrConfig.query.filter(StrConfig.key == key, StrConfig.child_id == child_id).first()
+        dbconf = db.session.query(StrConfig).filter(StrConfig.key == key, StrConfig.child_id == child_id).first()
         if not dbconf:
             dbconf = StrConfig(key=key, value=value, child_id=child_id)
             db.session.add(dbconf)

hiddifypanel/panel/commercial/restapi/v1/__init__.py

@@ -1,5 +1,4 @@
-from flask_apispec import FlaskApiSpec
-from flask_apispec.extension import FlaskApiSpec
+
 from marshmallow import Schema, fields
 
 

hiddifypanel/panel/init_db.py

@@ -698,8 +698,7 @@ def add_column(column):
 
 def execute(query: str):
     try:
-
-        db_execute(query)
+        return db_execute(query)
     except BaseException as e:
         logger.debug(f'migrating_db: {e}')
         pass
@@ -747,8 +746,17 @@ def add_new_enum_values():
         db_execute(f"ALTER TABLE {table_name} MODIFY COLUMN `{column_name}` ENUM({enumstr});", commit=True)
 
 
-def is_db_latest():
-    return str(hconfig(ConfigEnum.db_version))==str(latest_db_version())
+def current_db_version()->int:
+    try:
+        if db_version:=db.session.execute(db.text("select value from str_config where `key`='db_version'")).fetchall():
+            return int(db_version[0][0])
+    except:
+        pass
+    logger.warning("db version not found")
+    return 0
+
+def is_db_latest()->bool:
+    return current_db_version()==str(latest_db_version())
 
 def latest_db_version():
     for ver in range(MAX_DB_VERSION, 1, -1):
@@ -759,7 +767,6 @@ def latest_db_version():
 
 
 def upgrade_database():
-
     panel_root = '/opt/hiddify-manager/hiddify-panel/'
     backup_root = f"{panel_root}backup/"
     sqlite_db = f"{panel_root}hiddifypanel.db"
@@ -796,21 +803,30 @@ def upgrade_database():
 
 
 def init_db():
+    # set_hconfig(ConfigEnum.db_version, 71)
+    db_version = current_db_version()
+    if db_version == latest_db_version():
+        return
+    
     db.create_all()
     
-    # set_hconfig(ConfigEnum.db_version, 71)
     # temporary fix
     add_column(Child.mode)
     add_column(Child.name)
 
-    db_version = int(hconfig(ConfigEnum.db_version) or 0)
-
-    if db_version == latest_db_version():
-        return
     from flask import g
     cache.invalidate_all_cached_functions()
     migrate(db_version)
-    Child.query.filter(Child.id == 0).first().mode = ChildMode.virtual
+
+    child = Child.by_id(0)
+    if child is None:
+        tmp_uuid = str(uuid.uuid4())
+        db.session.add(Child(id=0, unique_id=tmp_uuid, name="Root"))
+        db.session.commit()
+        db_execute(f"update child set id=0 where unique_id='{tmp_uuid}'", commit=True)
+        child = Child.by_id(0)  
+
+    child.mode = ChildMode.virtual
     # if db_version < 69:
     #     _v70(0)
 

{hiddifypanel-10.85.0b4.dist-info → hiddifypanel-10.85.0b8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiddifypanel
-Version: 10.85.0b4
+Version: 10.85.0b8
 Summary: hiddifypanel multi proxy panel
 Author: hiddify
 License: 

{hiddifypanel-10.85.0b4.dist-info → hiddifypanel-10.85.0b8.dist-info}/RECORD

@@ -1,6 +1,6 @@
 hiddifypanel/Events.py,sha256=AlnRdjVul0jP-NCT4-zoaQgowoOo-JhdQB4ytetAFKA,723
-hiddifypanel/VERSION,sha256=2CEquIwAP-9Dlnta0YIevWt9BZBJs2jCISjeOQFFv3w,10
-hiddifypanel/VERSION.py,sha256=UAwI-fTtJyRilJtS7gHHot7rFZy-yQmSYOtwjT535Ws,189
+hiddifypanel/VERSION,sha256=idJCLUo1TPnK5I17Fw9R-W_JBDK1WgCRMkBoqHqhytw,10
+hiddifypanel/VERSION.py,sha256=L-jZ37bFOFXBPp8tu_vyqXsfwBsaf5o2NNbO0fC1jj4,189
 hiddifypanel/__init__.py,sha256=kigwDO8d9jXyPZLvJAWd6zo-GX3pG_xWf-q2aStz80Y,377
 hiddifypanel/__main__.py,sha256=IVchnXpK6bm8T3N--mN17HBQNLMeLAjyP7iwzULexB4,218
 hiddifypanel/auth.py,sha256=LJmH4ROqZv5ej_4m1b0xvbEw2meJTzDR1mFCDm523kE,8041
@@ -52,8 +52,8 @@ hiddifypanel/hutils/proxy/xrayjson.py,sha256=0Bhgj9uaXLTmUUPieg4IxERxO6vRcMkKq_Y
 hiddifypanel/models/__init__.py,sha256=PngFjQL9WvQP4EioNHRz1tTeyIgLoNvZ7WpmAhwKHnU,677
 hiddifypanel/models/admin.py,sha256=bbvpbquyPTmRjqwVT4zVC3bIF39zZYv8snlOR5XIF90,7517
 hiddifypanel/models/base_account.py,sha256=jVO4haLwTsiE7u4fWoDhhRZ_NjbO7hVJhry8k-Vnrzk,3507
-hiddifypanel/models/child.py,sha256=Phs-NpLqNPHh4Dy_GR2sgfBgbvLF_M2JTvv0wXqknlU,2998
-hiddifypanel/models/config.py,sha256=sj-uhikHZTFkZbvrwg7DZtAAUnR-ZLzUV-t4Evd8yzo,6354
+hiddifypanel/models/child.py,sha256=IhmCszhUgi1QXbWgji4UDjHV7_OyzLSLsW86BQWFys4,3009
+hiddifypanel/models/config.py,sha256=3HXKsjAOoya6JmLMb9GXcqa0_dyy9Xg7uDvw2RpdRVo,6378
 hiddifypanel/models/config_enum.py,sha256=7yotT57_-Rc0nBKKQtCTqVoREOAF9i_dudrX161r8lQ,16829
 hiddifypanel/models/domain.py,sha256=zj8zKR_gYnZNBsyZT2pUidvkVxw0WLzx6NysBjByxD0,8225
 hiddifypanel/models/parent_domain.py,sha256=bs5F1neOAQu9XHEk3QQTBM4p2iuebM4cnAQqwfNjCtg,2291
@@ -72,7 +72,7 @@ hiddifypanel/panel/common.py,sha256=pMxdgt37ubIZroFBuvHfN5qXNp8kytVTIzVxzZA_X_I,
 hiddifypanel/panel/custom_widgets.py,sha256=_zA0WZRZOCyh6Z1gW62aRQLMAOM_m85B2oZoIOU59Ys,2637
 hiddifypanel/panel/hiddify.py,sha256=nwLTMYa_LyNuS26BPOO8jfyrslHX2MbQxN0o4lxCTd4,15687
 hiddifypanel/panel/hlogger.py,sha256=1AQQCs1lg0Y1AYIASRjxWAdFE92HENeg3z1rFycOoY0,1215
-hiddifypanel/panel/init_db.py,sha256=_tV9WH1NYfpRUTWiMMDmg2I-TrCT6lhrVqstpFtlUVw,38037
+hiddifypanel/panel/init_db.py,sha256=oO2MHbGf5SPoeUiU_bQwy0Y52VlEDMx-EmB8pkJvQ98,38569
 hiddifypanel/panel/run_commander.py,sha256=cXCFVvZ6iTzab3EOZ-Eq3aOeIqfgzgt2ppNaxm_3OJI,3205
 hiddifypanel/panel/usage.py,sha256=o_VPALSd_40m_PEpNnCUggP2sZXXVf1mNjHI249cJOY,7437
 hiddifypanel/panel/admin/Actions.py,sha256=o_ENbphriVrbRJkx9nvrkpaliuMIfp34sscMkZJ3P5s,8578
@@ -140,7 +140,7 @@ hiddifypanel/panel/commercial/ParentDomainAdmin.py,sha256=fg5jQQsFXfbFRdfwKiqK3F
 hiddifypanel/panel/commercial/ProxyDetailsAdmin.py,sha256=lRYsR-oLd45DO0sH3_Ar6i3EZVG7WwoWE6YLdKjb19c,3258
 hiddifypanel/panel/commercial/__init__.py,sha256=oanPV36n6MXiVhiq_NYL6K9ENhQXZGQM5r4c9oPO0CQ,2322
 hiddifypanel/panel/commercial/restapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hiddifypanel/panel/commercial/restapi/v1/__init__.py,sha256=p7KxjATIX71uT1JQJrg9LKn5RgYJS2k6urX4MlOCb7E,1229
+hiddifypanel/panel/commercial/restapi/v1/__init__.py,sha256=KOVOj1y1TcFprlve8DhOhq6eZYbA6sa_79RbAoMKYuY,1142
 hiddifypanel/panel/commercial/restapi/v1/resources.py,sha256=D7HTLAW-KA_Ikm9VArN2FSARfyCPKHxr3WEs_y4_HTM,4691
 hiddifypanel/panel/commercial/restapi/v1/tgbot.py,sha256=KnKmYYYudQPe0Mppoo_Trb_3IMRsb5FGP0qRdPc319A,3091
 hiddifypanel/panel/commercial/restapi/v1/tgmsg.py,sha256=bUERY88cNvcDQ-SxoL4oNn6fiIKj8souyS1kSYnQmuU,3033
@@ -842,17 +842,17 @@ 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=pC1m5GaTZaH84uwIIGRyvZzhYpvu2jSUVuL2-Cecf78,80248
+hiddifypanel/translations/en/LC_MESSAGES/messages.mo,sha256=dKtp_8qkP3Hevs3RCI01p82MKIXwJLjQ6bazqdic41k,80248
 hiddifypanel/translations/en/LC_MESSAGES/messages.po,sha256=ZQn1-QHu0FwpHIluExU9U1p738DrpK_vBaucF1ndyvo,83564
-hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=I9206EsJUSHQ2XQkFcnTUizN0EnDV--felWV5KjgB6w,102665
+hiddifypanel/translations/fa/LC_MESSAGES/messages.mo,sha256=1Ni9G0XhhVa0nhZ350xeGZdAKsDOMwqXVEsvf8-y99U,102665
 hiddifypanel/translations/fa/LC_MESSAGES/messages.po,sha256=xEU_jSeWnc70mvoPJ7f0d_9lG5U-mvo3BQzcRRvB4o8,107420
-hiddifypanel/translations/my/LC_MESSAGES/messages.mo,sha256=jaKhRoNCqe67qqNfwn2TrmKZ0J0qq6BIeVDcfilDJ-Q,139090
+hiddifypanel/translations/my/LC_MESSAGES/messages.mo,sha256=zC5HhRjJ6xStw7pouGnP6PPFhDQnXEwLLLKjamhrfWA,139090
 hiddifypanel/translations/my/LC_MESSAGES/messages.po,sha256=GcrOHDJC2wjo1L8lLmwLOs_dwoqcf0f6rXXjDv8JnsE,141985
-hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=aBmPCD2OeKWl7prNfJJPGbhIyThQm4-Mz8ZeVjkYcGU,80797
+hiddifypanel/translations/pt/LC_MESSAGES/messages.mo,sha256=Excu9APam9gVEEH_G8uAiMbQMcJH9zEER5uvF6KKH8U,80797
 hiddifypanel/translations/pt/LC_MESSAGES/messages.po,sha256=pX1dG9wcQEYRBpxU3mL-gY_q2YNkVwbRmrI6wNHjkm8,85364
-hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=tPLIjkoqaQavuIyDBnNJSwJBhef8dDaOQISct7sAK00,108594
+hiddifypanel/translations/ru/LC_MESSAGES/messages.mo,sha256=DIl4r1cO7s5nNx9neViOubNabsMsew8-N6NkGd5t0jM,108594
 hiddifypanel/translations/ru/LC_MESSAGES/messages.po,sha256=mc8TFxwLUu8iBH8iK-aGUpQoKDRCjb2sh6fZK1w1inU,113367
-hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=Q_FDI6mbqUHWCYndnUjEzhuTPTgbbFH9-jI27mhXZbQ,75296
+hiddifypanel/translations/zh/LC_MESSAGES/messages.mo,sha256=UKGJcX1HYvZiA_K8_K9jpepG4dhuBrDgS_2xlrgUyRs,75296
 hiddifypanel/translations/zh/LC_MESSAGES/messages.po,sha256=ze5ipeKdB4ISOMkT0ERufBPdlWDT5m3xUj0OSeBdkpk,79474
 hiddifypanel/translations.i18n/en.json,sha256=4rDoVjPSUqs8OCh8dHf923wjHmgJNguelTN3b1EwLqA,72605
 hiddifypanel/translations.i18n/fa.json,sha256=3WMq36rLV-1E9GTVTovDlEPIoOJ5cedOBDdke-OcyXE,96515
@@ -861,9 +861,9 @@ hiddifypanel/translations.i18n/my.json,sha256=QAXg__5TCqfx3Ck0cw5YQsSXX_3kqUhMOd
 hiddifypanel/translations.i18n/pt.json,sha256=bO1-qEZJ9yf6Pz_6Vz18xDLezp3pCYwK8_aTLMJA1Iw,74570
 hiddifypanel/translations.i18n/ru.json,sha256=kCI1TBgj1T0VnvRfrgxCnLt_fA6ZuD9kjRt0vkmyvb0,102357
 hiddifypanel/translations.i18n/zh.json,sha256=A50l-_uQ4lsZwcF3UyGcyZxsR3hAjmvnMrJLnTcVZbI,69103
-hiddifypanel-10.85.0b4.dist-info/licenses/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
-hiddifypanel-10.85.0b4.dist-info/METADATA,sha256=RfnRc39gNqOhCjLBZJ6f_EsDLLB-iBjXMO1ZVCEohgE,25500
-hiddifypanel-10.85.0b4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-hiddifypanel-10.85.0b4.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
-hiddifypanel-10.85.0b4.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
-hiddifypanel-10.85.0b4.dist-info/RECORD,,
+hiddifypanel-10.85.0b8.dist-info/licenses/LICENSE.md,sha256=oDrt-cUsyiDGnRPjEJh-3dH2ddAuK_bIVBD8ntkOtZw,19807
+hiddifypanel-10.85.0b8.dist-info/METADATA,sha256=jZKRCO4lnRSMctzm_O3lOLgLmPyZdIrm-hkKC28fqW0,25500
+hiddifypanel-10.85.0b8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+hiddifypanel-10.85.0b8.dist-info/entry_points.txt,sha256=Xzpqlh3nwBtZhoV9AANJykano056VJvYzaujxPztJaM,60
+hiddifypanel-10.85.0b8.dist-info/top_level.txt,sha256=rv-b3qFWUZQTBy0kyBfsr7L6tPpeO7AaQlLHXn-HI5M,13
+hiddifypanel-10.85.0b8.dist-info/RECORD,,