Skip to content

Commit 6877a1b

Browse files
josStorerjosStorer
committed
improve 4881700 
1 parent c496f87 commit 6877a1b

File tree

22 files changed

+134
-184
lines changed

22 files changed

+134
-184
lines changed

‎src/_locales/de/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "Immer das schwebende Fenster anzeigen, die Seitenleiste für alle Website-Adapter deaktivieren",
147147
"Allow ESC to close all floating windows": "ESC-Taste zum Schließen aller schwebenden Fenster zulassen",
148148
"Export All Data": "Alle Daten exportieren",
149-
"Import All Data": "Alle Daten importieren"
149+
"Import All Data": "Alle Daten importieren",
150+
"Keep-Alive Time": "Keep-Alive-Zeit",
151+
"5m": "5m",
152+
"30m": "30m",
153+
"Forever": "Für immer"
150154
}

‎src/_locales/en/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "Always display floating window, disable sidebar for all site adapters",
147147
"Allow ESC to close all floating windows": "Allow ESC to close all floating windows",
148148
"Export All Data": "Export All Data",
149-
"Import All Data": "Import All Data"
149+
"Import All Data": "Import All Data",
150+
"Keep-Alive Time": "Keep-Alive Time",
151+
"5m": "5m",
152+
"30m": "30m",
153+
"Forever": "Forever"
150154
}

‎src/_locales/es/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "Mostrar siempre la ventana flotante, desactivar la barra lateral para todos los adaptadores de sitios",
147147
"Allow ESC to close all floating windows": "Permitir que ESC cierre todas las ventanas flotantes",
148148
"Export All Data": "Exportar todos los datos",
149-
"Import All Data": "Importar todos los datos"
149+
"Import All Data": "Importar todos los datos",
150+
"Keep-Alive Time": "Tiempo de mantenimiento de la conexión",
151+
"5m": "5m",
152+
"30m": "30m",
153+
"Forever": "Siempre"
150154
}

‎src/_locales/fr/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "Toujours afficher la fenêtre flottante, désactiver la barre latérale pour tous les adaptateurs de site",
147147
"Allow ESC to close all floating windows": "Autoriser la touche ESC pour fermer toutes les fenêtres flottantes",
148148
"Export All Data": "Exporter toutes les données",
149-
"Import All Data": "Importer toutes les données"
149+
"Import All Data": "Importer toutes les données",
150+
"Keep-Alive Time": "Temps de maintien de la connexion",
151+
"5m": "5m",
152+
"30m": "30m",
153+
"Forever": "Toujours"
150154
}

‎src/_locales/in/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "Selalu tampilkan jendela mengambang, nonaktifkan sidebar untuk semua adapter situs",
147147
"Allow ESC to close all floating windows": "Izinkan ESC untuk menutup semua jendela mengambang",
148148
"Export All Data": "Ekspor Semua Data",
149-
"Import All Data": "Impor Semua Data"
149+
"Import All Data": "Impor Semua Data",
150+
"Keep-Alive Time": "Waktu Tetap Hidup",
151+
"5m": "5m",
152+
"30m": "30m",
153+
"Forever": "Selamanya"
150154
}

‎src/_locales/it/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "Mostra sempre la finestra flottante, disabilita la barra laterale per tutti gli adattatori del sito",
147147
"Allow ESC to close all floating windows": "Consenti ESC per chiudere tutte le finestre flottanti",
148148
"Export All Data": "Esporta tutti i dati",
149-
"Import All Data": "Importa tutti i dati"
149+
"Import All Data": "Importa tutti i dati",
150+
"Keep-Alive Time": "Tempo di mantenimento",
151+
"5m": "5m",
152+
"30m": "30m",
153+
"Forever": "Per sempre"
150154
}

‎src/_locales/ja/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "常にフローティングウィンドウを表示し、すべてのサイトアダプターでサイドバーを無効にします",
147147
"Allow ESC to close all floating windows": "ESCキーですべてのフローティングウィンドウを閉じる",
148148
"Export All Data": "すべてのデータをエクスポート",
149-
"Import All Data": "すべてのデータをインポート"
149+
"Import All Data": "すべてのデータをインポート",
150+
"Keep-Alive Time": "Keep-Alive時間",
151+
"5m": "5分",
152+
"30m": "30分",
153+
"Forever": "永久"
150154
}

‎src/_locales/ko/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "항상 떠다니는 창을 표시하고 모든 사이트 어댑터의 사이드바를 비활성화합니다",
147147
"Allow ESC to close all floating windows": "ESC를 눌러 모든 떠다니는 창을 닫도록 허용",
148148
"Export All Data": "모든 데이터 내보내기",
149-
"Import All Data": "모든 데이터 가져오기"
149+
"Import All Data": "모든 데이터 가져오기",
150+
"Keep-Alive Time": "Keep-Alive 시간",
151+
"5m": "5분",
152+
"30m": "30분",
153+
"Forever": "영원히"
150154
}

‎src/_locales/pt/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "Sempre exibir janela flutuante, desativar barra lateral para todos os adaptadores de site",
147147
"Allow ESC to close all floating windows": "Permitir ESC para fechar todas as janelas flutuantes",
148148
"Export All Data": "Exportar Todos os Dados",
149-
"Import All Data": "Importar Todos os Dados"
149+
"Import All Data": "Importar Todos os Dados",
150+
"Keep-Alive Time": "Tempo de Manutenção de Conexão",
151+
"5m": "5m",
152+
"30m": "30m",
153+
"Forever": "Para sempre"
150154
}

‎src/_locales/ru/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "Всегда отображать плавающее окно, отключить боковую панель для всех адаптеров сайтов",
147147
"Allow ESC to close all floating windows": "Разрешить ESC для закрытия всех плавающих окон",
148148
"Export All Data": "Экспорт всех данных",
149-
"Import All Data": "Импорт всех данных"
149+
"Import All Data": "Импорт всех данных",
150+
"Keep-Alive Time": "Время поддержания активности",
151+
"5m": "5m",
152+
"30m": "30m",
153+
"Forever": "Вечно"
150154
}

‎src/_locales/tr/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "Her zaman kayan pencereyi görüntüle, tüm site adaptörleri için kenar çubuğunu devre dışı bırak",
147147
"Allow ESC to close all floating windows": "ESC tuşuyla tüm kayan pencereleri kapatmaya izin ver",
148148
"Export All Data": "Tüm Verileri Dışa Aktar",
149-
"Import All Data": "Tüm Verileri İçe Aktar"
149+
"Import All Data": "Tüm Verileri İçe Aktar",
150+
"Keep-Alive Time": "Canlı Tutma Süresi",
151+
"5m": "5m",
152+
"30m": "30m",
153+
"Forever": "Sonsuza dek"
150154
}

‎src/_locales/zh-hans/main.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
"ChatGPT (GPT-4-8k)": "ChatGPT (GPT-4-8k)",
7878
"ChatGPT (GPT-4-32k)": "ChatGPT (GPT-4-32k)",
7979
"GPT-3.5": "GPT-3.5",
80-
"Ollama API": "Ollama API",
8180
"Custom Model": "自定义模型",
8281
"Balanced": "平衡",
8382
"Creative": "有创造力",
@@ -148,8 +147,7 @@
148147
"Allow ESC to close all floating windows": "允许按ESC关闭所有浮动窗口",
149148
"Export All Data": "导出所有数据",
150149
"Import All Data": "导入所有数据",
151-
"Temperature": "温度",
152-
"keep-alive Time": "保活时间",
150+
"Keep-Alive Time": "保活时间",
153151
"5m": "5分钟",
154152
"30m": "半小时",
155153
"Forever": "永久"

‎src/_locales/zh-hant/main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,5 +146,9 @@
146146
"Always display floating window, disable sidebar for all site adapters": "總是顯示浮動視窗，停用所有網站適配器的側邊欄",
147147
"Allow ESC to close all floating windows": "允許按 ESC 關閉所有浮動視窗",
148148
"Export All Data": "匯出所有資料",
149-
"Import All Data": "匯入所有資料"
149+
"Import All Data": "匯入所有資料",
150+
"Keep-Alive Time": "保持連線時間",
151+
"5m": "5 分鐘",
152+
"30m": "30 分鐘",
153+
"Forever": "永遠"
150154
}

‎src/background/index.mjs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,7 @@ async function executeApi(session, port, config) {
127127
config.customModelName,
128128
)
129129
} else if (ollamaApiModelKeys.includes(session.modelName)) {
130-
await generateAnswersWithOllamaApi(
131-
port,
132-
session.question,
133-
session,
134-
config.ollamaApiKey,
135-
config.ollamaModelName,
136-
)
130+
await generateAnswersWithOllamaApi(port, session.question, session)
137131
} else if (azureOpenAiApiModelKeys.includes(session.modelName)) {
138132
await generateAnswersWithAzureOpenaiApi(port, session.question, session)
139133
} else if (claudeApiModelKeys.includes(session.modelName)) {

‎src/config/index.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@ export const defaultConfig = {
251251

252252
ollamaEndpoint: 'http://127.0.0.1:11434',
253253
ollamaModelName: 'llama3.1',
254-
keepAliveTime: '5m',
254+
ollamaApiKey: '',
255+
ollamaKeepAliveTime: '5m',
255256

256257
// advanced
257258

‎src/popup/sections/AdvancedPart.jsx

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import '../styles.scss'
21
import { useTranslation } from 'react-i18next'
32
import { parseFloatWithClamp, parseIntWithClamp } from '../../utils/index.mjs'
4-
import { isUsingOllamaModel } from '../../config/index.mjs'
53
import PropTypes from 'prop-types'
64
import { Tab, TabList, TabPanel, Tabs } from 'react-tabs'
75
import Browser from 'webextension-polyfill'
@@ -58,49 +56,6 @@ function ApiParams({ config, updateConfig }) {
5856
}}
5957
/>
6058
</label>
61-
{isUsingOllamaModel(config) && (
62-
<label>
63-
{`${t('keep-alive Time')}: `}
64-
<div className="label-group">
65-
<label>
66-
<input
67-
type="radio"
68-
name="keepAliveTime"
69-
value="5m"
70-
checked={config.keepAliveTime === '5m'}
71-
onChange={(e) => {
72-
updateConfig({ keepAliveTime: e.target.value })
73-
}}
74-
/>
75-
{t('5m')}
76-
</label>
77-
<label>
78-
<input
79-
type="radio"
80-
name="keepAliveTime"
81-
value="30m"
82-
checked={config.keepAliveTime === '30m'}
83-
onChange={(e) => {
84-
updateConfig({ keepAliveTime: e.target.value })
85-
}}
86-
/>
87-
{t('30m')}
88-
</label>
89-
<label>
90-
<input
91-
type="radio"
92-
name="keepAliveTime"
93-
value="-1"
94-
checked={config.keepAliveTime === '-1'}
95-
onChange={(e) => {
96-
updateConfig({ keepAliveTime: e.target.value })
97-
}}
98-
/>
99-
{t('Forever')}
100-
</label>
101-
</div>
102-
</label>
103-
)}
10459
</>
10560
)
10661
}

‎src/popup/sections/GeneralPart.jsx

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,47 @@ export function GeneralPart({ config, updateConfig }) {
350350
}}
351351
/>
352352
)}
353+
{isUsingOllamaModel(config) && (
354+
<div style={{ display: 'flex', gap: '10px' }}>
355+
{t('Keep-Alive Time') + ':'}
356+
<label>
357+
<input
358+
type="radio"
359+
name="ollamaKeepAliveTime"
360+
value="5m"
361+
checked={config.ollamaKeepAliveTime === '5m'}
362+
onChange={(e) => {
363+
updateConfig({ ollamaKeepAliveTime: e.target.value })
364+
}}
365+
/>
366+
{t('5m')}
367+
</label>
368+
<label>
369+
<input
370+
type="radio"
371+
name="ollamaKeepAliveTime"
372+
value="30m"
373+
checked={config.ollamaKeepAliveTime === '30m'}
374+
onChange={(e) => {
375+
updateConfig({ ollamaKeepAliveTime: e.target.value })
376+
}}
377+
/>
378+
{t('30m')}
379+
</label>
380+
<label>
381+
<input
382+
type="radio"
383+
name="ollamaKeepAliveTime"
384+
value="-1"
385+
checked={config.ollamaKeepAliveTime === '-1'}
386+
onChange={(e) => {
387+
updateConfig({ ollamaKeepAliveTime: e.target.value })
388+
}}
389+
/>
390+
{t('Forever')}
391+
</label>
392+
</div>
393+
)}
353394
{isUsingOllamaModel(config) && (
354395
<input
355396
type="text"

‎src/popup/styles.scss

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@
2323
--active-color: #eaecf0;
2424
}
2525

26-
#app {
27-
max-width: 600px;
28-
margin: 0 auto;
29-
}
30-
3126
.container-page-mode {
3227
display: flex;
3328
flex-direction: column;
@@ -63,7 +58,6 @@
6358
}
6459

6560
.footer {
66-
max-width: 580px;
6761
width: 90%;
6862
position: fixed;
6963
bottom: 10px;
@@ -94,12 +88,3 @@
9488
background: var(--active-color);
9589
}
9690
}
97-
98-
.label-group {
99-
display: flex;
100-
align-items: center;
101-
}
102-
103-
.label-group label {
104-
margin-right: 10px;
105-
}

0 commit comments

Comments
 (0)