Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: [ut] Fixed some issues #1066

Merged
merged 1 commit into from
Jan 20, 2025
Merged

fix: [ut] Fixed some issues #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 32 additions & 27 deletions assets/translations/en_US.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4123,52 +4123,62 @@ repos path: %0</source>
<context>
<name>ProjectTreeView</name>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="133"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="91"/>
<source>Open File</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="140"/>
<source>Generate UT</source>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="100"/>
<source>Regenerate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="145"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="102"/>
<source>Continue To Generate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="104"/>
<source>Generate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="109"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="148"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="112"/>
<source>Unignore</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="150"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="114"/>
<source>Ignore</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="152"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="116"/>
<source>Show Containing Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="161"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="172"/>
<source>Collapse</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="163"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="174"/>
<source>Expand</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="164"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="175"/>
<source>Collapse All</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="165"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="176"/>
<source>Expand All</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -6733,37 +6743,32 @@ not exists support files: %0</source>
<context>
<name>SmartUTWidget</name>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="72"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="79"/>
<source>The current resource is not configured</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="82"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="89"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please click the Setting button &quot;%1&quot; in the upper right corner to configure&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="120"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="127"/>
<source>Generate unit test files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="121"/>
<source>Run</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="122"/>
<source>Generate coverage report</source>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="128"/>
<source>Continue to generate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="123"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="129"/>
<source>Stop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="128"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="134"/>
<source>Select Model:</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -7010,21 +7015,21 @@ not exists support files: %0</source>
<context>
<name>TaskDelegate</name>
<message>
<location filename="../../src/plugins/builder/tasks/taskdelegate.cpp" line="211"/>
<location filename="../../src/plugins/builder/tasks/taskdelegate.cpp" line="223"/>
<source>File not found: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>TaskManager</name>
<message>
<location filename="../../src/plugins/builder/tasks/taskmanager.cpp" line="102"/>
<location filename="../../src/plugins/builder/tasks/taskmanager.cpp" line="108"/>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/plugins/builder/tasks/taskmanager.cpp" line="103"/>
<source>Fix Issue</source>
<location filename="../../src/plugins/builder/tasks/taskmanager.cpp" line="111"/>
<source>Smart Analysis</source>
<translation type="unfinished"></translation>
</message>
</context>
Expand Down
65 changes: 35 additions & 30 deletions assets/translations/zh_CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4160,52 +4160,62 @@ repos path: %0</source>
<context>
<name>ProjectTreeView</name>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="133"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="91"/>
<source>Open File</source>
<translation>打开文件</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="140"/>
<source>Generate UT</source>
<translation>生成单元测试</translation>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="100"/>
<source>Regenerate</source>
<translation>重新生成</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="102"/>
<source>Continue To Generate</source>
<translation>继续生成</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="104"/>
<source>Generate</source>
<translation>生成</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="145"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="109"/>
<source>Stop</source>
<translation>停止</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="148"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="112"/>
<source>Unignore</source>
<translation>取消忽略</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="150"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="114"/>
<source>Ignore</source>
<translation>忽略</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="152"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="116"/>
<source>Show Containing Folder</source>
<translation>显示所在文件夹</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="161"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="172"/>
<source>Collapse</source>
<translation>折叠</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="163"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="174"/>
<source>Expand</source>
<translation>展开</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="164"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="175"/>
<source>Collapse All</source>
<translation>折叠所有</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="165"/>
<location filename="../../src/plugins/smartut/gui/projecttreeview.cpp" line="176"/>
<source>Expand All</source>
<translation>展开所有</translation>
</message>
Expand Down Expand Up @@ -6779,37 +6789,32 @@ not exists support files: %0</source>
<context>
<name>SmartUTWidget</name>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="72"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="79"/>
<source>The current resource is not configured</source>
<translation>当前资源信息未配置</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="82"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="89"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please click the Setting button &quot;%1&quot; in the upper right corner to configure&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;请点击右上角的的设置按钮“%1”进行配置&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="120"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="127"/>
<source>Generate unit test files</source>
<translation>生成单元测试文件</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="121"/>
<source>Run</source>
<translation>运行</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="122"/>
<source>Generate coverage report</source>
<translation>生成覆盖率报告</translation>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="128"/>
<source>Continue to generate</source>
<translation>继续生成</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="123"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="129"/>
<source>Stop</source>
<translation>停止</translation>
</message>
<message>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="128"/>
<location filename="../../src/plugins/smartut/gui/smartutwidget.cpp" line="134"/>
<source>Select Model:</source>
<translation>选择模型：</translation>
</message>
Expand Down Expand Up @@ -7056,22 +7061,22 @@ not exists support files: %0</source>
<context>
<name>TaskDelegate</name>
<message>
<location filename="../../src/plugins/builder/tasks/taskdelegate.cpp" line="211"/>
<location filename="../../src/plugins/builder/tasks/taskdelegate.cpp" line="223"/>
<source>File not found: %1</source>
<translation>找不到文件：%1</translation>
</message>
</context>
<context>
<name>TaskManager</name>
<message>
<location filename="../../src/plugins/builder/tasks/taskmanager.cpp" line="102"/>
<location filename="../../src/plugins/builder/tasks/taskmanager.cpp" line="108"/>
<source>Clear</source>
<translation>清除</translation>
</message>
<message>
<location filename="../../src/plugins/builder/tasks/taskmanager.cpp" line="103"/>
<source>Fix Issue</source>
<translation>修复问题</translation>
<location filename="../../src/plugins/builder/tasks/taskmanager.cpp" line="111"/>
<source>Smart Analysis</source>
<translation>智能分析</translation>
</message>
</context>
<context>
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/aimanager/openai/openaicompatiblellm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class OpenAiCompatibleLLMPrivate
QNetworkReply *getMessage(const QString &url, const QString &apiKey);
void replyMessage(const QString &data, AbstractLLM::ResponseState state, AbstractLLM::ResponseHandler handler);
void processResponse(QNetworkReply *reply, AbstractLLM::ResponseHandler handler = nullptr);
void handleReplyFinished(QNetworkReply *reply);
void handleReplyFinished(QNetworkReply *reply, AbstractLLM::ResponseHandler handler = nullptr);

QString modelName { "" };
QString modelPath { "" };
Expand Down Expand Up @@ -161,13 +161,13 @@ void OpenAiCompatibleLLMPrivate::processResponse(QNetworkReply *reply, AbstractL
});
}

void OpenAiCompatibleLLMPrivate::handleReplyFinished(QNetworkReply *reply)
void OpenAiCompatibleLLMPrivate::handleReplyFinished(QNetworkReply *reply, AbstractLLM::ResponseHandler handler)
{
if (q->modelState() == AbstractLLM::Idle) // llm is alread stopped
return;
if (reply->error()) {
qWarning() << "NetWork Error: " << reply->errorString();
emit q->dataReceived(reply->errorString(), AbstractLLM::ResponseState::Failed);
replyMessage(reply->errorString(), AbstractLLM::Failed, handler);
}
q->setModelState(AbstractLLM::Idle);
}
Expand Down Expand Up @@ -296,7 +296,7 @@ void OpenAiCompatibleLLM::request(const QString &prompt, ResponseHandler handler
QNetworkReply *reply = d->postMessage(modelPath() + "/completions", d->apiKey, QJsonDocument(dataObject).toJson());
connect(this, &OpenAiCompatibleLLM::requstCancel, reply, &QNetworkReply::abort);
connect(reply, &QNetworkReply::finished, this, [=](){
d->handleReplyFinished(reply);
d->handleReplyFinished(reply, handler);
});

d->processResponse(reply, handler);
Expand Down
1 change: 1 addition & 0 deletions src/plugins/builder/builder.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
<file>texts/rebuild_16px.svg</file>
<file>texts/filter_16px.svg</file>
<file>texts/clear_log_16px.svg</file>
<file>texts/uc_repair_16px.svg</file>
</qresource>
</RCC>
3 changes: 1 addition & 2 deletions src/plugins/builder/mainframe/settingdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,5 @@ bool SettingDialog::eventFilter(QObject *obj, QEvent *e)

QString SettingDialog::defaultIssueFixPrompt()
{
return "How can I resolve this? If you propose a fix, please make it concise."
"For the code present, we get this error:";
return "如何解决这个问题？如果你提出修复方案，请尽量简洁。对于当前代码，我们遇到以下错误：";
}
Loading
Loading