chore(build): Fix typo and new pre-commit config (#987)

dbgpt/serve/agent/agents/controller.py

@@ -1,52 +1,30 @@
-import logging
 import json
-import asyncio
+import logging
 import uuid
+from abc import ABC
 from collections import defaultdict
-from typing import Any, Callable, Dict, List, Literal, Optional, Tuple, Type, Union
-from fastapi import (
-    APIRouter,
-    Body,
-    UploadFile,
-    File,
-)
+
+from fastapi import APIRouter, Body
 from fastapi.responses import StreamingResponse
 
-from abc import ABC
-from typing import List
-from dbgpt.core.awel import BaseOperator, SimpleCallDataInputSource, InputOperator, DAG
-from dbgpt.model.operator.model_operator import ModelOperator, ModelStreamOperator
-from dbgpt.app.openapi.api_view_model import Result, ConversationVo
-from dbgpt.util.json_utils import EnhancedJSONEncoder
-from dbgpt.serve.agent.model import (
-    PluginHubParam,
-    PagenationFilter,
-    PagenationResult,
-    PluginHubFilter,
-)
-
-from dbgpt.agent.common.schema import Status
-from dbgpt.agent.agents.agents_mange import AgentsMange
+from dbgpt._private.config import Config
+from dbgpt.agent.agents.agent import AgentContext
+from dbgpt.agent.agents.agents_mange import agent_mange
+from dbgpt.agent.agents.plan_group_chat import PlanChat, PlanChatManager
 from dbgpt.agent.agents.planner_agent import PlannerAgent
 from dbgpt.agent.agents.user_proxy_agent import UserProxyAgent
-from dbgpt.agent.agents.plan_group_chat import PlanChat, PlanChatManager
-from dbgpt.agent.agents.agent import AgentContext
+from dbgpt.agent.common.schema import Status
 from dbgpt.agent.memory.gpts_memory import GptsMemory
-
-from .db_gpts_memory import MetaDbGptsPlansMemory, MetaDbGptsMessageMemory
-
-from ..db.gpts_mange_db import GptsInstanceDao, GptsInstanceEntity
-from ..db.gpts_conversations_db import GptsConversationsDao, GptsConversationsEntity
-
-from .dbgpts import DbGptsCompletion, DbGptsTaskStep, DbGptsMessage, DbGptsInstance
+from dbgpt.app.openapi.api_view_model import Result
 from dbgpt.component import BaseComponent, ComponentType, SystemApp
-from dbgpt.agent.agents.agents_mange import agent_mange
-from dbgpt._private.config import Config
-from dbgpt.model.cluster.controller.controller import BaseModelController
-from dbgpt.agent.memory.gpts_memory import GptsMessage
-from dbgpt.model.cluster import WorkerManager, WorkerManagerFactory
-
+from dbgpt.model.cluster import WorkerManagerFactory
 from dbgpt.model.cluster.client import DefaultLLMClient
+from dbgpt.serve.agent.model import PagenationFilter, PluginHubFilter
+
+from ..db.gpts_conversations_db import GptsConversationsDao, GptsConversationsEntity
+from ..db.gpts_mange_db import GptsInstanceDao, GptsInstanceEntity
+from .db_gpts_memory import MetaDbGptsMessageMemory, MetaDbGptsPlansMemory
+from .dbgpts import DbGptsInstance
 
 CFG = Config()
 

dbgpt/serve/agent/agents/db_gpts_memory.py

@@ -1,13 +1,14 @@
 from typing import List, Optional
+
+from dbgpt.agent.memory.base import GptsPlan
 from dbgpt.agent.memory.gpts_memory import (
-    GptsPlansMemory,
-    GptsPlan,
-    GptsMessageMemory,
     GptsMessage,
+    GptsMessageMemory,
+    GptsPlansMemory,
 )
 
-from ..db.gpts_plans_db import GptsPlansEntity, GptsPlansDao
 from ..db.gpts_messages_db import GptsMessagesDao, GptsMessagesEntity
+from ..db.gpts_plans_db import GptsPlansDao, GptsPlansEntity
 
 
 class MetaDbGptsPlansMemory(GptsPlansMemory):

dbgpt/serve/agent/agents/dbgpts.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-from enum import Enum
-from abc import ABC, abstractmethod
-from typing import Any, Callable, Dict, List, Literal, Optional, Tuple, Type, Union
-from dataclasses import dataclass, asdict, fields
 import dataclasses
+from dataclasses import dataclass
+from enum import Enum
+from typing import Any, Dict, List, Optional
 
 from dbgpt.agent.agents.agent import AgentResource
 

dbgpt/serve/agent/db/gpts_conversations_db.py

@@ -1,19 +1,22 @@
 from datetime import datetime
-from typing import List
-from sqlalchemy import Column, Integer, String, Index, DateTime, func, Text, desc
-from sqlalchemy import UniqueConstraint
 
+from sqlalchemy import (
+    Column,
+    DateTime,
+    Index,
+    Integer,
+    String,
+    Text,
+    UniqueConstraint,
+    desc,
+    func,
+)
 
 from dbgpt.storage.metadata import BaseDao, Model
 
 
 class GptsConversationsEntity(Model):
     __tablename__ = "gpts_conversations"
-    __table_args__ = {
-        "mysql_charset": "utf8mb4",
-        "mysql_collate": "utf8mb4_unicode_ci",
-    }
-
     id = Column(Integer, primary_key=True, comment="autoincrement id")
 
     conv_id = Column(

dbgpt/serve/agent/db/gpts_mange_db.py

@@ -1,17 +1,12 @@
 from datetime import datetime
-from typing import List
-from sqlalchemy import Column, Integer, String, Index, DateTime, func, Text, Boolean
-from sqlalchemy import UniqueConstraint
+
+from sqlalchemy import Column, DateTime, Integer, String, Text, UniqueConstraint
 
 from dbgpt.storage.metadata import BaseDao, Model
 
 
 class GptsInstanceEntity(Model):
     __tablename__ = "gpts_instance"
-    __table_args__ = {
-        "mysql_charset": "utf8mb4",
-        "mysql_collate": "utf8mb4_unicode_ci",
-    }
     id = Column(Integer, primary_key=True, comment="autoincrement id")
 
     gpts_name = Column(String(255), nullable=False, comment="Current AI assistant name")

dbgpt/serve/agent/db/gpts_messages_db.py

@@ -1,28 +1,24 @@
 from datetime import datetime
 from typing import List, Optional
+
 from sqlalchemy import (
     Column,
+    DateTime,
+    Index,
     Integer,
     String,
-    Index,
-    DateTime,
-    func,
     Text,
-    or_,
     and_,
     desc,
+    func,
+    or_,
 )
-from sqlalchemy import UniqueConstraint
 
 from dbgpt.storage.metadata import BaseDao, Model
 
 
 class GptsMessagesEntity(Model):
     __tablename__ = "gpts_messages"
-    __table_args__ = {
-        "mysql_charset": "utf8mb4",
-        "mysql_collate": "utf8mb4_unicode_ci",
-    }
     id = Column(Integer, primary_key=True, comment="autoincrement id")
 
     conv_id = Column(

dbgpt/serve/agent/db/gpts_plans_db.py

@@ -1,18 +1,13 @@
 from datetime import datetime
-from typing import List
-from sqlalchemy import Column, Integer, String, Index, DateTime, func, Text
-from sqlalchemy import UniqueConstraint
 
-from dbgpt.storage.metadata import BaseDao, Model
+from sqlalchemy import Column, DateTime, Integer, String, Text, UniqueConstraint
+
 from dbgpt.agent.common.schema import Status
+from dbgpt.storage.metadata import BaseDao, Model
 
 
 class GptsPlansEntity(Model):
     __tablename__ = "gpts_plans"
-    __table_args__ = {
-        "mysql_charset": "utf8mb4",
-        "mysql_collate": "utf8mb4_unicode_ci",
-    }
     id = Column(Integer, primary_key=True, comment="autoincrement id")
 
     conv_id = Column(

dbgpt/serve/agent/db/my_plugin_db.py

@@ -1,6 +1,6 @@
 from datetime import datetime
-from sqlalchemy import Column, Integer, String, DateTime, func
-from sqlalchemy import UniqueConstraint
+
+from sqlalchemy import Column, DateTime, Integer, String, UniqueConstraint, func
 
 from dbgpt.storage.metadata import BaseDao, Model
 

dbgpt/serve/agent/db/plugin_hub_db.py

@@ -1,7 +1,16 @@
 from datetime import datetime
+
 import pytz
-from sqlalchemy import Column, Integer, String, Index, DateTime, func, DDL
-from sqlalchemy import UniqueConstraint
+from sqlalchemy import (
+    DDL,
+    Column,
+    DateTime,
+    Index,
+    Integer,
+    String,
+    UniqueConstraint,
+    func,
+)
 
 from dbgpt.storage.metadata import BaseDao, Model
 

dbgpt/serve/agent/hub/agent_hub.py

@@ -1,18 +1,19 @@
+import glob
 import json
 import logging
 import os
-import glob
 import shutil
-from fastapi import UploadFile
-from typing import Any
 import tempfile
+from typing import Any
 
-from ..db.plugin_hub_db import PluginHubEntity, PluginHubDao
-from ..db.my_plugin_db import MyPluginDao, MyPluginEntity
+from fastapi import UploadFile
 
 from dbgpt.agent.common.schema import PluginStorageType
 from dbgpt.agent.plugin.plugins_util import scan_plugins, update_from_git
 
+from ..db.my_plugin_db import MyPluginDao, MyPluginEntity
+from ..db.plugin_hub_db import PluginHubDao, PluginHubEntity
+
 logger = logging.getLogger(__name__)
 Default_User = "default"
 DEFAULT_PLUGIN_REPO = "https://github.com/eosphoros-ai/DB-GPT-Plugins.git"

dbgpt/serve/agent/hub/controller.py

@@ -1,31 +1,22 @@
 import logging
-from fastapi import (
-    APIRouter,
-    Body,
-    UploadFile,
-    File,
-)
 from abc import ABC
 from typing import List
 
-from dbgpt.app.openapi.api_view_model import (
-    Result,
-)
+from fastapi import APIRouter, Body, File, UploadFile
 
+from dbgpt.agent.plugin.generator import PluginPromptGenerator
+from dbgpt.agent.plugin.plugins_util import scan_plugins
+from dbgpt.app.openapi.api_view_model import Result
+from dbgpt.component import BaseComponent, ComponentType, SystemApp
+from dbgpt.configs.model_config import PLUGINS_DIR
+from dbgpt.serve.agent.db.plugin_hub_db import PluginHubEntity
+from dbgpt.serve.agent.hub.agent_hub import AgentHub
 from dbgpt.serve.agent.model import (
-    PluginHubParam,
     PagenationFilter,
     PagenationResult,
     PluginHubFilter,
+    PluginHubParam,
 )
-from dbgpt.serve.agent.hub.agent_hub import AgentHub
-from dbgpt.serve.agent.db.plugin_hub_db import PluginHubEntity
-
-from dbgpt.agent.plugin.plugins_util import scan_plugins
-from dbgpt.agent.plugin.generator import PluginPromptGenerator
-
-from dbgpt.configs.model_config import PLUGINS_DIR
-from dbgpt.component import BaseComponent, ComponentType, SystemApp
 
 router = APIRouter()
 logger = logging.getLogger(__name__)

dbgpt/serve/agent/model.py

@@ -1,6 +1,6 @@
-from typing import TypedDict, Optional, Dict, List
 from dataclasses import dataclass
-from typing import TypeVar, Generic, Any
+from typing import Any, Dict, Generic, List, Optional, TypedDict, TypeVar
+
 from dbgpt._private.pydantic import BaseModel, Field
 
 T = TypeVar("T")