Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

src/chat/knowledge/embedding_store.py

@@ -27,7 +27,7 @@ from rich.progress import (
 )
 
 install(extra_lines=3)
-ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", ".."))
+ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))
 EMBEDDING_DATA_DIR = (
     os.path.join(ROOT_PATH, "data", "embedding")
     if global_config["persistence"]["embedding_data_dir"] is None

src/chat/knowledge/ie_process.py

@@ -6,7 +6,7 @@ from .global_logger import logger
 from . import prompt_template
 from .lpmmconfig import global_config, INVALID_ENTITY
 from .llm_client import LLMClient
-from .utils.json_fix import new_fix_broken_generated_json
+from src.chat.knowledge.utils.json_fix import new_fix_broken_generated_json
 
 
 def _entity_extract(llm_client: LLMClient, paragraph: str) -> List[str]:

src/chat/knowledge/kg_manager.py

@@ -31,7 +31,7 @@ from .lpmmconfig import (
 
 from .global_logger import logger
 
-ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", ".."))
+ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))
 KG_DIR = (
     os.path.join(ROOT_PATH, "data/rag")
     if global_config["persistence"]["rag_data_dir"] is None

src/chat/knowledge/knowledge_lib.py

@@ -1,10 +1,10 @@
-from .src.lpmmconfig import PG_NAMESPACE, global_config
-from .src.embedding_store import EmbeddingManager
-from .src.llm_client import LLMClient
-from .src.mem_active_manager import MemoryActiveManager
-from .src.qa_manager import QAManager
-from .src.kg_manager import KGManager
-from .src.global_logger import logger
+from src.chat.knowledge.lpmmconfig import PG_NAMESPACE, global_config
+from src.chat.knowledge.embedding_store import EmbeddingManager
+from src.chat.knowledge.llm_client import LLMClient
+from src.chat.knowledge.mem_active_manager import MemoryActiveManager
+from src.chat.knowledge.qa_manager import QAManager
+from src.chat.knowledge.kg_manager import KGManager
+from src.chat.knowledge.global_logger import logger
 # try:
 #     import quick_algo
 # except ImportError:

src/chat/knowledge/lpmmconfig.py

@@ -45,7 +45,7 @@ def _load_config(config, config_file_path):
     if "llm_providers" in file_config:
         for provider in file_config["llm_providers"]:
             if provider["name"] not in config["llm_providers"]:
-                config["llm_providers"][provider["name"]] = dict()
+                config["llm_providers"][provider["name"]] = {}
             config["llm_providers"][provider["name"]]["base_url"] = provider["base_url"]
             config["llm_providers"][provider["name"]]["api_key"] = provider["api_key"]
 
@@ -135,6 +135,6 @@ global_config = dict(
 # _load_config(global_config, parser.parse_args().config_path)
 # file_path = os.path.abspath(__file__)
 # dir_path = os.path.dirname(file_path)
-ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "..", ".."))
+ROOT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", ".."))
 config_path = os.path.join(ROOT_PATH, "config", "lpmm_config.toml")
 _load_config(global_config, config_path)

src/chat/knowledge/raw_processing.py

@@ -3,7 +3,7 @@ import os
 
 from .global_logger import logger
 from .lpmmconfig import global_config
-from .utils.hash import get_sha256
+from src.chat.knowledge.utils import get_sha256
 
 
 def load_raw_data(path: str = None) -> tuple[list[str], list[str]]: