fix: add s model download

Author: mozhou52

example/s.yaml

@@ -0,0 +1,66 @@
+edition: 3.0.0
+name: ai-model-app
+access: quanxi
+
+resources:
+  modelDemo:
+    component: ${path("../")}
+    props:
+      region: cn-hangzhou
+      runtime: custom-container
+      functionName: ai-model-test-qwen
+      description: model service from functionai test
+      logConfig: auto
+      vpcConfig: auto
+      nasConfig: auto
+      instanceConcurrency: 20
+      cpu: 8
+      memorySize: 65536
+      role: acs:ram::1431999136518149:role/aliyunfcdefaultrole
+      diskSize: 10240
+      timeout: 300
+      gpuConfig:
+        gpuMemorySize: 49152
+        gpuType: fc.gpu.ada.1
+      instanceLifecycleConfig:
+        initializer:
+          handler: index.initializer
+          timeout: 600
+        preStop:
+          handler: index.preStop
+          timeout: 300
+      customContainerConfig:
+        image: >-
+          serverless-registry.cn-hangzhou.cr.aliyuncs.com/functionai/dms-vllm:openai_v0.10.0
+        port: 9000
+        entrypoint:
+          - vllm
+          - serve 
+          - /mnt/ai-model-test-qwen
+          - --port 
+          - "9000" 
+          - --served-model-name
+          - Qwen/Qwen3-0.6B
+          - --tensor-parallel-size 
+          - "1"
+          - --trust-remote-code  # 添加这个参数
+      triggers: # 默认，用户可能关注的是开启 authType 是 bear token
+        - triggerName: httpTrigger
+          triggerType: http
+          triggerConfig:
+            methods:
+              - GET
+              - POST
+              - PUT
+              - DELETE
+      provisionConfig:
+        target: 1
+        alwaysAllocateCPU: false
+        alwaysAllocateGPU: false
+        mode: sync
+
+      supplement:
+        modelConfig:
+          source: modelscope
+          id: 'Qwen/Qwen3-0.6B'
+          storage: nas

package-lock.json

@@ -22,6 +22,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@alicloud/devs20230714": "^2.4.5",
     "@alicloud/fc2": "^2.6.6",
     "@alicloud/fc20230330": "4.3.4",
     "@alicloud/pop-core": "^1.8.0",
@@ -34,6 +35,7 @@
     "@serverless-devs/utils": "^0.0.17",
     "@serverless-devs/zip": "^0.0.3-beta.8",
     "ajv": "^8.17.1",
+    "ali-oss": "6.18.1",
     "aliyun-sdk": "^1.12.10",
     "chalk": "^4.1.0",
     "crc64-ecma182.js": "^2.0.2",
@@ -51,8 +53,7 @@
     "temp-dir": "^2.0.0",
     "tty-table": "^4.2.3",
     "uuid": "^9.0.1",
-    "uuid-by-string": "^4.0.0",
-    "ali-oss": "6.18.1"
+    "uuid-by-string": "^4.0.0"
   },
   "devDependencies": {
     "@serverless-devs/component-interface": "^0.0.6",

package.json

@@ -0,0 +1,22 @@
+export default {
+  help: {
+    description: 'Resource layer operation ',
+    summary: 'Resource layer operation ',
+  },
+  subCommands: {
+    download: {
+      help: {
+        description: `Download model`,
+        summary: 'Publish new layer version',
+        option: [],
+      },
+    },
+    reomve: {
+      help: {
+        description: `Remove model`,
+        summary: 'Remove model',
+        option: [],
+      },
+    },
+  },
+};

src/commands-help/model.ts

@@ -4,3 +4,10 @@ export const VPC_AND_NAS_NAME = process.env.FC_GENERATE_VPC_AND_NAS_NAME || defa
 const defaultLogStoreName = 'default-logs';
 export const PROJECT = process.env.FC_GENERATE_PROJECT_NAME;
 export const LOG_STORE = process.env.FC_GENERATE_LOGSTORE_NAME || defaultLogStoreName;
+
+export function getEnvVariable(key: string): string {
+  if (typeof process !== 'undefined' && process.env) {
+    return process.env[key] || '';
+  }
+  return '';
+}

src/default/resources.ts

@@ -25,6 +25,7 @@ import SYaml2To3 from './subCommands/2to3';
 import Logs from './subCommands/logs';
 import { SCHEMA_FILE_PATH } from './constant';
 import { checkDockerIsOK, isAppCenter, isYunXiao } from './utils';
+import { Model } from './subCommands/model';
 
 export default class Fc extends Base {
   // 部署函数
@@ -168,6 +169,13 @@ export default class Fc extends Base {
     return await logs.run();
   }
 
+  public async model(inputs: IInputs) {
+    await super.handlePreRun(inputs, false);
+    const model = new Model(inputs);
+    logger.debug(`model inputs: ${model.subCommand}`);
+    return await model[model.subCommand]();
+  }
+
   public async getSchema(inputs: IInputs) {
     logger.debug(`getSchema: ${JSON.stringify(inputs)}`);
     return fs.readFileSync(SCHEMA_FILE_PATH, 'utf-8');

src/index.ts

@@ -19,6 +19,7 @@ export interface IProps extends IFunction {
   concurrencyConfig?: IConcurrencyConfig;
   provisionConfig?: IProvisionConfig;
   endpoint?: string;
+  supplement: any;
 }
 
 export interface IInputs extends _IInputs {

src/interface/index.ts

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import _, { isEmpty } from 'lodash';
 import { diffConvertYaml } from '@serverless-devs/diff';
 import inquirer from 'inquirer';
 import fs from 'fs';
@@ -319,7 +319,7 @@ export default class Service extends Base {
    * 生成 auto 资源，非 FC 资源，主要指 vpc、nas、log、role（oss mount 挂载点才有）
    */
   private async _deployAuto() {
-    const { region } = this.inputs.props;
+    const { region, supplement } = this.inputs.props;
     const { credential } = this.inputs;
     const { functionName } = this.local;
 
@@ -390,13 +390,15 @@ vpcConfig:
         _.set(this.local, 'vpcConfig', vpcConfig);
       }
       if (nasAuto) {
+        const { modelConfig } = supplement;
+
         logger.write(
           yellow(`Created nas resource succeeded, please replace nasConfig: auto in yaml with:
 nasConfig:
   groupId: 0
   userId: 0
   mountPoints:
-    - serverAddr: ${mountTargetDomain}:/${functionName}
+    - serverAddr: ${mountTargetDomain}:/${functionName}${isEmpty(modelConfig) ? '' : '/'+ modelConfig.id}
       mountDir: /mnt/${functionName}
       enableTLS: false\n`),
         );
@@ -406,7 +408,7 @@ nasConfig:
           userId: 0,
           mountPoints: [
             {
-              serverAddr: `${mountTargetDomain}:/${functionName}`,
+              serverAddr: `${mountTargetDomain}:/${functionName}${isEmpty(modelConfig) ? '' : '/'+ modelConfig.id}`,
               mountDir: `/mnt/${functionName}`,
               enableTLS: false,
             },