Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jopemachine committed Oct 19, 2023
1 parent 926d05f commit 581be8d
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 57 deletions.
106 changes: 58 additions & 48 deletions python.lock
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
// "python-dotenv~=0.20.0",
// "python-json-logger>=2.0.1",
// "pyzmq~=24.0.1",
// "raftify==0.0.38",
// "redis[hiredis]==4.5.5",
// "raftify==0.0.37",
// "rich~=12.2",
// "rraft-py==0.2.18",
// "setproctitle~=1.3.2",
Expand Down Expand Up @@ -166,21 +166,21 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "5268c89765a4a17d6875f70686d6ee406a0d4c40f0b65a0a311fb400aecfedf4",
"url": "https://files.pythonhosted.org/packages/61/1c/dc7a63e28cd4497ba05a3ff62684a49fd9d55c30671ca6f3f863ade0427a/aiodns-3.1.0-py3-none-any.whl"
"hash": "a387b63da4ced6aad35b1dda2d09620ad608a1c7c0fb71efa07ebb4cd511928d",
"url": "https://files.pythonhosted.org/packages/1a/74/976abff30200cb0cab0bd076db074b8cdda9236ba885ebe3f4d91c7e074b/aiodns-3.1.1-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "fadb59304f4e38fd23b2f1953107df5cf29121d66c4e9c37a9bb13832c0c0513",
"url": "https://files.pythonhosted.org/packages/e5/70/f9aa5346bb56b9de897ee0ad03e4d94e76731886df59e73218e024c257d6/aiodns-3.1.0.tar.gz"
"hash": "1073eac48185f7a4150cad7f96a5192d6911f12b4fb894de80a088508c9b3a99",
"url": "https://files.pythonhosted.org/packages/fa/10/4de99e6e67703d8f6b10ea92a4d2a6c5b96a9c0708b75389a00203387925/aiodns-3.1.1.tar.gz"
}
],
"project_name": "aiodns",
"requires_dists": [
"pycares>=4.0.0"
],
"requires_python": null,
"version": "3.1.0"
"version": "3.1.1"
},
{
"artifacts": [
Expand Down Expand Up @@ -866,36 +866,36 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "65d052ec13197460586ee385aa2d6bba0e7378d2d2c7f3e93c044c43ae1ca782",
"url": "https://files.pythonhosted.org/packages/c0/67/4d23a38313d7b37892a6d9c9260809f1a2f5a37feaf6f13da0aa27f57d6d/boto3-1.28.63-py3-none-any.whl"
"hash": "a8228522c7db33694c0746dec8b48c05473671626359dd62ab6829eb7871eddc",
"url": "https://files.pythonhosted.org/packages/0a/88/e68eb04a86e1022676196cbaf130563c241e80e95b38758f60d86cd940d8/boto3-1.28.66-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "94218aba2feb5b404b665b8d76c172dc654f79b4c5fa0e9e92459c098da87bf4",
"url": "https://files.pythonhosted.org/packages/08/93/0f614264bca69210ac6b0ae06bc112a9569a0b849499e6a7884b670d272a/boto3-1.28.63.tar.gz"
"hash": "38658585791f47cca3fc6aad03838de0136778b533e8c71c6a9590aedc60fbde",
"url": "https://files.pythonhosted.org/packages/4b/cd/9331ee4ecdbfd58e268664fc1126e7aa015a31ce088b0c1e3cf48bb56e97/boto3-1.28.66.tar.gz"
}
],
"project_name": "boto3",
"requires_dists": [
"botocore<1.32.0,>=1.31.63",
"botocore<1.32.0,>=1.31.66",
"botocore[crt]<2.0a0,>=1.21.0; extra == \"crt\"",
"jmespath<2.0.0,>=0.7.1",
"s3transfer<0.8.0,>=0.7.0"
],
"requires_python": ">=3.7",
"version": "1.28.63"
"version": "1.28.66"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "cb9db5db5af865b1fc2e1405b967db5d78dd0f4d84e5dc1974e082733c1034b7",
"url": "https://files.pythonhosted.org/packages/24/0e/39117ec73ea22e700503b3af1dbab270563d6d6ca862cf572899824e4212/botocore-1.31.63-py3-none-any.whl"
"hash": "8d161a97a25eb381721b4b7251d5126ef4ec57e452114250b3e51ba5e4ff45a4",
"url": "https://files.pythonhosted.org/packages/9f/85/66f93685c7006f32617ba74eaa984ce0fbf8b13312e6255887e509e4a036/botocore-1.31.66-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "6e582c811ea74f25bdb490ac372b2645de4a60286b42ddd8c69f3b6df82b6b12",
"url": "https://files.pythonhosted.org/packages/a6/4f/4c2b7d96dd50aed47db6cccf6c1c089853f6474e1d1da5c5aa320d7d4157/botocore-1.31.63.tar.gz"
"hash": "70e94a5f9bd46b26b63a41fb441ad35f2ae8862ad9d90765b6fa31ccc02c0a19",
"url": "https://files.pythonhosted.org/packages/ed/19/489d319b286f629be7c56025dfc0df41e69166eb559996bd07f664b2c63d/botocore-1.31.66.tar.gz"
}
],
"project_name": "botocore",
Expand All @@ -907,7 +907,7 @@
"urllib3<2.1,>=1.25.4; python_version >= \"3.10\""
],
"requires_python": ">=3.7",
"version": "1.31.63"
"version": "1.31.66"
},
{
"artifacts": [
Expand Down Expand Up @@ -3270,8 +3270,8 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "1306b1466687410b2269c25b66e86d05a3f7b0e1168f30297540b40df7ff1f8b",
"url": "https://files.pythonhosted.org/packages/f4/d4/d7e5a0174390051b39f02302a288b0db6545e7c859136551aef3d40a7e26/raftify-0.0.37-py3-none-any.whl"
"hash": "25282c93843fba66ecf0b4565e3b0851ae7a89dc10448b842fa79bf79583f53e",
"url": "https://files.pythonhosted.org/packages/d6/ae/8900cc13091b9248fcf8a017a9f2c236f1eccc66a1a1b85b75e0f8533a9b/raftify-0.0.38-py3-none-any.whl"
}
],
"project_name": "raftify",
Expand All @@ -3296,7 +3296,7 @@
"wheel>=0.41.1; extra == \"build\""
],
"requires_python": ">=3.10",
"version": "0.0.37"
"version": "0.0.38"
},
{
"artifacts": [
Expand Down Expand Up @@ -4237,13 +4237,13 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "7a7c7003b000adf9e7ca2a377c9688bbc54ed41b985789ed576570342a375cd2",
"url": "https://files.pythonhosted.org/packages/26/40/9957270221b6d3e9a3b92fdfba80dd5c9661ff45a664b47edd5d00f707f5/urllib3-2.0.6-py3-none-any.whl"
"hash": "fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e",
"url": "https://files.pythonhosted.org/packages/d2/b2/b157855192a68541a91ba7b2bbcb91f1b4faa51f8bae38d8005c034be524/urllib3-2.0.7-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564",
"url": "https://files.pythonhosted.org/packages/8b/00/db794bb94bf09cadb4ecd031c4295dd4e3536db4da958e20331d95f1edb7/urllib3-2.0.6.tar.gz"
"hash": "c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84",
"url": "https://files.pythonhosted.org/packages/af/47/b215df9f71b4fdba1025fc05a77db2ad243fa0926755a52c5e71659f4e3c/urllib3-2.0.7.tar.gz"
}
],
"project_name": "urllib3",
Expand All @@ -4259,62 +4259,72 @@
"zstandard>=0.18.0; extra == \"zstd\""
],
"requires_python": ">=3.7",
"version": "2.0.6"
"version": "2.0.7"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "585b7281f9ea25c4a5fa993b1acca4ad3d8bc3f3fe2e393f0ef51b6c1bcd2fe6",
"url": "https://files.pythonhosted.org/packages/ac/c9/4ab605b1b1eb4872e617930f5940d511b49d324a3e159b0a97b0d846eaed/uvloop-0.18.0-cp311-cp311-musllinux_1_1_x86_64.whl"
"hash": "6708f30db9117f115eadc4f125c2a10c1a50d711461699a0cbfaa45b9a78e376",
"url": "https://files.pythonhosted.org/packages/5d/bc/c1ef0b1c8faa3960b22f5809ebfd1eaa009e441b28b697f8871c31fc51d7/uvloop-0.17.0-cp311-cp311-musllinux_1_1_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "1121087dfeb46e9e65920b20d1f46322ba299b8d93f7cb61d76c94b5a1adc20c",
"url": "https://files.pythonhosted.org/packages/18/3c/4bb157af57e686e2c6dbd94ac759f4959c8ab9dfbf32cfa2fd0512fcc347/uvloop-0.18.0-cp311-cp311-macosx_10_9_x86_64.whl"
"hash": "6aafa5a78b9e62493539456f8b646f85abc7093dd997f4976bb105537cf2635e",
"url": "https://files.pythonhosted.org/packages/13/12/58a06670863b147f2b5bcd35ec16e55c2e811a67e926f62b4c04e6f52755/uvloop-0.17.0-cp311-cp311-macosx_10_9_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "25b714f07c68dcdaad6994414f6ec0f2a3b9565524fba181dcbfd7d9598a3e73",
"url": "https://files.pythonhosted.org/packages/36/0a/010b921a6cc14d6c787b24b5c6505619ee5da7ec0a7ee77cc60b4fc39c25/uvloop-0.18.0-cp311-cp311-macosx_10_9_universal2.whl"
"hash": "3378eb62c63bf336ae2070599e49089005771cc651c8769aaad72d1bd9385a7c",
"url": "https://files.pythonhosted.org/packages/14/58/333a56082bf25dee13cf9e8de5f408d107d75bf6145835ec6d6b2fd35980/uvloop-0.17.0-cp311-cp311-macosx_10_9_universal2.whl"
},
{
"algorithm": "sha256",
"hash": "1f4a549cd747e6f4f8446f4b4c8cb79504a8372d5d3a9b4fc20e25daf8e76c05",
"url": "https://files.pythonhosted.org/packages/65/35/fa6bec641e205d93a4e9725bf9d9297058722e6ea5abb16810f2985e3213/uvloop-0.18.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
"hash": "c686a47d57ca910a2572fddfe9912819880b8765e2f01dc0dd12a9bf8573e539",
"url": "https://files.pythonhosted.org/packages/2b/6f/ec3a30f0de00b8d240ab2128d50e4bf20b263065bc51eb0b4bbfaae6c87d/uvloop-0.17.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
},
{
"algorithm": "sha256",
"hash": "d5d1135beffe9cd95d0350f19e2716bc38be47d5df296d7cc46e3b7557c0d1ff",
"url": "https://files.pythonhosted.org/packages/80/f9/94d2d914d351c7d5db80e102fb0d7ab3bbb798e8322ab71a9fe9f8bfa31b/uvloop-0.18.0.tar.gz"
"hash": "2a6149e1defac0faf505406259561bc14b034cdf1d4711a3ddcdfbaa8d825a05",
"url": "https://files.pythonhosted.org/packages/a9/17/e0a10e6b5a1ace1861ba496981fed35dd806c81fa18260e6e631f2713c3c/uvloop-0.17.0-cp311-cp311-musllinux_1_1_aarch64.whl"
},
{
"algorithm": "sha256",
"hash": "6132318e1ab84a626639b252137aa8d031a6c0550250460644c32ed997604088",
"url": "https://files.pythonhosted.org/packages/ad/1c/bd7b8cc241f2b2af37eb8b5abb2c719be3943ba1eb800f1fb3c6f82e3259/uvloop-0.18.0-cp311-cp311-musllinux_1_1_aarch64.whl"
"hash": "864e1197139d651a76c81757db5eb199db8866e13acb0dfe96e6fc5d1cf45fc4",
"url": "https://files.pythonhosted.org/packages/b1/0c/f08c6863c9e0a6823b69fbbc6753a3e4f47c3a48628ce6e8370bd39b76e7/uvloop-0.17.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "74020ef8061678e01a40c49f1716b4f4d1cc71190d40633f08a5ef8a7448a5c6",
"url": "https://files.pythonhosted.org/packages/fa/fe/3ccbdcf690ed04f16d9eabf2be0658a99a552df8dbea0fda73f41a7d3ddf/uvloop-0.18.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
"hash": "0ddf6baf9cf11a1a22c71487f39f15b2cf78eb5bde7e5b45fbb99e8a9d91b9e1",
"url": "https://files.pythonhosted.org/packages/ba/86/6dda1760481abf244cbd3908b79a4520d757040ca9ec37a79fc0fd01e2a0/uvloop-0.17.0.tar.gz"
}
],
"project_name": "uvloop",
"requires_dists": [
"Cython<0.30.0,>=0.29.36; extra == \"test\"",
"Cython<0.30.0,>=0.29.32; extra == \"dev\"",
"Cython<0.30.0,>=0.29.32; extra == \"test\"",
"Sphinx~=4.1.2; extra == \"dev\"",
"Sphinx~=4.1.2; extra == \"docs\"",
"aiohttp==3.9.0b0; python_version >= \"3.12\" and extra == \"test\"",
"aiohttp>=3.8.1; python_version < \"3.12\" and extra == \"test\"",
"flake8~=5.0; extra == \"test\"",
"aiohttp; python_version < \"3.11\" and extra == \"dev\"",
"aiohttp; python_version < \"3.11\" and extra == \"test\"",
"flake8~=3.9.2; extra == \"dev\"",
"flake8~=3.9.2; extra == \"test\"",
"mypy>=0.800; extra == \"dev\"",
"mypy>=0.800; extra == \"test\"",
"psutil; extra == \"dev\"",
"psutil; extra == \"test\"",
"pyOpenSSL~=23.0.0; extra == \"test\"",
"pycodestyle~=2.9.0; extra == \"test\"",
"pyOpenSSL~=22.0.0; extra == \"dev\"",
"pyOpenSSL~=22.0.0; extra == \"test\"",
"pycodestyle~=2.7.0; extra == \"dev\"",
"pycodestyle~=2.7.0; extra == \"test\"",
"pytest>=3.6.0; extra == \"dev\"",
"sphinx-rtd-theme~=0.5.2; extra == \"dev\"",
"sphinx-rtd-theme~=0.5.2; extra == \"docs\"",
"sphinxcontrib-asyncio~=0.3.0; extra == \"dev\"",
"sphinxcontrib-asyncio~=0.3.0; extra == \"docs\""
],
"requires_python": ">=3.7.0",
"version": "0.18.0"
"requires_python": ">=3.7",
"version": "0.17.0"
},
{
"artifacts": [
Expand Down Expand Up @@ -4531,8 +4541,8 @@
"python-dotenv~=0.20.0",
"python-json-logger>=2.0.1",
"pyzmq~=24.0.1",
"raftify==0.0.38",
"redis[hiredis]==4.5.5",
"raftify==0.0.37",
"rich~=12.2",
"rraft-py==0.2.18",
"setproctitle~=1.3.2",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@ backend.ai-krunner-alpine==5.1.0
backend.ai-krunner-static-gnu==4.1.0

rraft-py==0.2.18
raftify==0.0.37
raftify==0.0.38
9 changes: 1 addition & 8 deletions src/ai/backend/manager/api/logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@
from aiohttp import web
from dateutil.relativedelta import relativedelta

from ai.backend.common import redis_helper
from ai.backend.common import validators as tx
from ai.backend.common.defs import REDIS_LIVE_DB
from ai.backend.common.distributed import DistributedLockGlobalTimer
from ai.backend.common.events import AbstractEvent, EmptyEventArgs, EventHandler
from ai.backend.common.logging import BraceStyleAdapter
from ai.backend.common.types import AgentId, LogSeverity, RedisConnectionInfo
from ai.backend.common.types import AgentId, LogSeverity

from ..defs import LockID
from ..models import UserRole, error_logs, groups
Expand Down Expand Up @@ -241,7 +239,6 @@ async def log_cleanup_task(app: web.Application, src: AgentId, event: DoLogClean
@attrs.define(slots=True, auto_attribs=True, init=False)
class PrivateContext:
log_cleanup_timer: DistributedLockGlobalTimer
log_cleanup_timer_redis: RedisConnectionInfo
log_cleanup_timer_evh: EventHandler[web.Application, DoLogCleanupEvent]


Expand All @@ -253,10 +250,6 @@ async def init(app: web.Application) -> None:
app,
log_cleanup_task,
)
app_ctx.log_cleanup_timer_redis = redis_helper.get_redis_object(
root_ctx.shared_config.data["redis"],
db=REDIS_LIVE_DB,
)
app_ctx.log_cleanup_timer = DistributedLockGlobalTimer(
root_ctx.distributed_lock_factory(LockID.LOCKID_LOG_CLEANUP_TIMER, 20.0),
root_ctx.event_producer,
Expand Down

0 comments on commit 581be8d

Please sign in to comment.