From 8b9af66755d54b9fd4d278bbe31e94cc374ce996 Mon Sep 17 00:00:00 2001 From: Wei Wei Date: Mon, 13 May 2024 10:43:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E7=9A=84include?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 4 ++-- src/datamanagement/datamanagementservice.cpp | 8 ++++---- src/util/autotokenizer.cpp | 4 ++-- src/util/parser/officepyparserwrapper.cpp | 4 ++-- src/util/{python => }/pythonthreadlocker.h | 0 src/util/{python => }/pythonutil.cpp | 0 src/util/{python => }/pythonutil.h | 0 7 files changed, 10 insertions(+), 10 deletions(-) rename src/util/{python => }/pythonthreadlocker.h (100%) rename src/util/{python => }/pythonutil.cpp (100%) rename src/util/{python => }/pythonutil.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18e3d76..9039042 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ add_executable(kylin-ai-business-framework-service src/main.cpp src/util/parser/parser.h src/util/parser/parser.cpp src/util/parser/txtparser.h src/util/parser/txtparser.cpp src/util/parser/pdfparser.h src/util/parser/pdfparser.cpp - src/util/python/pythonutil.h src/util/python/pythonutil.cpp + src/util/pythonutil.h src/util/pythonutil.cpp src/util/parser/officepyparserwrapper.h src/util/parser/officepyparserwrapper.cpp src/util/python/officeparser.py src/util/parser/docxparser.h src/util/parser/docxparser.cpp @@ -38,7 +38,7 @@ add_executable(kylin-ai-business-framework-service src/main.cpp src/embeddingtaskmanager/embeddingtaskmanager.h src/embeddingtaskmanager/embeddingtaskmanager.cpp src/embeddingtaskmanager/imageembeddingservice.h src/embeddingtaskmanager/imageembeddingservice.cpp src/embeddingtaskmanager/textembeddingservice.h src/embeddingtaskmanager/textembeddingservice.cpp - src/util/python/pythonthreadlocker.h + src/util/pythonthreadlocker.h src/datamanagement/datamanagementjsonhelper.cpp src/datamanagement/datamanagementjsonhelper.h src/datamanagement/datamanagementdatabase.cpp diff --git a/src/datamanagement/datamanagementservice.cpp b/src/datamanagement/datamanagementservice.cpp index 002bf63..9f96a88 100644 --- a/src/datamanagement/datamanagementservice.cpp +++ b/src/datamanagement/datamanagementservice.cpp @@ -1,11 +1,11 @@ #include "datamanagementservice.h" #include "thirdparty/threadpool/async.h" #include "datamanagement/datamanagementjsonhelper.h" -#include "../util/parser/parser.h" -#include "../util/parser/fileparserfactory.h" +#include "util/parser/parser.h" +#include "util/parser/fileparserfactory.h" #include "datamanagement/segmenttokenizer.h" -#include "../embeddingtaskmanager/embeddingtaskmanager.h" -#include "../embeddingtaskmanager/embeddingtask.h" +#include "embeddingtaskmanager/embeddingtaskmanager.h" +#include "embeddingtaskmanager/embeddingtask.h" #include diff --git a/src/util/autotokenizer.cpp b/src/util/autotokenizer.cpp index 575f62d..0d16163 100644 --- a/src/util/autotokenizer.cpp +++ b/src/util/autotokenizer.cpp @@ -1,7 +1,7 @@ #include "autotokenizer.h" -#include "python/pythonutil.h" -#include "python/pythonthreadlocker.h" +#include "util/pythonutil.h" +#include "util/pythonthreadlocker.h" #include diff --git a/src/util/parser/officepyparserwrapper.cpp b/src/util/parser/officepyparserwrapper.cpp index c97dcc7..5781fde 100644 --- a/src/util/parser/officepyparserwrapper.cpp +++ b/src/util/parser/officepyparserwrapper.cpp @@ -1,7 +1,7 @@ #include "officepyparserwrapper.h" -#include "../python/pythonutil.h" -#include "../python/pythonthreadlocker.h" +#include "util/pythonutil.h" +#include "util/pythonthreadlocker.h" OfficePyParserWrapper::OfficePyParserWrapper() { diff --git a/src/util/python/pythonthreadlocker.h b/src/util/pythonthreadlocker.h similarity index 100% rename from src/util/python/pythonthreadlocker.h rename to src/util/pythonthreadlocker.h diff --git a/src/util/python/pythonutil.cpp b/src/util/pythonutil.cpp similarity index 100% rename from src/util/python/pythonutil.cpp rename to src/util/pythonutil.cpp diff --git a/src/util/python/pythonutil.h b/src/util/pythonutil.h similarity index 100% rename from src/util/python/pythonutil.h rename to src/util/pythonutil.h -- Gitee From a73481dc2dbb7f5f7281a1b33c426ee4993c1ba4 Mon Sep 17 00:00:00 2001 From: Wei Wei Date: Mon, 13 May 2024 10:48:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=E9=87=8D=E5=91=BD=E5=90=8Dutil?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=BAutils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 42 +++++++++---------- src/datamanagement/datamanagementservice.cpp | 4 +- .../imageembeddingservice.h | 2 +- .../textembeddingservice.cpp | 2 +- .../textembeddingservice.h | 2 +- src/{util => utils}/autotokenizer.cpp | 4 +- src/{util => utils}/autotokenizer.h | 0 src/{util => utils}/imageembedder.cpp | 0 src/{util => utils}/imageembedder.h | 0 src/{util => utils}/math.cpp | 0 src/{util => utils}/math.h | 0 src/{util => utils}/parser/docxparser.cpp | 0 src/{util => utils}/parser/docxparser.h | 0 .../parser/fileparserfactory.cpp | 0 .../parser/fileparserfactory.h | 0 .../parser/officepyparserwrapper.cpp | 4 +- .../parser/officepyparserwrapper.h | 0 src/{util => utils}/parser/parser.cpp | 0 src/{util => utils}/parser/parser.h | 0 src/{util => utils}/parser/pdfparser.cpp | 0 src/{util => utils}/parser/pdfparser.h | 0 src/{util => utils}/parser/pptxparser.cpp | 0 src/{util => utils}/parser/pptxparser.h | 0 src/{util => utils}/parser/txtparser.cpp | 0 src/{util => utils}/parser/txtparser.h | 0 src/{util => utils}/python/autotokenizer.py | 0 src/{util => utils}/python/docxparser.py | 0 src/{util => utils}/python/officeparser.py | 0 src/{util => utils}/python/pptxparser.py | 0 src/{util => utils}/pythonthreadlocker.h | 0 src/{util => utils}/pythonutil.cpp | 0 src/{util => utils}/pythonutil.h | 0 src/{util => utils}/textembedder.cpp | 0 src/{util => utils}/textembedder.h | 0 34 files changed, 30 insertions(+), 30 deletions(-) rename src/{util => utils}/autotokenizer.cpp (97%) rename src/{util => utils}/autotokenizer.h (100%) rename src/{util => utils}/imageembedder.cpp (100%) rename src/{util => utils}/imageembedder.h (100%) rename src/{util => utils}/math.cpp (100%) rename src/{util => utils}/math.h (100%) rename src/{util => utils}/parser/docxparser.cpp (100%) rename src/{util => utils}/parser/docxparser.h (100%) rename src/{util => utils}/parser/fileparserfactory.cpp (100%) rename src/{util => utils}/parser/fileparserfactory.h (100%) rename src/{util => utils}/parser/officepyparserwrapper.cpp (97%) rename src/{util => utils}/parser/officepyparserwrapper.h (100%) rename src/{util => utils}/parser/parser.cpp (100%) rename src/{util => utils}/parser/parser.h (100%) rename src/{util => utils}/parser/pdfparser.cpp (100%) rename src/{util => utils}/parser/pdfparser.h (100%) rename src/{util => utils}/parser/pptxparser.cpp (100%) rename src/{util => utils}/parser/pptxparser.h (100%) rename src/{util => utils}/parser/txtparser.cpp (100%) rename src/{util => utils}/parser/txtparser.h (100%) rename src/{util => utils}/python/autotokenizer.py (100%) rename src/{util => utils}/python/docxparser.py (100%) rename src/{util => utils}/python/officeparser.py (100%) rename src/{util => utils}/python/pptxparser.py (100%) rename src/{util => utils}/pythonthreadlocker.h (100%) rename src/{util => utils}/pythonutil.cpp (100%) rename src/{util => utils}/pythonutil.h (100%) rename src/{util => utils}/textembedder.cpp (100%) rename src/{util => utils}/textembedder.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9039042..c45ccb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,32 +13,32 @@ add_executable(kylin-ai-business-framework-service src/main.cpp src/servicemanager.cpp src/servicemanager.h src/datamanagement/datamanagementprocessorglue.c src/datamanagement/datamanagementprocessorglue.h src/datamanagement/datamanagementprocessor.cpp src/datamanagement/datamanagementprocessor.h - src/util/python/autotokenizer.py - src/util/parser/parser.h src/util/parser/parser.cpp - src/util/parser/txtparser.h src/util/parser/txtparser.cpp - src/util/parser/pdfparser.h src/util/parser/pdfparser.cpp - src/util/pythonutil.h src/util/pythonutil.cpp - src/util/parser/officepyparserwrapper.h src/util/parser/officepyparserwrapper.cpp - src/util/python/officeparser.py - src/util/parser/docxparser.h src/util/parser/docxparser.cpp - src/util/python/docxparser.py - src/util/parser/pptxparser.h src/util/parser/pptxparser.cpp - src/util/python/pptxparser.py - src/util/parser/fileparserfactory.cpp src/util/parser/fileparserfactory.h - src/util/autotokenizer.cpp - src/util/autotokenizer.h - src/util/imageembedder.cpp - src/util/imageembedder.h - src/util/math.cpp - src/util/math.h - src/util/textembedder.cpp - src/util/textembedder.h + src/utils/python/autotokenizer.py + src/utils/parser/parser.h src/utils/parser/parser.cpp + src/utils/parser/txtparser.h src/utils/parser/txtparser.cpp + src/utils/parser/pdfparser.h src/utils/parser/pdfparser.cpp + src/utils/pythonutil.h src/utils/pythonutil.cpp + src/utils/parser/officepyparserwrapper.h src/utils/parser/officepyparserwrapper.cpp + src/utils/python/officeparser.py + src/utils/parser/docxparser.h src/utils/parser/docxparser.cpp + src/utils/python/docxparser.py + src/utils/parser/pptxparser.h src/utils/parser/pptxparser.cpp + src/utils/python/pptxparser.py + src/utils/parser/fileparserfactory.cpp src/utils/parser/fileparserfactory.h + src/utils/autotokenizer.cpp + src/utils/autotokenizer.h + src/utils/imageembedder.cpp + src/utils/imageembedder.h + src/utils/math.cpp + src/utils/math.h + src/utils/textembedder.cpp + src/utils/textembedder.h src/embeddingtaskmanager/baseembeddingservice.h src/embeddingtaskmanager/baseembeddingservice.cpp src/embeddingtaskmanager/embeddingtask.h src/embeddingtaskmanager/embeddingtask.cpp src/embeddingtaskmanager/embeddingtaskmanager.h src/embeddingtaskmanager/embeddingtaskmanager.cpp src/embeddingtaskmanager/imageembeddingservice.h src/embeddingtaskmanager/imageembeddingservice.cpp src/embeddingtaskmanager/textembeddingservice.h src/embeddingtaskmanager/textembeddingservice.cpp - src/util/pythonthreadlocker.h + src/utils/pythonthreadlocker.h src/datamanagement/datamanagementjsonhelper.cpp src/datamanagement/datamanagementjsonhelper.h src/datamanagement/datamanagementdatabase.cpp diff --git a/src/datamanagement/datamanagementservice.cpp b/src/datamanagement/datamanagementservice.cpp index 9f96a88..7a73b8d 100644 --- a/src/datamanagement/datamanagementservice.cpp +++ b/src/datamanagement/datamanagementservice.cpp @@ -1,8 +1,8 @@ #include "datamanagementservice.h" #include "thirdparty/threadpool/async.h" #include "datamanagement/datamanagementjsonhelper.h" -#include "util/parser/parser.h" -#include "util/parser/fileparserfactory.h" +#include "utils/parser/parser.h" +#include "utils/parser/fileparserfactory.h" #include "datamanagement/segmenttokenizer.h" #include "embeddingtaskmanager/embeddingtaskmanager.h" #include "embeddingtaskmanager/embeddingtask.h" diff --git a/src/embeddingtaskmanager/imageembeddingservice.h b/src/embeddingtaskmanager/imageembeddingservice.h index 061c535..a23df7c 100644 --- a/src/embeddingtaskmanager/imageembeddingservice.h +++ b/src/embeddingtaskmanager/imageembeddingservice.h @@ -2,7 +2,7 @@ #define IMAGEEMBEDDINGSERVICE_H #include "embeddingtaskmanager/baseembeddingservice.h" -#include "util/imageembedder.h" +#include "utils/imageembedder.h" #include diff --git a/src/embeddingtaskmanager/textembeddingservice.cpp b/src/embeddingtaskmanager/textembeddingservice.cpp index ce9f344..e944022 100644 --- a/src/embeddingtaskmanager/textembeddingservice.cpp +++ b/src/embeddingtaskmanager/textembeddingservice.cpp @@ -1,5 +1,5 @@ #include "textembeddingservice.h" -#include "util/textembedder.h" +#include "utils/textembedder.h" #include diff --git a/src/embeddingtaskmanager/textembeddingservice.h b/src/embeddingtaskmanager/textembeddingservice.h index 66f1426..6343ad7 100644 --- a/src/embeddingtaskmanager/textembeddingservice.h +++ b/src/embeddingtaskmanager/textembeddingservice.h @@ -2,7 +2,7 @@ #define TEXTEMBEDDINGSERVICE_H #include "embeddingtaskmanager/baseembeddingservice.h" -#include "util/textembedder.h" +#include "utils/textembedder.h" #include diff --git a/src/util/autotokenizer.cpp b/src/utils/autotokenizer.cpp similarity index 97% rename from src/util/autotokenizer.cpp rename to src/utils/autotokenizer.cpp index 0d16163..2c45c75 100644 --- a/src/util/autotokenizer.cpp +++ b/src/utils/autotokenizer.cpp @@ -1,7 +1,7 @@ #include "autotokenizer.h" -#include "util/pythonutil.h" -#include "util/pythonthreadlocker.h" +#include "utils/pythonutil.h" +#include "utils/pythonthreadlocker.h" #include diff --git a/src/util/autotokenizer.h b/src/utils/autotokenizer.h similarity index 100% rename from src/util/autotokenizer.h rename to src/utils/autotokenizer.h diff --git a/src/util/imageembedder.cpp b/src/utils/imageembedder.cpp similarity index 100% rename from src/util/imageembedder.cpp rename to src/utils/imageembedder.cpp diff --git a/src/util/imageembedder.h b/src/utils/imageembedder.h similarity index 100% rename from src/util/imageembedder.h rename to src/utils/imageembedder.h diff --git a/src/util/math.cpp b/src/utils/math.cpp similarity index 100% rename from src/util/math.cpp rename to src/utils/math.cpp diff --git a/src/util/math.h b/src/utils/math.h similarity index 100% rename from src/util/math.h rename to src/utils/math.h diff --git a/src/util/parser/docxparser.cpp b/src/utils/parser/docxparser.cpp similarity index 100% rename from src/util/parser/docxparser.cpp rename to src/utils/parser/docxparser.cpp diff --git a/src/util/parser/docxparser.h b/src/utils/parser/docxparser.h similarity index 100% rename from src/util/parser/docxparser.h rename to src/utils/parser/docxparser.h diff --git a/src/util/parser/fileparserfactory.cpp b/src/utils/parser/fileparserfactory.cpp similarity index 100% rename from src/util/parser/fileparserfactory.cpp rename to src/utils/parser/fileparserfactory.cpp diff --git a/src/util/parser/fileparserfactory.h b/src/utils/parser/fileparserfactory.h similarity index 100% rename from src/util/parser/fileparserfactory.h rename to src/utils/parser/fileparserfactory.h diff --git a/src/util/parser/officepyparserwrapper.cpp b/src/utils/parser/officepyparserwrapper.cpp similarity index 97% rename from src/util/parser/officepyparserwrapper.cpp rename to src/utils/parser/officepyparserwrapper.cpp index 5781fde..a3b21a6 100644 --- a/src/util/parser/officepyparserwrapper.cpp +++ b/src/utils/parser/officepyparserwrapper.cpp @@ -1,7 +1,7 @@ #include "officepyparserwrapper.h" -#include "util/pythonutil.h" -#include "util/pythonthreadlocker.h" +#include "utils/pythonutil.h" +#include "utils/pythonthreadlocker.h" OfficePyParserWrapper::OfficePyParserWrapper() { diff --git a/src/util/parser/officepyparserwrapper.h b/src/utils/parser/officepyparserwrapper.h similarity index 100% rename from src/util/parser/officepyparserwrapper.h rename to src/utils/parser/officepyparserwrapper.h diff --git a/src/util/parser/parser.cpp b/src/utils/parser/parser.cpp similarity index 100% rename from src/util/parser/parser.cpp rename to src/utils/parser/parser.cpp diff --git a/src/util/parser/parser.h b/src/utils/parser/parser.h similarity index 100% rename from src/util/parser/parser.h rename to src/utils/parser/parser.h diff --git a/src/util/parser/pdfparser.cpp b/src/utils/parser/pdfparser.cpp similarity index 100% rename from src/util/parser/pdfparser.cpp rename to src/utils/parser/pdfparser.cpp diff --git a/src/util/parser/pdfparser.h b/src/utils/parser/pdfparser.h similarity index 100% rename from src/util/parser/pdfparser.h rename to src/utils/parser/pdfparser.h diff --git a/src/util/parser/pptxparser.cpp b/src/utils/parser/pptxparser.cpp similarity index 100% rename from src/util/parser/pptxparser.cpp rename to src/utils/parser/pptxparser.cpp diff --git a/src/util/parser/pptxparser.h b/src/utils/parser/pptxparser.h similarity index 100% rename from src/util/parser/pptxparser.h rename to src/utils/parser/pptxparser.h diff --git a/src/util/parser/txtparser.cpp b/src/utils/parser/txtparser.cpp similarity index 100% rename from src/util/parser/txtparser.cpp rename to src/utils/parser/txtparser.cpp diff --git a/src/util/parser/txtparser.h b/src/utils/parser/txtparser.h similarity index 100% rename from src/util/parser/txtparser.h rename to src/utils/parser/txtparser.h diff --git a/src/util/python/autotokenizer.py b/src/utils/python/autotokenizer.py similarity index 100% rename from src/util/python/autotokenizer.py rename to src/utils/python/autotokenizer.py diff --git a/src/util/python/docxparser.py b/src/utils/python/docxparser.py similarity index 100% rename from src/util/python/docxparser.py rename to src/utils/python/docxparser.py diff --git a/src/util/python/officeparser.py b/src/utils/python/officeparser.py similarity index 100% rename from src/util/python/officeparser.py rename to src/utils/python/officeparser.py diff --git a/src/util/python/pptxparser.py b/src/utils/python/pptxparser.py similarity index 100% rename from src/util/python/pptxparser.py rename to src/utils/python/pptxparser.py diff --git a/src/util/pythonthreadlocker.h b/src/utils/pythonthreadlocker.h similarity index 100% rename from src/util/pythonthreadlocker.h rename to src/utils/pythonthreadlocker.h diff --git a/src/util/pythonutil.cpp b/src/utils/pythonutil.cpp similarity index 100% rename from src/util/pythonutil.cpp rename to src/utils/pythonutil.cpp diff --git a/src/util/pythonutil.h b/src/utils/pythonutil.h similarity index 100% rename from src/util/pythonutil.h rename to src/utils/pythonutil.h diff --git a/src/util/textembedder.cpp b/src/utils/textembedder.cpp similarity index 100% rename from src/util/textembedder.cpp rename to src/utils/textembedder.cpp diff --git a/src/util/textembedder.h b/src/utils/textembedder.h similarity index 100% rename from src/util/textembedder.h rename to src/utils/textembedder.h -- Gitee From 95680f8f96a79d896c48bbb82b7f9bc13c3a446e Mon Sep 17 00:00:00 2001 From: Wei Wei Date: Mon, 13 May 2024 11:22:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9Python=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=A8=A1=E5=9E=8B=E8=B7=AF=E5=BE=84=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 3 +++ src/datamanagement/datamanagementdatabase.cpp | 2 +- src/utils/imageembedder.cpp | 6 +++--- src/utils/pythonutil.h | 2 +- src/utils/textembedder.cpp | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c45ccb3..d482428 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,8 +75,11 @@ target_link_libraries(kylin-ai-business-framework-service PkgConfig::vectordb ) +set(UTILS_RESOURCE_PATH /usr/share/kylin-ai-business-framework/utils) + include(GNUInstallDirs) install(TARGETS kylin-ai-business-framework-service LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) +install(DIRECTORY src/utils/python DESTINATION ${UTILS_RESOURCE_PATH}) diff --git a/src/datamanagement/datamanagementdatabase.cpp b/src/datamanagement/datamanagementdatabase.cpp index 0e03334..386b2c3 100644 --- a/src/datamanagement/datamanagementdatabase.cpp +++ b/src/datamanagement/datamanagementdatabase.cpp @@ -5,7 +5,7 @@ #include #include -static const char* VECTOR_DATABASE_PATH = "/usr/share/kylin-ai-runtime/datamanagement/database/"; +static const char* VECTOR_DATABASE_PATH = "/usr/share/kylin-ai-business-framework/datamanagement/database/"; static const char* VECTOR_DATABASE_NAME = "search"; static const char* FILE_INFO_COLLECTION_NAME = "files-info"; static const char* VISION_FILE_CONTENT_COLLECTION_NAME = "vision-files-content-vector"; diff --git a/src/utils/imageembedder.cpp b/src/utils/imageembedder.cpp index 1a8795a..a5868b5 100644 --- a/src/utils/imageembedder.cpp +++ b/src/utils/imageembedder.cpp @@ -5,9 +5,9 @@ #include -static const char* TXT_MODEL_FOLDER = "/usr/share/kylin-ai-runtime/datamanagement/models/cn-clip-onnx"; -static const char* VISION_MODEL_PATH = "/usr/share/kylin-ai-runtime/datamanagement/models/cn-clip-onnx/vit-b-16.img.fp32.onnx"; -static const char* TXT_MODEL_PATH = "/usr/share/kylin-ai-runtime/datamanagement/models/cn-clip-onnx/vit-b-16.txt.fp32.onnx"; +static const char* TXT_MODEL_FOLDER = "/usr/share/kylin-datamanagement-models/cn-clip-onnx"; +static const char* VISION_MODEL_PATH = "/usr/share/kylin-datamanagement-models/cn-clip-onnx/vit-b-16.img.fp32.onnx"; +static const char* TXT_MODEL_PATH = "/usr/share/kylin-datamanagement-models/cn-clip-onnx/vit-b-16.txt.fp32.onnx"; static const int INPUT_CONTEXT_LENGTH = 52; diff --git a/src/utils/pythonutil.h b/src/utils/pythonutil.h index c38a64e..cf1fbdf 100644 --- a/src/utils/pythonutil.h +++ b/src/utils/pythonutil.h @@ -7,7 +7,7 @@ #include #include -#define DATA_MANAGEMENT_PYTHON_PATH "/usr/share/kylin-ai-runtime/datamanagement/python/" +#define DATA_MANAGEMENT_PYTHON_PATH "/usr/share/kylin-ai-business-framework/utils/python/" namespace pythonutil { diff --git a/src/utils/textembedder.cpp b/src/utils/textembedder.cpp index 3eaaa98..2c0b64b 100644 --- a/src/utils/textembedder.cpp +++ b/src/utils/textembedder.cpp @@ -3,8 +3,8 @@ #include -static const char* MODEL_FOLDER = "/usr/share/kylin-ai-runtime/datamanagement/models/bge-m3-onnx"; -static const char* MODEL_PATH = "/usr/share/kylin-ai-runtime/datamanagement/models/bge-m3-onnx/model.onnx"; +static const char* MODEL_FOLDER = "/usr/share/kylin-datamanagement-models/bge-m3-onnx"; +static const char* MODEL_PATH = "/usr/share/kylin-datamanagement-models/bge-m3-onnx/model.onnx"; TextEmbedder::TextEmbedder() : tokenizer_(MODEL_FOLDER) -- Gitee