Skip to content

Commit f0a124f

Browse files
authored
Merge pull request #8 from linjungz/pre-release
Sync from upstream
2 parents 635fe8e + 790af1f commit f0a124f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2739
-1067
lines changed
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: "[Bug] "
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Deployment**
27+
- [ ] Docker
28+
- [ ] Vercel
29+
- [ ] Server
30+
31+
**Desktop (please complete the following information):**
32+
- OS: [e.g. iOS]
33+
- Browser [e.g. chrome, safari]
34+
- Version [e.g. 22]
35+
36+
**Smartphone (please complete the following information):**
37+
- Device: [e.g. iPhone6]
38+
- OS: [e.g. iOS8.1]
39+
- Browser [e.g. stock browser, safari]
40+
- Version [e.g. 22]
41+
42+
**Additional Logs**
43+
Add any logs about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: "[Feature] "
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: 功能建议
3+
about: 请告诉我们你的灵光一闪
4+
title: "[Feature] "
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**这个功能与现有的问题有关吗?**
11+
如果有关,请在此列出链接或者描述问题。
12+
13+
**你想要什么功能或者有什么建议?**
14+
尽管告诉我们。
15+
16+
**有没有可以参考的同类竞品?**
17+
可以给出参考产品的链接或者截图。
18+
19+
**其他信息**
20+
可以说说你的其他考虑。
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: 反馈问题
3+
about: 请告诉我们你遇到的问题
4+
title: "[Bug] "
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**描述问题**
11+
请在此描述你遇到了什么问题。
12+
13+
**如何复现**
14+
请告诉我们你是通过什么操作触发的该问题。
15+
16+
**截图**
17+
请在此提供控制台截图、屏幕截图或者服务端的 log 截图。
18+
19+
**一些必要的信息**
20+
- 系统:[比如 windows 10/ macos 12/ linux / android 11 / ios 16]
21+
- 浏览器: [比如 chrome, safari]
22+
- 版本: [填写设置页面的版本号]
23+
- 部署方式:[比如 vercel、docker 或者服务器部署]

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ yarn-error.log*
3636
next-env.d.ts
3737
dev
3838

39-
public/prompts.json
39+
public/prompts.json
40+
41+
.vscode
42+
.idea

.vscode/settings.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

CODE_OF_CONDUCT.md

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
flynn.zhang@foxmail.com.
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ Deploy Chatbot Application using GPT4 in Azure Open AI Service
1414
- Export chat history with full Markdown support
1515

1616
## Roadmap
17-
- [ ] System Role/Message for initial instructions for models
18-
17+
- [ - ] System Role/Message for initial instructions for models
1918

2019
## Get Started
21-
2220
### Environment Variables
2321

2422
Need to prepare following environment variables. Suggest to use Azure Portal to retrieve related information.

app/api/chat-stream/route.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ async function createStream(req: NextRequest) {
88

99
const res = await requestOpenai(req);
1010

11+
const contentType = res.headers.get("Content-Type") ?? "";
12+
if (!contentType.includes("stream")) {
13+
const content = await (
14+
await res.text()
15+
).replace(/provided:.*. You/, "provided: ***. You");
16+
console.log("[Stream] error ", content);
17+
return "```json\n" + content + "```";
18+
}
19+
1120
const stream = new ReadableStream({
1221
async start(controller) {
1322
function onParse(event: any) {
@@ -50,6 +59,9 @@ export async function POST(req: NextRequest) {
5059
return new Response(stream);
5160
} catch (error) {
5261
console.error("[Chat Stream]", error);
62+
return new Response(
63+
["```json\n", JSON.stringify(error, null, " "), "\n```"].join(""),
64+
);
5365
}
5466
}
5567

app/api/openai/route.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ import { requestOpenai } from "../common";
33

44
async function makeRequest(req: NextRequest) {
55
try {
6-
const res = await requestOpenai(req);
7-
return new Response(res.body);
6+
const api = await requestOpenai(req);
7+
const res = new NextResponse(api.body);
8+
res.headers.set("Content-Type", "application/json");
9+
res.headers.set("Cache-Control", "no-cache");
10+
return res;
811
} catch (e) {
912
console.error("[OpenAI] ", req.body, e);
1013
return NextResponse.json(

0 commit comments

Comments
 (0)