diff --git a/Pipfile.lock b/Pipfile.lock index 8558940..4c86023 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -127,11 +127,11 @@ }, "alembic": { "hashes": [ - "sha256:6a810a6b012c88b33458fceb869aef09ac75d6ace5291915ba7fae44de372c01", - "sha256:dc871798a601fab38332e38d6ddb38d5e734f60034baeb8e2db5b642fccd8ab8" + "sha256:3db4ce81a9072e1b5aa44c2d202add24553182672a12daf21608d6f62a8f9cf9", + "sha256:d6c96c2482740592777c400550a523bc7a9aada4e210cae2e733354ddae6f6f8" ], "index": "pypi", - "version": "==1.11.1" + "version": "==1.11.3" }, "astunparse": { "hashes": [ @@ -142,11 +142,11 @@ }, "async-timeout": { "hashes": [ - "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15", - "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c" + "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f", + "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028" ], - "markers": "python_version >= '3.6'", - "version": "==4.0.2" + "markers": "python_version >= '3.7'", + "version": "==4.0.3" }, "attrs": { "hashes": [ @@ -270,26 +270,27 @@ }, "click": { "hashes": [ - "sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd", - "sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5" + "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", + "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" ], "markers": "python_version >= '3.7'", - "version": "==8.1.6" + "version": "==8.1.7" }, "discord.py": { "hashes": [ - "sha256:149652f24da299706270bf8c03c2fcf80cf1caf3a480744c61d5b001688b380d", - "sha256:8eb4fe66b5d503da6de3a8425e23012711dc2fbcd7a782107a92beac15ee3459" + "sha256:4560f70f2eddba7e83370ecebd237ac09fbb4980dc66507482b0c0e5b8f76b9c", + "sha256:9da4679fc3cb10c64b388284700dc998663e0e57328283bbfcfc2525ec5960a6" ], "index": "pypi", - "version": "==2.3.1" + "version": "==2.3.2" }, "enkanetwork.py": { "hashes": [ - "sha256:df98722a30e30b81a985c5e6ffd24b867fb68f920bc815d257f43453dc8a2a9d" + "sha256:bdc99679bec55017bcf951f636e31793e8cf1fdb040315a430adedb890c0a34d" ], "index": "pypi", - "version": "==1.4.4" + "markers": "python_version >= '3.6'", + "version": "==1.4.5" }, "frozenlist": { "hashes": [ @@ -360,12 +361,17 @@ }, "genshin": { "git": "https://github.com/thesadru/genshin.py", - "ref": "71cb7bc1e870f452254f372996256ba473a69919" + "hashes": [ + "sha256:39404af42147c1aa257a3f37bcfcf8e7d43aa6b1e2c3de7fcf1a44814b064c52", + "sha256:66577ab35c90069bbaf9819f50472e3d503384f0a467ee18cc2f28f21a06a71d" + ], + "ref": "6714e96122a06668dc24e8e4a2765e075e1af9c5" }, "greenlet": { "hashes": [ "sha256:03a8f4f3430c3b3ff8d10a2a86028c660355ab637cee9333d63d66b56f09d52a", "sha256:0bf60faf0bc2468089bdc5edd10555bab6e85152191df713e2ab1fcc86382b5a", + "sha256:1087300cf9700bbf455b1b97e24db18f2f77b55302a68272c56209d5587c12d1", "sha256:18a7f18b82b52ee85322d7a7874e676f34ab319b9f8cce5de06067384aa8ff43", "sha256:18e98fb3de7dba1c0a852731c3070cf022d14f0d68b4c87a19cc1016f3bb8b33", "sha256:1a819eef4b0e0b96bb0d98d797bef17dc1b4a10e8d7446be32d1da33e095dbb8", @@ -391,6 +397,7 @@ "sha256:76ae285c8104046b3a7f06b42f29c7b73f77683df18c49ab5af7983994c2dd91", "sha256:7cafd1208fdbe93b67c7086876f061f660cfddc44f404279c1585bbf3cdc64c5", "sha256:7efde645ca1cc441d6dc4b48c0f7101e8d86b54c8530141b09fd31cef5149ec9", + "sha256:8512a0c38cfd4e66a858ddd1b17705587900dd760c6003998e9472b77b56d417", "sha256:88d9ab96491d38a5ab7c56dd7a3cc37d83336ecc564e4e8816dbed12e5aaefc8", "sha256:8eab883b3b2a38cc1e050819ef06a7e6344d4a990d24d45bc6f2cf959045a45b", "sha256:910841381caba4f744a44bf81bfd573c94e10b3045ee00de0cbf436fe50673a6", @@ -414,8 +421,10 @@ "sha256:c9c59a2120b55788e800d82dfa99b9e156ff8f2227f07c5e3012a45a399620b7", "sha256:cd021c754b162c0fb55ad5d6b9d960db667faad0fa2ff25bb6e1301b0b6e6a75", "sha256:d27ec7509b9c18b6d73f2f5ede2622441de812e7b1a80bbd446cb0633bd3d5ae", + "sha256:d4606a527e30548153be1a9f155f4e283d109ffba663a15856089fb55f933e47", "sha256:d5508f0b173e6aa47273bdc0a0b5ba055b59662ba7c7ee5119528f466585526b", "sha256:d75209eed723105f9596807495d58d10b3470fa6732dd6756595e89925ce2470", + "sha256:d967650d3f56af314b72df7089d96cda1083a7fc2da05b375d2bc48c82ab3f3c", "sha256:db1a39669102a1d8d12b57de2bb7e2ec9066a6f2b3da35ae511ff93b01b5d564", "sha256:dbfcfc0218093a19c252ca8eb9aee3d29cfdcb586df21049b9d777fd32c14fd9", "sha256:e0f72c9ddb8cd28532185f54cc1453f2c16fb417a08b53a855c4e6a418edd099", @@ -456,52 +465,46 @@ }, "line-profiler": { "hashes": [ - "sha256:0783704f6bdd6d1029c193bb270b9e540f5b97ded662c74885b609d4bc016bfa", - "sha256:0a5dad6fa4ebc70676574941a564cdae4e664bf54fd68a8f19799167a927a3db", - "sha256:0e9f56be58b78bcfdc505987730b1a0099f8b2693c392879d0a8d1dd81a437d0", - "sha256:0f281672166f7d403b927f3a8af1fa28125be6309d0e8a3910770037b5abc7be", - "sha256:12bf7dc576707760d58efb221f4ee36cc9ec3e514733186c807fe6839c65a9e6", - "sha256:1847946c78be769d3b053879bc2df6e7eed7800e2e3b35a297043d656b4bb2f9", - "sha256:3873394ea9d66d05da6ed0f9f92e7463c44b716aadd034a603faad60a73577c6", - "sha256:467de51ae6f154865f40e7d645462c8bbf9dedb6c432b1af173c099d79b81c2e", - "sha256:48ce36c8fb17a64a494fb3ba0c591dd0fd2318bbe99c5c49da35f93257a5bc1a", - "sha256:506ab549197844629834c5db4414517f474d862a90dc3920800f823db48e7601", - "sha256:52780098491df001a1315c1bc3d8199edd440698f1aef4e78875f9f2181f79bb", - "sha256:5a2654510d872e36c0737cc9358a94307c1db52bf906b3c92569c9bc067b896e", - "sha256:5a727ddd521246fecd9a8aa918c81d2e7ebeef2c56af86be500280ec7ec720d1", - "sha256:5e9c5c6ea82ad587ebe127a1f18b37634ce9e2d8b2065c2cb382dc5576551503", - "sha256:659c3f99359825034a5becb7de2e19eeee96bbe60fface73059b446124b942d4", - "sha256:6906259a2732c18f3f8c3f03cbe3899a640d4dd998d09a4c91d41140fd8bc686", - "sha256:6eb244400492ffcbec0e6d5a52693828960a4c29f7d43c50190e4902bacad5be", - "sha256:779a41bd7cceb5487abc1e985cf90bc0be7a61f369c32e9971e3b244153373da", - "sha256:7fa9bec2d79374e32441fa46d284e4241f73d5e23b91cb3286c5573c29c2f218", - "sha256:81404b2530e2f4cb0e69f8b624957caef2b313227380e6aa7d3ccef494941f91", - "sha256:878479d3df35f6a3be83cb7ea5ee3df8f51003da6eca291242ebfecaf8cf940f", - "sha256:8ed41b4dc4bb5cea01e423928c50e354452eb1eb1b29b8b3ec94ee02b045fdf9", - "sha256:9bc4bf53a2c79c935a5e59645a6f5d9cc8618a4aded0d2116db5d4ebecab6dae", - "sha256:9e7fbe5280927d1c647b43516aedc2f21b0bfad27f6bc531ebca9df7c77f2f7f", - "sha256:a3337db24f51bda9f7c2fc5a135fc657c5cc818ba5905195a4f79f7489048bae", - "sha256:a4b7e84d800bb466e461d827eaadbf0bce1476b76a29b92d24f524db028ae4e1", - "sha256:ac886a51df9a5cec9dd9f483a63b88d1ecfff50151a9177f54931787e1c08575", - "sha256:af5259ba7f7ef73f9b02874fcfda2b0b7b0093e64b148bcf0d444bfb1d08fdcc", - "sha256:b1ba5076d8cf9fc7e18bb79884915d78f856a9f03e999e9c25ace462c4745bcb", - "sha256:b35795dc56dae57e1bca9d3ed7f03ca5ad86de578da29434dcb3fcc590009120", - "sha256:c5b579c7d1b3661e56c63f5052f96c81b7453e503e0c2950df79776181cc8007", - "sha256:c60c0f5e14e17cf19d0f45dc25b406a47da57c667de6263281758fae0ec76ca0", - "sha256:c6a19e39be62aa7d849fab9a7f61591365b41ae87fbf4321de5442cb460f1fb5", - "sha256:d1bce3d49c8a0f89a04c41d95f256a48ee744d2cbca0c5fd859c928cddcccf3e", - "sha256:d4ae74a784e3c878bb52cb819a971315547cec2cab8705571318995c045aae27", - "sha256:db98ff49c1f4753959bb1e9b9835626cb817d1add6d480311938c373e9c4c5f7", - "sha256:deb2eb9e9119d911debe23edcec8ea68a2cd70c9e3f753c96aaf4a86ca497e7e", - "sha256:e18ce062d652dc04eb0ebe5df13d78fb4d83979b459f8bca476059f3a71636d1", - "sha256:eb1d5e90862ac5385fdb002c40fe45bbf0396025dabc0565ac97efc622122274", - "sha256:f170232f15d48fb4e7ca46fe4147a54dd930baa7ef07c04c38b53e0e826028b8", - "sha256:f1fed42c6d070804d95990ad633f97778bc744f7569cb2b5a2cf5be05e932763", - "sha256:fbe0036a306835978270a66c460c7b57869fe985ca620613321971d396de295f", - "sha256:fdaac2e769e7d64cd3d19c4df5d26287e1cd362f47a1d3b42edd7c8420f40101" + "sha256:14944cf27c355f37e577d5c9a19192d9225766065fc3ea6bfc244ea10f6a4b9b", + "sha256:1c0f4953090cb280ea6ab3d1fe1b194c4233deb1ee13ce5dc7701b6351fc244f", + "sha256:1e750b1575e1e8c16da4a045ba4d566eb119a40b0a4ec9c4290cde6f7b2aa292", + "sha256:1ebea1e3a07f5f2925e6acc52007f041f173fe925b4876ce8c8b169620bf04f3", + "sha256:2fa73d2ac736902e0a6d1e74cf663244218d9c238a7aa5b5acfd6ac6d4672830", + "sha256:33c00f4740640aa729fe7118d0dd3c2b96af201c20afcbb5c5f71e1a3cfa10d8", + "sha256:508f5b6fd43047b0da2cf746f89b56064f23ac9040a1bdc258323634a1e17789", + "sha256:521eae25a5629e30e3f93a1aedfd20e423352316af29ba1805f8a60fe2b8ec37", + "sha256:583f3e6282a47f5f1c2aeb1234114f0d49d2eba0bb9c1f05c268d1543fe85794", + "sha256:66288d7b28c65a647186d5127593041f4ffe9e78649bc4fc2b309d74d2ca6c1f", + "sha256:6e9873556c851423c4ef112d5391b4d51b8e9f57f031d54a64687f36e17d5efd", + "sha256:7cbaa08adac1df3b16440ed00b73645cba008355e6e36ffd44f114e91ae554f6", + "sha256:7e37b62e47814081e36e33c9aee27c966e22ae4ac05b45515e45e5992d121698", + "sha256:7f67eed9a168293b7ebc5082ec003b4f72c5bd16853a57188d1060e5b6bb2232", + "sha256:832fb1b2fcec6f466d1b28456ea6bd5208784326202569631100b7281331ca3c", + "sha256:86851d76cbc3c74c6cb1685cb22802e75b61f8c1d5cf4c1e7c9f3d8c7a032053", + "sha256:8ada23285e774adfec4088ca8a53565fcd55397d0c2287a03835f9e319785b3e", + "sha256:924ab02db0d4572dd5f4945c1e0239ec300003fdce47a8ae1775a72477442d92", + "sha256:93401ea36653105568824becebe21e2a3c0c3e14b671268692b0af979ffa3cda", + "sha256:99991e9af0b94aa41e3bf7745a21ea194076bd18640d63fdd6f2a535aaa030d0", + "sha256:9f7fec0d06f96e963cc30647f65442e5264f31c80d0f60dcd4a059973bf24281", + "sha256:a33d728098af1c0d24a7d6cb121bf4627d423fcd6bc6759525df4b1713fcf7cb", + "sha256:afa938b78de445f418825017732d4d4ff7a04398c02b57b15803e7936dfd0b39", + "sha256:b0707458ce16be63855c12f42790bef520ec9674a7373cbb2eec28e3c00dffeb", + "sha256:b3e6c83a2a5cee7fb3b313141b3be12ff4eb1ba7ec31fb6739ac16a2f45cd001", + "sha256:b3ed8a4150f7005c477853a97e3d7d36359d0bbdf5992b22cc050eb2b915a9a0", + "sha256:b432ab2424763103ab01cd7cd38d02de921530b05bc488240be587b29d64fa94", + "sha256:b46c0c4367077cb77187aca50ee79df1e09348d05dbf0a15341f50741101daa3", + "sha256:b4d3b9026d2ee110a67b696783f5ad6c198d707701d563401a99d0dd386c5339", + "sha256:b987232d30f659591c978a40192e66f3815c9be8300cc927d264af9cd9eb73b8", + "sha256:d161a6e34a8998cd7b94cd7e59c0501a4c06e32a9b0211125f03cbe7643c8142", + "sha256:d231d8ebda1c0daa8b5c9467932a30602855e6cec7d3e8bd1593a3be0f7e4764", + "sha256:d89030daef504e4d329f9405e1aae5e1191d8bb51c2bb75f8842b2b910544521", + "sha256:dea7e688ede3bf1ab85fa71963847472ab5e88ca0d70d46ad5acdd788af584e0", + "sha256:e9712fcae893ada6217586e3a4d73eaf7a1146596bb9e8152c963413eeb06384", + "sha256:ec5850c0fdcd7d2b55065c4c3fa92578e0d1331d610431f19af99ed056ef53dd", + "sha256:fc9703f7aeff1e445661e3cc5b65f139e5e9a0f0666d0cde173586b841401fda" ], "markers": "python_version >= '3.6'", - "version": "==4.0.3" + "version": "==4.1.1" }, "mako": { "hashes": [ @@ -569,7 +572,7 @@ }, "mihomo": { "git": "https://github.com/KT-Yeh/mihomo", - "ref": "5a8d22f360c5d32a5ce7054a42999d32905a351d" + "ref": "6c6b02cff304d726a9b6acb863f9776c794d6cf2" }, "multidict": { "hashes": [ @@ -753,45 +756,45 @@ }, "pydantic": { "hashes": [ - "sha256:008c5e266c8aada206d0627a011504e14268a62091450210eda7c07fabe6963e", - "sha256:0588788a9a85f3e5e9ebca14211a496409cb3deca5b6971ff37c556d581854e7", - "sha256:08a6c32e1c3809fbc49debb96bf833164f3438b3696abf0fbeceb417d123e6eb", - "sha256:16928fdc9cb273c6af00d9d5045434c39afba5f42325fb990add2c241402d151", - "sha256:174899023337b9fc685ac8adaa7b047050616136ccd30e9070627c1aaab53a13", - "sha256:192c608ad002a748e4a0bed2ddbcd98f9b56df50a7c24d9a931a8c5dd053bd3d", - "sha256:1954f8778489a04b245a1e7b8b22a9d3ea8ef49337285693cf6959e4b757535e", - "sha256:2417de68290434461a266271fc57274a138510dca19982336639484c73a07af6", - "sha256:265a60da42f9f27e0b1014eab8acd3e53bd0bad5c5b4884e98a55f8f596b2c19", - "sha256:331c031ba1554b974c98679bd0780d89670d6fd6f53f5d70b10bdc9addee1713", - "sha256:373c0840f5c2b5b1ccadd9286782852b901055998136287828731868027a724f", - "sha256:3f34739a89260dfa420aa3cbd069fbcc794b25bbe5c0a214f8fb29e363484b66", - "sha256:41e0bb6efe86281623abbeeb0be64eab740c865388ee934cd3e6a358784aca6e", - "sha256:4400015f15c9b464c9db2d5d951b6a780102cfa5870f2c036d37c23b56f7fc1b", - "sha256:44e51ba599c3ef227e168424e220cd3e544288c57829520dc90ea9cb190c3248", - "sha256:469adf96c8e2c2bbfa655fc7735a2a82f4c543d9fee97bd113a7fb509bf5e622", - "sha256:5b02d24f7b2b365fed586ed73582c20f353a4c50e4be9ba2c57ab96f8091ddae", - "sha256:7522a7666157aa22b812ce14c827574ddccc94f361237ca6ea8bb0d5c38f1629", - "sha256:787cf23e5a0cde753f2eabac1b2e73ae3844eb873fd1f5bdbff3048d8dbb7604", - "sha256:8268a735a14c308923e8958363e3a3404f6834bb98c11f5ab43251a4e410170c", - "sha256:8dc77064471780262b6a68fe67e013298d130414d5aaf9b562c33987dbd2cf4f", - "sha256:a451ccab49971af043ec4e0d207cbc8cbe53dbf148ef9f19599024076fe9c25b", - "sha256:a6c098d4ab5e2d5b3984d3cb2527e2d6099d3de85630c8934efcfdc348a9760e", - "sha256:abade85268cc92dff86d6effcd917893130f0ff516f3d637f50dadc22ae93999", - "sha256:bc64eab9b19cd794a380179ac0e6752335e9555d214cfcb755820333c0784cb3", - "sha256:c3339a46bbe6013ef7bdd2844679bfe500347ac5742cd4019a88312aa58a9847", - "sha256:d185819a7a059550ecb85d5134e7d40f2565f3dd94cfd870132c5f91a89cf58c", - "sha256:d7781f1d13b19700b7949c5a639c764a077cbbdd4322ed505b449d3ca8edcb36", - "sha256:e297897eb4bebde985f72a46a7552a7556a3dd11e7f76acda0c1093e3dbcf216", - "sha256:e6cbfbd010b14c8a905a7b10f9fe090068d1744d46f9e0c021db28daeb8b6de1", - "sha256:e9738b0f2e6c70f44ee0de53f2089d6002b10c33264abee07bdb5c7f03038303", - "sha256:e9baf78b31da2dc3d3f346ef18e58ec5f12f5aaa17ac517e2ffd026a92a87588", - "sha256:ef55392ec4bb5721f4ded1096241e4b7151ba6d50a50a80a2526c854f42e6a2f", - "sha256:f66d479cf7eb331372c470614be6511eae96f1f120344c25f3f9bb59fb1b5528", - "sha256:fe429898f2c9dd209bd0632a606bddc06f8bce081bbd03d1c775a45886e2c1cb", - "sha256:ff44c5e89315b15ff1f7fdaf9853770b810936d6b01a7bcecaa227d2f8fe444f" + "sha256:0fe8a415cea8f340e7a9af9c54fc71a649b43e8ca3cc732986116b3cb135d303", + "sha256:1289c180abd4bd4555bb927c42ee42abc3aee02b0fb2d1223fb7c6e5bef87dbe", + "sha256:1eb2085c13bce1612da8537b2d90f549c8cbb05c67e8f22854e201bde5d98a47", + "sha256:2031de0967c279df0d8a1c72b4ffc411ecd06bac607a212892757db7462fc494", + "sha256:2a7bac939fa326db1ab741c9d7f44c565a1d1e80908b3797f7f81a4f86bc8d33", + "sha256:2d5a58feb9a39f481eda4d5ca220aa8b9d4f21a41274760b9bc66bfd72595b86", + "sha256:2f9a6fab5f82ada41d56b0602606a5506aab165ca54e52bc4545028382ef1c5d", + "sha256:2fcfb5296d7877af406ba1547dfde9943b1256d8928732267e2653c26938cd9c", + "sha256:549a8e3d81df0a85226963611950b12d2d334f214436a19537b2efed61b7639a", + "sha256:598da88dfa127b666852bef6d0d796573a8cf5009ffd62104094a4fe39599565", + "sha256:5d1197e462e0364906cbc19681605cb7c036f2475c899b6f296104ad42b9f5fb", + "sha256:69328e15cfda2c392da4e713443c7dbffa1505bc9d566e71e55abe14c97ddc62", + "sha256:6a9dfa722316f4acf4460afdf5d41d5246a80e249c7ff475c43a3a1e9d75cf62", + "sha256:6b30bcb8cbfccfcf02acb8f1a261143fab622831d9c0989707e0e659f77a18e0", + "sha256:6c076be61cd0177a8433c0adcb03475baf4ee91edf5a4e550161ad57fc90f523", + "sha256:771735dc43cf8383959dc9b90aa281f0b6092321ca98677c5fb6125a6f56d58d", + "sha256:795e34e6cc065f8f498c89b894a3c6da294a936ee71e644e4bd44de048af1405", + "sha256:87afda5539d5140cb8ba9e8b8c8865cb5b1463924d38490d73d3ccfd80896b3f", + "sha256:8fb2aa3ab3728d950bcc885a2e9eff6c8fc40bc0b7bb434e555c215491bcf48b", + "sha256:a1fcb59f2f355ec350073af41d927bf83a63b50e640f4dbaa01053a28b7a7718", + "sha256:a5e7add47a5b5a40c49b3036d464e3c7802f8ae0d1e66035ea16aa5b7a3923ed", + "sha256:a73f489aebd0c2121ed974054cb2759af8a9f747de120acd2c3394cf84176ccb", + "sha256:ab26038b8375581dc832a63c948f261ae0aa21f1d34c1293469f135fa92972a5", + "sha256:b0d191db0f92dfcb1dec210ca244fdae5cbe918c6050b342d619c09d31eea0cc", + "sha256:b749a43aa51e32839c9d71dc67eb1e4221bb04af1033a32e3923d46f9effa942", + "sha256:b7ccf02d7eb340b216ec33e53a3a629856afe1c6e0ef91d84a4e6f2fb2ca70fe", + "sha256:ba5b2e6fe6ca2b7e013398bc7d7b170e21cce322d266ffcd57cca313e54fb246", + "sha256:ba5c4a8552bff16c61882db58544116d021d0b31ee7c66958d14cf386a5b5350", + "sha256:c79e6a11a07da7374f46970410b41d5e266f7f38f6a17a9c4823db80dadf4303", + "sha256:ca48477862372ac3770969b9d75f1bf66131d386dba79506c46d75e6b48c1e09", + "sha256:dea7adcc33d5d105896401a1f37d56b47d443a2b2605ff8a969a0ed5543f7e33", + "sha256:e0a16d274b588767602b7646fa05af2782576a6cf1022f4ba74cbb4db66f6ca8", + "sha256:e4129b528c6baa99a429f97ce733fff478ec955513630e61b49804b6cf9b224a", + "sha256:e5f805d2d5d0a41633651a73fa4ecdd0b3d7a49de4ec3fadf062fe16501ddbf1", + "sha256:ef6c96b2baa2100ec91a4b428f80d8f28a3c9e53568219b6c298c1125572ebc6", + "sha256:fdbdd1d630195689f325c9ef1a12900524dceb503b00a987663ff4f58669b93d" ], "markers": "python_version >= '3.7'", - "version": "==1.10.11" + "version": "==1.10.12" }, "python-dotenv": { "hashes": [ @@ -803,11 +806,11 @@ }, "sentry-sdk": { "hashes": [ - "sha256:6bdb25bd9092478d3a817cb0d01fa99e296aea34d404eac3ca0037faa5c2aa0a", - "sha256:dcd88c68aa64dae715311b5ede6502fd684f70d00a7cd4858118f0ba3153a3ae" + "sha256:2e53ad63f96bb9da6570ba2e755c267e529edcf58580a2c0d2a11ef26e1e678b", + "sha256:7dc873b87e1faf4d00614afd1058bfa1522942f33daef8a59f90de8ed75cd10c" ], "index": "pypi", - "version": "==1.28.1" + "version": "==1.30.0" }, "six": { "hashes": [ @@ -819,61 +822,61 @@ }, "soupsieve": { "hashes": [ - "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8", - "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea" + "sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690", + "sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7" ], - "markers": "python_version >= '3.7'", - "version": "==2.4.1" + "markers": "python_version >= '3.8'", + "version": "==2.5" }, "sqlalchemy": { "extras": [ "asyncio" ], "hashes": [ - "sha256:024d2f67fb3ec697555e48caeb7147cfe2c08065a4f1a52d93c3d44fc8e6ad1c", - "sha256:0bf0fd65b50a330261ec7fe3d091dfc1c577483c96a9fa1e4323e932961aa1b5", - "sha256:16a310f5bc75a5b2ce7cb656d0e76eb13440b8354f927ff15cbaddd2523ee2d1", - "sha256:1d90ccc15ba1baa345796a8fb1965223ca7ded2d235ccbef80a47b85cea2d71a", - "sha256:22bafb1da60c24514c141a7ff852b52f9f573fb933b1e6b5263f0daa28ce6db9", - "sha256:2c69ce70047b801d2aba3e5ff3cba32014558966109fecab0c39d16c18510f15", - "sha256:2e7b69d9ced4b53310a87117824b23c509c6fc1f692aa7272d47561347e133b6", - "sha256:314145c1389b021a9ad5aa3a18bac6f5d939f9087d7fc5443be28cba19d2c972", - "sha256:3afa8a21a9046917b3a12ffe016ba7ebe7a55a6fc0c7d950beb303c735c3c3ad", - "sha256:430614f18443b58ceb9dedec323ecddc0abb2b34e79d03503b5a7579cd73a531", - "sha256:43699eb3f80920cc39a380c159ae21c8a8924fe071bccb68fc509e099420b148", - "sha256:539010665c90e60c4a1650afe4ab49ca100c74e6aef882466f1de6471d414be7", - "sha256:57d100a421d9ab4874f51285c059003292433c648df6abe6c9c904e5bd5b0828", - "sha256:5831138f0cc06b43edf5f99541c64adf0ab0d41f9a4471fd63b54ae18399e4de", - "sha256:584f66e5e1979a7a00f4935015840be627e31ca29ad13f49a6e51e97a3fb8cae", - "sha256:5d6afc41ca0ecf373366fd8e10aee2797128d3ae45eb8467b19da4899bcd1ee0", - "sha256:61ada5831db36d897e28eb95f0f81814525e0d7927fb51145526c4e63174920b", - "sha256:6b54d1ad7a162857bb7c8ef689049c7cd9eae2f38864fc096d62ae10bc100c7d", - "sha256:7351c05db355da112e056a7b731253cbeffab9dfdb3be1e895368513c7d70106", - "sha256:77a14fa20264af73ddcdb1e2b9c5a829b8cc6b8304d0f093271980e36c200a3f", - "sha256:851a37898a8a39783aab603c7348eb5b20d83c76a14766a43f56e6ad422d1ec8", - "sha256:89bc2b374ebee1a02fd2eae6fd0570b5ad897ee514e0f84c5c137c942772aa0c", - "sha256:8e712cfd2e07b801bc6b60fdf64853bc2bd0af33ca8fa46166a23fe11ce0dbb0", - "sha256:8f9eb4575bfa5afc4b066528302bf12083da3175f71b64a43a7c0badda2be365", - "sha256:8fc05b59142445a4efb9c1fd75c334b431d35c304b0e33f4fa0ff1ea4890f92e", - "sha256:96f0463573469579d32ad0c91929548d78314ef95c210a8115346271beeeaaa2", - "sha256:9deaae357edc2091a9ed5d25e9ee8bba98bcfae454b3911adeaf159c2e9ca9e3", - "sha256:a752b7a9aceb0ba173955d4f780c64ee15a1a991f1c52d307d6215c6c73b3a4c", - "sha256:ae7473a67cd82a41decfea58c0eac581209a0aa30f8bc9190926fbf628bb17f7", - "sha256:b15afbf5aa76f2241184c1d3b61af1a72ba31ce4161013d7cb5c4c2fca04fd6e", - "sha256:c896d4e6ab2eba2afa1d56be3d0b936c56d4666e789bfc59d6ae76e9fcf46145", - "sha256:cb4e688f6784427e5f9479d1a13617f573de8f7d4aa713ba82813bcd16e259d1", - "sha256:cda283700c984e699e8ef0fcc5c61f00c9d14b6f65a4f2767c97242513fcdd84", - "sha256:cf7b5e3856cbf1876da4e9d9715546fa26b6e0ba1a682d5ed2fc3ca4c7c3ec5b", - "sha256:d6894708eeb81f6d8193e996257223b6bb4041cb05a17cd5cf373ed836ef87a2", - "sha256:d8f2afd1aafded7362b397581772c670f20ea84d0a780b93a1a1529da7c3d369", - "sha256:dd4d410a76c3762511ae075d50f379ae09551d92525aa5bb307f8343bf7c2c12", - "sha256:eb60699de43ba1a1f77363f563bb2c652f7748127ba3a774f7cf2c7804aa0d3d", - "sha256:f469f15068cd8351826df4080ffe4cc6377c5bf7d29b5a07b0e717dddb4c7ea2", - "sha256:f82c310ddf97b04e1392c33cf9a70909e0ae10a7e2ddc1d64495e3abdc5d19fb", - "sha256:fa51ce4aea583b0c6b426f4b0563d3535c1c75986c4373a0987d84d22376585b" + "sha256:1506e988ebeaaf316f183da601f24eedd7452e163010ea63dbe52dc91c7fc70e", + "sha256:1a58052b5a93425f656675673ef1f7e005a3b72e3f2c91b8acca1b27ccadf5f4", + "sha256:1b74eeafaa11372627ce94e4dc88a6751b2b4d263015b3523e2b1e57291102f0", + "sha256:1be86ccea0c965a1e8cd6ccf6884b924c319fcc85765f16c69f1ae7148eba64b", + "sha256:1d35d49a972649b5080557c603110620a86aa11db350d7a7cb0f0a3f611948a0", + "sha256:243d0fb261f80a26774829bc2cee71df3222587ac789b7eaf6555c5b15651eed", + "sha256:26a3399eaf65e9ab2690c07bd5cf898b639e76903e0abad096cd609233ce5208", + "sha256:27d554ef5d12501898d88d255c54eef8414576f34672e02fe96d75908993cf53", + "sha256:3364b7066b3c7f4437dd345d47271f1251e0cfb0aba67e785343cdbdb0fff08c", + "sha256:3423dc2a3b94125094897118b52bdf4d37daf142cbcf26d48af284b763ab90e9", + "sha256:3c6aceebbc47db04f2d779db03afeaa2c73ea3f8dcd3987eb9efdb987ffa09a3", + "sha256:3ce5e81b800a8afc870bb8e0a275d81957e16f8c4b62415a7b386f29a0cb9763", + "sha256:411e7f140200c02c4b953b3dbd08351c9f9818d2bd591b56d0fa0716bd014f1e", + "sha256:4cde2e1096cbb3e62002efdb7050113aa5f01718035ba9f29f9d89c3758e7e4e", + "sha256:5768c268df78bacbde166b48be788b83dddaa2a5974b8810af422ddfe68a9bc8", + "sha256:599ccd23a7146e126be1c7632d1d47847fa9f333104d03325c4e15440fc7d927", + "sha256:5ed61e3463021763b853628aef8bc5d469fe12d95f82c74ef605049d810f3267", + "sha256:63a368231c53c93e2b67d0c5556a9836fdcd383f7e3026a39602aad775b14acf", + "sha256:63e73da7fb030ae0a46a9ffbeef7e892f5def4baf8064786d040d45c1d6d1dc5", + "sha256:6eb6d77c31e1bf4268b4d61b549c341cbff9842f8e115ba6904249c20cb78a61", + "sha256:6f8a934f9dfdf762c844e5164046a9cea25fabbc9ec865c023fe7f300f11ca4a", + "sha256:6fe7d61dc71119e21ddb0094ee994418c12f68c61b3d263ebaae50ea8399c4d4", + "sha256:759b51346aa388c2e606ee206c0bc6f15a5299f6174d1e10cadbe4530d3c7a98", + "sha256:76fdfc0f6f5341987474ff48e7a66c3cd2b8a71ddda01fa82fedb180b961630a", + "sha256:77d37c1b4e64c926fa3de23e8244b964aab92963d0f74d98cbc0783a9e04f501", + "sha256:79543f945be7a5ada9943d555cf9b1531cfea49241809dd1183701f94a748624", + "sha256:79fde625a0a55220d3624e64101ed68a059c1c1f126c74f08a42097a72ff66a9", + "sha256:7d3f175410a6db0ad96b10bfbb0a5530ecd4fcf1e2b5d83d968dd64791f810ed", + "sha256:8dd77fd6648b677d7742d2c3cc105a66e2681cc5e5fb247b88c7a7b78351cf74", + "sha256:a3f0dd6d15b6dc8b28a838a5c48ced7455c3e1fb47b89da9c79cc2090b072a50", + "sha256:bcb04441f370cbe6e37c2b8d79e4af9e4789f626c595899d94abebe8b38f9a4d", + "sha256:c3d99ba99007dab8233f635c32b5cd24fb1df8d64e17bc7df136cedbea427897", + "sha256:ca8a5ff2aa7f3ade6c498aaafce25b1eaeabe4e42b73e25519183e4566a16fc6", + "sha256:cb0d3e94c2a84215532d9bcf10229476ffd3b08f481c53754113b794afb62d14", + "sha256:d1b09ba72e4e6d341bb5bdd3564f1cea6095d4c3632e45dc69375a1dbe4e26ec", + "sha256:d32b5ffef6c5bcb452723a496bad2d4c52b346240c59b3e6dba279f6dcc06c14", + "sha256:d3793dcf5bc4d74ae1e9db15121250c2da476e1af8e45a1d9a52b1513a393459", + "sha256:dd81466bdbc82b060c3c110b2937ab65ace41dfa7b18681fdfad2f37f27acdd7", + "sha256:e4e571af672e1bb710b3cc1a9794b55bce1eae5aed41a608c0401885e3491179", + "sha256:ea8186be85da6587456c9ddc7bf480ebad1a0e6dcbad3967c4821233a4d4df57", + "sha256:eefebcc5c555803065128401a1e224a64607259b5eb907021bf9b175f315d2a6" ], "index": "pypi", - "version": "==2.0.19" + "version": "==2.0.20" }, "typing-extensions": { "hashes": [ @@ -893,11 +896,11 @@ }, "wheel": { "hashes": [ - "sha256:cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873", - "sha256:d236b20e7cb522daf2390fa84c55eea81c5c30190f90f29ae2ca1ad8355bf247" + "sha256:0c5ac5ff2afb79ac23ab82bab027a0be7b5dbcf2e54dc50efe4bf507de1f7985", + "sha256:75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8" ], "markers": "python_version >= '3.7'", - "version": "==0.40.0" + "version": "==0.41.2" }, "yarl": { "hashes": [ @@ -983,10 +986,10 @@ "develop": { "asttokens": { "hashes": [ - "sha256:4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3", - "sha256:6b0ac9e93fb0335014d382b8fa9b3afa7df546984258005da0b9e7095b3deb1c" + "sha256:2552a88626aaa7f0f299f871479fc755bd4e7c11e89078965e928fb7bb9a6afe", + "sha256:bef1a51bc256d349e9f94e7e40e44b705ed1162f55294220dd561d24583d9877" ], - "version": "==2.2.1" + "version": "==2.3.0" }, "backcall": { "hashes": [ @@ -1025,43 +1028,43 @@ }, "click": { "hashes": [ - "sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd", - "sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5" + "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", + "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de" ], "markers": "python_version >= '3.7'", - "version": "==8.1.6" + "version": "==8.1.7" }, "comm": { "hashes": [ - "sha256:16613c6211e20223f215fc6d3b266a247b6e2641bf4e0a3ad34cb1aff2aa3f37", - "sha256:a61efa9daffcfbe66fd643ba966f846a624e4e6d6767eda9cf6e993aadaab93e" + "sha256:354e40a59c9dd6db50c5cc6b4acc887d82e9603787f83b68c01a80a923984d15", + "sha256:6d52794cba11b36ed9860999cd10fd02d6b2eac177068fdd585e1e2f8a96e67a" ], "markers": "python_version >= '3.6'", - "version": "==0.1.3" + "version": "==0.1.4" }, "debugpy": { "hashes": [ - "sha256:0679b7e1e3523bd7d7869447ec67b59728675aadfc038550a63a362b63029d2c", - "sha256:279d64c408c60431c8ee832dfd9ace7c396984fd7341fa3116aee414e7dcd88d", - "sha256:33edb4afa85c098c24cc361d72ba7c21bb92f501104514d4ffec1fb36e09c01a", - "sha256:38ed626353e7c63f4b11efad659be04c23de2b0d15efff77b60e4740ea685d07", - "sha256:5224eabbbeddcf1943d4e2821876f3e5d7d383f27390b82da5d9558fd4eb30a9", - "sha256:53f7a456bc50706a0eaabecf2d3ce44c4d5010e46dfc65b6b81a518b42866267", - "sha256:9cd10cf338e0907fdcf9eac9087faa30f150ef5445af5a545d307055141dd7a4", - "sha256:aaf6da50377ff4056c8ed470da24632b42e4087bc826845daad7af211e00faad", - "sha256:b3e7ac809b991006ad7f857f016fa92014445085711ef111fdc3f74f66144096", - "sha256:bae1123dff5bfe548ba1683eb972329ba6d646c3a80e6b4c06cd1b1dd0205e9b", - "sha256:c0ff93ae90a03b06d85b2c529eca51ab15457868a377c4cc40a23ab0e4e552a3", - "sha256:c4c2f0810fa25323abfdfa36cbbbb24e5c3b1a42cb762782de64439c575d67f2", - "sha256:d71b31117779d9a90b745720c0eab54ae1da76d5b38c8026c654f4a066b0130a", - "sha256:dbe04e7568aa69361a5b4c47b4493d5680bfa3a911d1e105fbea1b1f23f3eb45", - "sha256:de86029696e1b3b4d0d49076b9eba606c226e33ae312a57a46dca14ff370894d", - "sha256:e3876611d114a18aafef6383695dfc3f1217c98a9168c1aaf1a02b01ec7d8d1e", - "sha256:ed6d5413474e209ba50b1a75b2d9eecf64d41e6e4501977991cdc755dc83ab0f", - "sha256:f90a2d4ad9a035cee7331c06a4cf2245e38bd7c89554fe3b616d90ab8aab89cc" + "sha256:038c51268367c9c935905a90b1c2d2dbfe304037c27ba9d19fe7409f8cdc710c", + "sha256:1093a5c541af079c13ac8c70ab8b24d1d35c8cacb676306cf11e57f699c02926", + "sha256:3370ef1b9951d15799ef7af41f8174194f3482ee689988379763ef61a5456426", + "sha256:38651c3639a4e8bbf0ca7e52d799f6abd07d622a193c406be375da4d510d968d", + "sha256:3de5d0f97c425dc49bce4293df6a04494309eedadd2b52c22e58d95107e178d9", + "sha256:4b9eba71c290852f959d2cf8a03af28afd3ca639ad374d393d53d367f7f685b2", + "sha256:65b28435a17cba4c09e739621173ff90c515f7b9e8ea469b92e3c28ef8e5cdfb", + "sha256:72f5d2ecead8125cf669e62784ef1e6300f4067b0f14d9f95ee00ae06fc7c4f7", + "sha256:85969d864c45f70c3996067cfa76a319bae749b04171f2cdeceebe4add316155", + "sha256:890f7ab9a683886a0f185786ffbda3b46495c4b929dab083b8c79d6825832a52", + "sha256:903bd61d5eb433b6c25b48eae5e23821d4c1a19e25c9610205f5aeaccae64e32", + "sha256:92b6dae8bfbd497c90596bbb69089acf7954164aea3228a99d7e43e5267f5b36", + "sha256:973a97ed3b434eab0f792719a484566c35328196540676685c975651266fccf9", + "sha256:d16882030860081e7dd5aa619f30dec3c2f9a421e69861125f83cc372c94e57d", + "sha256:d4ac7a4dba28801d184b7fc0e024da2635ca87d8b0a825c6087bb5168e3c0d28", + "sha256:eea8d8cfb9965ac41b99a61f8e755a8f50e9a20330938ad8271530210f54e09c", + "sha256:f0851403030f3975d6e2eaa4abf73232ab90b98f041e3c09ba33be2beda43fcf", + "sha256:fe87ec0182ef624855d05e6ed7e0b7cb1359d2ffa2a925f8ec2d22e98b75d0ca" ], "markers": "python_version >= '3.7'", - "version": "==1.6.7" + "version": "==1.6.7.post1" }, "decorator": { "hashes": [ @@ -1071,6 +1074,14 @@ "markers": "python_version >= '3.5'", "version": "==5.1.1" }, + "exceptiongroup": { + "hashes": [ + "sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9", + "sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3" + ], + "markers": "python_version < '3.11'", + "version": "==1.1.3" + }, "executing": { "hashes": [ "sha256:0314a69e37426e3608aada02473b4161d4caf5a4b244d1d0c48072b8fee7bacc", @@ -1080,43 +1091,43 @@ }, "flake8": { "hashes": [ - "sha256:3833794e27ff64ea4e9cf5d410082a8b97ff1a06c16aa3d2027339cd0f1195c7", - "sha256:c61007e76655af75e6785a931f452915b371dc48f56efd765247c8fe68f2b181" + "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23", + "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5" ], "index": "pypi", - "version": "==6.0.0" + "version": "==6.1.0" }, "ipykernel": { "hashes": [ - "sha256:29cea0a716b1176d002a61d0b0c851f34536495bc4ef7dd0222c88b41b816123", - "sha256:2f5fffc7ad8f1fd5aadb4e171ba9129d9668dbafa374732cf9511ada52d6547f" + "sha256:050391364c0977e768e354bdb60cbbfbee7cbb943b1af1618382021136ffd42f", + "sha256:c8a2430b357073b37c76c21c52184db42f6b4b0e438e1eb7df3c4440d120497c" ], "index": "pypi", - "version": "==6.24.0" + "version": "==6.25.1" }, "ipython": { "hashes": [ - "sha256:1d197b907b6ba441b692c48cf2a3a2de280dc0ac91a3405b39349a50272ca0a1", - "sha256:248aca623f5c99a6635bc3857677b7320b9b8039f99f070ee0d20a5ca5a8e6bf" + "sha256:2baeb5be6949eeebf532150f81746f8333e2ccce02de1c7eedde3f23ed5e9f1e", + "sha256:45a2c3a529296870a97b7de34eda4a31bee16bc7bf954e07d39abe49caf8f887" ], "markers": "python_version >= '3.9'", - "version": "==8.14.0" + "version": "==8.15.0" }, "jedi": { "hashes": [ - "sha256:203c1fd9d969ab8f2119ec0a3342e0b49910045abe6af0a3ae83a5764d54639e", - "sha256:bae794c30d07f6d910d32a7048af09b5a39ed740918da923c6b780790ebac612" + "sha256:bcf9894f1753969cbac8022a8c2eaee06bfa3724e4192470aaffe7eb6272b0c4", + "sha256:cb8ce23fbccff0025e9386b5cf85e892f94c9b822378f8da49970471335ac64e" ], "markers": "python_version >= '3.6'", - "version": "==0.18.2" + "version": "==0.19.0" }, "jupyter-client": { "hashes": [ - "sha256:3af69921fe99617be1670399a0b857ad67275eefcfa291e2c81a160b7b650f5f", - "sha256:7441af0c0672edc5d28035e92ba5e32fadcfa8a4e608a434c228836a89df6158" + "sha256:5eb9f55eb0650e81de6b7e34308d8b92d04fe4ec41cd8193a913979e33d8e1a5", + "sha256:60294b2d5b869356c893f57b1a877ea6510d60d45cf4b38057f1672d85699ac9" ], "markers": "python_version >= '3.8'", - "version": "==8.3.0" + "version": "==8.3.1" }, "jupyter-core": { "hashes": [ @@ -1144,35 +1155,36 @@ }, "mypy": { "hashes": [ - "sha256:01fd2e9f85622d981fd9063bfaef1aed6e336eaacca00892cd2d82801ab7c042", - "sha256:0dde1d180cd84f0624c5dcaaa89c89775550a675aff96b5848de78fb11adabcd", - "sha256:141dedfdbfe8a04142881ff30ce6e6653c9685b354876b12e4fe6c78598b45e2", - "sha256:16f0db5b641ba159eff72cff08edc3875f2b62b2fa2bc24f68c1e7a4e8232d01", - "sha256:190b6bab0302cec4e9e6767d3eb66085aef2a1cc98fe04936d8a42ed2ba77bb7", - "sha256:2460a58faeea905aeb1b9b36f5065f2dc9a9c6e4c992a6499a2360c6c74ceca3", - "sha256:34a9239d5b3502c17f07fd7c0b2ae6b7dd7d7f6af35fbb5072c6208e76295816", - "sha256:43b592511672017f5b1a483527fd2684347fdffc041c9ef53428c8dc530f79a3", - "sha256:43d24f6437925ce50139a310a64b2ab048cb2d3694c84c71c3f2a1626d8101dc", - "sha256:45d32cec14e7b97af848bddd97d85ea4f0db4d5a149ed9676caa4eb2f7402bb4", - "sha256:470c969bb3f9a9efcedbadcd19a74ffb34a25f8e6b0e02dae7c0e71f8372f97b", - "sha256:566e72b0cd6598503e48ea610e0052d1b8168e60a46e0bfd34b3acf2d57f96a8", - "sha256:5703097c4936bbb9e9bce41478c8d08edd2865e177dc4c52be759f81ee4dd26c", - "sha256:7549fbf655e5825d787bbc9ecf6028731973f78088fbca3a1f4145c39ef09462", - "sha256:8207b7105829eca6f3d774f64a904190bb2231de91b8b186d21ffd98005f14a7", - "sha256:8c4d8e89aa7de683e2056a581ce63c46a0c41e31bd2b6d34144e2c80f5ea53dc", - "sha256:98324ec3ecf12296e6422939e54763faedbfcc502ea4a4c38502082711867258", - "sha256:9bbcd9ab8ea1f2e1c8031c21445b511442cc45c89951e49bbf852cbb70755b1b", - "sha256:9d40652cc4fe33871ad3338581dca3297ff5f2213d0df345bcfbde5162abf0c9", - "sha256:a2746d69a8196698146a3dbe29104f9eb6a2a4d8a27878d92169a6c0b74435b6", - "sha256:ae704dcfaa180ff7c4cfbad23e74321a2b774f92ca77fd94ce1049175a21c97f", - "sha256:bfdca17c36ae01a21274a3c387a63aa1aafe72bff976522886869ef131b937f1", - "sha256:c482e1246726616088532b5e964e39765b6d1520791348e6c9dc3af25b233828", - "sha256:ca637024ca67ab24a7fd6f65d280572c3794665eaf5edcc7e90a866544076878", - "sha256:e02d700ec8d9b1859790c0475df4e4092c7bf3272a4fd2c9f33d87fac4427b8f", - "sha256:e5952d2d18b79f7dc25e62e014fe5a23eb1a3d2bc66318df8988a01b1a037c5b" + "sha256:159aa9acb16086b79bbb0016145034a1a05360626046a929f84579ce1666b315", + "sha256:258b22210a4a258ccd077426c7a181d789d1121aca6db73a83f79372f5569ae0", + "sha256:26f71b535dfc158a71264e6dc805a9f8d2e60b67215ca0bfa26e2e1aa4d4d373", + "sha256:26fb32e4d4afa205b24bf645eddfbb36a1e17e995c5c99d6d00edb24b693406a", + "sha256:2fc3a600f749b1008cc75e02b6fb3d4db8dbcca2d733030fe7a3b3502902f161", + "sha256:32cb59609b0534f0bd67faebb6e022fe534bdb0e2ecab4290d683d248be1b275", + "sha256:330857f9507c24de5c5724235e66858f8364a0693894342485e543f5b07c8693", + "sha256:361da43c4f5a96173220eb53340ace68cda81845cd88218f8862dfb0adc8cddb", + "sha256:4a465ea2ca12804d5b34bb056be3a29dc47aea5973b892d0417c6a10a40b2d65", + "sha256:51cb1323064b1099e177098cb939eab2da42fea5d818d40113957ec954fc85f4", + "sha256:57b10c56016adce71fba6bc6e9fd45d8083f74361f629390c556738565af8eeb", + "sha256:596fae69f2bfcb7305808c75c00f81fe2829b6236eadda536f00610ac5ec2243", + "sha256:5d627124700b92b6bbaa99f27cbe615c8ea7b3402960f6372ea7d65faf376c14", + "sha256:6ac9c21bfe7bc9f7f1b6fae441746e6a106e48fc9de530dea29e8cd37a2c0cc4", + "sha256:82cb6193de9bbb3844bab4c7cf80e6227d5225cc7625b068a06d005d861ad5f1", + "sha256:8f772942d372c8cbac575be99f9cc9d9fb3bd95c8bc2de6c01411e2c84ebca8a", + "sha256:9fece120dbb041771a63eb95e4896791386fe287fefb2837258925b8326d6160", + "sha256:a156e6390944c265eb56afa67c74c0636f10283429171018446b732f1a05af25", + "sha256:a9ec1f695f0c25986e6f7f8778e5ce61659063268836a38c951200c57479cc12", + "sha256:abed92d9c8f08643c7d831300b739562b0a6c9fcb028d211134fc9ab20ccad5d", + "sha256:b031b9601f1060bf1281feab89697324726ba0c0bae9d7cd7ab4b690940f0b92", + "sha256:c543214ffdd422623e9fedd0869166c2f16affe4ba37463975043ef7d2ea8770", + "sha256:d28ddc3e3dfeab553e743e532fb95b4e6afad51d4706dd22f28e1e5e664828d2", + "sha256:f33592ddf9655a4894aef22d134de7393e95fcbdc2d15c1ab65828eee5c66c70", + "sha256:f6b0e77db9ff4fda74de7df13f30016a0a663928d669c9f2c057048ba44f09bb", + "sha256:f757063a83970d67c444f6e01d9550a7402322af3557ce7630d3c957386fa8f5", + "sha256:ff0cedc84184115202475bbb46dd99f8dcb87fe24d5d0ddfc0fe6b8575c88d2f" ], "index": "pypi", - "version": "==1.4.1" + "version": "==1.5.1" }, "mypy-extensions": { "hashes": [ @@ -1184,11 +1196,11 @@ }, "nest-asyncio": { "hashes": [ - "sha256:b9a953fb40dceaa587d109609098db21900182b16440652454a146cffb06e8b8", - "sha256:d267cc1ff794403f7df692964d1d2a3fa9418ffea2a3f6859a439ff482fef290" + "sha256:5301c82941b550b3123a1ea772ba9a1c80bad3a182be8c1a5ae6ad3be57a9657", + "sha256:6a80f7b98f24d9083ed24608977c09dd608d83f91cccc24c9d2cba6d10e01c10" ], "markers": "python_version >= '3.5'", - "version": "==1.5.6" + "version": "==1.5.7" }, "packaging": { "hashes": [ @@ -1208,11 +1220,11 @@ }, "pathspec": { "hashes": [ - "sha256:2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687", - "sha256:d8af70af76652554bd134c22b3e8a1cc46ed7d91edcdd721ef1a0c51a84a5293" + "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20", + "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3" ], "markers": "python_version >= '3.7'", - "version": "==0.11.1" + "version": "==0.11.2" }, "pexpect": { "hashes": [ @@ -1231,11 +1243,11 @@ }, "platformdirs": { "hashes": [ - "sha256:1b42b450ad933e981d56e59f1b97495428c9bd60698baab9f3eb3d00d5822421", - "sha256:ad8291ae0ae5072f66c16945166cb11c63394c7a3ad1b1bc9828ca3162da8c2f" + "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d", + "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d" ], "markers": "python_version >= '3.7'", - "version": "==3.9.1" + "version": "==3.10.0" }, "prompt-toolkit": { "hashes": [ @@ -1281,27 +1293,27 @@ }, "pycodestyle": { "hashes": [ - "sha256:347187bdb476329d98f695c213d7295a846d1152ff4fe9bacb8a9590b8ee7053", - "sha256:8a4eaf0d0495c7395bdab3589ac2db602797d76207242c17d470186815706610" + "sha256:259bcc17857d8a8b3b4a2327324b79e5f020a13c16074670f9c8c8f872ea76d0", + "sha256:5d1013ba8dc7895b548be5afb05740ca82454fd899971563d2ef625d090326f8" ], - "markers": "python_version >= '3.6'", - "version": "==2.10.0" + "markers": "python_version >= '3.8'", + "version": "==2.11.0" }, "pyflakes": { "hashes": [ - "sha256:ec55bf7fe21fff7f1ad2f7da62363d749e2a470500eab1b555334b67aa1ef8cf", - "sha256:ec8b276a6b60bd80defed25add7e439881c19e64850afd9b346283d4165fd0fd" + "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774", + "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc" ], - "markers": "python_version >= '3.6'", - "version": "==3.0.1" + "markers": "python_version >= '3.8'", + "version": "==3.1.0" }, "pygments": { "hashes": [ - "sha256:8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c", - "sha256:db2db3deb4b4179f399a09054b023b6a586b76499d36965813c71aa8ed7b5fd1" + "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692", + "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29" ], "markers": "python_version >= '3.7'", - "version": "==2.15.1" + "version": "==2.16.1" }, "python-dateutil": { "hashes": [ @@ -1313,86 +1325,102 @@ }, "pyzmq": { "hashes": [ - "sha256:01f06f33e12497dca86353c354461f75275a5ad9eaea181ac0dc1662da8074fa", - "sha256:0b6b42f7055bbc562f63f3df3b63e3dd1ebe9727ff0f124c3aa7bcea7b3a00f9", - "sha256:0c4fc2741e0513b5d5a12fe200d6785bbcc621f6f2278893a9ca7bed7f2efb7d", - "sha256:108c96ebbd573d929740d66e4c3d1bdf31d5cde003b8dc7811a3c8c5b0fc173b", - "sha256:13bbe36da3f8aaf2b7ec12696253c0bf6ffe05f4507985a8844a1081db6ec22d", - "sha256:154bddda2a351161474b36dba03bf1463377ec226a13458725183e508840df89", - "sha256:19d0383b1f18411d137d891cab567de9afa609b214de68b86e20173dc624c101", - "sha256:1a6169e69034eaa06823da6a93a7739ff38716142b3596c180363dee729d713d", - "sha256:1fc56a0221bdf67cfa94ef2d6ce5513a3d209c3dfd21fed4d4e87eca1822e3a3", - "sha256:2a21fec5c3cea45421a19ccbe6250c82f97af4175bc09de4d6dd78fb0cb4c200", - "sha256:2b15247c49d8cbea695b321ae5478d47cffd496a2ec5ef47131a9e79ddd7e46c", - "sha256:2f5efcc29056dfe95e9c9db0dfbb12b62db9c4ad302f812931b6d21dd04a9119", - "sha256:2f666ae327a6899ff560d741681fdcdf4506f990595201ed39b44278c471ad98", - "sha256:332616f95eb400492103ab9d542b69d5f0ff628b23129a4bc0a2fd48da6e4e0b", - "sha256:33d5c8391a34d56224bccf74f458d82fc6e24b3213fc68165c98b708c7a69325", - "sha256:3575699d7fd7c9b2108bc1c6128641a9a825a58577775ada26c02eb29e09c517", - "sha256:3830be8826639d801de9053cf86350ed6742c4321ba4236e4b5568528d7bfed7", - "sha256:3a522510e3434e12aff80187144c6df556bb06fe6b9d01b2ecfbd2b5bfa5c60c", - "sha256:3bed53f7218490c68f0e82a29c92335daa9606216e51c64f37b48eb78f1281f4", - "sha256:414b8beec76521358b49170db7b9967d6974bdfc3297f47f7d23edec37329b00", - "sha256:442d3efc77ca4d35bee3547a8e08e8d4bb88dadb54a8377014938ba98d2e074a", - "sha256:47b915ba666c51391836d7ed9a745926b22c434efa76c119f77bcffa64d2c50c", - "sha256:48e5e59e77c1a83162ab3c163fc01cd2eebc5b34560341a67421b09be0891287", - "sha256:4a82faae00d1eed4809c2f18b37f15ce39a10a1c58fe48b60ad02875d6e13d80", - "sha256:4a983c8694667fd76d793ada77fd36c8317e76aa66eec75be2653cef2ea72883", - "sha256:4c2fc7aad520a97d64ffc98190fce6b64152bde57a10c704b337082679e74f67", - "sha256:4cb27ef9d3bdc0c195b2dc54fcb8720e18b741624686a81942e14c8b67cc61a6", - "sha256:4d67609b37204acad3d566bb7391e0ecc25ef8bae22ff72ebe2ad7ffb7847158", - "sha256:5482f08d2c3c42b920e8771ae8932fbaa0a67dff925fc476996ddd8155a170f3", - "sha256:5489738a692bc7ee9a0a7765979c8a572520d616d12d949eaffc6e061b82b4d1", - "sha256:5693dcc4f163481cf79e98cf2d7995c60e43809e325b77a7748d8024b1b7bcba", - "sha256:58416db767787aedbfd57116714aad6c9ce57215ffa1c3758a52403f7c68cff5", - "sha256:5873d6a60b778848ce23b6c0ac26c39e48969823882f607516b91fb323ce80e5", - "sha256:5af31493663cf76dd36b00dafbc839e83bbca8a0662931e11816d75f36155897", - "sha256:5e7fbcafa3ea16d1de1f213c226005fea21ee16ed56134b75b2dede5a2129e62", - "sha256:65346f507a815a731092421d0d7d60ed551a80d9b75e8b684307d435a5597425", - "sha256:6581e886aec3135964a302a0f5eb68f964869b9efd1dbafdebceaaf2934f8a68", - "sha256:69511d604368f3dc58d4be1b0bad99b61ee92b44afe1cd9b7bd8c5e34ea8248a", - "sha256:7018289b402ebf2b2c06992813523de61d4ce17bd514c4339d8f27a6f6809492", - "sha256:71c7b5896e40720d30cd77a81e62b433b981005bbff0cb2f739e0f8d059b5d99", - "sha256:75217e83faea9edbc29516fc90c817bc40c6b21a5771ecb53e868e45594826b0", - "sha256:7e23a8c3b6c06de40bdb9e06288180d630b562db8ac199e8cc535af81f90e64b", - "sha256:80c41023465d36280e801564a69cbfce8ae85ff79b080e1913f6e90481fb8957", - "sha256:831ba20b660b39e39e5ac8603e8193f8fce1ee03a42c84ade89c36a251449d80", - "sha256:851fb2fe14036cfc1960d806628b80276af5424db09fe5c91c726890c8e6d943", - "sha256:8751f9c1442624da391bbd92bd4b072def6d7702a9390e4479f45c182392ff78", - "sha256:8b45d722046fea5a5694cba5d86f21f78f0052b40a4bbbbf60128ac55bfcc7b6", - "sha256:8b697774ea8273e3c0460cf0bba16cd85ca6c46dfe8b303211816d68c492e132", - "sha256:90146ab578931e0e2826ee39d0c948d0ea72734378f1898939d18bc9c823fcf9", - "sha256:9301cf1d7fc1ddf668d0abbe3e227fc9ab15bc036a31c247276012abb921b5ff", - "sha256:95bd3a998d8c68b76679f6b18f520904af5204f089beebb7b0301d97704634dd", - "sha256:968b0c737797c1809ec602e082cb63e9824ff2329275336bb88bd71591e94a90", - "sha256:97d984b1b2f574bc1bb58296d3c0b64b10e95e7026f8716ed6c0b86d4679843f", - "sha256:9e68ae9864d260b18f311b68d29134d8776d82e7f5d75ce898b40a88df9db30f", - "sha256:adecf6d02b1beab8d7c04bc36f22bb0e4c65a35eb0b4750b91693631d4081c70", - "sha256:af56229ea6527a849ac9fb154a059d7e32e77a8cba27e3e62a1e38d8808cb1a5", - "sha256:b324fa769577fc2c8f5efcd429cef5acbc17d63fe15ed16d6dcbac2c5eb00849", - "sha256:b5a07c4f29bf7cb0164664ef87e4aa25435dcc1f818d29842118b0ac1eb8e2b5", - "sha256:bad172aba822444b32eae54c2d5ab18cd7dee9814fd5c7ed026603b8cae2d05f", - "sha256:bdca18b94c404af6ae5533cd1bc310c4931f7ac97c148bbfd2cd4bdd62b96253", - "sha256:be24a5867b8e3b9dd5c241de359a9a5217698ff616ac2daa47713ba2ebe30ad1", - "sha256:be86a26415a8b6af02cd8d782e3a9ae3872140a057f1cadf0133de685185c02b", - "sha256:c66b7ff2527e18554030319b1376d81560ca0742c6e0b17ff1ee96624a5f1afd", - "sha256:c8398a1b1951aaa330269c35335ae69744be166e67e0ebd9869bdc09426f3871", - "sha256:cad9545f5801a125f162d09ec9b724b7ad9b6440151b89645241d0120e119dcc", - "sha256:cb6d161ae94fb35bb518b74bb06b7293299c15ba3bc099dccd6a5b7ae589aee3", - "sha256:d40682ac60b2a613d36d8d3a0cd14fbdf8e7e0618fbb40aa9fa7b796c9081584", - "sha256:d6128d431b8dfa888bf51c22a04d48bcb3d64431caf02b3cb943269f17fd2994", - "sha256:dbc466744a2db4b7ca05589f21ae1a35066afada2f803f92369f5877c100ef62", - "sha256:ddbef8b53cd16467fdbfa92a712eae46dd066aa19780681a2ce266e88fbc7165", - "sha256:e21cc00e4debe8f54c3ed7b9fcca540f46eee12762a9fa56feb8512fd9057161", - "sha256:eb52e826d16c09ef87132c6e360e1879c984f19a4f62d8a935345deac43f3c12", - "sha256:f0d9e7ba6a815a12c8575ba7887da4b72483e4cfc57179af10c9b937f3f9308f", - "sha256:f1e931d9a92f628858a50f5bdffdfcf839aebe388b82f9d2ccd5d22a38a789dc", - "sha256:f45808eda8b1d71308c5416ef3abe958f033fdbb356984fabbfc7887bed76b3f", - "sha256:f6d39e42a0aa888122d1beb8ec0d4ddfb6c6b45aecb5ba4013c27e2f28657765", - "sha256:fc34fdd458ff77a2a00e3c86f899911f6f269d393ca5675842a6e92eea565bae" + "sha256:019e59ef5c5256a2c7378f2fb8560fc2a9ff1d315755204295b2eab96b254d0a", + "sha256:034239843541ef7a1aee0c7b2cb7f6aafffb005ede965ae9cbd49d5ff4ff73cf", + "sha256:03b3f49b57264909aacd0741892f2aecf2f51fb053e7d8ac6767f6c700832f45", + "sha256:047a640f5c9c6ade7b1cc6680a0e28c9dd5a0825135acbd3569cc96ea00b2505", + "sha256:04ccbed567171579ec2cebb9c8a3e30801723c575601f9a990ab25bcac6b51e2", + "sha256:057e824b2aae50accc0f9a0570998adc021b372478a921506fddd6c02e60308e", + "sha256:11baebdd5fc5b475d484195e49bae2dc64b94a5208f7c89954e9e354fc609d8f", + "sha256:11c1d2aed9079c6b0c9550a7257a836b4a637feb334904610f06d70eb44c56d2", + "sha256:11d58723d44d6ed4dd677c5615b2ffb19d5c426636345567d6af82be4dff8a55", + "sha256:12720a53e61c3b99d87262294e2b375c915fea93c31fc2336898c26d7aed34cd", + "sha256:17ef5f01d25b67ca8f98120d5fa1d21efe9611604e8eb03a5147360f517dd1e2", + "sha256:18d43df3f2302d836f2a56f17e5663e398416e9dd74b205b179065e61f1a6edf", + "sha256:1a5d26fe8f32f137e784f768143728438877d69a586ddeaad898558dc971a5ae", + "sha256:1af379b33ef33757224da93e9da62e6471cf4a66d10078cf32bae8127d3d0d4a", + "sha256:1ccf825981640b8c34ae54231b7ed00271822ea1c6d8ba1090ebd4943759abf5", + "sha256:21eb4e609a154a57c520e3d5bfa0d97e49b6872ea057b7c85257b11e78068222", + "sha256:2243700cc5548cff20963f0ca92d3e5e436394375ab8a354bbea2b12911b20b0", + "sha256:255ca2b219f9e5a3a9ef3081512e1358bd4760ce77828e1028b818ff5610b87b", + "sha256:259c22485b71abacdfa8bf79720cd7bcf4b9d128b30ea554f01ae71fdbfdaa23", + "sha256:25f0e6b78220aba09815cd1f3a32b9c7cb3e02cb846d1cfc526b6595f6046618", + "sha256:273bc3959bcbff3f48606b28229b4721716598d76b5aaea2b4a9d0ab454ec062", + "sha256:292fe3fc5ad4a75bc8df0dfaee7d0babe8b1f4ceb596437213821f761b4589f9", + "sha256:2ca57a5be0389f2a65e6d3bb2962a971688cbdd30b4c0bd188c99e39c234f414", + "sha256:2d163a18819277e49911f7461567bda923461c50b19d169a062536fffe7cd9d2", + "sha256:2d81f1ddae3858b8299d1da72dd7d19dd36aab654c19671aa8a7e7fb02f6638a", + "sha256:2f957ce63d13c28730f7fd6b72333814221c84ca2421298f66e5143f81c9f91f", + "sha256:330f9e188d0d89080cde66dc7470f57d1926ff2fb5576227f14d5be7ab30b9fa", + "sha256:34c850ce7976d19ebe7b9d4b9bb8c9dfc7aac336c0958e2651b88cbd46682123", + "sha256:35b5ab8c28978fbbb86ea54958cd89f5176ce747c1fb3d87356cf698048a7790", + "sha256:3669cf8ee3520c2f13b2e0351c41fea919852b220988d2049249db10046a7afb", + "sha256:381469297409c5adf9a0e884c5eb5186ed33137badcbbb0560b86e910a2f1e76", + "sha256:3d0a409d3b28607cc427aa5c30a6f1e4452cc44e311f843e05edb28ab5e36da0", + "sha256:44e58a0554b21fc662f2712814a746635ed668d0fbc98b7cb9d74cb798d202e6", + "sha256:458dea649f2f02a0b244ae6aef8dc29325a2810aa26b07af8374dc2a9faf57e3", + "sha256:48e466162a24daf86f6b5ca72444d2bf39a5e58da5f96370078be67c67adc978", + "sha256:49d238cf4b69652257db66d0c623cd3e09b5d2e9576b56bc067a396133a00d4a", + "sha256:4ca1ed0bb2d850aa8471387882247c68f1e62a4af0ce9c8a1dbe0d2bf69e41fb", + "sha256:52533489f28d62eb1258a965f2aba28a82aa747202c8fa5a1c7a43b5db0e85c1", + "sha256:548d6482dc8aadbe7e79d1b5806585c8120bafa1ef841167bc9090522b610fa6", + "sha256:5619f3f5a4db5dbb572b095ea3cb5cc035335159d9da950830c9c4db2fbb6995", + "sha256:57459b68e5cd85b0be8184382cefd91959cafe79ae019e6b1ae6e2ba8a12cda7", + "sha256:5a34d2395073ef862b4032343cf0c32a712f3ab49d7ec4f42c9661e0294d106f", + "sha256:61706a6b6c24bdece85ff177fec393545a3191eeda35b07aaa1458a027ad1304", + "sha256:724c292bb26365659fc434e9567b3f1adbdb5e8d640c936ed901f49e03e5d32e", + "sha256:73461eed88a88c866656e08f89299720a38cb4e9d34ae6bf5df6f71102570f2e", + "sha256:76705c9325d72a81155bb6ab48d4312e0032bf045fb0754889133200f7a0d849", + "sha256:76c1c8efb3ca3a1818b837aea423ff8a07bbf7aafe9f2f6582b61a0458b1a329", + "sha256:77a41c26205d2353a4c94d02be51d6cbdf63c06fbc1295ea57dad7e2d3381b71", + "sha256:79986f3b4af059777111409ee517da24a529bdbd46da578b33f25580adcff728", + "sha256:7cff25c5b315e63b07a36f0c2bab32c58eafbe57d0dce61b614ef4c76058c115", + "sha256:7f7e58effd14b641c5e4dec8c7dab02fb67a13df90329e61c869b9cc607ef752", + "sha256:820c4a08195a681252f46926de10e29b6bbf3e17b30037bd4250d72dd3ddaab8", + "sha256:87e34f31ca8f168c56d6fbf99692cc8d3b445abb5bfd08c229ae992d7547a92a", + "sha256:8f03d3f0d01cb5a018debeb412441996a517b11c5c17ab2001aa0597c6d6882c", + "sha256:90f26dc6d5f241ba358bef79be9ce06de58d477ca8485e3291675436d3827cf8", + "sha256:955215ed0604dac5b01907424dfa28b40f2b2292d6493445dd34d0dfa72586a8", + "sha256:985bbb1316192b98f32e25e7b9958088431d853ac63aca1d2c236f40afb17c83", + "sha256:a382372898a07479bd34bda781008e4a954ed8750f17891e794521c3e21c2e1c", + "sha256:a882ac0a351288dd18ecae3326b8a49d10c61a68b01419f3a0b9a306190baf69", + "sha256:aa8d6cdc8b8aa19ceb319aaa2b660cdaccc533ec477eeb1309e2a291eaacc43a", + "sha256:abc719161780932c4e11aaebb203be3d6acc6b38d2f26c0f523b5b59d2fc1996", + "sha256:abf34e43c531bbb510ae7e8f5b2b1f2a8ab93219510e2b287a944432fad135f3", + "sha256:ade6d25bb29c4555d718ac6d1443a7386595528c33d6b133b258f65f963bb0f6", + "sha256:afea96f64efa98df4da6958bae37f1cbea7932c35878b185e5982821bc883369", + "sha256:b1579413ae492b05de5a6174574f8c44c2b9b122a42015c5292afa4be2507f28", + "sha256:b3451108ab861040754fa5208bca4a5496c65875710f76789a9ad27c801a0075", + "sha256:b9af3757495c1ee3b5c4e945c1df7be95562277c6e5bccc20a39aec50f826cd0", + "sha256:bc16ac425cc927d0a57d242589f87ee093884ea4804c05a13834d07c20db203c", + "sha256:c2910967e6ab16bf6fbeb1f771c89a7050947221ae12a5b0b60f3bca2ee19bca", + "sha256:c2b92812bd214018e50b6380ea3ac0c8bb01ac07fcc14c5f86a5bb25e74026e9", + "sha256:c2f20ce161ebdb0091a10c9ca0372e023ce24980d0e1f810f519da6f79c60800", + "sha256:c56d748ea50215abef7030c72b60dd723ed5b5c7e65e7bc2504e77843631c1a6", + "sha256:c7c133e93b405eb0d36fa430c94185bdd13c36204a8635470cccc200723c13bb", + "sha256:c9c6c9b2c2f80747a98f34ef491c4d7b1a8d4853937bb1492774992a120f475d", + "sha256:cbc8df5c6a88ba5ae385d8930da02201165408dde8d8322072e3e5ddd4f68e22", + "sha256:cff084c6933680d1f8b2f3b4ff5bbb88538a4aac00d199ac13f49d0698727ecb", + "sha256:d2045d6d9439a0078f2a34b57c7b18c4a6aef0bee37f22e4ec9f32456c852c71", + "sha256:d20a0ddb3e989e8807d83225a27e5c2eb2260eaa851532086e9e0fa0d5287d83", + "sha256:d457aed310f2670f59cc5b57dcfced452aeeed77f9da2b9763616bd57e4dbaae", + "sha256:d89528b4943d27029a2818f847c10c2cecc79fa9590f3cb1860459a5be7933eb", + "sha256:db0b2af416ba735c6304c47f75d348f498b92952f5e3e8bff449336d2728795d", + "sha256:deee9ca4727f53464daf089536e68b13e6104e84a37820a88b0a057b97bba2d2", + "sha256:df27ffddff4190667d40de7beba4a950b5ce78fe28a7dcc41d6f8a700a80a3c0", + "sha256:e0c95ddd4f6e9fca4e9e3afaa4f9df8552f0ba5d1004e89ef0a68e1f1f9807c7", + "sha256:e1c1be77bc5fb77d923850f82e55a928f8638f64a61f00ff18a67c7404faf008", + "sha256:e1ffa1c924e8c72778b9ccd386a7067cddf626884fd8277f503c48bb5f51c762", + "sha256:e2400a94f7dd9cb20cd012951a0cbf8249e3d554c63a9c0cdfd5cbb6c01d2dec", + "sha256:e61f091c3ba0c3578411ef505992d356a812fb200643eab27f4f70eed34a29ef", + "sha256:e8a701123029cc240cea61dd2d16ad57cab4691804143ce80ecd9286b464d180", + "sha256:eadbefd5e92ef8a345f0525b5cfd01cf4e4cc651a2cffb8f23c0dd184975d787", + "sha256:f32260e556a983bc5c7ed588d04c942c9a8f9c2e99213fec11a031e316874c7e", + "sha256:f8115e303280ba09f3898194791a153862cbf9eef722ad8f7f741987ee2a97c7", + "sha256:fedbdc753827cf014c01dbbee9c3be17e5a208dcd1bf8641ce2cd29580d1f0d4" ], "markers": "python_version >= '3.6'", - "version": "==25.1.0" + "version": "==25.1.1" }, "six": { "hashes": [ @@ -1419,20 +1447,20 @@ }, "tornado": { "hashes": [ - "sha256:05615096845cf50a895026f749195bf0b10b8909f9be672f50b0fe69cba368e4", - "sha256:0c325e66c8123c606eea33084976c832aa4e766b7dff8aedd7587ea44a604cdf", - "sha256:29e71c847a35f6e10ca3b5c2990a52ce38b233019d8e858b755ea6ce4dcdd19d", - "sha256:4b927c4f19b71e627b13f3db2324e4ae660527143f9e1f2e2fb404f3a187e2ba", - "sha256:5b17b1cf5f8354efa3d37c6e28fdfd9c1c1e5122f2cb56dac121ac61baa47cbe", - "sha256:6a0848f1aea0d196a7c4f6772197cbe2abc4266f836b0aac76947872cd29b411", - "sha256:7efcbcc30b7c654eb6a8c9c9da787a851c18f8ccd4a5a3a95b05c7accfa068d2", - "sha256:834ae7540ad3a83199a8da8f9f2d383e3c3d5130a328889e4cc991acc81e87a0", - "sha256:b46a6ab20f5c7c1cb949c72c1994a4585d2eaa0be4853f50a03b5031e964fc7c", - "sha256:c2de14066c4a38b4ecbbcd55c5cc4b5340eb04f1c5e81da7451ef555859c833f", - "sha256:c367ab6c0393d71171123ca5515c61ff62fe09024fa6bf299cd1339dc9456829" + "sha256:1bd19ca6c16882e4d37368e0152f99c099bad93e0950ce55e71daed74045908f", + "sha256:22d3c2fa10b5793da13c807e6fc38ff49a4f6e1e3868b0a6f4164768bb8e20f5", + "sha256:502fba735c84450974fec147340016ad928d29f1e91f49be168c0a4c18181e1d", + "sha256:65ceca9500383fbdf33a98c0087cb975b2ef3bfb874cb35b8de8740cf7f41bd3", + "sha256:71a8db65160a3c55d61839b7302a9a400074c9c753040455494e2af74e2501f2", + "sha256:7ac51f42808cca9b3613f51ffe2a965c8525cb1b00b7b2d56828b8045354f76a", + "sha256:7d01abc57ea0dbb51ddfed477dfe22719d376119844e33c661d873bf9c0e4a16", + "sha256:805d507b1f588320c26f7f097108eb4023bbaa984d63176d1652e184ba24270a", + "sha256:9dc4444c0defcd3929d5c1eb5706cbe1b116e762ff3e0deca8b715d14bf6ec17", + "sha256:ceb917a50cd35882b57600709dd5421a418c29ddc852da8bcdab1f0db33406b0", + "sha256:e7d8db41c0181c80d76c982aacc442c0783a2c54d6400fe028954201a2e032fe" ], "markers": "python_version >= '3.8'", - "version": "==6.3.2" + "version": "==6.3.3" }, "traitlets": { "hashes": [ diff --git a/cogs/cookie_setting/cog.py b/cogs/cookie_setting/cog.py index 96787d5..46a7039 100644 --- a/cogs/cookie_setting/cog.py +++ b/cogs/cookie_setting/cog.py @@ -31,7 +31,7 @@ async def slash_cookie(self, interaction: discord.Interaction, option: int): "**3.** 如下圖,在網址列輸入 `java`,然後貼上程式碼\n" "**4.** 按 Enter,網頁會變成顯示你的 Cookie,全選然後複製\n" f"**5.** 在這裡使用指令 {get_app_command_mention('cookie設定')} 提交已取得的Cookie\n" - ". 遇到問題嗎?點 [教學連結](https://bit.ly/3LgQkg0) 查看其他方法\n", + ". 遇到登入問題嗎?點 [教學連結](https://hackmd.io/66fq-6NsT1Kqxqbpkj1xTA) 查看解決方法\n", title="原神小幫手 | 取得Cookie說明", ) embed.set_image(url="https://i.imgur.com/OQ8arx0.gif") diff --git a/cogs/cookie_setting/ui.py b/cogs/cookie_setting/ui.py index 0571822..ebb299b 100644 --- a/cogs/cookie_setting/ui.py +++ b/cogs/cookie_setting/ui.py @@ -34,11 +34,29 @@ class CookieModal(discord.ui.Modal, title="提交Cookie"): label="Cookie", placeholder='請貼上從網頁上取得的Cookie,取得方式請使用指令 "/cookie設定 顯示說明如何取得Cookie"', style=discord.TextStyle.long, - required=True, + required=False, min_length=50, max_length=2000, ) + ltuid_v2: discord.ui.TextInput[discord.ui.Modal] = discord.ui.TextInput( + label="ltuid_v2", + placeholder="請貼上取得的 ltuid_v2", + style=discord.TextStyle.short, + required=False, + min_length=5, + max_length=20, + ) + + ltoken_v2: discord.ui.TextInput[discord.ui.Modal] = discord.ui.TextInput( + label="ltoken_v2", + placeholder="請貼上取得的 ltoken_v2", + style=discord.TextStyle.short, + required=False, + min_length=30, + max_length=150, + ) + def __init__(self, games: list[genshin.Game]): self.games: list[genshin.Game] = games super().__init__() @@ -47,16 +65,36 @@ async def on_submit(self, interaction: discord.Interaction): await interaction.response.send_message( embed=EmbedTemplate.normal("設定中,請稍後..."), ephemeral=True ) + + # 將 ltuid_v2 和 ltoken_v2 附加到 cookie 中 + v2_str = "" + cookie = self.cookie.value + if len(self.ltoken_v2.value) > 0: + # 檢測 cookie 是否為 v2 版本 + if self.ltoken_v2.value.startswith("v2"): + v2_str = "_v2" + cookie += f" ltoken{v2_str}={self.ltoken_v2.value};" + if len(self.ltuid_v2.value) > 0: + if self.ltuid_v2.value.isdigit() is True: + cookie += f" ltuid{v2_str}={self.ltuid_v2.value};" + else: # ltuid_v2 不是數字,可能是 ltmid_v2 + cookie += f" ltmid_v2={self.ltuid_v2.value};" + LOG.Info(f"設定 {LOG.User(interaction.user)} 的Cookie:{self.cookie.value}") try: - cookie = await self._trim_cookies(self.cookie.value) - if cookie is None: + trimmed_cookie = await self._trim_cookies(cookie) + if trimmed_cookie is None: raise Exception( f"錯誤或無效的Cookie,請重新輸入(使用 {get_app_command_mention('cookie設定')} 顯示說明)" ) - msg = await genshin_py.set_cookie(interaction.user.id, cookie, self.games) + msg = await genshin_py.set_cookie(interaction.user.id, trimmed_cookie, self.games) except Exception as e: - await interaction.edit_original_response(embed=EmbedTemplate.error(e)) + embed = EmbedTemplate.error(e) + if embed.description is not None: + embed.description += ( + "點 [>>教學連結<<](https://hackmd.io/66fq-6NsT1Kqxqbpkj1xTA) 查看解決方法\n" + ) + await interaction.edit_original_response(embed=embed) else: await interaction.edit_original_response(embed=EmbedTemplate.normal(msg)) diff --git a/cogs/daily_checkin/cog.py b/cogs/daily_checkin/cog.py index e406194..1c742ac 100644 --- a/cogs/daily_checkin/cog.py +++ b/cogs/daily_checkin/cog.py @@ -47,6 +47,9 @@ async def slash_daily( } _user = user or interaction.user + if _user.id == self.bot.application_id: + _user = interaction.user + defer, result = await asyncio.gather( interaction.response.defer(ephemeral=(is_geetest == "是")), genshin_py.claim_daily_reward(_user.id, **choice), diff --git a/cogs/schedule/ui.py b/cogs/schedule/ui.py index f381f73..a34b14e 100644 --- a/cogs/schedule/ui.py +++ b/cogs/schedule/ui.py @@ -106,18 +106,18 @@ def _str_to_int(self, value: str) -> int | None: return int(value) if len(value) > 0 else None @overload - def _to_msg(self, title: str, value: int | None) -> str: + def _to_msg(self, title: str, value: int | None, date_frequency: str = "每天") -> str: ... @overload - def _to_msg(self, title: str, value: datetime | None) -> str: + def _to_msg(self, title: str, value: datetime | None, date_frequency: str = "每天") -> str: ... - def _to_msg(self, title: str, value: int | datetime | None) -> str: + def _to_msg(self, title: str, value: int | datetime | None, date_frequency: str = "每天") -> str: if value is None: return "" if isinstance(value, datetime): - return f". {title}:每天 {value.strftime('%H:%M')} 檢查\n" + return f". {title}:{date_frequency} {value.strftime('%H:%M')} 檢查\n" if value == 0: return f". {title}:當完成時提醒\n" else: @@ -263,6 +263,20 @@ class StarrailCheckNotesThresholdModal(BaseNotesThresholdModal, title="設定星 max_length=4, min_length=4, ) + universe: discord.ui.TextInput[discord.ui.Modal] = discord.ui.TextInput( + label="模擬宇宙:設定每周日幾點提醒本周的模擬宇宙還未完成 (不填表示不提醒)", + placeholder="請輸入一個介於 0000~2359 的數,例如 0200、2135", + required=False, + max_length=4, + min_length=4, + ) + echoofwar: discord.ui.TextInput[discord.ui.Modal] = discord.ui.TextInput( + label="歷戰餘響:設定每周日幾點提醒本周的歷戰餘響還未完成 (不填表示不提醒)", + placeholder="請輸入一個介於 0000~2359 的數,例如 0200、2135", + required=False, + max_length=4, + min_length=4, + ) def __init__(self, user_setting: StarrailScheduleNotes | None = None): """設定表單預設值;若使用者在資料庫已有設定值,則帶入表單預設值""" @@ -278,6 +292,16 @@ def __init__(self, user_setting: StarrailScheduleNotes | None = None): if user_setting.check_daily_training_time else None ) + self.universe.default = ( + user_setting.check_universe_time.strftime("%H%M") + if user_setting.check_universe_time + else None + ) + self.echoofwar.default = ( + user_setting.check_echoofwar_time.strftime("%H%M") + if user_setting.check_echoofwar_time + else None + ) super().__init__() async def on_submit(self, interaction: discord.Interaction) -> None: @@ -285,14 +309,23 @@ async def on_submit(self, interaction: discord.Interaction) -> None: power = self._str_to_int(self.power.value) expedition = self._str_to_int(self.expedition.value) dailytraining = self._str_to_int(self.dailytraining.value) + universe = self._str_to_int(self.universe.value) + echoofwar = self._str_to_int(self.echoofwar.value) # 檢查數字範圍 - if power is None and expedition is None and dailytraining is None: + if ( + power is None + and expedition is None + and dailytraining is None + and universe is None + and echoofwar is None + ): raise ValueError() if (isinstance(power, int) and not (0 <= power <= 8)) or ( isinstance(expedition, int) and not (0 <= expedition <= 5) ): raise ValueError() + dailytraining_time: datetime | None = None if isinstance(dailytraining, int): _time = time(dailytraining // 100, dailytraining % 100) @@ -301,6 +334,25 @@ async def on_submit(self, interaction: discord.Interaction) -> None: # 當今天已經超過設定的時間,則將檢查時間設為明日 if dailytraining_time < datetime.now(): dailytraining_time += timedelta(days=1) + + universe_time: datetime | None = None + echoofwar_time: datetime | None = None + if isinstance(universe, int) or isinstance(echoofwar, int): + # 取得本周日的日期 + _date = date.today() + timedelta(days=6 - date.today().weekday()) + if isinstance(universe, int): + universe_time = datetime.combine(_date, time(universe // 100, universe % 100)) + # 當今天已經超過設定的時間,則將檢查時間設為下周日 + if universe_time < datetime.now(): + universe_time += timedelta(days=7) + if isinstance(echoofwar, int): + echoofwar_time = datetime.combine( + _date, time(echoofwar // 100, echoofwar % 100) + ) + # 當今天已經超過設定的時間,則將檢查時間設為下周日 + if echoofwar_time < datetime.now(): + echoofwar_time += timedelta(days=7) + except Exception: await interaction.response.send_message( embed=EmbedTemplate.error("輸入數值有誤,請確認輸入的數值為整數且在規定範圍內"), @@ -315,6 +367,8 @@ async def on_submit(self, interaction: discord.Interaction) -> None: threshold_power=power, threshold_expedition=expedition, check_daily_training_time=dailytraining_time, + check_universe_time=universe_time, + check_echoofwar_time=echoofwar_time, ) ) await interaction.response.send_message( @@ -323,5 +377,7 @@ async def on_submit(self, interaction: discord.Interaction) -> None: f"{self._to_msg('開拓力 ', power)}" f"{self._to_msg('委託執行', expedition)}" f"{self._to_msg('每日實訓', dailytraining_time)}" + f"{self._to_msg('模擬宇宙', universe_time, '周日')}" + f"{self._to_msg('歷戰餘響', echoofwar_time, '周日')}" ) ) diff --git "a/database/alembic/versions/ff5dbf6e00bb_\345\242\236\345\212\240\346\230\237\351\220\265\345\215\263\346\231\202\344\276\277\347\256\213\346\252\242\346\237\245\351\240\205\347\233\256_\346\250\241\346\223\254\345\256\207\345\256\231_\346\255\267\346\210\260\351\244\230\351\237\277.py" "b/database/alembic/versions/ff5dbf6e00bb_\345\242\236\345\212\240\346\230\237\351\220\265\345\215\263\346\231\202\344\276\277\347\256\213\346\252\242\346\237\245\351\240\205\347\233\256_\346\250\241\346\223\254\345\256\207\345\256\231_\346\255\267\346\210\260\351\244\230\351\237\277.py" new file mode 100644 index 0000000..beeffc8 --- /dev/null +++ "b/database/alembic/versions/ff5dbf6e00bb_\345\242\236\345\212\240\346\230\237\351\220\265\345\215\263\346\231\202\344\276\277\347\256\213\346\252\242\346\237\245\351\240\205\347\233\256_\346\250\241\346\223\254\345\256\207\345\256\231_\346\255\267\346\210\260\351\244\230\351\237\277.py" @@ -0,0 +1,36 @@ +"""增加星鐵即時便箋檢查項目: 模擬宇宙、歷戰餘響 + +Revision ID: ff5dbf6e00bb +Revises: ab959d5054b5 +Create Date: 2023-09-02 11:02:56.565028 + +""" +import sqlalchemy as sa +from alembic import op + +# revision identifiers, used by Alembic. +revision = "ff5dbf6e00bb" +down_revision = "ab959d5054b5" +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.add_column( + "starrail_schedule_notes", sa.Column("check_universe_time", sa.DateTime(), nullable=True) + ) + op.add_column( + "starrail_schedule_notes", sa.Column("check_echoofwar_time", sa.DateTime(), nullable=True) + ) + + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table("starrail_schedule_notes", schema=None) as batch_op: + batch_op.drop_column("check_echoofwar_time") + batch_op.drop_column("check_universe_time") + + # ### end Alembic commands ### diff --git a/database/models.py b/database/models.py index b26a0c8..0a57e93 100644 --- a/database/models.py +++ b/database/models.py @@ -232,6 +232,10 @@ class StarrailScheduleNotes(Base): """全部委託完成之前幾小時發送提醒""" check_daily_training_time: Mapped[datetime.datetime | None] = mapped_column(default=None) """下次檢查今天的每日實訓還未完成的時間""" + check_universe_time: Mapped[datetime.datetime | None] = mapped_column(default=None) + """下次檢查本周的模擬宇宙還未完成的時間""" + check_echoofwar_time: Mapped[datetime.datetime | None] = mapped_column(default=None) + """下次檢查本周的歷戰餘響還未完成的時間""" class StarrailShowcase(Base): diff --git a/genshin_db/models/characters.py b/genshin_db/models/characters.py index 61796d1..6ae835c 100644 --- a/genshin_db/models/characters.py +++ b/genshin_db/models/characters.py @@ -63,7 +63,7 @@ class Character(GenshinDbBase): character_voice: CharacterVoice = Field(alias="cv") ascend_costs: AscendCosts = Field(alias="costs") """突破所需素材""" - images: Images + images: Optional[Images] = None version: str """新增至遊戲當時的版本號碼""" diff --git a/genshin_db/parsers.py b/genshin_db/parsers.py index 6f525fc..38d5e95 100644 --- a/genshin_db/parsers.py +++ b/genshin_db/parsers.py @@ -161,9 +161,10 @@ def parse_character(cls, character: Character) -> discord.Embed: embed = EmbedTemplate.normal( character.description, title=f"★{character.rarity} {character.name}" ) - embed.set_thumbnail(url=character.images.icon_url) - if character.images.cover1_url is not None: - embed.set_image(url=character.images.cover1_url) + if character.images is not None: + embed.set_thumbnail(url=character.images.icon_url) + if character.images.cover1_url is not None: + embed.set_image(url=character.images.cover1_url) embed.add_field( name="屬性", diff --git a/genshin_py/auto_task/realtime_notes/starrail.py b/genshin_py/auto_task/realtime_notes/starrail.py index d2ea416..07031a4 100644 --- a/genshin_py/auto_task/realtime_notes/starrail.py +++ b/genshin_py/auto_task/realtime_notes/starrail.py @@ -58,6 +58,24 @@ async def check_threshold(user: StarrailScheduleNotes, notes: genshin.models.Sta # 下次檢查時間為今天+1天,並更新至資料庫 user.check_daily_training_time += timedelta(days=1) next_check_time.append(user.check_daily_training_time) + # 檢查模擬宇宙 + if isinstance(user.check_universe_time, datetime): + # 當現在時間已超過設定的檢查時間 + if datetime.now() >= user.check_universe_time: + if notes.current_rogue_score < notes.max_rogue_score: + msg += "本周的模擬宇宙還未完成!" + # 下次檢查時間為下一周,並更新至資料庫 + user.check_universe_time += timedelta(weeks=1) + next_check_time.append(user.check_universe_time) + # 檢查歷戰餘響 + if isinstance(user.check_echoofwar_time, datetime): + # 當現在時間已超過設定的檢查時間 + if datetime.now() >= user.check_echoofwar_time: + if notes.remaining_weekly_discounts > 0: + msg += "本周的歷戰餘響還未完成!" + # 下次檢查時間為下一周,並更新至資料庫 + user.check_echoofwar_time += timedelta(weeks=1) + next_check_time.append(user.check_echoofwar_time) # 設定下次檢查時間,從上面設定的時間中取最小的值 check_time = min(next_check_time) diff --git a/genshin_py/draw.py b/genshin_py/draw.py index a71dd63..10ad46f 100644 --- a/genshin_py/draw.py +++ b/genshin_py/draw.py @@ -55,7 +55,7 @@ def draw_basic_card( draw_avatar(img, avatar, (70, 210)) draw_rounded_rect(img, (340, 270, 990, 460), radius=30, fill=(0, 0, 0, 120)) - draw_rounded_rect(img, (90, 520, 990, 1730), radius=30, fill=(0, 0, 0, 120)) + draw_rounded_rect(img, (90, 520, 990, 1810), radius=30, fill=(0, 0, 0, 120)) info = user_stats.info draw_text( @@ -102,6 +102,7 @@ def draw_record_card( (s.geoculi, "岩神瞳"), (s.electroculi, "雷神瞳"), (s.dendroculi, "草神瞳"), + (s.hydroculi, "水神瞳"), (s.unlocked_waypoints, "解鎖傳送點"), (s.unlocked_domains, "解鎖秘境"), (s.spiral_abyss, "深境螺旋"), @@ -117,7 +118,7 @@ def draw_record_card( row = int(n / 3) draw_text( img, - (245 + column * 295, 630 + row * 230), + (245 + column * 295, 630 + row * 200), str(stat[0]), "SourceHanSansTC-Bold.otf", 80, @@ -126,7 +127,7 @@ def draw_record_card( ) draw_text( img, - (245 + column * 295, 700 + row * 230), + (245 + column * 295, 700 + row * 200), str(stat[1]), "SourceHanSansTC-Regular.otf", 40, @@ -168,9 +169,12 @@ def draw_exploration_card( ["層岩·表", 0], ["層岩·底", 0], ["須彌", 0], + ["楓丹", 0], ] - offering_list = [["忍冬之樹", 0], ["神櫻眷顧", 0], ["流明石", 0], ["夢之樹", 0]] + offering_list = [["忍冬之樹", 0], ["神櫻眷顧", 0], ["流明石", 0], ["夢之樹", 0], ["露景泉", 0]] for e in user_stats.explorations: + if e.id > len(explored_list): + continue explored_list[e.id - 1][1] = e.explored if e.id == 3 and len(e.offerings) >= 1: @@ -181,6 +185,8 @@ def draw_exploration_card( offering_list[2][1] = e.offerings[0].level if e.id == 8 and len(e.offerings) >= 2: offering_list[3][1] = e.offerings[0].level + if e.id == 9 and len(e.offerings) >= 2: + offering_list[4][1] = e.offerings[0].level stat_list: List[Tuple[str, float, str]] = [] for e in explored_list: @@ -193,7 +199,7 @@ def draw_exploration_card( row = int(n / 3) draw_text( img, - (245 + column * 295, 620 + row * 270), + (245 + column * 295, 590 + row * 250), stat[0], "SourceHanSansTC-Regular.otf", 41, @@ -202,7 +208,7 @@ def draw_exploration_card( ) draw_text( img, - (245 + column * 295, 691 + row * 270), + (245 + column * 295, 661 + row * 250), f"{stat[1]:g}", "SourceHanSansTC-Bold.otf", 82, @@ -211,7 +217,7 @@ def draw_exploration_card( ) draw_text( img, - (245 + column * 295, 770 + row * 270), + (245 + column * 295, 740 + row * 250), stat[2], "SourceHanSansTC-Regular.otf", 45, diff --git a/genshin_py/parser/starrail.py b/genshin_py/parser/starrail.py index c0375fa..ab232a1 100644 --- a/genshin_py/parser/starrail.py +++ b/genshin_py/parser/starrail.py @@ -50,12 +50,13 @@ async def parse_starrail_notes( exped_title = f"委託執行:{exped_finished}/{len(notes.expeditions)}" - # 根據開拓力數量,以 90 作分界,embed 顏色從綠色 (0x28c828) 漸變到黃色 (0xc8c828),再漸變到紅色 (0xc82828) + # 根據開拓力數量,以一半作分界,embed 顏色從綠色 (0x28c828) 漸變到黃色 (0xc8c828),再漸變到紅色 (0xc82828) stamina = notes.current_stamina + max_half = notes.max_stamina / 2 color = ( - 0x28C828 + 0x010000 * int(0xA0 * stamina / 90) - if stamina < 90 - else 0xC8C828 - 0x000100 * int(0xA0 * (stamina - 90) / 90) + 0x28C828 + 0x010000 * int(0xA0 * stamina / max_half) + if stamina < max_half + else 0xC8C828 - 0x000100 * int(0xA0 * (stamina - max_half) / max_half) ) embed = discord.Embed(color=color) @@ -98,7 +99,7 @@ def parse_starrail_character(character: genshin.models.StarRailDetailCharacter) if character.equip: lightcone = character.equip embed.add_field( - name=f"光追:{lightcone.name}", + name=f"光錐:{lightcone.name}", inline=True, value=f"疊影:{lightcone.rank} 階\n等級:Lv. {lightcone.level}", )