Merge branch 'main' into feat/dataset-notion-import

.github/workflows/stale.yml

@@ -20,6 +20,8 @@ jobs:
     steps:
     - uses: actions/stale@v5
       with:
+        days-before-issue-stale: 30
+        days-before-issue-close: 3
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: "Close due to it's no longer active, if you have any questions, you can reopen it."
         stale-pr-message: "Close due to it's no longer active, if you have any questions, you can reopen it."

CONTRIBUTING.md

@@ -54,3 +54,8 @@ Did you have an issue, like a merge conflict, or don't know how to open a pull r
 ## Community channels
 
 Stuck somewhere? Have any questions? Join the [Discord Community Server](https://discord.gg/AhzKf7dNgk). We are here to help!
+
+### i18n (Internationalization) Support
+
+We are looking for contributors to help with translations in other languages. If you are interested in helping, please join the [Discord Community Server](https://discord.gg/AhzKf7dNgk) and let us know.  
+Also check out the [Frontend i18n README]((web/i18n/README_EN.md)) for more information.
\ No newline at end of file

CONTRIBUTING_CN.md

@@ -51,3 +51,7 @@ git clone git@github.com:<github_username>/dify.git
 ## 社区渠道
 
 遇到困难了吗？有任何问题吗? 加入 [Discord Community Server](https://discord.gg/AhzKf7dNgk)，我们将为您提供帮助。
+
+### 多语言支持
+
+需要参与贡献翻译内容，请参阅[前端多语言翻译 README](web/i18n/README_CN.md)。

api/app.py

 # -*- coding:utf-8 -*-
 import os
+from datetime import datetime
+
 if not os.environ.get("DEBUG") or os.environ.get("DEBUG").lower() != 'true':
     from gevent import monkey
     monkey.patch_all()
@@ -122,6 +124,9 @@ def load_user(user_id):
                     account.current_tenant_id = tenant_account_join.tenant_id
                     session['workspace_id'] = account.current_tenant_id
 
+            account.last_active_at = datetime.utcnow()
+            db.session.commit()
+
             # Log in the user with the updated user_id
             flask_login.login_user(account, remember=True)
 

api/migrations/versions/614f77cecc48_add_last_active_at.py

+"""add last active at
+
+Revision ID: 614f77cecc48
+Revises: a45f4dfde53b
+Create Date: 2023-06-15 13:33:00.357467
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '614f77cecc48'
+down_revision = 'a45f4dfde53b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('accounts', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('last_active_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP(0)'), nullable=False))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('accounts', schema=None) as batch_op:
+        batch_op.drop_column('last_active_at')
+
+    # ### end Alembic commands ###

api/models/account.py

@@ -32,6 +32,7 @@ class Account(UserMixin, db.Model):
     timezone = db.Column(db.String(255))
     last_login_at = db.Column(db.DateTime)
     last_login_ip = db.Column(db.String(255))
+    last_active_at = db.Column(db.DateTime, nullable=False, server_default=db.text('CURRENT_TIMESTAMP(0)'))
     status = db.Column(db.String(16), nullable=False, server_default=db.text("'active'::character varying"))
     initialized_at = db.Column(db.DateTime)
     created_at = db.Column(db.DateTime, nullable=False, server_default=db.text('CURRENT_TIMESTAMP(0)'))

web/app/components/app/configuration/config-model/index.tsx

@@ -97,7 +97,7 @@ const ConifgModel: FC<IConifgModelProps> = ({
       key: 'max_tokens',
       tip: t('common.model.params.maxTokenTip'),
       step: 100,
-      max: modelId === 'gpt-4' ? 8000 : 4000,
+      max: (modelId === 'gpt-4' || modelId === 'gpt-3.5-turbo-16k') ? 8000 : 4000,
     },
   ]
 
@@ -215,11 +215,11 @@ const ConifgModel: FC<IConifgModelProps> = ({
                   {!selectModelDisabled && <ChevronDownIcon className={cn(isShowOption && 'rotate-180', 'w-[14px] h-[14px] text-gray-500')} />}
                 </div>
                 {isShowOption && (
-                  <div className={cn(isChatApp ? 'w-[159px]' : 'w-[179px]', 'absolute right-0 bg-gray-50 rounded-lg shadow')}>
+                  <div className={cn(isChatApp ? 'min-w-[159px]' : 'w-[179px]', 'absolute right-0 bg-gray-50 rounded-lg shadow')}>
                     {availableModels.map(item => (
                       <div key={item.id} onClick={handleSelectModel(item.id)} className="flex items-center h-9 px-3 rounded-lg cursor-pointer hover:bg-gray-100">
-                        <ModelIcon className='mr-2' />
-                        <div className="text-sm gray-900">{item.name}</div>
+                        <ModelIcon className='shrink-0 mr-2' />
+                        <div className="text-sm gray-900 whitespace-nowrap">{item.name}</div>
                       </div>
                     ))}
                   </div>

web/i18n/README_CN.md

+# 前端 i18n 修改
+
+## 后端多语言支持
+
+`api/libs/helper.py:117` 中添加对应的语言支持。如：
+```python
+def supported_language(lang):
+    if lang in ['en-US', 'zh-Hans', 'de', 'de-AT']:
+        return lang
+```
+
+
+## 添加多语言文件
+
+在 `web/i18n/lang` 下添加不同模块的多语言文件。文件命令为 模块名.{LANG}.ts。详细参考[LANG](https://www.venea.net/web/culture_code) 
+
+## 引入新添加的多语言文件
+在 `web/i18n/i18next-config.ts` 中 resources 对象中中引入新添加的多语言文件。如：
+
+```javascript
+const resources = {
+    'en': {...},
+    'zh-Hans': {...},
+    // 引入新添加的语言
+    'new LANG': {
+      translation: {
+        common: commonNewLan,
+        layout: layoutNewLan,
+        ...
+      }
+    }
+}
+```
+
+## 翻译过程中的改动
+
+### 日期格式化的多语言处理
+
+目前日期做多语言格式化的文件涉及到如下 2 个: 
+
+```javascript
+1. web/app/components/header/account-setting/members-page/index.tsx
+// Line: 78 
+{dayjs(Number((account.last_login_at || account.created_at)) * 1000).locale(locale === 'zh-Hans' ? 'zh-cn' : 'en').fromNow()}
+2. web/app/components/develop/secret-key/secret-key-modal.tsx
+// Line：82
+const formatDate = (timestamp: any) => {
+    if (locale === 'en') {
+      return new Intl.DateTimeFormat('en-US', { year: 'numeric', month: 'long', day: 'numeric' }).format((+timestamp) * 1000)
+    } else {
+      return new Intl.DateTimeFormat('fr-CA', { year: 'numeric', month: '2-digit', day: '2-digit' }).format((+timestamp) * 1000)
+    }
+  }
+```
+看需求做对应的改动。
+
+### 翻译中带变量的内容的处理
+
+翻译中会存在带变量的情况，变量的值会在运行时被替换。翻译中的变量会用{{ 和 }} 包裹。
+翻译带变量的内容时：
+  1. 不能改变量的名称。即：变量的名称不需要做翻译。
+  2. 确保变量填充后，语句仍保持通顺。
+
+查找所有翻译中带变量的方式：在 ./web/i18n/lang 下搜索：{{。
+
+### 翻译内容太长破坏 UI
+
+如果某个翻译的内容比其他语言的长很多，检查下是否会破坏 UI。
+
+## 帮助文档
+
+目前的帮助文档的调整逻辑是：中文跳转中文，其他语言跳英文。如果帮助文档也做了多语言。需要做这块的改动。
+
+## 验证
+
+新增语言包建议通过本地部署最新代码来验证，可参考：https://docs.dify.ai/getting-started/install-self-hosted/local-source-code
+验证点：
+1. 首次初始化安装是否存在新语言下拉选项，以及是否可以用新语言进行初始化
+2. 个人设置中是否存在新语言下拉选项，以及是否可以选择并保存新语言
+3. 界面各处文案是否使用新语言来展示，以及文案是否破坏 UI
+4. 从模板创建应用内容是否均为新语言
+5. （CLOUD 版）通过 OAuth 授权登录后，是否直接设置当前浏览器语言为界面语言

web/i18n/README_EN.md

+# Frontend i18n modification
+
+## Backend i18n modification
+
+`api/libs/helper.py:117` Add corresponding language support. Such as:
+```python
+def supported_language(lang):
+    if lang in ['en-US', 'zh-Hans', 'de', 'de-AT']:
+        return lang
+```
+
+## Adding multiple language files
+
+Add multilingual files for different modules under web/i18n/lang. The file name is Module name.{LANG}.ts. Please refer [LANG](https://www.venea.net/web/culture_code) for details.
+
+## Introducing a newly added multilingual file 
+
+Introduce the newly added multilingual file in the resources object in web/i18n/i18next-config.ts. For example:
+
+```javascript
+const resources = {
+    'en': {...},
+    'zh-Hans': {...},  
+    _// Introduce the newly added language_
+    'new LANG': {  
+      translation: {  
+        common: commonNewLan,  
+        layout: layoutNewLan,  
+        ...  
+      }  
+    }
+}
+```
+## Changes in the translation process
+
+### Multi-language processing of date formatting
+
+Currently, two files are involved in date formatting in multiple languages:
+
+```javascript
+1. web/app/components/header/account-setting/members-page/index.tsx
+_// Line 78_   
+{dayjs(Number((account.last_login_at || account.created_at)) * 1000).locale(locale === 'zh-Hans' ? 'zh-cn' : 'en').fromNow()}  
+2. web/app/components/develop/secret-key/secret-key-modal.tsx  
+_// Line 82_
+const formatDate = (timestamp: any) => {
+    if (locale === 'en') {  
+      return new Intl.DateTimeFormat('en-US', { year: 'numeric', month: 'long', day: 'numeric' }).format((+timestamp) * 1000)  
+    } else {  
+      return new Intl.DateTimeFormat('fr-CA', { year: 'numeric', month: '2-digit', day: '2-digit' }).format((+timestamp) * 1000)  
+    }  
+  }
+```
+
+Make corresponding changes based on requirements.
+
+### Handling translation content with variables
+
+There will be variables in the translation, and the value of the variables will be replaced at runtime. Variables in translation will be wrapped in {{ and }}.
+When translating content with variables:
+  1. Do not change the variable name. That is: the variable name does not need to be translated. 
+  2. Ensure that the statement remains smooth after the variable is filled.
+Find all translations with variables: search for {{ under ./web/i18n/lang. 
+
+### Translation content is too long to destroy UI
+
+If a certain translation content is much longer than other languages, check if it will destroy the UI.
+
+## Help documentation
+
+The current logic for adjusting the help documentation is: Chinese jumps to Chinese, other languages jump to English. If the help documentation is also multilingual, changes need to be made in this area. 
+
+## Verification
+
+It is recommended to verify the newly added language pack through local deployment of the latest code. For reference: https://docs.dify.ai/getting-started/install-self-hosted/local-source-code
+Verification points:
+1. Whether the initial installation has new language drop-down options, and whether the new language can be used for initialization
+2. Whether there is a new language drop-down option in personal settings, and whether the new language can be selected and saved 
+3. Whether the text in the interface is displayed in the new language, and whether the text destroys the UI
+4. Whether the content created from the template is all in the new language
+5. (CLOUD version) After logging in through OAuth authorization, whether the current browser language is set directly as the interface language

web/i18n/lang/common.en.ts

@@ -50,7 +50,7 @@ const translation = {
         'How much to penalize new tokens based on their existing frequency in the text so far. Decreases the model\'s likelihood to repeat the same line verbatim.',
       maxToken: 'Max token',
       maxTokenTip:
-        'Max tokens generated is 2,048 or 4,000, depending on the model. Prompt and completion share this limit. One token is roughly 1 English character.',
+        'Max tokens depending on the model. Prompt and completion share this limit. One token is roughly 1 English character.',
       setToCurrentModelMaxTokenTip: 'Max token is updated to the maximum token of the current model 4,000.',
     },
     tone: {

web/i18n/lang/common.zh.ts

@@ -50,7 +50,7 @@ const translation = {
         'Frequency penalty 是根据重复词在目前文本中的出现频率来对其进行惩罚。正值将不太可能重复常用单词和短语。',
       maxToken: '最大 Token',
       maxTokenTip:
-        '生成的最大令牌数为 2,048 或 4,000，取决于模型。提示和完成共享令牌数限制。一个令牌约等于 1 个英文或 半个中文字符。',
+        '生成的最大令牌数取决于模型。提示和完成共享令牌数限制。一个令牌约等于 1 个英文或 半个中文字符。',
       setToCurrentModelMaxTokenTip: '最大令牌数更新为当前模型最大的令牌数 4,000。',
     },
     tone: {