From e89461a6aea526be5acf677fdee732467a8cc332 Mon Sep 17 00:00:00 2001 From: Abhi <85984486+AbhiTheModder@users.noreply.github.com> Date: Thu, 4 Jan 2024 23:27:16 +0000 Subject: [PATCH] Add: os.environ if `.env` is not present --- Procfile | 2 +- app.py | 10 ++++++++++ requirements.txt | 1 + run_command.txt | 1 + utils/config.py | 34 +++++++++++++++++++--------------- 5 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 app.py create mode 100644 run_command.txt diff --git a/Procfile b/Procfile index eb131d6..469ae06 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -worker: python3 main.py +web: python3 main.py diff --git a/app.py b/app.py new file mode 100644 index 0000000..85aa94c --- /dev/null +++ b/app.py @@ -0,0 +1,10 @@ +from flask import Flask +app = Flask(__name__) + +@app.route('/') +def hello_world(): + return 'This is Moon' + + +if __name__ == "__main__": + app.run() \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index b02e724..2915a1b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ pyrofork tgcrypto wheel +flask humanize pygments ffmpeg-python diff --git a/run_command.txt b/run_command.txt new file mode 100644 index 0000000..974c034 --- /dev/null +++ b/run_command.txt @@ -0,0 +1 @@ +gunicorn app:app & python3 main.py \ No newline at end of file diff --git a/utils/config.py b/utils/config.py index ea31857..0818567 100644 --- a/utils/config.py +++ b/utils/config.py @@ -1,22 +1,26 @@ +import os import environs -env = environs.Env() -env.read_env("./.env") +try: + env = environs.Env() + env.read_env("./.env") +except FileNotFoundError: + print("No .env file found, using os.environ.") -api_id = env.int("API_ID") -api_hash = env.str("API_HASH") +api_id = int(os.getenv("API_ID", env.int("API_ID"))) +api_hash = os.getenv("API_HASH", env.str("API_HASH")) -db_type = env.str("DATABASE_TYPE") -db_url = env.str("DATABASE_URL", "") -db_name = env.str("DATABASE_NAME") +db_type = os.getenv("DATABASE_TYPE", env.str("DATABASE_TYPE")) +db_url = os.getenv("DATABASE_URL", env.str("DATABASE_URL", "")) +db_name = os.getenv("DATABASE_NAME", env.str("DATABASE_NAME")) -apiflash_key = env.str("APIFLASH_KEY") -rmbg_key = env.str("RMBG_KEY") -vt_key = env.str("VT_KEY") -gemini_key = env.str("GEMINI_KEY") -vca_api_key = env.str("VCA_API_KEY") +apiflash_key = os.getenv("APIFLASH_KEY", env.str("APIFLASH_KEY")) +rmbg_key = os.getenv("RMBG_KEY", env.str("RMBG_KEY")) +vt_key = os.getenv("VT_KEY", env.str("VT_KEY")) +gemini_key = os.getenv("GEMINI_KEY", env.str("GEMINI_KEY")) +vca_api_key = os.getenv("VCA_API_KEY", env.str("VCA_API_KEY")) -pm_limit = env.int("PM_LIMIT") +pm_limit = int(os.getenv("PM_LIMIT", env.int("PM_LIMIT"))) -test_server = env.bool("TEST_SERVER", False) -modules_repo_branch = env.str("MODULES_REPO_BRANCH", "master") \ No newline at end of file +test_server = bool(os.getenv("TEST_SERVER", env.bool("TEST_SERVER", False))) +modules_repo_branch = os.getenv("MODULES_REPO_BRANCH", env.str("MODULES_REPO_BRANCH", "master"))