diff --git a/README.md b/README.md index 74c26ac..4cbbb4a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,57 @@ # Monitor - Agent - Final Degree Project - Host to monitor + +Final Degree Project - Host to monitor + +## Uvicorn configuration + +In `settings.json` you could pass this parameters to Uvicorn server: + +```python +host: str +port: int +uds: str +fd: int +loop: str +http: str +ws: str +ws_max_size: int +ws_ping_interval: float +ws_ping_timeout: float +ws_per_message_deflate: bool +lifespan: str +debug: bool +reload: bool +reload_dirs: typing.List[str] +reload_includes: typing.List[str] +reload_excludes: typing.List[str] +reload_delay: float +workers: int +env_file: str +log_config: str +log_level: str +access_log: bool +proxy_headers: bool +server_header: bool +date_header: bool +forwarded_allow_ips: str +root_path: str +limit_concurrency: int +backlog: int +limit_max_requests: int +timeout_keep_alive: int +ssl_keyfile: str +ssl_certfile: str +ssl_keyfile_password: str +ssl_version: int +ssl_cert_reqs: int +ssl_ca_certs: str +ssl_ciphers: str +headers: typing.List[str] +use_colors: bool +app_dir: str +factory: bool +``` + +More information in their webpage - [Uvicorn Settings](https://www.uvicorn.org/settings/). + +> :warning: If any parameters is incorrect the server will crash. diff --git a/monitor_agent/main.py b/monitor_agent/main.py index 1ee4a44..fc74fd4 100644 --- a/monitor_agent/main.py +++ b/monitor_agent/main.py @@ -4,15 +4,17 @@ import uvicorn import logging import requests -from urllib3.exceptions import MaxRetryError, NewConnectionError -from fastapi import FastAPI, UploadFile, File -from fastapi_utils.tasks import repeat_every -from monitor_agent.core.helper import save2log from .settings import Settings -from .core.metricFunctions import send_metrics, send_metrics_adapter, static, dynamic from .core.command import Command +from fastapi import FastAPI, UploadFile +from fastapi_utils.tasks import repeat_every +from .core.metricFunctions import send_metrics, send_metrics_adapter, static, dynamic -config_file = Settings() +try: + CONFIG = Settings() +except json.decoder.JSONDecodeError as msg: + print('Error in "settings.json".', msg, file=sys.stderr) + exit() logger = logging.getLogger(__name__) api = FastAPI() @@ -25,10 +27,6 @@ "thresholds": "/thresholds", } -thresholds_dict = { - "cpu_percent": 50, - "ram_percent": 30, -} # GET @api.get(endpoints["root"]) @@ -38,10 +36,10 @@ async def root(): @api.get(endpoints["thresholds"]) async def thresholds(): - return {"thresholds": thresholds_dict} + return {"thresholds": CONFIG.thresholds.__dict__} -if config_file.metric_endpoint: +if CONFIG.metrics.get_endpoint: @api.get(endpoints["metrics"]) async def metrics_endpoint(): @@ -52,56 +50,32 @@ async def metrics_endpoint(): # POST @api.post(endpoints["command"]) async def command(command: str, timeout: int): - # if token: - # blablabla return Command(command, timeout).__dict__ @api.post(endpoints["settings"]) async def mod_settings(settings: UploadFile): - # if token: - # blablabla + global CONFIG data: str = settings.file.read().decode() - return config_file.write_settings(data) - - -@api.post(endpoints["thresholds"]) -async def mod_settings( - cpu_percent: float = thresholds_dict["cpu_percent"], - ram_percent: float = thresholds_dict["ram_percent"], -): - # if token: - # blablabla - thresholds_dict["cpu_percent"] = cpu_percent - thresholds_dict["ram_percent"] = ram_percent - return {"thresholds": thresholds_dict} + msg = CONFIG.write_settings(data) + CONFIG = Settings() + return msg @api.on_event("startup") -@repeat_every(seconds=config_file.post_interval, logger=logger, wait_first=True) +@repeat_every(seconds=CONFIG.metrics.post_interval, logger=logger, wait_first=True) def periodic(): # https://github.com/tiangolo/fastapi/issues/520 # https://fastapi-utils.davidmontague.xyz/user-guide/repeated-tasks/#the-repeat_every-decorator # Changed Timeloop for this elapsed_time, data = send_metrics_adapter([static, dynamic]) - try: - send_metrics( - url=config_file.post_metric_url, - elapsed_time=elapsed_time, - data=data, - file_enabled=config_file.metric_enable_file, - file_path=config_file.metric_file, - ) - except ( - ConnectionRefusedError, - requests.exceptions.ConnectionError, - NewConnectionError, - MaxRetryError, - ) as msg: - save2log( - type="ERROR", - data=f'Could not connect to "{config_file.post_metric_url}" ({msg})', - ) + send_metrics( + url=CONFIG.metrics.post_url, + elapsed_time=elapsed_time, + data=data, + file_enabled=CONFIG.metrics.enable_logfile, + file_path=CONFIG.metrics.log_filename, + ) alert = {} if data["cpu_percent"] >= thresholds_dict["cpu_percent"]: @@ -114,36 +88,15 @@ def periodic(): except KeyError as msg: pass if alert: - try: - r = requests.post(config_file.post_alert_url, json={"alert": alert}) - except requests.exceptions.MissingSchema: - # If invalid URL is provided - save2log( - type="ERROR", - data=f'Invalid POST URL for Alerts ("{config_file.post_alert_url}")', - ) + r = requests.post(CONFIG.alerts.url, json={"alert": alert}) def start(): """Launched with `poetry run start` at root level""" - uvicorn.run( - "monitor_agent.main:api", - host=config_file.host, - port=config_file.port, - reload=config_file.reload, - workers=config_file.workers, - log_level=config_file.log_level, - interface="asgi3", - debug=config_file.debug, - backlog=config_file.backlog, - timeout_keep_alive=config_file.timeout_keep_alive, - limit_concurrency=config_file.limit_concurrency, - limit_max_requests=config_file.limit_max_requests, - ssl_keyfile=config_file.ssl_keyfile, - ssl_keyfile_password=config_file.ssl_keyfile_password, - ssl_certfile=config_file.ssl_certfile, - ssl_version=config_file.ssl_version, - ssl_cert_reqs=config_file.ssl_cert_reqs, - ssl_ca_certs=config_file.ssl_ca_certs, - ssl_ciphers=config_file.ssl_ciphers, - ) + uviconfig = {"app": "monitor_agent.main:api", "interface": "asgi3"} + uviconfig.update(CONFIG.uvicorn.__dict__) + uviconfig.pop("__module__", None) + uviconfig.pop("__dict__", None) + uviconfig.pop("__weakref__", None) + uviconfig.pop("__doc__", None) + uvicorn.run(**uviconfig) diff --git a/monitor_agent/settings.json b/monitor_agent/settings.json index e95f263..8c6e5ac 100644 --- a/monitor_agent/settings.json +++ b/monitor_agent/settings.json @@ -1,25 +1,26 @@ { - "backlog": 2048, - "debug": true, - "host": "0.0.0.0", - "limit_concurrency": null, - "limit_max_requests": null, - "log_level": "trace", - "metric_enable_file": false, - "metric_endpoint": true, - "metric_file": "metrics.json", - "port": 8080, - "post_alert_url": "", - "post_interval": 60, - "post_metric_url": "http://httpbin.org/post", - "reload": true, - "ssl_ca_certs": null, - "ssl_cert_reqs": null, - "ssl_certfile": null, - "ssl_ciphers": null, - "ssl_keyfile": null, - "ssl_keyfile_password": null, - "ssl_version": null, - "timeout_keep_alive": 5, - "workers": 4 + "alerts": { + "url": "127.0.0.1:8000/alerts" + }, + "metrics": { + "enable_logfile": false, + "get_endpoint": true, + "log_filename": "metrics.json", + "post_interval": 60, + "post_url": "http://httpbin.org/post" + }, + "thresholds": { + "cpu_percent": 50, + "ram_percent": 30 + }, + "uvicorn": { + "backlog": 2048, + "debug": true, + "host": "0.0.0.0", + "log_level": "trace", + "port": 8000, + "reload": true, + "timeout_keep_alive": 5, + "workers": 4 + } } \ No newline at end of file diff --git a/monitor_agent/settings.py b/monitor_agent/settings.py index c2167b6..a598721 100644 --- a/monitor_agent/settings.py +++ b/monitor_agent/settings.py @@ -4,36 +4,6 @@ from monitor_agent.core.helper import save2log -main_parameters = [ - "host", - "port", - "workers", - "reload", - "debug", - "log_level", - "backlog", - "timeout_keep_alive", - "metric_endpoint", - "post_metric_url", - "post_interval", - "metric_enable_file", - "metric_file", - "post_alert_url", -] - -optional_parameters = [ - "ssl_keyfile", - "ssl_keyfile_password", - "ssl_certfile", - "ssl_version", - "ssl_cert_reqs", - "ssl_ca_certs", - "ssl_ciphers", - "limit_concurrency", - "limit_max_requests", -] - -config_parameters = main_parameters + optional_parameters rel_path = "settings.json" dir = os.path.dirname(__file__) # <-- absolute dir the script is in abs_file_path = os.path.join(dir, rel_path) @@ -41,15 +11,19 @@ class Settings: def __init__(self): - for key, value in self._read_settings_file().items(): - setattr(self, key, value) + self.as_dict: dict = self._read_settings_file() + obj = toObj(self.as_dict) + self.alerts = obj.alerts + self.metrics = obj.metrics + self.thresholds = obj.thresholds + self.uvicorn = obj.uvicorn def _read_settings_file(self): try: f = open(abs_file_path, "r") data = f.read() - data_dict = _validate_json(data) - data_str, data_dict = _format_json_file(data_dict, abs_file_path) + data_dict = json.loads(data) + data_str, data_dict = _write_file(data_dict, abs_file_path) except (json.JSONDecodeError, ValueError, FileNotFoundError) as msg: print(f"ERROR: Invalid JSON settings file - {msg}", file=sys.stderr) save2log(type="ERROR", data=f"Invalid JSON file - {msg}") @@ -59,8 +33,8 @@ def _read_settings_file(self): def write_settings(self, data: str): try: - data_dict = _validate_json(data) - data_str, data_dict = _format_json_file(data_dict, abs_file_path) + data_dict = json.loads(data) + data_str, data_dict = _write_file(data_dict, abs_file_path) except (json.JSONDecodeError, ValueError) as msg: return {"status": f"Error: {msg}", "data": data} @@ -73,36 +47,23 @@ def write_settings(self, data: str): ###################### -def dict_keys_iterator(dictionary: dict): - for key, value in dictionary.items(): - if isinstance(value, dict): - dict_keys_iterator(value) - yield key +def toObj(item): + """Jakub Dóka: https://stackoverflow.com/a/65969444""" + if isinstance(item, dict): + obj = type("__object", (object,), {}) + for key, value in item.items(): + setattr(obj, key, toObj(value)) -def _validate_json(data: str): - data_dict = json.loads(data) + return obj + elif isinstance(item, list): + return map(toObj, item) + else: + return item - keys = [key for key in dict_keys_iterator(data_dict)] - diff_total = list(set(keys) - set(config_parameters)) - if len(diff_total) > 0: - raise ValueError(f"Config file contains invalid parameters: {diff_total}") - - diff_main = list(set(main_parameters) - set(keys)) - if len(diff_main) > 0: - raise ValueError(f"Config file does not contain main parameters: {diff_main}") - return data_dict - - # Need to validate type of data - - -def _format_json_file(data: dict, path: str): - data_dict = data.copy() - for key in optional_parameters: - if key not in data_dict.keys(): - data_dict[key] = None +def _write_file(data: dict, path: str): f = open(path, "w") - data_str: str = json.dumps(data_dict, indent=4, sort_keys=True) + data_str: str = json.dumps(data, indent=4, sort_keys=True) f.write(data_str) - return data_str, data_dict + return data_str, data diff --git a/poetry.lock b/poetry.lock index d3b2f32..5c42c28 100644 --- a/poetry.lock +++ b/poetry.lock @@ -174,7 +174,7 @@ python-versions = ">=3.5" [[package]] name = "importlib-metadata" -version = "4.11.1" +version = "4.11.3" description = "Read metadata from Python packages" category = "main" optional = false @@ -185,7 +185,7 @@ typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} zipp = ">=0.5" [package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +docs = ["sphinx", "jaraco.packaging (>=9)", "rst.linker (>=1.9)"] perf = ["ipython"] testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "importlib-resources (>=1.3)"] @@ -282,11 +282,11 @@ diagrams = ["jinja2", "railroad-diagrams"] [[package]] name = "pytest" -version = "7.0.1" +version = "7.1.1" description = "pytest: simple powerful testing with Python" category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [package.dependencies] atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""} @@ -349,7 +349,7 @@ python-versions = ">=3.5" [[package]] name = "sqlalchemy" -version = "1.4.31" +version = "1.4.32" description = "Database Abstraction Library" category = "main" optional = false @@ -444,20 +444,20 @@ python-versions = ">=3.6" [[package]] name = "urllib3" -version = "1.26.8" +version = "1.26.9" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" [package.extras] -brotli = ["brotlipy (>=0.6.0)"] +brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"] secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "uvicorn" -version = "0.17.5" +version = "0.17.6" description = "The lightning-fast ASGI server." category = "main" optional = false @@ -470,11 +470,11 @@ h11 = ">=0.8" typing-extensions = {version = "*", markers = "python_version < \"3.8\""} [package.extras] -standard = ["websockets (>=10.0)", "httptools (>=0.2.0,<0.4.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] +standard = ["websockets (>=10.0)", "httptools (>=0.4.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] [[package]] name = "virtualenv" -version = "20.13.2" +version = "20.14.0" description = "Virtual Python Environment builder" category = "dev" optional = false @@ -623,8 +623,8 @@ idna = [ {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.11.1-py3-none-any.whl", hash = "sha256:e0bc84ff355328a4adfc5240c4f211e0ab386f80aa640d1b11f0618a1d282094"}, - {file = "importlib_metadata-4.11.1.tar.gz", hash = "sha256:175f4ee440a0317f6e8d81b7f8d4869f93316170a65ad2b007d2929186c8052c"}, + {file = "importlib_metadata-4.11.3-py3-none-any.whl", hash = "sha256:1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6"}, + {file = "importlib_metadata-4.11.3.tar.gz", hash = "sha256:ea4c597ebf37142f827b8f39299579e31685c31d3a438b59f469406afd0f2539"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -722,8 +722,8 @@ pyparsing = [ {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, ] pytest = [ - {file = "pytest-7.0.1-py3-none-any.whl", hash = "sha256:9ce3ff477af913ecf6321fe337b93a2c0dcf2a0a1439c43f5452112c1e4280db"}, - {file = "pytest-7.0.1.tar.gz", hash = "sha256:e30905a0c131d3d94b89624a1cc5afec3e0ba2fbdb151867d8e0ebd49850f171"}, + {file = "pytest-7.1.1-py3-none-any.whl", hash = "sha256:92f723789a8fdd7180b6b06483874feca4c48a5c76968e03bb3e7f806a1869ea"}, + {file = "pytest-7.1.1.tar.gz", hash = "sha256:841132caef6b1ad17a9afde46dc4f6cfa59a05f9555aae5151f73bdf2820ca63"}, ] python-multipart = [ {file = "python-multipart-0.0.5.tar.gz", hash = "sha256:f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43"}, @@ -741,42 +741,41 @@ sniffio = [ {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, ] sqlalchemy = [ - {file = "SQLAlchemy-1.4.31-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:c3abc34fed19fdeaead0ced8cf56dd121f08198008c033596aa6aae7cc58f59f"}, - {file = "SQLAlchemy-1.4.31-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:8d0949b11681380b4a50ac3cd075e4816afe9fa4a8c8ae006c1ca26f0fa40ad8"}, - {file = "SQLAlchemy-1.4.31-cp27-cp27m-win32.whl", hash = "sha256:f3b7ec97e68b68cb1f9ddb82eda17b418f19a034fa8380a0ac04e8fe01532875"}, - {file = "SQLAlchemy-1.4.31-cp27-cp27m-win_amd64.whl", hash = "sha256:81f2dd355b57770fdf292b54f3e0a9823ec27a543f947fa2eb4ec0df44f35f0d"}, - {file = "SQLAlchemy-1.4.31-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4ad31cec8b49fd718470328ad9711f4dc703507d434fd45461096da0a7135ee0"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:05fa14f279d43df68964ad066f653193187909950aa0163320b728edfc400167"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dccff41478050e823271642837b904d5f9bda3f5cf7d371ce163f00a694118d6"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57205844f246bab9b666a32f59b046add8995c665d9ecb2b7b837b087df90639"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ea8210090a816d48a4291a47462bac750e3bc5c2442e6d64f7b8137a7c3f9ac5"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-win32.whl", hash = "sha256:2e216c13ecc7fcdcbb86bb3225425b3ed338e43a8810c7089ddb472676124b9b"}, - {file = "SQLAlchemy-1.4.31-cp310-cp310-win_amd64.whl", hash = "sha256:e3a86b59b6227ef72ffc10d4b23f0fe994bef64d4667eab4fb8cd43de4223bec"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:2fd4d3ca64c41dae31228b80556ab55b6489275fb204827f6560b65f95692cf3"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6f22c040d196f841168b1456e77c30a18a3dc16b336ddbc5a24ce01ab4e95ae0"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c0c7171aa5a57e522a04a31b84798b6c926234cb559c0939840c3235cf068813"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d046a9aeba9bc53e88a41e58beb72b6205abb9a20f6c136161adf9128e589db5"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-win32.whl", hash = "sha256:d86132922531f0dc5a4f424c7580a472a924dd737602638e704841c9cb24aea2"}, - {file = "SQLAlchemy-1.4.31-cp36-cp36m-win_amd64.whl", hash = "sha256:ca68c52e3cae491ace2bf39b35fef4ce26c192fd70b4cd90f040d419f70893b5"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:cf2cd387409b12d0a8b801610d6336ee7d24043b6dd965950eaec09b73e7262f"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb4b15fb1f0aafa65cbdc62d3c2078bea1ceecbfccc9a1f23a2113c9ac1191fa"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c317ddd7c586af350a6aef22b891e84b16bff1a27886ed5b30f15c1ed59caeaa"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c7ed6c69debaf6198fadb1c16ae1253a29a7670bbf0646f92582eb465a0b999"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-win32.whl", hash = "sha256:6a01ec49ca54ce03bc14e10de55dfc64187a2194b3b0e5ac0fdbe9b24767e79e"}, - {file = "SQLAlchemy-1.4.31-cp37-cp37m-win_amd64.whl", hash = "sha256:330eb45395874cc7787214fdd4489e2afb931bc49e0a7a8f9cd56d6e9c5b1639"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:5e9c7b3567edbc2183607f7d9f3e7e89355b8f8984eec4d2cd1e1513c8f7b43f"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:de85c26a5a1c72e695ab0454e92f60213b4459b8d7c502e0be7a6369690eeb1a"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:975f5c0793892c634c4920057da0de3a48bbbbd0a5c86f5fcf2f2fedf41b76da"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5c20c8415173b119762b6110af64448adccd4d11f273fb9f718a9865b88a99c"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-win32.whl", hash = "sha256:b35dca159c1c9fa8a5f9005e42133eed82705bf8e243da371a5e5826440e65ca"}, - {file = "SQLAlchemy-1.4.31-cp38-cp38-win_amd64.whl", hash = "sha256:b7b20c88873675903d6438d8b33fba027997193e274b9367421e610d9da76c08"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:85e4c244e1de056d48dae466e9baf9437980c19fcde493e0db1a0a986e6d75b4"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e79e73d5ee24196d3057340e356e6254af4d10e1fc22d3207ea8342fc5ffb977"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:15a03261aa1e68f208e71ae3cd845b00063d242cbf8c87348a0c2c0fc6e1f2ac"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ddc5e5ccc0160e7ad190e5c61eb57560f38559e22586955f205e537cda26034"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-win32.whl", hash = "sha256:289465162b1fa1e7a982f8abe59d26a8331211cad4942e8031d2b7db1f75e649"}, - {file = "SQLAlchemy-1.4.31-cp39-cp39-win_amd64.whl", hash = "sha256:9e4fb2895b83993831ba2401b6404de953fdbfa9d7d4fa6a4756294a83bbc94f"}, - {file = "SQLAlchemy-1.4.31.tar.gz", hash = "sha256:582b59d1e5780a447aada22b461e50b404a9dc05768da1d87368ad8190468418"}, + {file = "SQLAlchemy-1.4.32-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:4b2bcab3a914715d332ca783e9bda13bc570d8b9ef087563210ba63082c18c16"}, + {file = "SQLAlchemy-1.4.32-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:159c2f69dd6efd28e894f261ffca1100690f28210f34cfcd70b895e0ea7a64f3"}, + {file = "SQLAlchemy-1.4.32-cp27-cp27m-win_amd64.whl", hash = "sha256:d7e483f4791fbda60e23926b098702340504f7684ce7e1fd2c1bf02029288423"}, + {file = "SQLAlchemy-1.4.32-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4aa96e957141006181ca58e792e900ee511085b8dae06c2d08c00f108280fb8a"}, + {file = "SQLAlchemy-1.4.32-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:576684771456d02e24078047c2567025f2011977aa342063468577d94e194b00"}, + {file = "SQLAlchemy-1.4.32-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fff677fa4522dafb5a5e2c0cf909790d5d367326321aeabc0dffc9047cb235bd"}, + {file = "SQLAlchemy-1.4.32-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8679f9aba5ac22e7bce54ccd8a77641d3aea3e2d96e73e4356c887ebf8ff1082"}, + {file = "SQLAlchemy-1.4.32-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c7046f7aa2db445daccc8424f50b47a66c4039c9f058246b43796aa818f8b751"}, + {file = "SQLAlchemy-1.4.32-cp310-cp310-win32.whl", hash = "sha256:bedd89c34ab62565d44745212814e4b57ef1c24ad4af9b29c504ce40f0dc6558"}, + {file = "SQLAlchemy-1.4.32-cp310-cp310-win_amd64.whl", hash = "sha256:199dc6d0068753b6a8c0bd3aceb86a3e782df118260ebc1fa981ea31ee054674"}, + {file = "SQLAlchemy-1.4.32-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:8e1e5d96b744a4f91163290b01045430f3f32579e46d87282449e5b14d27d4ac"}, + {file = "SQLAlchemy-1.4.32-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edfcf93fd92e2f9eef640b3a7a40db20fe3c1d7c2c74faa41424c63dead61b76"}, + {file = "SQLAlchemy-1.4.32-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04164e0063feb7aedd9d073db0fd496edb244be40d46ea1f0d8990815e4b8c34"}, + {file = "SQLAlchemy-1.4.32-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5ba59761c19b800bc2e1c9324da04d35ef51e4ee9621ff37534bc2290d258f71"}, + {file = "SQLAlchemy-1.4.32-cp36-cp36m-win32.whl", hash = "sha256:708973b5d9e1e441188124aaf13c121e5b03b6054c2df59b32219175a25aa13e"}, + {file = "SQLAlchemy-1.4.32-cp36-cp36m-win_amd64.whl", hash = "sha256:316270e5867566376e69a0ac738b863d41396e2b63274616817e1d34156dff0e"}, + {file = "SQLAlchemy-1.4.32-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:9a0195af6b9050c9322a97cf07514f66fe511968e623ca87b2df5e3cf6349615"}, + {file = "SQLAlchemy-1.4.32-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f7e4a3c0c3c596296b37f8427c467c8e4336dc8d50f8ed38042e8ba79507b2c9"}, + {file = "SQLAlchemy-1.4.32-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bca714d831e5b8860c3ab134c93aec63d1a4f493bed20084f54e3ce9f0a3bf99"}, + {file = "SQLAlchemy-1.4.32-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9a680d9665f88346ed339888781f5236347933906c5a56348abb8261282ec48"}, + {file = "SQLAlchemy-1.4.32-cp37-cp37m-win32.whl", hash = "sha256:9cb5698c896fa72f88e7ef04ef62572faf56809093180771d9be8d9f2e264a13"}, + {file = "SQLAlchemy-1.4.32-cp37-cp37m-win_amd64.whl", hash = "sha256:8b9a395122770a6f08ebfd0321546d7379f43505882c7419d7886856a07caa13"}, + {file = "SQLAlchemy-1.4.32-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:3f88a4ee192142eeed3fe173f673ea6ab1f5a863810a9d85dbf6c67a9bd08f97"}, + {file = "SQLAlchemy-1.4.32-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dd93162615870c976dba43963a24bb418b28448fef584f30755990c134a06a55"}, + {file = "SQLAlchemy-1.4.32-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5a2e73508f939175363d8a4be9dcdc84cf16a92578d7fa86e6e4ca0e6b3667b2"}, + {file = "SQLAlchemy-1.4.32-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfec934aac7f9fa95fc82147a4ba5db0a8bdc4ebf1e33b585ab8860beb10232f"}, + {file = "SQLAlchemy-1.4.32-cp38-cp38-win32.whl", hash = "sha256:bb42f9b259c33662c6a9b866012f6908a91731a419e69304e1261ba3ab87b8d1"}, + {file = "SQLAlchemy-1.4.32-cp38-cp38-win_amd64.whl", hash = "sha256:7ff72b3cc9242d1a1c9b84bd945907bf174d74fc2519efe6184d6390a8df478b"}, + {file = "SQLAlchemy-1.4.32-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:5dc9801ae9884e822ba942ca493642fb50f049c06b6dbe3178691fce48ceb089"}, + {file = "SQLAlchemy-1.4.32-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4607d2d16330757818c9d6fba322c2e80b4b112ff24295d1343a80b876eb0ed"}, + {file = "SQLAlchemy-1.4.32-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:20e9eba7fd86ef52e0df25bea83b8b518dfdf0bce09b336cfe51671f52aaaa3f"}, + {file = "SQLAlchemy-1.4.32-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:290cbdf19129ae520d4bdce392648c6fcdbee763bc8f750b53a5ab51880cb9c9"}, + {file = "SQLAlchemy-1.4.32-cp39-cp39-win32.whl", hash = "sha256:1bbac3e8293b34c4403d297e21e8f10d2a57756b75cff101dc62186adec725f5"}, + {file = "SQLAlchemy-1.4.32-cp39-cp39-win_amd64.whl", hash = "sha256:b3f1d9b3aa09ab9adc7f8c4b40fc3e081eb903054c9a6f9ae1633fe15ae503b4"}, + {file = "SQLAlchemy-1.4.32.tar.gz", hash = "sha256:6fdd2dc5931daab778c2b65b03df6ae68376e028a3098eb624d0909d999885bc"}, ] starlette = [ {file = "starlette-0.17.1-py3-none-any.whl", hash = "sha256:26a18cbda5e6b651c964c12c88b36d9898481cd428ed6e063f5f29c418f73050"}, @@ -799,16 +798,16 @@ typing-extensions = [ {file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"}, ] urllib3 = [ - {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"}, - {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"}, + {file = "urllib3-1.26.9-py2.py3-none-any.whl", hash = "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"}, + {file = "urllib3-1.26.9.tar.gz", hash = "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e"}, ] uvicorn = [ - {file = "uvicorn-0.17.5-py3-none-any.whl", hash = "sha256:8adddf629b79857b48b999ae1b14d6c92c95d4d7840bd86461f09bee75f1653e"}, - {file = "uvicorn-0.17.5.tar.gz", hash = "sha256:c04a9c069111489c324f427501b3840d306c6b91a77b00affc136a840a3f45f1"}, + {file = "uvicorn-0.17.6-py3-none-any.whl", hash = "sha256:19e2a0e96c9ac5581c01eb1a79a7d2f72bb479691acd2b8921fce48ed5b961a6"}, + {file = "uvicorn-0.17.6.tar.gz", hash = "sha256:5180f9d059611747d841a4a4c4ab675edf54c8489e97f96d0583ee90ac3bfc23"}, ] virtualenv = [ - {file = "virtualenv-20.13.2-py2.py3-none-any.whl", hash = "sha256:e7b34c9474e6476ee208c43a4d9ac1510b041c68347eabfe9a9ea0c86aa0a46b"}, - {file = "virtualenv-20.13.2.tar.gz", hash = "sha256:01f5f80744d24a3743ce61858123488e91cb2dd1d3bdf92adaf1bba39ffdedf0"}, + {file = "virtualenv-20.14.0-py2.py3-none-any.whl", hash = "sha256:1e8588f35e8b42c6ec6841a13c5e88239de1e6e4e4cedfd3916b306dc826ec66"}, + {file = "virtualenv-20.14.0.tar.gz", hash = "sha256:8e5b402037287126e81ccde9432b95a8be5b19d36584f64957060a3488c11ca8"}, ] zipp = [ {file = "zipp-3.7.0-py3-none-any.whl", hash = "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375"},