refactor: folder structure

server/agent/bot_builder.py

@@ -3,8 +3,8 @@
 from petercat_utils.data_class import ChatData
 
 from agent.base import AgentBuilder
-from prompts.bot_builder import generate_prompt_by_user_id
-from tools import bot_builder
+from agent.prompts.bot_builder import generate_prompt_by_user_id
+from agent.tools import bot_builder
 
 
 TOOL_MAPPING = {

server/agent/qa_chat.py

@@ -1,12 +1,12 @@
 from typing import AsyncIterator, Optional
 from agent.base import AgentBuilder
 from agent.llm import get_llm
-from dao.botDAO import BotDAO
-from models.bot import Bot
-from prompts.bot_template import generate_prompt_by_repo_name
+from core.dao.botDAO import BotDAO
+from core.models.bot import Bot
+from agent.prompts.bot_template import generate_prompt_by_repo_name
 from petercat_utils.data_class import ChatData
 
-from tools import issue, sourcecode, knowledge, git_info
+from agent.tools import issue, sourcecode, knowledge, git_info
 
 
 def get_tools(bot: Bot, token: Optional[str]):

server/tools/issue.py → server/agent/tools/issue.py

@@ -3,7 +3,7 @@
 from github import Auth, Github
 from langchain.tools import tool
 
-from tools.helper import need_github_login
+from agent.tools.helper import need_github_login
 
 DEFAULT_REPO_NAME = "ant-design/ant-design"
 

server/bot/builder.py

@@ -5,7 +5,7 @@
 from petercat_utils.data_class import RAGGitDocConfig
 from petercat_utils import git_doc_task
 
-from prompts.bot_template import generate_prompt_by_repo_name
+from agent.prompts.bot_template import generate_prompt_by_repo_name
 
 g = Github()
 

server/routers/bot.py → server/bot/router.py

@@ -5,7 +5,7 @@
 from typing import Annotated, Optional
 
 from bot.builder import bot_builder, bot_info_generator
-from type_class.bot import BotUpdateRequest, BotCreateRequest
+from core.type_class.bot import BotUpdateRequest, BotCreateRequest
 
 router = APIRouter(
     prefix="/api/bot",

server/routers/chat.py → server/chat/router.py

@@ -4,7 +4,7 @@
 from petercat_utils.data_class import ChatData
 
 from agent import qa_chat, bot_builder
-from verify.rate_limit import verify_rate_limit
+from auth.rate_limit import verify_rate_limit
 from auth.get_user_info import get_user_access_token, get_user_id
 
 

server/dao/authorizationDAO.py → server/core/dao/authorizationDAO.py

@@ -2,8 +2,8 @@
 
 from petercat_utils.db.client.supabase import get_client
 
-from dao.BaseDAO import BaseDAO
-from models.authorization import Authorization
+from core.dao.BaseDAO import BaseDAO
+from core.models.authorization import Authorization
 
 class AuthorizationDAO(BaseDAO):
     client: Client

server/dao/botDAO.py → server/core/dao/botDAO.py

@@ -1,7 +1,7 @@
-from dao.BaseDAO import BaseDAO
+from core.dao.BaseDAO import BaseDAO
 from supabase.client import Client
 
-from models.bot import Bot
+from core.models.bot import Bot
 from petercat_utils.db.client.supabase import get_client
 
 class BotDAO(BaseDAO):

server/dao/repositoryConfigDAO.py → server/core/dao/repositoryConfigDAO.py

@@ -1,6 +1,6 @@
 
-from dao.BaseDAO import BaseDAO
-from models.repository import RepositoryConfig
+from core.dao.BaseDAO import BaseDAO
+from core.models.repository import RepositoryConfig
 from supabase.client import Client
 
 from petercat_utils.db.client.supabase import get_client

server/core/models/bot.py

@@ -0,0 +1,13 @@
+from datetime import datetime
+from typing import Optional
+from pydantic import BaseModel
+
+class Bot(BaseModel):
+    id: str
+    uid: str
+    avatar: Optional[str] = ""
+    description: Optional[str]
+    prompt: Optional[str] = ""
+    name: str
+    llm: Optional[str] = "openai"
+    created_at: datetime 

server/event_handler/issue.py

@@ -2,7 +2,7 @@
 from github import Github, Auth
 from github import GithubException
 
-from dao.repositoryConfigDAO import RepositoryConfigDAO
+from core.dao.repositoryConfigDAO import RepositoryConfigDAO
 from petercat_utils.data_class import ChatData, Message, TextContentBlock
 
 from agent.qa_chat import agent_chat

server/utils/github.py → server/github_app/handlers.py

@@ -1,6 +1,5 @@
 from typing import Union
-import boto3
-from botocore.exceptions import ClientError
+
 from petercat_utils import get_env_variable
 from github import Auth
 
@@ -10,24 +9,6 @@
 
 APP_ID = get_env_variable("X_GITHUB_APP_ID")
 
-def get_private_key():
-    secret_name = "prod/githubapp/petercat/pem"
-    region_name = "ap-northeast-1"
-    session = boto3.session.Session()
-    client = session.client(
-        service_name='secretsmanager',
-        region_name=region_name
-    )
-    try:
-        get_secret_value_response = client.get_secret_value(
-            SecretId=secret_name
-        )
-    except ClientError as e:
-        # For a list of exceptions thrown, see
-        # https://docs.aws.amazon.com/secretsmanager/latest/apireference/API_GetSecretValue.html
-        raise e
-
-    return get_secret_value_response['SecretString']
 
 def get_handler(event: str, payload: dict, auth: Auth.AppAuth, installation_id: int) -> Union[PullRequestEventHandler, IssueEventHandler, DiscussionEventHandler, None]:
     handlers = {