diff --git a/comfyui_manager/data_models/README.md b/comfyui_manager/data_models/README.md index adf840f0..eadcfa9d 100644 --- a/comfyui_manager/data_models/README.md +++ b/comfyui_manager/data_models/README.md @@ -29,6 +29,7 @@ datamodel-codegen \ --use-subclass-enum \ --field-constraints \ --strict-types bytes \ + --use-double-quotes \ --input openapi.yaml \ --output comfyui_manager/data_models/generated_models.py \ --output-model-type pydantic_v2.BaseModel diff --git a/comfyui_manager/data_models/generated_models.py b/comfyui_manager/data_models/generated_models.py index cc5f9a7b..69771009 100644 --- a/comfyui_manager/data_models/generated_models.py +++ b/comfyui_manager/data_models/generated_models.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: openapi.yaml -# timestamp: 2025-06-21T23:40:24+00:00 +# timestamp: 2025-06-27T04:01:45+00:00 from __future__ import annotations @@ -109,9 +109,9 @@ class SecurityLevel(str, Enum): class RiskLevel(str, Enum): block = "block" - high_p = "high+" + high_ = "high+" high = "high" - middle_p = "middle+" + middle_ = "middle+" middle = "middle" diff --git a/comfyui_manager/glob/utils/security_utils.py b/comfyui_manager/glob/utils/security_utils.py index 90fd781b..1f2ac581 100644 --- a/comfyui_manager/glob/utils/security_utils.py +++ b/comfyui_manager/glob/utils/security_utils.py @@ -17,7 +17,7 @@ def is_allowed_security_level(level): if level == RiskLevel.block.value: return False - elif level == RiskLevel.high_p.value: + elif level == RiskLevel.high_.value: if is_local_mode: return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal_.value] elif is_personal_cloud: @@ -29,7 +29,7 @@ def is_allowed_security_level(level): return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal_.value] else: return core.get_config()['security_level'] == SecurityLevel.weak.value - elif level == RiskLevel.middle_p.value: + elif level == RiskLevel.middle_.value: if is_local_mode or is_personal_cloud: return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal.value, SecurityLevel.normal_.value] else: @@ -54,7 +54,7 @@ async def get_risky_level(files, pip_packages): for x in files: if x not in all_urls: - return RiskLevel.high_p.value + return RiskLevel.high_.value all_pip_packages = set() for x in json_data1["custom_nodes"] + json_data2["custom_nodes"]: @@ -64,4 +64,4 @@ async def get_risky_level(files, pip_packages): if p not in all_pip_packages: return RiskLevel.block.value - return RiskLevel.middle_p.value + return RiskLevel.middle_.value diff --git a/openapi.yaml b/openapi.yaml index fb88960a..0e17dc74 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -240,7 +240,7 @@ components: description: Security level configuration (from most to least restrictive) RiskLevel: type: string - enum: [block, high, middle] + enum: [block, high+, high, middle+, middle] description: Risk classification for operations ManagerPack: allOf: