From 1a858cd47d8b52748b0ed379d5681ec2c4439410 Mon Sep 17 00:00:00 2001 From: monosans Date: Fri, 6 Oct 2023 10:37:16 +0300 Subject: [PATCH] Refactor file operations --- api/backup_manager/main.py | 15 ++++++++------- api/core.py | 17 +++++++++++------ api/db/providerkeys.py | 8 +++++--- api/db/users.py | 2 +- api/handler.py | 5 +++-- api/providers/__main__.py | 4 ++-- api/proxies.py | 2 +- requirements.txt | 1 + rewards/main.py | 2 +- 9 files changed, 33 insertions(+), 23 deletions(-) diff --git a/api/backup_manager/main.py b/api/backup_manager/main.py index d7db852..a55f89c 100644 --- a/api/backup_manager/main.py +++ b/api/backup_manager/main.py @@ -1,6 +1,8 @@ import os import json import asyncio +import aiofiles +import aiofiles.os from sys import argv from bson import json_util @@ -18,8 +20,7 @@ async def main(output_dir: str): 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) + await aiofiles.os.makedirs(output_dir, exist_ok=True) client = AsyncIOMotorClient(MONGO_URI) databases = await client.list_database_names() @@ -29,22 +30,22 @@ async def make_backup(output_dir: str): if database == 'local': continue - if not os.path.exists(f'{output_dir}/{database}'): - os.mkdir(f'{output_dir}/{database}') + await aiofiles.os.makedirs(os.path.join(output_dir, database), exist_ok=True) for collection in databases[database]: print(f'Initiated database 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 = os.path.join(output_dir, database, f'{collection}.json') client = AsyncIOMotorClient(MONGO_URI) collection = client[database][collection] documents = await collection.find({}).to_list(length=None) - with open(path, 'w') as f: - json.dump(documents, f, default=json_util.default) + async with aiofiles.open(path, 'w') as f: + for chunk in json.JSONEncoder(default=json_util.default).iterencode(documents): + await f.write(chunk) if __name__ == '__main__': if len(argv) < 2 or len(argv) > 2: diff --git a/api/core.py b/api/core.py index f802e20..059b122 100644 --- a/api/core.py +++ b/api/core.py @@ -13,6 +13,7 @@ import json import hmac import httpx import fastapi +import aiofiles import functools from dhooks import Webhook, Embed @@ -148,11 +149,14 @@ async def run_checks(incoming_request: fastapi.Request): async def get_crypto_price(cryptocurrency: str) -> float: """Gets the price of a cryptocurrency using coinbase's API.""" - if os.path.exists('cache/crypto_prices.json'): - with open('cache/crypto_prices.json', 'r') as f: - cache = json.load(f) - else: + cache_path = os.path.join('cache', 'crypto_prices.json') + try: + async with aiofiles.open(cache_path) as f: + content = await f.read() + except FileNotFoundError: cache = {} + else: + cache = json.loads(content) is_old = time.time() - cache.get('_last_updated', 0) > 60 * 60 @@ -164,8 +168,9 @@ async def get_crypto_price(cryptocurrency: str) -> float: cache[cryptocurrency] = usd_price cache['_last_updated'] = time.time() - with open('cache/crypto_prices.json', 'w') as f: - json.dump(cache, f) + async with aiofiles.open(cache_path, 'w') as f: + for chunk in json.JSONEncoder().iterencode(cache): + await f.write(chunk) return cache[cryptocurrency] diff --git a/api/db/providerkeys.py b/api/db/providerkeys.py index 4e11253..a75b95f 100644 --- a/api/db/providerkeys.py +++ b/api/db/providerkeys.py @@ -2,6 +2,8 @@ import os import time import asyncio +import aiofiles +import aiofiles.os from dotenv import load_dotenv from motor.motor_asyncio import AsyncIOMotorClient @@ -60,10 +62,10 @@ class KeyManager: db = await self._get_collection('providerkeys') num = 0 - for filename in os.listdir('api/secret'): + for filename in await aiofiles.os.listdir(os.path.join('api', 'secret')): if filename.endswith('.txt'): - with open(f'api/secret/{filename}') as f: - for line in f.readlines(): + async with aiofiles.open(os.path.join('api', 'secret', 'filename')) as f: + for line in await f.readlines(): if not line.strip(): continue diff --git a/api/db/users.py b/api/db/users.py index 2e325d4..3328c35 100644 --- a/api/db/users.py +++ b/api/db/users.py @@ -14,7 +14,7 @@ except ImportError: load_dotenv() -with open(helpers.root + '/api/config/config.yml', encoding='utf8') as f: +with open(os.path.join(helpers.root, 'api', 'config', 'config.yml'), encoding='utf8') as f: credits_config = yaml.safe_load(f) ## MONGODB Setup diff --git a/api/handler.py b/api/handler.py index d13b893..3d37abc 100644 --- a/api/handler.py +++ b/api/handler.py @@ -19,10 +19,11 @@ from helpers import tokens, errors, network load_dotenv() users = UserManager() -models_list = json.load(open('cache/models.json', encoding='utf8')) +with open(os.path.join('cache', 'models.json'), encoding='utf8') as f: + models_list = json.load(f) models = [model['id'] for model in models_list['data']] -with open('config/config.yml', encoding='utf8') as f: +with open(os.path.join('config', 'config.yml'), encoding='utf8') as f: config = yaml.safe_load(f) moderation_debug_key_key = os.getenv('MODERATION_DEBUG_KEY') diff --git a/api/providers/__main__.py b/api/providers/__main__.py index dc4b65d..f61bb47 100644 --- a/api/providers/__main__.py +++ b/api/providers/__main__.py @@ -16,9 +16,9 @@ try: provider_name = sys.argv[1] if provider_name == '--clear': - for file in os.listdir('secret/'): + for file in os.listdir('secret'): if file.endswith('.txt'): - remove_duplicate_keys(f'secret/{file}') + remove_duplicate_keys(os.path.join('secret', file)) exit() diff --git a/api/proxies.py b/api/proxies.py index 6b9568a..f234363 100644 --- a/api/proxies.py +++ b/api/proxies.py @@ -96,7 +96,7 @@ proxies_in_files = [] for proxy_type in ['http', 'socks4', 'socks5']: try: - with open(f'secret/proxies/{proxy_type}.txt') as f: + with open(os.path.join('secret', 'proxies', f'{proxy_type}.txt')) as f: for line in f: clean_line = line.split('#', 1)[0].strip() if clean_line: diff --git a/requirements.txt b/requirements.txt index 4b45671..d7e366c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +aiofiles==23.2.1 aiohttp==3.8.5 aiohttp_socks==0.8.0 dhooks==1.1.4 diff --git a/rewards/main.py b/rewards/main.py index cac3e61..710bdb0 100644 --- a/rewards/main.py +++ b/rewards/main.py @@ -51,7 +51,7 @@ async def update_roles(): def launch(): asyncio.run(main()) - with open('rewards/last_update.txt', 'w', encoding='utf8') as f: + with open(os.path.join('rewards', 'last_update.txt'), 'w', encoding='utf8') as f: f.write(str(time.time())) if __name__ == '__main__':