代码更新

compute_print_net.py

@@ -347,3 +347,25 @@ class Platform:
         return self.placed_models, self.unplaced_models
     
 # -------------------------- 结束：bbox --------------------------
+
+
+# -------------------------- 开始：oss --------------------------
+
+import yaml
+import oss2
+def get_oss_client(cfg_path):
+    with open(os.path.expanduser(cfg_path), "r") as config:
+        cfg = yaml.safe_load(config)
+
+    AccessKeyId_down = cfg["run"]["down"]["AccessKeyId"]
+    AccessKeySecret_down = cfg["run"]["down"]["AccessKeySecret"]
+    Endpoint_down = cfg["run"]["down"]["Endpoint"]
+    Bucket_down = cfg["run"]["down"]["Bucket"]
+
+    oss_client = oss2.Bucket(
+        oss2.Auth(AccessKeyId_down, AccessKeySecret_down), Endpoint_down, Bucket_down
+    )
+
+    return oss_client
+
+# -------------------------- 结束：oss --------------------------

download_print_out.py

@@ -15,8 +15,12 @@ import shutil
 
 from config import url_get_oss_suffix_by_orderId
 
-def download_transform_save_by_json(pid_file, workdir, oss_config):
-    layout_data = download_datas_by_json(pid_file, workdir, oss_config)
+from general import transform_save_bpy
+
+from compute_print_net import get_oss_client
+
+def download_transform_save_by_json(json_name, workdir, oss_config):
+    layout_data = download_datas_by_json(json_name, workdir, oss_config)
     original_obj_pid_dir = workdir
     transform_save_bpy(layout_data, original_obj_pid_dir)
 
@@ -241,21 +245,6 @@ def download_data_by_json(model_info, workdir, oss_client ):
     except Exception as e:
         print(f"下载失败: {pid}, 错误: {str(e)}")
         pass
-    
-def get_oss_client(cfg_path):
-    with open(os.path.expanduser(cfg_path), "r") as config:
-        cfg = yaml.safe_load(config)
-
-    AccessKeyId_down = cfg["run"]["down"]["AccessKeyId"]
-    AccessKeySecret_down = cfg["run"]["down"]["AccessKeySecret"]
-    Endpoint_down = cfg["run"]["down"]["Endpoint"]
-    Bucket_down = cfg["run"]["down"]["Bucket"]
-
-    oss_client = oss2.Bucket(
-        oss2.Auth(AccessKeyId_down, AccessKeySecret_down), Endpoint_down, Bucket_down
-    )
-
-    return oss_client
 
 def download_datas_by_json(pid_file, workdir, oss_config):
     oss_client = get_oss_client(oss_config)

general.py

@@ -6,6 +6,7 @@ from config import *
 from compute_print_net_out import mesh_transform_by_matrix
 from compute_print_net_out import down_sample
 from compute_print_net_out import voxel_size
+from compute_print_net_out import read_mesh
 
 # -------------------------- 开始：运行 ----------------------------------