diff --git a/app/generate_session_string.py b/app/generate_session_string.py index 124922b..6cace64 100644 --- a/app/generate_session_string.py +++ b/app/generate_session_string.py @@ -3,8 +3,8 @@ import os from telethon.sync import TelegramClient from telethon.sessions import StringSession -api_id = int(os.environ.get('API_ID') or input("Enter your API_ID: ")) -api_hash = os.environ.get('API_HASH') or input("Enter your API_HASH: ") +api_id = int(os.getenv('API_ID') or input("Enter your API_ID: ")) +api_hash = os.getenv('API_HASH') or input("Enter your API_HASH: ") with TelegramClient(StringSession(), api_id, api_hash) as client: - print(client.session.save()) + print("\n" + client.session.save()) diff --git a/poetry.lock b/poetry.lock index 7f40498..426ad46 100644 --- a/poetry.lock +++ b/poetry.lock @@ -134,7 +134,7 @@ python-versions = "*" [[package]] name = "python-dotenv" -version = "0.17.1" +version = "0.18.0" description = "Read key-value pairs from a .env file and set them as environment variables" category = "main" optional = false @@ -192,7 +192,7 @@ multidict = ">=4.0" [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "92e2ad6db6a5f87406f6790eb064f5c943fc3b24e60ad02586aae3790fce3bee" +content-hash = "422fb1b4353f5fa977e395da869403ba1478d48b4e147489f404bfcab97a232f" [metadata.files] aiohttp = [ @@ -356,8 +356,8 @@ pyasn1 = [ {file = "pyasn1-0.4.8.tar.gz", hash = "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba"}, ] python-dotenv = [ - {file = "python-dotenv-0.17.1.tar.gz", hash = "sha256:b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"}, - {file = "python_dotenv-0.17.1-py2.py3-none-any.whl", hash = "sha256:00aa34e92d992e9f8383730816359647f358f4a3be1ba45e5a5cefd27ee91544"}, + {file = "python-dotenv-0.18.0.tar.gz", hash = "sha256:effaac3c1e58d89b3ccb4d04a40dc7ad6e0275fda25fd75ae9d323e2465e202d"}, + {file = "python_dotenv-0.18.0-py2.py3-none-any.whl", hash = "sha256:dd8fe852847f4fbfadabf6183ddd4c824a9651f02d51714fa075c95561959c7d"}, ] rsa = [ {file = "rsa-4.7.2-py3-none-any.whl", hash = "sha256:78f9a9bf4e7be0c5ded4583326e7461e3a3c5aae24073648b4bdfa797d78c9d2"}, diff --git a/requirements.txt b/requirements.txt index 97e7e40..63ec702 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -aiohttp +aiohttp[speedups] aiohttp-jinja2 telethon>=1.16.4 cryptg diff --git a/run-dev.py b/run-dev.py index 2f9fa0d..48c7757 100644 --- a/run-dev.py +++ b/run-dev.py @@ -8,26 +8,26 @@ load_dotenv() # take environment variables from .env. # os.system("alias python3=python") - def runSetup(): - def alert(missing="API_ID , API_HASH"): + def alert(missing): print( - f"\nCopy your {missing} and save it into Secrets(Environment variables) Sidebar!\n" + f"\nCopy your {missing} and save it into Secrets (Environment variables) Sidebar!\n" ) - api_id = os.getenv("API_ID") - if api_id is None: - alert() - return + req_env_vars = ["API_ID", "API_HASH", "INDEX_SETTINGS"] - session_string = os.getenv("SESSION_STRING") - if session_string is None: + for env_var in req_env_vars: + env_value = os.getenv(env_var) + if env_value is None: + alert(env_var) + return + + if os.getenv("SESSION_STRRING") is None: os.system("python app/generate_session_string.py") - alert(missing="SESSION_STRING") + print("\nCopy your SESSION_STRING from above and save it into Secrets (Environment variables) Sidebar!") return os.system("python -m app") - if __name__ == "__main__": runSetup() diff --git a/run-repl.py b/run-repl.py index 3d28cc4..50e0c78 100644 --- a/run-repl.py +++ b/run-repl.py @@ -1,39 +1,30 @@ import os -# from dotenv import load_dotenv - -# load_dotenv() # take environment variables from .env. # Code of your application, which uses environment variables (e.g. from `os.environ` or # `os.getenv`) as if they came from the actual environment. os.system("alias python3=python") - def runSetup(): - def alert(missing="API_ID , API_HASH"): + def alert(missing): print( - f"\nCopy your {missing} and save it into Secrets(Environment variables) Sidebar!\n" + f"\nCopy your {missing} and save it into Secrets (Environment variables) Sidebar!\n" ) req_env_vars = ["API_ID", "API_HASH", "INDEX_SETTINGS"] - misssing_envs = False - for env_var in req_env_vars: - env_value = os.getenv(env_var ) - if env_value is None: - misssing_envs = True - alert(env_var) - - if misssing_envs: - return - session_string = os.getenv("SESSION_STRING") - if session_string is None: + for env_var in req_env_vars: + env_value = os.getenv(env_var) + if env_value is None: + alert(env_var) + return + + if os.getenv("SESSION_STRING") is None: os.system("python app/generate_session_string.py") - alert(missing="SESSION_STRING") + print("\nCopy your SESSION_STRING from above and save it into Secrets (Environment variables) Sidebar!") return os.system("python -m app") - if __name__ == "__main__": runSetup()