Skip to content

Commit 3842be2

Browse files
bentwnghkbentwnghk
committed
Merge remote-tracking branch 'upstream/main'
2 parents 5e3459a + 23a26a9 commit 3842be2

File tree

85 files changed

+921
-1621
lines changed

Some content is hidden

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

85 files changed

+921
-1621
lines changed

‎changelog/v1.json

+17-955
Large diffs are not rendered by default.

‎docker-compose/setup.sh

+92-1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,16 @@ show_message() {
170170
;;
171171
esac
172172
;;
173+
tips_download_failed)
174+
case $LANGUAGE in
175+
zh_CN)
176+
echo "$2 下载失败，请检查网络连接。"
177+
;;
178+
*)
179+
echo "$2 Download failed, please check the network connection."
180+
;;
181+
esac
182+
;;
173183
tips_already_installed)
174184
case $LANGUAGE in
175185
zh_CN)
@@ -260,6 +270,30 @@ show_message() {
260270
;;
261271
esac
262272
;;
273+
tips_no_docker_permission)
274+
case $LANGUAGE in
275+
zh_CN)
276+
echo "WARN: 看起来当前用户没有 Docker 权限。"
277+
echo "使用 'sudo usermod -aG docker $USER' 为用户分配 Docker 权限（可能需要重新启动 shell）。"
278+
;;
279+
*)
280+
echo "WARN: It look like the current user does not have Docker permissions."
281+
echo "Use 'sudo usermod -aG docker $USER' to assign Docker permissions to the user (may require restarting shell)."
282+
;;
283+
esac
284+
;;
285+
tips_init_database_failed)
286+
case $LANGUAGE in
287+
zh_CN)
288+
echo "无法初始化数据库，为了避免你的数据重复初始化，请在首次成功启动时运行以下指令清空 Casdoor 初始配置文件："
289+
echo "echo '{}' > init_data.json"
290+
;;
291+
*)
292+
echo "Failed to initialize the database. To avoid your data being initialized repeatedly, run the following command to unmount the initial configuration file of Casdoor when you first start successfully:"
293+
echo "echo '{}' > init_data.json"
294+
;;
295+
esac
296+
;;
263297
ask_regenerate_secrets)
264298
case $LANGUAGE in
265299
zh_CN)
@@ -320,12 +354,27 @@ show_message() {
320354
;;
321355
esac
322356
;;
357+
ask_init_database)
358+
case $LANGUAGE in
359+
zh_CN)
360+
echo "是否初始化数据库？"
361+
;;
362+
*)
363+
echo "Do you want to initialize the database?"
364+
;;
365+
esac
366+
;;
323367
esac
324368
}
325369

326370
# Function to download files
327371
download_file() {
328-
wget -q --show-progress "$1" -O "$2"
372+
wget --show-progress "$1" -O "$2"
373+
# If run failed, exit
374+
if [ $? -ne 0 ]; then
375+
show_message "tips_download_failed" "$2"
376+
exit 1
377+
fi
329378
}
330379

331380
print_centered() {
@@ -629,12 +678,54 @@ section_regenerate_secrets() {
629678
fi
630679
fi
631680
}
681+
632682
show_message "ask_regenerate_secrets"
633683
ask "(y/n)" "y"
634684
if [[ "$ask_result" == "y" ]]; then
635685
section_regenerate_secrets
636686
fi
637687

688+
section_init_database() {
689+
if ! command -v docker &> /dev/null ; then
690+
echo "docker" $(show_message "tips_no_executable")
691+
return 1
692+
fi
693+
694+
if ! docker compose &> /dev/null ; then
695+
echo "docker compose" $(show_message "tips_no_executable")
696+
return 1
697+
fi
698+
699+
# Check if user has permissions to run Docker by trying to get the status of Docker (docker status).
700+
# If this fails, the user probably does not have permissions for Docker.
701+
# ref: https://github.com/paperless-ngx/paperless-ngx/blob/89e5c08a1fe4ca0b7641ae8fbd5554502199ae40/install-paperless-ngx.sh#L64-L72
702+
if ! docker stats --no-stream &> /dev/null ; then
703+
echo $(show_message "tips_no_docker_permission")
704+
return 1
705+
fi
706+
707+
docker compose pull
708+
docker compose up --detach postgresql casdoor
709+
# hopefully enough time for even the slower systems
710+
sleep 15
711+
docker compose stop
712+
713+
# Init finished, remove init mount
714+
echo '{}' > init_data.json
715+
}
716+
717+
show_message "ask_init_database"
718+
ask "(y/n)" "y"
719+
if [[ "$ask_result" == "y" ]]; then
720+
# If return 1 means failed
721+
section_init_database
722+
if [ $? -ne 0 ]; then
723+
echo $(show_message "tips_init_database_failed")
724+
fi
725+
else
726+
show_message "tips_init_database_failed"
727+
fi
728+
638729
section_display_configurated_report() {
639730
# Display configuration reports
640731
echo $(show_message "security_secrect_regenerate_report")

‎docs/self-hosting/advanced/auth/clerk.mdx

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Go to [Clerk](https://clerk.com?utm_source=lobehub\&utm_medium=docs) to register
2727
```shell
2828
NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY=pk_live_xxxxxxxxxxx
2929
CLERK_SECRET_KEY=sk_live_xxxxxxxxxxxxxxxxxxxxxx
30+
NEXT_PUBLIC_ENABLE_NEXT_AUTH=0
3031
```
3132

3233
### Create and Configure Webhook in Clerk

‎locales/ar/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "لا توجد نماذج ممكن تمكينها، يرجى الانتقال إلى الإعدادات لتمكينها",
88+
"emptyProvider": "لا توجد مزودات مفعلة، يرجى الذهاب إلى الإعدادات لتفعيلها",
89+
"goToSettings": "اذهب إلى الإعدادات",
8890
"provider": "مزود"
8991
},
9092
"OllamaSetupGuide": {

‎locales/ar/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 Sonnet يقدم قدرات تتجاوز Opus وسرعة أكبر من Sonnet، مع الحفاظ على نفس السعر. يتميز Sonnet بمهارات خاصة في البرمجة وعلوم البيانات ومعالجة الصور والمهام الوكيلة."
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnet هو أكثر النماذج ذكاءً من Anthropic حتى الآن، وهو أيضًا أول نموذج مختلط للتفكير في السوق. يمكن لـ Claude 3.7 Sonnet إنتاج استجابات شبه فورية أو تفكير تدريجي ممتد، حيث يمكن للمستخدمين رؤية هذه العمليات بوضوح. يتميز Sonnet بشكل خاص في البرمجة، وعلوم البيانات، ومعالجة الصور، والمهام الوكيلة."
511+
},
509512
"aya": {
510513
"description": "Aya 23 هو نموذج متعدد اللغات أطلقته Cohere، يدعم 23 لغة، مما يسهل التطبيقات اللغوية المتنوعة."
511514
},

‎locales/bg-BG/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "Няма активирани модели, моля, посетете настройките и ги активирайте",
88+
"emptyProvider": "Няма активиран доставчик на услуги, моля, отидете в настройките, за да го активирате",
89+
"goToSettings": "Отидете в настройките",
8890
"provider": "Доставчик"
8991
},
9092
"OllamaSetupGuide": {

‎locales/bg-BG/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 Sonnet предлага способности, надхвърлящи Opus, и по-бърза скорост в сравнение с Sonnet, като същевременно запазва същата цена. Sonnet е особено силен в програмирането, науката за данни, визуалната обработка и агентските задачи."
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnet е най-интелигентният модел на Anthropic до момента и е първият хибриден модел за разсъждение на пазара. Claude 3.7 Sonnet може да генерира почти мигновени отговори или удължено стъпково мислене, което позволява на потребителите ясно да видят тези процеси. Sonnet е особено добър в програмирането, науката за данни, визуалната обработка и агентските задачи."
511+
},
509512
"aya": {
510513
"description": "Aya 23 е многозначен модел, представен от Cohere, поддържащ 23 езика, предоставяйки удобство за многоезични приложения."
511514
},

‎locales/de-DE/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "Kein aktiviertes Modell. Bitte gehen Sie zu den Einstellungen, um es zu aktivieren.",
88+
"emptyProvider": "Es sind keine aktiven Anbieter vorhanden, bitte gehen Sie zu den Einstellungen, um sie zu aktivieren",
89+
"goToSettings": "Zu den Einstellungen gehen",
8890
"provider": "Anbieter"
8991
},
9092
"OllamaSetupGuide": {

‎locales/de-DE/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 Sonnet bietet Fähigkeiten, die über Opus hinausgehen, und eine schnellere Geschwindigkeit als Sonnet, während es den gleichen Preis wie Sonnet beibehält. Sonnet ist besonders gut in Programmierung, Datenwissenschaft, visueller Verarbeitung und Agentenaufgaben."
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnet ist das intelligenteste Modell von Anthropic bis heute und das erste hybride Inferenzmodell auf dem Markt. Claude 3.7 Sonnet kann nahezu sofortige Antworten oder verlängerte, schrittweise Überlegungen erzeugen, wobei die Benutzer diesen Prozess klar nachvollziehen können. Sonnet ist besonders gut in den Bereichen Programmierung, Datenwissenschaft, visuelle Verarbeitung und Agentenaufgaben."
511+
},
509512
"aya": {
510513
"description": "Aya 23 ist ein mehrsprachiges Modell von Cohere, das 23 Sprachen unterstützt und die Anwendung in einer Vielzahl von Sprachen erleichtert."
511514
},

‎locales/en-US/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "No enabled model. Please go to settings to enable.",
88+
"emptyProvider": "No enabled providers. Please go to settings to enable one.",
89+
"goToSettings": "Go to settings",
8890
"provider": "Provider"
8991
},
9092
"OllamaSetupGuide": {

‎locales/en-US/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 Sonnet offers capabilities that surpass Opus and faster speeds than Sonnet, while maintaining the same pricing as Sonnet. Sonnet excels particularly in programming, data science, visual processing, and agent tasks."
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnet is Anthropic's most advanced model to date and the first hybrid reasoning model on the market. Claude 3.7 Sonnet can generate near-instant responses or extended step-by-step reasoning, allowing users to clearly observe these processes. Sonnet excels particularly in programming, data science, visual processing, and agent tasks."
511+
},
509512
"aya": {
510513
"description": "Aya 23 is a multilingual model launched by Cohere, supporting 23 languages, facilitating diverse language applications."
511514
},

‎locales/es-ES/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "No hay modelos habilitados. Vaya a la configuración para habilitarlos.",
88+
"emptyProvider": "No hay proveedores habilitados, por favor ve a la configuración para activarlos",
89+
"goToSettings": "Ir a la configuración",
8890
"provider": "Proveedor"
8991
},
9092
"OllamaSetupGuide": {

‎locales/es-ES/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 Sonnet ofrece capacidades que superan a Opus y una velocidad más rápida que Sonnet, manteniendo el mismo precio que Sonnet. Sonnet es especialmente hábil en programación, ciencia de datos, procesamiento visual y tareas de agente."
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnet es el modelo más inteligente de Anthropic hasta la fecha y el primer modelo de razonamiento híbrido en el mercado. Claude 3.7 Sonnet puede generar respuestas casi instantáneas o un pensamiento prolongado y gradual, permitiendo a los usuarios observar claramente estos procesos. Sonnet es especialmente hábil en programación, ciencia de datos, procesamiento visual y tareas de agente."
511+
},
509512
"aya": {
510513
"description": "Aya 23 es un modelo multilingüe lanzado por Cohere, que admite 23 idiomas, facilitando aplicaciones de lenguaje diversas."
511514
},

‎locales/fa-IR/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "هیچ مدلی فعال نیست، لطفاً به تنظیمات بروید و آن را فعال کنید",
88+
"emptyProvider": "هیچ ارائه‌دهنده‌ای فعال نیست، لطفاً به تنظیمات بروید و آن را فعال کنید",
89+
"goToSettings": "به تنظیمات بروید",
8890
"provider": "ارائه‌دهنده"
8991
},
9092
"OllamaSetupGuide": {

‎locales/fa-IR/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 Sonnet توانایی‌هایی فراتر از Opus ارائه می‌دهد و سرعتی سریع‌تر از Sonnet دارد، در حالی که قیمت آن با Sonnet یکسان است. Sonnet به‌ویژه در برنامه‌نویسی، علم داده، پردازش بصری و وظایف نمایندگی مهارت دارد."
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnet هو هوش مصنوعی پیشرفته‌ترین مدل Anthropic است و همچنین اولین مدل استدلال ترکیبی در بازار به شمار می‌رود. Claude 3.7 Sonnet می‌تواند پاسخ‌های تقریباً آنی یا تفکر تدریجی و طولانی‌تری تولید کند که کاربران می‌توانند این فرآیندها را به وضوح مشاهده کنند. Sonnet به‌ویژه در برنامه‌نویسی، علم داده، پردازش بصری و وظایف نمایندگی مهارت دارد."
511+
},
509512
"aya": {
510513
"description": "Aya 23 یک مدل چندزبانه است که توسط Cohere ارائه شده و از 23 زبان پشتیبانی می‌کند و برای برنامه‌های چندزبانه تسهیلات فراهم می‌آورد."
511514
},

‎locales/fr-FR/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "Aucun modèle activé. Veuillez vous rendre dans les paramètres pour l'activer.",
88+
"emptyProvider": "Aucun fournisseur activé, veuillez aller dans les paramètres pour l'activer",
89+
"goToSettings": "Aller aux paramètres",
8890
"provider": "Fournisseur"
8991
},
9092
"OllamaSetupGuide": {

‎locales/fr-FR/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 Sonnet offre des capacités supérieures à celles d'Opus et une vitesse plus rapide que Sonnet, tout en maintenant le même prix que Sonnet. Sonnet excelle particulièrement dans la programmation, la science des données, le traitement visuel et les tâches d'agent."
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnet est le modèle le plus intelligent d'Anthropic à ce jour, et le premier modèle de raisonnement hybride sur le marché. Claude 3.7 Sonnet peut produire des réponses quasi instantanées ou un raisonnement prolongé, permettant aux utilisateurs de voir clairement ces processus. Sonnet excelle particulièrement dans la programmation, la science des données, le traitement visuel et les tâches d'agent."
511+
},
509512
"aya": {
510513
"description": "Aya 23 est un modèle multilingue lancé par Cohere, prenant en charge 23 langues, facilitant les applications linguistiques diversifiées."
511514
},

‎locales/it-IT/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "Nessun modello attivo. Vai alle impostazioni per attivarne uno.",
88+
"emptyProvider": "Nessun fornitore attivo, vai alle impostazioni per attivarlo",
89+
"goToSettings": "Vai alle impostazioni",
8890
"provider": "Provider"
8991
},
9092
"OllamaSetupGuide": {

‎locales/it-IT/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 Sonnet offre capacità superiori rispetto a Opus e una velocità maggiore rispetto a Sonnet, mantenendo lo stesso prezzo di Sonnet. Sonnet è particolarmente abile in programmazione, scienza dei dati, elaborazione visiva e compiti di agenzia."
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnet è il modello più intelligente di Anthropic fino ad oggi ed è il primo modello di ragionamento ibrido sul mercato. Claude 3.7 Sonnet può generare risposte quasi istantanee o pensieri prolungati e graduali, consentendo agli utenti di vedere chiaramente questi processi. Sonnet è particolarmente abile nella programmazione, nella scienza dei dati, nell'elaborazione visiva e nei compiti di agenzia."
511+
},
509512
"aya": {
510513
"description": "Aya 23 è un modello multilingue lanciato da Cohere, supporta 23 lingue, facilitando applicazioni linguistiche diversificate."
511514
},

‎locales/ja-JP/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "有効なモデルがありません。設定に移動して有効にしてください。",
88+
"emptyProvider": "有効なサービスプロバイダーがありません。設定に移動して有効にしてください。",
89+
"goToSettings": "設定に移動",
8890
"provider": "プロバイダー"
8991
},
9092
"OllamaSetupGuide": {

‎locales/ja-JP/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 SonnetはOpusを超える能力を提供し、Sonnetよりも速い速度を持ちながら、Sonnetと同じ価格を維持します。Sonnetは特にプログラミング、データサイエンス、視覚処理、代理タスクに優れています。"
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnetは、Anthropicがこれまでに開発した最も知能の高いモデルであり、市場で初めての混合推論モデルです。Claude 3.7 Sonnetは、ほぼ瞬時の応答や段階的な思考を生成することができ、ユーザーはこれらのプロセスを明確に見ることができます。Sonnetは特にプログラミング、データサイエンス、視覚処理、代理タスクに優れています。"
511+
},
509512
"aya": {
510513
"description": "Aya 23は、Cohereが提供する多言語モデルであり、23の言語をサポートし、多様な言語アプリケーションを便利にします。"
511514
},

‎locales/ko-KR/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "활성화된 모델이 없습니다. 설정으로 이동하여 활성화하세요",
88+
"emptyProvider": "활성화된 서비스 제공자가 없습니다. 설정으로 가서 활성화하세요.",
89+
"goToSettings": "설정으로 가기",
8890
"provider": "제공자"
8991
},
9092
"OllamaSetupGuide": {

‎locales/ko-KR/models.json

+3
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@
506506
"anthropic/claude-3.5-sonnet": {
507507
"description": "Claude 3.5 Sonnet은 Opus를 초월하는 능력과 Sonnet보다 더 빠른 속도를 제공하며, Sonnet과 동일한 가격을 유지합니다. Sonnet은 프로그래밍, 데이터 과학, 비주얼 처리 및 에이전트 작업에 특히 강합니다."
508508
},
509+
"anthropic/claude-3.7-sonnet": {
510+
"description": "Claude 3.7 Sonnet은 Anthropic이 지금까지 개발한 가장 지능적인 모델로, 시장에서 최초의 혼합 추론 모델입니다. Claude 3.7 Sonnet은 거의 즉각적인 응답이나 연장된 단계적 사고를 생성할 수 있으며, 사용자는 이러한 과정을 명확하게 볼 수 있습니다. Sonnet은 프로그래밍, 데이터 과학, 시각 처리, 대리 작업에 특히 뛰어납니다."
511+
},
509512
"aya": {
510513
"description": "Aya 23은 Cohere에서 출시한 다국어 모델로, 23개 언어를 지원하여 다양한 언어 응용에 편리함을 제공합니다."
511514
},

‎locales/nl-NL/components.json

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
},
8686
"ModelSwitchPanel": {
8787
"emptyModel": "No enabled model, please go to settings to enable.",
88+
"emptyProvider": "Geen ingeschakelde provider, ga naar instellingen om deze in te schakelen",
89+
"goToSettings": "Ga naar instellingen",
8890
"provider": "Provider"
8991
},
9092
"OllamaSetupGuide": {

0 commit comments

Comments
 (0)