'commit'
This commit is contained in:
@@ -2,8 +2,10 @@ import base64
|
|||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
from Config.Config import OBS_SERVER, OBS_PREFIX
|
||||||
from JiMeng.Kit.JmCommon import JmCommon
|
from JiMeng.Kit.JmCommon import JmCommon
|
||||||
from JiMeng.Kit.JmErrorCode import JmErrorCode
|
from JiMeng.Kit.JmErrorCode import JmErrorCode
|
||||||
|
from Util.ObsUtil import ObsUploader
|
||||||
|
|
||||||
|
|
||||||
class JmTxt2Img:
|
class JmTxt2Img:
|
||||||
@@ -47,6 +49,20 @@ class JmTxt2Img:
|
|||||||
with open(save_img_path, 'wb') as f:
|
with open(save_img_path, 'wb') as f:
|
||||||
f.write(bytes_data)
|
f.write(bytes_data)
|
||||||
print(f"文件保存成功!文件位置: {save_img_path}")
|
print(f"文件保存成功!文件位置: {save_img_path}")
|
||||||
|
|
||||||
|
# 创建上传器实例
|
||||||
|
uploader = ObsUploader()
|
||||||
|
# 上传参数
|
||||||
|
object_key = OBS_PREFIX + "/" + file_path
|
||||||
|
# 执行上传
|
||||||
|
success, result = uploader.upload_file(object_key, file_path)
|
||||||
|
# 处理结果
|
||||||
|
if success:
|
||||||
|
logger.info(f'{file_path}上传成功!')
|
||||||
|
# 获取上传文件的 URL
|
||||||
|
file_url = f"https://{OBS_BUCKET}.{OBS_SERVER}/{object_key}"
|
||||||
|
img_url_list.append(file_url)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"保存图片失败: {str(e)}")
|
print(f"保存图片失败: {str(e)}")
|
||||||
raise Exception(f"保存图片失败: {str(e)}")
|
raise Exception(f"保存图片失败: {str(e)}")
|
||||||
|
@@ -14,11 +14,11 @@ def batch_glm(output_dir, img_list):
|
|||||||
img_url_list = []
|
img_url_list = []
|
||||||
for file_path in img_list:
|
for file_path in img_list:
|
||||||
# 创建上传器实例
|
# 创建上传器实例
|
||||||
uploader = ObsUploader(OBS_AK, OBS_SK, "https://" + OBS_SERVER)
|
uploader = ObsUploader()
|
||||||
# 上传参数
|
# 上传参数
|
||||||
object_key = OBS_PREFIX + "/" + file_path
|
object_key = OBS_PREFIX + "/" + file_path
|
||||||
# 执行上传
|
# 执行上传
|
||||||
success, result = uploader.upload_file(OBS_BUCKET, object_key, file_path)
|
success, result = uploader.upload_file(object_key, file_path)
|
||||||
# 处理结果
|
# 处理结果
|
||||||
if success:
|
if success:
|
||||||
logger.info(f'{file_path}上传成功!')
|
logger.info(f'{file_path}上传成功!')
|
||||||
|
@@ -38,11 +38,11 @@ def batch_qvq(output_dir, img_list):
|
|||||||
img_url_list = []
|
img_url_list = []
|
||||||
for file_path in img_list:
|
for file_path in img_list:
|
||||||
# 创建上传器实例
|
# 创建上传器实例
|
||||||
uploader = ObsUploader(OBS_AK, OBS_SK, "https://" + OBS_SERVER)
|
uploader = ObsUploader()
|
||||||
# 上传参数
|
# 上传参数
|
||||||
object_key = OBS_PREFIX + "/" + file_path
|
object_key = OBS_PREFIX + "/" + file_path
|
||||||
# 执行上传
|
# 执行上传
|
||||||
success, result = uploader.upload_file(OBS_BUCKET, object_key, file_path)
|
success, result = uploader.upload_file(object_key, file_path)
|
||||||
# 处理结果
|
# 处理结果
|
||||||
if success:
|
if success:
|
||||||
logger.info(f'{file_path}上传成功!')
|
logger.info(f'{file_path}上传成功!')
|
||||||
|
@@ -33,11 +33,11 @@ def batch_glm(output_dir, img_list):
|
|||||||
img_url_list = []
|
img_url_list = []
|
||||||
for file_path in img_list:
|
for file_path in img_list:
|
||||||
# 创建上传器实例
|
# 创建上传器实例
|
||||||
uploader = ObsUploader(OBS_AK, OBS_SK, "https://" + OBS_SERVER)
|
uploader = ObsUploader()
|
||||||
# 上传参数
|
# 上传参数
|
||||||
object_key = OBS_PREFIX + "/" + file_path
|
object_key = OBS_PREFIX + "/" + file_path
|
||||||
# 执行上传
|
# 执行上传
|
||||||
success, result = uploader.upload_file(OBS_BUCKET, object_key, file_path)
|
success, result = uploader.upload_file(object_key, file_path)
|
||||||
# 处理结果
|
# 处理结果
|
||||||
if success:
|
if success:
|
||||||
logger.info(f'{file_path}上传成功!')
|
logger.info(f'{file_path}上传成功!')
|
||||||
|
@@ -12,7 +12,7 @@ logger = logging.getLogger(__name__)
|
|||||||
|
|
||||||
|
|
||||||
class ObsUploader:
|
class ObsUploader:
|
||||||
def __init__(self, access_key_id, secret_access_key, server):
|
def __init__(self, access_key_id=OBS_AK, secret_access_key=OBS_SK, server="https://" + OBS_SERVER):
|
||||||
"""
|
"""
|
||||||
初始化OBS客户端
|
初始化OBS客户端
|
||||||
:param access_key_id: 访问密钥ID
|
:param access_key_id: 访问密钥ID
|
||||||
@@ -25,7 +25,7 @@ class ObsUploader:
|
|||||||
server=server
|
server=server
|
||||||
)
|
)
|
||||||
|
|
||||||
def upload_file(self, bucket_name, object_key, file_path, metadata=None, headers=None):
|
def upload_file(self, object_key, file_path, bucket_name=OBS_BUCKET, metadata=None, headers=None):
|
||||||
"""
|
"""
|
||||||
上传文件到OBS
|
上传文件到OBS
|
||||||
:param bucket_name: 桶名称
|
:param bucket_name: 桶名称
|
||||||
|
Reference in New Issue
Block a user