refactor: Replace plugin tools manager to client api tools manager

This commit is contained in:
Petr Mironychev
2026-03-30 06:53:29 +02:00
parent f58fad9578
commit e55e96714b
42 changed files with 381 additions and 343 deletions

View File

@ -18,8 +18,10 @@
*/
#include "OpenAICompatProvider.hpp"
#include <LLMCore/ToolsManager.hpp>
#include "pluginllmcore/ValidationUtils.hpp"
#include "tools/ToolsRegistration.hpp"
#include "logger/Logger.hpp"
#include "settings/ChatAssistantSettings.hpp"
#include "settings/CodeCompletionSettings.hpp"
@ -36,11 +38,13 @@ namespace QodeAssist::Providers {
OpenAICompatProvider::OpenAICompatProvider(QObject *parent)
: PluginLLMCore::Provider(parent)
, m_toolsManager(new Tools::ToolsManager(this))
, m_client(new ::LLMCore::OpenAIClient(url(), apiKey(), QString(), this))
{
Tools::registerQodeAssistTools(m_client->tools());
connect(
m_toolsManager,
&Tools::ToolsManager::toolExecutionComplete,
m_client->tools(),
&::LLMCore::ToolsManager::toolExecutionComplete,
this,
&OpenAICompatProvider::onToolExecutionComplete);
}
@ -112,8 +116,7 @@ void OpenAICompatProvider::prepareRequest(
filter = PluginLLMCore::RunToolsFilter::OnlyRead;
}
auto toolsDefinitions = m_toolsManager->getToolsDefinitions(
PluginLLMCore::ToolSchemaFormat::OpenAI, filter);
auto toolsDefinitions = m_client->tools()->getToolsDefinitions();
if (!toolsDefinitions.isEmpty()) {
request["tools"] = toolsDefinitions;
LOG_MESSAGE(
@ -266,7 +269,7 @@ void OpenAICompatProvider::onToolExecutionComplete(
auto toolContent = message->getCurrentToolUseContent();
for (auto tool : toolContent) {
if (tool->id() == it.key()) {
auto toolStringName = m_toolsManager->toolsFactory()->getStringName(tool->name());
auto toolStringName = m_client->tools()->displayName(tool->name());
emit toolExecutionCompleted(
requestId, tool->id(), toolStringName, toolResults[tool->id()]);
break;
@ -383,9 +386,9 @@ void OpenAICompatProvider::handleMessageComplete(const QString &requestId)
}
for (auto toolContent : toolUseContent) {
auto toolStringName = m_toolsManager->toolsFactory()->getStringName(toolContent->name());
auto toolStringName = m_client->tools()->displayName(toolContent->name());
emit toolExecutionStarted(requestId, toolContent->id(), toolStringName);
m_toolsManager->executeToolCall(
m_client->tools()->executeToolCall(
requestId, toolContent->id(), toolContent->name(), toolContent->input());
}
@ -406,7 +409,12 @@ void OpenAICompatProvider::cleanupRequest(const PluginLLMCore::RequestID &reques
m_dataBuffers.remove(requestId);
m_requestUrls.remove(requestId);
m_originalRequests.remove(requestId);
m_toolsManager->cleanupRequest(requestId);
m_client->tools()->cleanupRequest(requestId);
}
::LLMCore::ToolsManager *OpenAICompatProvider::toolsManager() const
{
return m_client->tools();
}
} // namespace QodeAssist::Providers