From d9e181eed6f29138db86e872dae837f819a85eb9 Mon Sep 17 00:00:00 2001 From: JiHoon Date: Tue, 23 Sep 2025 12:01:52 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=EB=AA=A8=EB=8D=B8=20=EB=B0=8F=20?= =?UTF-8?q?blogger=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pre-processing-service/.dockerignore | 8 ++++---- .../app/service/blog/blogger_blog_post_adapter.py | 2 +- .../app/service/blog/blogger_blog_post_service.py | 6 +++--- .../app/utils/similarity_analyzer.py | 2 +- docker/production-fastapi/docker-compose.yml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/pre-processing-service/.dockerignore b/apps/pre-processing-service/.dockerignore index 11ccfc7e..28e16925 100644 --- a/apps/pre-processing-service/.dockerignore +++ b/apps/pre-processing-service/.dockerignore @@ -19,7 +19,7 @@ scripts/ pytest-report.xml coverage.xml -klue_bert.onnx -token_dev_icebang5_gmail_com.pkl -credentials.json -blog_config.json \ No newline at end of file +models/klue_bert.onnx +blogger/token_dev_icebang5_gmail_com.pkl +blogger/credentials.json +blogger/blog_config.json \ No newline at end of file diff --git a/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py b/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py index 3f4a67e9..1a2b66f5 100644 --- a/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py +++ b/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py @@ -10,7 +10,7 @@ class BloggerBlogPostAdapter(BaseBlogPostService): 현재 BaseBlogPostService 인터페이스와 호환 """ - def __init__(self, config_file="blog_config.json"): + def __init__(self, config_file="blogger/blog_config.json"): # API 전용 서비스 (Adaptee) 먼저 초기화 self.api_service = BloggerApiService(config_file=config_file) diff --git a/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py b/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py index 8bdeb221..4adc4b6a 100644 --- a/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py +++ b/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py @@ -6,7 +6,7 @@ from google_auth_oauthlib.flow import InstalledAppFlow from app.errors.BlogPostingException import * from typing import Dict - +from loguru import logger class BloggerApiService: """ @@ -14,7 +14,7 @@ class BloggerApiService: 완전히 다른 초기화/인증 방식을 사용 """ - def __init__(self, config_file="blog_config.json"): + def __init__(self, config_file:str): self.config_file = config_file self.config = {} self.current_upload_account = None @@ -46,7 +46,7 @@ def authenticate_with_google_oauth(self) -> bool: if self.authenticated: return True - token_file = f"token_{self.current_upload_account.replace('@', '_').replace('.', '_')}.pkl" + token_file = f"blogger/token_{self.current_upload_account.replace('@', '_').replace('.', '_')}.pkl" try: creds = None diff --git a/apps/pre-processing-service/app/utils/similarity_analyzer.py b/apps/pre-processing-service/app/utils/similarity_analyzer.py index d4e7c0c5..94b67d6a 100644 --- a/apps/pre-processing-service/app/utils/similarity_analyzer.py +++ b/apps/pre-processing-service/app/utils/similarity_analyzer.py @@ -8,7 +8,7 @@ class SimilarityAnalyzerONNX: """ONNX 기반 텍스트 유사도 분석기""" - def __init__(self, model_path: str = "klue_bert.onnx"): + def __init__(self, model_path: str = "models/klue_bert.onnx"): try: logger.info("토크나이저 로딩 중: klue/bert-base") self.tokenizer = AutoTokenizer.from_pretrained("klue/bert-base") diff --git a/docker/production-fastapi/docker-compose.yml b/docker/production-fastapi/docker-compose.yml index 5149011e..76b0b85c 100644 --- a/docker/production-fastapi/docker-compose.yml +++ b/docker/production-fastapi/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - "80:8000" volumes: - - ~/app/blogger:/app + - ~/app/blogger:/app/blogger - ~/app/models:/app/models - logs_volume:/logs depends_on: From 41b2842e6842107ab8a35290b246ace23d55a491 Mon Sep 17 00:00:00 2001 From: JiHoon Date: Tue, 23 Sep 2025 12:02:25 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"fix=20:=20=EB=AA=A8=EB=8D=B8=20?= =?UTF-8?q?=EB=B0=8F=20blogger=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d9e181eed6f29138db86e872dae837f819a85eb9. --- apps/pre-processing-service/.dockerignore | 8 ++++---- .../app/service/blog/blogger_blog_post_adapter.py | 2 +- .../app/service/blog/blogger_blog_post_service.py | 6 +++--- .../app/utils/similarity_analyzer.py | 2 +- docker/production-fastapi/docker-compose.yml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/pre-processing-service/.dockerignore b/apps/pre-processing-service/.dockerignore index 28e16925..11ccfc7e 100644 --- a/apps/pre-processing-service/.dockerignore +++ b/apps/pre-processing-service/.dockerignore @@ -19,7 +19,7 @@ scripts/ pytest-report.xml coverage.xml -models/klue_bert.onnx -blogger/token_dev_icebang5_gmail_com.pkl -blogger/credentials.json -blogger/blog_config.json \ No newline at end of file +klue_bert.onnx +token_dev_icebang5_gmail_com.pkl +credentials.json +blog_config.json \ No newline at end of file diff --git a/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py b/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py index 1a2b66f5..3f4a67e9 100644 --- a/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py +++ b/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py @@ -10,7 +10,7 @@ class BloggerBlogPostAdapter(BaseBlogPostService): 현재 BaseBlogPostService 인터페이스와 호환 """ - def __init__(self, config_file="blogger/blog_config.json"): + def __init__(self, config_file="blog_config.json"): # API 전용 서비스 (Adaptee) 먼저 초기화 self.api_service = BloggerApiService(config_file=config_file) diff --git a/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py b/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py index 4adc4b6a..8bdeb221 100644 --- a/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py +++ b/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py @@ -6,7 +6,7 @@ from google_auth_oauthlib.flow import InstalledAppFlow from app.errors.BlogPostingException import * from typing import Dict -from loguru import logger + class BloggerApiService: """ @@ -14,7 +14,7 @@ class BloggerApiService: 완전히 다른 초기화/인증 방식을 사용 """ - def __init__(self, config_file:str): + def __init__(self, config_file="blog_config.json"): self.config_file = config_file self.config = {} self.current_upload_account = None @@ -46,7 +46,7 @@ def authenticate_with_google_oauth(self) -> bool: if self.authenticated: return True - token_file = f"blogger/token_{self.current_upload_account.replace('@', '_').replace('.', '_')}.pkl" + token_file = f"token_{self.current_upload_account.replace('@', '_').replace('.', '_')}.pkl" try: creds = None diff --git a/apps/pre-processing-service/app/utils/similarity_analyzer.py b/apps/pre-processing-service/app/utils/similarity_analyzer.py index 94b67d6a..d4e7c0c5 100644 --- a/apps/pre-processing-service/app/utils/similarity_analyzer.py +++ b/apps/pre-processing-service/app/utils/similarity_analyzer.py @@ -8,7 +8,7 @@ class SimilarityAnalyzerONNX: """ONNX 기반 텍스트 유사도 분석기""" - def __init__(self, model_path: str = "models/klue_bert.onnx"): + def __init__(self, model_path: str = "klue_bert.onnx"): try: logger.info("토크나이저 로딩 중: klue/bert-base") self.tokenizer = AutoTokenizer.from_pretrained("klue/bert-base") diff --git a/docker/production-fastapi/docker-compose.yml b/docker/production-fastapi/docker-compose.yml index 76b0b85c..5149011e 100644 --- a/docker/production-fastapi/docker-compose.yml +++ b/docker/production-fastapi/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - "80:8000" volumes: - - ~/app/blogger:/app/blogger + - ~/app/blogger:/app - ~/app/models:/app/models - logs_volume:/logs depends_on: From b7d74151a224d7b3790a2317ddb148060ee337e6 Mon Sep 17 00:00:00 2001 From: JiHoon Date: Tue, 23 Sep 2025 12:06:03 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=EB=AA=A8=EB=8D=B8=20=EB=B0=8F=20?= =?UTF-8?q?blogger=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/pre-processing-service/.dockerignore | 8 ++++---- .../app/service/blog/blogger_blog_post_adapter.py | 2 +- .../app/service/blog/blogger_blog_post_service.py | 2 +- .../app/utils/similarity_analyzer.py | 2 +- docker/production-fastapi/docker-compose.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/pre-processing-service/.dockerignore b/apps/pre-processing-service/.dockerignore index 11ccfc7e..28e16925 100644 --- a/apps/pre-processing-service/.dockerignore +++ b/apps/pre-processing-service/.dockerignore @@ -19,7 +19,7 @@ scripts/ pytest-report.xml coverage.xml -klue_bert.onnx -token_dev_icebang5_gmail_com.pkl -credentials.json -blog_config.json \ No newline at end of file +models/klue_bert.onnx +blogger/token_dev_icebang5_gmail_com.pkl +blogger/credentials.json +blogger/blog_config.json \ No newline at end of file diff --git a/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py b/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py index 3f4a67e9..1a2b66f5 100644 --- a/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py +++ b/apps/pre-processing-service/app/service/blog/blogger_blog_post_adapter.py @@ -10,7 +10,7 @@ class BloggerBlogPostAdapter(BaseBlogPostService): 현재 BaseBlogPostService 인터페이스와 호환 """ - def __init__(self, config_file="blog_config.json"): + def __init__(self, config_file="blogger/blog_config.json"): # API 전용 서비스 (Adaptee) 먼저 초기화 self.api_service = BloggerApiService(config_file=config_file) diff --git a/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py b/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py index 8bdeb221..ec7f3707 100644 --- a/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py +++ b/apps/pre-processing-service/app/service/blog/blogger_blog_post_service.py @@ -46,7 +46,7 @@ def authenticate_with_google_oauth(self) -> bool: if self.authenticated: return True - token_file = f"token_{self.current_upload_account.replace('@', '_').replace('.', '_')}.pkl" + token_file = f"blogger/token_{self.current_upload_account.replace('@', '_').replace('.', '_')}.pkl" try: creds = None diff --git a/apps/pre-processing-service/app/utils/similarity_analyzer.py b/apps/pre-processing-service/app/utils/similarity_analyzer.py index d4e7c0c5..94b67d6a 100644 --- a/apps/pre-processing-service/app/utils/similarity_analyzer.py +++ b/apps/pre-processing-service/app/utils/similarity_analyzer.py @@ -8,7 +8,7 @@ class SimilarityAnalyzerONNX: """ONNX 기반 텍스트 유사도 분석기""" - def __init__(self, model_path: str = "klue_bert.onnx"): + def __init__(self, model_path: str = "models/klue_bert.onnx"): try: logger.info("토크나이저 로딩 중: klue/bert-base") self.tokenizer = AutoTokenizer.from_pretrained("klue/bert-base") diff --git a/docker/production-fastapi/docker-compose.yml b/docker/production-fastapi/docker-compose.yml index 5149011e..76b0b85c 100644 --- a/docker/production-fastapi/docker-compose.yml +++ b/docker/production-fastapi/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - "80:8000" volumes: - - ~/app/blogger:/app + - ~/app/blogger:/app/blogger - ~/app/models:/app/models - logs_volume:/logs depends_on: