fix: code commit

Author: 高魏洪

__tests__/e2e/ci-mac-linux.sh

@@ -35,6 +35,12 @@ python deploy_and_test_model.py --model-id iic/cv_LightweightEdge_ocr-recognitoi
 python deploy_and_test_model.py --model-id Qwen/Qwen2.5-0.5B-Instruct --region cn-shanghai --auto-cleanup
 python deploy_and_test_model.py --model-id iic/cv_LightweightEdge_ocr-recognitoin-general_damo --region cn-shanghai --storage oss --auto-cleanup
 python deploy_and_test_model.py --model-id Qwen/Qwen2.5-0.5B-Instruct --region cn-shanghai --storage oss --auto-cleanup
+
+echo "test model s_file.yaml"
+s model download -t s_file.yaml
+s deploy -y -t s_file.yaml
+s model remove -t s_file.yaml
+s remove -y -t s_file.yaml
 cd ..
 
 echo "test go runtime"

__tests__/e2e/model/s_file.yaml

@@ -0,0 +1,75 @@
+edition: 3.0.0
+name: ai-model-app
+access: quanxi
+
+vars:
+  region: ${env('REGION', 'cn-hongkong')}
+
+resources:
+  fc3:
+    component: ${env('fc_component_version', path('../../../'))}
+    type: Function
+    props:
+      logConfig: auto
+      functionName: fc3-model-files-${env('fc_component_function_name', 'nodejs18')}
+      instanceLifecycleConfig:
+        preStop:
+          handler: 'true'
+          timeout: 300
+      gpuConfig:
+        gpuMemorySize: 16384
+        gpuType: fc.gpu.tesla.1
+      nasConfig: auto
+      runtime: custom-container
+      description: test model download files
+      cpu: 8
+      customContainerConfig:
+        image: >-
+          cap-demo-public-registry.cn-hangzhou.cr.aliyuncs.com/cap-app/image-generation-comfyui-agent:v1.1.0-beta.0
+        port: 9000
+      triggers:
+        - triggerConfig:
+            methods:
+              - GET
+              - POST
+              - PUT
+              - PATCH
+              - DELETE
+              - HEAD
+            authType: anonymous
+            disableURLInternet: false
+          triggerName: fc3-model-files-${env('fc_component_function_name', 'nodejs18')}
+          qualifier: LATEST
+          description: http trigger for fc3-model-files-${env('fc_component_function_name', 'nodejs18')}
+          triggerType: http
+      version: 1.6.0
+      timeout: 3600
+      instanceConcurrency: 200
+      diskSize: 61440
+      memorySize: 32768
+      internetAccess: true
+      environmentVariables:
+        BACKEND_TYPE: comfyui
+        MODEL_ASSET_DIR: /mnt/fc3-model-files-${env('fc_component_function_name', 'nodejs18')}
+        REGION: ${vars.region}
+      vpcConfig: auto
+      region: ${vars.region}
+      annotations:
+        modelConfig:
+          solution: funArt
+          source:
+            uri: 'oss://dipper-cache-cn-hangzhou.oss-cn-hangzhou.aliyuncs.com'
+          downloadStrategy:
+            mode: once
+          target:
+            uri: 'nas://auto'
+          files:
+            - source:
+                path: base/comfyui/v0.3.59-alpha
+              target:
+                path: ''
+            - source:
+                path: >-
+                  function-art/comfyui/models/checkpoints/v1-5-pruned-emaonly-fp16.safetensors
+              target:
+                path: models/checkpoints/v1-5-pruned-emaonly-fp16.safetensors

__tests__/ut/commands/artModelService_test.ts

@@ -3,6 +3,11 @@ import { IInputs } from '../../../src/interface';
 import DevClient from '@alicloud/devs20230714';
 import * as $OpenApi from '@alicloud/openapi-client';
 import { sleep } from '../../../src/utils';
+import {
+  initClient,
+  _displayProgress,
+  _displayProgressComplete,
+} from '../../../src/subCommands/model/utils';
 
 // Mock dependencies
 jest.mock('../../../src/logger', () => {
@@ -83,14 +88,14 @@ describe('ArtModelService', () => {
         securityToken: 'test-token',
         protocol: 'https',
         endpoint: 'devs-pre.cn-hangzhou.aliyuncs.com',
-        readTimeout: 86400000,
-        connectTimeout: 60000,
-        userAgent: 'test-agent',
+        readTimeout: 300000,
+        connectTimeout: 300000,
+        userAgent: 'Component:fun-art;Nodejs:;OS:darwin-',
       };
 
       ($OpenApi.Config as unknown as jest.Mock).mockImplementation((config) => config);
 
-      const client = await artModelService.initClient();
+      const client = await initClient(mockInputs, 'cn-hangzhou', artModelService.logger, 'fun-art');
 
       expect($OpenApi.Config).toHaveBeenCalledWith(expect.objectContaining(mockConfig));
       expect(client).toBeInstanceOf(DevClient);
@@ -101,27 +106,31 @@ describe('ArtModelService', () => {
 
       ($OpenApi.Config as unknown as jest.Mock).mockImplementation((config) => config);
 
-      await artModelService.initClient();
+      const client = await initClient(mockInputs, 'cn-hangzhou', artModelService.logger, 'fun-art');
 
       expect($OpenApi.Config).toHaveBeenCalledWith(
         expect.objectContaining({
           endpoint: 'custom.endpoint.com',
+          userAgent: 'Component:fun-art;Nodejs:;OS:darwin-',
         }),
       );
+      expect(client).toBeInstanceOf(DevClient);
     });
 
     it('should use custom endpoint from artifact_endpoint environment variable', async () => {
       process.env.artifact_endpoint = 'custom2.endpoint.com';
 
       ($OpenApi.Config as unknown as jest.Mock).mockImplementation((config) => config);
 
-      await artModelService.initClient();
+      const client = await initClient(mockInputs, 'cn-hangzhou', artModelService.logger, 'fun-art');
 
       expect($OpenApi.Config).toHaveBeenCalledWith(
         expect.objectContaining({
           endpoint: 'custom2.endpoint.com',
+          userAgent: 'Component:fun-art;Nodejs:;OS:darwin-',
         }),
       );
+      expect(client).toBeInstanceOf(DevClient);
     });
   });
 
@@ -135,7 +144,9 @@ describe('ArtModelService', () => {
         getFileManagerTask: jest.fn(),
       } as any;
 
-      artModelService.initClient = jest.fn().mockResolvedValue(mockDevClient);
+      // Mock the initClient function from utils
+      const utils = require('../../../src/subCommands/model/utils');
+      jest.spyOn(utils, 'initClient').mockResolvedValue(mockDevClient);
       (sleep as jest.Mock).mockResolvedValue(undefined);
     });
 
@@ -458,7 +469,9 @@ describe('ArtModelService', () => {
         fileManagerRm: jest.fn(),
       } as any;
 
-      artModelService.initClient = jest.fn().mockResolvedValue(mockDevClient);
+      // Mock the initClient function from utils
+      const utils = require('../../../src/subCommands/model/utils');
+      jest.spyOn(utils, 'initClient').mockResolvedValue(mockDevClient);
     });
 
     it('should successfully remove model files', async () => {
@@ -492,9 +505,9 @@ describe('ArtModelService', () => {
     });
   });
 
-  describe('getSource', () => {
+  describe('getSourceAndDestination', () => {
     it('should correctly generate source and destination paths', () => {
-      const result = artModelService.getSource(
+      const result = artModelService.getSourceAndDestination(
         'modelscope://test-model',
         { source: { path: 'file1.txt' }, target: { path: 'file1.txt' } },
         [{ mountDir: '/mnt/nas' }],
@@ -510,7 +523,7 @@ describe('ArtModelService', () => {
 
     it('should handle invalid source URI', () => {
       expect(() => {
-        artModelService.getSource(
+        artModelService.getSourceAndDestination(
           'invalid://test-model',
           { source: { path: 'file1.txt' }, target: { path: 'file1.txt' } },
           [{ mountDir: '/mnt/nas' }],
@@ -526,19 +539,17 @@ describe('ArtModelService', () => {
   describe('_getSourcePath', () => {
     it('should correctly generate source path with valid URI', () => {
       const result = (artModelService as any)._getSourcePath(
-        { path: 'file1.txt' },
+        { source: { path: 'file1.txt' } },
         'modelscope://test-model',
-        /^(modelscope|oss|nas):\/\//,
       );
 
       expect(result).toBe('modelscope://test-model/file1.txt');
     });
 
     it('should handle URI ending with slash', () => {
       const result = (artModelService as any)._getSourcePath(
-        { path: 'file1.txt' },
+        { source: { path: 'file1.txt' } },
         'modelscope://test-model/',
-        /^(modelscope|oss|nas):\/\//,
       );
 
       expect(result).toBe('modelscope://test-model/file1.txt');
@@ -595,7 +606,8 @@ describe('ArtModelService', () => {
     it('should display progress correctly', () => {
       const stdoutSpy = jest.spyOn(process.stdout, 'write').mockImplementation(() => true as any);
 
-      (artModelService as any)._displayProgress('file1.txt', 512, 1024);
+      // Import and call the _displayProgress function directly from utils
+      _displayProgress('file1.txt', 512, 1024);
 
       expect(stdoutSpy).toHaveBeenCalledWith(
         expect.stringContaining(
@@ -611,7 +623,8 @@ describe('ArtModelService', () => {
     it('should display complete progress correctly', () => {
       const stdoutSpy = jest.spyOn(process.stdout, 'write').mockImplementation(() => true as any);
 
-      (artModelService as any)._displayProgressComplete('file1.txt', 1024, 1024);
+      // Import and call the _displayProgressComplete function directly from utils
+      _displayProgressComplete('file1.txt', 1024, 1024);
 
       expect(stdoutSpy).toHaveBeenCalledWith(
         expect.stringContaining(

__tests__/ut/commands/modelService_test.ts

@@ -3,6 +3,11 @@ import { IInputs } from '../../../src/interface';
 import DevClient from '@alicloud/devs20230714';
 import * as $OpenApi from '@alicloud/openapi-client';
 import { sleep } from '../../../src/utils';
+import {
+  initClient,
+  _displayProgress,
+  _displayProgressComplete,
+} from '../../../src/subCommands/model/utils';
 
 // Mock dependencies
 jest.mock('../../../src/logger', () => {
@@ -83,14 +88,14 @@ describe('ModelService', () => {
         securityToken: 'test-token',
         protocol: 'https',
         endpoint: 'devs-pre.cn-hangzhou.aliyuncs.com',
-        readTimeout: 86400000,
-        connectTimeout: 60000,
-        userAgent: 'test-agent',
+        readTimeout: 300000,
+        connectTimeout: 300000,
+        userAgent: 'Component:fun-model;Nodejs:;OS:darwin-',
       };
 
       ($OpenApi.Config as unknown as jest.Mock).mockImplementation((config) => config);
 
-      const client = await modelService.initClient();
+      const client = await initClient(mockInputs, 'cn-hangzhou', modelService.logger, 'fun-model');
 
       expect($OpenApi.Config).toHaveBeenCalledWith(expect.objectContaining(mockConfig));
       expect(client).toBeInstanceOf(DevClient);
@@ -101,27 +106,32 @@ describe('ModelService', () => {
 
       ($OpenApi.Config as unknown as jest.Mock).mockImplementation((config) => config);
 
-      await modelService.initClient();
+      // Since initClient is not a method of ModelService, we need to import and call it directly
+      const client = await initClient(mockInputs, 'cn-hangzhou', modelService.logger, 'fun-model');
 
       expect($OpenApi.Config).toHaveBeenCalledWith(
         expect.objectContaining({
           endpoint: 'custom.endpoint.com',
+          userAgent: 'Component:fun-model;Nodejs:;OS:darwin-',
         }),
       );
+      expect(client).toBeInstanceOf(DevClient);
     });
 
     it('should use custom endpoint from artifact_endpoint environment variable', async () => {
       process.env.artifact_endpoint = 'custom2.endpoint.com';
 
       ($OpenApi.Config as unknown as jest.Mock).mockImplementation((config) => config);
 
-      await modelService.initClient();
+      const client = await initClient(mockInputs, 'cn-hangzhou', modelService.logger, 'fun-model');
 
       expect($OpenApi.Config).toHaveBeenCalledWith(
         expect.objectContaining({
           endpoint: 'custom2.endpoint.com',
+          userAgent: 'Component:fun-model;Nodejs:;OS:darwin-',
         }),
       );
+      expect(client).toBeInstanceOf(DevClient);
     });
   });
 
@@ -135,7 +145,9 @@ describe('ModelService', () => {
         getFileManagerTask: jest.fn(),
       } as any;
 
-      modelService.initClient = jest.fn().mockResolvedValue(mockDevClient);
+      // Mock the initClient function from utils
+      const utils = require('../../../src/subCommands/model/utils');
+      jest.spyOn(utils, 'initClient').mockResolvedValue(mockDevClient);
       (sleep as jest.Mock).mockResolvedValue(undefined);
     });
 
@@ -395,7 +407,9 @@ describe('ModelService', () => {
         fileManagerRm: jest.fn(),
       } as any;
 
-      modelService.initClient = jest.fn().mockResolvedValue(mockDevClient);
+      // Mock the initClient function from utils
+      const utils = require('../../../src/subCommands/model/utils');
+      jest.spyOn(utils, 'initClient').mockResolvedValue(mockDevClient);
     });
 
     it('should successfully remove model', async () => {
@@ -423,7 +437,8 @@ describe('ModelService', () => {
     it('should display progress correctly', () => {
       const stdoutSpy = jest.spyOn(process.stdout, 'write').mockImplementation(() => true as any);
 
-      (modelService as any)._displayProgress('[Model Download]', 512, 1024);
+      // Import and call the _displayProgress function directly from utils
+      _displayProgress('[Model Download]', 512, 1024);
 
       expect(stdoutSpy).toHaveBeenCalledWith(
         expect.stringContaining(
@@ -439,7 +454,7 @@ describe('ModelService', () => {
     it('should display complete progress correctly', () => {
       const stdoutSpy = jest.spyOn(process.stdout, 'write').mockImplementation(() => true as any);
 
-      (modelService as any)._displayProgressComplete('[Model Download]', 1024, 1024);
+      _displayProgressComplete('[Model Download]', 1024, 1024);
 
       expect(stdoutSpy).toHaveBeenCalledWith(
         expect.stringContaining(