From 07eca3274c674640ed510daeb85656cfe1c74390 Mon Sep 17 00:00:00 2001 From: Lev Gorodetskiy Date: Sun, 26 Jan 2025 09:58:25 -0300 Subject: [PATCH 1/5] Update tortoise-orm to 0.24.0 --- pyproject.toml | 3 +- requirements.txt | 24 +++++------ src/dipdup/fields.py | 2 +- src/dipdup/models/__init__.py | 6 +-- uv.lock | 75 +++++++++++++++++------------------ 5 files changed, 54 insertions(+), 56 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 15923decf..3c4dd8254 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,8 +76,7 @@ dependencies = [ "strict-rfc3339~=0.7", "survey~=5.4", "tabulate~=0.9", - # TODO: 0.23.0 available - "tortoise-orm==0.21.7", # pinned + "tortoise-orm==0.24.0", # pinned "uvloop~=0.20", "web3~=7.2", ] diff --git a/requirements.txt b/requirements.txt index 847ffe7be..1d6916feb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -71,9 +71,9 @@ asyncpg==0.30.0 \ --hash=sha256:c551e9928ab6707602f44811817f82ba3c446e018bfe1d3abecc8ba5f3eac851 \ --hash=sha256:c902a60b52e506d38d7e80e0dd5399f657220f24635fee368117b8b5fce1142e \ --hash=sha256:db9891e2d76e6f425746c5d2da01921e9a16b5a71a1c905b13f30e12a257c4af -attrs==24.3.0 \ - --hash=sha256:8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff \ - --hash=sha256:ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308 +attrs==25.1.0 \ + --hash=sha256:1c97078a80c814273a76b2a298a932eb681c87415c11dee0a6921de7f1b02c3e \ + --hash=sha256:c75a69e28a550a7e93789579c22aa26b0f5b83b75dc4e08fe092980051e1090a base58==2.1.1 \ --hash=sha256:11a36f4d3ce51dfc1043f3218591ac4eb1ceb172919cebe05b52a5bcc8d245c2 \ --hash=sha256:c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c @@ -403,9 +403,9 @@ pycryptodome==3.21.0 \ --hash=sha256:b7aa25fc0baa5b1d95b7633af4f5f1838467f1815442b22487426f94e0d66c53 \ --hash=sha256:de18954104667f565e2fbb4783b56667f30fb49c4d79b346f52a29cb198d5b6b \ --hash=sha256:f7787e0d469bdae763b876174cf2e6c0f7be79808af26b1da96f1a64bcf47297 -pydantic==2.10.5 \ - --hash=sha256:278b38dbbaec562011d659ee05f63346951b3a248a6f3642e1bc68894ea2b4ff \ - --hash=sha256:4dd4e322dbe55472cb7ca7e73f4b63574eecccf2835ffa2af9021ce113c83c53 +pydantic==2.10.6 \ + --hash=sha256:427d664bf0b8a2b34ff5dd0f5a18df00591adcee7198fbd71981054cef37b584 \ + --hash=sha256:ca5daa827cce33de7a42be142548b0096bf05a7e7b365aebfa5f8eeec7128236 pydantic-core==2.27.2 \ --hash=sha256:05e3a55d124407fffba0dd6b0c0cd056d10e983ceb4e5dbd10dda135c31071d6 \ --hash=sha256:172fce187655fece0c90d90a678424b013f8fbb0ca8b036ac266749c09438cb7 \ @@ -425,9 +425,9 @@ pydantic-core==2.27.2 \ pyhumps==3.8.0 \ --hash=sha256:060e1954d9069f428232a1adda165db0b9d8dfdce1d265d36df7fbff540acfd6 \ --hash=sha256:498026258f7ee1a8e447c2e28526c0bea9407f9a59c03260aee4bd6c04d681a3 -pypika-tortoise==0.2.2 \ - --hash=sha256:e93190aedd95acb08b69636bc2328cc053b2c9971307b6d44405bc6d9f9b71a5 \ - --hash=sha256:f0fbc9e0c3ddc33118a5be69907428863849df60788e125edef1f46a6261d63b +pypika-tortoise==0.5.0 \ + --hash=sha256:dbdc47eb52ce17407b05ce9f8560ce93b856d7b28beb01971d956b017846691f \ + --hash=sha256:ed0f56761868dc222c03e477578638590b972280b03c7c45cd93345b18b61f58 pysignalr==1.1.0 \ --hash=sha256:17977720e3360403b05e8c764a28c70a3865fef973cc0f08bd877101f06ae815 \ --hash=sha256:f9e9ed611c999043778ebb9e5bd7d92e0afae3f9555eb73d447335e48de3b385 @@ -526,9 +526,9 @@ tabulate==0.9.0 \ toolz==1.0.0 ; implementation_name == 'cpython' or implementation_name == 'pypy' \ --hash=sha256:292c8f1c4e7516bf9086f8850935c799a874039c8bcf959d47b600e4c44a6236 \ --hash=sha256:2c86e3d9a04798ac556793bced838816296a2f085017664e4995cb40a1047a02 -tortoise-orm==0.21.7 \ - --hash=sha256:2229925885461f424673223ea1875bd5e6961384c766833af55a1ea11a9b25eb \ - --hash=sha256:8a790a931828aa37ac364b344c561e603422aced2af5e403f6790575da0f19c5 +tortoise-orm==0.24.0 \ + --hash=sha256:ae0704a93ea27931724fc899e57268c8081afce3b32b110b00037ec206553e7d \ + --hash=sha256:ee3b72b226767293b24c5c4906ae5f027d7cc84496cd503352c918564b4fd687 typeguard==4.4.1 \ --hash=sha256:0d22a89d00b453b47c49875f42b6601b961757541a2e1e0ef517b6e24213c21b \ --hash=sha256:9324ec07a27ec67fc54a9c063020ca4c0ae6abad5e9f0f9804ca59aee68c6e21 diff --git a/src/dipdup/fields.py b/src/dipdup/fields.py index 4eeaebfac..be1f6d079 100644 --- a/src/dipdup/fields.py +++ b/src/dipdup/fields.py @@ -59,7 +59,7 @@ JSONField = partial( - _JSONField, + _JSONField[Any], encoder=json_dumps_plain, decoder=orjson.loads, ) diff --git a/src/dipdup/models/__init__.py b/src/dipdup/models/__init__.py index 3b079ced8..e684b7ab7 100644 --- a/src/dipdup/models/__init__.py +++ b/src/dipdup/models/__init__.py @@ -310,7 +310,7 @@ async def _execute(self) -> int: class BulkUpdateQuery(TortoiseBulkUpdateQuery): # type: ignore[type-arg] async def _execute(self) -> int: - for model in self.objects: + for model in self._objects: if update := ModelUpdate.from_model( cast(Model, model), ModelUpdateAction.UPDATE, @@ -322,7 +322,7 @@ async def _execute(self) -> int: class BulkCreateQuery(TortoiseBulkCreateQuery): # type: ignore[type-arg] async def _execute(self) -> None: - for model in self.objects: + for model in self._objects: if update := ModelUpdate.from_model( cast(Model, model), ModelUpdateAction.INSERT, @@ -332,7 +332,7 @@ async def _execute(self) -> None: await super()._execute() # NOTE: A bug; raises "You should first call .save()..." otherwise - for model in self.objects: + for model in self._objects: model._saved_in_db = True diff --git a/uv.lock b/uv.lock index b4fea7f0d..666fe8201 100644 --- a/uv.lock +++ b/uv.lock @@ -218,11 +218,11 @@ wheels = [ [[package]] name = "attrs" -version = "24.3.0" +version = "25.1.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/48/c8/6260f8ccc11f0917360fc0da435c5c9c7504e3db174d5a12a1494887b045/attrs-24.3.0.tar.gz", hash = "sha256:8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff", size = 805984 } +sdist = { url = "https://files.pythonhosted.org/packages/49/7c/fdf464bcc51d23881d110abd74b512a42b3d5d376a55a831b44c603ae17f/attrs-25.1.0.tar.gz", hash = "sha256:1c97078a80c814273a76b2a298a932eb681c87415c11dee0a6921de7f1b02c3e", size = 810562 } wheels = [ - { url = "https://files.pythonhosted.org/packages/89/aa/ab0f7891a01eeb2d2e338ae8fecbe57fcebea1a24dbb64d45801bfab481d/attrs-24.3.0-py3-none-any.whl", hash = "sha256:ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308", size = 63397 }, + { url = "https://files.pythonhosted.org/packages/fc/30/d4986a882011f9df997a55e6becd864812ccfcd821d64aac8570ee39f719/attrs-25.1.0-py3-none-any.whl", hash = "sha256:c75a69e28a550a7e93789579c22aa26b0f5b83b75dc4e08fe092980051e1090a", size = 63152 }, ] [[package]] @@ -560,7 +560,7 @@ requires-dist = [ { name = "strict-rfc3339", specifier = "~=0.7" }, { name = "survey", specifier = "~=5.4" }, { name = "tabulate", specifier = "~=0.9" }, - { name = "tortoise-orm", specifier = "==0.21.7" }, + { name = "tortoise-orm", specifier = "==0.24.0" }, { name = "uvloop", specifier = "~=0.20" }, { name = "web3", specifier = "~=7.2" }, ] @@ -1096,11 +1096,11 @@ wheels = [ [[package]] name = "nvidia-ml-py" -version = "12.560.30" +version = "12.570.86" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/53/10/5f34de4a71db8b2b7ec4269f4a33287f24c23e2857ea3187c977b7bc3604/nvidia-ml-py-12.560.30.tar.gz", hash = "sha256:f0254dc7400647680a072ee02509bfd46102b60bdfeca321576d4d4817e7fe97", size = 39194 } +sdist = { url = "https://files.pythonhosted.org/packages/ad/6e/7b0c9b88c7d520fb8639024a1a3b6dd1db03bf2c17ae85040c8758d2eb6f/nvidia_ml_py-12.570.86.tar.gz", hash = "sha256:0508d4a0c7b6d015cf574530b95a62ed4fc89da3b8b47e1aefe6777db170ec8b", size = 43147 } wheels = [ - { url = "https://files.pythonhosted.org/packages/b7/f3/a69ce0b1a1e12fbf6b2ad9f4c14c9999fdbdf15f2478d210f0fd501ddc98/nvidia_ml_py-12.560.30-py3-none-any.whl", hash = "sha256:fea371c94d63e38a611c17bbb85fe400e9c8ddb9e8684a9cd0e47786a4bc3c73", size = 40526 }, + { url = "https://files.pythonhosted.org/packages/d8/a8/ec37169be4e2b7063b9076ed3fe0661e87335fbca665eed3f48c415cb234/nvidia_ml_py-12.570.86-py3-none-any.whl", hash = "sha256:58907de35a845abd13dcb227f18298f3b5dd94a72d04c9e594e77711e95c0b51", size = 44442 }, ] [[package]] @@ -1264,16 +1264,16 @@ wheels = [ [[package]] name = "pydantic" -version = "2.10.5" +version = "2.10.6" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "annotated-types" }, { name = "pydantic-core" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/6a/c7/ca334c2ef6f2e046b1144fe4bb2a5da8a4c574e7f2ebf7e16b34a6a2fa92/pydantic-2.10.5.tar.gz", hash = "sha256:278b38dbbaec562011d659ee05f63346951b3a248a6f3642e1bc68894ea2b4ff", size = 761287 } +sdist = { url = "https://files.pythonhosted.org/packages/b7/ae/d5220c5c52b158b1de7ca89fc5edb72f304a70a4c540c84c8844bf4008de/pydantic-2.10.6.tar.gz", hash = "sha256:ca5daa827cce33de7a42be142548b0096bf05a7e7b365aebfa5f8eeec7128236", size = 761681 } wheels = [ - { url = "https://files.pythonhosted.org/packages/58/26/82663c79010b28eddf29dcdd0ea723439535fa917fce5905885c0e9ba562/pydantic-2.10.5-py3-none-any.whl", hash = "sha256:4dd4e322dbe55472cb7ca7e73f4b63574eecccf2835ffa2af9021ce113c83c53", size = 431426 }, + { url = "https://files.pythonhosted.org/packages/f4/3c/8cc1cc84deffa6e25d2d0c688ebb80635dfdbf1dbea3e30c541c8cf4d860/pydantic-2.10.6-py3-none-any.whl", hash = "sha256:427d664bf0b8a2b34ff5dd0f5a18df00591adcee7198fbd71981054cef37b584", size = 431696 }, ] [package.optional-dependencies] @@ -1326,11 +1326,11 @@ wheels = [ [[package]] name = "pypika-tortoise" -version = "0.2.2" +version = "0.5.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/84/2d/603b4945d4f6aec8894e0b7009d7094cada2b75e187de62320d78927f18b/pypika_tortoise-0.2.2.tar.gz", hash = "sha256:f0fbc9e0c3ddc33118a5be69907428863849df60788e125edef1f46a6261d63b", size = 39858 } +sdist = { url = "https://files.pythonhosted.org/packages/7d/7b/74dce3354d81988f1d69b689f20b28c3e92f2dcc0c46975bdafd3eb37b18/pypika_tortoise-0.5.0.tar.gz", hash = "sha256:ed0f56761868dc222c03e477578638590b972280b03c7c45cd93345b18b61f58", size = 39701 } wheels = [ - { url = "https://files.pythonhosted.org/packages/dc/90/36daceba2a90a97bb11013118c0104d1a2c1f6af23b72a71df42cebc7952/pypika_tortoise-0.2.2-py3-none-any.whl", hash = "sha256:e93190aedd95acb08b69636bc2328cc053b2c9971307b6d44405bc6d9f9b71a5", size = 50015 }, + { url = "https://files.pythonhosted.org/packages/36/bc/830cfe07a84a9ff75d2ae96696b933744b7f20ef40ad69b002b8cf9265e3/pypika_tortoise-0.5.0-py3-none-any.whl", hash = "sha256:dbdc47eb52ce17407b05ce9f8560ce93b856d7b28beb01971d956b017846691f", size = 45915 }, ] [[package]] @@ -1572,27 +1572,27 @@ wheels = [ [[package]] name = "ruff" -version = "0.9.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/80/63/77ecca9d21177600f551d1c58ab0e5a0b260940ea7312195bd2a4798f8a8/ruff-0.9.2.tar.gz", hash = "sha256:b5eceb334d55fae5f316f783437392642ae18e16dcf4f1858d55d3c2a0f8f5d0", size = 3553799 } -wheels = [ - { url = "https://files.pythonhosted.org/packages/af/b9/0e168e4e7fb3af851f739e8f07889b91d1a33a30fca8c29fa3149d6b03ec/ruff-0.9.2-py3-none-linux_armv6l.whl", hash = "sha256:80605a039ba1454d002b32139e4970becf84b5fee3a3c3bf1c2af6f61a784347", size = 11652408 }, - { url = "https://files.pythonhosted.org/packages/2c/22/08ede5db17cf701372a461d1cb8fdde037da1d4fa622b69ac21960e6237e/ruff-0.9.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b9aab82bb20afd5f596527045c01e6ae25a718ff1784cb92947bff1f83068b00", size = 11587553 }, - { url = "https://files.pythonhosted.org/packages/42/05/dedfc70f0bf010230229e33dec6e7b2235b2a1b8cbb2a991c710743e343f/ruff-0.9.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:fbd337bac1cfa96be615f6efcd4bc4d077edbc127ef30e2b8ba2a27e18c054d4", size = 11020755 }, - { url = "https://files.pythonhosted.org/packages/df/9b/65d87ad9b2e3def67342830bd1af98803af731243da1255537ddb8f22209/ruff-0.9.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82b35259b0cbf8daa22a498018e300b9bb0174c2bbb7bcba593935158a78054d", size = 11826502 }, - { url = "https://files.pythonhosted.org/packages/93/02/f2239f56786479e1a89c3da9bc9391120057fc6f4a8266a5b091314e72ce/ruff-0.9.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8b6a9701d1e371bf41dca22015c3f89769da7576884d2add7317ec1ec8cb9c3c", size = 11390562 }, - { url = "https://files.pythonhosted.org/packages/c9/37/d3a854dba9931f8cb1b2a19509bfe59e00875f48ade632e95aefcb7a0aee/ruff-0.9.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9cc53e68b3c5ae41e8faf83a3b89f4a5d7b2cb666dff4b366bb86ed2a85b481f", size = 12548968 }, - { url = "https://files.pythonhosted.org/packages/fa/c3/c7b812bb256c7a1d5553433e95980934ffa85396d332401f6b391d3c4569/ruff-0.9.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:8efd9da7a1ee314b910da155ca7e8953094a7c10d0c0a39bfde3fcfd2a015684", size = 13187155 }, - { url = "https://files.pythonhosted.org/packages/bd/5a/3c7f9696a7875522b66aa9bba9e326e4e5894b4366bd1dc32aa6791cb1ff/ruff-0.9.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3292c5a22ea9a5f9a185e2d131dc7f98f8534a32fb6d2ee7b9944569239c648d", size = 12704674 }, - { url = "https://files.pythonhosted.org/packages/be/d6/d908762257a96ce5912187ae9ae86792e677ca4f3dc973b71e7508ff6282/ruff-0.9.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1a605fdcf6e8b2d39f9436d343d1f0ff70c365a1e681546de0104bef81ce88df", size = 14529328 }, - { url = "https://files.pythonhosted.org/packages/2d/c2/049f1e6755d12d9cd8823242fa105968f34ee4c669d04cac8cea51a50407/ruff-0.9.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c547f7f256aa366834829a08375c297fa63386cbe5f1459efaf174086b564247", size = 12385955 }, - { url = "https://files.pythonhosted.org/packages/91/5a/a9bdb50e39810bd9627074e42743b00e6dc4009d42ae9f9351bc3dbc28e7/ruff-0.9.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:d18bba3d3353ed916e882521bc3e0af403949dbada344c20c16ea78f47af965e", size = 11810149 }, - { url = "https://files.pythonhosted.org/packages/e5/fd/57df1a0543182f79a1236e82a79c68ce210efb00e97c30657d5bdb12b478/ruff-0.9.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b338edc4610142355ccf6b87bd356729b62bf1bc152a2fad5b0c7dc04af77bfe", size = 11479141 }, - { url = "https://files.pythonhosted.org/packages/dc/16/bc3fd1d38974f6775fc152a0554f8c210ff80f2764b43777163c3c45d61b/ruff-0.9.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:492a5e44ad9b22a0ea98cf72e40305cbdaf27fac0d927f8bc9e1df316dcc96eb", size = 12014073 }, - { url = "https://files.pythonhosted.org/packages/47/6b/e4ca048a8f2047eb652e1e8c755f384d1b7944f69ed69066a37acd4118b0/ruff-0.9.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:af1e9e9fe7b1f767264d26b1075ac4ad831c7db976911fa362d09b2d0356426a", size = 12435758 }, - { url = "https://files.pythonhosted.org/packages/c2/40/4d3d6c979c67ba24cf183d29f706051a53c36d78358036a9cd21421582ab/ruff-0.9.2-py3-none-win32.whl", hash = "sha256:71cbe22e178c5da20e1514e1e01029c73dc09288a8028a5d3446e6bba87a5145", size = 9796916 }, - { url = "https://files.pythonhosted.org/packages/c3/ef/7f548752bdb6867e6939489c87fe4da489ab36191525fadc5cede2a6e8e2/ruff-0.9.2-py3-none-win_amd64.whl", hash = "sha256:c5e1d6abc798419cf46eed03f54f2e0c3adb1ad4b801119dedf23fcaf69b55b5", size = 10773080 }, - { url = "https://files.pythonhosted.org/packages/0e/4e/33df635528292bd2d18404e4daabcd74ca8a9853b2e1df85ed3d32d24362/ruff-0.9.2-py3-none-win_arm64.whl", hash = "sha256:a1b63fa24149918f8b37cef2ee6fff81f24f0d74b6f0bdc37bc3e1f2143e41c6", size = 10001738 }, +version = "0.9.3" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/1e/7f/60fda2eec81f23f8aa7cbbfdf6ec2ca11eb11c273827933fb2541c2ce9d8/ruff-0.9.3.tar.gz", hash = "sha256:8293f89985a090ebc3ed1064df31f3b4b56320cdfcec8b60d3295bddb955c22a", size = 3586740 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/f9/77/4fb790596d5d52c87fd55b7160c557c400e90f6116a56d82d76e95d9374a/ruff-0.9.3-py3-none-linux_armv6l.whl", hash = "sha256:7f39b879064c7d9670197d91124a75d118d00b0990586549949aae80cdc16624", size = 11656815 }, + { url = "https://files.pythonhosted.org/packages/a2/a8/3338ecb97573eafe74505f28431df3842c1933c5f8eae615427c1de32858/ruff-0.9.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:a187171e7c09efa4b4cc30ee5d0d55a8d6c5311b3e1b74ac5cb96cc89bafc43c", size = 11594821 }, + { url = "https://files.pythonhosted.org/packages/8e/89/320223c3421962762531a6b2dd58579b858ca9916fb2674874df5e97d628/ruff-0.9.3-py3-none-macosx_11_0_arm64.whl", hash = "sha256:c59ab92f8e92d6725b7ded9d4a31be3ef42688a115c6d3da9457a5bda140e2b4", size = 11040475 }, + { url = "https://files.pythonhosted.org/packages/b2/bd/1d775eac5e51409535804a3a888a9623e87a8f4b53e2491580858a083692/ruff-0.9.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2dc153c25e715be41bb228bc651c1e9b1a88d5c6e5ed0194fa0dfea02b026439", size = 11856207 }, + { url = "https://files.pythonhosted.org/packages/7f/c6/3e14e09be29587393d188454064a4aa85174910d16644051a80444e4fd88/ruff-0.9.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:646909a1e25e0dc28fbc529eab8eb7bb583079628e8cbe738192853dbbe43af5", size = 11420460 }, + { url = "https://files.pythonhosted.org/packages/ef/42/b7ca38ffd568ae9b128a2fa76353e9a9a3c80ef19746408d4ce99217ecc1/ruff-0.9.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5a5a46e09355695fbdbb30ed9889d6cf1c61b77b700a9fafc21b41f097bfbba4", size = 12605472 }, + { url = "https://files.pythonhosted.org/packages/a6/a1/3167023f23e3530fde899497ccfe239e4523854cb874458ac082992d206c/ruff-0.9.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:c4bb09d2bbb394e3730d0918c00276e79b2de70ec2a5231cd4ebb51a57df9ba1", size = 13243123 }, + { url = "https://files.pythonhosted.org/packages/d0/b4/3c600758e320f5bf7de16858502e849f4216cb0151f819fa0d1154874802/ruff-0.9.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:96a87ec31dc1044d8c2da2ebbed1c456d9b561e7d087734336518181b26b3aa5", size = 12744650 }, + { url = "https://files.pythonhosted.org/packages/be/38/266fbcbb3d0088862c9bafa8b1b99486691d2945a90b9a7316336a0d9a1b/ruff-0.9.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9bb7554aca6f842645022fe2d301c264e6925baa708b392867b7a62645304df4", size = 14458585 }, + { url = "https://files.pythonhosted.org/packages/63/a6/47fd0e96990ee9b7a4abda62de26d291bd3f7647218d05b7d6d38af47c30/ruff-0.9.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cabc332b7075a914ecea912cd1f3d4370489c8018f2c945a30bcc934e3bc06a6", size = 12419624 }, + { url = "https://files.pythonhosted.org/packages/84/5d/de0b7652e09f7dda49e1a3825a164a65f4998175b6486603c7601279baad/ruff-0.9.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:33866c3cc2a575cbd546f2cd02bdd466fed65118e4365ee538a3deffd6fcb730", size = 11843238 }, + { url = "https://files.pythonhosted.org/packages/9e/be/3f341ceb1c62b565ec1fb6fd2139cc40b60ae6eff4b6fb8f94b1bb37c7a9/ruff-0.9.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:006e5de2621304c8810bcd2ee101587712fa93b4f955ed0985907a36c427e0c2", size = 11484012 }, + { url = "https://files.pythonhosted.org/packages/a3/c8/ff8acbd33addc7e797e702cf00bfde352ab469723720c5607b964491d5cf/ruff-0.9.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:ba6eea4459dbd6b1be4e6bfc766079fb9b8dd2e5a35aff6baee4d9b1514ea519", size = 12038494 }, + { url = "https://files.pythonhosted.org/packages/73/b1/8d9a2c0efbbabe848b55f877bc10c5001a37ab10aca13c711431673414e5/ruff-0.9.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:90230a6b8055ad47d3325e9ee8f8a9ae7e273078a66401ac66df68943ced029b", size = 12473639 }, + { url = "https://files.pythonhosted.org/packages/cb/44/a673647105b1ba6da9824a928634fe23186ab19f9d526d7bdf278cd27bc3/ruff-0.9.3-py3-none-win32.whl", hash = "sha256:eabe5eb2c19a42f4808c03b82bd313fc84d4e395133fb3fc1b1516170a31213c", size = 9834353 }, + { url = "https://files.pythonhosted.org/packages/c3/01/65cadb59bf8d4fbe33d1a750103e6883d9ef302f60c28b73b773092fbde5/ruff-0.9.3-py3-none-win_amd64.whl", hash = "sha256:040ceb7f20791dfa0e78b4230ee9dce23da3b64dd5848e40e3bf3ab76468dcf4", size = 10821444 }, + { url = "https://files.pythonhosted.org/packages/69/cb/b3fe58a136a27d981911cba2f18e4b29f15010623b79f0f2510fd0d31fd3/ruff-0.9.3-py3-none-win_arm64.whl", hash = "sha256:800d773f6d4d33b0a3c60e2c6ae8f4c202ea2de056365acfa519aa48acf28e0b", size = 10038168 }, ] [[package]] @@ -1855,18 +1855,17 @@ wheels = [ [[package]] name = "tortoise-orm" -version = "0.21.7" +version = "0.24.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "aiosqlite" }, { name = "iso8601" }, - { name = "pydantic" }, { name = "pypika-tortoise" }, { name = "pytz" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/e8/0e/ad8e7554b0259072887d602617a67ef21055e1d8aa061936e381ecc1a9a5/tortoise_orm-0.21.7.tar.gz", hash = "sha256:8a790a931828aa37ac364b344c561e603422aced2af5e403f6790575da0f19c5", size = 138689 } +sdist = { url = "https://files.pythonhosted.org/packages/64/81/973b629f8a70fc928343f4f8be6121023b6c6f0ee0ae45695955db82af47/tortoise_orm-0.24.0.tar.gz", hash = "sha256:ae0704a93ea27931724fc899e57268c8081afce3b32b110b00037ec206553e7d", size = 143958 } wheels = [ - { url = "https://files.pythonhosted.org/packages/00/e4/918587b57062e83ce230635b5e4611cd192967c1fef9e08936e77f9ba2b9/tortoise_orm-0.21.7-py3-none-any.whl", hash = "sha256:2229925885461f424673223ea1875bd5e6961384c766833af55a1ea11a9b25eb", size = 175702 }, + { url = "https://files.pythonhosted.org/packages/96/88/313395d3ae15f24b18496c4f8077404ee0336eea2a9c648466c406f053b3/tortoise_orm-0.24.0-py3-none-any.whl", hash = "sha256:ee3b72b226767293b24c5c4906ae5f027d7cc84496cd503352c918564b4fd687", size = 164094 }, ] [[package]] From 266a609bc0803671a6d09dc70d72ebe32787cc19 Mon Sep 17 00:00:00 2001 From: Lev Gorodetskiy Date: Tue, 28 Jan 2025 08:59:26 -0300 Subject: [PATCH 2/5] fix for 0.22.1 --- pyproject.toml | 2 +- requirements.txt | 12 ++++++------ src/dipdup/models/__init__.py | 12 ++++++------ uv.lock | 27 ++++++++++++++------------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3c4dd8254..1b97f2461 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,7 @@ dependencies = [ "strict-rfc3339~=0.7", "survey~=5.4", "tabulate~=0.9", - "tortoise-orm==0.24.0", # pinned + "tortoise-orm==0.22.1", # pinned "uvloop~=0.20", "web3~=7.2", ] diff --git a/requirements.txt b/requirements.txt index 1d6916feb..0c4b41a64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -425,9 +425,9 @@ pydantic-core==2.27.2 \ pyhumps==3.8.0 \ --hash=sha256:060e1954d9069f428232a1adda165db0b9d8dfdce1d265d36df7fbff540acfd6 \ --hash=sha256:498026258f7ee1a8e447c2e28526c0bea9407f9a59c03260aee4bd6c04d681a3 -pypika-tortoise==0.5.0 \ - --hash=sha256:dbdc47eb52ce17407b05ce9f8560ce93b856d7b28beb01971d956b017846691f \ - --hash=sha256:ed0f56761868dc222c03e477578638590b972280b03c7c45cd93345b18b61f58 +pypika-tortoise==0.3.2 \ + --hash=sha256:c5c52bc4473fe6f3db36cf659340750246ec5dd0f980d04ae7811430e299c3a2 \ + --hash=sha256:f5d508e2ef00255e52ec6ac79ef889e10dbab328f218c55cd134c4d02ff9f6f4 pysignalr==1.1.0 \ --hash=sha256:17977720e3360403b05e8c764a28c70a3865fef973cc0f08bd877101f06ae815 \ --hash=sha256:f9e9ed611c999043778ebb9e5bd7d92e0afae3f9555eb73d447335e48de3b385 @@ -526,9 +526,9 @@ tabulate==0.9.0 \ toolz==1.0.0 ; implementation_name == 'cpython' or implementation_name == 'pypy' \ --hash=sha256:292c8f1c4e7516bf9086f8850935c799a874039c8bcf959d47b600e4c44a6236 \ --hash=sha256:2c86e3d9a04798ac556793bced838816296a2f085017664e4995cb40a1047a02 -tortoise-orm==0.24.0 \ - --hash=sha256:ae0704a93ea27931724fc899e57268c8081afce3b32b110b00037ec206553e7d \ - --hash=sha256:ee3b72b226767293b24c5c4906ae5f027d7cc84496cd503352c918564b4fd687 +tortoise-orm==0.22.1 \ + --hash=sha256:50cce7ab3eee5321553810ee31f411abde7a1806312655a377801c91e1b2cb77 \ + --hash=sha256:96b8dbc10956cb5cfb6f02841b238035924a6011b5a9737774a22859e1b7bcbf typeguard==4.4.1 \ --hash=sha256:0d22a89d00b453b47c49875f42b6601b961757541a2e1e0ef517b6e24213c21b \ --hash=sha256:9324ec07a27ec67fc54a9c063020ca4c0ae6abad5e9f0f9804ca59aee68c6e21 diff --git a/src/dipdup/models/__init__.py b/src/dipdup/models/__init__.py index e684b7ab7..613f80f6d 100644 --- a/src/dipdup/models/__init__.py +++ b/src/dipdup/models/__init__.py @@ -266,7 +266,7 @@ def __init__( ) self.filter_queryset = filter_queryset - async def _execute(self) -> int: + async def _execute(self, sql, values) -> int: _logger.debug('Prefetching query models: %s', self.filter_queryset) models = await self.filter_queryset _logger.debug('Got %s', len(models)) @@ -278,7 +278,7 @@ async def _execute(self) -> int: if update := ModelUpdate.from_model(model, ModelUpdateAction.UPDATE): get_pending_updates().append(update) - return await super()._execute() + return await super()._execute(sql, values) class DeleteQuery(TortoiseDeleteQuery): @@ -309,7 +309,7 @@ async def _execute(self) -> int: class BulkUpdateQuery(TortoiseBulkUpdateQuery): # type: ignore[type-arg] - async def _execute(self) -> int: + async def _execute_many(self, queries_with_params: list[tuple[str, list[Any]]]) -> int: for model in self._objects: if update := ModelUpdate.from_model( cast(Model, model), @@ -317,11 +317,11 @@ async def _execute(self) -> int: ): get_pending_updates().append(update) - return await super()._execute() + return await super()._execute_many(queries_with_params) class BulkCreateQuery(TortoiseBulkCreateQuery): # type: ignore[type-arg] - async def _execute(self) -> None: + async def _execute_many(self) -> int: for model in self._objects: if update := ModelUpdate.from_model( cast(Model, model), @@ -329,7 +329,7 @@ async def _execute(self) -> None: ): get_pending_updates().append(update) - await super()._execute() + await super()._execute_many() # NOTE: A bug; raises "You should first call .save()..." otherwise for model in self._objects: diff --git a/uv.lock b/uv.lock index 666fe8201..628107b14 100644 --- a/uv.lock +++ b/uv.lock @@ -560,7 +560,7 @@ requires-dist = [ { name = "strict-rfc3339", specifier = "~=0.7" }, { name = "survey", specifier = "~=5.4" }, { name = "tabulate", specifier = "~=0.9" }, - { name = "tortoise-orm", specifier = "==0.24.0" }, + { name = "tortoise-orm", specifier = "==0.22.1" }, { name = "uvloop", specifier = "~=0.20" }, { name = "web3", specifier = "~=7.2" }, ] @@ -1326,11 +1326,11 @@ wheels = [ [[package]] name = "pypika-tortoise" -version = "0.5.0" +version = "0.3.2" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/7d/7b/74dce3354d81988f1d69b689f20b28c3e92f2dcc0c46975bdafd3eb37b18/pypika_tortoise-0.5.0.tar.gz", hash = "sha256:ed0f56761868dc222c03e477578638590b972280b03c7c45cd93345b18b61f58", size = 39701 } +sdist = { url = "https://files.pythonhosted.org/packages/f2/6f/d7bfc44f9d8d68e33866688f7ce9ba0785b485e4dec1590ae0a6ba73b5e2/pypika_tortoise-0.3.2.tar.gz", hash = "sha256:f5d508e2ef00255e52ec6ac79ef889e10dbab328f218c55cd134c4d02ff9f6f4", size = 40445 } wheels = [ - { url = "https://files.pythonhosted.org/packages/36/bc/830cfe07a84a9ff75d2ae96696b933744b7f20ef40ad69b002b8cf9265e3/pypika_tortoise-0.5.0-py3-none-any.whl", hash = "sha256:dbdc47eb52ce17407b05ce9f8560ce93b856d7b28beb01971d956b017846691f", size = 45915 }, + { url = "https://files.pythonhosted.org/packages/c1/8f/85ae29998186957487b9bab089e382e812b8104ed9da47d7815ba04d57bd/pypika_tortoise-0.3.2-py3-none-any.whl", hash = "sha256:c5c52bc4473fe6f3db36cf659340750246ec5dd0f980d04ae7811430e299c3a2", size = 50832 }, ] [[package]] @@ -1611,7 +1611,7 @@ wheels = [ [[package]] name = "scalene" -version = "1.5.50" +version = "1.5.51" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "cloudpickle" }, @@ -1623,12 +1623,12 @@ dependencies = [ { name = "rich" }, { name = "wheel" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/17/3b/dc23631691688d893a6fb5b7a29d44611adb48d87b9a3f996aa8345d600c/scalene-1.5.50.tar.gz", hash = "sha256:fa217bace3cbccf8d32a8affd63489404171a017169af91c85f5d145ad2cd64c", size = 9168332 } +sdist = { url = "https://files.pythonhosted.org/packages/4c/a4/e35a4e22a309ad6a886f0f3a66fd25ae1d0317d1aa81d21b79b3fe1b7cb9/scalene-1.5.51.tar.gz", hash = "sha256:ad33b6ce79239b5a6aff4ec78fa576fe2076b46f78c4c7e5fbc78a927b83374d", size = 9168270 } wheels = [ - { url = "https://files.pythonhosted.org/packages/c0/95/e780b765268ca77bb53af2aa7bf5b9de490541e566b94ef105e6e8248c12/scalene-1.5.50-cp312-cp312-macosx_13_0_universal2.whl", hash = "sha256:c0a9a18a2a3ca1580281560430f834dc895d6e7e313d0464371b9a503594fccf", size = 973806 }, - { url = "https://files.pythonhosted.org/packages/0c/33/8853a07d331f0c1774ac875edf977fd9cb8aab9417f095e74c9313f3b706/scalene-1.5.50-cp312-cp312-macosx_14_0_universal2.whl", hash = "sha256:ee32fff516e8e7dea7dd44c23d8fed1fa5c46ca2c674842d0edf71a8831c1296", size = 973209 }, - { url = "https://files.pythonhosted.org/packages/65/44/ee49b4226da813855c5125a198a5cc1c874191617f95cdcc71aa697d80a3/scalene-1.5.50-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d5258a28021872632cf604f0f70a424489f1854b8275ad79b327ade2b946e118", size = 1247800 }, - { url = "https://files.pythonhosted.org/packages/d9/11/6b7c475d676adcf52d63b30c917085044133f6fdf4f0ce92fb270d402388/scalene-1.5.50-cp312-cp312-win_amd64.whl", hash = "sha256:1024863a4bdfe446af6a2a4d17a538249a34a9d33869ca457ec873719ea5297b", size = 862379 }, + { url = "https://files.pythonhosted.org/packages/aa/39/ace88bf09bca876ae9bd5009042dc95e4b9aae01c24dfc03cae33360d486/scalene-1.5.51-cp312-cp312-macosx_13_0_universal2.whl", hash = "sha256:b9daaefdfc2c20d22aa1ad261cc5965fd73f2dd184fba126be4dc19aae44d141", size = 973804 }, + { url = "https://files.pythonhosted.org/packages/db/f7/657b5fdbbf6eed0f1007f97f8992ef945dd3bc0dafb490cc5e660c40d374/scalene-1.5.51-cp312-cp312-macosx_14_0_universal2.whl", hash = "sha256:4c12d714ce6664c2bd1adab72640bf65fbd9ca2c31164f26b99e898dfe53b754", size = 973209 }, + { url = "https://files.pythonhosted.org/packages/11/de/29a375bc1dc77033c5abbf7c465056557fb3f927eceb623c4b085f5dbf1d/scalene-1.5.51-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:95fc48f2766f9e6c6b1d51942fe8949d422d0025c17471d80f4a67452508053a", size = 1247804 }, + { url = "https://files.pythonhosted.org/packages/48/cb/df80c9f6b0b9b1748b9410e7a10a2f8f791d8588a1e0496bc7d0c6eecf71/scalene-1.5.51-cp312-cp312-win_amd64.whl", hash = "sha256:e53393ffe3fa67d1952b0b7eb8d7787b16f5569553433d6204416591c2e884a3", size = 862381 }, ] [[package]] @@ -1855,17 +1855,18 @@ wheels = [ [[package]] name = "tortoise-orm" -version = "0.24.0" +version = "0.22.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "aiosqlite" }, { name = "iso8601" }, + { name = "pydantic" }, { name = "pypika-tortoise" }, { name = "pytz" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/64/81/973b629f8a70fc928343f4f8be6121023b6c6f0ee0ae45695955db82af47/tortoise_orm-0.24.0.tar.gz", hash = "sha256:ae0704a93ea27931724fc899e57268c8081afce3b32b110b00037ec206553e7d", size = 143958 } +sdist = { url = "https://files.pythonhosted.org/packages/be/97/49fa461b4bd802ffa1671c60662a4fe8acbeebcef4155258101cf9048d02/tortoise_orm-0.22.1.tar.gz", hash = "sha256:50cce7ab3eee5321553810ee31f411abde7a1806312655a377801c91e1b2cb77", size = 143909 } wheels = [ - { url = "https://files.pythonhosted.org/packages/96/88/313395d3ae15f24b18496c4f8077404ee0336eea2a9c648466c406f053b3/tortoise_orm-0.24.0-py3-none-any.whl", hash = "sha256:ee3b72b226767293b24c5c4906ae5f027d7cc84496cd503352c918564b4fd687", size = 164094 }, + { url = "https://files.pythonhosted.org/packages/d3/da/7e5783f9037c2a6bee9914b03a307396c37a5d9797d15f465ad04613d4a4/tortoise_orm-0.22.1-py3-none-any.whl", hash = "sha256:96b8dbc10956cb5cfb6f02841b238035924a6011b5a9737774a22859e1b7bcbf", size = 181570 }, ] [[package]] From b28a07955067d138899f1c8e156d4053e601568d Mon Sep 17 00:00:00 2001 From: Lev Gorodetskiy Date: Tue, 28 Jan 2025 09:05:16 -0300 Subject: [PATCH 3/5] fix for 0.24.0 --- pyproject.toml | 2 +- requirements.txt | 12 ++++++------ src/dipdup/models/__init__.py | 8 ++++---- uv.lock | 15 +++++++-------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1b97f2461..3c4dd8254 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,7 @@ dependencies = [ "strict-rfc3339~=0.7", "survey~=5.4", "tabulate~=0.9", - "tortoise-orm==0.22.1", # pinned + "tortoise-orm==0.24.0", # pinned "uvloop~=0.20", "web3~=7.2", ] diff --git a/requirements.txt b/requirements.txt index 0c4b41a64..1d6916feb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -425,9 +425,9 @@ pydantic-core==2.27.2 \ pyhumps==3.8.0 \ --hash=sha256:060e1954d9069f428232a1adda165db0b9d8dfdce1d265d36df7fbff540acfd6 \ --hash=sha256:498026258f7ee1a8e447c2e28526c0bea9407f9a59c03260aee4bd6c04d681a3 -pypika-tortoise==0.3.2 \ - --hash=sha256:c5c52bc4473fe6f3db36cf659340750246ec5dd0f980d04ae7811430e299c3a2 \ - --hash=sha256:f5d508e2ef00255e52ec6ac79ef889e10dbab328f218c55cd134c4d02ff9f6f4 +pypika-tortoise==0.5.0 \ + --hash=sha256:dbdc47eb52ce17407b05ce9f8560ce93b856d7b28beb01971d956b017846691f \ + --hash=sha256:ed0f56761868dc222c03e477578638590b972280b03c7c45cd93345b18b61f58 pysignalr==1.1.0 \ --hash=sha256:17977720e3360403b05e8c764a28c70a3865fef973cc0f08bd877101f06ae815 \ --hash=sha256:f9e9ed611c999043778ebb9e5bd7d92e0afae3f9555eb73d447335e48de3b385 @@ -526,9 +526,9 @@ tabulate==0.9.0 \ toolz==1.0.0 ; implementation_name == 'cpython' or implementation_name == 'pypy' \ --hash=sha256:292c8f1c4e7516bf9086f8850935c799a874039c8bcf959d47b600e4c44a6236 \ --hash=sha256:2c86e3d9a04798ac556793bced838816296a2f085017664e4995cb40a1047a02 -tortoise-orm==0.22.1 \ - --hash=sha256:50cce7ab3eee5321553810ee31f411abde7a1806312655a377801c91e1b2cb77 \ - --hash=sha256:96b8dbc10956cb5cfb6f02841b238035924a6011b5a9737774a22859e1b7bcbf +tortoise-orm==0.24.0 \ + --hash=sha256:ae0704a93ea27931724fc899e57268c8081afce3b32b110b00037ec206553e7d \ + --hash=sha256:ee3b72b226767293b24c5c4906ae5f027d7cc84496cd503352c918564b4fd687 typeguard==4.4.1 \ --hash=sha256:0d22a89d00b453b47c49875f42b6601b961757541a2e1e0ef517b6e24213c21b \ --hash=sha256:9324ec07a27ec67fc54a9c063020ca4c0ae6abad5e9f0f9804ca59aee68c6e21 diff --git a/src/dipdup/models/__init__.py b/src/dipdup/models/__init__.py index 613f80f6d..9d573c65c 100644 --- a/src/dipdup/models/__init__.py +++ b/src/dipdup/models/__init__.py @@ -266,7 +266,7 @@ def __init__( ) self.filter_queryset = filter_queryset - async def _execute(self, sql, values) -> int: + async def _execute(self) -> int: _logger.debug('Prefetching query models: %s', self.filter_queryset) models = await self.filter_queryset _logger.debug('Got %s', len(models)) @@ -278,7 +278,7 @@ async def _execute(self, sql, values) -> int: if update := ModelUpdate.from_model(model, ModelUpdateAction.UPDATE): get_pending_updates().append(update) - return await super()._execute(sql, values) + return await super()._execute() class DeleteQuery(TortoiseDeleteQuery): @@ -321,7 +321,7 @@ async def _execute_many(self, queries_with_params: list[tuple[str, list[Any]]]) class BulkCreateQuery(TortoiseBulkCreateQuery): # type: ignore[type-arg] - async def _execute_many(self) -> int: + async def _execute_many(self, insert_sql: str, insert_sql_all: str) -> None: for model in self._objects: if update := ModelUpdate.from_model( cast(Model, model), @@ -329,7 +329,7 @@ async def _execute_many(self) -> int: ): get_pending_updates().append(update) - await super()._execute_many() + await super()._execute_many(insert_sql, insert_sql_all) # NOTE: A bug; raises "You should first call .save()..." otherwise for model in self._objects: diff --git a/uv.lock b/uv.lock index 628107b14..7309495c5 100644 --- a/uv.lock +++ b/uv.lock @@ -560,7 +560,7 @@ requires-dist = [ { name = "strict-rfc3339", specifier = "~=0.7" }, { name = "survey", specifier = "~=5.4" }, { name = "tabulate", specifier = "~=0.9" }, - { name = "tortoise-orm", specifier = "==0.22.1" }, + { name = "tortoise-orm", specifier = "==0.24.0" }, { name = "uvloop", specifier = "~=0.20" }, { name = "web3", specifier = "~=7.2" }, ] @@ -1326,11 +1326,11 @@ wheels = [ [[package]] name = "pypika-tortoise" -version = "0.3.2" +version = "0.5.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/f2/6f/d7bfc44f9d8d68e33866688f7ce9ba0785b485e4dec1590ae0a6ba73b5e2/pypika_tortoise-0.3.2.tar.gz", hash = "sha256:f5d508e2ef00255e52ec6ac79ef889e10dbab328f218c55cd134c4d02ff9f6f4", size = 40445 } +sdist = { url = "https://files.pythonhosted.org/packages/7d/7b/74dce3354d81988f1d69b689f20b28c3e92f2dcc0c46975bdafd3eb37b18/pypika_tortoise-0.5.0.tar.gz", hash = "sha256:ed0f56761868dc222c03e477578638590b972280b03c7c45cd93345b18b61f58", size = 39701 } wheels = [ - { url = "https://files.pythonhosted.org/packages/c1/8f/85ae29998186957487b9bab089e382e812b8104ed9da47d7815ba04d57bd/pypika_tortoise-0.3.2-py3-none-any.whl", hash = "sha256:c5c52bc4473fe6f3db36cf659340750246ec5dd0f980d04ae7811430e299c3a2", size = 50832 }, + { url = "https://files.pythonhosted.org/packages/36/bc/830cfe07a84a9ff75d2ae96696b933744b7f20ef40ad69b002b8cf9265e3/pypika_tortoise-0.5.0-py3-none-any.whl", hash = "sha256:dbdc47eb52ce17407b05ce9f8560ce93b856d7b28beb01971d956b017846691f", size = 45915 }, ] [[package]] @@ -1855,18 +1855,17 @@ wheels = [ [[package]] name = "tortoise-orm" -version = "0.22.1" +version = "0.24.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "aiosqlite" }, { name = "iso8601" }, - { name = "pydantic" }, { name = "pypika-tortoise" }, { name = "pytz" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/be/97/49fa461b4bd802ffa1671c60662a4fe8acbeebcef4155258101cf9048d02/tortoise_orm-0.22.1.tar.gz", hash = "sha256:50cce7ab3eee5321553810ee31f411abde7a1806312655a377801c91e1b2cb77", size = 143909 } +sdist = { url = "https://files.pythonhosted.org/packages/64/81/973b629f8a70fc928343f4f8be6121023b6c6f0ee0ae45695955db82af47/tortoise_orm-0.24.0.tar.gz", hash = "sha256:ae0704a93ea27931724fc899e57268c8081afce3b32b110b00037ec206553e7d", size = 143958 } wheels = [ - { url = "https://files.pythonhosted.org/packages/d3/da/7e5783f9037c2a6bee9914b03a307396c37a5d9797d15f465ad04613d4a4/tortoise_orm-0.22.1-py3-none-any.whl", hash = "sha256:96b8dbc10956cb5cfb6f02841b238035924a6011b5a9737774a22859e1b7bcbf", size = 181570 }, + { url = "https://files.pythonhosted.org/packages/96/88/313395d3ae15f24b18496c4f8077404ee0336eea2a9c648466c406f053b3/tortoise_orm-0.24.0-py3-none-any.whl", hash = "sha256:ee3b72b226767293b24c5c4906ae5f027d7cc84496cd503352c918564b4fd687", size = 164094 }, ] [[package]] From 2cabb631ca2b6684e2cd9f2c9f60065396e82bf1 Mon Sep 17 00:00:00 2001 From: Lev Gorodetskiy Date: Tue, 28 Jan 2025 09:09:26 -0300 Subject: [PATCH 4/5] changelog, jsonlogger dep --- CHANGELOG.md | 4 ++++ pyproject.toml | 2 +- requirements.txt | 6 +++--- uv.lock | 8 ++++---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 811a72e32..ba3c96f01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic Releases prior to 7.0 has been removed from this file to declutter search results; see the [archived copy](https://github.com/dipdup-io/dipdup/blob/8.0.0b5/CHANGELOG.md) for the full list. +## [Unreleased] + +- deps: `tortoise-orm` updated to 0.24.0. + ## [8.2.0rc1] - 2025-01-24 ### Added diff --git a/pyproject.toml b/pyproject.toml index 3c4dd8254..cb592992d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ dependencies = [ "pyhumps~=3.8", "pysignalr~=1.0", "python-dotenv~=1.0", - "python-json-logger~=2.0", + "python-json-logger~=3.2", "ruamel.yaml~=0.18.6", "sentry-sdk~=2.16", "sqlparse~=0.5", diff --git a/requirements.txt b/requirements.txt index 1d6916feb..25ddfd76f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -434,9 +434,9 @@ pysignalr==1.1.0 \ python-dotenv==1.0.1 \ --hash=sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca \ --hash=sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a -python-json-logger==2.0.7 \ - --hash=sha256:23e7ec02d34237c5aa1e29a070193a4ea87583bb4e7f8fd06d3de8264c4b2e1c \ - --hash=sha256:f380b826a991ebbe3de4d897aeec42760035ac760345e57b812938dc8b35e2bd +python-json-logger==3.2.1 \ + --hash=sha256:8eb0554ea17cb75b05d2848bc14fb02fbdbd9d6972120781b974380bfa162008 \ + --hash=sha256:cdc17047eb5374bd311e748b42f99d71223f3b0e186f4206cc5d52aefe85b090 pytz==2024.2 \ --hash=sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a \ --hash=sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725 diff --git a/uv.lock b/uv.lock index 7309495c5..1557cebe7 100644 --- a/uv.lock +++ b/uv.lock @@ -552,7 +552,7 @@ requires-dist = [ { name = "pyhumps", specifier = "~=3.8" }, { name = "pysignalr", specifier = "~=1.0" }, { name = "python-dotenv", specifier = "~=1.0" }, - { name = "python-json-logger", specifier = "~=2.0" }, + { name = "python-json-logger", specifier = "~=3.2" }, { name = "ruamel-yaml", specifier = "~=0.18.6" }, { name = "sentry-sdk", specifier = "~=2.16" }, { name = "sqlparse", specifier = "~=0.5" }, @@ -1426,11 +1426,11 @@ wheels = [ [[package]] name = "python-json-logger" -version = "2.0.7" +version = "3.2.1" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/4f/da/95963cebfc578dabd323d7263958dfb68898617912bb09327dd30e9c8d13/python-json-logger-2.0.7.tar.gz", hash = "sha256:23e7ec02d34237c5aa1e29a070193a4ea87583bb4e7f8fd06d3de8264c4b2e1c", size = 10508 } +sdist = { url = "https://files.pythonhosted.org/packages/e3/c4/358cd13daa1d912ef795010897a483ab2f0b41c9ea1b35235a8b2f7d15a7/python_json_logger-3.2.1.tar.gz", hash = "sha256:8eb0554ea17cb75b05d2848bc14fb02fbdbd9d6972120781b974380bfa162008", size = 16287 } wheels = [ - { url = "https://files.pythonhosted.org/packages/35/a6/145655273568ee78a581e734cf35beb9e33a370b29c5d3c8fee3744de29f/python_json_logger-2.0.7-py3-none-any.whl", hash = "sha256:f380b826a991ebbe3de4d897aeec42760035ac760345e57b812938dc8b35e2bd", size = 8067 }, + { url = "https://files.pythonhosted.org/packages/4b/72/2f30cf26664fcfa0bd8ec5ee62ec90c03bd485e4a294d92aabc76c5203a5/python_json_logger-3.2.1-py3-none-any.whl", hash = "sha256:cdc17047eb5374bd311e748b42f99d71223f3b0e186f4206cc5d52aefe85b090", size = 14924 }, ] [[package]] From 6380e2130748b0aa6ff9c07294e2de29b9fc3f62 Mon Sep 17 00:00:00 2001 From: Lev Gorodetskiy Date: Tue, 28 Jan 2025 09:13:01 -0300 Subject: [PATCH 5/5] cleanup --- pyproject.toml | 2 +- requirements.txt | 6 +++--- uv.lock | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cb592992d..a7133b301 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -68,7 +68,7 @@ dependencies = [ "pyhumps~=3.8", "pysignalr~=1.0", "python-dotenv~=1.0", - "python-json-logger~=3.2", + "python-json-logger~=2.0", # pinned "ruamel.yaml~=0.18.6", "sentry-sdk~=2.16", "sqlparse~=0.5", diff --git a/requirements.txt b/requirements.txt index 25ddfd76f..1d6916feb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -434,9 +434,9 @@ pysignalr==1.1.0 \ python-dotenv==1.0.1 \ --hash=sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca \ --hash=sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a -python-json-logger==3.2.1 \ - --hash=sha256:8eb0554ea17cb75b05d2848bc14fb02fbdbd9d6972120781b974380bfa162008 \ - --hash=sha256:cdc17047eb5374bd311e748b42f99d71223f3b0e186f4206cc5d52aefe85b090 +python-json-logger==2.0.7 \ + --hash=sha256:23e7ec02d34237c5aa1e29a070193a4ea87583bb4e7f8fd06d3de8264c4b2e1c \ + --hash=sha256:f380b826a991ebbe3de4d897aeec42760035ac760345e57b812938dc8b35e2bd pytz==2024.2 \ --hash=sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a \ --hash=sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725 diff --git a/uv.lock b/uv.lock index 1557cebe7..7309495c5 100644 --- a/uv.lock +++ b/uv.lock @@ -552,7 +552,7 @@ requires-dist = [ { name = "pyhumps", specifier = "~=3.8" }, { name = "pysignalr", specifier = "~=1.0" }, { name = "python-dotenv", specifier = "~=1.0" }, - { name = "python-json-logger", specifier = "~=3.2" }, + { name = "python-json-logger", specifier = "~=2.0" }, { name = "ruamel-yaml", specifier = "~=0.18.6" }, { name = "sentry-sdk", specifier = "~=2.16" }, { name = "sqlparse", specifier = "~=0.5" }, @@ -1426,11 +1426,11 @@ wheels = [ [[package]] name = "python-json-logger" -version = "3.2.1" +version = "2.0.7" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/e3/c4/358cd13daa1d912ef795010897a483ab2f0b41c9ea1b35235a8b2f7d15a7/python_json_logger-3.2.1.tar.gz", hash = "sha256:8eb0554ea17cb75b05d2848bc14fb02fbdbd9d6972120781b974380bfa162008", size = 16287 } +sdist = { url = "https://files.pythonhosted.org/packages/4f/da/95963cebfc578dabd323d7263958dfb68898617912bb09327dd30e9c8d13/python-json-logger-2.0.7.tar.gz", hash = "sha256:23e7ec02d34237c5aa1e29a070193a4ea87583bb4e7f8fd06d3de8264c4b2e1c", size = 10508 } wheels = [ - { url = "https://files.pythonhosted.org/packages/4b/72/2f30cf26664fcfa0bd8ec5ee62ec90c03bd485e4a294d92aabc76c5203a5/python_json_logger-3.2.1-py3-none-any.whl", hash = "sha256:cdc17047eb5374bd311e748b42f99d71223f3b0e186f4206cc5d52aefe85b090", size = 14924 }, + { url = "https://files.pythonhosted.org/packages/35/a6/145655273568ee78a581e734cf35beb9e33a370b29c5d3c8fee3744de29f/python_json_logger-2.0.7-py3-none-any.whl", hash = "sha256:f380b826a991ebbe3de4d897aeec42760035ac760345e57b812938dc8b35e2bd", size = 8067 }, ] [[package]]