move kdev plugin into subdir

Author: arturbac

src/CMakeLists.txt

@@ -1,39 +1,3 @@
 
 add_subdirectory(plugin_common)
-
-set(CXX_WITH_GPT_UI plugin_settings.ui)
-qt5_wrap_ui(CXX_WITH_GPT_UI_HEADERS ${CXX_WITH_GPT_UI})
-
-set(kdevcxx_with_ai_SRCS
- kdevcxx_with_ai.cc
- plugin_settings.cc
- markdown_view.cc
- kdevcxx_with_ai_config_page.cc
- ${CXX_WITH_GPT_UI_HEADERS}
-)
-
-kdevplatform_add_plugin(kdevcxx_with_ai
- SOURCES ${kdevcxx_with_ai_SRCS}
-)
-
-target_link_libraries(kdevcxx_with_ai
- kdevcxx_with_ai::plugin_commn
- KDev::Interfaces
- Qt5::WebEngineWidgets
- ${BASIC_LINK_FLAGS}
-)
-target_compile_options( kdevcxx_with_ai PRIVATE "-fexceptions")
-set_target_properties(kdevcxx_with_ai PROPERTIES OUTPUT_NAME "kdevcxx_with_ai")
-
-install(TARGETS kdevcxx_with_ai DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES kdevcxx_with_ai.json DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
-message(STATUS "PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}")
-message(STATUS "KDE_INSTALL_KSERVICES5DIR ${KDE_INSTALL_KSERVICES5DIR}")
-
-add_executable( markdown_view EXCLUDE_FROM_ALL)
-target_sources(markdown_view PRIVATE 
- markdown_view.cc
- markdown_view_test.cc
-)
-target_link_libraries(markdown_view Qt5::Widgets Qt5::WebEngineWidgets)
-
+add_subdirectory(kdevcxx_with_ai)

src/document_read_only.h

@@ -0,0 +1,26 @@
+set(CMAKE_AUTOMOC ON)
+# set(CXX_WITH_GPT_UI plugin_settings.ui)
+# qt5_wrap_ui(CXX_WITH_GPT_UI_HEADERS ${CXX_WITH_GPT_UI})
+
+set(kdevcxx_with_ai_SRCS
+ kdevcxx_with_ai.cc
+ kdevcxx_with_ai_config_page.cc
+ ${CXX_WITH_GPT_UI_HEADERS}
+)
+
+kdevplatform_add_plugin(kdevcxx_with_ai
+ SOURCES ${kdevcxx_with_ai_SRCS}
+)
+
+target_link_libraries(kdevcxx_with_ai
+ kdevcxx_with_ai::plugin_commn
+ KDev::Interfaces
+ ${BASIC_LINK_FLAGS}
+)
+target_compile_options( kdevcxx_with_ai PRIVATE "-fexceptions")
+set_target_properties(kdevcxx_with_ai PROPERTIES OUTPUT_NAME "kdevcxx_with_ai")
+
+install(TARGETS kdevcxx_with_ai DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES kdevcxx_with_ai.json DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+message(STATUS "PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}")
+message(STATUS "KDE_INSTALL_KSERVICES5DIR ${KDE_INSTALL_KSERVICES5DIR}")

src/kdevcxx_with_ai/CMakeLists.txt

@@ -50,20 +50,15 @@ kdevcxx_with_ai::kdevcxx_with_ai(QObject * parent, QVariantList const &) : KDeve
  * been properly set up with an API key. If the API key is missing, it prompts
  * the user to enter the API key by displaying an information dialog.
  */
+
 void kdevcxx_with_ai::on_first_time()
  {
  auto aisettings = aiprocess::load_ai_settings();
  aiprocess::warn("api_key {}", aiprocess::obfuscate_text(aisettings.api_key));
  aiprocess::warn("cxx_rules {}", aisettings.cxx_rules);
  if(aisettings.api_key.empty())
  {
- info_dialog dialog(
- "KDevCxx_With_Ai key setup",
- "Please go to KDevelop settings and enter your API key before calling any functions and adjust your rules for "
- "AI.\n"
- "You can change them at any time without restarting KDevelop.\n"
- "Changes to AI settings will take effect on every execution."
- );
+ info_dialog dialog( "KDevCxx_With_Ai Initialization", kdevcxxai::fist_time_message );
  dialog.exec();
  }
  }
@@ -72,95 +67,13 @@ using namespace std::string_view_literals;
 
 void kdevcxx_with_ai::on_process_with_ai()
  {
-#if 1
- auto * view = KTextEditor::Editor::instance()->application()->activeMainWindow()->activeView();
- if(!view || !view->selection()) [[unlikely]]
- return;
-
- kdevcxxai::process_with_ai(*view, settings);
-#else
- {
- auto aisettings{aiprocess::load_ai_settings()};
- if(aisettings.api_key.empty())
- {
- info_dialog dialog{
- "KDevCxx_With_Ai key setup",
- "Please go to KDevelop settings and enter your API key before calling any functions and adjust your language "
- "rules for AI.\n"
- "You can change them at any time without restarting KDevelop.\n"
- "Changes to AI settings will take effect on every execution."
- };
- dialog.exec();
- return;
- }
- }
 
- using namespace std::chrono_literals;
  auto * view = KTextEditor::Editor::instance()->application()->activeMainWindow()->activeView();
-
  if(!view || !view->selection()) [[unlikely]]
  return;
 
- auto * document = view->document();
- if(!document) [[unlikely]]
- {
- warn("Invalid view->document");
- return;
- }
-
- info("Processing OpenAI request ...");
- QProgressDialog progressDialog{"Processing OpenAI Request...", "Cancel", 0, 100};
- progressDialog.setWindowModality(Qt::WindowModal);
- progressDialog.show();
-
- QString selected_text = view->selectionText();
-
- auto async_result = std::async(
- std::launch::async,
- [](QString text) -> expected<aiprocess::model_response_text_t, aiprocess::process_with_ai_error>
- { return aiprocess::process_with_ai(text.toStdString()); },
- selected_text
- );
-
- debug("async to OpenAI executed ...");
- std::this_thread::yield();
-
- while(async_result.wait_for(50ms) != std::future_status::ready)
- QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
-
- auto result = async_result.get();
- debug("async to OpenAI done ...");
-
- if(!result)
- {
- aiprocess::li::error("Got error from async {}\n", result.error());
- KMessageBox::error(
- view,
- QString::fromStdString(stralgo::stl::merge(
- "Error processing AI request "sv,
- simple_enum::enum_name(result.error()),
- "\ncheck detailed log at ~/.config/kdevcxx_with_ai/"sv,
- settings.log_path
- )),
- "Error during processing AI request"
- );
- return;
- }
-
- std::string cur_work_dir{};
- if(auto path = kdevcxxai::get_view_file_path(*view); path.has_value())
- cur_work_dir = std::move(path.value());
-
- auto const & response = *result;
- auto new_text = aiprocess::process_openai_json_response(response, std::move(cur_work_dir));
- debug("Proocessed response Command Text: {}\nCode Text: {}\n", response.command, response.recived_text);
-
- if(new_text.empty()) [[unlikely]]
- return;
+ kdevcxxai::process_with_ai(*view, settings);
 
- document->replaceText(view->selectionRange(), QString::fromStdString(new_text));
- debug("document->replaceText called ...");
-#endif
  }
 
 void kdevcxx_with_ai::createActionsForMainWindow(Sublime::MainWindow *, QString &, KActionCollection & actions)
@@ -208,4 +121,4 @@ void kdevcxx_with_ai::unload() {}
 kdevcxx_with_ai::~kdevcxx_with_ai() {}
 
 #include "kdevcxx_with_ai.moc"
-#include "moc_kdevcxx_with_ai.cpp"
+// #include "moc_kdevcxx_with_ai.cpp"

src/kdevcxx_with_ai.cc renamed to src/kdevcxx_with_ai/kdevcxx_with_ai.cc

@@ -9,14 +9,25 @@ add_library( kdevcxx_with_ai::plugin_commn ALIAS plugin_commn )
 target_sources(plugin_commn PRIVATE
  plugin_common.cc
  info_dialog.cc
+ markdown_view.cc
  )
 
 target_link_libraries(plugin_commn PUBLIC
  ai_processing::core
- # Qt5::Widgets
+ Qt5::Widgets
+ Qt5::WebEngineWidgets
  KF5::TextEditor
  ${BASIC_LINK_FLAGS}
 )
 target_compile_options( plugin_commn PUBLIC "-fexceptions")
 
 target_include_directories( plugin_commn PUBLIC include ${CMAKE_CURRENT_SOURCE_DIR} )
+
+
+# add_executable( markdown_view EXCLUDE_FROM_ALL)
+# target_sources(markdown_view PRIVATE 
+# markdown_view.cc
+# markdown_view_test.cc
+# )
+# target_link_libraries(markdown_view Qt5::Widgets Qt5::WebEngineWidgets)
+# 

src/kdevcxx_with_ai.h renamed to src/kdevcxx_with_ai/kdevcxx_with_ai.h

@@ -17,6 +17,13 @@ struct app_settings_t;
 
 namespace kdevcxxai
  {
+inline constexpr auto fist_time_message
+ = "Kindly navigate to the KDevelop settings to provide your API key for activation.\n"
+ " Additionally, fine-tune the AI behavior by adjusting the rule set to your preference.\n"
+ "Modifications to the API key or rules can be made at any moment and will be applied immediately,\n"
+ "negating the necessity for a KDevelop restart.\n"
+ "Alterations to AI settings will be effective upon the next invocation.";
+
 enum class get_view_file_path_error
  {
  no_document,