[FEAT] 자료 제목에 따른 추천 카테고리 (Proxy) #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Coldot merged 26 commits into main from feat/#5

Mar 21, 2025

.aws/ecs-task-definition.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,10 @@ @@
                 "mountPoints": [],
                 "volumesFrom": [],
                 "secrets": [
+                    {
+                        "name": "MONGODB_URL",
+                        "valueFrom": "arn:aws:secretsmanager:ap-northeast-2:864981757354:secret:xrpedia/credentials-UAy9x0:xrpedia-mongodb-url::"
+                    }
                 ],
                 "ulimits": [],
                 "logConfiguration": {
@@ Expand Down @@

.github/workflows/cd-ecs.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ env: @@
       ECS_TASK_DEFINITION: ${{ vars.ECS_TASK_DEFINITION }}
       CONTAINER_NAME: ${{ vars.CONTAINER_NAME }}
       TEST_IMAGE_NAME: xrpedia-ai-proxy-test
+      TEST_MONGODB_URL: ${{ secrets.TEST_MONGODB_URL }}
     permissions:
       contents: read
       id-token: write
@@ Expand Down Expand Up / @@ -49,6 +50,8 @@ jobs: @@
             id: run-test
             run: |
               docker run --rm \
+                -e MONGODB_URL=${{ env.TEST_MONGODB_URL }} \
+                -e AWS_REGION=${{ env.AWS_REGION }} \
                 ${{ env.TEST_IMAGE_NAME }}
           - name: Build, tag, and push image to Amazon ECR
@@ Expand Down @@

.github/workflows/ci-pytest.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ on: @@
     env:
       TEST_IMAGE_NAME: xrpedia-ai-proxy-test
+      TEST_MONGODB_URL: ${{ secrets.TEST_MONGODB_URL }}
+      AWS_REGION: ${{ secrets.AWS_REGION }}
     jobs:
       build:
@@ Expand All / @@ -22,4 +24,6 @@ jobs: @@
           id: run-test
           run: |
             docker run --rm \
+              -e AWS_REGION=${{ env.AWS_REGION }} \
+              -e MONGODB_URL=${{ env.TEST_MONGODB_URL }} \
               ${{ env.TEST_IMAGE_NAME }}

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -173,4 +173,6 @@ cython_debug/ @@
     # PyPI configuration file
     .pypirc
-    .DS_Store
+    .DS_Store
+    .doc/
+    .idea/

poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

pyproject.toml

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ boto3 = "^1.37.16" @@
     botocore = "^1.37.16"
     dotenv = "^0.9.9"
     httpx = "^0.28.1"
+    pymongo = "^4.11.3"
     [build-system]
     requires = ["poetry-core"]
@@ Expand Down @@

src/app.py

-Original file line number
+Diff line change
@@ -1,5 +1,7 @@
-    from fastapi import FastAPI
+    from fastapi import FastAPI, Request, status
     from fastapi.middleware.cors import CORSMiddleware
+    from fastapi.exceptions import RequestValidationError
+    from fastapi.responses import JSONResponse
     from dotenv import load_dotenv
     from src.router import router
@@ Expand All / @@ -26,4 +28,17 @@ @@
         allow_headers=["*"],
     )
+    @app.exception_handler(RequestValidationError)
+    async def validation_exception_handler(request: Request, exc: RequestValidationError):
+        return JSONResponse(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            content={
+                "status": 400,
+                "message": "잘못된 요청입니다.",
+                "detail": "명세에 맞지 않은 요청입니다."
+            }
+        )
     app.include_router(router)

src/main/ai/__init__.py

Empty file.

src/main/ai/data/CategoryRecommendationQueue.py

-Original file line number
+Diff line change
@@ -0,0 +1,35 @@
+    import os
+    import json
+    import boto3
+    from dotenv import load_dotenv
+    load_dotenv()
+    class CategoryRecommendationQueue:
+        def __init__(self, sqs_client: boto3.client, queue_url: str):
+            self.sqs = sqs_client
+            self.queue_url = queue_url
+        def send_message(self, request_id: str, title: str, user_id: str):
+            try:
+                message_body = {
+                    'request_type': 'category_recommendation',
+                    'request_id': request_id,
+                    'user_id': str(user_id),
+                    'payload': {
+                        'title': title
+                    }
+                }
+                response = self.sqs.send_message(
+                    QueueUrl=self.queue_url,
+                    MessageGroupId=str(user_id),
+                    MessageDeduplicationId=str(request_id),
+                    MessageBody=json.dumps(message_body)
+                )
+                return response
+            except Exception as e:
+                print(f"Error sending message to SQS: {e}")
+                raise

src/main/ai/data/CategoryRecommendationRepository.py

-Original file line number
+Diff line change
@@ -0,0 +1,56 @@
+    from typing import Optional
+    from pymongo.collection import Collection
+    from pymongo import MongoClient
+    from bson import ObjectId
+    from datetime import datetime, timezone
+    class CategoryRecommendationRepository:
+        def __init__(self, client: MongoClient):
+            self.db = client.get_database()
+            self.collection: Collection = self.db.get_collection('category_recommendations')
+        def create_recommendation_request(self, title: str, user_id: str) -> dict:
+            document = {
+                "title": title,
+                "user_id": user_id,
+                "is_completed": False,
+                "created_at": self.get_current_time()
+            }
+            result = self.collection.insert_one(document)
+            document["_id"] = result.inserted_id
+            return document
+        def get_recommendation_by_id(self, request_id: str, user_id: str) -> Optional[dict]:
+            try:
+                object_id = ObjectId(request_id)
+                return self.collection.find_one({
+                    "_id": object_id,
+                    "user_id": user_id
+                })
+            except:
+                return None
+        def update_recommendation_result(self, request_id: str, predicted_category: str) -> Optional[dict]:
+            try:
+                object_id = ObjectId(request_id)
+                result = self.collection.update_one(
+                    {"_id": object_id},
+                    {
+                        "$set": {
+                            "is_completed": True,
+                            "predicted_category": predicted_category,
+                            "updated_at": self.get_current_time()
+                        }
+                    }
+                )
+                if result.modified_count == 0:
+                    return None
+                return self.collection.find_one({"_id": object_id})
+            except:
+                return None
+        def get_current_time(self):
+            return datetime.now(timezone.utc)

src/main/ai/data/__init__.py

Empty file.

src/main/ai/di/__init__.py

Empty file.

src/main/ai/di/dependencies.py

-Original file line number
+Diff line change
@@ -0,0 +1,33 @@
+    import os
+    import boto3
+    from dotenv import load_dotenv
+    from src.main.ai.data.CategoryRecommendationRepository import CategoryRecommendationRepository
+    from src.main.ai.service.CategoryRecommendationService import CategoryRecommendationService
+    from src.main.ai.data.CategoryRecommendationQueue import CategoryRecommendationQueue
+    from src.main.config.mongodb import get_mongo_client
+    load_dotenv()
+    def get_category_recommendation_repository():
+        client = get_mongo_client()
+        return CategoryRecommendationRepository(client)
+    def get_category_recommendation_queue():
+        if os.getenv('ENV') == 'local':
+            aws_profile = os.getenv('AWS_PROFILE', 'default')
+            session = boto3.Session(profile_name=aws_profile)
+            sqs_client = session.client('sqs')
+        else:
+            sqs_client = boto3.client('sqs', region_name=os.getenv('AWS_REGION'))
+        queue_url = os.getenv('SQS_REQUEST_QUEUE_URL')
+        return CategoryRecommendationQueue(sqs_client, queue_url)
+    def get_category_recommendation_service():
+        repository = get_category_recommendation_repository()
+        queue = get_category_recommendation_queue()
+        return CategoryRecommendationService(repository, queue)

src/main/ai/models/CategoryRecommendation.py

-Original file line number
+Diff line change
@@ -0,0 +1,21 @@
+    from pydantic import BaseModel, Field
+    import uuid
+    from typing import Optional
+    class CategoryRecommendationRequest(BaseModel):
+        title: str
+    class CategoryRecommendationResponse(BaseModel):
+        request_id: str = Field(default_factory=lambda: str(uuid.uuid4()))
+    class CategoryRecommendationStatusResponse(BaseModel):
+        request_id: str
+        is_completed: bool
+        predicted_category: Optional[str] = None
+    class CategoryRecommendationResultRequest(BaseModel):
+        predicted_category: str

src/main/ai/models/__init__.py

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FEAT] 자료 제목에 따른 추천 카테고리 (Proxy) #6

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!