From d21e0e4934495defc79d3e08d9545be21bc6b674 Mon Sep 17 00:00:00 2001 From: yeonsu Date: Mon, 20 May 2024 14:50:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix=20db=20url=20url=20=EB=AF=BC=EA=B0=90?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20.env=EB=A1=9C=20=EB=B9=BC=EB=86=93?= =?UTF-8?q?=EC=95=98=EC=8A=B5=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index fbaec9d1c9..eada7b9bbe 100644 --- a/main.py +++ b/main.py @@ -23,6 +23,8 @@ from sklearn.impute import SimpleImputer from request import Recommend +import os + state_lock = Lock() @@ -50,7 +52,7 @@ class DataModel(BaseModel): user: UserCategory post: PostCategory -DATABASE_URL = "postgresql://cheesecrust:0810jack@mydatabase.c3kmc4wcyz81.ap-northeast-2.rds.amazonaws.com/maru" +DATABASE_URL = f"postgresql://{os.getenv('DB_USER')}:{os.getenv('DB_PASSWORD')}@{os.getenv('DB_HOST')}:{os.getenv('DB_PORT')}/{os.getenv('DB_NAME')}" # DATABASE_URL = "postgresql://localhost:5432/maru" database = Database(DATABASE_URL) From 60afb0533734e7d19a78a4fd25d1a82570e38bc1 Mon Sep 17 00:00:00 2001 From: yeonsu Date: Mon, 20 May 2024 22:04:26 +0900 Subject: [PATCH 2/3] fix query --- __pycache__/main.cpython-310.pyc | Bin 6452 -> 9807 bytes main.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc index 25da000c53adc56a814530c7d24a205176a6994d..74579e9fb94bb252ed5608c6b2e9e72dcea105f0 100644 GIT binary patch literal 9807 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 b!+0#6F=9sC7&bHmUvr6Do9%cT9rFJI9$nsl literal 6452 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 Jk$LV3_TROR6>b0k diff --git a/main.py b/main.py index eada7b9bbe..675cb42e9e 100644 --- a/main.py +++ b/main.py @@ -184,7 +184,7 @@ async def fetch_data(user_id, card_type, want_to_find): user_location = "성북구" if user['location'] != 'default': - user['location'].split()[1] + user_location = user['location'].split()[1] user_gender = user['gender'] From 772283a3d8f054b31de508eff94e207057a2ae9f Mon Sep 17 00:00:00 2001 From: yeonsu Date: Mon, 20 May 2024 22:07:56 +0900 Subject: [PATCH 3/3] fix deploy --- .github/workflows/deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f612741da1..cdb18e8931 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -45,6 +45,9 @@ jobs: git pull + touch .env + echo "${{ secrets.ENV }}" > .env + docker stop maru-rec-sys-container docker rm maru-rec-sys-container