From 453c6e7430a8d710a218840daff8e86d6c906279 Mon Sep 17 00:00:00 2001 From: henceiusegentoo Date: Thu, 21 Sep 2023 22:38:12 +0200 Subject: [PATCH] Removed local from backups --- PUSH_TO_PRODUCTION.sh | 2 +- api/backup_manager/main.py | 34 +++++++++++++++++++--------------- checks/client.py | 4 ++-- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/PUSH_TO_PRODUCTION.sh b/PUSH_TO_PRODUCTION.sh index 60c7d38..d15b66c 100755 --- a/PUSH_TO_PRODUCTION.sh +++ b/PUSH_TO_PRODUCTION.sh @@ -4,7 +4,7 @@ # git commit -am "Auto-trigger - Production server started" && git push origin Production # backup database -/usr/local/bin/python /home/nova-api/backup_manager/main.py pre_prodpush +/usr/local/bin/python /home/nova-api/api/backup_manager/main.py pre_prodpush # Kill production server fuser -k 2333/tcp diff --git a/api/backup_manager/main.py b/api/backup_manager/main.py index 15a063e..4ecb1cf 100644 --- a/api/backup_manager/main.py +++ b/api/backup_manager/main.py @@ -1,21 +1,22 @@ -from dotenv import load_dotenv import os -from motor.motor_asyncio import AsyncIOMotorClient -from bson import json_util import json -from sys import argv import asyncio +from sys import argv +from bson import json_util +from dotenv import load_dotenv +from motor.motor_asyncio import AsyncIOMotorClient + load_dotenv() -MONGO_URI = os.getenv("MONGO_URI") +MONGO_URI = os.environ['MONGO_URI'] FILE_DIR = os.path.dirname(os.path.realpath(__file__)) -async def main(output_dir): +async def main(output_dir: str): await make_backup(output_dir) -async def make_backup(output_dir): - output_dir = os.path.join(FILE_DIR, "..", "backups", output_dir) +async def make_backup(output_dir: str): + output_dir = os.path.join(FILE_DIR, '..', 'backups', output_dir) if not os.path.exists(output_dir): os.makedirs(output_dir) @@ -25,26 +26,29 @@ async def make_backup(output_dir): databases = {db: await client[db].list_collection_names() for db in databases} for database in databases: - if not os.path.exists(f"{output_dir}/{database}"): - os.mkdir(f"{output_dir}/{database}") + if database == 'local': + continue + + if not os.path.exists(f'{output_dir}/{database}'): + os.mkdir(f'{output_dir}/{database}') for collection in databases[database]: - print(f"Making backup for {database}/{collection}") + print(f'Making backup for {database}/{collection}') await make_backup_for_collection(database, collection, output_dir) async def make_backup_for_collection(database, collection, output_dir): - path = f"{output_dir}/{database}/{collection}.json" + path = f'{output_dir}/{database}/{collection}.json' client = AsyncIOMotorClient(MONGO_URI) collection = client[database][collection] documents = await collection.find({}).to_list(length=None) - with open(path, "w") as f: + with open(path, 'w') as f: json.dump(documents, f, default=json_util.default) -if __name__ == "__main__": +if __name__ == '__main__': if len(argv) < 2 or len(argv) > 2: - print("Usage: python3 main.py ") + print('Usage: python3 main.py ') exit(1) output_dir = argv[1] diff --git a/checks/client.py b/checks/client.py index 6b4fbe4..de321f6 100644 --- a/checks/client.py +++ b/checks/client.py @@ -217,8 +217,8 @@ async def demo(): print('Checking streamed chat completions...') print(await test_chat_stream_gpt3()) - print('[lightblue]Checking if image generation works...') - print(await test_image_generation()) + # print('[lightblue]Checking if image generation works...') + # print(await test_image_generation()) print('Checking the models endpoint...') print(await test_models())