add oss

Author: suluyan

publish.yaml

@@ -156,6 +156,11 @@ Parameters:
       type: string
       default: ''
       description: nas所在专用网络的交换机id，nasMountAddr为空时不会被取用。
+    ossBucketPath:
+      title: oss挂载地址
+      type: string
+      default: ''
+      description: oss挂载地址，用于模型下载的缓存和转换；配置优先级大于nas。配置时nas不被挂载。oss所在区域应与region完全一致。配置示例：0625xxxxxx-xxxxx.cn-hangzhou.nas.aliyuncs.com:/deploy
     refresh:
       title: 刷新缓存
       type: string

src/s.yaml

@@ -28,6 +28,7 @@ vars: # 全局变量
   securityGroupId: {{ securityGroupId }}
   vSwitchIds: {{ vSwitchIds }}
   refresh: '{{ refresh }}'
+  ossBucketPath: {{ ossBucketPath }}
 resources:
   model_cache:
     component: 'fc3'
@@ -40,7 +41,14 @@ resources:
       instanceType: e1
       runtime: python3.9
       code: ./model_cache
-      vpcConfig:{{ if nasMountAddr != '' }}
+      {{ if ossBucketPath != '' }}ossMountConfig:
+        ossMountPoints:
+          - bucketName: swingdeploy-oss-${vars.region}
+            bucketPath: ${vars.ossBucketPath}
+            endpoint: oss-cn-${vars.region}.aliyuncs.com
+            mountDir: /mnt/cache
+            readOnly: False
+      {{ else }}vpcConfig:{{ if nasMountAddr != '' }}
         vpcId: ${vars.vpcId}
         securityGroupId: ${vars.securityGroupId}
         vSwitchIds:
@@ -51,7 +59,7 @@ resources:
         mountPoints:
           - serverAddr: ${vars.nasMountAddr}
             mountDir: /mnt/cache
-            enableTLS: false{{ else }} auto{{ /if }}
+            enableTLS: false{{ else }} auto{{ /if }}{{ /if }}
       environmentVariables:
         ALIBABA_CLOUD_ACCESS_KEY_ID: ''
         ALIBABA_CLOUD_ACCESS_KEY_SECRET: ''
@@ -77,8 +85,9 @@ resources:
       instanceConcurrency: 1
       runtime: custom-container
       internetAccess: true
-      vpcConfig: ${resources.model_cache.output.vpcConfig}
-      nasConfig: ${resources.model_cache.output.nasConfig}
+      {{ if ossBucketPath != '' }}ossMountConfig: ${resources.model_cache.output.ossMountConfig}
+      {{ else }}vpcConfig: ${resources.model_cache.output.vpcConfig}
+      nasConfig: ${resources.model_cache.output.nasConfig}{{ /if }}
       customContainerConfig:
         image: modelscope-registry.${vars.region}.cr.aliyuncs.com/modelscope-repo/modelscope:ubuntu22.04-py310-torch2.3.1-1.23.1
         command: ["/bin/sh", "-c", "wget https://modelscope.oss-cn-beijing.aliyuncs.com/swingdeploy/pre/deploy.tar; tar xvf deploy.tar; /bin/bash script/run_download.sh"]
@@ -93,7 +102,7 @@ resources:
         ALIBABA_CLOUD_SECURITY_TOKEN: ''
         MODEL_ID: ${vars.modelID}
         MODEL_VERSION: ${vars.modelRevision}
-        MODELSCOPE_CACHE: ${resources.model_cache.output.nasConfig.mountPoints.0.mountDir}
+        MODELSCOPE_CACHE: {{ if }}${resources.model_cache.output.nasConfig.mountPoints.0.mountDir}{{ else }}${resources.model_cache.output.ossMountConfig.ossMountPoints.0.mountDir}{{ /if }}
         MODELSCOPE_TOKEN: ${vars.modelAccessToken}
         MODELSCOPE_DOMAIN: ${vars.modelCache}
         IMAGE_TAG: ${vars.version}
@@ -171,8 +180,15 @@ resources:
       initializer: 'true'
       initializationTimeout: 300
       internetAccess: true
-      vpcConfig: ${resources.model_cache.output.vpcConfig}
-      nasConfig: ${resources.model_cache.output.nasConfig}
+      {{ if ossBucketPath != '' }}ossMountConfig:
+        ossMountPoints:
+          - bucketName: swingdeploy-oss-${vars.region}
+            bucketPath: ${vars.ossBucketPath}
+            endpoint: oss-cn-${vars.region}.aliyuncs.com
+            mountDir: /mnt/cache
+            readOnly: False
+      {{ else }}vpcConfig: ${resources.model_cache.output.vpcConfig}
+      nasConfig: ${resources.model_cache.output.nasConfig}{{ /if }}
       customContainerConfig:
         image: {{ if imageTag == 'ubuntu22.04-cuda12.1.0-py310-torch2.3.0-tf2.16.1-1.16.0-fc' || imageTag == 'ubuntu22.04-cuda12.4.0-py311-torch2.6.0-1.25.0-LLM' || imageTag == 'ubuntu22.04-cuda12.4.0-py310-torch2.6.0-1.23.1-LLM' || imageTag == 'ubuntu22.04-py310-torch2.3.0-1.16.0-fc' || imageTag == 'ubuntu22.04-cuda12.1.0-py310-torch2.3.0-tf2.16.1-1.16.0based-1.18.1-fc' || imageTag == 'ubuntu22.04-cuda12.4.0-py310-torch2.5.1-1.23.1-LLM' || imageTag == 'fc-deploy-common-v17.3.3' || imageTag == 'ubuntu22.04-cuda12.4.0-py310-torch2.4.0-1.21.0-LLM-vllm085' }}registry.${vars.region}.aliyuncs.com/modelscope-repo/modelscope:${vars.version}{{ else }}modelscope-registry.${vars.region}.cr.aliyuncs.com/modelscope-repo/modelscope:${vars.version}{{/if}}
         command: ["/bin/sh", "-c", "wget https://modelscope.oss-cn-beijing.aliyuncs.com/swingdeploy/pre/deploy.tar; tar xvf deploy.tar; /bin/bash script/run_deploy.sh"]
@@ -187,7 +203,7 @@ resources:
         ALIBABA_CLOUD_SECURITY_TOKEN: ''
         MODEL_ID: ${vars.modelID}
         MODEL_VERSION: ${vars.modelRevision}
-        MODELSCOPE_CACHE: ${resources.model_cache.output.nasConfig.mountPoints.0.mountDir}/
+        MODELSCOPE_CACHE: {{ if }}${resources.model_cache.output.nasConfig.mountPoints.0.mountDir}{{ else }}${resources.model_cache.output.ossMountConfig.ossMountPoints.0.mountDir}{{ /if }}
         MODELSCOPE_TOKEN: ${vars.modelAccessToken}
         TASK: ${vars.modelTask}
         IMAGE_TAG: ${vars.version}