diff --git a/CMakeLists.txt b/CMakeLists.txt index 28b99b029a88118286af0160a5b81ba9fc9186a2..4dfabfcbf539289c590b2544f8dea4454a835340 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,8 @@ add_executable(kylin-ai-business-framework-service src/main.cpp src/utils/vectordb/vectordb.cpp src/utils/vectordb/vectordb.h src/utils/utils.cpp - src/utils/utils.h) + src/utils/utils.h +) find_package(PkgConfig REQUIRED) @@ -85,4 +86,4 @@ install(TARGETS kylin-ai-business-framework-service ) install(DIRECTORY src/utils/python DESTINATION ${FRAMEWORK_PATH}/utils) install(DIRECTORY configs/lib/systemd/user/ DESTINATION /usr/lib/systemd/user) -install(DIRECTORY python-depends/ DESTINATION ${FRAMEWORK_PATH}/python-depends) \ No newline at end of file +install(DIRECTORY python-depends/ DESTINATION ${FRAMEWORK_PATH}/python-depends) diff --git a/debian/changelog b/debian/changelog index 05cf6f6fe2b7b9ecbcb56b1346a7a95545c48a1d..a3e35e645664a6892734818965c5b55434445aad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +kylin-ai-business-framework-service (1.0.0.0-ok0.9) nile; urgency=medium + + * 增加获取功能状态的接口 + * 支持未安装模型时运行,在安装模型后不需要重启 + + -- wangweinan Thu, 13 Jun 2024 14:08:46 +0800 + kylin-ai-business-framework-service (1.0.0.0-ok0.8) nile; urgency=medium * 解决会有多个进程问题,改为常驻两个进程,子进程管理共享数据 diff --git a/debian/control b/debian/control index 0e8eab95bd5a90e9a90a959b170729241265947c..dba244945c5ee9418bc8ea70f7caf65eb14bbc1c 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,7 @@ Architecture: amd64 Depends: ${misc:Depends}, ${shlibs:Depends}, onnxruntime, python3-venv, - python3-pip, - kylin-datamanagement-models(>= 0.1.0.0) + python3-pip Description: kylin ai business framework service. kylin-ai-business-framework-service is a service for Fuzzy search, which encapsulates the relevant Python interfaces in C++. diff --git a/src/datamanagement/datamanagementprocessor.cpp b/src/datamanagement/datamanagementprocessor.cpp index 9b05c3859c5754a34c8254d2aa3e8aada83be165..b39e19fbb9c6660abc006a449debfafb4a9bc3d3 100644 --- a/src/datamanagement/datamanagementprocessor.cpp +++ b/src/datamanagement/datamanagementprocessor.cpp @@ -65,6 +65,9 @@ void DataManagementProcessor::unexportSkeleton() void DataManagementProcessor::connectSignal() { + g_signal_connect(delegate_, "handle-get-feature-status", + G_CALLBACK(DataManagementProcessor::handleGetFeatureStatus), + this); g_signal_connect(delegate_, "handle-similarity-search", G_CALLBACK(DataManagementProcessor::handleSimilaritySearch), this); @@ -88,6 +91,23 @@ void DataManagementProcessor::connectSignal() this); } +bool DataManagementProcessor::handleGetFeatureStatus(AisdkDataManagementProcessor *delegate, + GDBusMethodInvocation *invocation, + gpointer /*userData*/) +{ + std::cout << "Receive get_feature_status request" << std::endl; + auto callback = [delegate, invocation](int featureStatus, int errorCode) + { + std::cout << "Complete get_feature_status request" << std::endl; + aisdk_data_management_processor_complete_get_feature_status( + delegate, invocation, featureStatus, errorCode); + }; + + DataManagementService::getInstance()->getFeatureStatus(callback); + + return true; +} + bool DataManagementProcessor::handleSimilaritySearch(AisdkDataManagementProcessor *delegate, GDBusMethodInvocation *invocation, gchar *searchConditions, int /*uid*/, diff --git a/src/datamanagement/datamanagementprocessor.h b/src/datamanagement/datamanagementprocessor.h index c2c153681f6863ddcfeb793b1bdfe877cc593610..71768dea4b40b5f9e9f2097ad1c613c16e65c21c 100644 --- a/src/datamanagement/datamanagementprocessor.h +++ b/src/datamanagement/datamanagementprocessor.h @@ -32,6 +32,9 @@ private: void unexportSkeleton(); void connectSignal(); + static bool handleGetFeatureStatus(AisdkDataManagementProcessor *delegate, + GDBusMethodInvocation *invocation, + gpointer userData); static bool handleSimilaritySearch(AisdkDataManagementProcessor *delegate, GDBusMethodInvocation *invocation, gchar *searchConditions, diff --git a/src/datamanagement/datamanagementprocessor.xml b/src/datamanagement/datamanagementprocessor.xml index 003e03b5555ebad75e2e1f2a244c7eaa4ba561fe..eb364889ed0adbd736fe0b22ad7ae5534790138b 100644 --- a/src/datamanagement/datamanagementprocessor.xml +++ b/src/datamanagement/datamanagementprocessor.xml @@ -3,6 +3,15 @@ + + + + +