From e4c6d10781bfcdf5d71ae72e07c2d399ea368569 Mon Sep 17 00:00:00 2001 From: Sergey Vanyushkin Date: Mon, 15 Apr 2024 22:03:02 +0000 Subject: [PATCH] sync --- dump.rdb | Bin 0 -> 117 bytes flask_demo_api/config.py | 2 +- flask_demo_api/error_handlers.py | 14 ++ flask_demo_api/ioc.py | 17 +- flask_demo_api/main.py | 20 +- flask_demo_api/protocols/models.py | 3 +- flask_demo_api/protocols/repository.py | 6 +- flask_demo_api/repository/config.py | 2 +- flask_demo_api/repository/redis.py | 23 +- flask_demo_api/routers/key.py | 49 +++- flask_demo_api/usecase/add.py | 4 +- flask_demo_api/usecase/delete.py | 13 + flask_demo_api/usecase/get.py | 4 +- flask_demo_api/usecase/put.py | 4 +- poetry.lock | 319 ++++++++++++++++++++++++- pyproject.toml | 8 + tests/conftest.py | 28 +++ tests/test_get.py | 14 ++ tests/test_post.py | 23 ++ 19 files changed, 507 insertions(+), 46 deletions(-) create mode 100644 dump.rdb create mode 100644 flask_demo_api/error_handlers.py create mode 100644 flask_demo_api/usecase/delete.py create mode 100644 tests/conftest.py create mode 100644 tests/test_get.py create mode 100644 tests/test_post.py diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000000000000000000000000000000000000..69c161aefb01ac6b1b59b1a03e204fb9ed8485bd GIT binary patch literal 117 zcmWG?b@2=~FfcUy#aWb^l3A=1kd#?ce8AxsYjR0uZt9_{b7j+h zag-LPrs(FT<{p~B&(H9SBQZZsHz~0=^#H>^hTn_~49tm1$wCb*Q`s3HpocjnHEoLC O{|(oagBo5 Container: diff --git a/flask_demo_api/main.py b/flask_demo_api/main.py index 0f41ffa..10fefd8 100644 --- a/flask_demo_api/main.py +++ b/flask_demo_api/main.py @@ -1,20 +1,26 @@ from dishka.integrations.flask import setup_dishka from flask import Flask -from ioc import create_container -from routers.key import key_bp + +from flask_demo_api.error_handlers import register_errors +from flask_demo_api.ioc import create_container +from flask_demo_api.routers.key import key_bp def app_factory() -> Flask: app = Flask(__name__) + register_errors(app) app.register_blueprint(key_bp) return app -if __name__ == "__main__": +def run_app(): app = app_factory() + container = create_container() setup_dishka(container=container, app=app, auto_inject=True) - try: - app.run(debug=True, host="0.0.0.0") - finally: - container.close() + app.run() + container.close() + + +if __name__ == "__main__": + run_app() diff --git a/flask_demo_api/protocols/models.py b/flask_demo_api/protocols/models.py index e5bc842..5840ab0 100644 --- a/flask_demo_api/protocols/models.py +++ b/flask_demo_api/protocols/models.py @@ -1,7 +1,8 @@ from dataclasses import dataclass +from typing import Any @dataclass(frozen=True) class KeyDTO: key: str - val: str | None = None + val: Any | None = None diff --git a/flask_demo_api/protocols/repository.py b/flask_demo_api/protocols/repository.py index c7f2ba7..a08e113 100644 --- a/flask_demo_api/protocols/repository.py +++ b/flask_demo_api/protocols/repository.py @@ -1,7 +1,7 @@ from abc import abstractmethod from typing import Protocol -from protocols.models import KeyDTO +from flask_demo_api.protocols.models import KeyDTO class Repository(Protocol): @@ -16,3 +16,7 @@ class Repository(Protocol): @abstractmethod def put_key(self, obj: KeyDTO) -> KeyDTO: raise NotImplementedError + + @abstractmethod + def delete_key(self, obj: KeyDTO) -> None: + raise NotImplementedError diff --git a/flask_demo_api/repository/config.py b/flask_demo_api/repository/config.py index 0a6bd45..d7f0df1 100644 --- a/flask_demo_api/repository/config.py +++ b/flask_demo_api/repository/config.py @@ -3,4 +3,4 @@ from dataclasses import dataclass @dataclass(frozen=True) class RedisSettings: - url: str = "redis://redis:6379/0" + url: str = "redis://localhost:6379/0" diff --git a/flask_demo_api/repository/redis.py b/flask_demo_api/repository/redis.py index c968aaa..11cb393 100644 --- a/flask_demo_api/repository/redis.py +++ b/flask_demo_api/repository/redis.py @@ -1,6 +1,9 @@ +import pickle + import redis # type: ignore -from protocols.models import KeyDTO -from protocols.repository import Repository + +from flask_demo_api.protocols.models import KeyDTO +from flask_demo_api.protocols.repository import Repository class RedisRepository(Repository): @@ -8,14 +11,18 @@ class RedisRepository(Repository): self.pool = redis_pool def get_key(self, obj: KeyDTO) -> KeyDTO | None: - # data = self.pool.get(obj.key) - # if not data: - # return None - return KeyDTO(key="10", val="1") + data = self.pool.get(obj.key) + if not data: + return None + return KeyDTO(key=str(obj.key), val=data) def add_key(self, obj: KeyDTO) -> KeyDTO: - self.pool.set(obj.key, obj.val) - return KeyDTO(key="3", val="4") + self.pool.set(str(obj.key), pickle.dumps(obj.val)) + return obj def put_key(self, obj: KeyDTO) -> KeyDTO: return KeyDTO(key="5", val="6") + + def delete_key(self, obj: KeyDTO) -> None: + self.pool.delete(str(obj.key)) + return None diff --git a/flask_demo_api/routers/key.py b/flask_demo_api/routers/key.py index a1522a1..dd0b86b 100644 --- a/flask_demo_api/routers/key.py +++ b/flask_demo_api/routers/key.py @@ -1,22 +1,27 @@ from dishka.integrations.flask import FromDishka, inject -from flask import Blueprint, jsonify, request -from protocols.models import KeyDTO -from usecase.add import PostKey -from usecase.get import GetKey -from usecase.put import PutKey +from flask import Blueprint, abort, jsonify, request + +from flask_demo_api.protocols.models import KeyDTO +from flask_demo_api.usecase.add import PostKey +from flask_demo_api.usecase.delete import DelKey +from flask_demo_api.usecase.get import GetKey +from flask_demo_api.usecase.put import PutKey key_bp = Blueprint("key_bp", __name__) @key_bp.route("/", methods=["POST"]) +@inject def past_key(usecase: FromDishka[PostKey]): json_data = request.get_json() if json_data: - result = usecase(request=KeyDTO(key=json_data)) + result = usecase( + request=KeyDTO(key=json_data.get("key"), val=json_data.get("val")) + ) return ( - jsonify({"message": "Received JSON data successfully", "data": result}), - 200, + jsonify({"message": "Ok", "data": result}), + 201, ) else: return jsonify({"message": "No JSON data received"}), 400 @@ -29,23 +34,43 @@ def get_key(usecase: FromDishka[GetKey]): if request_data: result = usecase(request=KeyDTO(key=request_data)) + if result is None: + abort(404, "Key not found") return ( - jsonify({"message": "Received JSON data successfully", "data": result}), + jsonify({"message": "Ok", "data": result}), 200, ) else: - return jsonify({"message": "No GET parameters received"}), 400 + abort(400, "Invalid GET parameters") @key_bp.route("/", methods=["PUT"]) +@inject def put_key(usecase: FromDishka[PutKey]): json_data = request.get_json() if json_data: - result = usecase(request=KeyDTO(key=json_data)) + result = usecase( + request=KeyDTO(key=json_data.get("key"), val=json_data.get("val")) + ) return ( - jsonify({"message": "Received JSON data successfully", "data": result}), + jsonify({"message": "Updated", "data": result}), + 200, + ) + else: + return jsonify({"message": "No JSON data received"}), 400 + + +@key_bp.route("/", methods=["DELETE"]) +@inject +def delete_key(usecase: FromDishka[DelKey]): + json_data = request.get_json() + + if json_data: + usecase(request=KeyDTO(key=json_data.get("key"), val=json_data.get("val"))) + return ( + jsonify({"message": "Deleted"}), 200, ) else: diff --git a/flask_demo_api/usecase/add.py b/flask_demo_api/usecase/add.py index 6b77ee5..765196f 100644 --- a/flask_demo_api/usecase/add.py +++ b/flask_demo_api/usecase/add.py @@ -1,5 +1,5 @@ -from protocols.models import KeyDTO -from protocols.repository import Repository +from flask_demo_api.protocols.models import KeyDTO +from flask_demo_api.protocols.repository import Repository class PostKey: diff --git a/flask_demo_api/usecase/delete.py b/flask_demo_api/usecase/delete.py new file mode 100644 index 0000000..53d64c6 --- /dev/null +++ b/flask_demo_api/usecase/delete.py @@ -0,0 +1,13 @@ +from flask_demo_api.protocols.models import KeyDTO +from flask_demo_api.protocols.repository import Repository + + +class DelKey: + def __init__( + self, + repository: Repository, + ) -> None: + self.__repository = repository + + def __call__(self, request: KeyDTO) -> KeyDTO: + return self.__repository.delete_key(obj=request) diff --git a/flask_demo_api/usecase/get.py b/flask_demo_api/usecase/get.py index ec4c01c..6685516 100644 --- a/flask_demo_api/usecase/get.py +++ b/flask_demo_api/usecase/get.py @@ -1,5 +1,5 @@ -from protocols.models import KeyDTO -from protocols.repository import Repository +from flask_demo_api.protocols.models import KeyDTO +from flask_demo_api.protocols.repository import Repository class GetKey: diff --git a/flask_demo_api/usecase/put.py b/flask_demo_api/usecase/put.py index d2abd6f..b9afa94 100644 --- a/flask_demo_api/usecase/put.py +++ b/flask_demo_api/usecase/put.py @@ -1,5 +1,5 @@ -from protocols.models import KeyDTO -from protocols.repository import Repository +from flask_demo_api.protocols.models import KeyDTO +from flask_demo_api.protocols.repository import Repository class PutKey: diff --git a/poetry.lock b/poetry.lock index b13211b..bfad65d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,26 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. + +[[package]] +name = "anyio" +version = "4.3.0" +description = "High level compatibility layer for multiple asynchronous event loop implementations" +optional = false +python-versions = ">=3.8" +files = [ + {file = "anyio-4.3.0-py3-none-any.whl", hash = "sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8"}, + {file = "anyio-4.3.0.tar.gz", hash = "sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6"}, +] + +[package.dependencies] +exceptiongroup = {version = ">=1.0.2", markers = "python_version < \"3.11\""} +idna = ">=2.8" +sniffio = ">=1.1" +typing-extensions = {version = ">=4.1", markers = "python_version < \"3.11\""} + +[package.extras] +doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] +test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] +trio = ["trio (>=0.23)"] [[package]] name = "async-timeout" @@ -22,6 +44,17 @@ files = [ {file = "blinker-1.7.0.tar.gz", hash = "sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182"}, ] +[[package]] +name = "certifi" +version = "2024.2.2" +description = "Python package for providing Mozilla's CA Bundle." +optional = false +python-versions = ">=3.6" +files = [ + {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"}, + {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"}, +] + [[package]] name = "cfgv" version = "3.4.0" @@ -58,6 +91,73 @@ files = [ {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] +[[package]] +name = "coverage" +version = "7.4.4" +description = "Code coverage measurement for Python" +optional = false +python-versions = ">=3.8" +files = [ + {file = "coverage-7.4.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e0be5efd5127542ef31f165de269f77560d6cdef525fffa446de6f7e9186cfb2"}, + {file = "coverage-7.4.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ccd341521be3d1b3daeb41960ae94a5e87abe2f46f17224ba5d6f2b8398016cf"}, + {file = "coverage-7.4.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09fa497a8ab37784fbb20ab699c246053ac294d13fc7eb40ec007a5043ec91f8"}, + {file = "coverage-7.4.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b1a93009cb80730c9bca5d6d4665494b725b6e8e157c1cb7f2db5b4b122ea562"}, + {file = "coverage-7.4.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:690db6517f09336559dc0b5f55342df62370a48f5469fabf502db2c6d1cffcd2"}, + {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:09c3255458533cb76ef55da8cc49ffab9e33f083739c8bd4f58e79fecfe288f7"}, + {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8ce1415194b4a6bd0cdcc3a1dfbf58b63f910dcb7330fe15bdff542c56949f87"}, + {file = "coverage-7.4.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b91cbc4b195444e7e258ba27ac33769c41b94967919f10037e6355e998af255c"}, + {file = "coverage-7.4.4-cp310-cp310-win32.whl", hash = "sha256:598825b51b81c808cb6f078dcb972f96af96b078faa47af7dfcdf282835baa8d"}, + {file = "coverage-7.4.4-cp310-cp310-win_amd64.whl", hash = "sha256:09ef9199ed6653989ebbcaacc9b62b514bb63ea2f90256e71fea3ed74bd8ff6f"}, + {file = "coverage-7.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0f9f50e7ef2a71e2fae92774c99170eb8304e3fdf9c8c3c7ae9bab3e7229c5cf"}, + {file = "coverage-7.4.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:623512f8ba53c422fcfb2ce68362c97945095b864cda94a92edbaf5994201083"}, + {file = "coverage-7.4.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0513b9508b93da4e1716744ef6ebc507aff016ba115ffe8ecff744d1322a7b63"}, + {file = "coverage-7.4.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40209e141059b9370a2657c9b15607815359ab3ef9918f0196b6fccce8d3230f"}, + {file = "coverage-7.4.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a2b2b78c78293782fd3767d53e6474582f62443d0504b1554370bde86cc8227"}, + {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:73bfb9c09951125d06ee473bed216e2c3742f530fc5acc1383883125de76d9cd"}, + {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1f384c3cc76aeedce208643697fb3e8437604b512255de6d18dae3f27655a384"}, + {file = "coverage-7.4.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:54eb8d1bf7cacfbf2a3186019bcf01d11c666bd495ed18717162f7eb1e9dd00b"}, + {file = "coverage-7.4.4-cp311-cp311-win32.whl", hash = "sha256:cac99918c7bba15302a2d81f0312c08054a3359eaa1929c7e4b26ebe41e9b286"}, + {file = "coverage-7.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:b14706df8b2de49869ae03a5ccbc211f4041750cd4a66f698df89d44f4bd30ec"}, + {file = "coverage-7.4.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:201bef2eea65e0e9c56343115ba3814e896afe6d36ffd37bab783261db430f76"}, + {file = "coverage-7.4.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41c9c5f3de16b903b610d09650e5e27adbfa7f500302718c9ffd1c12cf9d6818"}, + {file = "coverage-7.4.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d898fe162d26929b5960e4e138651f7427048e72c853607f2b200909794ed978"}, + {file = "coverage-7.4.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ea79bb50e805cd6ac058dfa3b5c8f6c040cb87fe83de10845857f5535d1db70"}, + {file = "coverage-7.4.4-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce4b94265ca988c3f8e479e741693d143026632672e3ff924f25fab50518dd51"}, + {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:00838a35b882694afda09f85e469c96367daa3f3f2b097d846a7216993d37f4c"}, + {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:fdfafb32984684eb03c2d83e1e51f64f0906b11e64482df3c5db936ce3839d48"}, + {file = "coverage-7.4.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:69eb372f7e2ece89f14751fbcbe470295d73ed41ecd37ca36ed2eb47512a6ab9"}, + {file = "coverage-7.4.4-cp312-cp312-win32.whl", hash = "sha256:137eb07173141545e07403cca94ab625cc1cc6bc4c1e97b6e3846270e7e1fea0"}, + {file = "coverage-7.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:d71eec7d83298f1af3326ce0ff1d0ea83c7cb98f72b577097f9083b20bdaf05e"}, + {file = "coverage-7.4.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d5ae728ff3b5401cc320d792866987e7e7e880e6ebd24433b70a33b643bb0384"}, + {file = "coverage-7.4.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cc4f1358cb0c78edef3ed237ef2c86056206bb8d9140e73b6b89fbcfcbdd40e1"}, + {file = "coverage-7.4.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8130a2aa2acb8788e0b56938786c33c7c98562697bf9f4c7d6e8e5e3a0501e4a"}, + {file = "coverage-7.4.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf271892d13e43bc2b51e6908ec9a6a5094a4df1d8af0bfc360088ee6c684409"}, + {file = "coverage-7.4.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a4cdc86d54b5da0df6d3d3a2f0b710949286094c3a6700c21e9015932b81447e"}, + {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ae71e7ddb7a413dd60052e90528f2f65270aad4b509563af6d03d53e979feafd"}, + {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:38dd60d7bf242c4ed5b38e094baf6401faa114fc09e9e6632374388a404f98e7"}, + {file = "coverage-7.4.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa5b1c1bfc28384f1f53b69a023d789f72b2e0ab1b3787aae16992a7ca21056c"}, + {file = "coverage-7.4.4-cp38-cp38-win32.whl", hash = "sha256:dfa8fe35a0bb90382837b238fff375de15f0dcdb9ae68ff85f7a63649c98527e"}, + {file = "coverage-7.4.4-cp38-cp38-win_amd64.whl", hash = "sha256:b2991665420a803495e0b90a79233c1433d6ed77ef282e8e152a324bbbc5e0c8"}, + {file = "coverage-7.4.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3b799445b9f7ee8bf299cfaed6f5b226c0037b74886a4e11515e569b36fe310d"}, + {file = "coverage-7.4.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b4d33f418f46362995f1e9d4f3a35a1b6322cb959c31d88ae56b0298e1c22357"}, + {file = "coverage-7.4.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aadacf9a2f407a4688d700e4ebab33a7e2e408f2ca04dbf4aef17585389eff3e"}, + {file = "coverage-7.4.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7c95949560050d04d46b919301826525597f07b33beba6187d04fa64d47ac82e"}, + {file = "coverage-7.4.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff7687ca3d7028d8a5f0ebae95a6e4827c5616b31a4ee1192bdfde697db110d4"}, + {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5fc1de20b2d4a061b3df27ab9b7c7111e9a710f10dc2b84d33a4ab25065994ec"}, + {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c74880fc64d4958159fbd537a091d2a585448a8f8508bf248d72112723974cbd"}, + {file = "coverage-7.4.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:742a76a12aa45b44d236815d282b03cfb1de3b4323f3e4ec933acfae08e54ade"}, + {file = "coverage-7.4.4-cp39-cp39-win32.whl", hash = "sha256:d89d7b2974cae412400e88f35d86af72208e1ede1a541954af5d944a8ba46c57"}, + {file = "coverage-7.4.4-cp39-cp39-win_amd64.whl", hash = "sha256:9ca28a302acb19b6af89e90f33ee3e1906961f94b54ea37de6737b7ca9d8827c"}, + {file = "coverage-7.4.4-pp38.pp39.pp310-none-any.whl", hash = "sha256:b2c5edc4ac10a7ef6605a966c58929ec6c1bd0917fb8c15cb3363f65aa40e677"}, + {file = "coverage-7.4.4.tar.gz", hash = "sha256:c901df83d097649e257e803be22592aedfd5182f07b3cc87d640bbb9afd50f49"}, +] + +[package.dependencies] +tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""} + +[package.extras] +toml = ["tomli"] + [[package]] name = "dishka" version = "1.0.0" @@ -135,6 +235,62 @@ Werkzeug = ">=3.0.0" async = ["asgiref (>=3.2)"] dotenv = ["python-dotenv"] +[[package]] +name = "h11" +version = "0.14.0" +description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +optional = false +python-versions = ">=3.7" +files = [ + {file = "h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"}, + {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"}, +] + +[[package]] +name = "httpcore" +version = "1.0.5" +description = "A minimal low-level HTTP client." +optional = false +python-versions = ">=3.8" +files = [ + {file = "httpcore-1.0.5-py3-none-any.whl", hash = "sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5"}, + {file = "httpcore-1.0.5.tar.gz", hash = "sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61"}, +] + +[package.dependencies] +certifi = "*" +h11 = ">=0.13,<0.15" + +[package.extras] +asyncio = ["anyio (>=4.0,<5.0)"] +http2 = ["h2 (>=3,<5)"] +socks = ["socksio (==1.*)"] +trio = ["trio (>=0.22.0,<0.26.0)"] + +[[package]] +name = "httpx" +version = "0.27.0" +description = "The next generation HTTP client." +optional = false +python-versions = ">=3.8" +files = [ + {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"}, + {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"}, +] + +[package.dependencies] +anyio = "*" +certifi = "*" +httpcore = "==1.*" +idna = "*" +sniffio = "*" + +[package.extras] +brotli = ["brotli", "brotlicffi"] +cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"] +http2 = ["h2 (>=3,<5)"] +socks = ["socksio (==1.*)"] + [[package]] name = "identify" version = "2.5.35" @@ -149,6 +305,28 @@ files = [ [package.extras] license = ["ukkonen"] +[[package]] +name = "idna" +version = "3.7" +description = "Internationalized Domain Names in Applications (IDNA)" +optional = false +python-versions = ">=3.5" +files = [ + {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"}, + {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"}, +] + +[[package]] +name = "iniconfig" +version = "2.0.0" +description = "brain-dead simple config-ini parsing" +optional = false +python-versions = ">=3.7" +files = [ + {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"}, + {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, +] + [[package]] name = "itsdangerous" version = "2.1.2" @@ -260,6 +438,17 @@ files = [ [package.dependencies] setuptools = "*" +[[package]] +name = "packaging" +version = "24.0" +description = "Core utilities for Python packages" +optional = false +python-versions = ">=3.7" +files = [ + {file = "packaging-24.0-py3-none-any.whl", hash = "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5"}, + {file = "packaging-24.0.tar.gz", hash = "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"}, +] + [[package]] name = "platformdirs" version = "4.2.0" @@ -275,6 +464,21 @@ files = [ docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"] +[[package]] +name = "pluggy" +version = "1.4.0" +description = "plugin and hook calling mechanisms for python" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pluggy-1.4.0-py3-none-any.whl", hash = "sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981"}, + {file = "pluggy-1.4.0.tar.gz", hash = "sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be"}, +] + +[package.extras] +dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] + [[package]] name = "pre-commit" version = "3.7.0" @@ -293,6 +497,64 @@ nodeenv = ">=0.11.1" pyyaml = ">=5.1" virtualenv = ">=20.10.0" +[[package]] +name = "pytest" +version = "8.1.1" +description = "pytest: simple powerful testing with Python" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pytest-8.1.1-py3-none-any.whl", hash = "sha256:2a8386cfc11fa9d2c50ee7b2a57e7d898ef90470a7a34c4b949ff59662bb78b7"}, + {file = "pytest-8.1.1.tar.gz", hash = "sha256:ac978141a75948948817d360297b7aae0fcb9d6ff6bc9ec6d514b85d5a65c044"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "sys_platform == \"win32\""} +exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} +iniconfig = "*" +packaging = "*" +pluggy = ">=1.4,<2.0" +tomli = {version = ">=1", markers = "python_version < \"3.11\""} + +[package.extras] +testing = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] + +[[package]] +name = "pytest-asyncio" +version = "0.23.6" +description = "Pytest support for asyncio" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pytest-asyncio-0.23.6.tar.gz", hash = "sha256:ffe523a89c1c222598c76856e76852b787504ddb72dd5d9b6617ffa8aa2cde5f"}, + {file = "pytest_asyncio-0.23.6-py3-none-any.whl", hash = "sha256:68516fdd1018ac57b846c9846b954f0393b26f094764a28c955eabb0536a4e8a"}, +] + +[package.dependencies] +pytest = ">=7.0.0,<9" + +[package.extras] +docs = ["sphinx (>=5.3)", "sphinx-rtd-theme (>=1.0)"] +testing = ["coverage (>=6.2)", "hypothesis (>=5.7.1)"] + +[[package]] +name = "pytest-cov" +version = "5.0.0" +description = "Pytest plugin for measuring coverage." +optional = false +python-versions = ">=3.8" +files = [ + {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"}, + {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"}, +] + +[package.dependencies] +coverage = {version = ">=5.2.1", extras = ["toml"]} +pytest = ">=4.6" + +[package.extras] +testing = ["fields", "hunter", "process-tests", "pytest-xdist", "virtualenv"] + [[package]] name = "pyyaml" version = "6.0.1" @@ -318,6 +580,7 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, @@ -386,6 +649,58 @@ docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments testing = ["build[virtualenv]", "filelock (>=3.4.0)", "importlib-metadata", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mypy (==1.9)", "packaging (>=23.2)", "pip (>=19.1)", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff (>=0.2.1)", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.2)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] +[[package]] +name = "sniffio" +version = "1.3.1" +description = "Sniff out which async library your code is running under" +optional = false +python-versions = ">=3.7" +files = [ + {file = "sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2"}, + {file = "sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc"}, +] + +[[package]] +name = "tomli" +version = "2.0.1" +description = "A lil' TOML parser" +optional = false +python-versions = ">=3.7" +files = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, +] + +[[package]] +name = "typing-extensions" +version = "4.11.0" +description = "Backported and Experimental Type Hints for Python 3.8+" +optional = false +python-versions = ">=3.8" +files = [ + {file = "typing_extensions-4.11.0-py3-none-any.whl", hash = "sha256:c1f94d72897edaf4ce775bb7558d5b79d8126906a14ea5ed1635921406c0387a"}, + {file = "typing_extensions-4.11.0.tar.gz", hash = "sha256:83f085bd5ca59c80295fc2a82ab5dac679cbe02b9f33f7d83af68e241bea51b0"}, +] + +[[package]] +name = "uvicorn" +version = "0.29.0" +description = "The lightning-fast ASGI server." +optional = false +python-versions = ">=3.8" +files = [ + {file = "uvicorn-0.29.0-py3-none-any.whl", hash = "sha256:2c2aac7ff4f4365c206fd773a39bf4ebd1047c238f8b8268ad996829323473de"}, + {file = "uvicorn-0.29.0.tar.gz", hash = "sha256:6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0"}, +] + +[package.dependencies] +click = ">=7.0" +h11 = ">=0.8" +typing-extensions = {version = ">=4.0", markers = "python_version < \"3.11\""} + +[package.extras] +standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", "pyyaml (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "watchfiles (>=0.13)", "websockets (>=10.4)"] + [[package]] name = "virtualenv" version = "20.25.1" @@ -426,4 +741,4 @@ watchdog = ["watchdog (>=2.3)"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "0277ac9aaa4b3c1aafbf05157381b1af16f56a8d7ce4a47c5a20f7bac3978189" +content-hash = "87d073ca24de35a4bf88e34ab602eb9cae853b6ac836a6752299006eb37c3f87" diff --git a/pyproject.toml b/pyproject.toml index 2d8d64f..76ccf27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,11 +11,19 @@ flask = "^3.0.3" redis = "^5.0.3" dishka = "^1.0.0" exceptiongroup = "^1.2.0" +uvicorn = "^0.29.0" [tool.poetry.group.dev.dependencies] pre-commit = "^3.7.0" +pytest = "^8.1.1" +httpx = "^0.27.0" +pytest-asyncio = "^0.23.6" +pytest-cov = "^5.0.0" [build-system] requires = ["poetry-core"] build-backend = "poetry.core.masonry.api" + +[tool.poetry.scripts] +app = "flask_demo_api.main:run_app" diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000..0f74a88 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,28 @@ +import pytest +from dishka.integrations.flask import setup_dishka +from flask import Flask +from httpx import AsyncClient + +from flask_demo_api.ioc import create_container +from flask_demo_api.main import app_factory + + +@pytest.fixture(scope="session", autouse=True) +def app(): + app: Flask = app_factory() + app.config.update( + { + "TESTING": True, + } + ) + container = create_container() + setup_dishka(container=container, app=app, auto_inject=True) + + yield app + + container.close() + + +@pytest.fixture() +def client(app): + return app.test_client() diff --git a/tests/test_get.py b/tests/test_get.py new file mode 100644 index 0000000..a2ab475 --- /dev/null +++ b/tests/test_get.py @@ -0,0 +1,14 @@ +def test_get_without_args(client): + response = client.get("/") + assert response.status_code == 400 + assert response.get_json() == { + "error": "400 Bad Request: Invalid GET parameters", + } + + +def test_get_with_wrong_key(client): + response = client.get("/?key=blabla") + assert response.status_code == 404 + assert response.get_json() == { + "error": "404 Not Found: Key not found", + } diff --git a/tests/test_post.py b/tests/test_post.py new file mode 100644 index 0000000..d43c53a --- /dev/null +++ b/tests/test_post.py @@ -0,0 +1,23 @@ +import json + + +def test_post_with_wrong_content_type(client): + data = json.dumps({}) + response = client.post("/", data=data) + assert response.status_code == 415 + + +def test_post_with_empty_data(client): + data = json.dumps({}) + response = client.post("/", data=data, content_type="application/json") + assert response.status_code == 400 + + +def test_post_with_data(client): + data = json.dumps({"key": "abc", "val": "def"}) + response = client.post("/", data=data, content_type="application/json") + assert response.status_code == 201 + assert response.get_json() == { + "message": "Ok", + "data": {"key": "abc", "val": "def"}, + }