Refactor database module structure and improve import paths for clarity

Author: coolbeevip

README.md

@@ -145,7 +145,7 @@ from colorama import Fore
 from tabulate import tabulate
 
 from camel_database_agent import DatabaseAgent
-from camel_database_agent.database.database_manager import DatabaseManager
+from camel_database_agent.database.manager import DatabaseManager
 from camel_database_agent.database_base import TrainLevel
 
 # Configure logging settings to show errors on stdout

camel_database_agent/__init__.py

@@ -6,16 +6,16 @@
     "DatabaseSchemaDialectSqlite",
 ]
 
-from camel_database_agent.database.dialect.database_schema_dialect_mysql import (
+from camel_database_agent.database.dialect.dialect_mysql import (
     DatabaseSchemaDialectMySQL,
 )
-from camel_database_agent.database.dialect.database_schema_dialect_postgresql import (
+from camel_database_agent.database.dialect.dialect_postgresql import (
     DatabaseSchemaDialectPostgresql,
 )
-from camel_database_agent.database.dialect.database_schema_dialect_sqlite import (
+from camel_database_agent.database.dialect.dialect_sqlite import (
     DatabaseSchemaDialectSqlite,
 )
 from camel_database_agent.database_agent import DatabaseAgent
-from camel_database_agent.datagen.sql_query_inference_pipeline import (
+from camel_database_agent.datagen.pipeline import (
     DataQueryInferencePipeline,
 )

camel_database_agent/cli.py

@@ -19,11 +19,11 @@
 from tabulate import tabulate
 
 from camel_database_agent import DatabaseAgent
-from camel_database_agent.database.database_manager import DatabaseManager
+from camel_database_agent.database.manager import DatabaseManager
 from camel_database_agent.database_agent import DatabaseAgentResponse
 from camel_database_agent.database_base import TrainLevel, spinner
 
-"""设置日志"""
+"""Logging"""
 logging.basicConfig(
     level=logging.ERROR,
     format="%(message)s",
@@ -33,7 +33,7 @@
 logging.getLogger("camel_database_agent").setLevel(logging.INFO)
 logger = logging.getLogger(__name__)
 
-"""设置 pandas 显示选项"""
+"""Pandas display"""
 pd.set_option("display.max_rows", None)  # Show all rows
 pd.set_option("display.max_columns", None)  # Show all columns
 pd.set_option("display.width", None)  # Auto-detect display width

camel_database_agent/core/__init__.py

@@ -0,0 +1,16 @@
+class DataGenerationError(Exception):
+    """数据生成过程中的异常基类"""
+
+    pass
+
+
+class QueryParsingError(DataGenerationError):
+    """查询解析错误"""
+
+    pass
+
+
+class KnowledgeException(Exception):
+    """统一的数据库知识异常类"""
+
+    pass

camel_database_agent/core/exceptions.py

@@ -0,0 +1,20 @@
+from functools import lru_cache
+from typing import Any, Callable, TypeVar, cast
+
+R = TypeVar('R')
+
+
+def method_lru_cache(maxsize: int = 128):
+    """A decorator that applies lru_cache to a method safely."""
+
+    def decorator(func: Callable[..., R]) -> Callable[..., R]:
+        cache = lru_cache(maxsize=maxsize)(func)
+
+        def wrapper(self, *args: Any, **kwargs: Any) -> R:
+            return cast(R, cache(self, *args, **kwargs))
+
+        wrapper.cache_clear = cache.cache_clear  # type: ignore[attr-defined]
+        wrapper.cache_info = cache.cache_info  # type: ignore[attr-defined]
+        return wrapper
+
+    return decorator

camel_database_agent/core/method_lru_cache.py

@@ -6,8 +6,8 @@
 from camel.models import BaseModelBackend
 from tabulate import tabulate
 
-from camel_database_agent.database.database_manager import DatabaseManager
-from camel_database_agent.database_prompt import POLISH_SCHEMA_OUTPUT_EXAMPLE
+from camel_database_agent.database.manager import DatabaseManager
+from camel_database_agent.database.prompts import PromptTemplates
 
 logger = logging.getLogger(__name__)
 
@@ -52,7 +52,7 @@ def get_dialect(
 
     def get_polished_schema(self, language: str = "English") -> str:
         if self.schema_polish_agent:
-            prompt = POLISH_SCHEMA_OUTPUT_EXAMPLE.replace(
+            prompt = PromptTemplates.POLISH_SCHEMA_OUTPUT_EXAMPLE.replace(
                 "{{ddl_sql}}", self.get_schema()
             ).replace("{{language}}", language)
             response = self.schema_polish_agent.step(prompt)

…abase/dialect/database_schema_dialect.py …tabase_agent/database/dialect/dialect.pycamel_database_agent/database/dialect/database_schema_dialect.py renamed to camel_database_agent/database/dialect/dialect.py camel_database_agent/database/dialect/database_schema_dialect.py renamed to camel_database_agent/database/dialect/dialect.py

@@ -2,12 +2,12 @@
 
 from camel.models import BaseModelBackend
 
-from camel_database_agent.database.database_manager import (
-    DatabaseManager,
-)
-from camel_database_agent.database.dialect.database_schema_dialect import (
+from camel_database_agent.database.dialect.dialect import (
     DatabaseSchemaDialect,
 )
+from camel_database_agent.database.manager import (
+    DatabaseManager,
+)
 
 
 class DatabaseSchemaDialectMySQL(DatabaseSchemaDialect):

…dialect/database_schema_dialect_mysql.py …_agent/database/dialect/dialect_mysql.pycamel_database_agent/database/dialect/database_schema_dialect_mysql.py renamed to camel_database_agent/database/dialect/dialect_mysql.py camel_database_agent/database/dialect/database_schema_dialect_mysql.py renamed to camel_database_agent/database/dialect/dialect_mysql.py

@@ -2,10 +2,10 @@
 
 from camel.models import BaseModelBackend
 
-from camel_database_agent.database.database_manager import DatabaseManager
-from camel_database_agent.database.dialect.database_schema_dialect import (
+from camel_database_agent.database.dialect.dialect import (
     DatabaseSchemaDialect,
 )
+from camel_database_agent.database.manager import DatabaseManager
 
 
 class DatabaseSchemaDialectPostgresql(DatabaseSchemaDialect):

…ct/database_schema_dialect_postgresql.py …t/database/dialect/dialect_postgresql.pycamel_database_agent/database/dialect/database_schema_dialect_postgresql.py renamed to camel_database_agent/database/dialect/dialect_postgresql.py camel_database_agent/database/dialect/database_schema_dialect_postgresql.py renamed to camel_database_agent/database/dialect/dialect_postgresql.py

@@ -3,10 +3,10 @@
 from camel.models import BaseModelBackend
 from sqlalchemy import DefaultClause
 
-from camel_database_agent.database.database_manager import DatabaseManager
-from camel_database_agent.database.dialect.database_schema_dialect import (
+from camel_database_agent.database.dialect.dialect import (
     DatabaseSchemaDialect,
 )
+from camel_database_agent.database.manager import DatabaseManager
 
 
 class DatabaseSchemaDialectSqlite(DatabaseSchemaDialect):