feat: init pytest workflow

feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow feat: init pytest workflow
petercat-ai · Aug 21, 2024 · bc3f47f · bc3f47f
1 parent 6fa72d3
commit bc3f47f
Show file tree

Hide file tree

Showing 34 changed files with 131 additions and 120 deletions.
diff --git a/.github/workflows/after-success.yml b/.github/workflows/after-success.yml
@@ -0,0 +1,14 @@
+name: After Success
+
+on:
+  workflow_run:
+    workflows: ["PR Tests"]
+    types:
+      - completed
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Confirm Success
+        run: echo "Previous workflow was successful!"
diff --git a/.github/workflows/aws-preview.yml b/.github/workflows/aws-preview.yml
@@ -2,7 +2,7 @@ name: Deploy Backend to Preview ECS
 
 on:
   workflow_run:
-    workflows: ["Build And Test"]
+    workflows: ["PR Tests"]
     types:
       - completed
 
@@ -14,11 +14,12 @@ env:
 permissions:
   id-token: write   # This is required for requesting the JWT
   contents: read    # This is required for actions/checkout
+  actions: write 
 
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    environment: production
+    environment: Preview
     strategy:
       fail-fast: true
 

diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
@@ -0,0 +1,16 @@
+name: PR Tests
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Run a simple test
+        run: echo "Running tests..."
diff --git a/.github/workflows/server-test.yml b/.github/workflows/server-test.yml
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ venv
 .next/
 out/
 
+.ruff_cache/
 
 # production
 build

diff --git a/Makefile b/Makefile
diff --git a/docs/guides/self_hosting_aws.md b/docs/guides/self_hosting_aws.md
@@ -0,0 +1,25 @@
+## Supabase Budget
+
+|Resources| Instances | Pricing |
+|---------|------|------|
+| Supabase   |   1   | $0
+
+
+## Infrastructure Budget
+
+|Resources| Instances | Pricing |
+|---------|------|------|
+| EC2 Container Registry (ECR)   |      | https://aws.amazon.com/cn/ecr/pricing/
+| Route 53 | 1 | $0.53
+| Secrets Manager | 1 | $0.40
+| S3 | Very Few | https://aws.amazon.com/cn/s3/pricing/
+| CloudFront | 2 | $0
+| Lambda | 4 | https://aws.amazon.com/cn/lambda/pricing/
+
+
+## LLM Budget
+
+|Resources| Instances | Pricing |
+|---------|------|------|
+| OpenAI   |  -    | https://openai.com/pricing/
+| Gemini flash | - | $0
diff --git a/petercat_utils/rag_helper/task.py b/petercat_utils/rag_helper/task.py
@@ -1,21 +1,21 @@
 import json
 from typing import Optional
+from github import Github
 
 import boto3
 
 from .git_doc_task import GitDocTask
 from .git_issue_task import GitIssueTask
 from .git_task import GitTask
 
-# Create SQS client
-sqs = boto3.client("sqs")
-
-from github import Github
-
 from ..utils.env import get_env_variable
 from ..data_class import TaskStatus, TaskType
 from ..db.client.supabase import get_client
 
+# Create SQS client
+sqs = boto3.client("sqs")
+
+
 g = Github()
 
 TABLE_NAME = "rag_tasks"

diff --git a/pyproject.toml b/pyproject.toml
@@ -6,11 +6,26 @@ authors = ["raoha.rh <[email protected]>"]
 readme = "README.md"
 packages = [{include = "petercat_utils"}]
 
+[tool.ruff]
+builtins = ["_"]
+
+[pytest]
+testpaths = ["tests"]
+pythonpath = "."
+consider_namespace_packages = "True"
+python_files = "test_*.py"
+cov="com"
+cov-report=["xml","html"]
+md_report = true
+md_report_verbose = 0
+md_report_color = "auto"
+
 [tool.poetry.dependencies]
 python = "^3.8"
 langchain_community = "^0.2.11"
 langchain_openai = "^0.1.20"
 langchain_core = "0.2.28"
+langchain = "^0.2.12"
 supabase = "2.6.0"
 pydantic = "2.7.0"
 PyGithub = "2.3.0"

diff --git a/server/agent/bot_builder.py b/server/agent/bot_builder.py
@@ -1,9 +1,9 @@
 from typing import AsyncIterator, Optional
 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.base import AgentBuilder
+from prompts.bot_builder import generate_prompt_by_user_id
+from tools import bot_builder
 
 
 TOOL_MAPPING = {

diff --git a/server/agent/qa_chat.py b/server/agent/qa_chat.py
@@ -2,9 +2,9 @@
 from petercat_utils import get_client
 from petercat_utils.data_class import ChatData
 
-from ..agent.base import AgentBuilder
-from ..prompts.bot_template import generate_prompt_by_repo_name
-from ..tools import issue, sourcecode, knowledge, git_info
+from agent.base import AgentBuilder
+from prompts.bot_template import generate_prompt_by_repo_name
+from tools import issue, sourcecode, knowledge, git_info
 
 
 def get_tools(bot_id: str, token: Optional[str]):

diff --git a/server/auth/get_user_info.py b/server/auth/get_user_info.py
@@ -1,5 +1,5 @@
 from typing import Annotated
-from fastapi import Cookie, HTTPException
+from fastapi import Cookie
 import httpx
 import secrets
 import random
@@ -8,7 +8,8 @@
 from .get_oauth_token import get_oauth_token
 from petercat_utils import get_client, get_env_variable
 
-random_str = lambda N: ''.join(random.SystemRandom().choice(string.ascii_uppercase + string.ascii_lowercase + string.digits) for _ in range(N))
+def random_str(N):
+    return ''.join(random.SystemRandom().choice(string.ascii_uppercase + string.ascii_lowercase + string.digits) for _ in range(N))
 
 AUTH0_DOMAIN = get_env_variable("AUTH0_DOMAIN")
 
@@ -70,7 +71,7 @@ async def get_user_id(petercat_user_token: Annotated[str | None, Cookie()] = Non
         user_info = await getUserInfoByToken(petercat_user_token)
         return user_info['id']
 
-    except Exception as e:
+    except Exception:
         return None
 
 async def get_user_access_token(petercat_user_token: Annotated[str | None, Cookie()] = None):
@@ -83,5 +84,5 @@ async def get_user_access_token(petercat_user_token: Annotated[str | None, Cooki
         access_token = await getUserAccessToken(user_id=user_info['id'])
         print(f"get_user_access_token: user_info={user_info}, access_token={access_token}")
         return access_token
-    except Exception as e:
+    except Exception:
         return None
diff --git a/server/bot/builder.py b/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 prompts.bot_template import generate_prompt_by_repo_name
 
 g = Github()
 

diff --git a/server/dao/authorizationDAO.py b/server/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 dao.BaseDAO import BaseDAO
+from models.authorization import Authorization
 
 class AuthorizationDAO(BaseDAO):
     client: Client

diff --git a/server/dao/repositoryConfigDAO.py b/server/dao/repositoryConfigDAO.py
@@ -1,8 +1,8 @@
 from supabase.client import Client
 from petercat_utils.db.client.supabase import get_client
 
-from ..dao.BaseDAO import BaseDAO
-from ..models.repository import RepositoryConfig
+from dao.BaseDAO import BaseDAO
+from models.repository import RepositoryConfig
 class RepositoryConfigDAO(BaseDAO):
     client: Client
 

diff --git a/server/event_handler/discussion.py b/server/event_handler/discussion.py
@@ -5,7 +5,7 @@
 
 from petercat_utils.data_class import ChatData, Message, TextContentBlock
 
-from ..agent.qa_chat import agent_chat
+from agent.qa_chat import agent_chat
 
 
 class DiscussionEventHandler:

diff --git a/server/event_handler/issue.py b/server/event_handler/issue.py
@@ -4,7 +4,7 @@
 
 from petercat_utils.data_class import ChatData, Message, TextContentBlock
 
-from ..agent.qa_chat import agent_chat
+from agent.qa_chat import agent_chat
 
 
 class IssueEventHandler:

diff --git a/server/main.py b/server/main.py
@@ -1,6 +1,4 @@
-import os
 
-import uvicorn
 from fastapi import FastAPI
 from starlette.middleware.sessions import SessionMiddleware
 from fastapi.middleware.cors import CORSMiddleware
@@ -9,7 +7,7 @@
 
 
 # Import fastapi routers
-from .routers import bot, health_checker, github, rag, auth, chat, task
+from routers import bot, health_checker, github, rag, auth, chat, task
 
 AUTH0_DOMAIN = get_env_variable("AUTH0_DOMAIN")
 API_AUDIENCE = get_env_variable("API_IDENTIFIER")

diff --git a/server/models/authorization.py b/server/models/authorization.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 import json
 from pydantic import BaseModel, field_serializer
-from typing import Any, Dict
+from typing import Dict
 
 class Authorization(BaseModel):
     token: str

diff --git a/server/pytest.ini b/server/pytest.ini
@@ -1,5 +1,7 @@
 [pytest]
-testpaths = .
+testpaths = tests
+rootdir=server
+consider_namespace_packages = True
 python_files = test_*.py
 cov=com
 cov-report=xml,html
diff --git a/server/requirements.txt b/server/requirements.txt
@@ -4,9 +4,8 @@ python-dotenv==1.0.0
 openai
 mangum
 langserve
-langchain_community
-langchain
-langchain-openai
+langchain_community>=0.2.11
+langchain>=0.2.12
 PyGithub
 GitPython
 python-multipart

diff --git a/server/routers/__init__.py b/server/routers/__init__.py
diff --git a/server/routers/auth.py b/server/routers/auth.py
@@ -4,7 +4,7 @@
 import httpx
 from petercat_utils import get_client, get_env_variable
 
-from ..auth.get_user_info import generateAnonymousUser, getAnonymousUserInfoByToken, getUserInfoByToken
+from auth.get_user_info import generateAnonymousUser, getAnonymousUserInfoByToken, getUserInfoByToken
 
 AUTH0_DOMAIN = get_env_variable("AUTH0_DOMAIN")
 

diff --git a/server/routers/bot.py b/server/routers/bot.py
@@ -3,9 +3,9 @@
 from petercat_utils import get_client
 from typing import Annotated, Optional
 
-from ..auth.get_user_info import get_user_id
-from ..bot.builder import bot_builder, bot_info_generator
-from ..type_class.bot import BotUpdateRequest, BotCreateRequest
+from auth.get_user_info import get_user_id
+from bot.builder import bot_builder, bot_info_generator
+from type_class.bot import BotUpdateRequest, BotCreateRequest
 
 router = APIRouter(
     prefix="/api/bot",

diff --git a/server/routers/chat.py b/server/routers/chat.py
@@ -3,9 +3,9 @@
 from fastapi.responses import StreamingResponse
 from petercat_utils.data_class import ChatData
 
-from ..agent import qa_chat, bot_builder
-from ..verify.rate_limit import verify_rate_limit
-from ..auth.get_user_info import get_user_access_token, get_user_id
+from agent import qa_chat, bot_builder
+from verify.rate_limit import verify_rate_limit
+from auth.get_user_info import get_user_access_token, get_user_id
 
 
 router = APIRouter(
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ venv @@
     .next/
     out/
+    .ruff_cache/
     # production
     build
@@ Expand Down @@