From 840382ad741620c361fe754bde18d2aa7e155bd7 Mon Sep 17 00:00:00 2001 From: rsonghuster Date: Sat, 13 Jul 2024 17:12:43 +0800 Subject: [PATCH 1/9] add-flask-build --- web-framework/python/flask/publish.yaml | 4 ++-- web-framework/python/flask/src/build.yaml | 6 ++++++ web-framework/python/flask/src/s.yaml | 12 ++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 web-framework/python/flask/src/build.yaml diff --git a/web-framework/python/flask/publish.yaml b/web-framework/python/flask/publish.yaml index 320c9a409..98f69f441 100755 --- a/web-framework/python/flask/publish.yaml +++ b/web-framework/python/flask/publish.yaml @@ -1,9 +1,9 @@ Edition: 3.0.0 Type: Project -Name: start-flask-v3 +Name: start-fc-flask Provider: - 阿里云 -Version: 0.0.16 +Version: 0.0.2 Description: 本案例将Flask框架，这一非常受欢迎的Python Web框架，快捷创建并部署到阿里云函数计算 FC。 HomePage: https://github.com/devsapp/start-web-framework Organization: 阿里云函数计算（FC） diff --git a/web-framework/python/flask/src/build.yaml b/web-framework/python/flask/src/build.yaml new file mode 100644 index 000000000..3a1f798ce --- /dev/null +++ b/web-framework/python/flask/src/build.yaml @@ -0,0 +1,6 @@ +framework: + builder: default + languages: + - python3.10 + command: mkdir python && pip install -r requirements.txt -t ./python + workDir: ./code \ No newline at end of file diff --git a/web-framework/python/flask/src/s.yaml b/web-framework/python/flask/src/s.yaml index ea718aa85..ad1f49a0a 100644 --- a/web-framework/python/flask/src/s.yaml +++ b/web-framework/python/flask/src/s.yaml @@ -11,12 +11,12 @@ vars: resources: framework: component: fc3 - actions: - pre-deploy: - - run: mkdir python - path: ./code - - run: pip install -r requirements.txt -t ./python - path: ./code + # actions: + # pre-deploy: + # - run: mkdir python + # path: ./code + # - run: pip install -r requirements.txt -t ./python + # path: ./code props: timeout: 60 cpu: 1 From 6bed17924b2855229d4315c28c1aa3ae650f4524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=81=E5=B4=87?= Date: Wed, 24 Jul 2024 13:55:50 +0800 Subject: [PATCH 2/9] use default builder --- web-framework/python/flask/publish.yaml | 2 +- web-framework/python/flask/src/build.yaml | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/web-framework/python/flask/publish.yaml b/web-framework/python/flask/publish.yaml index 98f69f441..ef89da774 100755 --- a/web-framework/python/flask/publish.yaml +++ b/web-framework/python/flask/publish.yaml @@ -3,7 +3,7 @@ Type: Project Name: start-fc-flask Provider: - 阿里云 -Version: 0.0.2 +Version: 0.0.3 Description: 本案例将Flask框架，这一非常受欢迎的Python Web框架，快捷创建并部署到阿里云函数计算 FC。 HomePage: https://github.com/devsapp/start-web-framework Organization: 阿里云函数计算（FC） diff --git a/web-framework/python/flask/src/build.yaml b/web-framework/python/flask/src/build.yaml index 3a1f798ce..d77329167 100644 --- a/web-framework/python/flask/src/build.yaml +++ b/web-framework/python/flask/src/build.yaml @@ -1,6 +1,9 @@ framework: - builder: default - languages: - - python3.10 - command: mkdir python && pip install -r requirements.txt -t ./python - workDir: ./code \ No newline at end of file + defaultBuilder: + languages: + - python3.10 + steps: + - run: mkdir python + path: ./code + - run: pip install -r requirements.txt -t ./python + path: ./code From 6c1b7caeb63cf014c75b3109822f539e59eb2ade Mon Sep 17 00:00:00 2001 From: rsonghuster Date: Thu, 25 Jul 2024 19:23:16 +0800 Subject: [PATCH 3/9] functionName parameter use vars --- web-framework/python/flask/publish.yaml | 2 +- web-framework/python/flask/src/s.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web-framework/python/flask/publish.yaml b/web-framework/python/flask/publish.yaml index ef89da774..e2e37d620 100755 --- a/web-framework/python/flask/publish.yaml +++ b/web-framework/python/flask/publish.yaml @@ -3,7 +3,7 @@ Type: Project Name: start-fc-flask Provider: - 阿里云 -Version: 0.0.3 +Version: 0.0.4 Description: 本案例将Flask框架，这一非常受欢迎的Python Web框架，快捷创建并部署到阿里云函数计算 FC。 HomePage: https://github.com/devsapp/start-web-framework Organization: 阿里云函数计算（FC） diff --git a/web-framework/python/flask/src/s.yaml b/web-framework/python/flask/src/s.yaml index ad1f49a0a..c69811ce4 100644 --- a/web-framework/python/flask/src/s.yaml +++ b/web-framework/python/flask/src/s.yaml @@ -8,6 +8,7 @@ name: flask-app access: "{{ access }}" vars: region: "{{ region }}" + functionName: "{{ functionName }}" resources: framework: component: fc3 @@ -35,7 +36,7 @@ resources: PATH: /var/fc/lang/python3.10/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/ruby/bin:/opt/bin:/code:/code/bin PYTHONPATH: /opt/python:/code/python:/code TZ: Asia/Shanghai - functionName: "{{ functionName }}" + functionName: ${vars.functionName} code: ./code layers: - acs:fc:${this.props.region}:official:layers/Python3-Flask2x/versions/2 @@ -59,4 +60,4 @@ resources: routeConfig: routes: - path: /* - functionName: ${resources.framework.props.functionName} + functionName: ${vars.functionName} From 5bdc6d1f4c66111fb6fbe4ca7aab5a70f99a60c2 Mon Sep 17 00:00:00 2001 From: rsonghuster Date: Thu, 25 Jul 2024 19:49:49 +0800 Subject: [PATCH 4/9] use domainName as a template parameter --- web-framework/python/flask/publish.yaml | 9 ++++++++- web-framework/python/flask/src/s.yaml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web-framework/python/flask/publish.yaml b/web-framework/python/flask/publish.yaml index e2e37d620..b0f19214a 100755 --- a/web-framework/python/flask/publish.yaml +++ b/web-framework/python/flask/publish.yaml @@ -3,7 +3,7 @@ Type: Project Name: start-fc-flask Provider: - 阿里云 -Version: 0.0.4 +Version: 0.0.5 Description: 本案例将Flask框架，这一非常受欢迎的Python Web框架，快捷创建并部署到阿里云函数计算 FC。 HomePage: https://github.com/devsapp/start-web-framework Organization: 阿里云函数计算（FC） @@ -55,3 +55,10 @@ Parameters: default: flask-${default-suffix} pattern: "^[a-zA-Z_][a-zA-Z0-9-_]{0,127}$" description: 函数名称，只能包含字母、数字、下划线和中划线。不能以数字、中划线开头。长度在 1-128 之间 + + domainName: + title: 域名配置 + type: string + default: auto + required: false + x-domain: true diff --git a/web-framework/python/flask/src/s.yaml b/web-framework/python/flask/src/s.yaml index c69811ce4..f4d7ea06c 100644 --- a/web-framework/python/flask/src/s.yaml +++ b/web-framework/python/flask/src/s.yaml @@ -55,7 +55,7 @@ resources: component: fc3-domain props: region: ${vars.region} - domainName: auto + domainName: "{{ domainName }}" protocol: HTTP routeConfig: routes: From fb0d2cf8455becc92a321179a679a0f0b6fbeb78 Mon Sep 17 00:00:00 2001 From: rsonghuster Date: Thu, 8 Aug 2024 11:58:32 +0800 Subject: [PATCH 5/9] add variable.yaml --- web-framework/python/flask/publish.yaml | 3 +- web-framework/python/flask/src/build.yaml | 2 +- web-framework/python/flask/src/s.yaml | 30 +++++++------------- web-framework/python/flask/src/variable.yaml | 12 ++++++++ 4 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 web-framework/python/flask/src/variable.yaml diff --git a/web-framework/python/flask/publish.yaml b/web-framework/python/flask/publish.yaml index b0f19214a..dd25d3b2c 100755 --- a/web-framework/python/flask/publish.yaml +++ b/web-framework/python/flask/publish.yaml @@ -3,7 +3,7 @@ Type: Project Name: start-fc-flask Provider: - 阿里云 -Version: 0.0.5 +Version: 0.0.7 Description: 本案例将Flask框架，这一非常受欢迎的Python Web框架，快捷创建并部署到阿里云函数计算 FC。 HomePage: https://github.com/devsapp/start-web-framework Organization: 阿里云函数计算（FC） @@ -60,5 +60,6 @@ Parameters: title: 域名配置 type: string default: auto + description: 函数计算自定义域名， 如果为 auto，则会下发一个一定有效期的仅支持 http 临时测试域名(切莫用于生产) required: false x-domain: true diff --git a/web-framework/python/flask/src/build.yaml b/web-framework/python/flask/src/build.yaml index d77329167..a5e79490b 100644 --- a/web-framework/python/flask/src/build.yaml +++ b/web-framework/python/flask/src/build.yaml @@ -1,4 +1,4 @@ -framework: +fc-flask: defaultBuilder: languages: - python3.10 diff --git a/web-framework/python/flask/src/s.yaml b/web-framework/python/flask/src/s.yaml index f4d7ea06c..b04f39769 100644 --- a/web-framework/python/flask/src/s.yaml +++ b/web-framework/python/flask/src/s.yaml @@ -9,15 +9,10 @@ access: "{{ access }}" vars: region: "{{ region }}" functionName: "{{ functionName }}" + resources: - framework: - component: fc3 - # actions: - # pre-deploy: - # - run: mkdir python - # path: ./code - # - run: pip install -r requirements.txt -t ./python - # path: ./code + fc-flask: + component: fc3@dev props: timeout: 60 cpu: 1 @@ -36,6 +31,8 @@ resources: PATH: /var/fc/lang/python3.10/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/ruby/bin:/opt/bin:/code:/code/bin PYTHONPATH: /opt/python:/code/python:/code TZ: Asia/Shanghai + CHAT_API_URL: '{{ chat_api_url }}' + CHAT_API_TOKEN: '{{ chat_api_token }}' functionName: ${vars.functionName} code: ./code layers: @@ -50,14 +47,9 @@ resources: - PUT - DELETE authType: anonymous - - fc3_domain_0: - component: fc3-domain - props: - region: ${vars.region} - domainName: "{{ domainName }}" - protocol: HTTP - routeConfig: - routes: - - path: /* - functionName: ${vars.functionName} + customDomain: + domainName: "{{ domainName }}" + protocol: HTTP + route: + path: /* + qualifier: LATEST diff --git a/web-framework/python/flask/src/variable.yaml b/web-framework/python/flask/src/variable.yaml new file mode 100644 index 000000000..7d00fea8e --- /dev/null +++ b/web-framework/python/flask/src/variable.yaml @@ -0,0 +1,12 @@ +services: #服务变量 + fc-flask: + chat_api_url: + title: chat_api_url + type: string + default: 'https://api.openai.com/v1' + description: chat api 服务的 url + chat_api_token: + title: chat_api_token + type: string + sensitive: true + description: chat api 服务的 token \ No newline at end of file From f053dda607e9177a6cb5793bde99cfb7cab1a7a9 Mon Sep 17 00:00:00 2001 From: rsonghuster Date: Fri, 9 Aug 2024 10:26:57 +0800 Subject: [PATCH 6/9] add variable.yaml args in publish.yaml --- web-framework/python/flask/publish.yaml | 12 ++++++++++++ web-framework/python/flask/src/s.yaml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/web-framework/python/flask/publish.yaml b/web-framework/python/flask/publish.yaml index dd25d3b2c..7f80183ff 100755 --- a/web-framework/python/flask/publish.yaml +++ b/web-framework/python/flask/publish.yaml @@ -63,3 +63,15 @@ Parameters: description: 函数计算自定义域名， 如果为 auto，则会下发一个一定有效期的仅支持 http 临时测试域名(切莫用于生产) required: false x-domain: true + + chat_api_url: + title: chat_api_url + type: string + default: 'https://api.openai.com/v1' + description: chat api 服务的 url + + chat_api_token: + title: chat_api_token + type: string + sensitive: true + description: chat api 服务的 token diff --git a/web-framework/python/flask/src/s.yaml b/web-framework/python/flask/src/s.yaml index b04f39769..c433e7e29 100644 --- a/web-framework/python/flask/src/s.yaml +++ b/web-framework/python/flask/src/s.yaml @@ -12,7 +12,7 @@ vars: resources: fc-flask: - component: fc3@dev + component: fc3 props: timeout: 60 cpu: 1 From ad6238be0aade4eeadd8dc2bfca3dc2e46d34a79 Mon Sep 17 00:00:00 2001 From: rsonghuster Date: Fri, 16 Aug 2024 14:55:45 +0800 Subject: [PATCH 7/9] add flow_api_registry plugin --- web-framework/python/flask/publish.yaml | 6 ++++-- web-framework/python/flask/src/s.yaml | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web-framework/python/flask/publish.yaml b/web-framework/python/flask/publish.yaml index 7f80183ff..1bc4491d4 100755 --- a/web-framework/python/flask/publish.yaml +++ b/web-framework/python/flask/publish.yaml @@ -1,9 +1,9 @@ Edition: 3.0.0 Type: Project -Name: start-fc-flask +Name: start-dipper-flask Provider: - 阿里云 -Version: 0.0.7 +Version: 0.0.1 Description: 本案例将Flask框架，这一非常受欢迎的Python Web框架，快捷创建并部署到阿里云函数计算 FC。 HomePage: https://github.com/devsapp/start-web-framework Organization: 阿里云函数计算（FC） @@ -22,6 +22,8 @@ Parameters: required: # 必填项 - region - functionName + - chat_api_url + - chat_api_token properties: region: title: 地域 diff --git a/web-framework/python/flask/src/s.yaml b/web-framework/python/flask/src/s.yaml index c433e7e29..5fd70e886 100644 --- a/web-framework/python/flask/src/s.yaml +++ b/web-framework/python/flask/src/s.yaml @@ -13,6 +13,11 @@ vars: resources: fc-flask: component: fc3 + actions: + complete-deploy: + - plugin: flow_api_registry@dev + complete-remove: + - plugin: flow_api_registry@dev props: timeout: 60 cpu: 1 From 33a176cba6533fbc9dff13ef50fa5907453fbf88 Mon Sep 17 00:00:00 2001 From: rsonghuster Date: Tue, 10 Sep 2024 12:00:56 +0800 Subject: [PATCH 8/9] add PROJECT_NAME: env('ALIYUN_DEVS_REMOTE_PROJECT_NAME') --- web-framework/python/flask/publish.yaml | 2 +- web-framework/python/flask/src/s.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/web-framework/python/flask/publish.yaml b/web-framework/python/flask/publish.yaml index 1bc4491d4..dee1f5513 100755 --- a/web-framework/python/flask/publish.yaml +++ b/web-framework/python/flask/publish.yaml @@ -3,7 +3,7 @@ Type: Project Name: start-dipper-flask Provider: - 阿里云 -Version: 0.0.1 +Version: 0.0.2 Description: 本案例将Flask框架，这一非常受欢迎的Python Web框架，快捷创建并部署到阿里云函数计算 FC。 HomePage: https://github.com/devsapp/start-web-framework Organization: 阿里云函数计算（FC） diff --git a/web-framework/python/flask/src/s.yaml b/web-framework/python/flask/src/s.yaml index 5fd70e886..00a00f68e 100644 --- a/web-framework/python/flask/src/s.yaml +++ b/web-framework/python/flask/src/s.yaml @@ -38,6 +38,7 @@ resources: TZ: Asia/Shanghai CHAT_API_URL: '{{ chat_api_url }}' CHAT_API_TOKEN: '{{ chat_api_token }}' + PROJECT_NAME: env('ALIYUN_DEVS_REMOTE_PROJECT_NAME') functionName: ${vars.functionName} code: ./code layers: From 762f39148a4a2ee5137df618f0c76ecba28c8dea Mon Sep 17 00:00:00 2001 From: rsonghuster Date: Tue, 10 Sep 2024 14:49:20 +0800 Subject: [PATCH 9/9] use env ALIYUN_DEVS_REMOTE_PROJECT_NAME --- web-framework/python/flask/publish.yaml | 2 +- web-framework/python/flask/src/s.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web-framework/python/flask/publish.yaml b/web-framework/python/flask/publish.yaml index dee1f5513..6f757ffb5 100755 --- a/web-framework/python/flask/publish.yaml +++ b/web-framework/python/flask/publish.yaml @@ -3,7 +3,7 @@ Type: Project Name: start-dipper-flask Provider: - 阿里云 -Version: 0.0.2 +Version: 0.0.3 Description: 本案例将Flask框架，这一非常受欢迎的Python Web框架，快捷创建并部署到阿里云函数计算 FC。 HomePage: https://github.com/devsapp/start-web-framework Organization: 阿里云函数计算（FC） diff --git a/web-framework/python/flask/src/s.yaml b/web-framework/python/flask/src/s.yaml index 00a00f68e..26e93f6cd 100644 --- a/web-framework/python/flask/src/s.yaml +++ b/web-framework/python/flask/src/s.yaml @@ -38,7 +38,8 @@ resources: TZ: Asia/Shanghai CHAT_API_URL: '{{ chat_api_url }}' CHAT_API_TOKEN: '{{ chat_api_token }}' - PROJECT_NAME: env('ALIYUN_DEVS_REMOTE_PROJECT_NAME') + PROJECT_NAME: ${env('ALIYUN_DEVS_REMOTE_PROJECT_NAME')} + XX_NAME: ${env('ALIYUN_DEVS_REMOTE_PROJECT_NAME')}_XX functionName: ${vars.functionName} code: ./code layers: