Commit 6af8eac
committed
Merge branch 'develop_datamate_core' of https://github.com/ModelEngine-Group/nexent into develop_datamate_core_v2
# Conflicts:
# backend/consts/const.py
# backend/services/datamate_service.py
# backend/services/vectordatabase_service.py
# sdk/nexent/core/tools/datamate_search_tool.py
# test/backend/services/test_datamate_service.py
# test/backend/services/test_vectordatabase_service.py
# test/sdk/core/tools/test_datamate_search_tool.pyFile tree
39 files changed
+5242
-855
lines changed- backend
- apps
- consts
- database
- services
- frontend
- app/[locale]
- agents/components
- agentConfig
- agentInfo
- models/components
- services
- styles
- sdk/nexent
- core/tools
- datamate
- test
- backend
- app
- database
- services
- sdk/core/tools
39 files changed
+5242
-855
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
22 | 25 | | |
23 | 26 | | |
24 | 27 | | |
| |||
59 | 62 | | |
60 | 63 | | |
61 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
62 | 68 | | |
63 | 69 | | |
64 | 70 | | |
| |||
0 commit comments