Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/befly-prod-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,22 @@ jobs:
- name: Push to Docker Hub
run: |
docker push ${{ secrets.DOCKER_USERNAME }}/befly-ai:${{ steps.vars.outputs.sha }}

- name: Checkout Manifests Repo
uses: actions/checkout@v3
with:
repository: KEA-ReNov8/Befly-Minifest
path: manifest-repo
token: ${{ secrets.PAT }}

- name: Bump image tag in consult-service deployment
run: |
cd manifest-repo
IMAGE=${{ secrets.DOCKER_USERNAME }}/befly-ai:${{ steps.vars.outputs.sha }}
# apps/consult-service/deployment.yaml 의 image ν•„λ“œλ§Œ ꡐ체
yq eval -i ".spec.template.spec.containers[0].image = \"${IMAGE}\"" apps/consult-service/deployment.yaml
git add apps/consult-service/deployment.yaml
git config user.name "github-actions"
git config user.email "actions@github.com"
git commit -m "ci: bump consult-service image to ${{ steps.vars.outputs.sha }}"
git push origin main
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt
COPY . .
EXPOSE 8000
CMD ["/bin/bash", "-c", "echo 'Befly AI App Starting...' && gunicorn app.main:app --workers 4 --worker-class uvicorn.workers.UvicornWorker --bind 0.0.0.0:8000"]
CMD ["/bin/bash", "-c", "echo 'Befly AI App Starting...' && uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload"]
#CMD ["/bin/bash", "-c", "echo 'Befly AI App Starting...' && gunicorn app.main:app --workers 4 --worker-class uvicorn.workers.UvicornWorker --bind 0.0.0.0:8000"]
19 changes: 19 additions & 0 deletions app/api/routes/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ async def chat_history(
):
headers = request.headers
user_id = headers.get("X-USER-ID")
print("user_id", user_id)
model = await ChatService.get_chat_history(session_id, user_id)
return ResponseModel(
code = "common200",
Expand All @@ -74,6 +75,23 @@ async def chat_history(
)


@router.get("/list/all",
response_model=ResponseModel,
summary="μ±„νŒ…λ°© λͺ©λ‘ 전체 쑰회",
description="μœ μ €μ˜ μ±„νŒ… λͺ©λ‘μ„ 쑰건 없이 λͺ¨λ‘ μ‘°νšŒν•©λ‹ˆλ‹€."
)
async def list_all(
request: Request,
):
user_id = request.headers.get("X-USER-ID")
model = await ChatService.get_all_chat(user_id)
return ResponseModel(
code="COMMON200",
message="λͺ¨λ“  μ±„νŒ… λͺ©λ‘μž…λ‹ˆλ‹€.",
result = model
)


@router.get("/list/{status_field}",
response_model=ResponseModel,
summary="μ±„νŒ…λ°© λͺ©λ‘ 쑰회",
Expand Down Expand Up @@ -108,6 +126,7 @@ async def evaluate_user(
request: Request
):
user_id = request.headers.get("X-USER-ID")
print(user_id)
model = await ChatService.evaluate_user(session_id, user_id)
return ResponseModel(
code="COMMON200",
Expand Down
6 changes: 3 additions & 3 deletions app/main.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
from fastapi import FastAPI, Depends
from fastapi.security import APIKeyHeader
from fastapi.security import APIKeyCookie

from app.api.routes.chat import router as chat_router
from app.core.config import settings
from app.Exception.handlers import setup_exception_handlers


bearer_header = APIKeyHeader(name="Authorization", auto_error=False, description="μ•‘μ„ΈμŠ€ 토큰 (Bearer ν˜•μ‹)")
cookie_scheme = APIKeyCookie(name="accessToken", auto_error=False, description="μ•‘μ„ΈμŠ€ 토큰 (μΏ ν‚€)")
app = FastAPI(
title=settings.APP_NAME,
dependencies=[
Depends(bearer_header)
Depends(cookie_scheme)
]
)

Expand Down
8 changes: 8 additions & 0 deletions app/prompt/evaulatorAI.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@
μžμ‹ μ„ λ‹€λ₯Έ μ‚¬λžŒλ“€κ³Ό λΉ„κ΅ν–ˆμ„ λ•Œ λŠλΌλŠ” 감정을 μ§ˆλ¬Έν•©λ‹ˆλ‹€.
μžμ‹ μ˜ μž₯점과 단점에 λŒ€ν•œ 인식을 μ§ˆλ¬Έν•©λ‹ˆλ‹€.

우울감 (PHQ-9 κ΄€λ ¨):
μΌμƒμƒν™œμ—μ„œ 즐거움을 λŠλΌμ§€ λͺ»ν•˜λŠ” λΉˆλ„μ™€ 정도λ₯Ό μ§ˆλ¬Έν•©λ‹ˆλ‹€.
μŠ¬ν””, 우울감, 절망감의 지속 μ‹œκ°„κ³Ό 영ν–₯을 νŒŒμ•…ν•©λ‹ˆλ‹€.
μˆ˜λ©΄μ΄λ‚˜ μ‹μš•μ˜ λ³€ν™”, ν”Όλ‘œκ°, λ¬΄κ°€μΉ˜ν•¨μ— λŒ€ν•œ 인식을 ν‰κ°€ν•©λ‹ˆλ‹€.
집쀑λ ₯ μ €ν•˜, 느린 μ›€μ§μž„ λ˜λŠ” μ΄ˆμ‘°ν•¨μ˜ 유무λ₯Ό μ§ˆλ¬Έν•©λ‹ˆλ‹€.
μžμ‚΄ μ‚¬κ³ λ‚˜ 자기 ν•΄λ₯Ό κ°€ν•˜λ €λŠ” 생각이 μžˆμ—ˆλŠ”μ§€ λ―Όκ°ν•˜κ²Œ μ§ˆλ¬Έν•©λ‹ˆλ‹€.
μ΄λŸ¬ν•œ 증상듀이 일상 κΈ°λŠ₯(일, κ°€μ‘±, 인간관계)에 μ–Όλ§ˆλ‚˜ 영ν–₯을 λ―Έμ³€λŠ”μ§€ νŒŒμ•…ν•©λ‹ˆλ‹€.


슀트레슀 (μ§€κ°λœ 슀트레슀 척도 - PSS κ΄€λ ¨):
μΌμƒμƒν™œμ—μ„œ 슀트레슀λ₯Ό λŠλΌλŠ” 정도와 λΉˆλ„λ₯Ό μ§ˆλ¬Έν•©λ‹ˆλ‹€.
Expand Down
13 changes: 12 additions & 1 deletion app/repository/chat_repository.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from typing import Optional

from motor.motor_asyncio import AsyncIOMotorCursor

from app.database.MongoDB import get_db
from app.core.config import settings

Expand All @@ -14,7 +16,7 @@ async def find_sessions_by_user(user_id: str, status_field: Optional[bool] = Non
return await db[settings.MONGODB_COLLECTION].distinct("session_id", query)

@staticmethod
async def find_session_info(session_id: str, status_field: Optional[bool] = None):
async def find_session_info(session_id: str, status_field):
db = get_db()
query = {"session_id": session_id}

Expand All @@ -26,3 +28,12 @@ async def find_session_info(session_id: str, status_field: Optional[bool] = None
query,
sort=[("created_at", -1)]
)

@staticmethod
async def get_all_chat(user_id: str):
db = get_db()
query = {"user_id": user_id}
cursor: AsyncIOMotorCursor = db[settings.MONGODB_COLLECTION].find(query, sort=[("created_at", -1)])
chat_docs = await cursor.to_list(length=None)
print(f"Found {len(chat_docs)} chats for user_id: {user_id}")
return chat_docs
21 changes: 20 additions & 1 deletion app/service/chat_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,23 @@ async def get_chat_list(user_id: str, status_field: bool):

return chat_list

async def get_all_chat(user_id: str):
chat_list = await ChatRepository.get_all_chat(user_id)
all_chat = []

for chat in chat_list:
if chat:
all_chat.append({
"session_id": chat.get("session_id"),
"chat_title": chat.get("chat_title"),
"created_at": chat.get("created_at"),
"last_message": chat.get("content", ""),
"category": chat.get("category"),
"status": chat.get("worry_state")
})
return all_chat


@staticmethod
async def evaluate_user(session_id: str, user_id: str):
try:
Expand Down Expand Up @@ -182,4 +199,6 @@ async def update_after_keyword_and_change_status(session_id: str, data_dict: dic
return None
except Exception as e:
print(e)
raise CustomException(500, "CHAT002", "μ±„νŒ… μ„Έμ…˜ μ—…λ°μ΄νŠΈ 쀑 였λ₯˜κ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€.")
raise CustomException(500, "CHAT002", "μ±„νŒ… μ„Έμ…˜ μ—…λ°μ΄νŠΈ 쀑 였λ₯˜κ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€.")


2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ python-json-logger # κ΅¬μ‘°ν™”λœ λ‘œκΉ…
asyncio # 비동기 처리
httpx # 비동기 HTTP ν΄λΌμ΄μ–ΈνŠΈ
motor
langchain-google-genai
langchain-google-genai