The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Move parsing of requirements logic to function. (#12701)
comfyanonymous17106cb124fc
diff --git a/app/frontend_management.py b/app/frontend_management.pyindex bdaa85812..f753ef0de 100644--- a/app/frontend_management.py+++ b/app/frontend_management.py@@ -17,7 +17,7 @@ from importlib.metadata import versionimport requestsfrom typing_extensions import NotRequired-from utils.install_util import get_missing_requirements_message, requirements_path+from utils.install_util import get_missing_requirements_message, get_required_packages_versionsfrom comfy.cli_args import DEFAULT_VERSION_STRINGimport app.logger@@ -45,25 +45,7 @@ def get_installed_frontend_version():def get_required_frontend_version():- """Get the required frontend version from requirements.txt."""- try:- with open(requirements_path, "r", encoding="utf-8") as f:- for line in f:- line = line.strip()- if line.startswith("comfyui-frontend-package=="):- version_str = line.split("==")[-1]- if not is_valid_version(version_str):- logging.error(f"Invalid version format in requirements.txt: {version_str}")- return None- return version_str- logging.error("comfyui-frontend-package not found in requirements.txt")- return None- except FileNotFoundError:- logging.error("requirements.txt not found. Cannot determine required frontend version.")- return None- except Exception as e:- logging.error(f"Error reading requirements.txt: {e}")- return None+ return get_required_packages_versions().get("comfyui-frontend-package", None)def check_frontend_version():@@ -217,25 +199,7 @@ class FrontendManager:@classmethoddef get_required_templates_version(cls) -> str:- """Get the required workflow templates version from requirements.txt."""- try:- with open(requirements_path, "r", encoding="utf-8") as f:- for line in f:- line = line.strip()- if line.startswith("comfyui-workflow-templates=="):- version_str = line.split("==")[-1]- if not is_valid_version(version_str):- logging.error(f"Invalid templates version format in requirements.txt: {version_str}")- return None- return version_str- logging.error("comfyui-workflow-templates not found in requirements.txt")- return None- except FileNotFoundError:- logging.error("requirements.txt not found. Cannot determine required templates version.")- return None- except Exception as e:- logging.error(f"Error reading requirements.txt: {e}")- return None+ return get_required_packages_versions().get("comfyui-workflow-templates", None)@classmethoddef default_frontend_path(cls) -> str:diff --git a/tests-unit/app_test/frontend_manager_test.py b/tests-unit/app_test/frontend_manager_test.pyindex 643f04e72..1d5a84b47 100644--- a/tests-unit/app_test/frontend_manager_test.py+++ b/tests-unit/app_test/frontend_manager_test.py@@ -49,6 +49,12 @@ def mock_provider(mock_releases):return provider[email protected](autouse=True)+def clear_cache():+ import utils.install_util+ utils.install_util.PACKAGE_VERSIONS = {}++def test_get_release(mock_provider, mock_releases):version = "1.0.0"release = mock_provider.get_release(version)diff --git a/utils/install_util.py b/utils/install_util.pyindex 0f59bcf91..34489aec5 100644--- a/utils/install_util.py+++ b/utils/install_util.py@@ -1,5 +1,7 @@from pathlib import Pathimport sys+import logging+import re# The path to the requirements.txt filerequirements_path = Path(__file__).parents[1] / "requirements.txt"@@ -16,3 +18,34 @@ Please install the updated requirements.txt file by running:{sys.executable} {extra}-m pip install -r {requirements_path}If you are on the portable package you can run: update\\update_comfyui.bat to solve this problem.""".strip()+++def is_valid_version(version: str) -> bool:+ """Validate if a string is a valid semantic version (X.Y.Z format)."""+ pattern = r"^(\d+)\.(\d+)\.(\d+)$"+ return bool(re.match(pattern, version))+++PACKAGE_VERSIONS = {}+def get_required_packages_versions():+ if len(PACKAGE_VERSIONS) > 0:+ return PACKAGE_VERSIONS.copy()+ out = PACKAGE_VERSIONS+ try:+ with open(requirements_path, "r", encoding="utf-8") as f:+ for line in f:+ line = line.strip().replace(">=", "==")+ s = line.split("==")+ if len(s) == 2:+ version_str = s[-1]+ if not is_valid_version(version_str):+ logging.error(f"Invalid version format in requirements.txt: {version_str}")+ continue+ out[s[0]] = version_str+ return out.copy()+ except FileNotFoundError:+ logging.error("requirements.txt not found.")+ return None+ except Exception as e:+ logging.error(f"Error reading requirements.txt: {e}")+ return None