From f49af2b4d16460f2e7232e9da52b441e6a97caf0 Mon Sep 17 00:00:00 2001 From: honzapatCZ Date: Sun, 2 Apr 2023 12:05:49 +0200 Subject: [PATCH] Docker and env settings --- .dockerignore | 249 +++++++++++++++++++++++++++++++++++++++++++++- utils/settings.py | 40 ++++++++ 2 files changed, 288 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 1d1fe94..d6dd1db 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,248 @@ -Dockerfile \ No newline at end of file +Dockerfile + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +assets/ +/.vscode +out +.DS_Store +.setup-done-before +results/* +reddit-bot-351418-5560ebc49cac.json +/.idea +*.pyc +video_creation/data/videos.json +video_creation/data/envvars.txt + +video_creation/data/videos.json \ No newline at end of file diff --git a/utils/settings.py b/utils/settings.py index 221a09c..a9dfb52 100755 --- a/utils/settings.py +++ b/utils/settings.py @@ -1,4 +1,6 @@ +import os import re +import sys from typing import Tuple, Dict from pathlib import Path import toml @@ -123,6 +125,41 @@ def check_vars(path, checks): global config crawl_and_check(config, path, checks) +argMap = { + "USERNAME": ["reddit", "creds", "username"], + "PASSWORD": ["reddit", "creds", "password"], +} + +def recursive_update(path, value, obj): + if len(path) == 1: + obj[path[0]] = value + return obj + obj[path[0]] = recursive_update(path[1:], value, obj[path[0]]) + return obj + +def enrich_config_with_env(config): + dict = {} + # Iterate all environment variables + for key, value in os.environ.items(): + dict[key] = value + + # Iterate all program arguments + for str in sys.argv: + if "=" in str: + key, value = str.split("=") + dict[key] = value + else: + dict[str] = True + + # Iterate the argMap + for key, value in argMap.items(): + # If the key is in the dict, overwrite the value in the config + if key in dict: + console.print(f"[blue]Using {key} from env/args") + config = recursive_update(value, dict[key], config) + + return config + def check_toml(template_file, config_file) -> Tuple[bool, Dict]: global config @@ -167,6 +204,9 @@ Creating it now.""" f"[red bold]Failed to write to {config_file}. Giving up.\nSuggestion: check the folder's permissions for the user." ) return False + + # Enrich config with enviroment variables + config = enrich_config_with_env(config) console.print( """\