Skip to content

Commit

Permalink
Merge pull request #4239 from chatchat-space/pre-release
Browse files Browse the repository at this point in the history
项目协议更新说明
  • Loading branch information
zRzRzRzRzRzRzR committed Jun 20, 2024
2 parents 52a8402 + 585ac1f commit a5ed508
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 2 deletions.
38 changes: 38 additions & 0 deletions ADDITIONAL_LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Open Source License

Dify is licensed under the Apache License 2.0, with the following additional conditions:

1. Dify may be utilized commercially, including as a backend service for other applications or as an application development platform for enterprises. Should the conditions below be met, a commercial license must be obtained from the producer:

a. Multi-tenant SaaS service: Unless explicitly authorized by Dify in writing, you may not use the Dify source code to operate a multi-tenant environment.
- Tenant Definition: Within the context of Dify, one tenant corresponds to one workspace. The workspace provides a separated area for each tenant's data and configurations.

b. LOGO and copyright information: In the process of using Dify's frontend components, you may not remove or modify the LOGO or copyright information in the Dify console or applications. This restriction is inapplicable to uses of Dify that do not involve its frontend components.

Please contact [email protected] by email to inquire about licensing matters.

2. As a contributor, you should agree that:

a. The producer can adjust the open-source agreement to be more strict or relaxed as deemed necessary.
b. Your contributed code may be used for commercial purposes, including but not limited to its cloud business operations.

Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0. Detailed information about the Apache License 2.0 can be found at http://www.apache.org/licenses/LICENSE-2.0.

The interactive design of this product is protected by appearance patent.

© 2024 LangGenius, Inc.


----------

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2024 LangChain-Chatchat Team

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,16 @@ chatchat -a

---

## 协议

本项目非涉及 额外协议 部分的代码遵循 [Apache-2.0](LICENSE) 协议。

### 额外协议

本仓库中的 [model-providers 代码](https://github.com/chatchat-space/Langchain-Chatchat/tree/master/libs/model-providers/)
引用了 [Dify](https://github.com/langgenius/dify/tree/main/api/core/model_runtime)中的相关代码。
如果您使用这部分代码并再分发,你需要包含 [ADDITIONAL_LICENSE](ADDITIONAL_LICENSE) 的完整内容。

## 联系我们

### Telegram
Expand Down
9 changes: 9 additions & 0 deletions README_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,15 @@ The following guide does not guarantee 100% compatibility and success. Remember

---

## License

The code of this project that does not involve *Additional License* follows the [Apache-2.0](LICENSE) agreement.

### Additional License

The [model-providers code](https://github.com/chatchat-space/Langchain-Chatchat/tree/master/libs/model-providers/) in this repository
references the relevant code in [Dify](https://github.com/langgenius/dify/tree/main/api/core/model_runtime).
If you use this part of the code and redistribute it, you need to include the full content of [ADDITIONAL_LICENSE](ADDITIONAL_LICENSE).
## Project Milestones

+ `April 2023`: `Langchain-ChatGLM 0.1.0` released, supporting local knowledge base question and answer based on ChatGLM-6B model.
Expand Down
5 changes: 5 additions & 0 deletions libs/model-providers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,8 @@ deepseek:


```

### 额外协议

本文件夹中的部分代码参考了[Dify](https://github.com/langgenius/dify/tree/main/api/core/model_runtime)中的相关代码。
如果您使用这部分代码并再分发,你需要包含 [ADDITIONAL_LICENSE](../../ADDITIONAL_LICENSE) 的完整内容。
7 changes: 6 additions & 1 deletion libs/model-providers/README_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,9 @@ deepseek:



```
```

### Additional License

Some of the codes in this folder refer to the relevant codes in [Dify](https://github.com/langgenius/dify/tree/main/api/core/model_runtime).
If you use this code and redistribute it, you need to include the full contents of the [ADDITIONAL_LICENSE](../../ADDITIONAL_LICENSE) .

0 comments on commit a5ed508

Please sign in to comment.