Skip to content

Commit e7b9085

Browse files
Resolve merge conflicts: integrate main branch changes with aiChat fix
- Resolved conflict in app/controller/app-center/aiChat.ts - Kept the main branch's token handling and uploadFile method - The original 'aiChat is undefined' issue is already fixed in main branch - Main branch uses correct service path: ctx.service.appCenter.aiChat
2 parents 52be6d8 + e31f2f3 commit e7b9085

40 files changed

Lines changed: 2316 additions & 171 deletions
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: '🐛 Bug report'
2+
description: Create a report to help us improve Tiny Engine
3+
title: '🐛 [Bug]: '
4+
labels: ['🐛 bug']
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Please fill out the following carefully in order to better fix the problem.
10+
- type: input
11+
id: Environment
12+
attributes:
13+
label: Environment
14+
description: |
15+
**Depending on your browser and operating system, websites may behave differently from one environment to another. Make sure your developers know your technical environment.**
16+
placeholder: Please browser information.
17+
validations:
18+
required: true
19+
- type: input
20+
id: node-version
21+
attributes:
22+
label: Version
23+
description: |
24+
### **Check if the issue is reproducible with the latest stable version.**
25+
You can use the command `node -v` to view it
26+
placeholder: latest
27+
validations:
28+
required: true
29+
- type: input
30+
id: tiny-vue-version
31+
attributes:
32+
label: Version
33+
description: |
34+
### **Check if the issue is reproducible with the latest stable version.**
35+
You can use the command `npm ls @opentiny/vue` to view it
36+
placeholder: latest
37+
validations:
38+
required: true
39+
- type: textarea
40+
id: minimal-repo
41+
attributes:
42+
label: Link to minimal reproduction
43+
description: |
44+
**Provide a streamlined CodePen / CodeSandbox or GitHub repository link as much as possible. Please don't fill in a link randomly, it will only close your issue directly.**
45+
placeholder: Please Input
46+
validations:
47+
required: true
48+
- type: textarea
49+
id: reproduce
50+
attributes:
51+
label: Step to reproduce
52+
description: |
53+
**After the replay is turned on, what actions do we need to perform to make the bug appear? Simple and clear steps can help us locate the problem more quickly. Please clearly describe the steps of reproducing the issue. Issues without clear reproducing steps will not be repaired. If the issue marked with 'need reproduction' does not provide relevant steps within 7 days, it will be closed directly.**
54+
placeholder: Please Input
55+
validations:
56+
required: true
57+
- type: textarea
58+
id: expected
59+
attributes:
60+
label: What is expected
61+
placeholder: Please Input
62+
- type: textarea
63+
id: actually
64+
attributes:
65+
label: What is actually happening
66+
placeholder: Please Input
67+
- type: textarea
68+
id: additional-comments
69+
attributes:
70+
label: Any additional comments (optional)
71+
description: |
72+
**Some background / context of how you ran into this bug.**
73+
placeholder: Please Input

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Questions or need help
4+
url: https://github.com/opentiny/tiny-engine/discussions
5+
about: Add this WeChat(opentiny), we will invite you to the WeChat discussion group later.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: ✨ Feature Request
2+
description: Propose new features to @opentiny/tiny-engine-webservice to improve it.
3+
title: '✨ [Feature]: '
4+
labels: ['✨ feature']
5+
body:
6+
- type: textarea
7+
id: feature-solve
8+
attributes:
9+
label: What problem does this feature solve
10+
description: |
11+
Explain your use case, context, and rationale behind this feature request. More importantly, what is the end user experience you are trying to build that led to the need for this feature?
12+
placeholder: Please Input
13+
validations:
14+
required: true
15+
- type: textarea
16+
id: feature-api
17+
attributes:
18+
label: What does the proposed API look like
19+
description: |
20+
Describe how you propose to solve the problem and provide code samples of how the API would work once implemented. Note that you can use Markdown to format your code blocks.
21+
placeholder: Please Input
22+
validations:
23+
required: true

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
English | [简体中文](https://github.com/opentiny/tiny-engine-webservice/blob/main/.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.zh-CN.md)
2+
3+
# PR
4+
5+
## PR Checklist
6+
7+
Please check if your PR fulfills the following requirements:
8+
9+
- [ ] The commit message follows our [Commit Message Guidelines](https://github.com/opentiny/tiny-engine-webservice/blob/main/CONTRIBUTING.md)
10+
- [ ] Tests for the changes have been added (for bug fixes / features)
11+
- [ ] Docs have been added / updated (for bug fixes / features)
12+
- [ ] Built its own designer, fully self-validated
13+
14+
## PR Type
15+
16+
What kind of change does this PR introduce?
17+
18+
<!-- Please check the one that applies to this PR using "x". -->
19+
20+
- [ ] Bugfix
21+
- [ ] Feature
22+
- [ ] Code style update (formatting, local variables)
23+
- [ ] Refactoring (no functional changes, no api changes)
24+
- [ ] Build related changes
25+
- [ ] CI related changes
26+
- [ ] Documentation content changes
27+
- [ ] Other... Please describe:
28+
29+
## Background and solution
30+
<!--
31+
1. Describe the problem and the scenario.
32+
2. New features need to be described and attached with renderings.
33+
3. Screenshots or GIFs involving UI/Interaction changes/Bugfix before and after modification are required.
34+
-->
35+
36+
### What is the current behavior?
37+
38+
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
39+
40+
Issue Number: N/A
41+
42+
### What is the new behavior?
43+
44+
45+
## Does this PR introduce a breaking change?
46+
47+
- [ ] Yes
48+
- [ ] No
49+
50+
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
51+
52+
## Other information
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
[English](https://github.com/opentiny/tiny-engine-webservice/blob/main/.github/PULL_REQUEST_TEMPLATE.md) | 简体中文
2+
3+
# PR
4+
5+
## PR Checklist
6+
7+
请检查您的 PR 是否满足以下要求:
8+
9+
- [ ] commit message遵循我们的[提交贡献指南](https://github.com/opentiny/tiny-engine-webservice/blob/main/CONTRIBUTING.zh-CN.md)
10+
- [ ] 添加了更改内容的测试用例(用于bugfix/功能)
11+
- [ ] 文档已添加/更新(用于bugfix/功能)
12+
- [ ] 是否构建了自己的设计器,经过了充分的自验证
13+
14+
## PR 类型
15+
16+
这个PR的类型是?
17+
18+
- [ ] 日常 bug 修复
19+
- [ ] 新特性支持
20+
- [ ] 代码风格优化
21+
- [ ] 重构
22+
- [ ] 构建优化
23+
- [ ] 测试用例
24+
- [ ] 文档更新
25+
- [ ] 分支合并
26+
- [ ] 其他改动(请补充)
27+
28+
29+
## 需求背景和解决方案
30+
31+
<!--
32+
1. 要解决的具体问题。
33+
2. 新增特性,需要进行功能描述,并附上效果图。
34+
3. 涉及UI/交互变动/Bugfix需要有修改前&修改后截图或 GIF。
35+
-->
36+
37+
38+
Issue Number: N/A
39+
40+
### 修改前
41+
42+
43+
### 修改后
44+
45+
## 此PR是否含有 breaking change?
46+
47+
- [ ]
48+
- [ ]
49+
50+
<!-- 如果此 PR 包含breaking change,请在下面从用户角度描述具体变化和其他风险。-->
51+
52+
## Other information

.github/release.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- ignore-for-release
5+
authors:
6+
- allcontributors[bot]
7+
categories:
8+
- title: Breaking Changes 🛠
9+
labels:
10+
- Semver-Major
11+
- breaking-change
12+
- title: Exciting New Features 🎉
13+
labels:
14+
- Semver-Minor
15+
- feature
16+
- enhancement
17+
- title: Bug Fixes 🐛
18+
labels:
19+
- Semver-Patch
20+
- bug
21+
- title: Other Changes
22+
labels:
23+
- documentation
24+
- refactoring
25+
- unit-test
26+
- ci
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: AI Code Review
2+
3+
permissions:
4+
contents: read
5+
pull-requests: write
6+
7+
on:
8+
pull_request:
9+
types: [opened, reopened, synchronize]
10+
11+
jobs:
12+
review:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: anc95/ChatGPT-CodeReview@main
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
19+
LANGUAGE: Chinese
20+
OPENAI_API_ENDPOINT: https://api.openai.com/v1
21+
MODEL: gpt-3.5-turbo
22+
MAX_TOKENS: 4096
23+
MAX_PATCH_LENGTH: 10000
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: 'issue-translator'
2+
on:
3+
issue_comment:
4+
types: [created]
5+
issues:
6+
types: [opened]
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: usthe/issues-translate-action@v2.7
13+
with:
14+
IS_MODIFY_TITLE: false
15+
# 非必须,决定是否需要修改issue标题内容
16+
# 若是true,则机器人账户@Issues-translate-bot必须拥有修改此仓库issue权限。可以通过邀请@Issues-translate-bot加入仓库协作者实现。
17+
CUSTOM_BOT_NOTE: Bot detected the issue body's language is not English, translate it automatically.
18+
# 非必须,自定义机器人翻译的前缀开始内容。

CONTRIBUTING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ When you personally use the TinyEngine and participate in many of the above cont
1717
### Bug Reports
1818
If you encounter problems when using TinyEngine-webservice, please submit an issue to us. Before submitting an issue, read the related official documents carefully to check whether the issue is a defect or a function that has not been implemented.
1919

20-
If the issue is a defect, select the bug report template when creating a new issue. The title must comply with the defect description format. For example, [tiny-engine-webservice] cannot be refreshed.
20+
If the issue is a defect, select the bug report template when creating a new issue. The title must comply with the defect description format. For example, [TinyEngine-webservice] cannot be refreshed.
2121

2222
To report a defect, you need to fill in the following information:
2323

24-
* Tiny-engine-webservice and node version numbers
24+
* TinyEngine-webservice and node version numbers
2525
*Screenshots can be used to describe the defect. If an error is reported, the error information can be posted.
2626
* It is recommended that a minimum demo link be provided to reproduce the defect.
2727

28-
If the feature is a new feature, select the Feature request template. The title complies with the format of the new feature description, for example, [tiny-engine-webservice].
28+
If the feature is a new feature, select the Feature request template. The title complies with the format of the new feature description, for example, [TinyEngine-webservice].
2929

3030
For an issue of a new feature, you need to fill in the following information:
3131

@@ -38,16 +38,16 @@ Before submitting pull request, please make sure that your submission is in line
3838

3939
Local startup steps:
4040

41-
* Click Fork in the upper right corner of the TinyEngine-webservice code repository to fork the upstream repository to the personal repository.
41+
* Click Fork in the upper right corner of the tiny-engine-webservice code repository to fork the upstream repository to the personal repository.
4242
* Clone personal warehouse to local
43-
* Run npm install in the TinyEngine-webservice root directory to install the dependency.
44-
* Modify related configurations in the config folder in the TinyEngine-webservice root directory.
45-
* Run npm run dev in the root directory of TinyEngine-webservice to start local development.
43+
* Run npm install in the tiny-engine-webservice root directory to install the dependency.
44+
* Modify related configurations in the config folder in the tiny-engine-webservice root directory.
45+
* Run npm run dev in the root directory of tiny-engine-webservice to start local development.
4646

4747
```
4848
# username indicates the user name. Replace it before running the command.
4949
git clone git@github.com:username/tiny-engine-webservice.git
50-
cd tiny-engine
50+
cd tiny-engine-webservice
5151
git remote add upstream git@github.com:opentiny/tiny-engine-webservice.git
5252
npm i
5353

CONTRIBUTING.zh-CN.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,37 @@
1717
### 提交 Issue
1818
如果你在使用 TinyEngine-webservice 过程中遇到问题,欢迎给我们提交 Issue,提交 Issue 之前,请先仔细阅读相关的官方文档,确认这是一个缺陷还是尚未实现的功能。
1919

20-
如果是一个缺陷,创建新 Issue 时选择 Bug report 模板,标题遵循缺陷简述 的格式,比如:[tiny-engine-webservice] 刷新功能无法使用。
20+
如果是一个缺陷,创建新 Issue 时选择 Bug report 模板,标题遵循缺陷简述 的格式,比如:[TinyEngine-webservice] 刷新功能无法使用。
2121

2222
报告缺陷的 Issue 主要需要填写以下信息:
2323

24-
* tiny-engine-webservice 和 node 的版本号
24+
* TinyEngine-webservice 和 node 的版本号
2525
* 缺陷的表现,可截图辅助说明,如果有报错可贴上报错信息
2626
* 缺陷的复现步骤,最好能提供一个最小可复现 demo 链接
2727

28-
如果是一个新特性,则选择 Feature request 模板,标题遵循新特性简述 的格式,比如:[tiny-engine-webservice] 新增XX主题。
28+
如果是一个新特性,则选择 Feature request 模板,标题遵循新特性简述 的格式,比如:[TinyEngine-webservice] 新增XX主题。
2929

3030
新特性的 Issue 主要需要填写以下信息:
3131

3232
* 该特性主要解决用户的什么问题
3333
* 该特性的 api 是什么样的
3434

3535
### 提交 PR
36-
提交 PR 之前,请先确保你提交的内容是符合 TinyEngine-webservice 整体规划的,一般已经标记为 bug 的 Issue 是鼓励提交 PR 的,如果你不是很确定,可以创建一个 Discussion 进行讨论。
36+
提交 PR 之前,请先确保你提交的内容是符合 TinyEngine Web Service 整体规划的,一般已经标记为 bug 的 Issue 是鼓励提交 PR 的,如果你不是很确定,可以创建一个 Discussion 进行讨论。
3737

3838
本地启动步骤:
3939

40-
* 点击 TinyEngine-webservice 代码仓库右上角的 Fork 按钮,将上游仓库 Fork 到个人仓库
40+
* 点击 tiny-engine-webservice 代码仓库右上角的 Fork 按钮,将上游仓库 Fork 到个人仓库
4141
* Clone 个人仓库到本地
42-
*TinyEngine-webservice 根目录下运行 npm install, 安装依赖
43-
*TinyEngine-webservice 根目录config文件夹下修改相关配置
44-
*TinyEngine-webservice 根目录下运行 npm run dev,启动本地开发
42+
*tiny-engine-webservice 根目录下运行 npm install, 安装依赖
43+
*tiny-engine-webservice 根目录config文件夹下修改相关配置
44+
*tiny-engine-webservice 根目录下运行 npm run dev,启动本地开发
4545

4646

4747
```
4848
# username 为用户名,执行前请替换
4949
git clone git@github.com:username/tiny-engine-webservice.git
50-
cd tiny-engine
50+
cd tiny-engine-webservice
5151
git remote add upstream git@github.com:opentiny/tiny-engine-webservice.git
5252
npm i
5353

0 commit comments

Comments
 (0)