Merge pull request #77 from devsapp/model-remove

fix: model is not exist error

Author: rsonghuster

__tests__/it/integration_test.ts

@@ -87,8 +87,8 @@ describe('Integration Tests', () => {
       role: '',
       runtime: 'python3.9',
       timeout: 60,
-      instanceIsolationMode: "SHARE",
-      sessionAffinity: "NONE",
+      instanceIsolationMode: 'SHARE',
+      sessionAffinity: 'NONE',
       asyncInvokeConfig: undefined,
       concurrencyConfig: undefined,
       customDomain: undefined,
@@ -131,8 +131,8 @@ describe('Integration Tests', () => {
       runtime: 'python3.9',
       timeout: 60,
       disableOndemand: false,
-      instanceIsolationMode: "SHARE",
-      sessionAffinity: "NONE",
+      instanceIsolationMode: 'SHARE',
+      sessionAffinity: 'NONE',
       triggers: [
         {
           description: 'xxxx',

example/s-pipeline.yaml

@@ -28,10 +28,7 @@ resources:
         entrypoint:
           - sh
           - '-c'
-          - >-
-            mkdir -p /.function_model && curl -fL --retry 3 -o
-            /.function_model/server.py 
-            https://images.devsapp.cn/modelscope/server.py &&  MODEL_ID="${env('MODEL_ID', 'iic/SenseVoiceSmall')}"  MODEL_VERSION="${env('MODEL_VERSION', 'master')}" MODEL_PATH="/mnt/${env('fc_component_function_name', 'ai-model-test-qwen-pipeline')} /${env('MODEL_ID', 'iic/SenseVoiceSmall')}"  TASK="${env('TASK')}" python3 -u /.function_model/server.py 
+          - mkdir -p /.function_model && curl -fL --retry 3 -o /.function_model/server.py https://images.devsapp.cn/modelscope/server.py && exec python3 -u /.function_model/server.py --task "${env('TASK')}" --model-id "${env('MODEL_ID', 'iic/SenseVoiceSmall')}" --model-revision "${env('MODEL_VERSION', 'master')}" --model-path "/mnt/${env('fc_component_function_name', 'ai-model-test-qwen-pipeline')}/${env('MODEL_ID', 'iic/SenseVoiceSmall')}"
       triggers: # 默认，用户可能关注的是开启 authType 是 bear token
         - triggerConfig:
             methods:

example/test_models_pipeline.sh

@@ -13,7 +13,7 @@ log() {
 
 # 定义模型列表 (每个元素包含model_version, model_id, task)
 MODEL_LIST=(
-    '{"model_version": "v2.4.0", "model_id": "iic/cv_convnextTiny_ocr-recognition-general_damo", "task": "ocr-recognition", "input":{"image":"http://modelscope.oss-cn-beijing.aliyuncs.com/demo/images/image_ocr_recognition.jpg"}'
+    '{"model_version": "v2.4.0", "model_id": "iic/cv_convnextTiny_ocr-recognition-general_damo", "task": "ocr-recognition", "input":{"image":"http://modelscope.oss-cn-beijing.aliyuncs.com/demo/images/image_ocr_recognition.jpg"}}'
     '{"model_version": "master", "model_id": "iic/SenseVoiceSmall", "task": "auto-speech-recognition", "input": "https://isv-data.oss-cn-hangzhou.aliyuncs.com/ics/MaaS/ASR/test_audio/asr_example_zh.wav"}'
 )
 

src/subCommands/model/index.ts

@@ -14,7 +14,7 @@ import assert from 'assert';
 import { sleep } from '../../utils';
 
 export const NEW_MODEL_SERVICE_CLIENT_CONNECT_TIMEOUT: number =
-  parseInt(process.env.NEW_MODEL_SERVICE_CLIENT_CONNECT_TIMEOUT as string, 10) || 10 * 1000;
+  parseInt(process.env.NEW_MODEL_SERVICE_CLIENT_CONNECT_TIMEOUT as string, 10) || 60 * 1000;
 export const NEW_MODEL_SERVICE_CLIENT_READ_TIMEOUT: number =
   parseInt(process.env.NEW_MODEL_SERVICE_CLIENT_READ_TIMEOUT as string, 10) || 86400 * 1000;
 export const MODEL_DOWNLOAD_TIMEOUT: number =
@@ -317,11 +317,11 @@ mountPoints:
         logger.info(`[Remove-model] delete model requestId: ${rb.requestId}`);
         logger.info(`[Remove-model] Remove model succeeded.`);
         return true;
-      } else {
-        throw new Error(
-          `[Remove-model] delete model service biz failed, errCode: ${rb.errCode}, errMsg: ${rb.errMsg}`,
-        );
-      }
+      } else if (!rb.errMsg.includes(`${name} is not exist`)) {
+          throw new Error(
+            `[Remove-model] delete model service biz failed, errCode: ${rb.errCode}, errMsg: ${rb.errMsg}`,
+          );
+        }
     } catch (e) {
       logger.error(`[Remove-model] delete model invocation error: ${e.message}`);
       throw new Error(`[Remove-model] delete model error: ${e.message}`);