From a26bd6ae558e72df73e33378d9c26a81ae11ddfa Mon Sep 17 00:00:00 2001
From: sepehr <sepehr.ha@gmail.com>
Date: Mon, 16 Dec 2024 13:04:30 +0300
Subject: [PATCH] Fix Wrong Imports and typo

---
 py/api/api_account.py | 9 +++++++--
 py/libs/firm_lib.py   | 2 +-
 py/libs/util.py       | 1 -
 py/mules/updater.py   | 5 +----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/py/api/api_account.py b/py/api/api_account.py
index c34f74f..2f9c984 100644
--- a/py/api/api_account.py
+++ b/py/api/api_account.py
@@ -11,10 +11,15 @@ from libs.util import ISPRO
 from libs.db import db,db_permissions,db_user_group_perm,db_groups,db_sysconfig,db_syslog
 
 import json
-from libs import utilpro, webutil,account
+from libs import webutil,account
 from libs.webutil import app, login_required, get_myself , buildResponse
 from libs.mschap3.mschap import nt_password_hash
-
+try:
+    from libs import utilpro
+    ISPRO=True
+except ImportError:
+    ISPRO=False
+    pass
 import logging
 log = logging.getLogger("api")
 
diff --git a/py/libs/firm_lib.py b/py/libs/firm_lib.py
index cf0d4d3..84be3fd 100644
--- a/py/libs/firm_lib.py
+++ b/py/libs/firm_lib.py
@@ -27,7 +27,7 @@ import urllib.request
 import hashlib
 import netifaces
 log = logging.getLogger("util")
-from libs import utilpro,util
+from libs import util
 try:
     from libs import utilpro
     ISPRO=True
diff --git a/py/libs/util.py b/py/libs/util.py
index b79ea1a..dd7cf93 100644
--- a/py/libs/util.py
+++ b/py/libs/util.py
@@ -27,7 +27,6 @@ import urllib.request
 import hashlib
 import netifaces
 log = logging.getLogger("util")
-from libs import utilpro
 try:
     from libs import utilpro
     ISPRO=True
diff --git a/py/mules/updater.py b/py/mules/updater.py
index b0252e2..02addd9 100644
--- a/py/mules/updater.py
+++ b/py/mules/updater.py
@@ -80,14 +80,13 @@ def extract_zip_reload(filename,dst):
     p_status = p.wait()
     #install requirments
     try:
-        from libs import utilpro
-        ISPRO=True
         proreqs="/app/py/pro-reqs.txt"
         with open(proreqs, "r") as f:
             for line in f:
                 import_or_install(line.strip())
                 log.info("Installed {}".format(line.strip()))
                 time.sleep(1)
+        time.sleep(3)
     except ImportError:
         pass
     reqs="/app/reqs.txt"
@@ -101,8 +100,6 @@ def extract_zip_reload(filename,dst):
     #touch server reload file /app/reload
     Path('/app/reload').touch()
 
-
-
 def main():
     while True:
         try: