fix error issue due to version upgrade

Signed-off-by: seven <[email protected]>

Author: Blankll

package-lock.json

@@ -63,6 +63,7 @@
     "@alicloud/ros-cdk-ram": "^1.6.0",
     "@alicloud/ros-cdk-rds": "^1.6.0",
     "@alicloud/ros-cdk-sls": "^1.6.0",
+    "@alicloud/ros-cdk-vpc": "^1.7.0",
     "@alicloud/ros20190910": "^3.5.3",
     "ajv": "^8.17.1",
     "ali-oss": "^6.22.0",

package.json

@@ -3,17 +3,6 @@ provider:
   name: aliyun
   region: cn-hangzhou
 
-vars:
-  testv: testVarValue
-  handler: index.handler
-
-stages:
-  default:
-    node_env: default
-  dev:
-    node_env: development
-  prod:
-    region: cn-hangzhou
 
 service: insight-poc-gpu
 
@@ -24,17 +13,18 @@ functions:
   insight_poc_fn:
     name: insight-poc-gpu-fn
     container:
-      image: registry.cn-chengdu.aliyuncs.com/geek-fun/meke-api:latest
-      cmd: "npm start"
+      image: registry.cn-hangzhou.aliyuncs.com/serverless_devs/modelscope:ubuntu20.04-cuda11.3.0-py37-torch1.11.0-tf1.15.5-1.5.0
+      cmd: "ollama run modelscope.cn/DeepSeek-R1-Distill-Qwen-1.5B-GGUF"
       port: 9000
-    memory: 512
-    gpu: TESLA_8
-    timeout: 10
+    memory: 4096
+    gpu: TESLA_16
+    timeout: 900
+    log: true
     network:
-      vpc_id: vpc-2vc8v9btc8470laqui9bk
+      vpc_id: vpc-bp1jpzq0807mrww7i8uko
       subnet_ids:
-        - vsw-2vc9zrs5mojkxd14yo3zw
-        - vsw-2vceshdo0xjp9q9t0oyt0
+        - vsw-bp1tp32pxn8c3mm07e9s2
+        - vsw-bp1gs2ggjq85apbf5yd9d
       security_group:
         name: insight-poc-gpu-fn-sg
         ingress:
@@ -49,6 +39,17 @@ functions:
         - mount_path: /mnt/nas
           storage_class: STANDARD_CAPACITY
     environment:
-      NODE_ENV: ${stages.node_env}
-      TEST_VAR: ${vars.testv}
-      TEST_VAR_EXTRA: abcds-${vars.testv}-andyou
+      OLLAMA_MODELS: /mnt/nas/models
+      LLAMA_GPU_OVERHEAD: 0
+      OLLAMA_HOST: http://0.0.0.0:11434
+      OLLAMA_INTEL_GPU: false
+      OLLAMA_KEEP_ALIVE: 2562047h47m16.854775807s
+      OLLAMA_LOAD_TIMEOUT: 5m0s
+      OLLAMA_MAX_LOADED_MODELS: 1
+      OLLAMA_MAX_QUEUE: 1
+      OLLAMA_MULTIUSER_CACHE: false
+      OLLAMA_NOHISTORY: false
+      OLLAMA_NOPRUNE: false
+      OLLAMA_NUM_PARALLEL: 1
+      OLLAMA_ORIGINS: [ * http://localhost https://localhost http://localhost:* https://localhost:* http://127.0.0.1 https://127.0.0.1 http://127.0.0.1:* https://127.0.0.1:* http://0.0.0.0 https://0.0.0.0 http://0.0.0.0:* https://0.0.0.0:* app://* file://* tauri://* vscode-webview://* ]
+      OLLAMA_SCHED_SPREAD: fals

samples/aliyun-poc-fc-gpu.yml

@@ -69,8 +69,15 @@ const updateStack = async (stackId: string, templateBody: unknown, context: Acti
     // wait for stack update complete
     return await getStackActionResult(response.body?.stackId || '', context.region);
   } catch (err) {
-    const { Message: message, statusCode } =
-      (err as { data: { Message: string; statusCode: number } })?.data || {};
+    const { message, statusCode } =
+      (err as {
+        message: string;
+        code: string;
+        statusCode: number;
+        description: string;
+        requestId: string;
+        accessDeniedDetail: unknown;
+      }) || {};
     if (statusCode === 400 && message.includes('Update the completely same stack')) {
       logger.warn(`${lang.__('UPDATE_COMPLETELY_SAME_STACK')}`);
       return null;

src/common/rosClient.ts

@@ -21,6 +21,7 @@ import * as ros from '@alicloud/ros-cdk-core';
 import * as sls from '@alicloud/ros-cdk-sls';
 import * as nas from '@alicloud/ros-cdk-nas';
 import * as ecs from '@alicloud/ros-cdk-ecs';
+import * as vpc from '@alicloud/ros-cdk-vpc';
 import { RosFunction, RosFunctionProps } from '@alicloud/ros-cdk-fc3/lib/fc3.generated';
 
 const storageClassMap = {
@@ -237,6 +238,30 @@ export const resolveFunctions = (
           true,
         );
 
+        const fcVpcSubnets = fnc.network?.subnet_ids.map(
+          (subnet) =>
+            new vpc.datasource.VSwitch(
+              scope,
+              `${fnc.key}_datasource_subnet_${encodeBase64ForRosId(subnet)}`,
+              {
+                vSwitchId: subnet,
+                refreshOptions: 'Always',
+              },
+            ),
+        );
+
+        fcVpcSubnets?.forEach((subnetDatasource, index) => {
+          new nas.AccessRule(
+            scope,
+            `${fnc.key}_nas_rule_${encodeBase64ForRosId(fnc.network!.subnet_ids[index])}`,
+            {
+              accessGroupName: accessGroup.attrAccessGroupName,
+              sourceCidrIp: subnetDatasource.attrCidrBlock,
+            },
+            true,
+          );
+        });
+
         const nasResource = new nas.FileSystem(
           scope,
           `${fnc.key}_nas_${encodeBase64ForRosId(nasItem.mount_path)}`,

src/stack/rosStack/function.ts

@@ -98,8 +98,8 @@ export const functionSchema = {
                   storage_class: {
                     type: 'string',
                     enum: [
-                      'STANDARD_PERFORMANCE',
                       'STANDARD_CAPACITY',
+                      'STANDARD_PERFORMANCE',
                       'EXTREME_STANDARD',
                       'EXTREME_ADVANCE',
                     ],