feat: combining tools and models to implement AI functions

openagent/database/models/agent.py

@@ -1,15 +1,20 @@
 import enum
+from typing import List
 
 from sqlalchemy import Column, Integer, String, DateTime, JSON, Enum
 from datetime import datetime, UTC
 
 from openagent.database.models.base import Base
+from openagent.tools import ToolConfig
 
 
-class AgentStatus(enum.Enum):
+class AgentStatus(str, enum.Enum):
     INACTIVE = "inactive"
     ACTIVE = "active"
 
+    def __str__(self):
+        return self.value
+
 
 class Agent(Base):
     __tablename__ = "agents"
@@ -28,11 +33,29 @@ class Agent(Base):
     telegram = Column(String)
     website = Column(String)
     tool_configs = Column(JSON)
-    status = Column(Enum(AgentStatus), nullable=False)
+    status = Column(
+        Enum(AgentStatus, values_callable=lambda x: [e.value for e in x]),
+        nullable=False,
+    )
     created_at = Column(DateTime, default=lambda: datetime.now(UTC), nullable=False)
     updated_at = Column(
         DateTime,
         default=lambda: datetime.now(UTC),
         onupdate=lambda: datetime.now(UTC),
         nullable=False,
     )
+
+    def __init__(self, *args, **kwargs):
+        if "status" in kwargs and isinstance(kwargs["status"], AgentStatus):
+            kwargs["status"] = kwargs["status"].value
+        super().__init__(*args, **kwargs)
+
+    @property
+    def tool_configs_list(self) -> List[ToolConfig]:
+        if not self.tool_configs:
+            return []
+        return [ToolConfig.model_validate(config) for config in self.tool_configs]
+
+    @tool_configs_list.setter
+    def tool_configs_list(self, configs: List[ToolConfig]):
+        self.tool_configs = [config.model_dump() for config in configs]

openagent/database/models/tool.py

@@ -8,18 +8,29 @@ class ToolType(enum.Enum):
     TEXT_GENERATION = "text_generation"
     SOCIAL_INTEGRATION = "social_integration"
 
+    def __str__(self):
+        return self.value
+
 
 class Tool(Base):
     __tablename__ = "tools"
 
     id = Column(Integer, primary_key=True)
     name = Column(String, nullable=False)
     description = Column(Text)
-    type = Column(Enum(ToolType), nullable=False)
+    type = Column(
+        Enum(ToolType, values_callable=lambda x: [e.value for e in x]),
+        nullable=False,
+    )
     created_at = Column(DateTime, default=lambda: datetime.now(UTC), nullable=False)
     updated_at = Column(
         DateTime,
         default=lambda: datetime.now(UTC),
         onupdate=lambda: datetime.now(UTC),
         nullable=False,
     )
+
+    def __init__(self, *args, **kwargs):
+        if "type" in kwargs and isinstance(kwargs["type"], ToolType):
+            kwargs["type"] = kwargs["type"].value
+        super().__init__(*args, **kwargs)

openagent/router/routes/__init__.py

@@ -1,6 +1,5 @@
-from .chat import router as chat_router
 from .agent import router as agent_router
 from .model import router as model_router
 from .tool import router as tool_router
 
-__all__ = ["chat_router", "agent_router", "model_router", "tool_router"]
+__all__ = ["agent_router", "model_router", "tool_router"]