From bbf4a69c34a278e00449406f813b502188f0db34 Mon Sep 17 00:00:00 2001 From: JimZhang Date: Fri, 30 Jun 2023 12:06:00 +0800 Subject: [PATCH] fix: disable amqpstorm auto decode --- amqpworker/easyqueue/queue.py | 2 +- poetry.lock | 88 +++++++++++++---------------------- pyproject.toml | 7 +-- 3 files changed, 37 insertions(+), 60 deletions(-) diff --git a/amqpworker/easyqueue/queue.py b/amqpworker/easyqueue/queue.py index de0c88e..6686fc5 100644 --- a/amqpworker/easyqueue/queue.py +++ b/amqpworker/easyqueue/queue.py @@ -330,7 +330,7 @@ class JsonQueue(BaseQueue, Generic[T]): def start(): try: - self.connection.channel.start_consuming() + self.connection.channel.start_consuming(auto_decode=False) except: traceback.print_exc() diff --git a/poetry.lock b/poetry.lock index 90e04dc..fe7e259 100644 --- a/poetry.lock +++ b/poetry.lock @@ -69,9 +69,6 @@ files = [ {file = "delayedqueue-1.0.0.tar.gz", hash = "sha256:34085363e5ae54584b2d5977f270fa5d9321ce9a857f3acab8608d711278b68c"}, ] -[package.dependencies] -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - [package.extras] testing = ["pytest", "pytest-cov", "setuptools"] @@ -100,32 +97,6 @@ type = "legacy" url = "https://mirror.baidu.com/pypi/simple" reference = "douban" -[[package]] -name = "importlib-metadata" -version = "6.6.0" -description = "Read metadata from Python packages" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "importlib_metadata-6.6.0-py3-none-any.whl", hash = "sha256:43dd286a2cd8995d5eaef7fee2066340423b818ed3fd70adf0bad5f1fac53fed"}, - {file = "importlib_metadata-6.6.0.tar.gz", hash = "sha256:92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705"}, -] - -[package.dependencies] -typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} -zipp = ">=0.5" - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -perf = ["ipython"] -testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)"] - -[package.source] -type = "legacy" -url = "https://mirror.baidu.com/pypi/simple" -reference = "douban" - [[package]] name = "iniconfig" version = "2.0.0" @@ -167,6 +138,36 @@ type = "legacy" url = "https://mirror.baidu.com/pypi/simple" reference = "douban" +[[package]] +name = "oxidized-importer" +version = "0.6.0" +description = "Python importer implemented in Rust" +category = "dev" +optional = false +python-versions = ">=3.8" +files = [ + {file = "oxidized_importer-0.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:288f895e7e10a2eaf38b8be60bc7d6b97bbff7ddc92e7bc940f7a5f5d5d47506"}, + {file = "oxidized_importer-0.6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4229c3a31511640206cd3f29aa45f0ad576c5e26f3c3f06815cfdf47a417bc9"}, + {file = "oxidized_importer-0.6.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a64621425a1d226b24448d35cd5f4d0fa2d8172d9196ff05ae7d2d3079e0821"}, + {file = "oxidized_importer-0.6.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5e3ea7014e9cbb3d33ce401fee9580e28c00f64f9a4cbea97b098ee27032b95"}, + {file = "oxidized_importer-0.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:9e875a5cfb9f17998d305190d073a6fe048f996e528f0498b07b7a3f683fac9f"}, + {file = "oxidized_importer-0.6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:01de60443f2b6d79b99500ac32c3c9e01e3baf7cce8ed2416b4c78bcb936df6d"}, + {file = "oxidized_importer-0.6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dbc2a2e8b077793043d0eee18bd0ed454da7bf5b498c3e8f9ef2ca5f4bb8700b"}, + {file = "oxidized_importer-0.6.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0170adbf5b4a1f88e8ebdc68bb74349e1c048307b1f814c1ad96e3279f47dfb4"}, + {file = "oxidized_importer-0.6.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3818dbd8669e3cd4917d79c894897e4b28cc426250494d7d614c6f3c9c3c184b"}, + {file = "oxidized_importer-0.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:ae3555af07922513966742c2a1fbeedeccd1cafcd3de257c967e80539ea37883"}, + {file = "oxidized_importer-0.6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fccb6e2865446aba16efef44f87380357df2479567176efa3f02182e15c6c347"}, + {file = "oxidized_importer-0.6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7fb386ac476e9f99a5c05e480953baec55fc985e5984b52f60ee036f7a474d04"}, + {file = "oxidized_importer-0.6.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:41a8cd76f4fe3b0b214ac34b2b9508bbd0fcae0730df2ba2d0d5e011bfddfd32"}, + {file = "oxidized_importer-0.6.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9763b3f0310b97d281763a4a4522e24fd92b4bb429206da4af04296a2266f209"}, + {file = "oxidized_importer-0.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:75ba68610eabae456151a3e4aef99baac0aace01d67d99809d991b1a2d141fc6"}, +] + +[package.source] +type = "legacy" +url = "https://mirror.baidu.com/pypi/simple" +reference = "douban" + [[package]] name = "packaging" version = "23.1" @@ -216,9 +217,6 @@ files = [ {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, ] -[package.dependencies] -importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} - [package.extras] dev = ["pre-commit", "tox"] testing = ["pytest", "pytest-benchmark"] @@ -301,7 +299,6 @@ files = [ [package.dependencies] colorama = {version = "*", markers = "sys_platform == \"win32\""} exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} -importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} iniconfig = "*" packaging = "*" pluggy = ">=0.12,<2.0" @@ -392,28 +389,7 @@ type = "legacy" url = "https://mirror.baidu.com/pypi/simple" reference = "douban" -[[package]] -name = "zipp" -version = "3.15.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" -optional = false -python-versions = ">=3.7" -files = [ - {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"}, - {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"}, -] - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] - -[package.source] -type = "legacy" -url = "https://mirror.baidu.com/pypi/simple" -reference = "douban" - [metadata] lock-version = "2.0" -python-versions = "^3.7" -content-hash = "cd2a61e44b452c0c7c98b52833f4b223c8f3c22f363bcbf62acbf239ab9260e6" +python-versions = "^3.8" +content-hash = "df08e505f86ac2948eb727cac8ef0caa5eceed20b9bc7a616690585394992a9a" diff --git a/pyproject.toml b/pyproject.toml index 2cd94c8..ca59df1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "amqp-workers" -version = "0.1.1" -description = "" +version = "0.1.3" +description = "amqp-worker is a Python-based multi-threaded RabbitMQ consumer framework" authors = ["JimZhang "] readme = "README.md" packages = [{include = "amqpworker"}] @@ -10,7 +10,7 @@ keywords = ["amqp", "rabbitmq"] license = "MIT" [tool.poetry.dependencies] -python = "^3.7" +python = "^3.8" amqpstorm = {version = "^2.10.6", source = "douban"} pydantic = {version = "1.10.7", source = "douban"} loguru = {version = "^0.7.0", source = "douban"} @@ -21,6 +21,7 @@ delayedqueue = {version = "^1.0.0", source = "douban"} [tool.poetry.group.dev.dependencies] pytest = "^7.3.1" pytest-mock = "^3.10.0" +oxidized-importer = "^0.6.0" [build-system] requires = ["poetry-core"]