From 509cbf3ce0ebb15ece49903b4a55a0966e2ed934 Mon Sep 17 00:00:00 2001 From: Fang_Zhijian Date: Mon, 19 May 2025 19:14:24 +0800 Subject: [PATCH] i18n, fix get netlist --- CHANGELOG.md | 13 +++ README.md | 5 +- extension.json | 22 +---- iframe/index.html | 108 ++++++++++++++---------- iframe/js/AI.js | 194 +++++++++++++++++++++++-------------------- locales/en.json | 24 +++++- locales/zh-Hans.json | 24 +++++- 7 files changed, 228 insertions(+), 162 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..f594e49 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,13 @@ +# 1.2.0-pre1 + +1. Commence the i18n work. +2. Modify the code to be compatible with the new `SCH_Netlist.getNetlist()` API. + +# 1.1.1 + +1. 输入框输入完成后可按回车发送 +2. 在关于增加了检查更新功能 + +# 1.1.0 + +第一个公开版本 diff --git a/README.md b/README.md index 275e692..819d253 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,9 @@ 3. 在正式使用前需要先配置模型，点击 `模型` 选择模型，点击 `设置` 进行 API 配置 - ![image](https://github.com/user-attachments/assets/82c2d88b-683a-4bad-ab85-616c8114aa57) -## 统计信息 +## 星星历史 [![Stargazers over time](https://starchart.cc/klxf/eda-copilot.svg?background=%23ffffff00&axis=%23ffffff&line=%23007bff)](https://starchart.cc/klxf/eda-copilot) @@ -30,3 +29,5 @@ GitHub License 本项目使用 [Apache License 2.0](https://choosealicense.com/licenses/apache-2.0/) 开源许可协议 + +本项目使用了 [Marked](https://github.com/markedjs/marked) 渲染对话 diff --git a/extension.json b/extension.json index a1ca444..51b42c6 100644 --- a/extension.json +++ b/extension.json @@ -3,8 +3,8 @@ "uuid": "30c8ce0d81f546fea716ea111c508ab2", "displayName": "EDA Copilot", "description": "嘉立创 EDA 多模态大模型 AI 助手", - "version": "1.1.1", - "publisher": "Mr_Fang ", + "version": "1.2.0", + "publisher": "Mr_Fang", "engines": { "eda": "^2.2.37" }, @@ -41,24 +41,6 @@ } ] } - ], - "pcb": [ - { - "id": "copilot-pcb", - "title": "Copilot", - "menuItems": [ - { - "id": "copilot-iframe", - "title": "打开聊天", - "registerFn": "openIframe" - }, - { - "id": "copilot-about", - "title": "关于...", - "registerFn": "openAbout" - } - ] - } ] } } diff --git a/iframe/index.html b/iframe/index.html index b696b16..58548c4 100644 --- a/iframe/index.html +++ b/iframe/index.html @@ -11,63 +11,63 @@
-
设置
+
设置
- + - + - +
- - + +
-
模型
+
模型
- +
- - + +
-
新的聊天
+
新的聊天
测试
-
有什么可以帮你的吗？
-
预设提示词
+
有什么可以帮你的吗？
+
预设提示词
@@ -114,35 +114,35 @@
+ +
@@ -172,7 +178,7 @@ // ok!! }) .catch((error) => { - eda.sys_Message.showToastMessage('本拓展需要启用外部交互权限！', 'error'); + eda.sys_Message.showToastMessage(eda.sys_I18n.text('toast.network_error'), 'error'); }); @@ -199,22 +205,13 @@ chatHistory = []; let clearChat = document.createElement('div'); clearChat.className = 'clear-chat'; - clearChat.innerHTML = '上下文已清除'; + clearChat.innerHTML = eda.sys_I18n.text('iframe.chat.context_cleared'); document.querySelector('.chat-body').appendChild(clearChat); document.querySelector('.chat-body').scrollTop = document.querySelector('.chat-body').scrollHeight; - CHAT_TITLE = '新的聊天'; + CHAT_TITLE = eda.sys_I18n.text('iframe.chat.default_title'); document.getElementById('title').innerText = CHAT_TITLE; }); - document.getElementById('test').addEventListener('click', function () { - getDatasheetUrl().then((url) => { - console.log(url); - getDatasheetData(url).then((data) => { - console.log(data); - }); - }); - }); - document.getElementById('chat-input').addEventListener('keypress', function (event) { if (event.key === 'Enter') { event.preventDefault(); @@ -260,7 +257,7 @@ chatHistory.push({ role: 'user', content: contents }); } - createBubble('user', message + (showImage ? `\n![图片](data:image/png;base64,${image})` : ''), undefined); + createBubble('user', message + (showImage ? `\n![Image](data:image/png;base64,${image})` : ''), undefined); input.value = ''; getAIResponse(chatHistory); }); @@ -323,6 +320,29 @@ }, 4000); } }); + + document.getElementById('test').addEventListener('click', function () { + getDatasheetUrl().then((url) => { + console.log(url); + getDatasheetData(url).then((data) => { + console.log(data); + }); + }); + }); + + + diff --git a/iframe/js/AI.js b/iframe/js/AI.js index 339c436..0ea1009 100644 --- a/iframe/js/AI.js +++ b/iframe/js/AI.js @@ -8,16 +8,16 @@ async function getAIResponse(contents) { document.querySelector('.chat-body').appendChild(thinking); document.querySelector('.chat-body').scrollTop = document.querySelector('.chat-body').scrollHeight; - if (MODEL_GROUP === "Gemini") { + if (MODEL_GROUP === 'Gemini') { response = await getGeminiResponse(contents); - } else if (MODEL_GROUP === "DeepSeek") { + } else if (MODEL_GROUP === 'DeepSeek') { response = await getDeepSeekResponse(contents); - } else if (MODEL_GROUP === "QWen") { + } else if (MODEL_GROUP === 'QWen') { response = await getQWenResponse(contents); - } else if (MODEL_GROUP === "Custom") { + } else if (MODEL_GROUP === 'Custom') { response = await getCustomResponse(contents); } else { - response = { err_code: 1, error: "模型不被支持" }; + response = { err_code: 1, error: '模型不被支持' }; } console.log(response); @@ -28,51 +28,54 @@ async function getAIResponse(contents) { content = content.replace(/\u003cthink\u003e/, '
').replace(/\u003c\/think\u003e/, '
'); createBubble('model', content, undefined); - if (MODEL_GROUP === "Gemini") { + if (MODEL_GROUP === 'Gemini') { chatHistory.push({ role: 'model', parts: [{ text: content }] }); - } else if (MODEL_GROUP === "DeepSeek" || MODEL_GROUP === "Qwen" || MODEL_GROUP === "Custom") { + } else if (MODEL_GROUP === 'DeepSeek' || MODEL_GROUP === 'Qwen' || MODEL_GROUP === 'Custom') { chatHistory.push({ role: 'assistant', content: content }); } - if (CHAT_TITLE === "新的对话") { + if (CHAT_TITLE === '新的对话') { let temp = chatHistory.slice(); - if (MODEL_GROUP === "Gemini") { - temp.push({ role: 'user', parts: [{ text: "用几个字总结这个对话，将其作为对话的标题" }] }); + if (MODEL_GROUP === 'Gemini') { + temp.push({ role: 'user', parts: [{ text: '用几个字总结这个对话，将其作为对话的标题' }] }); - getGeminiResponse(temp).then(response => { + getGeminiResponse(temp).then((response) => { if (response.err_code === 0) { const summary = response.response; CHAT_TITLE = summary.replace('*', ''); document.getElementById('title').innerText = summary; } }); - } else if (MODEL_GROUP === "DeepSeek") { - temp.push({ role: 'user', content: "用几个字总结这个对话，将其作为对话的标题，除此以外不要有任何其他文字" }); + } else if (MODEL_GROUP === 'DeepSeek') { + temp.push({ role: 'user', content: '用几个字总结这个对话，将其作为对话的标题，除此以外不要有任何其他文字' }); - getDeepSeekResponse(temp).then(response => { + getDeepSeekResponse(temp).then((response) => { if (response.err_code === 0) { const summary = response.response; CHAT_TITLE = summary.replace(/\u003cthink\u003e.*\u003c\/think\u003e/ms, '').replace('*', ''); document.getElementById('title').innerText = CHAT_TITLE; } }); - } else if (MODEL_GROUP === "QWen") { - temp.push({ role: 'user', content: "用几个字总结这个对话，将其作为对话的标题，除此以外不要有任何其他文字" }); + } else if (MODEL_GROUP === 'QWen') { + temp.push({ role: 'user', content: '用几个字总结这个对话，将其作为对话的标题，除此以外不要有任何其他文字' }); - getQWenResponse(temp).then(response => { + getQWenResponse(temp).then((response) => { if (response.err_code === 0) { const summary = response.response; CHAT_TITLE = summary.replace(/\u003cthink\u003e.*\u003c\/think\u003e/ms, '').replace('*', ''); document.getElementById('title').innerText = CHAT_TITLE; } }); - } else if (MODEL_GROUP === "Custom") { - temp.push({ role: 'user', content: "用几个字总结这个对话，将其作为对话的标题，除此以外不要有任何其他文字" }); + } else if (MODEL_GROUP === 'Custom') { + temp.push({ role: 'user', content: '用几个字总结这个对话，将其作为对话的标题，除此以外不要有任何其他文字' }); getCustomResponse(temp).then((response) => { if (response.err_code === 0) { const summary = response.response; - CHAT_TITLE = summary.replace(/.*<\/think>/ms, '').replaceAll('*', '').replaceAll('\n', ''); + CHAT_TITLE = summary + .replace(/.*<\/think>/ms, '') + .replaceAll('*', '') + .replaceAll('\n', ''); document.getElementById('title').innerText = CHAT_TITLE; } }); @@ -80,78 +83,76 @@ async function getAIResponse(contents) { } } else { document.getElementById('thinking').remove(); - createBubble('model', response.error, "异常"); + createBubble('model', response.error, '异常'); } } // eslint-disable-next-line @typescript-eslint/no-unused-vars async function setAICache(cache) { - if (MODEL_GROUP === "Gemini" && MODEL_NAME !== "gemini-2.0-flash-001") { + if (MODEL_GROUP === 'Gemini' && MODEL_NAME !== 'gemini-2.0-flash-001') { return await setGeminiCache(cache); - } else if (MODEL_GROUP === "QWen" || MODEL_GROUP === "DeepSeek" || MODEL_GROUP === "Custom") { + } else if (MODEL_GROUP === 'QWen' || MODEL_GROUP === 'DeepSeek' || MODEL_GROUP === 'Custom') { return await setOtherCache(decodeURIComponent(atob(cache))); - } else if (MODEL_GROUP === "Gemini" && MODEL_NAME === "gemini-2.0-flash-001") { + } else if (MODEL_GROUP === 'Gemini' && MODEL_NAME === 'gemini-2.0-flash-001') { return await setOtherCache(decodeURIComponent(atob(cache))); } else { - createBubble('model', "抱歉，该模型不支持缓存长上下文", "异常"); + createBubble('model', '抱歉，该模型不支持缓存长上下文', '异常'); } } async function getGeminiResponse(contents) { - const API = GOOGLE_SETTINGS.HOST + "/v1beta/models/" + MODEL_NAME + ":generateContent?key=" + GOOGLE_SETTINGS.API_KEY; + const API = GOOGLE_SETTINGS.HOST + '/v1beta/models/' + MODEL_NAME + ':generateContent?key=' + GOOGLE_SETTINGS.API_KEY; console.log(chatHistory); const data = { - contents: [ - contents - ], + contents: [contents], safetySettings: [ [ { - "category": "HARM_CATEGORY_HARASSMENT", - "threshold": "BLOCK_ONLY_HIGH" + 'category': 'HARM_CATEGORY_HARASSMENT', + 'threshold': 'BLOCK_ONLY_HIGH', }, { - "category": "HARM_CATEGORY_HATE_SPEECH", - "threshold": "BLOCK_ONLY_HIGH" + 'category': 'HARM_CATEGORY_HATE_SPEECH', + 'threshold': 'BLOCK_ONLY_HIGH', }, { - "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", - "threshold": "BLOCK_ONLY_HIGH" + 'category': 'HARM_CATEGORY_SEXUALLY_EXPLICIT', + 'threshold': 'BLOCK_ONLY_HIGH', }, { - "category": "HARM_CATEGORY_DANGEROUS_CONTENT", - "threshold": "BLOCK_ONLY_HIGH" - } - ] - ] + 'category': 'HARM_CATEGORY_DANGEROUS_CONTENT', + 'threshold': 'BLOCK_ONLY_HIGH', + }, + ], + ], }; if (CACHE_NAME !== null) { data.cachedContent = CACHE_NAME; } else { - data.systemInstruction = { parts: [{ "text": "You are an electronic engineer. Use Chinese to answer." }] } + data.systemInstruction = { parts: [{ 'text': 'You are an electronic engineer. Use Chinese to answer.' }] }; } try { - const response = await eda.sys_ClientUrl.request(API, "POST", JSON.stringify(data), { headers: GOOGLE_SETTINGS.HEADER }); + const response = await eda.sys_ClientUrl.request(API, 'POST', JSON.stringify(data), { headers: GOOGLE_SETTINGS.HEADER }); if (response.status !== 200) { throw new Error(response.statusText); } const result = await response.json(); return { response: result.candidates[0].content.parts[0].text, - err_code: 0 + err_code: 0, }; } catch (error) { return { - error: error.message || "请求失败", - err_code: 1 + error: error.message || '请求失败', + err_code: 1, }; } } async function getDeepSeekResponse(contents) { - const API = DS_SETTINGS.HOST + "/chat/completions"; + const API = DS_SETTINGS.HOST + '/chat/completions'; let HEADERS = DS_SETTINGS.HEADER; HEADERS['Authorization'] = 'Bearer ' + DS_SETTINGS.API_KEY; @@ -159,29 +160,29 @@ async function getDeepSeekResponse(contents) { const data = { model: MODEL_NAME, messages: contents, - stream: false - } + stream: false, + }; try { - const response = await eda.sys_ClientUrl.request(API, "POST", JSON.stringify(data), { headers: HEADERS }); + const response = await eda.sys_ClientUrl.request(API, 'POST', JSON.stringify(data), { headers: HEADERS }); if (response.status !== 200) { throw new Error(response.statusText); } const result = await response.json(); return { response: result.choices[0].message.content, - err_code: 0 + err_code: 0, }; } catch (error) { return { - error: error.message || "请求失败", - err_code: 1 + error: error.message || '请求失败', + err_code: 1, }; } } async function getQWenResponse(contents) { - const API = QWEN_SETTINGS.HOST + "/compatible-mode/v1/chat/completions"; + const API = QWEN_SETTINGS.HOST + '/compatible-mode/v1/chat/completions'; let HEADERS = QWEN_SETTINGS.HEADER; HEADERS['Authorization'] = 'Bearer ' + QWEN_SETTINGS.API_KEY; @@ -189,22 +190,22 @@ async function getQWenResponse(contents) { const data = { model: MODEL_NAME, messages: contents, - } + }; try { - const response = await eda.sys_ClientUrl.request(API, "POST", JSON.stringify(data), { headers: HEADERS }); + const response = await eda.sys_ClientUrl.request(API, 'POST', JSON.stringify(data), { headers: HEADERS }); if (response.status !== 200) { throw new Error(response.statusText); } const result = await response.json(); return { response: result.choices[0].message.content, - err_code: 0 + err_code: 0, }; } catch (error) { return { - error: error.message || "请求失败", - err_code: 1 + error: error.message || '请求失败', + err_code: 1, }; } } @@ -215,43 +216,49 @@ async function getCustomResponse(contents) { const data = { model: CUSTOM_SETTINGS.MODEL, messages: contents, - stream: false - } + stream: false, + }; try { - const response = await eda.sys_ClientUrl.request(API, "POST", JSON.stringify(data), { headers: CUSTOM_SETTINGS.HEADER }); + const response = await eda.sys_ClientUrl.request(API, 'POST', JSON.stringify(data), { headers: CUSTOM_SETTINGS.HEADER }); if (response.status !== 200) { throw new Error(response.statusText); } const result = await response.json(); return { response: result.choices[0].message.content, - err_code: 0 + err_code: 0, }; } catch (error) { return { - error: error.message || "请求失败", - err_code: 1 + error: error.message || '请求失败', + err_code: 1, }; } } async function setGeminiCache(cache) { - let API = GOOGLE_SETTINGS.HOST + "/v1beta/cachedContents?key=" + GOOGLE_SETTINGS.API_KEY; + let API = GOOGLE_SETTINGS.HOST + '/v1beta/cachedContents?key=' + GOOGLE_SETTINGS.API_KEY; const data = { - model: "models/" + MODEL_NAME, + model: 'models/' + MODEL_NAME, contents: [ - { role: 'user', parts: [{ inline_data: { mime_type: "text/plain", data: cache} }, {text: "Here's a netlist file describing the circuit diagram, and I'm going to ask you questions about it."}] } + { + role: 'user', + parts: [ + { inline_data: { mime_type: 'text/plain', data: cache } }, + { text: "Here's a netlist file describing the circuit diagram, and I'm going to ask you questions about it." }, + ], + }, ], systemInstruction: { parts: [ { - "text": "You are an electronic engineer. The text describes a netlist of circuit diagrams. When asked a question about a component, it is displayed if there is a URL in the netlist, otherwise it is not. Use Chinese to answer." - } - ] + 'text': 'You are an electronic engineer. The text describes a netlist of circuit diagrams. When asked a question about a component, it is displayed if there is a URL in the netlist, otherwise it is not. Use Chinese to answer.', + }, + ], }, - } + }; let thinking = document.createElement('div'); thinking.className = 'message-bubble model'; @@ -260,31 +267,35 @@ async function setGeminiCache(cache) { document.querySelector('.chat-body').appendChild(thinking); document.querySelector('.chat-body').scrollTop = document.querySelector('.chat-body').scrollHeight; - eda.sys_ClientUrl.request(API, "POST", JSON.stringify(data), { headers: GOOGLE_SETTINGS.HEADER }).then(response => { - if (response.status !== 200) { - throw new Error(response.statusText); - } - return response.json(); - }).then(result => { - document.getElementById('thinking').remove(); - createBubble('model', "好的，接下来你可以围绕这张原理图向我提问", undefined); - CACHE_NAME = result.name; - }).catch(error => { - document.getElementById('thinking').remove(); - createBubble('model', error.toString(), "异常"); - }); + eda.sys_ClientUrl + .request(API, 'POST', JSON.stringify(data), { headers: GOOGLE_SETTINGS.HEADER }) + .then((response) => { + if (response.status !== 200) { + throw new Error(response.statusText); + } + return response.json(); + }) + .then((result) => { + document.getElementById('thinking').remove(); + createBubble('model', '好的，接下来你可以围绕这张原理图向我提问', undefined); + CACHE_NAME = result.name; + }) + .catch((error) => { + document.getElementById('thinking').remove(); + createBubble('model', error.toString(), '异常'); + }); } async function setOtherCache(cache) { chatHistory.push({ role: 'user', content: '这是一个电路图的网表，后续回答依照这个网表回答：' + cache }); - chatHistory.push({ role: 'assistant', content: '好的，我了解了'}); + chatHistory.push({ role: 'assistant', content: '好的，我了解了' }); } // eslint-disable-next-line @typescript-eslint/no-unused-vars function getNetlist() { let netlist = ''; - eda.sch_Netlist.getNetlist().then(data => { - netlist = data[0].toString(); + eda.sch_Netlist.getNetlist().then((data) => { + netlist = data.toString(); const cache = btoa(encodeURIComponent(netlist)); // 获取 cache 的字节数 let size = cache.length; @@ -306,17 +317,17 @@ function getNetlist() { `; document.querySelector('.chat-body').appendChild(fileBubble); setAICache(cache); - }) - + }); } // eslint-disable-next-line @typescript-eslint/no-unused-vars async function setAIFile() { - if (MODEL_GROUP !== "Gemini") { + if (MODEL_GROUP !== 'Gemini') { eda.sys_Message.showToastMessage('当前模型尚未支持该功能', 'warn'); return; } - const file = await eda.sys_FileSystem.openReadFileDialog("pdf"); + + const file = await eda.sys_FileSystem.openReadFileDialog('.pdf'); const reader = new FileReader(); reader.onload = function (event) { const base64 = event.target.result; @@ -386,4 +397,3 @@ async function getDatasheetData(url) { return null; } } - diff --git a/locales/en.json b/locales/en.json index 2db1cdd..f687d86 100644 --- a/locales/en.json +++ b/locales/en.json @@ -1,4 +1,24 @@ { - "About": "About", - "EasyEDA extension SDK v": "EasyEDA extension SDK v${1}" + "iframe.settings.title": "Settings", + "iframe.settings.api_host": "API Host", + "iframe.settings.api_key": "API Key", + "iframe.settings.header": "Request Header", + "iframe.settings.endpoint": "Endpoint", + "iframe.settings.model": "Model", + "iframe.settings.model.choose": "Choose Model", + "iframe.settings.model.custom": "Custom", + "iframe.button.cancel": "Cancel", + "iframe.button.save": "Save", + "iframe.button.analysis_netlist": "Netlist", + "iframe.button.add_file": "Add File", + "iframe.button.new_chat": "New Chat", + "iframe.button.model": "Model", + "iframe.button.setting": "Settings", + "iframe.button.send": "Send", + "iframe.chat.default_title": "New Chat", + "iframe.chat.default_message": "Can I help you?", + "iframe.chat.default_message_meta": "Prompt", + "iframe.chat.context_cleared": "Context Cleared", + "iframe.input.chat_input": "Send image, file or netlist can resolve complex issues.", + "toast.network_error": "This extension requires enabling the 'External Interactions' permission!" } diff --git a/locales/zh-Hans.json b/locales/zh-Hans.json index 8a298c5..cd69a3a 100644 --- a/locales/zh-Hans.json +++ b/locales/zh-Hans.json @@ -1,4 +1,24 @@ { - "About": "关于", - "EasyEDA extension SDK v": "嘉立创EDA 扩展 SDK v${1}" + "iframe.settings": "设置", + "iframe.settings.api_host": "接口地址", + "iframe.settings.api_key": "API Key", + "iframe.settings.header": "自定义请求头", + "iframe.settings.endpoint": "终结点", + "iframe.settings.model": "模型", + "iframe.settings.model.choose": "选择模型", + "iframe.settings.model.custom": "自定义", + "iframe.button.cancel": "取消", + "iframe.button.save": "保存", + "iframe.button.analysis_netlist": "解析网表", + "iframe.button.add_file": "添加文件", + "iframe.button.new_chat": "新的聊天", + "iframe.button.model": "模型", + "iframe.button.setting": "设置", + "iframe.button.send": "发送", + "iframe.chat.default_title": "新的聊天", + "iframe.chat.default_message": "有什么可以帮你的吗？", + "iframe.chat.default_message_meta": "预设提示词", + "iframe.chat.context_cleared": "上下文已清除", + "iframe.input.chat_input": "解析网表、上传图片或文件可解决复杂问题", + "toast.network_error": "本拓展需要启用外部交互权限！" }