comi-logic/ComfyUI-CustomNode
7
0
Fork 0
Code Pull Requests Releases Activity

FIX 调整线上配置获取方式

Browse Source
This commit is contained in:
kyj@bowong.ai
2025-05-19 11:17:05 +08:00
parent c7fed29a5c
commit 1db32fa308
2 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
nodes/cos.py
View File

@@ -39,18 +39,21 @@ class COSDownload:
) )
for i in range(0, 10): for i in range(0, 10):
try: try:
with open( if "aws_key_id" in list(os.environ.keys()):
os.path.join( yaml_config = os.environ
os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml" else:
), with open(
encoding="utf-8", os.path.join(
mode="r+", os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"
) as f: ),
yaml_config = yaml.load(f, Loader=yaml.FullLoader) encoding="utf-8",
mode="r+",
) as f:
yaml_config = yaml.load(f, Loader=yaml.FullLoader)
config = CosConfig( config = CosConfig(
Region=yaml_config["region"], Region=yaml_config["cos_region"],
SecretId=yaml_config["secret_id"], SecretId=yaml_config["cos_secret_id"],
SecretKey=yaml_config["secret_key"], SecretKey=yaml_config["cos_secret_key"],
) )
client = CosS3Client(config) client = CosS3Client(config)
response = client.download_file( response = client.download_file(
@@ -99,18 +102,21 @@ class COSUpload:
loguru.logger.info(f"COS UPLOAD {path} to {cos_bucket}/{subfolder}") loguru.logger.info(f"COS UPLOAD {path} to {cos_bucket}/{subfolder}")
for i in range(0, 10): for i in range(0, 10):
try: try:
with open( if "aws_key_id" in list(os.environ.keys()):
os.path.join( yaml_config = os.environ
os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml" else:
), with open(
encoding="utf-8", os.path.join(
mode="r+", os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"
) as f: ),
yaml_config = yaml.load(f, Loader=yaml.FullLoader) encoding="utf-8",
mode="r+",
) as f:
yaml_config = yaml.load(f, Loader=yaml.FullLoader)
config = CosConfig( config = CosConfig(
Region=yaml_config["region"], Region=yaml_config["cos_region"],
SecretId=yaml_config["secret_id"], SecretId=yaml_config["cos_secret_id"],
SecretKey=yaml_config["secret_key"], SecretKey=yaml_config["cos_secret_key"],
) )
client = CosS3Client(config) client = CosS3Client(config)
response = client.upload_file( response = client.upload_file(

18
nodes/s3.py
View File

@@ -4,6 +4,8 @@ import boto3
import loguru import loguru
import yaml import yaml
from test import yaml_config
class S3Download: class S3Download:
"""AWS S3下载""" """AWS S3下载"""
@@ -36,8 +38,11 @@ class S3Download:
exist_ok=True, exist_ok=True,
) )
try: try:
with open(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"),encoding="utf-8",mode="r+") as f: if "aws_key_id" in list(os.environ.keys()):
yaml_config = yaml.load(f, Loader=yaml.FullLoader) yaml_config = os.environ
else:
with open(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"),encoding="utf-8",mode="r+") as f:
yaml_config = yaml.load(f, Loader=yaml.FullLoader)
client = boto3.client("s3",aws_access_key_id=yaml_config["aws_key_id"],aws_secret_access_key=yaml_config["aws_access_key"]) client = boto3.client("s3",aws_access_key_id=yaml_config["aws_key_id"],aws_secret_access_key=yaml_config["aws_access_key"])
client.download_file(s3_bucket, s3_key, destination) client.download_file(s3_bucket, s3_key, destination)
except Exception as e: except Exception as e:
@@ -67,9 +72,12 @@ class S3Upload:
def upload(self, s3_bucket, path, subfolder): def upload(self, s3_bucket, path, subfolder):
loguru.logger.info(f"S3 UPLOAD {path} to {s3_bucket}/{subfolder}") loguru.logger.info(f"S3 UPLOAD {path} to {s3_bucket}/{subfolder}")
try: try:
with open(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"), if "aws_key_id" in list(os.environ.keys()):
encoding="utf-8", mode="r+") as f: yaml_config = os.environ
yaml_config = yaml.load(f, Loader=yaml.FullLoader) else:
with open(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "config.yaml"),
encoding="utf-8", mode="r+") as f:
yaml_config = yaml.load(f, Loader=yaml.FullLoader)
client = boto3.client("s3", aws_access_key_id=yaml_config["aws_key_id"], client = boto3.client("s3", aws_access_key_id=yaml_config["aws_key_id"],
aws_secret_access_key=yaml_config["aws_access_key"]) aws_secret_access_key=yaml_config["aws_access_key"])
dest_key = "/".join( dest_key = "/".join(