diff --git a/.gitignore b/.gitignore index fffe7704..a7da8b8a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,11 @@ *_internal* talemate_env chroma -scenes config.yaml -!scenes/infinity-quest/assets +scenes/ +!scenes/infinity-quest-dynamic-scenario/ +!scenes/infinity-quest-dynamic-scenario/assets/ +!scenes/infinity-quest-dynamic-scenario/templates/ +!scenes/infinity-quest-dynamic-scenario/infinity-quest.json +!scenes/infinity-quest/assets/ !scenes/infinity-quest/infinity-quest.json diff --git a/README.md b/README.md index d442d62b..349e5794 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,9 @@ Allows you to play roleplay scenarios with large language models. -|![Screenshot 1](docs/img/Screenshot_9.png)|![Screenshot 2](docs/img/Screenshot_2.png)| +|![Screenshot 1](docs/img/0.17.0/ss-1.png)|![Screenshot 2](docs/img/0.17.0/ss-2.png)| +|------------------------------------------|------------------------------------------| +|![Screenshot 1](docs/img/0.17.0/ss-4.png)|![Screenshot 2](docs/img/0.17.0/ss-3.png)| |------------------------------------------|------------------------------------------| > :warning: **It does not run any large language models itself but relies on existing APIs. Currently supports OpenAI, text-generation-webui and LMStudio.** @@ -31,10 +33,15 @@ This means you need to either have: - chromadb integration - passage of time - narrative world state + - Automatically keep track and reinforce selected character and world truths / states. - narrative tools - creative tools - AI backed character creation with template support (jinja2) - AI backed scenario creation +- context managegement + - Manage character details and attributes + - Manage world information / past events + - Pin important information to the context (Manually or conditionally through AI) - runpod integration - overridable templates for all prompts. (jinja2) @@ -51,14 +58,14 @@ In no particular order: - Dynamic player choice generation - Better creative tools - node based scenario / character creation -- Improved and consistent long term memory +- Improved and consistent long term memory and accurate current state of the world - Improved director agent - Right now this doesn't really work well on anything but GPT-4 (and even there it's debatable). It tends to steer the story in a way that introduces pacing issues. It needs a model that is creative but also reasons really well i think. - Gameplay loop governed by AI - objectives - quests - win / lose conditions -- Automatic1111 client for in place visual generation +- stable-diffusion client for in place visual generation # Quickstart diff --git a/config.example.yaml b/config.example.yaml index 333bdc2e..c54a3fea 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -2,12 +2,45 @@ agents: {} clients: {} creator: content_context: - - a fun and engaging slice of life story aimed at an adult audience. - - a terrifying horror story aimed at an adult audience. - - a thrilling action story aimed at an adult audience. - - a mysterious adventure aimed at an adult audience. - - an epic sci-fi adventure aimed at an adult audience. -game: {} + - a fun and engaging slice of life story + - a terrifying horror story + - a thrilling action story + - a mysterious adventure + - an epic sci-fi adventure +game: + world_state: + templates: + state_reinforcement: + Goals: + auto_create: false + description: Long term and short term goals + favorite: true + insert: conversation-context + instructions: Create a long term goal and two short term goals for {character_name}. Your response must only be the long terms and two short term goals. + interval: 20 + name: Goals + query: Goals + state_type: npc + Physical Health: + auto_create: false + description: Keep track of health. + favorite: true + insert: sequential + instructions: '' + interval: 10 + name: Physical Health + query: What is {character_name}'s current physical health status? + state_type: character + Time of day: + auto_create: false + description: Track night / day cycle + favorite: true + insert: sequential + instructions: '' + interval: 10 + name: Time of day + query: What is the current time of day? + state_type: world ## Long-term memory diff --git a/docs/img/0.17.0/ss-1.png b/docs/img/0.17.0/ss-1.png new file mode 100644 index 00000000..5cca1b37 Binary files /dev/null and b/docs/img/0.17.0/ss-1.png differ diff --git a/docs/img/0.17.0/ss-2.png b/docs/img/0.17.0/ss-2.png new file mode 100644 index 00000000..08745a66 Binary files /dev/null and b/docs/img/0.17.0/ss-2.png differ diff --git a/docs/img/0.17.0/ss-3.png b/docs/img/0.17.0/ss-3.png new file mode 100644 index 00000000..9a211891 Binary files /dev/null and b/docs/img/0.17.0/ss-3.png differ diff --git a/docs/img/0.17.0/ss-4.png b/docs/img/0.17.0/ss-4.png new file mode 100644 index 00000000..3e78cb6b Binary files /dev/null and b/docs/img/0.17.0/ss-4.png differ diff --git a/poetry.lock b/poetry.lock index 6bf7709d..2ad20fa6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,5 +1,19 @@ # This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. +[[package]] +name = "aiodns" +version = "3.1.1" +description = "Simple DNS resolver for asyncio" +optional = false +python-versions = "*" +files = [ + {file = "aiodns-3.1.1-py3-none-any.whl", hash = "sha256:a387b63da4ced6aad35b1dda2d09620ad608a1c7c0fb71efa07ebb4cd511928d"}, + {file = "aiodns-3.1.1.tar.gz", hash = "sha256:1073eac48185f7a4150cad7f96a5192d6911f12b4fb894de80a088508c9b3a99"}, +] + +[package.dependencies] +pycares = ">=4.0.0" + [[package]] name = "aiohttp" version = "3.9.1" @@ -86,9 +100,12 @@ files = [ ] [package.dependencies] +aiodns = {version = "*", optional = true, markers = "(sys_platform == \"linux\" or sys_platform == \"darwin\") and extra == \"speedups\""} aiosignal = ">=1.1.2" async-timeout = {version = ">=4.0,<5.0", markers = "python_version < \"3.11\""} attrs = ">=17.3.0" +Brotli = {version = "*", optional = true, markers = "platform_python_implementation == \"CPython\" and extra == \"speedups\""} +brotlicffi = {version = "*", optional = true, markers = "platform_python_implementation != \"CPython\" and extra == \"speedups\""} frozenlist = ">=1.1.1" multidict = ">=4.5,<7.0" yarl = ">=1.0,<2.0" @@ -137,24 +154,25 @@ files = [ [[package]] name = "anyio" -version = "3.7.1" +version = "4.2.0" description = "High level compatibility layer for multiple asynchronous event loop implementations" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "anyio-3.7.1-py3-none-any.whl", hash = "sha256:91dee416e570e92c64041bd18b900d1d6fa78dff7048769ce5ac5ddad004fbb5"}, - {file = "anyio-3.7.1.tar.gz", hash = "sha256:44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780"}, + {file = "anyio-4.2.0-py3-none-any.whl", hash = "sha256:745843b39e829e108e518c489b31dc757de7d2131d53fac32bd8df268227bfee"}, + {file = "anyio-4.2.0.tar.gz", hash = "sha256:e1875bb4b4e2de1669f4bc7869b6d3f54231cdced71605e6e64c9be77e3be50f"}, ] [package.dependencies] -exceptiongroup = {version = "*", markers = "python_version < \"3.11\""} +exceptiongroup = {version = ">=1.0.2", markers = "python_version < \"3.11\""} idna = ">=2.8" sniffio = ">=1.1" +typing-extensions = {version = ">=4.1", markers = "python_version < \"3.11\""} [package.extras] -doc = ["Sphinx", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme (>=1.2.2)", "sphinxcontrib-jquery"] -test = ["anyio[trio]", "coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "mock (>=4)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] -trio = ["trio (<0.22)"] +doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"] +test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] +trio = ["trio (>=0.23)"] [[package]] name = "asgiref" @@ -215,21 +233,22 @@ files = [ [[package]] name = "attrs" -version = "23.1.0" +version = "23.2.0" description = "Classes Without Boilerplate" optional = false python-versions = ">=3.7" files = [ - {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"}, - {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"}, + {file = "attrs-23.2.0-py3-none-any.whl", hash = "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"}, + {file = "attrs-23.2.0.tar.gz", hash = "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"}, ] [package.extras] cov = ["attrs[tests]", "coverage[toml] (>=5.3)"] -dev = ["attrs[docs,tests]", "pre-commit"] +dev = ["attrs[tests]", "pre-commit"] docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"] tests = ["attrs[tests-no-zope]", "zope-interface"] -tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] +tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"] +tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"] [[package]] name = "backoff" @@ -244,28 +263,38 @@ files = [ [[package]] name = "bcrypt" -version = "4.1.1" +version = "4.1.2" description = "Modern password hashing for your software and your servers" optional = false python-versions = ">=3.7" files = [ - {file = "bcrypt-4.1.1-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:196008d91201bbb1aa4e666fee5e610face25d532e433a560cabb33bfdff958b"}, - {file = "bcrypt-4.1.1-cp37-abi3-macosx_13_0_universal2.whl", hash = "sha256:2e197534c884336f9020c1f3a8efbaab0aa96fc798068cb2da9c671818b7fbb0"}, - {file = "bcrypt-4.1.1-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d573885b637815a7f3a3cd5f87724d7d0822da64b0ab0aa7f7c78bae534e86dc"}, - {file = "bcrypt-4.1.1-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bab33473f973e8058d1b2df8d6e095d237c49fbf7a02b527541a86a5d1dc4444"}, - {file = "bcrypt-4.1.1-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:fb931cd004a7ad36a89789caf18a54c20287ec1cd62161265344b9c4554fdb2e"}, - {file = "bcrypt-4.1.1-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:12f40f78dcba4aa7d1354d35acf45fae9488862a4fb695c7eeda5ace6aae273f"}, - {file = "bcrypt-4.1.1-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:2ade10e8613a3b8446214846d3ddbd56cfe9205a7d64742f0b75458c868f7492"}, - {file = "bcrypt-4.1.1-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:f33b385c3e80b5a26b3a5e148e6165f873c1c202423570fdf45fe34e00e5f3e5"}, - {file = "bcrypt-4.1.1-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:755b9d27abcab678e0b8fb4d0abdebeea1f68dd1183b3f518bad8d31fa77d8be"}, - {file = "bcrypt-4.1.1-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a7a7b8a87e51e5e8ca85b9fdaf3a5dc7aaf123365a09be7a27883d54b9a0c403"}, - {file = "bcrypt-4.1.1-cp37-abi3-win32.whl", hash = "sha256:3d6c4e0d6963c52f8142cdea428e875042e7ce8c84812d8e5507bd1e42534e07"}, - {file = "bcrypt-4.1.1-cp37-abi3-win_amd64.whl", hash = "sha256:14d41933510717f98aac63378b7956bbe548986e435df173c841d7f2bd0b2de7"}, - {file = "bcrypt-4.1.1-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:24c2ebd287b5b11016f31d506ca1052d068c3f9dc817160628504690376ff050"}, - {file = "bcrypt-4.1.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:476aa8e8aca554260159d4c7a97d6be529c8e177dbc1d443cb6b471e24e82c74"}, - {file = "bcrypt-4.1.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:12611c4b0a8b1c461646228344784a1089bc0c49975680a2f54f516e71e9b79e"}, - {file = "bcrypt-4.1.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c6450538a0fc32fb7ce4c6d511448c54c4ff7640b2ed81badf9898dcb9e5b737"}, - {file = "bcrypt-4.1.1.tar.gz", hash = "sha256:df37f5418d4f1cdcff845f60e747a015389fa4e63703c918330865e06ad80007"}, + {file = "bcrypt-4.1.2-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:ac621c093edb28200728a9cca214d7e838529e557027ef0581685909acd28b5e"}, + {file = "bcrypt-4.1.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea505c97a5c465ab8c3ba75c0805a102ce526695cd6818c6de3b1a38f6f60da1"}, + {file = "bcrypt-4.1.2-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:57fa9442758da926ed33a91644649d3e340a71e2d0a5a8de064fb621fd5a3326"}, + {file = "bcrypt-4.1.2-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:eb3bd3321517916696233b5e0c67fd7d6281f0ef48e66812db35fc963a422a1c"}, + {file = "bcrypt-4.1.2-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:6cad43d8c63f34b26aef462b6f5e44fdcf9860b723d2453b5d391258c4c8e966"}, + {file = "bcrypt-4.1.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:44290ccc827d3a24604f2c8bcd00d0da349e336e6503656cb8192133e27335e2"}, + {file = "bcrypt-4.1.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:732b3920a08eacf12f93e6b04ea276c489f1c8fb49344f564cca2adb663b3e4c"}, + {file = "bcrypt-4.1.2-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1c28973decf4e0e69cee78c68e30a523be441972c826703bb93099868a8ff5b5"}, + {file = "bcrypt-4.1.2-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b8df79979c5bae07f1db22dcc49cc5bccf08a0380ca5c6f391cbb5790355c0b0"}, + {file = "bcrypt-4.1.2-cp37-abi3-win32.whl", hash = "sha256:fbe188b878313d01b7718390f31528be4010fed1faa798c5a1d0469c9c48c369"}, + {file = "bcrypt-4.1.2-cp37-abi3-win_amd64.whl", hash = "sha256:9800ae5bd5077b13725e2e3934aa3c9c37e49d3ea3d06318010aa40f54c63551"}, + {file = "bcrypt-4.1.2-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:71b8be82bc46cedd61a9f4ccb6c1a493211d031415a34adde3669ee1b0afbb63"}, + {file = "bcrypt-4.1.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e3c6642077b0c8092580c819c1684161262b2e30c4f45deb000c38947bf483"}, + {file = "bcrypt-4.1.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:387e7e1af9a4dd636b9505a465032f2f5cb8e61ba1120e79a0e1cd0b512f3dfc"}, + {file = "bcrypt-4.1.2-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:f70d9c61f9c4ca7d57f3bfe88a5ccf62546ffbadf3681bb1e268d9d2e41c91a7"}, + {file = "bcrypt-4.1.2-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2a298db2a8ab20056120b45e86c00a0a5eb50ec4075b6142db35f593b97cb3fb"}, + {file = "bcrypt-4.1.2-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:ba55e40de38a24e2d78d34c2d36d6e864f93e0d79d0b6ce915e4335aa81d01b1"}, + {file = "bcrypt-4.1.2-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:3566a88234e8de2ccae31968127b0ecccbb4cddb629da744165db72b58d88ca4"}, + {file = "bcrypt-4.1.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b90e216dc36864ae7132cb151ffe95155a37a14e0de3a8f64b49655dd959ff9c"}, + {file = "bcrypt-4.1.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:69057b9fc5093ea1ab00dd24ede891f3e5e65bee040395fb1e66ee196f9c9b4a"}, + {file = "bcrypt-4.1.2-cp39-abi3-win32.whl", hash = "sha256:02d9ef8915f72dd6daaef40e0baeef8a017ce624369f09754baf32bb32dba25f"}, + {file = "bcrypt-4.1.2-cp39-abi3-win_amd64.whl", hash = "sha256:be3ab1071662f6065899fe08428e45c16aa36e28bc42921c4901a191fda6ee42"}, + {file = "bcrypt-4.1.2-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d75fc8cd0ba23f97bae88a6ec04e9e5351ff3c6ad06f38fe32ba50cbd0d11946"}, + {file = "bcrypt-4.1.2-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:a97e07e83e3262599434816f631cc4c7ca2aa8e9c072c1b1a7fec2ae809a1d2d"}, + {file = "bcrypt-4.1.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:e51c42750b7585cee7892c2614be0d14107fad9581d1738d954a262556dd1aab"}, + {file = "bcrypt-4.1.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:ba4e4cc26610581a6329b3937e02d319f5ad4b85b074846bf4fef8a8cf51e7bb"}, + {file = "bcrypt-4.1.2.tar.gz", hash = "sha256:33313a1200a3ae90b75587ceac502b048b840fc69e7f7a0905b5f87fac7a1258"}, ] [package.extras] @@ -292,29 +321,33 @@ lxml = ["lxml"] [[package]] name = "black" -version = "23.11.0" +version = "23.12.1" description = "The uncompromising code formatter." optional = false python-versions = ">=3.8" files = [ - {file = "black-23.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911"}, - {file = "black-23.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f"}, - {file = "black-23.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394"}, - {file = "black-23.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f"}, - {file = "black-23.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479"}, - {file = "black-23.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244"}, - {file = "black-23.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221"}, - {file = "black-23.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5"}, - {file = "black-23.11.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187"}, - {file = "black-23.11.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6"}, - {file = "black-23.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b"}, - {file = "black-23.11.0-cp38-cp38-win_amd64.whl", hash = "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142"}, - {file = "black-23.11.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055"}, - {file = "black-23.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4"}, - {file = "black-23.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06"}, - {file = "black-23.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07"}, - {file = "black-23.11.0-py3-none-any.whl", hash = "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e"}, - {file = "black-23.11.0.tar.gz", hash = "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05"}, + {file = "black-23.12.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e0aaf6041986767a5e0ce663c7a2f0e9eaf21e6ff87a5f95cbf3675bfd4c41d2"}, + {file = "black-23.12.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c88b3711d12905b74206227109272673edce0cb29f27e1385f33b0163c414bba"}, + {file = "black-23.12.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a920b569dc6b3472513ba6ddea21f440d4b4c699494d2e972a1753cdc25df7b0"}, + {file = "black-23.12.1-cp310-cp310-win_amd64.whl", hash = "sha256:3fa4be75ef2a6b96ea8d92b1587dd8cb3a35c7e3d51f0738ced0781c3aa3a5a3"}, + {file = "black-23.12.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8d4df77958a622f9b5a4c96edb4b8c0034f8434032ab11077ec6c56ae9f384ba"}, + {file = "black-23.12.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:602cfb1196dc692424c70b6507593a2b29aac0547c1be9a1d1365f0d964c353b"}, + {file = "black-23.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c4352800f14be5b4864016882cdba10755bd50805c95f728011bcb47a4afd59"}, + {file = "black-23.12.1-cp311-cp311-win_amd64.whl", hash = "sha256:0808494f2b2df923ffc5723ed3c7b096bd76341f6213989759287611e9837d50"}, + {file = "black-23.12.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:25e57fd232a6d6ff3f4478a6fd0580838e47c93c83eaf1ccc92d4faf27112c4e"}, + {file = "black-23.12.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2d9e13db441c509a3763a7a3d9a49ccc1b4e974a47be4e08ade2a228876500ec"}, + {file = "black-23.12.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d1bd9c210f8b109b1762ec9fd36592fdd528485aadb3f5849b2740ef17e674e"}, + {file = "black-23.12.1-cp312-cp312-win_amd64.whl", hash = "sha256:ae76c22bde5cbb6bfd211ec343ded2163bba7883c7bc77f6b756a1049436fbb9"}, + {file = "black-23.12.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1fa88a0f74e50e4487477bc0bb900c6781dbddfdfa32691e780bf854c3b4a47f"}, + {file = "black-23.12.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a4d6a9668e45ad99d2f8ec70d5c8c04ef4f32f648ef39048d010b0689832ec6d"}, + {file = "black-23.12.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b18fb2ae6c4bb63eebe5be6bd869ba2f14fd0259bda7d18a46b764d8fb86298a"}, + {file = "black-23.12.1-cp38-cp38-win_amd64.whl", hash = "sha256:c04b6d9d20e9c13f43eee8ea87d44156b8505ca8a3c878773f68b4e4812a421e"}, + {file = "black-23.12.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3e1b38b3135fd4c025c28c55ddfc236b05af657828a8a6abe5deec419a0b7055"}, + {file = "black-23.12.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4f0031eaa7b921db76decd73636ef3a12c942ed367d8c3841a0739412b260a54"}, + {file = "black-23.12.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97e56155c6b737854e60a9ab1c598ff2533d57e7506d97af5481141671abf3ea"}, + {file = "black-23.12.1-cp39-cp39-win_amd64.whl", hash = "sha256:dd15245c8b68fe2b6bd0f32c1556509d11bb33aec9b5d0866dd8e2ed3dba09c2"}, + {file = "black-23.12.1-py3-none-any.whl", hash = "sha256:78baad24af0f033958cad29731e27363183e140962595def56423e626f4bee3e"}, + {file = "black-23.12.1.tar.gz", hash = "sha256:4ce3ef14ebe8d9509188014d96af1c456a910d5b5cbf434a09fef7e024b3d0d5"}, ] [package.dependencies] @@ -328,7 +361,7 @@ typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} [package.extras] colorama = ["colorama (>=0.4.3)"] -d = ["aiohttp (>=3.7.4)"] +d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] uvloop = ["uvloop (>=0.15.2)"] @@ -345,32 +378,32 @@ files = [ [[package]] name = "boto3" -version = "1.33.10" +version = "1.34.19" description = "The AWS SDK for Python" optional = false -python-versions = ">= 3.7" +python-versions = ">= 3.8" files = [ - {file = "boto3-1.33.10-py3-none-any.whl", hash = "sha256:8011445d95499ca9622d8d368ce469d51bc9e82a23b6edd6498f9ae57d69ce9e"}, - {file = "boto3-1.33.10.tar.gz", hash = "sha256:407b26197aced386e7ce2327ca9199b506dcf248220cfb8fc89d06497dd4522b"}, + {file = "boto3-1.34.19-py3-none-any.whl", hash = "sha256:4c76ef92af7dbdcea21b196a2699671e82e8814d4cfe570c48eda477dd1aeb19"}, + {file = "boto3-1.34.19.tar.gz", hash = "sha256:95d2c2bde86a0934d4c461020c50fc1344b444f167654e215f1de549bc77fc0f"}, ] [package.dependencies] -botocore = ">=1.33.10,<1.34.0" +botocore = ">=1.34.19,<1.35.0" jmespath = ">=0.7.1,<2.0.0" -s3transfer = ">=0.8.2,<0.9.0" +s3transfer = ">=0.10.0,<0.11.0" [package.extras] crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.33.10" +version = "1.34.19" description = "Low-level, data-driven core of boto 3." optional = false -python-versions = ">= 3.7" +python-versions = ">= 3.8" files = [ - {file = "botocore-1.33.10-py3-none-any.whl", hash = "sha256:9619609692a7f99f33093a305a0fb88ca5c83104f97ead3a4405b1e4ba6058f9"}, - {file = "botocore-1.33.10.tar.gz", hash = "sha256:82be3da9ceac9d847d115a80f0a0dae020c3534ef88839ef907eb3205309fd4a"}, + {file = "botocore-1.34.19-py3-none-any.whl", hash = "sha256:a4a39c7092960f5da2439efc5f6220730dab634aaff4c1444bbd1dfa43bc28cc"}, + {file = "botocore-1.34.19.tar.gz", hash = "sha256:64352b2f05de5c6ab025c1d5232880c22775356dcc5a53d798a6f65db847e826"}, ] [package.dependencies] @@ -379,7 +412,161 @@ python-dateutil = ">=2.1,<3.0.0" urllib3 = {version = ">=1.25.4,<2.1", markers = "python_version >= \"3.10\""} [package.extras] -crt = ["awscrt (==0.19.17)"] +crt = ["awscrt (==0.19.19)"] + +[[package]] +name = "brotli" +version = "1.1.0" +description = "Python bindings for the Brotli compression library" +optional = false +python-versions = "*" +files = [ + {file = "Brotli-1.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e1140c64812cb9b06c922e77f1c26a75ec5e3f0fb2bf92cc8c58720dec276752"}, + {file = "Brotli-1.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c8fd5270e906eef71d4a8d19b7c6a43760c6abcfcc10c9101d14eb2357418de9"}, + {file = "Brotli-1.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1ae56aca0402a0f9a3431cddda62ad71666ca9d4dc3a10a142b9dce2e3c0cda3"}, + {file = "Brotli-1.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:43ce1b9935bfa1ede40028054d7f48b5469cd02733a365eec8a329ffd342915d"}, + {file = "Brotli-1.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7c4855522edb2e6ae7fdb58e07c3ba9111e7621a8956f481c68d5d979c93032e"}, + {file = "Brotli-1.1.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:38025d9f30cf4634f8309c6874ef871b841eb3c347e90b0851f63d1ded5212da"}, + {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e6a904cb26bfefc2f0a6f240bdf5233be78cd2488900a2f846f3c3ac8489ab80"}, + {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a37b8f0391212d29b3a91a799c8e4a2855e0576911cdfb2515487e30e322253d"}, + {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e84799f09591700a4154154cab9787452925578841a94321d5ee8fb9a9a328f0"}, + {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f66b5337fa213f1da0d9000bc8dc0cb5b896b726eefd9c6046f699b169c41b9e"}, + {file = "Brotli-1.1.0-cp310-cp310-win32.whl", hash = "sha256:be36e3d172dc816333f33520154d708a2657ea63762ec16b62ece02ab5e4daf2"}, + {file = "Brotli-1.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:0c6244521dda65ea562d5a69b9a26120769b7a9fb3db2fe9545935ed6735b128"}, + {file = "Brotli-1.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a3daabb76a78f829cafc365531c972016e4aa8d5b4bf60660ad8ecee19df7ccc"}, + {file = "Brotli-1.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c8146669223164fc87a7e3de9f81e9423c67a79d6b3447994dfb9c95da16e2d6"}, + {file = "Brotli-1.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:30924eb4c57903d5a7526b08ef4a584acc22ab1ffa085faceb521521d2de32dd"}, + {file = "Brotli-1.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ceb64bbc6eac5a140ca649003756940f8d6a7c444a68af170b3187623b43bebf"}, + {file = "Brotli-1.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a469274ad18dc0e4d316eefa616d1d0c2ff9da369af19fa6f3daa4f09671fd61"}, + {file = "Brotli-1.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:524f35912131cc2cabb00edfd8d573b07f2d9f21fa824bd3fb19725a9cf06327"}, + {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:5b3cc074004d968722f51e550b41a27be656ec48f8afaeeb45ebf65b561481dd"}, + {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:19c116e796420b0cee3da1ccec3b764ed2952ccfcc298b55a10e5610ad7885f9"}, + {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:510b5b1bfbe20e1a7b3baf5fed9e9451873559a976c1a78eebaa3b86c57b4265"}, + {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a1fd8a29719ccce974d523580987b7f8229aeace506952fa9ce1d53a033873c8"}, + {file = "Brotli-1.1.0-cp311-cp311-win32.whl", hash = "sha256:39da8adedf6942d76dc3e46653e52df937a3c4d6d18fdc94a7c29d263b1f5b50"}, + {file = "Brotli-1.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:aac0411d20e345dc0920bdec5548e438e999ff68d77564d5e9463a7ca9d3e7b1"}, + {file = "Brotli-1.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:316cc9b17edf613ac76b1f1f305d2a748f1b976b033b049a6ecdfd5612c70409"}, + {file = "Brotli-1.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:caf9ee9a5775f3111642d33b86237b05808dafcd6268faa492250e9b78046eb2"}, + {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:70051525001750221daa10907c77830bc889cb6d865cc0b813d9db7fefc21451"}, + {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f4bf76817c14aa98cc6697ac02f3972cb8c3da93e9ef16b9c66573a68014f91"}, + {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d0c5516f0aed654134a2fc936325cc2e642f8a0e096d075209672eb321cff408"}, + {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c3020404e0b5eefd7c9485ccf8393cfb75ec38ce75586e046573c9dc29967a0"}, + {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4ed11165dd45ce798d99a136808a794a748d5dc38511303239d4e2363c0695dc"}, + {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:4093c631e96fdd49e0377a9c167bfd75b6d0bad2ace734c6eb20b348bc3ea180"}, + {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:7e4c4629ddad63006efa0ef968c8e4751c5868ff0b1c5c40f76524e894c50248"}, + {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:861bf317735688269936f755fa136a99d1ed526883859f86e41a5d43c61d8966"}, + {file = "Brotli-1.1.0-cp312-cp312-win32.whl", hash = "sha256:5f4d5ea15c9382135076d2fb28dde923352fe02951e66935a9efaac8f10e81b0"}, + {file = "Brotli-1.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:906bc3a79de8c4ae5b86d3d75a8b77e44404b0f4261714306e3ad248d8ab0951"}, + {file = "Brotli-1.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:a090ca607cbb6a34b0391776f0cb48062081f5f60ddcce5d11838e67a01928d1"}, + {file = "Brotli-1.1.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2de9d02f5bda03d27ede52e8cfe7b865b066fa49258cbab568720aa5be80a47d"}, + {file = "Brotli-1.1.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2333e30a5e00fe0fe55903c8832e08ee9c3b1382aacf4db26664a16528d51b4b"}, + {file = "Brotli-1.1.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4d4a848d1837973bf0f4b5e54e3bec977d99be36a7895c61abb659301b02c112"}, + {file = "Brotli-1.1.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:fdc3ff3bfccdc6b9cc7c342c03aa2400683f0cb891d46e94b64a197910dc4064"}, + {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:5eeb539606f18a0b232d4ba45adccde4125592f3f636a6182b4a8a436548b914"}, + {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:fd5f17ff8f14003595ab414e45fce13d073e0762394f957182e69035c9f3d7c2"}, + {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:069a121ac97412d1fe506da790b3e69f52254b9df4eb665cd42460c837193354"}, + {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:e93dfc1a1165e385cc8239fab7c036fb2cd8093728cbd85097b284d7b99249a2"}, + {file = "Brotli-1.1.0-cp36-cp36m-win32.whl", hash = "sha256:a599669fd7c47233438a56936988a2478685e74854088ef5293802123b5b2460"}, + {file = "Brotli-1.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d143fd47fad1db3d7c27a1b1d66162e855b5d50a89666af46e1679c496e8e579"}, + {file = "Brotli-1.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:11d00ed0a83fa22d29bc6b64ef636c4552ebafcef57154b4ddd132f5638fbd1c"}, + {file = "Brotli-1.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f733d788519c7e3e71f0855c96618720f5d3d60c3cb829d8bbb722dddce37985"}, + {file = "Brotli-1.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:929811df5462e182b13920da56c6e0284af407d1de637d8e536c5cd00a7daf60"}, + {file = "Brotli-1.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0b63b949ff929fbc2d6d3ce0e924c9b93c9785d877a21a1b678877ffbbc4423a"}, + {file = "Brotli-1.1.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d192f0f30804e55db0d0e0a35d83a9fead0e9a359a9ed0285dbacea60cc10a84"}, + {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:f296c40e23065d0d6650c4aefe7470d2a25fffda489bcc3eb66083f3ac9f6643"}, + {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:919e32f147ae93a09fe064d77d5ebf4e35502a8df75c29fb05788528e330fe74"}, + {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:23032ae55523cc7bccb4f6a0bf368cd25ad9bcdcc1990b64a647e7bbcce9cb5b"}, + {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:224e57f6eac61cc449f498cc5f0e1725ba2071a3d4f48d5d9dffba42db196438"}, + {file = "Brotli-1.1.0-cp37-cp37m-win32.whl", hash = "sha256:587ca6d3cef6e4e868102672d3bd9dc9698c309ba56d41c2b9c85bbb903cdb95"}, + {file = "Brotli-1.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2954c1c23f81c2eaf0b0717d9380bd348578a94161a65b3a2afc62c86467dd68"}, + {file = "Brotli-1.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:efa8b278894b14d6da122a72fefcebc28445f2d3f880ac59d46c90f4c13be9a3"}, + {file = "Brotli-1.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:03d20af184290887bdea3f0f78c4f737d126c74dc2f3ccadf07e54ceca3bf208"}, + {file = "Brotli-1.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6172447e1b368dcbc458925e5ddaf9113477b0ed542df258d84fa28fc45ceea7"}, + {file = "Brotli-1.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a743e5a28af5f70f9c080380a5f908d4d21d40e8f0e0c8901604d15cfa9ba751"}, + {file = "Brotli-1.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0541e747cce78e24ea12d69176f6a7ddb690e62c425e01d31cc065e69ce55b48"}, + {file = "Brotli-1.1.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:cdbc1fc1bc0bff1cef838eafe581b55bfbffaed4ed0318b724d0b71d4d377619"}, + {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:890b5a14ce214389b2cc36ce82f3093f96f4cc730c1cffdbefff77a7c71f2a97"}, + {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1ab4fbee0b2d9098c74f3057b2bc055a8bd92ccf02f65944a241b4349229185a"}, + {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:141bd4d93984070e097521ed07e2575b46f817d08f9fa42b16b9b5f27b5ac088"}, + {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fce1473f3ccc4187f75b4690cfc922628aed4d3dd013d047f95a9b3919a86596"}, + {file = "Brotli-1.1.0-cp38-cp38-win32.whl", hash = "sha256:db85ecf4e609a48f4b29055f1e144231b90edc90af7481aa731ba2d059226b1b"}, + {file = "Brotli-1.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3d7954194c36e304e1523f55d7042c59dc53ec20dd4e9ea9d151f1b62b4415c0"}, + {file = "Brotli-1.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5fb2ce4b8045c78ebbc7b8f3c15062e435d47e7393cc57c25115cfd49883747a"}, + {file = "Brotli-1.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7905193081db9bfa73b1219140b3d315831cbff0d8941f22da695832f0dd188f"}, + {file = "Brotli-1.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a77def80806c421b4b0af06f45d65a136e7ac0bdca3c09d9e2ea4e515367c7e9"}, + {file = "Brotli-1.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8dadd1314583ec0bf2d1379f7008ad627cd6336625d6679cf2f8e67081b83acf"}, + {file = "Brotli-1.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:901032ff242d479a0efa956d853d16875d42157f98951c0230f69e69f9c09bac"}, + {file = "Brotli-1.1.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:22fc2a8549ffe699bfba2256ab2ed0421a7b8fadff114a3d201794e45a9ff578"}, + {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ae15b066e5ad21366600ebec29a7ccbc86812ed267e4b28e860b8ca16a2bc474"}, + {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:949f3b7c29912693cee0afcf09acd6ebc04c57af949d9bf77d6101ebb61e388c"}, + {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:89f4988c7203739d48c6f806f1e87a1d96e0806d44f0fba61dba81392c9e474d"}, + {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:de6551e370ef19f8de1807d0a9aa2cdfdce2e85ce88b122fe9f6b2b076837e59"}, + {file = "Brotli-1.1.0-cp39-cp39-win32.whl", hash = "sha256:f0d8a7a6b5983c2496e364b969f0e526647a06b075d034f3297dc66f3b360c64"}, + {file = "Brotli-1.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:cdad5b9014d83ca68c25d2e9444e28e967ef16e80f6b436918c700c117a85467"}, + {file = "Brotli-1.1.0.tar.gz", hash = "sha256:81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724"}, +] + +[[package]] +name = "brotlicffi" +version = "1.1.0.0" +description = "Python CFFI bindings to the Brotli library" +optional = false +python-versions = ">=3.7" +files = [ + {file = "brotlicffi-1.1.0.0-cp37-abi3-macosx_10_9_x86_64.whl", hash = "sha256:9b7ae6bd1a3f0df532b6d67ff674099a96d22bc0948955cb338488c31bfb8851"}, + {file = "brotlicffi-1.1.0.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19ffc919fa4fc6ace69286e0a23b3789b4219058313cf9b45625016bf7ff996b"}, + {file = "brotlicffi-1.1.0.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9feb210d932ffe7798ee62e6145d3a757eb6233aa9a4e7db78dd3690d7755814"}, + {file = "brotlicffi-1.1.0.0-cp37-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84763dbdef5dd5c24b75597a77e1b30c66604725707565188ba54bab4f114820"}, + {file = "brotlicffi-1.1.0.0-cp37-abi3-win32.whl", hash = "sha256:1b12b50e07c3911e1efa3a8971543e7648100713d4e0971b13631cce22c587eb"}, + {file = "brotlicffi-1.1.0.0-cp37-abi3-win_amd64.whl", hash = "sha256:994a4f0681bb6c6c3b0925530a1926b7a189d878e6e5e38fae8efa47c5d9c613"}, + {file = "brotlicffi-1.1.0.0-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2e4aeb0bd2540cb91b069dbdd54d458da8c4334ceaf2d25df2f4af576d6766ca"}, + {file = "brotlicffi-1.1.0.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4b7b0033b0d37bb33009fb2fef73310e432e76f688af76c156b3594389d81391"}, + {file = "brotlicffi-1.1.0.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:54a07bb2374a1eba8ebb52b6fafffa2afd3c4df85ddd38fcc0511f2bb387c2a8"}, + {file = "brotlicffi-1.1.0.0-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7901a7dc4b88f1c1475de59ae9be59799db1007b7d059817948d8e4f12e24e35"}, + {file = "brotlicffi-1.1.0.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:ce01c7316aebc7fce59da734286148b1d1b9455f89cf2c8a4dfce7d41db55c2d"}, + {file = "brotlicffi-1.1.0.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:246f1d1a90279bb6069de3de8d75a8856e073b8ff0b09dcca18ccc14cec85979"}, + {file = "brotlicffi-1.1.0.0-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc4bc5d82bc56ebd8b514fb8350cfac4627d6b0743382e46d033976a5f80fab6"}, + {file = "brotlicffi-1.1.0.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37c26ecb14386a44b118ce36e546ce307f4810bc9598a6e6cb4f7fca725ae7e6"}, + {file = "brotlicffi-1.1.0.0-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca72968ae4eaf6470498d5c2887073f7efe3b1e7d7ec8be11a06a79cc810e990"}, + {file = "brotlicffi-1.1.0.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:add0de5b9ad9e9aa293c3aa4e9deb2b61e99ad6c1634e01d01d98c03e6a354cc"}, + {file = "brotlicffi-1.1.0.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:9b6068e0f3769992d6b622a1cd2e7835eae3cf8d9da123d7f51ca9c1e9c333e5"}, + {file = "brotlicffi-1.1.0.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8557a8559509b61e65083f8782329188a250102372576093c88930c875a69838"}, + {file = "brotlicffi-1.1.0.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a7ae37e5d79c5bdfb5b4b99f2715a6035e6c5bf538c3746abc8e26694f92f33"}, + {file = "brotlicffi-1.1.0.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:391151ec86bb1c683835980f4816272a87eaddc46bb91cbf44f62228b84d8cca"}, + {file = "brotlicffi-1.1.0.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:2f3711be9290f0453de8eed5275d93d286abe26b08ab4a35d7452caa1fef532f"}, + {file = "brotlicffi-1.1.0.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:1a807d760763e398bbf2c6394ae9da5815901aa93ee0a37bca5efe78d4ee3171"}, + {file = "brotlicffi-1.1.0.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fa8ca0623b26c94fccc3a1fdd895be1743b838f3917300506d04aa3346fd2a14"}, + {file = "brotlicffi-1.1.0.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3de0cf28a53a3238b252aca9fed1593e9d36c1d116748013339f0949bfc84112"}, + {file = "brotlicffi-1.1.0.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6be5ec0e88a4925c91f3dea2bb0013b3a2accda6f77238f76a34a1ea532a1cb0"}, + {file = "brotlicffi-1.1.0.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:d9eb71bb1085d996244439154387266fd23d6ad37161f6f52f1cd41dd95a3808"}, + {file = "brotlicffi-1.1.0.0.tar.gz", hash = "sha256:b77827a689905143f87915310b93b273ab17888fd43ef350d4832c4a71083c13"}, +] + +[package.dependencies] +cffi = ">=1.0.0" + +[[package]] +name = "build" +version = "1.0.3" +description = "A simple, correct Python build frontend" +optional = false +python-versions = ">= 3.7" +files = [ + {file = "build-1.0.3-py3-none-any.whl", hash = "sha256:589bf99a67df7c9cf07ec0ac0e5e2ea5d4b37ac63301c4986d1acb126aa83f8f"}, + {file = "build-1.0.3.tar.gz", hash = "sha256:538aab1b64f9828977f84bc63ae570b060a8ed1be419e7870b8b4fc5e6ea553b"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "os_name == \"nt\""} +packaging = ">=19.0" +pyproject_hooks = "*" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} + +[package.extras] +docs = ["furo (>=2023.08.17)", "sphinx (>=7.0,<8.0)", "sphinx-argparse-cli (>=1.5)", "sphinx-autodoc-typehints (>=1.10)", "sphinx-issues (>=3.0.0)"] +test = ["filelock (>=3)", "pytest (>=6.2.4)", "pytest-cov (>=2.12)", "pytest-mock (>=2)", "pytest-rerunfailures (>=9.1)", "pytest-xdist (>=1.34)", "setuptools (>=42.0.0)", "setuptools (>=56.0.0)", "setuptools (>=56.0.0)", "setuptools (>=67.8.0)", "wheel (>=0.36.0)"] +typing = ["importlib-metadata (>=5.1)", "mypy (>=1.5.0,<1.6.0)", "tomli", "typing-extensions (>=3.7.4.3)"] +virtualenv = ["virtualenv (>=20.0.35)"] [[package]] name = "cachetools" @@ -605,24 +792,25 @@ numpy = "*" [[package]] name = "chromadb" -version = "0.4.18" +version = "0.4.22" description = "Chroma." optional = false python-versions = ">=3.8" files = [ - {file = "chromadb-0.4.18-py3-none-any.whl", hash = "sha256:6de20f8c1dc880bef1d49c10d9f998ddb9d7e39b6c1e757d8b58e37b535ad625"}, - {file = "chromadb-0.4.18.tar.gz", hash = "sha256:42f1e8f3f48884abfb43fbbb132940d0b78c0f633baf888d2525c970678b886c"}, + {file = "chromadb-0.4.22-py3-none-any.whl", hash = "sha256:ad210b27b4cda2f09d15adc9c83c81bfa66b69f39648a27b637306e40de0680d"}, + {file = "chromadb-0.4.22.tar.gz", hash = "sha256:c793149e1c2bbbb52d77602c6c0594c5752f04cd9be12619250ddad2082af27a"}, ] [package.dependencies] bcrypt = ">=4.0.1" +build = ">=1.0.3" chroma-hnswlib = "0.7.3" fastapi = ">=0.95.2" grpcio = ">=1.58.0" importlib-resources = "*" kubernetes = ">=28.1.0" mmh3 = ">=4.0.1" -numpy = {version = ">=1.22.5", markers = "python_version >= \"3.8\""} +numpy = ">=1.22.5" onnxruntime = ">=1.14.1" opentelemetry-api = ">=1.2.0" opentelemetry-exporter-otlp-proto-grpc = ">=1.2.0" @@ -748,13 +936,13 @@ dev = ["PyTest", "PyTest-Cov", "bump2version (<1)", "sphinx (<2)", "tox"] [[package]] name = "distro" -version = "1.8.0" +version = "1.9.0" description = "Distro - an OS platform information API" optional = false python-versions = ">=3.6" files = [ - {file = "distro-1.8.0-py3-none-any.whl", hash = "sha256:99522ca3e365cac527b44bde033f64c6945d90eb9f769703caaec52b09bbd3ff"}, - {file = "distro-1.8.0.tar.gz", hash = "sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8"}, + {file = "distro-1.9.0-py3-none-any.whl", hash = "sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2"}, + {file = "distro-1.9.0.tar.gz", hash = "sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed"}, ] [[package]] @@ -807,17 +995,16 @@ test = ["pytest (>=6)"] [[package]] name = "fastapi" -version = "0.104.1" +version = "0.109.0" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" optional = false python-versions = ">=3.8" files = [ - {file = "fastapi-0.104.1-py3-none-any.whl", hash = "sha256:752dc31160cdbd0436bb93bad51560b57e525cbb1d4bbf6f4904ceee75548241"}, - {file = "fastapi-0.104.1.tar.gz", hash = "sha256:e5e4540a7c5e1dcfbbcf5b903c234feddcdcd881f191977a1c5dfd917487e7ae"}, + {file = "fastapi-0.109.0-py3-none-any.whl", hash = "sha256:8c77515984cd8e8cfeb58364f8cc7a28f0692088475e2614f7bf03275eba9093"}, + {file = "fastapi-0.109.0.tar.gz", hash = "sha256:b978095b9ee01a5cf49b19f4bc1ac9b8ca83aa076e770ef8fd9af09a2b88d191"}, ] [package.dependencies] -anyio = ">=3.7.1,<4.0.0" email-validator = {version = ">=2.0.0", optional = true, markers = "extra == \"all\""} httpx = {version = ">=0.23.0", optional = true, markers = "extra == \"all\""} itsdangerous = {version = ">=1.1.0", optional = true, markers = "extra == \"all\""} @@ -828,7 +1015,7 @@ pydantic-extra-types = {version = ">=2.0.0", optional = true, markers = "extra = pydantic-settings = {version = ">=2.0.0", optional = true, markers = "extra == \"all\""} python-multipart = {version = ">=0.0.5", optional = true, markers = "extra == \"all\""} pyyaml = {version = ">=5.3.1", optional = true, markers = "extra == \"all\""} -starlette = ">=0.27.0,<0.28.0" +starlette = ">=0.35.0,<0.36.0" typing-extensions = ">=4.8.0" ujson = {version = ">=4.0.1,<4.0.2 || >4.0.2,<4.1.0 || >4.1.0,<4.2.0 || >4.2.0,<4.3.0 || >4.3.0,<5.0.0 || >5.0.0,<5.1.0 || >5.1.0", optional = true, markers = "extra == \"all\""} uvicorn = {version = ">=0.12.0", extras = ["standard"], optional = true, markers = "extra == \"all\""} @@ -865,83 +1052,99 @@ files = [ [[package]] name = "frozenlist" -version = "1.4.0" +version = "1.4.1" description = "A list-like structure which implements collections.abc.MutableSequence" optional = false python-versions = ">=3.8" files = [ - {file = "frozenlist-1.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:764226ceef3125e53ea2cb275000e309c0aa5464d43bd72abd661e27fffc26ab"}, - {file = "frozenlist-1.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d6484756b12f40003c6128bfcc3fa9f0d49a687e171186c2d85ec82e3758c559"}, - {file = "frozenlist-1.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9ac08e601308e41eb533f232dbf6b7e4cea762f9f84f6357136eed926c15d12c"}, - {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d081f13b095d74b67d550de04df1c756831f3b83dc9881c38985834387487f1b"}, - {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:71932b597f9895f011f47f17d6428252fc728ba2ae6024e13c3398a087c2cdea"}, - {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:981b9ab5a0a3178ff413bca62526bb784249421c24ad7381e39d67981be2c326"}, - {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e41f3de4df3e80de75845d3e743b3f1c4c8613c3997a912dbf0229fc61a8b963"}, - {file = "frozenlist-1.4.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6918d49b1f90821e93069682c06ffde41829c346c66b721e65a5c62b4bab0300"}, - {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0e5c8764c7829343d919cc2dfc587a8db01c4f70a4ebbc49abde5d4b158b007b"}, - {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8d0edd6b1c7fb94922bf569c9b092ee187a83f03fb1a63076e7774b60f9481a8"}, - {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e29cda763f752553fa14c68fb2195150bfab22b352572cb36c43c47bedba70eb"}, - {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:0c7c1b47859ee2cac3846fde1c1dc0f15da6cec5a0e5c72d101e0f83dcb67ff9"}, - {file = "frozenlist-1.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:901289d524fdd571be1c7be054f48b1f88ce8dddcbdf1ec698b27d4b8b9e5d62"}, - {file = "frozenlist-1.4.0-cp310-cp310-win32.whl", hash = "sha256:1a0848b52815006ea6596c395f87449f693dc419061cc21e970f139d466dc0a0"}, - {file = "frozenlist-1.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:b206646d176a007466358aa21d85cd8600a415c67c9bd15403336c331a10d956"}, - {file = "frozenlist-1.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:de343e75f40e972bae1ef6090267f8260c1446a1695e77096db6cfa25e759a95"}, - {file = "frozenlist-1.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ad2a9eb6d9839ae241701d0918f54c51365a51407fd80f6b8289e2dfca977cc3"}, - {file = "frozenlist-1.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bd7bd3b3830247580de99c99ea2a01416dfc3c34471ca1298bccabf86d0ff4dc"}, - {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bdf1847068c362f16b353163391210269e4f0569a3c166bc6a9f74ccbfc7e839"}, - {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:38461d02d66de17455072c9ba981d35f1d2a73024bee7790ac2f9e361ef1cd0c"}, - {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d5a32087d720c608f42caed0ef36d2b3ea61a9d09ee59a5142d6070da9041b8f"}, - {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd65632acaf0d47608190a71bfe46b209719bf2beb59507db08ccdbe712f969b"}, - {file = "frozenlist-1.4.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:261b9f5d17cac914531331ff1b1d452125bf5daa05faf73b71d935485b0c510b"}, - {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:b89ac9768b82205936771f8d2eb3ce88503b1556324c9f903e7156669f521472"}, - {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:008eb8b31b3ea6896da16c38c1b136cb9fec9e249e77f6211d479db79a4eaf01"}, - {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:e74b0506fa5aa5598ac6a975a12aa8928cbb58e1f5ac8360792ef15de1aa848f"}, - {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:490132667476f6781b4c9458298b0c1cddf237488abd228b0b3650e5ecba7467"}, - {file = "frozenlist-1.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:76d4711f6f6d08551a7e9ef28c722f4a50dd0fc204c56b4bcd95c6cc05ce6fbb"}, - {file = "frozenlist-1.4.0-cp311-cp311-win32.whl", hash = "sha256:a02eb8ab2b8f200179b5f62b59757685ae9987996ae549ccf30f983f40602431"}, - {file = "frozenlist-1.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:515e1abc578dd3b275d6a5114030b1330ba044ffba03f94091842852f806f1c1"}, - {file = "frozenlist-1.4.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:f0ed05f5079c708fe74bf9027e95125334b6978bf07fd5ab923e9e55e5fbb9d3"}, - {file = "frozenlist-1.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ca265542ca427bf97aed183c1676e2a9c66942e822b14dc6e5f42e038f92a503"}, - {file = "frozenlist-1.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:491e014f5c43656da08958808588cc6c016847b4360e327a62cb308c791bd2d9"}, - {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:17ae5cd0f333f94f2e03aaf140bb762c64783935cc764ff9c82dff626089bebf"}, - {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1e78fb68cf9c1a6aa4a9a12e960a5c9dfbdb89b3695197aa7064705662515de2"}, - {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d5655a942f5f5d2c9ed93d72148226d75369b4f6952680211972a33e59b1dfdc"}, - {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c11b0746f5d946fecf750428a95f3e9ebe792c1ee3b1e96eeba145dc631a9672"}, - {file = "frozenlist-1.4.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e66d2a64d44d50d2543405fb183a21f76b3b5fd16f130f5c99187c3fb4e64919"}, - {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:88f7bc0fcca81f985f78dd0fa68d2c75abf8272b1f5c323ea4a01a4d7a614efc"}, - {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5833593c25ac59ede40ed4de6d67eb42928cca97f26feea219f21d0ed0959b79"}, - {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:fec520865f42e5c7f050c2a79038897b1c7d1595e907a9e08e3353293ffc948e"}, - {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:b826d97e4276750beca7c8f0f1a4938892697a6bcd8ec8217b3312dad6982781"}, - {file = "frozenlist-1.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ceb6ec0a10c65540421e20ebd29083c50e6d1143278746a4ef6bcf6153171eb8"}, - {file = "frozenlist-1.4.0-cp38-cp38-win32.whl", hash = "sha256:2b8bcf994563466db019fab287ff390fffbfdb4f905fc77bc1c1d604b1c689cc"}, - {file = "frozenlist-1.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:a6c8097e01886188e5be3e6b14e94ab365f384736aa1fca6a0b9e35bd4a30bc7"}, - {file = "frozenlist-1.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6c38721585f285203e4b4132a352eb3daa19121a035f3182e08e437cface44bf"}, - {file = "frozenlist-1.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a0c6da9aee33ff0b1a451e867da0c1f47408112b3391dd43133838339e410963"}, - {file = "frozenlist-1.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:93ea75c050c5bb3d98016b4ba2497851eadf0ac154d88a67d7a6816206f6fa7f"}, - {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f61e2dc5ad442c52b4887f1fdc112f97caeff4d9e6ebe78879364ac59f1663e1"}, - {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aa384489fefeb62321b238e64c07ef48398fe80f9e1e6afeff22e140e0850eef"}, - {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:10ff5faaa22786315ef57097a279b833ecab1a0bfb07d604c9cbb1c4cdc2ed87"}, - {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:007df07a6e3eb3e33e9a1fe6a9db7af152bbd8a185f9aaa6ece10a3529e3e1c6"}, - {file = "frozenlist-1.4.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f4f399d28478d1f604c2ff9119907af9726aed73680e5ed1ca634d377abb087"}, - {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c5374b80521d3d3f2ec5572e05adc94601985cc526fb276d0c8574a6d749f1b3"}, - {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ce31ae3e19f3c902de379cf1323d90c649425b86de7bbdf82871b8a2a0615f3d"}, - {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7211ef110a9194b6042449431e08c4d80c0481e5891e58d429df5899690511c2"}, - {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:556de4430ce324c836789fa4560ca62d1591d2538b8ceb0b4f68fb7b2384a27a"}, - {file = "frozenlist-1.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:7645a8e814a3ee34a89c4a372011dcd817964ce8cb273c8ed6119d706e9613e3"}, - {file = "frozenlist-1.4.0-cp39-cp39-win32.whl", hash = "sha256:19488c57c12d4e8095a922f328df3f179c820c212940a498623ed39160bc3c2f"}, - {file = "frozenlist-1.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:6221d84d463fb110bdd7619b69cb43878a11d51cbb9394ae3105d082d5199167"}, - {file = "frozenlist-1.4.0.tar.gz", hash = "sha256:09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251"}, + {file = "frozenlist-1.4.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f9aa1878d1083b276b0196f2dfbe00c9b7e752475ed3b682025ff20c1c1f51ac"}, + {file = "frozenlist-1.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:29acab3f66f0f24674b7dc4736477bcd4bc3ad4b896f5f45379a67bce8b96868"}, + {file = "frozenlist-1.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:74fb4bee6880b529a0c6560885fce4dc95936920f9f20f53d99a213f7bf66776"}, + {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:590344787a90ae57d62511dd7c736ed56b428f04cd8c161fcc5e7232c130c69a"}, + {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:068b63f23b17df8569b7fdca5517edef76171cf3897eb68beb01341131fbd2ad"}, + {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5c849d495bf5154cd8da18a9eb15db127d4dba2968d88831aff6f0331ea9bd4c"}, + {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9750cc7fe1ae3b1611bb8cfc3f9ec11d532244235d75901fb6b8e42ce9229dfe"}, + {file = "frozenlist-1.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9b2de4cf0cdd5bd2dee4c4f63a653c61d2408055ab77b151c1957f221cabf2a"}, + {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0633c8d5337cb5c77acbccc6357ac49a1770b8c487e5b3505c57b949b4b82e98"}, + {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:27657df69e8801be6c3638054e202a135c7f299267f1a55ed3a598934f6c0d75"}, + {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:f9a3ea26252bd92f570600098783d1371354d89d5f6b7dfd87359d669f2109b5"}, + {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:4f57dab5fe3407b6c0c1cc907ac98e8a189f9e418f3b6e54d65a718aaafe3950"}, + {file = "frozenlist-1.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e02a0e11cf6597299b9f3bbd3f93d79217cb90cfd1411aec33848b13f5c656cc"}, + {file = "frozenlist-1.4.1-cp310-cp310-win32.whl", hash = "sha256:a828c57f00f729620a442881cc60e57cfcec6842ba38e1b19fd3e47ac0ff8dc1"}, + {file = "frozenlist-1.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:f56e2333dda1fe0f909e7cc59f021eba0d2307bc6f012a1ccf2beca6ba362439"}, + {file = "frozenlist-1.4.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a0cb6f11204443f27a1628b0e460f37fb30f624be6051d490fa7d7e26d4af3d0"}, + {file = "frozenlist-1.4.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b46c8ae3a8f1f41a0d2ef350c0b6e65822d80772fe46b653ab6b6274f61d4a49"}, + {file = "frozenlist-1.4.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fde5bd59ab5357e3853313127f4d3565fc7dad314a74d7b5d43c22c6a5ed2ced"}, + {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:722e1124aec435320ae01ee3ac7bec11a5d47f25d0ed6328f2273d287bc3abb0"}, + {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2471c201b70d58a0f0c1f91261542a03d9a5e088ed3dc6c160d614c01649c106"}, + {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c757a9dd70d72b076d6f68efdbb9bc943665ae954dad2801b874c8c69e185068"}, + {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f146e0911cb2f1da549fc58fc7bcd2b836a44b79ef871980d605ec392ff6b0d2"}, + {file = "frozenlist-1.4.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f9c515e7914626b2a2e1e311794b4c35720a0be87af52b79ff8e1429fc25f19"}, + {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:c302220494f5c1ebeb0912ea782bcd5e2f8308037b3c7553fad0e48ebad6ad82"}, + {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:442acde1e068288a4ba7acfe05f5f343e19fac87bfc96d89eb886b0363e977ec"}, + {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:1b280e6507ea8a4fa0c0a7150b4e526a8d113989e28eaaef946cc77ffd7efc0a"}, + {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:fe1a06da377e3a1062ae5fe0926e12b84eceb8a50b350ddca72dc85015873f74"}, + {file = "frozenlist-1.4.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:db9e724bebd621d9beca794f2a4ff1d26eed5965b004a97f1f1685a173b869c2"}, + {file = "frozenlist-1.4.1-cp311-cp311-win32.whl", hash = "sha256:e774d53b1a477a67838a904131c4b0eef6b3d8a651f8b138b04f748fccfefe17"}, + {file = "frozenlist-1.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:fb3c2db03683b5767dedb5769b8a40ebb47d6f7f45b1b3e3b4b51ec8ad9d9825"}, + {file = "frozenlist-1.4.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:1979bc0aeb89b33b588c51c54ab0161791149f2461ea7c7c946d95d5f93b56ae"}, + {file = "frozenlist-1.4.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:cc7b01b3754ea68a62bd77ce6020afaffb44a590c2289089289363472d13aedb"}, + {file = "frozenlist-1.4.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c9c92be9fd329ac801cc420e08452b70e7aeab94ea4233a4804f0915c14eba9b"}, + {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c3894db91f5a489fc8fa6a9991820f368f0b3cbdb9cd8849547ccfab3392d86"}, + {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ba60bb19387e13597fb059f32cd4d59445d7b18b69a745b8f8e5db0346f33480"}, + {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8aefbba5f69d42246543407ed2461db31006b0f76c4e32dfd6f42215a2c41d09"}, + {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:780d3a35680ced9ce682fbcf4cb9c2bad3136eeff760ab33707b71db84664e3a"}, + {file = "frozenlist-1.4.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9acbb16f06fe7f52f441bb6f413ebae6c37baa6ef9edd49cdd567216da8600cd"}, + {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:23b701e65c7b36e4bf15546a89279bd4d8675faabc287d06bbcfac7d3c33e1e6"}, + {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:3e0153a805a98f5ada7e09826255ba99fb4f7524bb81bf6b47fb702666484ae1"}, + {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:dd9b1baec094d91bf36ec729445f7769d0d0cf6b64d04d86e45baf89e2b9059b"}, + {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:1a4471094e146b6790f61b98616ab8e44f72661879cc63fa1049d13ef711e71e"}, + {file = "frozenlist-1.4.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5667ed53d68d91920defdf4035d1cdaa3c3121dc0b113255124bcfada1cfa1b8"}, + {file = "frozenlist-1.4.1-cp312-cp312-win32.whl", hash = "sha256:beee944ae828747fd7cb216a70f120767fc9f4f00bacae8543c14a6831673f89"}, + {file = "frozenlist-1.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:64536573d0a2cb6e625cf309984e2d873979709f2cf22839bf2d61790b448ad5"}, + {file = "frozenlist-1.4.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:20b51fa3f588ff2fe658663db52a41a4f7aa6c04f6201449c6c7c476bd255c0d"}, + {file = "frozenlist-1.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:410478a0c562d1a5bcc2f7ea448359fcb050ed48b3c6f6f4f18c313a9bdb1826"}, + {file = "frozenlist-1.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c6321c9efe29975232da3bd0af0ad216800a47e93d763ce64f291917a381b8eb"}, + {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48f6a4533887e189dae092f1cf981f2e3885175f7a0f33c91fb5b7b682b6bab6"}, + {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6eb73fa5426ea69ee0e012fb59cdc76a15b1283d6e32e4f8dc4482ec67d1194d"}, + {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fbeb989b5cc29e8daf7f976b421c220f1b8c731cbf22b9130d8815418ea45887"}, + {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:32453c1de775c889eb4e22f1197fe3bdfe457d16476ea407472b9442e6295f7a"}, + {file = "frozenlist-1.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:693945278a31f2086d9bf3df0fe8254bbeaef1fe71e1351c3bd730aa7d31c41b"}, + {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:1d0ce09d36d53bbbe566fe296965b23b961764c0bcf3ce2fa45f463745c04701"}, + {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:3a670dc61eb0d0eb7080890c13de3066790f9049b47b0de04007090807c776b0"}, + {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:dca69045298ce5c11fd539682cff879cc1e664c245d1c64da929813e54241d11"}, + {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a06339f38e9ed3a64e4c4e43aec7f59084033647f908e4259d279a52d3757d09"}, + {file = "frozenlist-1.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b7f2f9f912dca3934c1baec2e4585a674ef16fe00218d833856408c48d5beee7"}, + {file = "frozenlist-1.4.1-cp38-cp38-win32.whl", hash = "sha256:e7004be74cbb7d9f34553a5ce5fb08be14fb33bc86f332fb71cbe5216362a497"}, + {file = "frozenlist-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:5a7d70357e7cee13f470c7883a063aae5fe209a493c57d86eb7f5a6f910fae09"}, + {file = "frozenlist-1.4.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bfa4a17e17ce9abf47a74ae02f32d014c5e9404b6d9ac7f729e01562bbee601e"}, + {file = "frozenlist-1.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b7e3ed87d4138356775346e6845cccbe66cd9e207f3cd11d2f0b9fd13681359d"}, + {file = "frozenlist-1.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c99169d4ff810155ca50b4da3b075cbde79752443117d89429595c2e8e37fed8"}, + {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edb678da49d9f72c9f6c609fbe41a5dfb9a9282f9e6a2253d5a91e0fc382d7c0"}, + {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6db4667b187a6742b33afbbaf05a7bc551ffcf1ced0000a571aedbb4aa42fc7b"}, + {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:55fdc093b5a3cb41d420884cdaf37a1e74c3c37a31f46e66286d9145d2063bd0"}, + {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:82e8211d69a4f4bc360ea22cd6555f8e61a1bd211d1d5d39d3d228b48c83a897"}, + {file = "frozenlist-1.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89aa2c2eeb20957be2d950b85974b30a01a762f3308cd02bb15e1ad632e22dc7"}, + {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9d3e0c25a2350080e9319724dede4f31f43a6c9779be48021a7f4ebde8b2d742"}, + {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7268252af60904bf52c26173cbadc3a071cece75f873705419c8681f24d3edea"}, + {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:0c250a29735d4f15321007fb02865f0e6b6a41a6b88f1f523ca1596ab5f50bd5"}, + {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:96ec70beabbd3b10e8bfe52616a13561e58fe84c0101dd031dc78f250d5128b9"}, + {file = "frozenlist-1.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:23b2d7679b73fe0e5a4560b672a39f98dfc6f60df63823b0a9970525325b95f6"}, + {file = "frozenlist-1.4.1-cp39-cp39-win32.whl", hash = "sha256:a7496bfe1da7fb1a4e1cc23bb67c58fab69311cc7d32b5a99c2007b4b2a0e932"}, + {file = "frozenlist-1.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:e6a20a581f9ce92d389a8c7d7c3dd47c81fd5d6e655c8dddf341e14aa48659d0"}, + {file = "frozenlist-1.4.1-py3-none-any.whl", hash = "sha256:04ced3e6a46b4cfffe20f9ae482818e34eba9b5fb0ce4056e4cc9b6e212d09b7"}, + {file = "frozenlist-1.4.1.tar.gz", hash = "sha256:c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8ed402b"}, ] [[package]] name = "fsspec" -version = "2023.12.1" +version = "2023.12.2" description = "File-system specification" optional = false python-versions = ">=3.8" files = [ - {file = "fsspec-2023.12.1-py3-none-any.whl", hash = "sha256:6271f1d3075a378bfe432f6f42bf7e1d2a6ba74f78dd9b512385474c579146a0"}, - {file = "fsspec-2023.12.1.tar.gz", hash = "sha256:c4da01a35ac65c853f833e43f67802c25213f560820d54ddf248f92eddd5e990"}, + {file = "fsspec-2023.12.2-py3-none-any.whl", hash = "sha256:d800d87f72189a745fa3d6b033b9dc4a34ad069f60ca60b943a63599f5501960"}, + {file = "fsspec-2023.12.2.tar.gz", hash = "sha256:8548d39e8810b59c38014934f6b31e57f40c1b20f911f4cc2b85389c7e9bf0cb"}, ] [package.extras] @@ -970,13 +1173,13 @@ tqdm = ["tqdm"] [[package]] name = "google-auth" -version = "2.25.2" +version = "2.26.2" description = "Google Authentication Library" optional = false python-versions = ">=3.7" files = [ - {file = "google-auth-2.25.2.tar.gz", hash = "sha256:42f707937feb4f5e5a39e6c4f343a17300a459aaf03141457ba505812841cc40"}, - {file = "google_auth-2.25.2-py2.py3-none-any.whl", hash = "sha256:473a8dfd0135f75bb79d878436e568f2695dce456764bf3a02b6f8c540b1d256"}, + {file = "google-auth-2.26.2.tar.gz", hash = "sha256:97327dbbf58cccb58fc5a1712bba403ae76668e64814eb30f7316f7e27126b81"}, + {file = "google_auth-2.26.2-py2.py3-none-any.whl", hash = "sha256:3f445c8ce9b61ed6459aad86d8ccdba4a9afed841b2d1451a11ef4db08957424"}, ] [package.dependencies] @@ -1156,13 +1359,13 @@ test = ["Cython (>=0.29.24,<0.30.0)"] [[package]] name = "httpx" -version = "0.25.2" +version = "0.26.0" description = "The next generation HTTP client." optional = false python-versions = ">=3.8" files = [ - {file = "httpx-0.25.2-py3-none-any.whl", hash = "sha256:a05d3d052d9b2dfce0e3896636467f8a5342fb2b902c819428e1ac65413ca118"}, - {file = "httpx-0.25.2.tar.gz", hash = "sha256:8b8fcaa0c8ea7b05edd69a094e63a2094c4efcb48129fb757361bc423c0ad9e8"}, + {file = "httpx-0.26.0-py3-none-any.whl", hash = "sha256:8915f5a3627c4d47b73e8202457cb28f1266982d1159bd5779d86a80c0eab1cd"}, + {file = "httpx-0.26.0.tar.gz", hash = "sha256:451b55c30d5185ea6b23c2c793abf9bb237d2a7dfb901ced6ff69ad37ec1dfaf"}, ] [package.dependencies] @@ -1180,13 +1383,13 @@ socks = ["socksio (==1.*)"] [[package]] name = "huggingface-hub" -version = "0.19.4" +version = "0.20.2" description = "Client library to download and publish models, datasets and other repos on the huggingface.co hub" optional = false python-versions = ">=3.8.0" files = [ - {file = "huggingface_hub-0.19.4-py3-none-any.whl", hash = "sha256:dba013f779da16f14b606492828f3760600a1e1801432d09fe1c33e50b825bb5"}, - {file = "huggingface_hub-0.19.4.tar.gz", hash = "sha256:176a4fc355a851c17550e7619488f383189727eab209534d7cef2114dae77b22"}, + {file = "huggingface_hub-0.20.2-py3-none-any.whl", hash = "sha256:53752eda2239d30a470c307a61cf9adcf136bc77b0a734338c7d04941af560d8"}, + {file = "huggingface_hub-0.20.2.tar.gz", hash = "sha256:215c5fceff631030c7a3d19ba7b588921c908b3f21eef31d160ebc245b200ff6"}, ] [package.dependencies] @@ -1199,15 +1402,14 @@ tqdm = ">=4.42.1" typing-extensions = ">=3.7.4.3" [package.extras] -all = ["InquirerPy (==0.3.4)", "Jinja2", "Pillow", "aiohttp", "gradio", "jedi", "mypy (==1.5.1)", "numpy", "pydantic (>1.1,<2.0)", "pydantic (>1.1,<3.0)", "pytest", "pytest-asyncio", "pytest-cov", "pytest-env", "pytest-vcr", "pytest-xdist", "ruff (>=0.1.3)", "soundfile", "types-PyYAML", "types-requests", "types-simplejson", "types-toml", "types-tqdm", "types-urllib3", "typing-extensions (>=4.8.0)", "urllib3 (<2.0)"] +all = ["InquirerPy (==0.3.4)", "Jinja2", "Pillow", "aiohttp", "gradio", "jedi", "mypy (==1.5.1)", "numpy", "pydantic (>1.1,<2.0)", "pydantic (>1.1,<3.0)", "pytest", "pytest-asyncio", "pytest-cov", "pytest-env", "pytest-rerunfailures", "pytest-vcr", "pytest-xdist", "ruff (>=0.1.3)", "soundfile", "types-PyYAML", "types-requests", "types-simplejson", "types-toml", "types-tqdm", "types-urllib3", "typing-extensions (>=4.8.0)", "urllib3 (<2.0)"] cli = ["InquirerPy (==0.3.4)"] -dev = ["InquirerPy (==0.3.4)", "Jinja2", "Pillow", "aiohttp", "gradio", "jedi", "mypy (==1.5.1)", "numpy", "pydantic (>1.1,<2.0)", "pydantic (>1.1,<3.0)", "pytest", "pytest-asyncio", "pytest-cov", "pytest-env", "pytest-vcr", "pytest-xdist", "ruff (>=0.1.3)", "soundfile", "types-PyYAML", "types-requests", "types-simplejson", "types-toml", "types-tqdm", "types-urllib3", "typing-extensions (>=4.8.0)", "urllib3 (<2.0)"] -docs = ["InquirerPy (==0.3.4)", "Jinja2", "Pillow", "aiohttp", "gradio", "hf-doc-builder", "jedi", "mypy (==1.5.1)", "numpy", "pydantic (>1.1,<2.0)", "pydantic (>1.1,<3.0)", "pytest", "pytest-asyncio", "pytest-cov", "pytest-env", "pytest-vcr", "pytest-xdist", "ruff (>=0.1.3)", "soundfile", "types-PyYAML", "types-requests", "types-simplejson", "types-toml", "types-tqdm", "types-urllib3", "typing-extensions (>=4.8.0)", "urllib3 (<2.0)", "watchdog"] +dev = ["InquirerPy (==0.3.4)", "Jinja2", "Pillow", "aiohttp", "gradio", "jedi", "mypy (==1.5.1)", "numpy", "pydantic (>1.1,<2.0)", "pydantic (>1.1,<3.0)", "pytest", "pytest-asyncio", "pytest-cov", "pytest-env", "pytest-rerunfailures", "pytest-vcr", "pytest-xdist", "ruff (>=0.1.3)", "soundfile", "types-PyYAML", "types-requests", "types-simplejson", "types-toml", "types-tqdm", "types-urllib3", "typing-extensions (>=4.8.0)", "urllib3 (<2.0)"] fastai = ["fastai (>=2.4)", "fastcore (>=1.3.27)", "toml"] inference = ["aiohttp", "pydantic (>1.1,<2.0)", "pydantic (>1.1,<3.0)"] quality = ["mypy (==1.5.1)", "ruff (>=0.1.3)"] tensorflow = ["graphviz", "pydot", "tensorflow"] -testing = ["InquirerPy (==0.3.4)", "Jinja2", "Pillow", "aiohttp", "gradio", "jedi", "numpy", "pydantic (>1.1,<2.0)", "pydantic (>1.1,<3.0)", "pytest", "pytest-asyncio", "pytest-cov", "pytest-env", "pytest-vcr", "pytest-xdist", "soundfile", "urllib3 (<2.0)"] +testing = ["InquirerPy (==0.3.4)", "Jinja2", "Pillow", "aiohttp", "gradio", "jedi", "numpy", "pydantic (>1.1,<2.0)", "pydantic (>1.1,<3.0)", "pytest", "pytest-asyncio", "pytest-cov", "pytest-env", "pytest-rerunfailures", "pytest-vcr", "pytest-xdist", "soundfile", "urllib3 (<2.0)"] torch = ["torch"] typing = ["types-PyYAML", "types-requests", "types-simplejson", "types-toml", "types-tqdm", "types-urllib3", "typing-extensions (>=4.8.0)"] @@ -1326,20 +1528,17 @@ six = "*" [[package]] name = "isort" -version = "5.12.0" +version = "5.13.2" description = "A Python utility / library to sort Python imports." optional = false python-versions = ">=3.8.0" files = [ - {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"}, - {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"}, + {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"}, + {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"}, ] [package.extras] -colors = ["colorama (>=0.4.3)"] -pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"] -plugins = ["setuptools"] -requirements-deprecated-finder = ["pip-api", "pipreqs"] +colors = ["colorama (>=0.4.6)"] [[package]] name = "itsdangerous" @@ -1373,13 +1572,13 @@ testing = ["Django (<3.1)", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] [[package]] name = "jinja2" -version = "3.1.2" +version = "3.1.3" description = "A very fast and expressive template engine." optional = false python-versions = ">=3.7" files = [ - {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"}, - {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, + {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"}, + {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"}, ] [package.dependencies] @@ -1412,13 +1611,13 @@ files = [ [[package]] name = "kubernetes" -version = "28.1.0" +version = "29.0.0" description = "Kubernetes python client" optional = false python-versions = ">=3.6" files = [ - {file = "kubernetes-28.1.0-py2.py3-none-any.whl", hash = "sha256:10f56f8160dcb73647f15fafda268e7f60cf7dbc9f8e46d52fcd46d3beb0c18d"}, - {file = "kubernetes-28.1.0.tar.gz", hash = "sha256:1468069a573430fb1cb5ad22876868f57977930f80a6749405da31cd6086a7e9"}, + {file = "kubernetes-29.0.0-py2.py3-none-any.whl", hash = "sha256:ab8cb0e0576ccdfb71886366efb102c6a20f268d817be065ce7f9909c631e43e"}, + {file = "kubernetes-29.0.0.tar.gz", hash = "sha256:c4812e227ae74d07d53c88293e564e54b850452715a59a927e7e1bc6b9a60459"}, ] [package.dependencies] @@ -1430,7 +1629,7 @@ pyyaml = ">=5.4.1" requests = "*" requests-oauthlib = "*" six = ">=1.9.0" -urllib3 = ">=1.24.2,<2.0" +urllib3 = ">=1.24.2" websocket-client = ">=0.32.0,<0.40.0 || >0.40.0,<0.41.dev0 || >=0.43.dev0" [package.extras] @@ -1438,47 +1637,48 @@ adal = ["adal (>=1.0.2)"] [[package]] name = "lazy-object-proxy" -version = "1.9.0" +version = "1.10.0" description = "A fast and thorough lazy object proxy." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "lazy-object-proxy-1.9.0.tar.gz", hash = "sha256:659fb5809fa4629b8a1ac5106f669cfc7bef26fbb389dda53b3e010d1ac4ebae"}, - {file = "lazy_object_proxy-1.9.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b40387277b0ed2d0602b8293b94d7257e17d1479e257b4de114ea11a8cb7f2d7"}, - {file = "lazy_object_proxy-1.9.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e8c6cfb338b133fbdbc5cfaa10fe3c6aeea827db80c978dbd13bc9dd8526b7d4"}, - {file = "lazy_object_proxy-1.9.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:721532711daa7db0d8b779b0bb0318fa87af1c10d7fe5e52ef30f8eff254d0cd"}, - {file = "lazy_object_proxy-1.9.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:66a3de4a3ec06cd8af3f61b8e1ec67614fbb7c995d02fa224813cb7afefee701"}, - {file = "lazy_object_proxy-1.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1aa3de4088c89a1b69f8ec0dcc169aa725b0ff017899ac568fe44ddc1396df46"}, - {file = "lazy_object_proxy-1.9.0-cp310-cp310-win32.whl", hash = "sha256:f0705c376533ed2a9e5e97aacdbfe04cecd71e0aa84c7c0595d02ef93b6e4455"}, - {file = "lazy_object_proxy-1.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:ea806fd4c37bf7e7ad82537b0757999264d5f70c45468447bb2b91afdbe73a6e"}, - {file = "lazy_object_proxy-1.9.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:946d27deaff6cf8452ed0dba83ba38839a87f4f7a9732e8f9fd4107b21e6ff07"}, - {file = "lazy_object_proxy-1.9.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:79a31b086e7e68b24b99b23d57723ef7e2c6d81ed21007b6281ebcd1688acb0a"}, - {file = "lazy_object_proxy-1.9.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f699ac1c768270c9e384e4cbd268d6e67aebcfae6cd623b4d7c3bfde5a35db59"}, - {file = "lazy_object_proxy-1.9.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bfb38f9ffb53b942f2b5954e0f610f1e721ccebe9cce9025a38c8ccf4a5183a4"}, - {file = "lazy_object_proxy-1.9.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:189bbd5d41ae7a498397287c408617fe5c48633e7755287b21d741f7db2706a9"}, - {file = "lazy_object_proxy-1.9.0-cp311-cp311-win32.whl", hash = "sha256:81fc4d08b062b535d95c9ea70dbe8a335c45c04029878e62d744bdced5141586"}, - {file = "lazy_object_proxy-1.9.0-cp311-cp311-win_amd64.whl", hash = "sha256:f2457189d8257dd41ae9b434ba33298aec198e30adf2dcdaaa3a28b9994f6adb"}, - {file = "lazy_object_proxy-1.9.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d9e25ef10a39e8afe59a5c348a4dbf29b4868ab76269f81ce1674494e2565a6e"}, - {file = "lazy_object_proxy-1.9.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cbf9b082426036e19c6924a9ce90c740a9861e2bdc27a4834fd0a910742ac1e8"}, - {file = "lazy_object_proxy-1.9.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f5fa4a61ce2438267163891961cfd5e32ec97a2c444e5b842d574251ade27d2"}, - {file = "lazy_object_proxy-1.9.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:8fa02eaab317b1e9e03f69aab1f91e120e7899b392c4fc19807a8278a07a97e8"}, - {file = "lazy_object_proxy-1.9.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e7c21c95cae3c05c14aafffe2865bbd5e377cfc1348c4f7751d9dc9a48ca4bda"}, - {file = "lazy_object_proxy-1.9.0-cp37-cp37m-win32.whl", hash = "sha256:f12ad7126ae0c98d601a7ee504c1122bcef553d1d5e0c3bfa77b16b3968d2734"}, - {file = "lazy_object_proxy-1.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:edd20c5a55acb67c7ed471fa2b5fb66cb17f61430b7a6b9c3b4a1e40293b1671"}, - {file = "lazy_object_proxy-1.9.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2d0daa332786cf3bb49e10dc6a17a52f6a8f9601b4cf5c295a4f85854d61de63"}, - {file = "lazy_object_proxy-1.9.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cd077f3d04a58e83d04b20e334f678c2b0ff9879b9375ed107d5d07ff160171"}, - {file = "lazy_object_proxy-1.9.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:660c94ea760b3ce47d1855a30984c78327500493d396eac4dfd8bd82041b22be"}, - {file = "lazy_object_proxy-1.9.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:212774e4dfa851e74d393a2370871e174d7ff0ebc980907723bb67d25c8a7c30"}, - {file = "lazy_object_proxy-1.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f0117049dd1d5635bbff65444496c90e0baa48ea405125c088e93d9cf4525b11"}, - {file = "lazy_object_proxy-1.9.0-cp38-cp38-win32.whl", hash = "sha256:0a891e4e41b54fd5b8313b96399f8b0e173bbbfc03c7631f01efbe29bb0bcf82"}, - {file = "lazy_object_proxy-1.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:9990d8e71b9f6488e91ad25f322898c136b008d87bf852ff65391b004da5e17b"}, - {file = "lazy_object_proxy-1.9.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9e7551208b2aded9c1447453ee366f1c4070602b3d932ace044715d89666899b"}, - {file = "lazy_object_proxy-1.9.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f83ac4d83ef0ab017683d715ed356e30dd48a93746309c8f3517e1287523ef4"}, - {file = "lazy_object_proxy-1.9.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7322c3d6f1766d4ef1e51a465f47955f1e8123caee67dd641e67d539a534d006"}, - {file = "lazy_object_proxy-1.9.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:18b78ec83edbbeb69efdc0e9c1cb41a3b1b1ed11ddd8ded602464c3fc6020494"}, - {file = "lazy_object_proxy-1.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:09763491ce220c0299688940f8dc2c5d05fd1f45af1e42e636b2e8b2303e4382"}, - {file = "lazy_object_proxy-1.9.0-cp39-cp39-win32.whl", hash = "sha256:9090d8e53235aa280fc9239a86ae3ea8ac58eff66a705fa6aa2ec4968b95c821"}, - {file = "lazy_object_proxy-1.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:db1c1722726f47e10e0b5fdbf15ac3b8adb58c091d12b3ab713965795036985f"}, + {file = "lazy-object-proxy-1.10.0.tar.gz", hash = "sha256:78247b6d45f43a52ef35c25b5581459e85117225408a4128a3daf8bf9648ac69"}, + {file = "lazy_object_proxy-1.10.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:855e068b0358ab916454464a884779c7ffa312b8925c6f7401e952dcf3b89977"}, + {file = "lazy_object_proxy-1.10.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ab7004cf2e59f7c2e4345604a3e6ea0d92ac44e1c2375527d56492014e690c3"}, + {file = "lazy_object_proxy-1.10.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc0d2fc424e54c70c4bc06787e4072c4f3b1aa2f897dfdc34ce1013cf3ceef05"}, + {file = "lazy_object_proxy-1.10.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e2adb09778797da09d2b5ebdbceebf7dd32e2c96f79da9052b2e87b6ea495895"}, + {file = "lazy_object_proxy-1.10.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b1f711e2c6dcd4edd372cf5dec5c5a30d23bba06ee012093267b3376c079ec83"}, + {file = "lazy_object_proxy-1.10.0-cp310-cp310-win32.whl", hash = "sha256:76a095cfe6045c7d0ca77db9934e8f7b71b14645f0094ffcd842349ada5c5fb9"}, + {file = "lazy_object_proxy-1.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:b4f87d4ed9064b2628da63830986c3d2dca7501e6018347798313fcf028e2fd4"}, + {file = "lazy_object_proxy-1.10.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fec03caabbc6b59ea4a638bee5fce7117be8e99a4103d9d5ad77f15d6f81020c"}, + {file = "lazy_object_proxy-1.10.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:02c83f957782cbbe8136bee26416686a6ae998c7b6191711a04da776dc9e47d4"}, + {file = "lazy_object_proxy-1.10.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:009e6bb1f1935a62889ddc8541514b6a9e1fcf302667dcb049a0be5c8f613e56"}, + {file = "lazy_object_proxy-1.10.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:75fc59fc450050b1b3c203c35020bc41bd2695ed692a392924c6ce180c6f1dc9"}, + {file = "lazy_object_proxy-1.10.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:782e2c9b2aab1708ffb07d4bf377d12901d7a1d99e5e410d648d892f8967ab1f"}, + {file = "lazy_object_proxy-1.10.0-cp311-cp311-win32.whl", hash = "sha256:edb45bb8278574710e68a6b021599a10ce730d156e5b254941754a9cc0b17d03"}, + {file = "lazy_object_proxy-1.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:e271058822765ad5e3bca7f05f2ace0de58a3f4e62045a8c90a0dfd2f8ad8cc6"}, + {file = "lazy_object_proxy-1.10.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:e98c8af98d5707dcdecc9ab0863c0ea6e88545d42ca7c3feffb6b4d1e370c7ba"}, + {file = "lazy_object_proxy-1.10.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:952c81d415b9b80ea261d2372d2a4a2332a3890c2b83e0535f263ddfe43f0d43"}, + {file = "lazy_object_proxy-1.10.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80b39d3a151309efc8cc48675918891b865bdf742a8616a337cb0090791a0de9"}, + {file = "lazy_object_proxy-1.10.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:e221060b701e2aa2ea991542900dd13907a5c90fa80e199dbf5a03359019e7a3"}, + {file = "lazy_object_proxy-1.10.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:92f09ff65ecff3108e56526f9e2481b8116c0b9e1425325e13245abfd79bdb1b"}, + {file = "lazy_object_proxy-1.10.0-cp312-cp312-win32.whl", hash = "sha256:3ad54b9ddbe20ae9f7c1b29e52f123120772b06dbb18ec6be9101369d63a4074"}, + {file = "lazy_object_proxy-1.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:127a789c75151db6af398b8972178afe6bda7d6f68730c057fbbc2e96b08d282"}, + {file = "lazy_object_proxy-1.10.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9e4ed0518a14dd26092614412936920ad081a424bdcb54cc13349a8e2c6d106a"}, + {file = "lazy_object_proxy-1.10.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ad9e6ed739285919aa9661a5bbed0aaf410aa60231373c5579c6b4801bd883c"}, + {file = "lazy_object_proxy-1.10.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fc0a92c02fa1ca1e84fc60fa258458e5bf89d90a1ddaeb8ed9cc3147f417255"}, + {file = "lazy_object_proxy-1.10.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0aefc7591920bbd360d57ea03c995cebc204b424524a5bd78406f6e1b8b2a5d8"}, + {file = "lazy_object_proxy-1.10.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5faf03a7d8942bb4476e3b62fd0f4cf94eaf4618e304a19865abf89a35c0bbee"}, + {file = "lazy_object_proxy-1.10.0-cp38-cp38-win32.whl", hash = "sha256:e333e2324307a7b5d86adfa835bb500ee70bfcd1447384a822e96495796b0ca4"}, + {file = "lazy_object_proxy-1.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:cb73507defd385b7705c599a94474b1d5222a508e502553ef94114a143ec6696"}, + {file = "lazy_object_proxy-1.10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:366c32fe5355ef5fc8a232c5436f4cc66e9d3e8967c01fb2e6302fd6627e3d94"}, + {file = "lazy_object_proxy-1.10.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2297f08f08a2bb0d32a4265e98a006643cd7233fb7983032bd61ac7a02956b3b"}, + {file = "lazy_object_proxy-1.10.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:18dd842b49456aaa9a7cf535b04ca4571a302ff72ed8740d06b5adcd41fe0757"}, + {file = "lazy_object_proxy-1.10.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:217138197c170a2a74ca0e05bddcd5f1796c735c37d0eee33e43259b192aa424"}, + {file = "lazy_object_proxy-1.10.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9a3a87cf1e133e5b1994144c12ca4aa3d9698517fe1e2ca82977781b16955658"}, + {file = "lazy_object_proxy-1.10.0-cp39-cp39-win32.whl", hash = "sha256:30b339b2a743c5288405aa79a69e706a06e02958eab31859f7f3c04980853b70"}, + {file = "lazy_object_proxy-1.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:a899b10e17743683b293a729d3a11f2f399e8a90c73b089e29f5d0fe3509f0dd"}, + {file = "lazy_object_proxy-1.10.0-pp310.pp311.pp312.pp38.pp39-none-any.whl", hash = "sha256:80fa48bd89c8f2f456fc0765c11c23bf5af827febacd2f523ca5bc1893fcc09d"}, ] [[package]] @@ -1542,75 +1742,91 @@ files = [ [[package]] name = "mmh3" -version = "4.0.1" +version = "4.1.0" description = "Python extension for MurmurHash (MurmurHash3), a set of fast and robust hash functions." optional = false python-versions = "*" files = [ - {file = "mmh3-4.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:b719ba87232749095011d567a36a25e40ed029fc61c47e74a12416d8bb60b311"}, - {file = "mmh3-4.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f0ad423711c5096cf4a346011f3b3ec763208e4f4cc4b10ed41cad2a03dbfaed"}, - {file = "mmh3-4.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:80918e3f8ab6b717af0a388c14ffac5a89c15d827ff008c1ef545b8b32724116"}, - {file = "mmh3-4.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8222cd5f147defa1355b4042d590c34cef9b2bb173a159fcb72cda204061a4ac"}, - {file = "mmh3-4.0.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3821bcd1961ef19247c78c5d01b5a759de82ab0c023e2ff1d5ceed74322fa018"}, - {file = "mmh3-4.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:59f7ed28c24249a54665f1ed3f6c7c1c56618473381080f79bcc0bd1d1db2e4a"}, - {file = "mmh3-4.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dacd8d07d4b9be8f0cb6e8fd9a08fc237c18578cf8d42370ee8af2f5a2bf1967"}, - {file = "mmh3-4.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd00883ef6bcf7831026ce42e773a4b2a4f3a7bf9003a4e781fecb1144b06c1"}, - {file = "mmh3-4.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:df73d1c7f0c50c0f8061cd349968fd9dcc6a9e7592d1c834fa898f9c98f8dd7e"}, - {file = "mmh3-4.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f41eeae98f15af0a4ba2a92bce11d8505b612012af664a7634bbfdba7096f5fc"}, - {file = "mmh3-4.0.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:ce9bb622e9f1162cafd033071b32ac495c5e8d5863fca2a5144c092a0f129a5b"}, - {file = "mmh3-4.0.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:dd92e0ff9edee6af960d9862a3e519d651e6344321fd280fb082654fc96ecc4d"}, - {file = "mmh3-4.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1aefa8ac8c8fc8ad93365477baef2125dbfd7235880a9c47dca2c46a0af49ef7"}, - {file = "mmh3-4.0.1-cp310-cp310-win32.whl", hash = "sha256:a076ea30ec279a63f44f4c203e4547b5710d00581165fed12583d2017139468d"}, - {file = "mmh3-4.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:5aa1e87e448ee1ffa3737b72f2fe3f5960159ab75bbac2f49dca6fb9797132f6"}, - {file = "mmh3-4.0.1-cp310-cp310-win_arm64.whl", hash = "sha256:45155ff2f291c3a1503d1c93e539ab025a13fd8b3f2868650140702b8bd7bfc2"}, - {file = "mmh3-4.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:91f81d6dd4d0c3b4235b4a58a545493c946669c751a2e0f15084171dc2d81fee"}, - {file = "mmh3-4.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:bbfddaf55207798f5b29341e5b3a24dbff91711c51b1665eabc9d910255a78f0"}, - {file = "mmh3-4.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0deb8e19121c0896fdc709209aceda30a367cda47f4a884fcbe56223dbf9e867"}, - {file = "mmh3-4.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df468ac7b61ec7251d7499e27102899ca39d87686f659baf47f84323f8f4541f"}, - {file = "mmh3-4.0.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:84936c113814c6ef3bc4bd3d54f538d7ba312d1d0c2441ac35fdd7d5221c60f6"}, - {file = "mmh3-4.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8b1df3cf5ce5786aa093f45462118d87ff485f0d69699cdc34f6289b1e833632"}, - {file = "mmh3-4.0.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da281aa740aa9e7f9bebb879c1de0ea9366687ece5930f9f5027e7c87d018153"}, - {file = "mmh3-4.0.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ec380933a56eb9fea16d7fcd49f1b5a5c92d7d2b86f25e9a845b72758ee8c42"}, - {file = "mmh3-4.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:2fa905fcec8a30e1c0ef522afae1d6170c4f08e6a88010a582f67c59209fb7c7"}, - {file = "mmh3-4.0.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:9b23a06315a65ef0b78da0be32409cfce0d6d83e51d70dcebd3302a61e4d34ce"}, - {file = "mmh3-4.0.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:36c27089b12026db14be594d750f7ea6d5d785713b40a971b063f033f5354a74"}, - {file = "mmh3-4.0.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:6338341ae6fa5eaa46f69ed9ac3e34e8eecad187b211a6e552e0d8128c568eb1"}, - {file = "mmh3-4.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1aece29e27d0c8fb489d00bb712fba18b4dd10e39c9aec2e216c779ae6400b8f"}, - {file = "mmh3-4.0.1-cp311-cp311-win32.whl", hash = "sha256:2733e2160c142eed359e25e5529915964a693f0d043165b53933f904a731c1b3"}, - {file = "mmh3-4.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:09f9f643e0b7f8d98473efdfcdb155105824a38a1ada374625b84c1208197a9b"}, - {file = "mmh3-4.0.1-cp311-cp311-win_arm64.whl", hash = "sha256:d93422f38bc9c4d808c5438a011b769935a87df92ce277e9e22b6ec0ae8ed2e2"}, - {file = "mmh3-4.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:41013c033dc446d3bfb573621b8b53223adcfcf07be1da0bcbe166d930276882"}, - {file = "mmh3-4.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be46540eac024dd8d9b82899d35b2f23592d3d3850845aba6f10e6127d93246b"}, - {file = "mmh3-4.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0e64114b30c6c1e30f8201433b5fa6108a74a5d6f1a14af1b041360c0dd056aa"}, - {file = "mmh3-4.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:275637ecca755565e3b0505d3ecf8e1e0a51eb6a3cbe6e212ed40943f92f98cd"}, - {file = "mmh3-4.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:955178c8e8d3bc9ad18eab443af670cd13fe18a6b2dba16db2a2a0632be8a133"}, - {file = "mmh3-4.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:750afe0477e0c17904611045ad311ff10bc6c2ec5f5ddc5dd949a2b9bf71d5d5"}, - {file = "mmh3-4.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0b7c18c35e9d6a59d6c5f94a6576f800ff2b500e41cd152ecfc7bb4330f32ba2"}, - {file = "mmh3-4.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5b8635b1fc6b25d93458472c5d682a1a4b9e6c53e7f4ca75d2bf2a18fa9363ae"}, - {file = "mmh3-4.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:057b8de47adee8ad0f2e194ffa445b9845263c1c367ddb335e9ae19c011b25cc"}, - {file = "mmh3-4.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:78c0ee0197cfc912f57172aa16e784ad55b533e2e2e91b3a65188cc66fbb1b6e"}, - {file = "mmh3-4.0.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:d6acb15137467592691e41e6f897db1d2823ff3283111e316aa931ac0b5a5709"}, - {file = "mmh3-4.0.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:f91b2598e1f25e013da070ff641a29ebda76292d3a7bdd20ef1736e9baf0de67"}, - {file = "mmh3-4.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:a78f6f2592395321e2f0dc6b618773398b2c9b15becb419364e0960df53e9f04"}, - {file = "mmh3-4.0.1-cp38-cp38-win32.whl", hash = "sha256:d8650982d0b70af24700bd32b15fab33bb3ef9be4af411100f4960a938b0dd0f"}, - {file = "mmh3-4.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:2489949c7261870a02eeaa2ec7b966881c1775df847c8ce6ea4de3e9d96b5f4f"}, - {file = "mmh3-4.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:dcd03a4bb0fa3db03648d26fb221768862f089b6aec5272f0df782a8b4fe5b5b"}, - {file = "mmh3-4.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3775fb0cc675977e5b506b12b8f23cd220be3d4c2d4db7df81f03c9f61baa4cc"}, - {file = "mmh3-4.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f250f78328d41cdf73d3ad9809359636f4fb7a846d7a6586e1a0f0d2f5f2590"}, - {file = "mmh3-4.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4161009c9077d5ebf8b472dbf0f41b9139b3d380e0bbe71bf9b503efb2965584"}, - {file = "mmh3-4.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2cf986ebf530717fefeee8d0decbf3f359812caebba985e2c8885c0ce7c2ee4e"}, - {file = "mmh3-4.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3b55741ed51e928b1eec94a119e003fa3bc0139f4f9802e19bea3af03f7dd55a"}, - {file = "mmh3-4.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d8250375641b8c5ce5d56a00c6bb29f583516389b8bde0023181d5eba8aa4119"}, - {file = "mmh3-4.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:29373e802bc094ffd490e39047bac372ac893c0f411dac3223ef11775e34acd0"}, - {file = "mmh3-4.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:071ba41e56f5c385d13ee84b288ccaf46b70cd9e9a6d8cbcbe0964dee68c0019"}, - {file = "mmh3-4.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:909e0b88d2c6285481fa6895c2a0faf6384e1b0093f72791aa57d1e04f4adc65"}, - {file = "mmh3-4.0.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:51d356f4380f9d9c2a0612156c3d1e7359933991e84a19304440aa04fd723e68"}, - {file = "mmh3-4.0.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:c4b2549949efa63d8decb6572f7e75fad4f2375d52fafced674323239dd9812d"}, - {file = "mmh3-4.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9bcc7b32a89c4e5c6fdef97d82e8087ba26a20c25b4aaf0723abd0b302525934"}, - {file = "mmh3-4.0.1-cp39-cp39-win32.whl", hash = "sha256:8edee21ae4f4337fb970810ef5a263e5d2212b85daca0d39daf995e13380e908"}, - {file = "mmh3-4.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:8cbb6f90f08952fcc90dbf08f0310fdf4d61096c5cb7db8adf03e23f3b857ae5"}, - {file = "mmh3-4.0.1-cp39-cp39-win_arm64.whl", hash = "sha256:ce71856cbca9d7c74d084eeee1bc5b126ed197c1c9530a4fdb994d099b9bc4db"}, - {file = "mmh3-4.0.1.tar.gz", hash = "sha256:ad8be695dc4e44a79631748ba5562d803f0ac42d36a6b97a53aca84a70809385"}, + {file = "mmh3-4.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:be5ac76a8b0cd8095784e51e4c1c9c318c19edcd1709a06eb14979c8d850c31a"}, + {file = "mmh3-4.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:98a49121afdfab67cd80e912b36404139d7deceb6773a83620137aaa0da5714c"}, + {file = "mmh3-4.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5259ac0535874366e7d1a5423ef746e0d36a9e3c14509ce6511614bdc5a7ef5b"}, + {file = "mmh3-4.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5950827ca0453a2be357696da509ab39646044e3fa15cad364eb65d78797437"}, + {file = "mmh3-4.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1dd0f652ae99585b9dd26de458e5f08571522f0402155809fd1dc8852a613a39"}, + {file = "mmh3-4.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:99d25548070942fab1e4a6f04d1626d67e66d0b81ed6571ecfca511f3edf07e6"}, + {file = "mmh3-4.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:53db8d9bad3cb66c8f35cbc894f336273f63489ce4ac416634932e3cbe79eb5b"}, + {file = "mmh3-4.1.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75da0f615eb55295a437264cc0b736753f830b09d102aa4c2a7d719bc445ec05"}, + {file = "mmh3-4.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b926b07fd678ea84b3a2afc1fa22ce50aeb627839c44382f3d0291e945621e1a"}, + {file = "mmh3-4.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c5b053334f9b0af8559d6da9dc72cef0a65b325ebb3e630c680012323c950bb6"}, + {file = "mmh3-4.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:5bf33dc43cd6de2cb86e0aa73a1cc6530f557854bbbe5d59f41ef6de2e353d7b"}, + {file = "mmh3-4.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:fa7eacd2b830727ba3dd65a365bed8a5c992ecd0c8348cf39a05cc77d22f4970"}, + {file = "mmh3-4.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:42dfd6742b9e3eec599f85270617debfa0bbb913c545bb980c8a4fa7b2d047da"}, + {file = "mmh3-4.1.0-cp310-cp310-win32.whl", hash = "sha256:2974ad343f0d39dcc88e93ee6afa96cedc35a9883bc067febd7ff736e207fa47"}, + {file = "mmh3-4.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:74699a8984ded645c1a24d6078351a056f5a5f1fe5838870412a68ac5e28d865"}, + {file = "mmh3-4.1.0-cp310-cp310-win_arm64.whl", hash = "sha256:f0dc874cedc23d46fc488a987faa6ad08ffa79e44fb08e3cd4d4cf2877c00a00"}, + {file = "mmh3-4.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3280a463855b0eae64b681cd5b9ddd9464b73f81151e87bb7c91a811d25619e6"}, + {file = "mmh3-4.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:97ac57c6c3301769e757d444fa7c973ceb002cb66534b39cbab5e38de61cd896"}, + {file = "mmh3-4.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a7b6502cdb4dbd880244818ab363c8770a48cdccecf6d729ade0241b736b5ec0"}, + {file = "mmh3-4.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:52ba2da04671a9621580ddabf72f06f0e72c1c9c3b7b608849b58b11080d8f14"}, + {file = "mmh3-4.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5a5fef4c4ecc782e6e43fbeab09cff1bac82c998a1773d3a5ee6a3605cde343e"}, + {file = "mmh3-4.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5135358a7e00991f73b88cdc8eda5203bf9de22120d10a834c5761dbeb07dd13"}, + {file = "mmh3-4.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cff9ae76a54f7c6fe0167c9c4028c12c1f6de52d68a31d11b6790bb2ae685560"}, + {file = "mmh3-4.1.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6f02576a4d106d7830ca90278868bf0983554dd69183b7bbe09f2fcd51cf54f"}, + {file = "mmh3-4.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:073d57425a23721730d3ff5485e2da489dd3c90b04e86243dd7211f889898106"}, + {file = "mmh3-4.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:71e32ddec7f573a1a0feb8d2cf2af474c50ec21e7a8263026e8d3b4b629805db"}, + {file = "mmh3-4.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7cbb20b29d57e76a58b40fd8b13a9130db495a12d678d651b459bf61c0714cea"}, + {file = "mmh3-4.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:a42ad267e131d7847076bb7e31050f6c4378cd38e8f1bf7a0edd32f30224d5c9"}, + {file = "mmh3-4.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4a013979fc9390abadc445ea2527426a0e7a4495c19b74589204f9b71bcaafeb"}, + {file = "mmh3-4.1.0-cp311-cp311-win32.whl", hash = "sha256:1d3b1cdad7c71b7b88966301789a478af142bddcb3a2bee563f7a7d40519a00f"}, + {file = "mmh3-4.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:0dc6dc32eb03727467da8e17deffe004fbb65e8b5ee2b502d36250d7a3f4e2ec"}, + {file = "mmh3-4.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:9ae3a5c1b32dda121c7dc26f9597ef7b01b4c56a98319a7fe86c35b8bc459ae6"}, + {file = "mmh3-4.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0033d60c7939168ef65ddc396611077a7268bde024f2c23bdc283a19123f9e9c"}, + {file = "mmh3-4.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d6af3e2287644b2b08b5924ed3a88c97b87b44ad08e79ca9f93d3470a54a41c5"}, + {file = "mmh3-4.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d82eb4defa245e02bb0b0dc4f1e7ee284f8d212633389c91f7fba99ba993f0a2"}, + {file = "mmh3-4.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba245e94b8d54765e14c2d7b6214e832557e7856d5183bc522e17884cab2f45d"}, + {file = "mmh3-4.1.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bb04e2feeabaad6231e89cd43b3d01a4403579aa792c9ab6fdeef45cc58d4ec0"}, + {file = "mmh3-4.1.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1e3b1a27def545ce11e36158ba5d5390cdbc300cfe456a942cc89d649cf7e3b2"}, + {file = "mmh3-4.1.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce0ab79ff736d7044e5e9b3bfe73958a55f79a4ae672e6213e92492ad5e734d5"}, + {file = "mmh3-4.1.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b02268be6e0a8eeb8a924d7db85f28e47344f35c438c1e149878bb1c47b1cd3"}, + {file = "mmh3-4.1.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:deb887f5fcdaf57cf646b1e062d56b06ef2f23421c80885fce18b37143cba828"}, + {file = "mmh3-4.1.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:99dd564e9e2b512eb117bd0cbf0f79a50c45d961c2a02402787d581cec5448d5"}, + {file = "mmh3-4.1.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:08373082dfaa38fe97aa78753d1efd21a1969e51079056ff552e687764eafdfe"}, + {file = "mmh3-4.1.0-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:54b9c6a2ea571b714e4fe28d3e4e2db37abfd03c787a58074ea21ee9a8fd1740"}, + {file = "mmh3-4.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a7b1edf24c69e3513f879722b97ca85e52f9032f24a52284746877f6a7304086"}, + {file = "mmh3-4.1.0-cp312-cp312-win32.whl", hash = "sha256:411da64b951f635e1e2284b71d81a5a83580cea24994b328f8910d40bed67276"}, + {file = "mmh3-4.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:bebc3ecb6ba18292e3d40c8712482b4477abd6981c2ebf0e60869bd90f8ac3a9"}, + {file = "mmh3-4.1.0-cp312-cp312-win_arm64.whl", hash = "sha256:168473dd608ade6a8d2ba069600b35199a9af837d96177d3088ca91f2b3798e3"}, + {file = "mmh3-4.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:372f4b7e1dcde175507640679a2a8790185bb71f3640fc28a4690f73da986a3b"}, + {file = "mmh3-4.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:438584b97f6fe13e944faf590c90fc127682b57ae969f73334040d9fa1c7ffa5"}, + {file = "mmh3-4.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6e27931b232fc676675fac8641c6ec6b596daa64d82170e8597f5a5b8bdcd3b6"}, + {file = "mmh3-4.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:571a92bad859d7b0330e47cfd1850b76c39b615a8d8e7aa5853c1f971fd0c4b1"}, + {file = "mmh3-4.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a69d6afe3190fa08f9e3a58e5145549f71f1f3fff27bd0800313426929c7068"}, + {file = "mmh3-4.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:afb127be0be946b7630220908dbea0cee0d9d3c583fa9114a07156f98566dc28"}, + {file = "mmh3-4.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:940d86522f36348ef1a494cbf7248ab3f4a1638b84b59e6c9e90408bd11ad729"}, + {file = "mmh3-4.1.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3dcccc4935686619a8e3d1f7b6e97e3bd89a4a796247930ee97d35ea1a39341"}, + {file = "mmh3-4.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:01bb9b90d61854dfc2407c5e5192bfb47222d74f29d140cb2dd2a69f2353f7cc"}, + {file = "mmh3-4.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:bcb1b8b951a2c0b0fb8a5426c62a22557e2ffc52539e0a7cc46eb667b5d606a9"}, + {file = "mmh3-4.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:6477a05d5e5ab3168e82e8b106e316210ac954134f46ec529356607900aea82a"}, + {file = "mmh3-4.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:da5892287e5bea6977364b15712a2573c16d134bc5fdcdd4cf460006cf849278"}, + {file = "mmh3-4.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:99180d7fd2327a6fffbaff270f760576839dc6ee66d045fa3a450f3490fda7f5"}, + {file = "mmh3-4.1.0-cp38-cp38-win32.whl", hash = "sha256:9b0d4f3949913a9f9a8fb1bb4cc6ecd52879730aab5ff8c5a3d8f5b593594b73"}, + {file = "mmh3-4.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:598c352da1d945108aee0c3c3cfdd0e9b3edef74108f53b49d481d3990402169"}, + {file = "mmh3-4.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:475d6d1445dd080f18f0f766277e1237fa2914e5fe3307a3b2a3044f30892103"}, + {file = "mmh3-4.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5ca07c41e6a2880991431ac717c2a049056fff497651a76e26fc22224e8b5732"}, + {file = "mmh3-4.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0ebe052fef4bbe30c0548d12ee46d09f1b69035ca5208a7075e55adfe091be44"}, + {file = "mmh3-4.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eaefd42e85afb70f2b855a011f7b4d8a3c7e19c3f2681fa13118e4d8627378c5"}, + {file = "mmh3-4.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0ae43caae5a47afe1b63a1ae3f0986dde54b5fb2d6c29786adbfb8edc9edfb"}, + {file = "mmh3-4.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6218666f74c8c013c221e7f5f8a693ac9cf68e5ac9a03f2373b32d77c48904de"}, + {file = "mmh3-4.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ac59294a536ba447b5037f62d8367d7d93b696f80671c2c45645fa9f1109413c"}, + {file = "mmh3-4.1.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:086844830fcd1e5c84fec7017ea1ee8491487cfc877847d96f86f68881569d2e"}, + {file = "mmh3-4.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e42b38fad664f56f77f6fbca22d08450f2464baa68acdbf24841bf900eb98e87"}, + {file = "mmh3-4.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d08b790a63a9a1cde3b5d7d733ed97d4eb884bfbc92f075a091652d6bfd7709a"}, + {file = "mmh3-4.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:73ea4cc55e8aea28c86799ecacebca09e5f86500414870a8abaedfcbaf74d288"}, + {file = "mmh3-4.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:f90938ff137130e47bcec8dc1f4ceb02f10178c766e2ef58a9f657ff1f62d124"}, + {file = "mmh3-4.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:aa1f13e94b8631c8cd53259250556edcf1de71738936b60febba95750d9632bd"}, + {file = "mmh3-4.1.0-cp39-cp39-win32.whl", hash = "sha256:a3b680b471c181490cf82da2142029edb4298e1bdfcb67c76922dedef789868d"}, + {file = "mmh3-4.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:fefef92e9c544a8dbc08f77a8d1b6d48006a750c4375bbcd5ff8199d761e263b"}, + {file = "mmh3-4.1.0-cp39-cp39-win_arm64.whl", hash = "sha256:8e2c1f6a2b41723a4f82bd5a762a777836d29d664fc0095f17910bea0adfd4a6"}, + {file = "mmh3-4.1.0.tar.gz", hash = "sha256:a1cf25348b9acd229dda464a094d6170f47d2850a1fcb762a3b6172d2ce6ca4a"}, ] [package.extras] @@ -1834,47 +2050,47 @@ twitter = ["twython"] [[package]] name = "numpy" -version = "1.26.2" +version = "1.26.3" description = "Fundamental package for array computing in Python" optional = false python-versions = ">=3.9" files = [ - {file = "numpy-1.26.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3703fc9258a4a122d17043e57b35e5ef1c5a5837c3db8be396c82e04c1cf9b0f"}, - {file = "numpy-1.26.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cc392fdcbd21d4be6ae1bb4475a03ce3b025cd49a9be5345d76d7585aea69440"}, - {file = "numpy-1.26.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36340109af8da8805d8851ef1d74761b3b88e81a9bd80b290bbfed61bd2b4f75"}, - {file = "numpy-1.26.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bcc008217145b3d77abd3e4d5ef586e3bdfba8fe17940769f8aa09b99e856c00"}, - {file = "numpy-1.26.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:3ced40d4e9e18242f70dd02d739e44698df3dcb010d31f495ff00a31ef6014fe"}, - {file = "numpy-1.26.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b272d4cecc32c9e19911891446b72e986157e6a1809b7b56518b4f3755267523"}, - {file = "numpy-1.26.2-cp310-cp310-win32.whl", hash = "sha256:22f8fc02fdbc829e7a8c578dd8d2e15a9074b630d4da29cda483337e300e3ee9"}, - {file = "numpy-1.26.2-cp310-cp310-win_amd64.whl", hash = "sha256:26c9d33f8e8b846d5a65dd068c14e04018d05533b348d9eaeef6c1bd787f9919"}, - {file = "numpy-1.26.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b96e7b9c624ef3ae2ae0e04fa9b460f6b9f17ad8b4bec6d7756510f1f6c0c841"}, - {file = "numpy-1.26.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:aa18428111fb9a591d7a9cc1b48150097ba6a7e8299fb56bdf574df650e7d1f1"}, - {file = "numpy-1.26.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:06fa1ed84aa60ea6ef9f91ba57b5ed963c3729534e6e54055fc151fad0423f0a"}, - {file = "numpy-1.26.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96ca5482c3dbdd051bcd1fce8034603d6ebfc125a7bd59f55b40d8f5d246832b"}, - {file = "numpy-1.26.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:854ab91a2906ef29dc3925a064fcd365c7b4da743f84b123002f6139bcb3f8a7"}, - {file = "numpy-1.26.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f43740ab089277d403aa07567be138fc2a89d4d9892d113b76153e0e412409f8"}, - {file = "numpy-1.26.2-cp311-cp311-win32.whl", hash = "sha256:a2bbc29fcb1771cd7b7425f98b05307776a6baf43035d3b80c4b0f29e9545186"}, - {file = "numpy-1.26.2-cp311-cp311-win_amd64.whl", hash = "sha256:2b3fca8a5b00184828d12b073af4d0fc5fdd94b1632c2477526f6bd7842d700d"}, - {file = "numpy-1.26.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:a4cd6ed4a339c21f1d1b0fdf13426cb3b284555c27ac2f156dfdaaa7e16bfab0"}, - {file = "numpy-1.26.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5d5244aabd6ed7f312268b9247be47343a654ebea52a60f002dc70c769048e75"}, - {file = "numpy-1.26.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a3cdb4d9c70e6b8c0814239ead47da00934666f668426fc6e94cce869e13fd7"}, - {file = "numpy-1.26.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa317b2325f7aa0a9471663e6093c210cb2ae9c0ad824732b307d2c51983d5b6"}, - {file = "numpy-1.26.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:174a8880739c16c925799c018f3f55b8130c1f7c8e75ab0a6fa9d41cab092fd6"}, - {file = "numpy-1.26.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:f79b231bf5c16b1f39c7f4875e1ded36abee1591e98742b05d8a0fb55d8a3eec"}, - {file = "numpy-1.26.2-cp312-cp312-win32.whl", hash = "sha256:4a06263321dfd3598cacb252f51e521a8cb4b6df471bb12a7ee5cbab20ea9167"}, - {file = "numpy-1.26.2-cp312-cp312-win_amd64.whl", hash = "sha256:b04f5dc6b3efdaab541f7857351aac359e6ae3c126e2edb376929bd3b7f92d7e"}, - {file = "numpy-1.26.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4eb8df4bf8d3d90d091e0146f6c28492b0be84da3e409ebef54349f71ed271ef"}, - {file = "numpy-1.26.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1a13860fdcd95de7cf58bd6f8bc5a5ef81c0b0625eb2c9a783948847abbef2c2"}, - {file = "numpy-1.26.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:64308ebc366a8ed63fd0bf426b6a9468060962f1a4339ab1074c228fa6ade8e3"}, - {file = "numpy-1.26.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baf8aab04a2c0e859da118f0b38617e5ee65d75b83795055fb66c0d5e9e9b818"}, - {file = "numpy-1.26.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d73a3abcac238250091b11caef9ad12413dab01669511779bc9b29261dd50210"}, - {file = "numpy-1.26.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b361d369fc7e5e1714cf827b731ca32bff8d411212fccd29ad98ad622449cc36"}, - {file = "numpy-1.26.2-cp39-cp39-win32.whl", hash = "sha256:bd3f0091e845164a20bd5a326860c840fe2af79fa12e0469a12768a3ec578d80"}, - {file = "numpy-1.26.2-cp39-cp39-win_amd64.whl", hash = "sha256:2beef57fb031dcc0dc8fa4fe297a742027b954949cabb52a2a376c144e5e6060"}, - {file = "numpy-1.26.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:1cc3d5029a30fb5f06704ad6b23b35e11309491c999838c31f124fee32107c79"}, - {file = "numpy-1.26.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94cc3c222bb9fb5a12e334d0479b97bb2df446fbe622b470928f5284ffca3f8d"}, - {file = "numpy-1.26.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:fe6b44fb8fcdf7eda4ef4461b97b3f63c466b27ab151bec2366db8b197387841"}, - {file = "numpy-1.26.2.tar.gz", hash = "sha256:f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea"}, + {file = "numpy-1.26.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:806dd64230dbbfaca8a27faa64e2f414bf1c6622ab78cc4264f7f5f028fee3bf"}, + {file = "numpy-1.26.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:02f98011ba4ab17f46f80f7f8f1c291ee7d855fcef0a5a98db80767a468c85cd"}, + {file = "numpy-1.26.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d45b3ec2faed4baca41c76617fcdcfa4f684ff7a151ce6fc78ad3b6e85af0a6"}, + {file = "numpy-1.26.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bdd2b45bf079d9ad90377048e2747a0c82351989a2165821f0c96831b4a2a54b"}, + {file = "numpy-1.26.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:211ddd1e94817ed2d175b60b6374120244a4dd2287f4ece45d49228b4d529178"}, + {file = "numpy-1.26.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b1240f767f69d7c4c8a29adde2310b871153df9b26b5cb2b54a561ac85146485"}, + {file = "numpy-1.26.3-cp310-cp310-win32.whl", hash = "sha256:21a9484e75ad018974a2fdaa216524d64ed4212e418e0a551a2d83403b0531d3"}, + {file = "numpy-1.26.3-cp310-cp310-win_amd64.whl", hash = "sha256:9e1591f6ae98bcfac2a4bbf9221c0b92ab49762228f38287f6eeb5f3f55905ce"}, + {file = "numpy-1.26.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b831295e5472954104ecb46cd98c08b98b49c69fdb7040483aff799a755a7374"}, + {file = "numpy-1.26.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9e87562b91f68dd8b1c39149d0323b42e0082db7ddb8e934ab4c292094d575d6"}, + {file = "numpy-1.26.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c66d6fec467e8c0f975818c1796d25c53521124b7cfb760114be0abad53a0a2"}, + {file = "numpy-1.26.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f25e2811a9c932e43943a2615e65fc487a0b6b49218899e62e426e7f0a57eeda"}, + {file = "numpy-1.26.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:af36e0aa45e25c9f57bf684b1175e59ea05d9a7d3e8e87b7ae1a1da246f2767e"}, + {file = "numpy-1.26.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:51c7f1b344f302067b02e0f5b5d2daa9ed4a721cf49f070280ac202738ea7f00"}, + {file = "numpy-1.26.3-cp311-cp311-win32.whl", hash = "sha256:7ca4f24341df071877849eb2034948459ce3a07915c2734f1abb4018d9c49d7b"}, + {file = "numpy-1.26.3-cp311-cp311-win_amd64.whl", hash = "sha256:39763aee6dfdd4878032361b30b2b12593fb445ddb66bbac802e2113eb8a6ac4"}, + {file = "numpy-1.26.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:a7081fd19a6d573e1a05e600c82a1c421011db7935ed0d5c483e9dd96b99cf13"}, + {file = "numpy-1.26.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12c70ac274b32bc00c7f61b515126c9205323703abb99cd41836e8125ea0043e"}, + {file = "numpy-1.26.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7f784e13e598e9594750b2ef6729bcd5a47f6cfe4a12cca13def35e06d8163e3"}, + {file = "numpy-1.26.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5f24750ef94d56ce6e33e4019a8a4d68cfdb1ef661a52cdaee628a56d2437419"}, + {file = "numpy-1.26.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:77810ef29e0fb1d289d225cabb9ee6cf4d11978a00bb99f7f8ec2132a84e0166"}, + {file = "numpy-1.26.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8ed07a90f5450d99dad60d3799f9c03c6566709bd53b497eb9ccad9a55867f36"}, + {file = "numpy-1.26.3-cp312-cp312-win32.whl", hash = "sha256:f73497e8c38295aaa4741bdfa4fda1a5aedda5473074369eca10626835445511"}, + {file = "numpy-1.26.3-cp312-cp312-win_amd64.whl", hash = "sha256:da4b0c6c699a0ad73c810736303f7fbae483bcb012e38d7eb06a5e3b432c981b"}, + {file = "numpy-1.26.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1666f634cb3c80ccbd77ec97bc17337718f56d6658acf5d3b906ca03e90ce87f"}, + {file = "numpy-1.26.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:18c3319a7d39b2c6a9e3bb75aab2304ab79a811ac0168a671a62e6346c29b03f"}, + {file = "numpy-1.26.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b7e807d6888da0db6e7e75838444d62495e2b588b99e90dd80c3459594e857b"}, + {file = "numpy-1.26.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b4d362e17bcb0011738c2d83e0a65ea8ce627057b2fdda37678f4374a382a137"}, + {file = "numpy-1.26.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b8c275f0ae90069496068c714387b4a0eba5d531aace269559ff2b43655edd58"}, + {file = "numpy-1.26.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:cc0743f0302b94f397a4a65a660d4cd24267439eb16493fb3caad2e4389bccbb"}, + {file = "numpy-1.26.3-cp39-cp39-win32.whl", hash = "sha256:9bc6d1a7f8cedd519c4b7b1156d98e051b726bf160715b769106661d567b3f03"}, + {file = "numpy-1.26.3-cp39-cp39-win_amd64.whl", hash = "sha256:867e3644e208c8922a3be26fc6bbf112a035f50f0a86497f98f228c50c607bb2"}, + {file = "numpy-1.26.3-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:3c67423b3703f8fbd90f5adaa37f85b5794d3366948efe9a5190a5f3a83fc34e"}, + {file = "numpy-1.26.3-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:46f47ee566d98849323f01b349d58f2557f02167ee301e5e28809a8c0e27a2d0"}, + {file = "numpy-1.26.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a8474703bffc65ca15853d5fd4d06b18138ae90c17c8d12169968e998e448bb5"}, + {file = "numpy-1.26.3.tar.gz", hash = "sha256:697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4"}, ] [[package]] @@ -2077,36 +2293,36 @@ sympy = "*" [[package]] name = "openai" -version = "1.3.7" +version = "1.7.2" description = "The official Python library for the openai API" optional = false python-versions = ">=3.7.1" files = [ - {file = "openai-1.3.7-py3-none-any.whl", hash = "sha256:e5c51367a910297e4d1cd33d2298fb87d7edf681edbe012873925ac16f95bee0"}, - {file = "openai-1.3.7.tar.gz", hash = "sha256:18074a0f51f9b49d1ae268c7abc36f7f33212a0c0d08ce11b7053ab2d17798de"}, + {file = "openai-1.7.2-py3-none-any.whl", hash = "sha256:8f41b90a762f5fd9d182b45851041386fed94c8ad240a70abefee61a68e0ef53"}, + {file = "openai-1.7.2.tar.gz", hash = "sha256:c73c78878258b07f1b468b0602c6591f25a1478f49ecb90b9bd44b7cc80bce73"}, ] [package.dependencies] -anyio = ">=3.5.0,<4" +anyio = ">=3.5.0,<5" distro = ">=1.7.0,<2" httpx = ">=0.23.0,<1" pydantic = ">=1.9.0,<3" sniffio = "*" tqdm = ">4" -typing-extensions = ">=4.5,<5" +typing-extensions = ">=4.7,<5" [package.extras] datalib = ["numpy (>=1)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"] [[package]] name = "opentelemetry-api" -version = "1.21.0" +version = "1.22.0" description = "OpenTelemetry Python API" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_api-1.21.0-py3-none-any.whl", hash = "sha256:4bb86b28627b7e41098f0e93280fe4892a1abed1b79a19aec6f928f39b17dffb"}, - {file = "opentelemetry_api-1.21.0.tar.gz", hash = "sha256:d6185fd5043e000075d921822fd2d26b953eba8ca21b1e2fa360dd46a7686316"}, + {file = "opentelemetry_api-1.22.0-py3-none-any.whl", hash = "sha256:43621514301a7e9f5d06dd8013a1b450f30c2e9372b8e30aaeb4562abf2ce034"}, + {file = "opentelemetry_api-1.22.0.tar.gz", hash = "sha256:15ae4ca925ecf9cfdfb7a709250846fbb08072260fca08ade78056c502b86bed"}, ] [package.dependencies] @@ -2115,28 +2331,28 @@ importlib-metadata = ">=6.0,<7.0" [[package]] name = "opentelemetry-exporter-otlp-proto-common" -version = "1.21.0" +version = "1.22.0" description = "OpenTelemetry Protobuf encoding" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_exporter_otlp_proto_common-1.21.0-py3-none-any.whl", hash = "sha256:97b1022b38270ec65d11fbfa348e0cd49d12006485c2321ea3b1b7037d42b6ec"}, - {file = "opentelemetry_exporter_otlp_proto_common-1.21.0.tar.gz", hash = "sha256:61db274d8a68d636fb2ec2a0f281922949361cdd8236e25ff5539edf942b3226"}, + {file = "opentelemetry_exporter_otlp_proto_common-1.22.0-py3-none-any.whl", hash = "sha256:3f2538bec5312587f8676c332b3747f54c89fe6364803a807e217af4603201fa"}, + {file = "opentelemetry_exporter_otlp_proto_common-1.22.0.tar.gz", hash = "sha256:71ae2f81bc6d6fe408d06388826edc8933759b2ca3a97d24054507dc7cfce52d"}, ] [package.dependencies] backoff = {version = ">=1.10.0,<3.0.0", markers = "python_version >= \"3.7\""} -opentelemetry-proto = "1.21.0" +opentelemetry-proto = "1.22.0" [[package]] name = "opentelemetry-exporter-otlp-proto-grpc" -version = "1.21.0" +version = "1.22.0" description = "OpenTelemetry Collector Protobuf over gRPC Exporter" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_exporter_otlp_proto_grpc-1.21.0-py3-none-any.whl", hash = "sha256:ab37c63d6cb58d6506f76d71d07018eb1f561d83e642a8f5aa53dddf306087a4"}, - {file = "opentelemetry_exporter_otlp_proto_grpc-1.21.0.tar.gz", hash = "sha256:a497c5611245a2d17d9aa1e1cbb7ab567843d53231dcc844a62cea9f0924ffa7"}, + {file = "opentelemetry_exporter_otlp_proto_grpc-1.22.0-py3-none-any.whl", hash = "sha256:b5bcadc129272004316a455e9081216d3380c1fc2231a928ea6a70aa90e173fb"}, + {file = "opentelemetry_exporter_otlp_proto_grpc-1.22.0.tar.gz", hash = "sha256:1e0e5aa4bbabc74942f06f268deffd94851d12a8dc30b02527472ef1729fe5b1"}, ] [package.dependencies] @@ -2145,22 +2361,22 @@ deprecated = ">=1.2.6" googleapis-common-protos = ">=1.52,<2.0" grpcio = ">=1.0.0,<2.0.0" opentelemetry-api = ">=1.15,<2.0" -opentelemetry-exporter-otlp-proto-common = "1.21.0" -opentelemetry-proto = "1.21.0" -opentelemetry-sdk = ">=1.21.0,<1.22.0" +opentelemetry-exporter-otlp-proto-common = "1.22.0" +opentelemetry-proto = "1.22.0" +opentelemetry-sdk = ">=1.22.0,<1.23.0" [package.extras] test = ["pytest-grpc"] [[package]] name = "opentelemetry-instrumentation" -version = "0.42b0" +version = "0.43b0" description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_instrumentation-0.42b0-py3-none-any.whl", hash = "sha256:65ae54ddb90ca2d05d2d16bf6863173e7141eba1bbbf41fc9bbb02446adbe369"}, - {file = "opentelemetry_instrumentation-0.42b0.tar.gz", hash = "sha256:6a653a1fed0f76eea32885321d77c750483e987eeefa4cbf219fc83559543198"}, + {file = "opentelemetry_instrumentation-0.43b0-py3-none-any.whl", hash = "sha256:0ff1334d7e359e27640e9d420024efeb73eacae464309c2e14ede7ba6c93967e"}, + {file = "opentelemetry_instrumentation-0.43b0.tar.gz", hash = "sha256:c3755da6c4be8033be0216d0501e11f4832690f4e2eca5a3576fbf113498f0f6"}, ] [package.dependencies] @@ -2170,57 +2386,57 @@ wrapt = ">=1.0.0,<2.0.0" [[package]] name = "opentelemetry-instrumentation-asgi" -version = "0.42b0" +version = "0.43b0" description = "ASGI instrumentation for OpenTelemetry" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_instrumentation_asgi-0.42b0-py3-none-any.whl", hash = "sha256:79b7278fb614aba1bf2211060960d3e8501c1d7d9314b857b30ad80ba34a2805"}, - {file = "opentelemetry_instrumentation_asgi-0.42b0.tar.gz", hash = "sha256:da1d5dd4f172c44c6c100dae352e1fd0ae36dc4f266b3fed68ce9d5ab94c9146"}, + {file = "opentelemetry_instrumentation_asgi-0.43b0-py3-none-any.whl", hash = "sha256:1f593829fa039e9367820736fb063e92acd15c25b53d7bcb5d319971b8e93fd7"}, + {file = "opentelemetry_instrumentation_asgi-0.43b0.tar.gz", hash = "sha256:3f6f19333dca31ef696672e4e36cb1c2613c71dc7e847c11ff36a37e1130dadc"}, ] [package.dependencies] asgiref = ">=3.0,<4.0" opentelemetry-api = ">=1.12,<2.0" -opentelemetry-instrumentation = "0.42b0" -opentelemetry-semantic-conventions = "0.42b0" -opentelemetry-util-http = "0.42b0" +opentelemetry-instrumentation = "0.43b0" +opentelemetry-semantic-conventions = "0.43b0" +opentelemetry-util-http = "0.43b0" [package.extras] instruments = ["asgiref (>=3.0,<4.0)"] -test = ["opentelemetry-instrumentation-asgi[instruments]", "opentelemetry-test-utils (==0.42b0)"] +test = ["opentelemetry-instrumentation-asgi[instruments]", "opentelemetry-test-utils (==0.43b0)"] [[package]] name = "opentelemetry-instrumentation-fastapi" -version = "0.42b0" +version = "0.43b0" description = "OpenTelemetry FastAPI Instrumentation" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_instrumentation_fastapi-0.42b0-py3-none-any.whl", hash = "sha256:d53a26c4859767d5ba67109038cabc7165d97a8a8b7654ccde4ce290036d1725"}, - {file = "opentelemetry_instrumentation_fastapi-0.42b0.tar.gz", hash = "sha256:7181d4886e57182e93477c4b797a7cd5467820b93c238eeb3e7d27a563c176e8"}, + {file = "opentelemetry_instrumentation_fastapi-0.43b0-py3-none-any.whl", hash = "sha256:b79c044df68a52e07b35fa12a424e7cc0dd27ff0a171c5fdcc41dea9de8fc938"}, + {file = "opentelemetry_instrumentation_fastapi-0.43b0.tar.gz", hash = "sha256:2afaaf470622e1a2732182c68f6d2431ffe5e026a7edacd0f83605632b66347f"}, ] [package.dependencies] opentelemetry-api = ">=1.12,<2.0" -opentelemetry-instrumentation = "0.42b0" -opentelemetry-instrumentation-asgi = "0.42b0" -opentelemetry-semantic-conventions = "0.42b0" -opentelemetry-util-http = "0.42b0" +opentelemetry-instrumentation = "0.43b0" +opentelemetry-instrumentation-asgi = "0.43b0" +opentelemetry-semantic-conventions = "0.43b0" +opentelemetry-util-http = "0.43b0" [package.extras] instruments = ["fastapi (>=0.58,<1.0)"] -test = ["httpx (>=0.22,<1.0)", "opentelemetry-instrumentation-fastapi[instruments]", "opentelemetry-test-utils (==0.42b0)", "requests (>=2.23,<3.0)"] +test = ["httpx (>=0.22,<1.0)", "opentelemetry-instrumentation-fastapi[instruments]", "opentelemetry-test-utils (==0.43b0)", "requests (>=2.23,<3.0)"] [[package]] name = "opentelemetry-proto" -version = "1.21.0" +version = "1.22.0" description = "OpenTelemetry Python Proto" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_proto-1.21.0-py3-none-any.whl", hash = "sha256:32fc4248e83eebd80994e13963e683f25f3b443226336bb12b5b6d53638f50ba"}, - {file = "opentelemetry_proto-1.21.0.tar.gz", hash = "sha256:7d5172c29ed1b525b5ecf4ebe758c7138a9224441b3cfe683d0a237c33b1941f"}, + {file = "opentelemetry_proto-1.22.0-py3-none-any.whl", hash = "sha256:ce7188d22c75b6d0fe53e7fb58501613d0feade5139538e79dedd9420610fa0c"}, + {file = "opentelemetry_proto-1.22.0.tar.gz", hash = "sha256:9ec29169286029f17ca34ec1f3455802ffb90131642d2f545ece9a63e8f69003"}, ] [package.dependencies] @@ -2228,40 +2444,40 @@ protobuf = ">=3.19,<5.0" [[package]] name = "opentelemetry-sdk" -version = "1.21.0" +version = "1.22.0" description = "OpenTelemetry Python SDK" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_sdk-1.21.0-py3-none-any.whl", hash = "sha256:9fe633243a8c655fedace3a0b89ccdfc654c0290ea2d8e839bd5db3131186f73"}, - {file = "opentelemetry_sdk-1.21.0.tar.gz", hash = "sha256:3ec8cd3020328d6bc5c9991ccaf9ae820ccb6395a5648d9a95d3ec88275b8879"}, + {file = "opentelemetry_sdk-1.22.0-py3-none-any.whl", hash = "sha256:a730555713d7c8931657612a88a141e3a4fe6eb5523d9e2d5a8b1e673d76efa6"}, + {file = "opentelemetry_sdk-1.22.0.tar.gz", hash = "sha256:45267ac1f38a431fc2eb5d6e0c0d83afc0b78de57ac345488aa58c28c17991d0"}, ] [package.dependencies] -opentelemetry-api = "1.21.0" -opentelemetry-semantic-conventions = "0.42b0" +opentelemetry-api = "1.22.0" +opentelemetry-semantic-conventions = "0.43b0" typing-extensions = ">=3.7.4" [[package]] name = "opentelemetry-semantic-conventions" -version = "0.42b0" +version = "0.43b0" description = "OpenTelemetry Semantic Conventions" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_semantic_conventions-0.42b0-py3-none-any.whl", hash = "sha256:5cd719cbfec448af658860796c5d0fcea2fdf0945a2bed2363f42cb1ee39f526"}, - {file = "opentelemetry_semantic_conventions-0.42b0.tar.gz", hash = "sha256:44ae67a0a3252a05072877857e5cc1242c98d4cf12870159f1a94bec800d38ec"}, + {file = "opentelemetry_semantic_conventions-0.43b0-py3-none-any.whl", hash = "sha256:291284d7c1bf15fdaddf309b3bd6d3b7ce12a253cec6d27144439819a15d8445"}, + {file = "opentelemetry_semantic_conventions-0.43b0.tar.gz", hash = "sha256:b9576fb890df479626fa624e88dde42d3d60b8b6c8ae1152ad157a8b97358635"}, ] [[package]] name = "opentelemetry-util-http" -version = "0.42b0" +version = "0.43b0" description = "Web util for OpenTelemetry" optional = false python-versions = ">=3.7" files = [ - {file = "opentelemetry_util_http-0.42b0-py3-none-any.whl", hash = "sha256:764069ed2f7e9a98ed1a7a87111f838000484e388e81f467405933be4b0306c6"}, - {file = "opentelemetry_util_http-0.42b0.tar.gz", hash = "sha256:665e7d372837811aa08cbb9102d4da862441d1c9b1795d649ef08386c8a3cbbd"}, + {file = "opentelemetry_util_http-0.43b0-py3-none-any.whl", hash = "sha256:f25a820784b030f6cb86b3d76e5676c769b75ed3f55a210bcdae0a5e175ebadb"}, + {file = "opentelemetry_util_http-0.43b0.tar.gz", hash = "sha256:3ff6ab361dbe99fc81200d625603c0fb890c055c6e416a3e6d661ddf47a6c7f7"}, ] [[package]] @@ -2347,13 +2563,13 @@ files = [ [[package]] name = "paramiko" -version = "3.3.1" +version = "3.4.0" description = "SSH2 protocol library" optional = false python-versions = ">=3.6" files = [ - {file = "paramiko-3.3.1-py3-none-any.whl", hash = "sha256:b7bc5340a43de4287bbe22fe6de728aa2c22468b2a849615498dd944c2f275eb"}, - {file = "paramiko-3.3.1.tar.gz", hash = "sha256:6a3777a961ac86dbef375c5f5b8d50014a1a96d0fd7f054a43bc880134b0ff77"}, + {file = "paramiko-3.4.0-py3-none-any.whl", hash = "sha256:43f0b51115a896f9c00f59618023484cb3a14b98bbceab43394a39c6739b7ee7"}, + {file = "paramiko-3.4.0.tar.gz", hash = "sha256:aac08f26a31dc4dffd92821527d1682d99d52f9ef6851968114a8728f3c274d3"}, ] [package.dependencies] @@ -2383,13 +2599,13 @@ testing = ["docopt", "pytest (<6.0.0)"] [[package]] name = "pathspec" -version = "0.11.2" +version = "0.12.1" description = "Utility library for gitignore style pattern matching of file paths." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"}, - {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"}, + {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"}, + {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"}, ] [[package]] @@ -2528,13 +2744,13 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "posthog" -version = "3.1.0" +version = "3.3.1" description = "Integrate PostHog into any python application." optional = false python-versions = "*" files = [ - {file = "posthog-3.1.0-py2.py3-none-any.whl", hash = "sha256:acd033530bdfc275dce5587f205f62378991ecb9b7cd5479e79c7f4ac575d319"}, - {file = "posthog-3.1.0.tar.gz", hash = "sha256:db17a2c511e18757aec12b6632ddcc1fa318743dad88a4666010467a3d9468da"}, + {file = "posthog-3.3.1-py2.py3-none-any.whl", hash = "sha256:5f53b232acb680a0389e372db5f786061a18386b8b5324bddcc64eff9fdb319b"}, + {file = "posthog-3.3.1.tar.gz", hash = "sha256:252cb6ab5cbe7ff002753f34fb647721b3af75034b4a5a631317ebf3db58fe59"}, ] [package.dependencies] @@ -2568,13 +2784,13 @@ tests = ["pytest", "pytest-cov", "pytest-lazy-fixture"] [[package]] name = "prompt-toolkit" -version = "3.0.41" +version = "3.0.43" description = "Library for building powerful interactive command lines in Python" optional = false python-versions = ">=3.7.0" files = [ - {file = "prompt_toolkit-3.0.41-py3-none-any.whl", hash = "sha256:f36fe301fafb7470e86aaf90f036eef600a3210be4decf461a5b1ca8403d3cb2"}, - {file = "prompt_toolkit-3.0.41.tar.gz", hash = "sha256:941367d97fc815548822aa26c2a269fdc4eb21e9ec05fc5d447cf09bad5d75f0"}, + {file = "prompt_toolkit-3.0.43-py3-none-any.whl", hash = "sha256:a11a29cb3bf0a28a387fe5122cdb649816a957cd9261dcedf8c9f1fef33eacf6"}, + {file = "prompt_toolkit-3.0.43.tar.gz", hash = "sha256:3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d"}, ] [package.dependencies] @@ -2582,70 +2798,70 @@ wcwidth = "*" [[package]] name = "protobuf" -version = "4.25.1" +version = "4.25.2" description = "" optional = false python-versions = ">=3.8" files = [ - {file = "protobuf-4.25.1-cp310-abi3-win32.whl", hash = "sha256:193f50a6ab78a970c9b4f148e7c750cfde64f59815e86f686c22e26b4fe01ce7"}, - {file = "protobuf-4.25.1-cp310-abi3-win_amd64.whl", hash = "sha256:3497c1af9f2526962f09329fd61a36566305e6c72da2590ae0d7d1322818843b"}, - {file = "protobuf-4.25.1-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:0bf384e75b92c42830c0a679b0cd4d6e2b36ae0cf3dbb1e1dfdda48a244f4bcd"}, - {file = "protobuf-4.25.1-cp37-abi3-manylinux2014_aarch64.whl", hash = "sha256:0f881b589ff449bf0b931a711926e9ddaad3b35089cc039ce1af50b21a4ae8cb"}, - {file = "protobuf-4.25.1-cp37-abi3-manylinux2014_x86_64.whl", hash = "sha256:ca37bf6a6d0046272c152eea90d2e4ef34593aaa32e8873fc14c16440f22d4b7"}, - {file = "protobuf-4.25.1-cp38-cp38-win32.whl", hash = "sha256:abc0525ae2689a8000837729eef7883b9391cd6aa7950249dcf5a4ede230d5dd"}, - {file = "protobuf-4.25.1-cp38-cp38-win_amd64.whl", hash = "sha256:1484f9e692091450e7edf418c939e15bfc8fc68856e36ce399aed6889dae8bb0"}, - {file = "protobuf-4.25.1-cp39-cp39-win32.whl", hash = "sha256:8bdbeaddaac52d15c6dce38c71b03038ef7772b977847eb6d374fc86636fa510"}, - {file = "protobuf-4.25.1-cp39-cp39-win_amd64.whl", hash = "sha256:becc576b7e6b553d22cbdf418686ee4daa443d7217999125c045ad56322dda10"}, - {file = "protobuf-4.25.1-py3-none-any.whl", hash = "sha256:a19731d5e83ae4737bb2a089605e636077ac001d18781b3cf489b9546c7c80d6"}, - {file = "protobuf-4.25.1.tar.gz", hash = "sha256:57d65074b4f5baa4ab5da1605c02be90ac20c8b40fb137d6a8df9f416b0d0ce2"}, + {file = "protobuf-4.25.2-cp310-abi3-win32.whl", hash = "sha256:b50c949608682b12efb0b2717f53256f03636af5f60ac0c1d900df6213910fd6"}, + {file = "protobuf-4.25.2-cp310-abi3-win_amd64.whl", hash = "sha256:8f62574857ee1de9f770baf04dde4165e30b15ad97ba03ceac65f760ff018ac9"}, + {file = "protobuf-4.25.2-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:2db9f8fa64fbdcdc93767d3cf81e0f2aef176284071507e3ede160811502fd3d"}, + {file = "protobuf-4.25.2-cp37-abi3-manylinux2014_aarch64.whl", hash = "sha256:10894a2885b7175d3984f2be8d9850712c57d5e7587a2410720af8be56cdaf62"}, + {file = "protobuf-4.25.2-cp37-abi3-manylinux2014_x86_64.whl", hash = "sha256:fc381d1dd0516343f1440019cedf08a7405f791cd49eef4ae1ea06520bc1c020"}, + {file = "protobuf-4.25.2-cp38-cp38-win32.whl", hash = "sha256:33a1aeef4b1927431d1be780e87b641e322b88d654203a9e9d93f218ee359e61"}, + {file = "protobuf-4.25.2-cp38-cp38-win_amd64.whl", hash = "sha256:47f3de503fe7c1245f6f03bea7e8d3ec11c6c4a2ea9ef910e3221c8a15516d62"}, + {file = "protobuf-4.25.2-cp39-cp39-win32.whl", hash = "sha256:5e5c933b4c30a988b52e0b7c02641760a5ba046edc5e43d3b94a74c9fc57c1b3"}, + {file = "protobuf-4.25.2-cp39-cp39-win_amd64.whl", hash = "sha256:d66a769b8d687df9024f2985d5137a337f957a0916cf5464d1513eee96a63ff0"}, + {file = "protobuf-4.25.2-py3-none-any.whl", hash = "sha256:a8b7a98d4ce823303145bf3c1a8bdb0f2f4642a414b196f04ad9853ed0c8f830"}, + {file = "protobuf-4.25.2.tar.gz", hash = "sha256:fe599e175cb347efc8ee524bcd4b902d11f7262c0e569ececcb89995c15f0a5e"}, ] [[package]] name = "pulsar-client" -version = "3.3.0" +version = "3.4.0" description = "Apache Pulsar Python client library" optional = false python-versions = "*" files = [ - {file = "pulsar_client-3.3.0-cp310-cp310-macosx_10_15_universal2.whl", hash = "sha256:c31afd3e67a044ff93177df89e08febf214cc965e95ede097d9fe8755af00e01"}, - {file = "pulsar_client-3.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f66982284571674b215324cc26b5c2f7c56c7043113c47a7084cb70d67a8afb"}, - {file = "pulsar_client-3.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7fe50a06f81c48a75a9b95c27a6446260039adca71d9face273740de96b2efca"}, - {file = "pulsar_client-3.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d4c46a4b96a6e9919cfe220156d69a2ede8053d9ea1add4ada108abcf2ba9775"}, - {file = "pulsar_client-3.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1e4b5d44b992c9b036286b483f3588c10b89c6047fb59d80c7474445997f4e10"}, - {file = "pulsar_client-3.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:497a59ac6b650835a3b2c502f53477e5c98e5226998ca3f17c0b0a3eb4d67d08"}, - {file = "pulsar_client-3.3.0-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:386e78ff52058d881780bae1f6e84ac9434ae0b01a8581755ca8cc0dc844a332"}, - {file = "pulsar_client-3.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e4ecb780df58bcfd3918590bd3ff31ed79bccfbef3a1a60370642eb1e14a9d2"}, - {file = "pulsar_client-3.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ce1e215c252f22a6f26ca5e9076826041a04d88dc213b92c86b524be2774a64"}, - {file = "pulsar_client-3.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:88b0fd5be73a4103986b9dbe3a66468cf8829371e34af87ff8f216e3980f4cbe"}, - {file = "pulsar_client-3.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:33656450536d83eed1563ff09692c2c415fb199d88e9ed97d701ca446a119e1b"}, - {file = "pulsar_client-3.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:ce33de700b06583df8777e139d68cb4b4b3d0a2eac168d74278d8935f357fb10"}, - {file = "pulsar_client-3.3.0-cp37-cp37m-macosx_10_15_universal2.whl", hash = "sha256:7b5dd25cf778d6c980d36c53081e843ea272afe7af4f0ad6394ae9513f94641b"}, - {file = "pulsar_client-3.3.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33c4e6865fda62a2e460f823dce4d49ac2973a4459b8ff99eda5fdd6aaaebf46"}, - {file = "pulsar_client-3.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f1810ddc623c8de2675d17405ce47057a9a2b92298e708ce4d9564847f5ad904"}, - {file = "pulsar_client-3.3.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:8259c3b856eb6deaa1f93dce893ab18d99d36d102da5612c8e97a4fb41b70ab1"}, - {file = "pulsar_client-3.3.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:5e7a48b2e505cde758fd51a601b5da0671fa98c9baee38362aaaa3ab2b930c28"}, - {file = "pulsar_client-3.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ede264385d47257b2f2b08ecde9181ec5338bea5639cc543d1856f01736778d2"}, - {file = "pulsar_client-3.3.0-cp38-cp38-macosx_10_15_universal2.whl", hash = "sha256:0f64c62746ccd5b65a0c505f5f40b9af1f147eb1fa2d8f9c90cd5c8b92dd8597"}, - {file = "pulsar_client-3.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b84a20c9012e3c4ef1b7085acd7467197118c090b378dec27d773fb79d91556"}, - {file = "pulsar_client-3.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4e15fa696e275ccb66d0791fdc19c4dea0420d81349c8055e485b134125e14f"}, - {file = "pulsar_client-3.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:72cbb1bdcba2dd1265296b5ba65331622ee89c16db75edaad46dd7b90c6dd447"}, - {file = "pulsar_client-3.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d54dd12955bf587dd46d9184444af5e853d9da2a14bbfb739ed2c7c3b78ce280"}, - {file = "pulsar_client-3.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:43f98afdf0334b2b957a4d96f97a1fe8a7f7fd1e2631d40c3f00b4162f396485"}, - {file = "pulsar_client-3.3.0-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:efe7c1e6a96daccc522c3567b6847ffa54c13e0f510d9a427b4aeff9fbebe54b"}, - {file = "pulsar_client-3.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f28e94420090fceeb38e23fc744f3edf8710e48314ef5927d2b674a1d1e43ee0"}, - {file = "pulsar_client-3.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42c8f3eaa98e2351805ecb6efb6d5fedf47a314a3ce6af0e05ea1449ea7244ed"}, - {file = "pulsar_client-3.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5e69750f8ae57e55fddf97b459ce0d8b38b2bb85f464a71e871ee6a86d893be7"}, - {file = "pulsar_client-3.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:7e147e5ba460c1818bc05254279a885b4e552bcafb8961d40e31f98d5ff46628"}, - {file = "pulsar_client-3.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:694530af1d6c75fb81456fb509778c1868adee31e997ddece6e21678200182ea"}, + {file = "pulsar_client-3.4.0-cp310-cp310-macosx_10_15_universal2.whl", hash = "sha256:ebf99db5244ff69479283b25621b070492acc4bb643d162d86b90387cb6fdb2a"}, + {file = "pulsar_client-3.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d6cb5d8e1482a8aea758633be23717e0c4bb7dc53784e37915c0048c0382f134"}, + {file = "pulsar_client-3.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b30a7592e42c76034e9a8d64d42dd5bab361425f869de562e9ccad698e19cd88"}, + {file = "pulsar_client-3.4.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5963090a78a5644ba25f41da3a6d49ea3f00c972b095baff365916dc246426a"}, + {file = "pulsar_client-3.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:419cdcf577f755e3f31bf264300d9ba158325edb2ee9cee555d81ba1909c094e"}, + {file = "pulsar_client-3.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:4c93c35ee97307dae153e748b33dcd3d4f06da34bca373321aa2df73f1535705"}, + {file = "pulsar_client-3.4.0-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:11952fb022ee72debf53b169f4482f9dc5c890be0149ae98779864b3a21f1bd3"}, + {file = "pulsar_client-3.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8743c320aa96798d20cafa98ea97a68c4295fc4872c23acd5e012fd36cb06ba"}, + {file = "pulsar_client-3.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:33571de99cd898349f17978ba62e2b839ea0275fb7067f31bf5f6ebfeae0987d"}, + {file = "pulsar_client-3.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a60c03c3e70f018538e7cd3fa84d95e283b610272b744166dbc48960a809fa07"}, + {file = "pulsar_client-3.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4c47041267b5843ffec54352d842156c279945f3e976d7025ffa89875ff76390"}, + {file = "pulsar_client-3.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:49fe4ab04004b476c87ab3ad22fe87346fca564a3e3ca9c0ac58fee45a895d81"}, + {file = "pulsar_client-3.4.0-cp312-cp312-macosx_10_15_universal2.whl", hash = "sha256:1e077a4839be3ead3de3f05b4c244269dca2df07f47cea0b90544c7e9dc1642f"}, + {file = "pulsar_client-3.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f202b84e1f683d64672dd1971114600ae2e5c3735587286ff9bfb431385f08e8"}, + {file = "pulsar_client-3.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c606c04f357341042fa6c75477de7d2204f7ae50aa29c2f74b24e54c85f47f96"}, + {file = "pulsar_client-3.4.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c67b25ede3a578f5a7dc30230e52609ef38191f74b47e5cbdbc98c42df556927"}, + {file = "pulsar_client-3.4.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b7f8211cc9460cdf4d06e4e1cb878689d2aa4a7e4027bd2a2f1419a79ade16a6"}, + {file = "pulsar_client-3.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:c5399e9780d6951c69808c0b6175311a966af82fb08addf6e741ae37b1bee7ef"}, + {file = "pulsar_client-3.4.0-cp38-cp38-macosx_10_15_universal2.whl", hash = "sha256:a2d6c850b60106dc915d3476a490fba547c6748a5f742b68abd30d1a35355b82"}, + {file = "pulsar_client-3.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a52ea8294a9f30eb6f0a2db5dc16e3aad7ff2284f818c48ad3a6b601723be02b"}, + {file = "pulsar_client-3.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eeeede40108be12222e009285c971e5b8f6433d9f0f8ef934d6a131585921c4"}, + {file = "pulsar_client-3.4.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9409066c600f2b6f220552c5dfe08aeeabcf07fe0e76367aa5816b2e87a5cf72"}, + {file = "pulsar_client-3.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:58e2f886e6dab43e66c3ce990fe96209e55ab46350506829a637b77b74125fb9"}, + {file = "pulsar_client-3.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:b57dfa5063b0d9dc7664896c55605eac90753e35e80db5a959d3be2be0ab0d48"}, + {file = "pulsar_client-3.4.0-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:7704c664aa2c801af4c2d3a58e9d8ffaeef12ce8a0f71712e9187f9a96da856f"}, + {file = "pulsar_client-3.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0364db563e27442053bdbb8655e7ffb420f491690bc2c78da5a58bd35c658ad"}, + {file = "pulsar_client-3.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e3e34de19e0744d8aa3538cb2172076bccd0761b3e94ebadb7bd59765ae3d1ed"}, + {file = "pulsar_client-3.4.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:dc8be41dec8cb052fb1837550f495e9b73a8b3cf85e07157904ec84832758a65"}, + {file = "pulsar_client-3.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b49d669bed15b7edb9c936704310d57808f1d01c511b94d866f54fe8ffe1752d"}, + {file = "pulsar_client-3.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:88c93e5fbfc349f3967e931f7a908d15fd4fd725ebdd842423ac9cd961fe293f"}, ] [package.dependencies] certifi = "*" [package.extras] -all = ["apache-bookkeeper-client (>=4.16.1)", "fastavro (==1.7.3)", "grpcio (>=1.8.2)", "prometheus-client", "protobuf (>=3.6.1,<=3.20.3)", "ratelimit"] -avro = ["fastavro (==1.7.3)"] -functions = ["apache-bookkeeper-client (>=4.16.1)", "grpcio (>=1.8.2)", "prometheus-client", "protobuf (>=3.6.1,<=3.20.3)", "ratelimit"] +all = ["apache-bookkeeper-client (>=4.16.1)", "fastavro (>=1.9.2)", "grpcio (>=1.60.0)", "prometheus-client", "protobuf (>=3.6.1,<=3.20.3)", "ratelimit"] +avro = ["fastavro (>=1.9.2)"] +functions = ["apache-bookkeeper-client (>=4.16.1)", "grpcio (>=1.60.0)", "prometheus-client", "protobuf (>=3.6.1,<=3.20.3)", "ratelimit"] [[package]] name = "py" @@ -2694,6 +2910,72 @@ files = [ [package.dependencies] pyasn1 = ">=0.4.6,<0.6.0" +[[package]] +name = "pycares" +version = "4.4.0" +description = "Python interface for c-ares" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pycares-4.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:24da119850841d16996713d9c3374ca28a21deee056d609fbbed29065d17e1f6"}, + {file = "pycares-4.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8f64cb58729689d4d0e78f0bfb4c25ce2f851d0274c0273ac751795c04b8798a"}, + {file = "pycares-4.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d33e2a1120887e89075f7f814ec144f66a6ce06a54f5722ccefc62fbeda83cff"}, + {file = "pycares-4.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c680fef1b502ee680f8f0b95a41af4ec2c234e50e16c0af5bbda31999d3584bd"}, + {file = "pycares-4.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fff16b09042ba077f7b8aa5868d1d22456f0002574d0ba43462b10a009331677"}, + {file = "pycares-4.4.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:229a1675eb33bc9afb1fc463e73ee334950ccc485bc83a43f6ae5839fb4d5fa3"}, + {file = "pycares-4.4.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3aebc73e5ad70464f998f77f2da2063aa617cbd8d3e8174dd7c5b4518f967153"}, + {file = "pycares-4.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6ef64649eba56448f65e26546d85c860709844d2fc22ef14d324fe0b27f761a9"}, + {file = "pycares-4.4.0-cp310-cp310-win32.whl", hash = "sha256:4afc2644423f4eef97857a9fd61be9758ce5e336b4b0bd3d591238bb4b8b03e0"}, + {file = "pycares-4.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:5ed4e04af4012f875b78219d34434a6d08a67175150ac1b79eb70ab585d4ba8c"}, + {file = "pycares-4.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:bce8db2fc6f3174bd39b81405210b9b88d7b607d33e56a970c34a0c190da0490"}, + {file = "pycares-4.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9a0303428d013ccf5c51de59c83f9127aba6200adb7fd4be57eddb432a1edd2a"}, + {file = "pycares-4.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afb91792f1556f97be7f7acb57dc7756d89c5a87bd8b90363a77dbf9ea653817"}, + {file = "pycares-4.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b61579cecf1f4d616e5ea31a6e423a16680ab0d3a24a2ffe7bb1d4ee162477ff"}, + {file = "pycares-4.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7af06968cbf6851566e806bf3e72825b0e6671832a2cbe840be1d2d65350710"}, + {file = "pycares-4.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ceb12974367b0a68a05d52f4162b29f575d241bd53de155efe632bf2c943c7f6"}, + {file = "pycares-4.4.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:2eeec144bcf6a7b6f2d74d6e70cbba7886a84dd373c886f06cb137a07de4954c"}, + {file = "pycares-4.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e3a6f7cfdfd11eb5493d6d632e582408c8f3b429f295f8799c584c108b28db6f"}, + {file = "pycares-4.4.0-cp311-cp311-win32.whl", hash = "sha256:34736a2ffaa9c08ca9c707011a2d7b69074bbf82d645d8138bba771479b2362f"}, + {file = "pycares-4.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:eb66c30eb11e877976b7ead13632082a8621df648c408b8e15cdb91a452dd502"}, + {file = "pycares-4.4.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:fd644505a8cfd7f6584d33a9066d4e3d47700f050ef1490230c962de5dfb28c6"}, + {file = "pycares-4.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:52084961262232ec04bd75f5043aed7e5d8d9695e542ff691dfef0110209f2d4"}, + {file = "pycares-4.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0c5368206057884cde18602580083aeaad9b860e2eac14fd253543158ce1e93"}, + {file = "pycares-4.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:112a4979c695b1c86f6782163d7dec58d57a3b9510536dcf4826550f9053dd9a"}, + {file = "pycares-4.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8d186dafccdaa3409194c0f94db93c1a5d191145a275f19da6591f9499b8e7b8"}, + {file = "pycares-4.4.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:64965dc19c578a683ea73487a215a8897276224e004d50eeb21f0bc7a0b63c88"}, + {file = "pycares-4.4.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:ed2a38e34bec6f2586435f6ff0bc5fe11d14bebd7ed492cf739a424e81681540"}, + {file = "pycares-4.4.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:94d6962db81541eb0396d2f0dfcbb18cdb8c8b251d165efc2d974ae652c547d4"}, + {file = "pycares-4.4.0-cp312-cp312-win32.whl", hash = "sha256:1168a48a834813aa80f412be2df4abaf630528a58d15c704857448b20b1675c0"}, + {file = "pycares-4.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:db24c4e7fea4a052c6e869cbf387dd85d53b9736cfe1ef5d8d568d1ca925e977"}, + {file = "pycares-4.4.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:21a5a0468861ec7df7befa69050f952da13db5427ae41ffe4713bc96291d1d95"}, + {file = "pycares-4.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:22c00bf659a9fa44d7b405cf1cd69b68b9d37537899898d8cbe5dffa4016b273"}, + {file = "pycares-4.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:23aa3993a352491a47fcf17867f61472f32f874df4adcbb486294bd9fbe8abee"}, + {file = "pycares-4.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:813d661cbe2e37d87da2d16b7110a6860e93ddb11735c6919c8a3545c7b9c8d8"}, + {file = "pycares-4.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:77cf5a2fd5583c670de41a7f4a7b46e5cbabe7180d8029f728571f4d2e864084"}, + {file = "pycares-4.4.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:3eaa6681c0a3e3f3868c77aca14b7760fed35fdfda2fe587e15c701950e7bc69"}, + {file = "pycares-4.4.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ad58e284a658a8a6a84af2e0b62f2f961f303cedfe551854d7bd40c3cbb61912"}, + {file = "pycares-4.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bfb89ca9e3d0a9b5332deeb666b2ede9d3469107742158f4aeda5ce032d003f4"}, + {file = "pycares-4.4.0-cp38-cp38-win32.whl", hash = "sha256:f36bdc1562142e3695555d2f4ac0cb69af165eddcefa98efc1c79495b533481f"}, + {file = "pycares-4.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:902461a92b6a80fd5041a2ec5235680c7cc35e43615639ec2a40e63fca2dfb51"}, + {file = "pycares-4.4.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7bddc6adba8f699728f7fc1c9ce8cef359817ad78e2ed52b9502cb5f8dc7f741"}, + {file = "pycares-4.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cb49d5805cd347c404f928c5ae7c35e86ba0c58ffa701dbe905365e77ce7d641"}, + {file = "pycares-4.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:56cf3349fa3a2e67ed387a7974c11d233734636fe19facfcda261b411af14d80"}, + {file = "pycares-4.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8bf2eaa83a5987e48fa63302f0fe7ce3275cfda87b34d40fef9ce703fb3ac002"}, + {file = "pycares-4.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:82bba2ab77eb5addbf9758d514d9bdef3c1bfe7d1649a47bd9a0d55a23ef478b"}, + {file = "pycares-4.4.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c6a8bde63106f162fca736e842a916853cad3c8d9d137e11c9ffa37efa818b02"}, + {file = "pycares-4.4.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f5f646eec041db6ffdbcaf3e0756fb92018f7af3266138c756bb09d2b5baadec"}, + {file = "pycares-4.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9dc04c54c6ea615210c1b9e803d0e2d2255f87a3d5d119b6482c8f0dfa15b26b"}, + {file = "pycares-4.4.0-cp39-cp39-win32.whl", hash = "sha256:97892cced5794d721fb4ff8765764aa4ea48fe8b2c3820677505b96b83d4ef47"}, + {file = "pycares-4.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:917f08f0b5d9324e9a34211e68d27447c552b50ab967044776bbab7e42a553a2"}, + {file = "pycares-4.4.0.tar.gz", hash = "sha256:f47579d508f2f56eddd16ce72045782ad3b1b3b678098699e2b6a1b30733e1c2"}, +] + +[package.dependencies] +cffi = ">=1.5.0" + +[package.extras] +idna = ["idna (>=2.1)"] + [[package]] name = "pycparser" version = "2.21" @@ -2707,18 +2989,18 @@ files = [ [[package]] name = "pydantic" -version = "2.5.2" +version = "2.5.3" description = "Data validation using Python type hints" optional = false python-versions = ">=3.7" files = [ - {file = "pydantic-2.5.2-py3-none-any.whl", hash = "sha256:80c50fb8e3dcecfddae1adbcc00ec5822918490c99ab31f6cf6140ca1c1429f0"}, - {file = "pydantic-2.5.2.tar.gz", hash = "sha256:ff177ba64c6faf73d7afa2e8cad38fd456c0dbe01c9954e71038001cd15a6edd"}, + {file = "pydantic-2.5.3-py3-none-any.whl", hash = "sha256:d0caf5954bee831b6bfe7e338c32b9e30c85dfe080c843680783ac2b631673b4"}, + {file = "pydantic-2.5.3.tar.gz", hash = "sha256:b3ef57c62535b0941697cce638c08900d87fcb67e29cfa99e8a68f747f393f7a"}, ] [package.dependencies] annotated-types = ">=0.4.0" -pydantic-core = "2.14.5" +pydantic-core = "2.14.6" typing-extensions = ">=4.6.1" [package.extras] @@ -2726,116 +3008,116 @@ email = ["email-validator (>=2.0.0)"] [[package]] name = "pydantic-core" -version = "2.14.5" +version = "2.14.6" description = "" optional = false python-versions = ">=3.7" files = [ - {file = "pydantic_core-2.14.5-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:7e88f5696153dc516ba6e79f82cc4747e87027205f0e02390c21f7cb3bd8abfd"}, - {file = "pydantic_core-2.14.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4641e8ad4efb697f38a9b64ca0523b557c7931c5f84e0fd377a9a3b05121f0de"}, - {file = "pydantic_core-2.14.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:774de879d212db5ce02dfbf5b0da9a0ea386aeba12b0b95674a4ce0593df3d07"}, - {file = "pydantic_core-2.14.5-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ebb4e035e28f49b6f1a7032920bb9a0c064aedbbabe52c543343d39341a5b2a3"}, - {file = "pydantic_core-2.14.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b53e9ad053cd064f7e473a5f29b37fc4cc9dc6d35f341e6afc0155ea257fc911"}, - {file = "pydantic_core-2.14.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8aa1768c151cf562a9992462239dfc356b3d1037cc5a3ac829bb7f3bda7cc1f9"}, - {file = "pydantic_core-2.14.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eac5c82fc632c599f4639a5886f96867ffced74458c7db61bc9a66ccb8ee3113"}, - {file = "pydantic_core-2.14.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d2ae91f50ccc5810b2f1b6b858257c9ad2e08da70bf890dee02de1775a387c66"}, - {file = "pydantic_core-2.14.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:6b9ff467ffbab9110e80e8c8de3bcfce8e8b0fd5661ac44a09ae5901668ba997"}, - {file = "pydantic_core-2.14.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:61ea96a78378e3bd5a0be99b0e5ed00057b71f66115f5404d0dae4819f495093"}, - {file = "pydantic_core-2.14.5-cp310-none-win32.whl", hash = "sha256:bb4c2eda937a5e74c38a41b33d8c77220380a388d689bcdb9b187cf6224c9720"}, - {file = "pydantic_core-2.14.5-cp310-none-win_amd64.whl", hash = "sha256:b7851992faf25eac90bfcb7bfd19e1f5ffa00afd57daec8a0042e63c74a4551b"}, - {file = "pydantic_core-2.14.5-cp311-cp311-macosx_10_7_x86_64.whl", hash = "sha256:4e40f2bd0d57dac3feb3a3aed50f17d83436c9e6b09b16af271b6230a2915459"}, - {file = "pydantic_core-2.14.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ab1cdb0f14dc161ebc268c09db04d2c9e6f70027f3b42446fa11c153521c0e88"}, - {file = "pydantic_core-2.14.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aae7ea3a1c5bb40c93cad361b3e869b180ac174656120c42b9fadebf685d121b"}, - {file = "pydantic_core-2.14.5-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:60b7607753ba62cf0739177913b858140f11b8af72f22860c28eabb2f0a61937"}, - {file = "pydantic_core-2.14.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2248485b0322c75aee7565d95ad0e16f1c67403a470d02f94da7344184be770f"}, - {file = "pydantic_core-2.14.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:823fcc638f67035137a5cd3f1584a4542d35a951c3cc68c6ead1df7dac825c26"}, - {file = "pydantic_core-2.14.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96581cfefa9123accc465a5fd0cc833ac4d75d55cc30b633b402e00e7ced00a6"}, - {file = "pydantic_core-2.14.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a33324437018bf6ba1bb0f921788788641439e0ed654b233285b9c69704c27b4"}, - {file = "pydantic_core-2.14.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9bd18fee0923ca10f9a3ff67d4851c9d3e22b7bc63d1eddc12f439f436f2aada"}, - {file = "pydantic_core-2.14.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:853a2295c00f1d4429db4c0fb9475958543ee80cfd310814b5c0ef502de24dda"}, - {file = "pydantic_core-2.14.5-cp311-none-win32.whl", hash = "sha256:cb774298da62aea5c80a89bd58c40205ab4c2abf4834453b5de207d59d2e1651"}, - {file = "pydantic_core-2.14.5-cp311-none-win_amd64.whl", hash = "sha256:e87fc540c6cac7f29ede02e0f989d4233f88ad439c5cdee56f693cc9c1c78077"}, - {file = "pydantic_core-2.14.5-cp311-none-win_arm64.whl", hash = "sha256:57d52fa717ff445cb0a5ab5237db502e6be50809b43a596fb569630c665abddf"}, - {file = "pydantic_core-2.14.5-cp312-cp312-macosx_10_7_x86_64.whl", hash = "sha256:e60f112ac88db9261ad3a52032ea46388378034f3279c643499edb982536a093"}, - {file = "pydantic_core-2.14.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6e227c40c02fd873c2a73a98c1280c10315cbebe26734c196ef4514776120aeb"}, - {file = "pydantic_core-2.14.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0cbc7fff06a90bbd875cc201f94ef0ee3929dfbd5c55a06674b60857b8b85ed"}, - {file = "pydantic_core-2.14.5-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:103ef8d5b58596a731b690112819501ba1db7a36f4ee99f7892c40da02c3e189"}, - {file = "pydantic_core-2.14.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c949f04ecad823f81b1ba94e7d189d9dfb81edbb94ed3f8acfce41e682e48cef"}, - {file = "pydantic_core-2.14.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c1452a1acdf914d194159439eb21e56b89aa903f2e1c65c60b9d874f9b950e5d"}, - {file = "pydantic_core-2.14.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cb4679d4c2b089e5ef89756bc73e1926745e995d76e11925e3e96a76d5fa51fc"}, - {file = "pydantic_core-2.14.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:cf9d3fe53b1ee360e2421be95e62ca9b3296bf3f2fb2d3b83ca49ad3f925835e"}, - {file = "pydantic_core-2.14.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:70f4b4851dbb500129681d04cc955be2a90b2248d69273a787dda120d5cf1f69"}, - {file = "pydantic_core-2.14.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:59986de5710ad9613ff61dd9b02bdd2f615f1a7052304b79cc8fa2eb4e336d2d"}, - {file = "pydantic_core-2.14.5-cp312-none-win32.whl", hash = "sha256:699156034181e2ce106c89ddb4b6504c30db8caa86e0c30de47b3e0654543260"}, - {file = "pydantic_core-2.14.5-cp312-none-win_amd64.whl", hash = "sha256:5baab5455c7a538ac7e8bf1feec4278a66436197592a9bed538160a2e7d11e36"}, - {file = "pydantic_core-2.14.5-cp312-none-win_arm64.whl", hash = "sha256:e47e9a08bcc04d20975b6434cc50bf82665fbc751bcce739d04a3120428f3e27"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:af36f36538418f3806048f3b242a1777e2540ff9efaa667c27da63d2749dbce0"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-macosx_11_0_arm64.whl", hash = "sha256:45e95333b8418ded64745f14574aa9bfc212cb4fbeed7a687b0c6e53b5e188cd"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e47a76848f92529879ecfc417ff88a2806438f57be4a6a8bf2961e8f9ca9ec7"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d81e6987b27bc7d101c8597e1cd2bcaa2fee5e8e0f356735c7ed34368c471550"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:34708cc82c330e303f4ce87758828ef6e457681b58ce0e921b6e97937dd1e2a3"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:652c1988019752138b974c28f43751528116bcceadad85f33a258869e641d753"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6e4d090e73e0725b2904fdbdd8d73b8802ddd691ef9254577b708d413bf3006e"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5c7d5b5005f177764e96bd584d7bf28d6e26e96f2a541fdddb934c486e36fd59"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a71891847f0a73b1b9eb86d089baee301477abef45f7eaf303495cd1473613e4"}, - {file = "pydantic_core-2.14.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a717aef6971208f0851a2420b075338e33083111d92041157bbe0e2713b37325"}, - {file = "pydantic_core-2.14.5-cp37-none-win32.whl", hash = "sha256:de790a3b5aa2124b8b78ae5faa033937a72da8efe74b9231698b5a1dd9be3405"}, - {file = "pydantic_core-2.14.5-cp37-none-win_amd64.whl", hash = "sha256:6c327e9cd849b564b234da821236e6bcbe4f359a42ee05050dc79d8ed2a91588"}, - {file = "pydantic_core-2.14.5-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:ef98ca7d5995a82f43ec0ab39c4caf6a9b994cb0b53648ff61716370eadc43cf"}, - {file = "pydantic_core-2.14.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c6eae413494a1c3f89055da7a5515f32e05ebc1a234c27674a6956755fb2236f"}, - {file = "pydantic_core-2.14.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dcf4e6d85614f7a4956c2de5a56531f44efb973d2fe4a444d7251df5d5c4dcfd"}, - {file = "pydantic_core-2.14.5-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6637560562134b0e17de333d18e69e312e0458ee4455bdad12c37100b7cad706"}, - {file = "pydantic_core-2.14.5-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:77fa384d8e118b3077cccfcaf91bf83c31fe4dc850b5e6ee3dc14dc3d61bdba1"}, - {file = "pydantic_core-2.14.5-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:16e29bad40bcf97aac682a58861249ca9dcc57c3f6be22f506501833ddb8939c"}, - {file = "pydantic_core-2.14.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:531f4b4252fac6ca476fbe0e6f60f16f5b65d3e6b583bc4d87645e4e5ddde331"}, - {file = "pydantic_core-2.14.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:074f3d86f081ce61414d2dc44901f4f83617329c6f3ab49d2bc6c96948b2c26b"}, - {file = "pydantic_core-2.14.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c2adbe22ab4babbca99c75c5d07aaf74f43c3195384ec07ccbd2f9e3bddaecec"}, - {file = "pydantic_core-2.14.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0f6116a558fd06d1b7c2902d1c4cf64a5bd49d67c3540e61eccca93f41418124"}, - {file = "pydantic_core-2.14.5-cp38-none-win32.whl", hash = "sha256:fe0a5a1025eb797752136ac8b4fa21aa891e3d74fd340f864ff982d649691867"}, - {file = "pydantic_core-2.14.5-cp38-none-win_amd64.whl", hash = "sha256:079206491c435b60778cf2b0ee5fd645e61ffd6e70c47806c9ed51fc75af078d"}, - {file = "pydantic_core-2.14.5-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:a6a16f4a527aae4f49c875da3cdc9508ac7eef26e7977952608610104244e1b7"}, - {file = "pydantic_core-2.14.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:abf058be9517dc877227ec3223f0300034bd0e9f53aebd63cf4456c8cb1e0863"}, - {file = "pydantic_core-2.14.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:49b08aae5013640a3bfa25a8eebbd95638ec3f4b2eaf6ed82cf0c7047133f03b"}, - {file = "pydantic_core-2.14.5-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c2d97e906b4ff36eb464d52a3bc7d720bd6261f64bc4bcdbcd2c557c02081ed2"}, - {file = "pydantic_core-2.14.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3128e0bbc8c091ec4375a1828d6118bc20404883169ac95ffa8d983b293611e6"}, - {file = "pydantic_core-2.14.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:88e74ab0cdd84ad0614e2750f903bb0d610cc8af2cc17f72c28163acfcf372a4"}, - {file = "pydantic_core-2.14.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c339dabd8ee15f8259ee0f202679b6324926e5bc9e9a40bf981ce77c038553db"}, - {file = "pydantic_core-2.14.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3387277f1bf659caf1724e1afe8ee7dbc9952a82d90f858ebb931880216ea955"}, - {file = "pydantic_core-2.14.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ba6b6b3846cfc10fdb4c971980a954e49d447cd215ed5a77ec8190bc93dd7bc5"}, - {file = "pydantic_core-2.14.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ca61d858e4107ce5e1330a74724fe757fc7135190eb5ce5c9d0191729f033209"}, - {file = "pydantic_core-2.14.5-cp39-none-win32.whl", hash = "sha256:ec1e72d6412f7126eb7b2e3bfca42b15e6e389e1bc88ea0069d0cc1742f477c6"}, - {file = "pydantic_core-2.14.5-cp39-none-win_amd64.whl", hash = "sha256:c0b97ec434041827935044bbbe52b03d6018c2897349670ff8fe11ed24d1d4ab"}, - {file = "pydantic_core-2.14.5-pp310-pypy310_pp73-macosx_10_7_x86_64.whl", hash = "sha256:79e0a2cdbdc7af3f4aee3210b1172ab53d7ddb6a2d8c24119b5706e622b346d0"}, - {file = "pydantic_core-2.14.5-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:678265f7b14e138d9a541ddabbe033012a2953315739f8cfa6d754cc8063e8ca"}, - {file = "pydantic_core-2.14.5-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:95b15e855ae44f0c6341ceb74df61b606e11f1087e87dcb7482377374aac6abe"}, - {file = "pydantic_core-2.14.5-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:09b0e985fbaf13e6b06a56d21694d12ebca6ce5414b9211edf6f17738d82b0f8"}, - {file = "pydantic_core-2.14.5-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3ad873900297bb36e4b6b3f7029d88ff9829ecdc15d5cf20161775ce12306f8a"}, - {file = "pydantic_core-2.14.5-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:2d0ae0d8670164e10accbeb31d5ad45adb71292032d0fdb9079912907f0085f4"}, - {file = "pydantic_core-2.14.5-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:d37f8ec982ead9ba0a22a996129594938138a1503237b87318392a48882d50b7"}, - {file = "pydantic_core-2.14.5-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:35613015f0ba7e14c29ac6c2483a657ec740e5ac5758d993fdd5870b07a61d8b"}, - {file = "pydantic_core-2.14.5-pp37-pypy37_pp73-macosx_10_7_x86_64.whl", hash = "sha256:ab4ea451082e684198636565224bbb179575efc1658c48281b2c866bfd4ddf04"}, - {file = "pydantic_core-2.14.5-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ce601907e99ea5b4adb807ded3570ea62186b17f88e271569144e8cca4409c7"}, - {file = "pydantic_core-2.14.5-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fb2ed8b3fe4bf4506d6dab3b93b83bbc22237e230cba03866d561c3577517d18"}, - {file = "pydantic_core-2.14.5-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:70f947628e074bb2526ba1b151cee10e4c3b9670af4dbb4d73bc8a89445916b5"}, - {file = "pydantic_core-2.14.5-pp37-pypy37_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:4bc536201426451f06f044dfbf341c09f540b4ebdb9fd8d2c6164d733de5e634"}, - {file = "pydantic_core-2.14.5-pp37-pypy37_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f4791cf0f8c3104ac668797d8c514afb3431bc3305f5638add0ba1a5a37e0d88"}, - {file = "pydantic_core-2.14.5-pp38-pypy38_pp73-macosx_10_7_x86_64.whl", hash = "sha256:038c9f763e650712b899f983076ce783175397c848da04985658e7628cbe873b"}, - {file = "pydantic_core-2.14.5-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:27548e16c79702f1e03f5628589c6057c9ae17c95b4c449de3c66b589ead0520"}, - {file = "pydantic_core-2.14.5-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c97bee68898f3f4344eb02fec316db93d9700fb1e6a5b760ffa20d71d9a46ce3"}, - {file = "pydantic_core-2.14.5-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9b759b77f5337b4ea024f03abc6464c9f35d9718de01cfe6bae9f2e139c397e"}, - {file = "pydantic_core-2.14.5-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:439c9afe34638ace43a49bf72d201e0ffc1a800295bed8420c2a9ca8d5e3dbb3"}, - {file = "pydantic_core-2.14.5-pp38-pypy38_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:ba39688799094c75ea8a16a6b544eb57b5b0f3328697084f3f2790892510d144"}, - {file = "pydantic_core-2.14.5-pp38-pypy38_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:ccd4d5702bb90b84df13bd491be8d900b92016c5a455b7e14630ad7449eb03f8"}, - {file = "pydantic_core-2.14.5-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:81982d78a45d1e5396819bbb4ece1fadfe5f079335dd28c4ab3427cd95389944"}, - {file = "pydantic_core-2.14.5-pp39-pypy39_pp73-macosx_10_7_x86_64.whl", hash = "sha256:7f8210297b04e53bc3da35db08b7302a6a1f4889c79173af69b72ec9754796b8"}, - {file = "pydantic_core-2.14.5-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:8c8a8812fe6f43a3a5b054af6ac2d7b8605c7bcab2804a8a7d68b53f3cd86e00"}, - {file = "pydantic_core-2.14.5-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:206ed23aecd67c71daf5c02c3cd19c0501b01ef3cbf7782db9e4e051426b3d0d"}, - {file = "pydantic_core-2.14.5-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c2027d05c8aebe61d898d4cffd774840a9cb82ed356ba47a90d99ad768f39789"}, - {file = "pydantic_core-2.14.5-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:40180930807ce806aa71eda5a5a5447abb6b6a3c0b4b3b1b1962651906484d68"}, - {file = "pydantic_core-2.14.5-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:615a0a4bff11c45eb3c1996ceed5bdaa2f7b432425253a7c2eed33bb86d80abc"}, - {file = "pydantic_core-2.14.5-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f5e412d717366e0677ef767eac93566582518fe8be923361a5c204c1a62eaafe"}, - {file = "pydantic_core-2.14.5-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:513b07e99c0a267b1d954243845d8a833758a6726a3b5d8948306e3fe14675e3"}, - {file = "pydantic_core-2.14.5.tar.gz", hash = "sha256:6d30226dfc816dd0fdf120cae611dd2215117e4f9b124af8c60ab9093b6e8e71"}, + {file = "pydantic_core-2.14.6-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:72f9a942d739f09cd42fffe5dc759928217649f070056f03c70df14f5770acf9"}, + {file = "pydantic_core-2.14.6-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6a31d98c0d69776c2576dda4b77b8e0c69ad08e8b539c25c7d0ca0dc19a50d6c"}, + {file = "pydantic_core-2.14.6-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5aa90562bc079c6c290f0512b21768967f9968e4cfea84ea4ff5af5d917016e4"}, + {file = "pydantic_core-2.14.6-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:370ffecb5316ed23b667d99ce4debe53ea664b99cc37bfa2af47bc769056d534"}, + {file = "pydantic_core-2.14.6-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f85f3843bdb1fe80e8c206fe6eed7a1caeae897e496542cee499c374a85c6e08"}, + {file = "pydantic_core-2.14.6-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9862bf828112e19685b76ca499b379338fd4c5c269d897e218b2ae8fcb80139d"}, + {file = "pydantic_core-2.14.6-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:036137b5ad0cb0004c75b579445a1efccd072387a36c7f217bb8efd1afbe5245"}, + {file = "pydantic_core-2.14.6-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:92879bce89f91f4b2416eba4429c7b5ca22c45ef4a499c39f0c5c69257522c7c"}, + {file = "pydantic_core-2.14.6-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0c08de15d50fa190d577e8591f0329a643eeaed696d7771760295998aca6bc66"}, + {file = "pydantic_core-2.14.6-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:36099c69f6b14fc2c49d7996cbf4f87ec4f0e66d1c74aa05228583225a07b590"}, + {file = "pydantic_core-2.14.6-cp310-none-win32.whl", hash = "sha256:7be719e4d2ae6c314f72844ba9d69e38dff342bc360379f7c8537c48e23034b7"}, + {file = "pydantic_core-2.14.6-cp310-none-win_amd64.whl", hash = "sha256:36fa402dcdc8ea7f1b0ddcf0df4254cc6b2e08f8cd80e7010d4c4ae6e86b2a87"}, + {file = "pydantic_core-2.14.6-cp311-cp311-macosx_10_7_x86_64.whl", hash = "sha256:dea7fcd62915fb150cdc373212141a30037e11b761fbced340e9db3379b892d4"}, + {file = "pydantic_core-2.14.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ffff855100bc066ff2cd3aa4a60bc9534661816b110f0243e59503ec2df38421"}, + {file = "pydantic_core-2.14.6-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b027c86c66b8627eb90e57aee1f526df77dc6d8b354ec498be9a757d513b92b"}, + {file = "pydantic_core-2.14.6-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:00b1087dabcee0b0ffd104f9f53d7d3eaddfaa314cdd6726143af6bc713aa27e"}, + {file = "pydantic_core-2.14.6-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:75ec284328b60a4e91010c1acade0c30584f28a1f345bc8f72fe8b9e46ec6a96"}, + {file = "pydantic_core-2.14.6-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7e1f4744eea1501404b20b0ac059ff7e3f96a97d3e3f48ce27a139e053bb370b"}, + {file = "pydantic_core-2.14.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2602177668f89b38b9f84b7b3435d0a72511ddef45dc14446811759b82235a1"}, + {file = "pydantic_core-2.14.6-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6c8edaea3089bf908dd27da8f5d9e395c5b4dc092dbcce9b65e7156099b4b937"}, + {file = "pydantic_core-2.14.6-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:478e9e7b360dfec451daafe286998d4a1eeaecf6d69c427b834ae771cad4b622"}, + {file = "pydantic_core-2.14.6-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:b6ca36c12a5120bad343eef193cc0122928c5c7466121da7c20f41160ba00ba2"}, + {file = "pydantic_core-2.14.6-cp311-none-win32.whl", hash = "sha256:2b8719037e570639e6b665a4050add43134d80b687288ba3ade18b22bbb29dd2"}, + {file = "pydantic_core-2.14.6-cp311-none-win_amd64.whl", hash = "sha256:78ee52ecc088c61cce32b2d30a826f929e1708f7b9247dc3b921aec367dc1b23"}, + {file = "pydantic_core-2.14.6-cp311-none-win_arm64.whl", hash = "sha256:a19b794f8fe6569472ff77602437ec4430f9b2b9ec7a1105cfd2232f9ba355e6"}, + {file = "pydantic_core-2.14.6-cp312-cp312-macosx_10_7_x86_64.whl", hash = "sha256:667aa2eac9cd0700af1ddb38b7b1ef246d8cf94c85637cbb03d7757ca4c3fdec"}, + {file = "pydantic_core-2.14.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cdee837710ef6b56ebd20245b83799fce40b265b3b406e51e8ccc5b85b9099b7"}, + {file = "pydantic_core-2.14.6-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c5bcf3414367e29f83fd66f7de64509a8fd2368b1edf4351e862910727d3e51"}, + {file = "pydantic_core-2.14.6-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:26a92ae76f75d1915806b77cf459811e772d8f71fd1e4339c99750f0e7f6324f"}, + {file = "pydantic_core-2.14.6-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a983cca5ed1dd9a35e9e42ebf9f278d344603bfcb174ff99a5815f953925140a"}, + {file = "pydantic_core-2.14.6-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cb92f9061657287eded380d7dc455bbf115430b3aa4741bdc662d02977e7d0af"}, + {file = "pydantic_core-2.14.6-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4ace1e220b078c8e48e82c081e35002038657e4b37d403ce940fa679e57113b"}, + {file = "pydantic_core-2.14.6-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ef633add81832f4b56d3b4c9408b43d530dfca29e68fb1b797dcb861a2c734cd"}, + {file = "pydantic_core-2.14.6-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7e90d6cc4aad2cc1f5e16ed56e46cebf4877c62403a311af20459c15da76fd91"}, + {file = "pydantic_core-2.14.6-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e8a5ac97ea521d7bde7621d86c30e86b798cdecd985723c4ed737a2aa9e77d0c"}, + {file = "pydantic_core-2.14.6-cp312-none-win32.whl", hash = "sha256:f27207e8ca3e5e021e2402ba942e5b4c629718e665c81b8b306f3c8b1ddbb786"}, + {file = "pydantic_core-2.14.6-cp312-none-win_amd64.whl", hash = "sha256:b3e5fe4538001bb82e2295b8d2a39356a84694c97cb73a566dc36328b9f83b40"}, + {file = "pydantic_core-2.14.6-cp312-none-win_arm64.whl", hash = "sha256:64634ccf9d671c6be242a664a33c4acf12882670b09b3f163cd00a24cffbd74e"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:24368e31be2c88bd69340fbfe741b405302993242ccb476c5c3ff48aeee1afe0"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-macosx_11_0_arm64.whl", hash = "sha256:e33b0834f1cf779aa839975f9d8755a7c2420510c0fa1e9fa0497de77cd35d2c"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6af4b3f52cc65f8a0bc8b1cd9676f8c21ef3e9132f21fed250f6958bd7223bed"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d15687d7d7f40333bd8266f3814c591c2e2cd263fa2116e314f60d82086e353a"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:095b707bb287bfd534044166ab767bec70a9bba3175dcdc3371782175c14e43c"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:94fc0e6621e07d1e91c44e016cc0b189b48db053061cc22d6298a611de8071bb"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1ce830e480f6774608dedfd4a90c42aac4a7af0a711f1b52f807130c2e434c06"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a306cdd2ad3a7d795d8e617a58c3a2ed0f76c8496fb7621b6cd514eb1532cae8"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:2f5fa187bde8524b1e37ba894db13aadd64faa884657473b03a019f625cee9a8"}, + {file = "pydantic_core-2.14.6-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:438027a975cc213a47c5d70672e0d29776082155cfae540c4e225716586be75e"}, + {file = "pydantic_core-2.14.6-cp37-none-win32.whl", hash = "sha256:f96ae96a060a8072ceff4cfde89d261837b4294a4f28b84a28765470d502ccc6"}, + {file = "pydantic_core-2.14.6-cp37-none-win_amd64.whl", hash = "sha256:e646c0e282e960345314f42f2cea5e0b5f56938c093541ea6dbf11aec2862391"}, + {file = "pydantic_core-2.14.6-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:db453f2da3f59a348f514cfbfeb042393b68720787bbef2b4c6068ea362c8149"}, + {file = "pydantic_core-2.14.6-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3860c62057acd95cc84044e758e47b18dcd8871a328ebc8ccdefd18b0d26a21b"}, + {file = "pydantic_core-2.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36026d8f99c58d7044413e1b819a67ca0e0b8ebe0f25e775e6c3d1fabb3c38fb"}, + {file = "pydantic_core-2.14.6-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8ed1af8692bd8d2a29d702f1a2e6065416d76897d726e45a1775b1444f5928a7"}, + {file = "pydantic_core-2.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:314ccc4264ce7d854941231cf71b592e30d8d368a71e50197c905874feacc8a8"}, + {file = "pydantic_core-2.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:982487f8931067a32e72d40ab6b47b1628a9c5d344be7f1a4e668fb462d2da42"}, + {file = "pydantic_core-2.14.6-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2dbe357bc4ddda078f79d2a36fc1dd0494a7f2fad83a0a684465b6f24b46fe80"}, + {file = "pydantic_core-2.14.6-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2f6ffc6701a0eb28648c845f4945a194dc7ab3c651f535b81793251e1185ac3d"}, + {file = "pydantic_core-2.14.6-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:7f5025db12fc6de7bc1104d826d5aee1d172f9ba6ca936bf6474c2148ac336c1"}, + {file = "pydantic_core-2.14.6-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:dab03ed811ed1c71d700ed08bde8431cf429bbe59e423394f0f4055f1ca0ea60"}, + {file = "pydantic_core-2.14.6-cp38-none-win32.whl", hash = "sha256:dfcbebdb3c4b6f739a91769aea5ed615023f3c88cb70df812849aef634c25fbe"}, + {file = "pydantic_core-2.14.6-cp38-none-win_amd64.whl", hash = "sha256:99b14dbea2fdb563d8b5a57c9badfcd72083f6006caf8e126b491519c7d64ca8"}, + {file = "pydantic_core-2.14.6-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:4ce8299b481bcb68e5c82002b96e411796b844d72b3e92a3fbedfe8e19813eab"}, + {file = "pydantic_core-2.14.6-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b9a9d92f10772d2a181b5ca339dee066ab7d1c9a34ae2421b2a52556e719756f"}, + {file = "pydantic_core-2.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fd9e98b408384989ea4ab60206b8e100d8687da18b5c813c11e92fd8212a98e0"}, + {file = "pydantic_core-2.14.6-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4f86f1f318e56f5cbb282fe61eb84767aee743ebe32c7c0834690ebea50c0a6b"}, + {file = "pydantic_core-2.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86ce5fcfc3accf3a07a729779d0b86c5d0309a4764c897d86c11089be61da160"}, + {file = "pydantic_core-2.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3dcf1978be02153c6a31692d4fbcc2a3f1db9da36039ead23173bc256ee3b91b"}, + {file = "pydantic_core-2.14.6-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eedf97be7bc3dbc8addcef4142f4b4164066df0c6f36397ae4aaed3eb187d8ab"}, + {file = "pydantic_core-2.14.6-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d5f916acf8afbcab6bacbb376ba7dc61f845367901ecd5e328fc4d4aef2fcab0"}, + {file = "pydantic_core-2.14.6-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8a14c192c1d724c3acbfb3f10a958c55a2638391319ce8078cb36c02283959b9"}, + {file = "pydantic_core-2.14.6-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0348b1dc6b76041516e8a854ff95b21c55f5a411c3297d2ca52f5528e49d8411"}, + {file = "pydantic_core-2.14.6-cp39-none-win32.whl", hash = "sha256:de2a0645a923ba57c5527497daf8ec5df69c6eadf869e9cd46e86349146e5975"}, + {file = "pydantic_core-2.14.6-cp39-none-win_amd64.whl", hash = "sha256:aca48506a9c20f68ee61c87f2008f81f8ee99f8d7f0104bff3c47e2d148f89d9"}, + {file = "pydantic_core-2.14.6-pp310-pypy310_pp73-macosx_10_7_x86_64.whl", hash = "sha256:d5c28525c19f5bb1e09511669bb57353d22b94cf8b65f3a8d141c389a55dec95"}, + {file = "pydantic_core-2.14.6-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:78d0768ee59baa3de0f4adac9e3748b4b1fffc52143caebddfd5ea2961595277"}, + {file = "pydantic_core-2.14.6-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b93785eadaef932e4fe9c6e12ba67beb1b3f1e5495631419c784ab87e975670"}, + {file = "pydantic_core-2.14.6-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a874f21f87c485310944b2b2734cd6d318765bcbb7515eead33af9641816506e"}, + {file = "pydantic_core-2.14.6-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b89f4477d915ea43b4ceea6756f63f0288941b6443a2b28c69004fe07fde0d0d"}, + {file = "pydantic_core-2.14.6-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:172de779e2a153d36ee690dbc49c6db568d7b33b18dc56b69a7514aecbcf380d"}, + {file = "pydantic_core-2.14.6-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:dfcebb950aa7e667ec226a442722134539e77c575f6cfaa423f24371bb8d2e94"}, + {file = "pydantic_core-2.14.6-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:55a23dcd98c858c0db44fc5c04fc7ed81c4b4d33c653a7c45ddaebf6563a2f66"}, + {file = "pydantic_core-2.14.6-pp37-pypy37_pp73-macosx_10_7_x86_64.whl", hash = "sha256:4241204e4b36ab5ae466ecec5c4c16527a054c69f99bba20f6f75232a6a534e2"}, + {file = "pydantic_core-2.14.6-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e574de99d735b3fc8364cba9912c2bec2da78775eba95cbb225ef7dda6acea24"}, + {file = "pydantic_core-2.14.6-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1302a54f87b5cd8528e4d6d1bf2133b6aa7c6122ff8e9dc5220fbc1e07bffebd"}, + {file = "pydantic_core-2.14.6-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f8e81e4b55930e5ffab4a68db1af431629cf2e4066dbdbfef65348b8ab804ea8"}, + {file = "pydantic_core-2.14.6-pp37-pypy37_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:c99462ffc538717b3e60151dfaf91125f637e801f5ab008f81c402f1dff0cd0f"}, + {file = "pydantic_core-2.14.6-pp37-pypy37_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e4cf2d5829f6963a5483ec01578ee76d329eb5caf330ecd05b3edd697e7d768a"}, + {file = "pydantic_core-2.14.6-pp38-pypy38_pp73-macosx_10_7_x86_64.whl", hash = "sha256:cf10b7d58ae4a1f07fccbf4a0a956d705356fea05fb4c70608bb6fa81d103cda"}, + {file = "pydantic_core-2.14.6-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:399ac0891c284fa8eb998bcfa323f2234858f5d2efca3950ae58c8f88830f145"}, + {file = "pydantic_core-2.14.6-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c6a5c79b28003543db3ba67d1df336f253a87d3112dac3a51b94f7d48e4c0e1"}, + {file = "pydantic_core-2.14.6-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:599c87d79cab2a6a2a9df4aefe0455e61e7d2aeede2f8577c1b7c0aec643ee8e"}, + {file = "pydantic_core-2.14.6-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:43e166ad47ba900f2542a80d83f9fc65fe99eb63ceec4debec160ae729824052"}, + {file = "pydantic_core-2.14.6-pp38-pypy38_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:3a0b5db001b98e1c649dd55afa928e75aa4087e587b9524a4992316fa23c9fba"}, + {file = "pydantic_core-2.14.6-pp38-pypy38_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:747265448cb57a9f37572a488a57d873fd96bf51e5bb7edb52cfb37124516da4"}, + {file = "pydantic_core-2.14.6-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:7ebe3416785f65c28f4f9441e916bfc8a54179c8dea73c23023f7086fa601c5d"}, + {file = "pydantic_core-2.14.6-pp39-pypy39_pp73-macosx_10_7_x86_64.whl", hash = "sha256:86c963186ca5e50d5c8287b1d1c9d3f8f024cbe343d048c5bd282aec2d8641f2"}, + {file = "pydantic_core-2.14.6-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:e0641b506486f0b4cd1500a2a65740243e8670a2549bb02bc4556a83af84ae03"}, + {file = "pydantic_core-2.14.6-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:71d72ca5eaaa8d38c8df16b7deb1a2da4f650c41b58bb142f3fb75d5ad4a611f"}, + {file = "pydantic_core-2.14.6-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27e524624eace5c59af499cd97dc18bb201dc6a7a2da24bfc66ef151c69a5f2a"}, + {file = "pydantic_core-2.14.6-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a3dde6cac75e0b0902778978d3b1646ca9f438654395a362cb21d9ad34b24acf"}, + {file = "pydantic_core-2.14.6-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:00646784f6cd993b1e1c0e7b0fdcbccc375d539db95555477771c27555e3c556"}, + {file = "pydantic_core-2.14.6-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:23598acb8ccaa3d1d875ef3b35cb6376535095e9405d91a3d57a8c7db5d29341"}, + {file = "pydantic_core-2.14.6-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7f41533d7e3cf9520065f610b41ac1c76bc2161415955fbcead4981b22c7611e"}, + {file = "pydantic_core-2.14.6.tar.gz", hash = "sha256:1fd0c1d395372843fba13a51c28e3bb9d59bd7aebfeb17358ffaaa1e4dbbe948"}, ] [package.dependencies] @@ -2843,20 +3125,20 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0" [[package]] name = "pydantic-extra-types" -version = "2.1.0" +version = "2.4.1" description = "Extra Pydantic types." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "pydantic_extra_types-2.1.0-py3-none-any.whl", hash = "sha256:1b8aa83a2986b0bc6a7179834fdb423c5e0bcef6b2b4cd9261bf753ad7dcc483"}, - {file = "pydantic_extra_types-2.1.0.tar.gz", hash = "sha256:d07b869e733d33712b07d6b8cd7b0223077c23ae5a1e23bd0699a00401259ec7"}, + {file = "pydantic_extra_types-2.4.1-py3-none-any.whl", hash = "sha256:b3cec735e471b1234a1cc05a680dc080836bab6970cab40d60dcade97fe68f5d"}, + {file = "pydantic_extra_types-2.4.1.tar.gz", hash = "sha256:63314096ca57bc1575d988d1a770d73af76aaebe684140f24333b60af4134a2c"}, ] [package.dependencies] -pydantic = ">=2.0.3" +pydantic = ">=2.5.2" [package.extras] -all = ["phonenumbers (>=8,<9)", "pycountry (>=22,<23)"] +all = ["phonenumbers (>=8,<9)", "pycountry (>=23,<24)", "python-ulid (>=1,<2)"] [[package]] name = "pydantic-settings" @@ -2909,6 +3191,20 @@ files = [ {file = "PyPika-0.48.9.tar.gz", hash = "sha256:838836a61747e7c8380cd1b7ff638694b7a7335345d0f559b04b2cd832ad5378"}, ] +[[package]] +name = "pyproject-hooks" +version = "1.0.0" +description = "Wrappers to call pyproject.toml-based build backend hooks." +optional = false +python-versions = ">=3.7" +files = [ + {file = "pyproject_hooks-1.0.0-py3-none-any.whl", hash = "sha256:283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8"}, + {file = "pyproject_hooks-1.0.0.tar.gz", hash = "sha256:f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5"}, +] + +[package.dependencies] +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} + [[package]] name = "pyreadline3" version = "3.4.1" @@ -3047,101 +3343,101 @@ files = [ [[package]] name = "rapidfuzz" -version = "3.5.2" +version = "3.6.1" description = "rapid fuzzy string matching" optional = false python-versions = ">=3.8" files = [ - {file = "rapidfuzz-3.5.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1a047d6e58833919d742bbc0dfa66d1de4f79e8562ee195007d3eae96635df39"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:22877c027c492b7dc7e3387a576a33ed5aad891104aa90da2e0844c83c5493ef"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e0f448b0eacbcc416feb634e1232a48d1cbde5e60f269c84e4fb0912f7bbb001"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d05146497672f869baf41147d5ec1222788c70e5b8b0cfcd6e95597c75b5b96b"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8f2df3968738a38d2a0058b5e721753f5d3d602346a1027b0dde31b0476418f3"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5afc1fcf1830f9bb87d3b490ba03691081b9948a794ea851befd2643069a30c1"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:84be69ea65f64fa01e5c4976be9826a5aa949f037508887add42da07420d65d6"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8658c1045766e87e0038323aa38b4a9f49b7f366563271f973c8890a98aa24b5"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:852b3f93c15fce58b8dc668bd54123713bfdbbb0796ba905ea5df99cfd083132"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:12424a06ad9bd0cbf5f7cea1015e78d924a0034a0e75a5a7b39c0703dcd94095"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b4e9ded8e80530bd7205a7a2b01802f934a4695ca9e9fbe1ce9644f5e0697864"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:affb8fe36157c2dc8a7bc45b6a1875eb03e2c49167a1d52789144bdcb7ab3b8c"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c1d33a622572d384f4c90b5f7a139328246ab5600141e90032b521c2127bd605"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-win32.whl", hash = "sha256:2cf9f2ed4a97b388cffd48d534452a564c2491f68f4fd5bc140306f774ceb63a"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-win_amd64.whl", hash = "sha256:6541ffb70097885f7302cd73e2efd77be99841103023c2f9408551f27f45f7a5"}, - {file = "rapidfuzz-3.5.2-cp310-cp310-win_arm64.whl", hash = "sha256:1dd2542e5103fb8ca46500a979ae14d1609dcba11d2f9fe01e99eec03420e193"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:bff7d3127ebc5cd908f3a72f6517f31f5247b84666137556a8fcc5177c560939"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:fdfdb3685b631d8efbb6d6d3d86eb631be2b408d9adafcadc11e63e3f9c96dec"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:97b043fe8185ec53bb3ff0e59deb89425c0fc6ece6e118939963aab473505801"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1a4a7832737f87583f3863dc62e6f56dd4a9fefc5f04a7bdcb4c433a0f36bb1b"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2d876dba9a11fcf60dcf1562c5a84ef559db14c2ceb41e1ad2d93cd1dc085889"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa4c0612893716bbb6595066ca9ecb517c982355abe39ba9d1f4ab834ace91ad"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:120316824333e376b88b284724cfd394c6ccfcb9818519eab5d58a502e5533f0"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9cdbe8e80cc186d55f748a34393533a052d855357d5398a1ccb71a5021b58e8d"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1062425c8358a547ae5ebad148f2e0f02417716a571b803b0c68e4d552e99d32"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:66be181965aff13301dd5f9b94b646ce39d99c7fe2fd5de1656f4ca7fafcb38c"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:53df7aea3cf301633cfa2b4b2c2d2441a87dfc878ef810e5b4eddcd3e68723ad"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:76639dca5eb0afc6424ac5f42d43d3bd342ac710e06f38a8c877d5b96de09589"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:27689361c747b5f7b8a26056bc60979875323f1c3dcaaa9e2fec88f03b20a365"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-win32.whl", hash = "sha256:99c9fc5265566fb94731dc6826f43c5109e797078264e6389a36d47814473692"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-win_amd64.whl", hash = "sha256:666928ee735562a909d81bd2f63207b3214afd4ca41f790ab3025d066975c814"}, - {file = "rapidfuzz-3.5.2-cp311-cp311-win_arm64.whl", hash = "sha256:d55de67c48f06b7772541e8d4c062a2679205799ce904236e2836cb04c106442"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:04e1e02b182283c43c866e215317735e91d22f5d34e65400121c04d5ed7ed859"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:365e544aba3ac13acf1a62cb2e5909ad2ba078d0bfc7d69b1f801dfd673b9782"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b61f77d834f94b0099fa9ed35c189b7829759d4e9c2743697a130dd7ba62259f"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43fb368998b9703fa8c63db292a8ab9e988bf6da0c8a635754be8e69da1e7c1d"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:25510b5d142c47786dbd27cfd9da7cae5bdea28d458379377a3644d8460a3404"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bf3093443751e5a419834162af358d1e31dec75f84747a91dbbc47b2c04fc085"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2fbaf546f15a924613f89d609ff66b85b4f4c2307ac14d93b80fe1025b713138"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:32d580df0e130ed85400ff77e1c32d965e9bc7be29ac4072ab637f57e26d29fb"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:358a0fbc49343de20fee8ebdb33c7fa8f55a9ff93ff42d1ffe097d2caa248f1b"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:fb379ac0ddfc86c5542a225d194f76ed468b071b6f79ff57c4b72e635605ad7d"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:7fb21e182dc6d83617e88dea002963d5cf99cf5eabbdbf04094f503d8fe8d723"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:c04f9f1310ce414ab00bdcbf26d0906755094bfc59402cb66a7722c6f06d70b2"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:f6da61cc38c1a95efc5edcedf258759e6dbab73191651a28c5719587f32a56ad"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-win32.whl", hash = "sha256:f823fd1977071486739f484e27092765d693da6beedaceece54edce1dfeec9b2"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-win_amd64.whl", hash = "sha256:a8162d81486de85ab1606e48e076431b66d44cf431b2b678e9cae458832e7147"}, - {file = "rapidfuzz-3.5.2-cp312-cp312-win_arm64.whl", hash = "sha256:dfc63fabb7d8da8483ca836bae7e55766fe39c63253571e103c034ba8ea80950"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:df8fae2515a1e4936affccac3e7d506dd904de5ff82bc0b1433b4574a51b9bfb"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:dd6384780c2a16097d47588844cd677316a90e0f41ef96ff485b62d58de79dcf"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:467a4d730ae3bade87dba6bd769e837ab97e176968ce20591fe8f7bf819115b1"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:54576669c1502b751b534bd76a4aeaaf838ed88b30af5d5c1b7d0a3ca5d4f7b5"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abafeb82f85a651a9d6d642a33dc021606bc459c33e250925b25d6b9e7105a2e"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:73e14617a520c0f1bc15eb78c215383477e5ca70922ecaff1d29c63c060e04ca"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7cdf92116e9dfe40da17f921cdbfa0039dde9eb158914fa5f01b1e67a20b19cb"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1962d5ccf8602589dbf8e85246a0ee2b4050d82fade1568fb76f8a4419257704"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:db45028eae2fda7a24759c69ebeb2a7fbcc1a326606556448ed43ee480237a3c"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:b685abb8b6d97989f6c69556d7934e0e533aa8822f50b9517ff2da06a1d29f23"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:40139552961018216b8cd88f6df4ecbbe984f907a62a5c823ccd907132c29a14"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:0fef4705459842ef8f79746d6f6a0b5d2b6a61a145d7d8bbe10b2e756ea337c8"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6b2ad5516f7068c7d9cbcda8ac5906c589e99bc427df2e1050282ee2d8bc2d58"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-win32.whl", hash = "sha256:2da3a24c2f7dfca7f26ba04966b848e3bbeb93e54d899908ff88dfe3e1def9dc"}, - {file = "rapidfuzz-3.5.2-cp38-cp38-win_amd64.whl", hash = "sha256:e3f2be79d4114d01f383096dbee51b57df141cb8b209c19d0cf65f23a24e75ba"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:089a7e96e5032821af5964d8457fcb38877cc321cdd06ad7c5d6e3d852264cb9"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:75d8a52bf8d1aa2ac968ae4b21b83b94fc7e5ea3dfbab34811fc60f32df505b2"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2bacce6bbc0362f0789253424269cc742b1f45e982430387db3abe1d0496e371"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5fd627e604ddc02db2ddb9ddc4a91dd92b7a6d6378fcf30bb37b49229072b89"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b2e8b369f23f00678f6e673572209a5d3b0832f4991888e3df97af7b8b9decf3"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c29958265e4c2b937269e804b8a160c027ee1c2627d6152655008a8b8083630e"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:00be97f9219355945c46f37ac9fa447046e6f7930f7c901e5d881120d1695458"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ada0d8d57e0f556ef38c24fee71bfe8d0db29c678bff2acd1819fc1b74f331c2"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:de89585268ed8ee44e80126814cae63ff6b00d08416481f31b784570ef07ec59"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:908ff2de9c442b379143d1da3c886c63119d4eba22986806e2533cee603fe64b"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:54f0061028723c026020f5bb20649c22bc8a0d9f5363c283bdc5901d4d3bff01"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:b581107ec0c610cdea48b25f52030770be390db4a9a73ca58b8d70fa8a5ec32e"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1d5a686ea258931aaa38019204bdc670bbe14b389a230b1363d84d6cf4b9dc38"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-win32.whl", hash = "sha256:97f811ca7709c6ee8c0b55830f63b3d87086f4abbcbb189b4067e1cd7014db7b"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-win_amd64.whl", hash = "sha256:58ee34350f8c292dd24a050186c0e18301d80da904ef572cf5fda7be6a954929"}, - {file = "rapidfuzz-3.5.2-cp39-cp39-win_arm64.whl", hash = "sha256:c5075ce7b9286624cafcf36720ef1cfb2946d75430b87cb4d1f006e82cd71244"}, - {file = "rapidfuzz-3.5.2-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:af5221e4f7800db3e84c46b79dba4112e3b3cc2678f808bdff4fcd2487073846"}, - {file = "rapidfuzz-3.5.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8501d7875b176930e6ed9dbc1bc35adb37ef312f6106bd6bb5c204adb90160ac"}, - {file = "rapidfuzz-3.5.2-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e414e1ca40386deda4291aa2d45062fea0fbaa14f95015738f8bb75c4d27f862"}, - {file = "rapidfuzz-3.5.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2059cd73b7ea779a9307d7a78ed743f0e3d33b88ccdcd84569abd2953cd859f"}, - {file = "rapidfuzz-3.5.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:58e3e21f6f13a7cca265cce492bc797425bd4cb2025fdd161a9e86a824ad65ce"}, - {file = "rapidfuzz-3.5.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b847a49377e64e92e11ef3d0a793de75451526c83af015bdafdd5d04de8a058a"}, - {file = "rapidfuzz-3.5.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a42c7a8c62b29c4810e39da22b42524295fcb793f41c395c2cb07c126b729e83"}, - {file = "rapidfuzz-3.5.2-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:51b5166be86e09e011e92d9862b1fe64c4c7b9385f443fb535024e646d890460"}, - {file = "rapidfuzz-3.5.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f808dcb0088a7a496cc9895e66a7b8de55ffea0eb9b547c75dfb216dd5f76ed"}, - {file = "rapidfuzz-3.5.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:d4b05a8f4ab7e7344459394094587b033fe259eea3a8720035e8ba30e79ab39b"}, - {file = "rapidfuzz-3.5.2.tar.gz", hash = "sha256:9e9b395743e12c36a3167a3a9fd1b4e11d92fb0aa21ec98017ee6df639ed385e"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ac434fc71edda30d45db4a92ba5e7a42c7405e1a54cb4ec01d03cc668c6dcd40"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2a791168e119cfddf4b5a40470620c872812042f0621e6a293983a2d52372db0"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5a2f3e9df346145c2be94e4d9eeffb82fab0cbfee85bd4a06810e834fe7c03fa"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:23de71e7f05518b0bbeef55d67b5dbce3bcd3e2c81e7e533051a2e9401354eb0"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d056e342989248d2bdd67f1955bb7c3b0ecfa239d8f67a8dfe6477b30872c607"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:01835d02acd5d95c1071e1da1bb27fe213c84a013b899aba96380ca9962364bc"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ed0f712e0bb5fea327e92aec8a937afd07ba8de4c529735d82e4c4124c10d5a0"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96cd19934f76a1264e8ecfed9d9f5291fde04ecb667faef5f33bdbfd95fe2d1f"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e06c4242a1354cf9d48ee01f6f4e6e19c511d50bb1e8d7d20bcadbb83a2aea90"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:d73dcfe789d37c6c8b108bf1e203e027714a239e50ad55572ced3c004424ed3b"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:06e98ff000e2619e7cfe552d086815671ed09b6899408c2c1b5103658261f6f3"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:08b6fb47dd889c69fbc0b915d782aaed43e025df6979b6b7f92084ba55edd526"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a1788ebb5f5b655a15777e654ea433d198f593230277e74d51a2a1e29a986283"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-win32.whl", hash = "sha256:c65f92881753aa1098c77818e2b04a95048f30edbe9c3094dc3707d67df4598b"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-win_amd64.whl", hash = "sha256:4243a9c35667a349788461aae6471efde8d8800175b7db5148a6ab929628047f"}, + {file = "rapidfuzz-3.6.1-cp310-cp310-win_arm64.whl", hash = "sha256:f59d19078cc332dbdf3b7b210852ba1f5db8c0a2cd8cc4c0ed84cc00c76e6802"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:fbc07e2e4ac696497c5f66ec35c21ddab3fc7a406640bffed64c26ab2f7ce6d6"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:40cced1a8852652813f30fb5d4b8f9b237112a0bbaeebb0f4cc3611502556764"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:82300e5f8945d601c2daaaac139d5524d7c1fdf719aa799a9439927739917460"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edf97c321fd641fea2793abce0e48fa4f91f3c202092672f8b5b4e781960b891"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7420e801b00dee4a344ae2ee10e837d603461eb180e41d063699fb7efe08faf0"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:060bd7277dc794279fa95522af355034a29c90b42adcb7aa1da358fc839cdb11"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b7e3375e4f2bfec77f907680328e4cd16cc64e137c84b1886d547ab340ba6928"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a490cd645ef9d8524090551016f05f052e416c8adb2d8b85d35c9baa9d0428ab"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:2e03038bfa66d2d7cffa05d81c2f18fd6acbb25e7e3c068d52bb7469e07ff382"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:2b19795b26b979c845dba407fe79d66975d520947b74a8ab6cee1d22686f7967"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:064c1d66c40b3a0f488db1f319a6e75616b2e5fe5430a59f93a9a5e40a656d15"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:3c772d04fb0ebeece3109d91f6122b1503023086a9591a0b63d6ee7326bd73d9"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:841eafba6913c4dfd53045835545ba01a41e9644e60920c65b89c8f7e60c00a9"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-win32.whl", hash = "sha256:266dd630f12696ea7119f31d8b8e4959ef45ee2cbedae54417d71ae6f47b9848"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-win_amd64.whl", hash = "sha256:d79aec8aeee02ab55d0ddb33cea3ecd7b69813a48e423c966a26d7aab025cdfe"}, + {file = "rapidfuzz-3.6.1-cp311-cp311-win_arm64.whl", hash = "sha256:484759b5dbc5559e76fefaa9170147d1254468f555fd9649aea3bad46162a88b"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:b2ef4c0fd3256e357b70591ffb9e8ed1d439fb1f481ba03016e751a55261d7c1"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:588c4b20fa2fae79d60a4e438cf7133d6773915df3cc0a7f1351da19eb90f720"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7142ee354e9c06e29a2636b9bbcb592bb00600a88f02aa5e70e4f230347b373e"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1dfc557c0454ad22382373ec1b7df530b4bbd974335efe97a04caec936f2956a"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:03f73b381bdeccb331a12c3c60f1e41943931461cdb52987f2ecf46bfc22f50d"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6b0ccc2ec1781c7e5370d96aef0573dd1f97335343e4982bdb3a44c133e27786"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:da3e8c9f7e64bb17faefda085ff6862ecb3ad8b79b0f618a6cf4452028aa2222"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fde9b14302a31af7bdafbf5cfbb100201ba21519be2b9dedcf4f1048e4fbe65d"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c1a23eee225dfb21c07f25c9fcf23eb055d0056b48e740fe241cbb4b22284379"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:e49b9575d16c56c696bc7b06a06bf0c3d4ef01e89137b3ddd4e2ce709af9fe06"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:0a9fc714b8c290261669f22808913aad49553b686115ad0ee999d1cb3df0cd66"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:a3ee4f8f076aa92184e80308fc1a079ac356b99c39408fa422bbd00145be9854"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:f056ba42fd2f32e06b2c2ba2443594873cfccc0c90c8b6327904fc2ddf6d5799"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-win32.whl", hash = "sha256:5d82b9651e3d34b23e4e8e201ecd3477c2baa17b638979deeabbb585bcb8ba74"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-win_amd64.whl", hash = "sha256:dad55a514868dae4543ca48c4e1fc0fac704ead038dafedf8f1fc0cc263746c1"}, + {file = "rapidfuzz-3.6.1-cp312-cp312-win_arm64.whl", hash = "sha256:3c84294f4470fcabd7830795d754d808133329e0a81d62fcc2e65886164be83b"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e19d519386e9db4a5335a4b29f25b8183a1c3f78cecb4c9c3112e7f86470e37f"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:01eb03cd880a294d1bf1a583fdd00b87169b9cc9c9f52587411506658c864d73"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:be368573255f8fbb0125a78330a1a40c65e9ba3c5ad129a426ff4289099bfb41"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b3e5af946f419c30f5cb98b69d40997fe8580efe78fc83c2f0f25b60d0e56efb"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f382f7ffe384ce34345e1c0b2065451267d3453cadde78946fbd99a59f0cc23c"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be156f51f3a4f369e758505ed4ae64ea88900dcb2f89d5aabb5752676d3f3d7e"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1936d134b6c513fbe934aeb668b0fee1ffd4729a3c9d8d373f3e404fbb0ce8a0"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:12ff8eaf4a9399eb2bebd838f16e2d1ded0955230283b07376d68947bbc2d33d"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ae598a172e3a95df3383634589660d6b170cc1336fe7578115c584a99e0ba64d"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cd4ba4c18b149da11e7f1b3584813159f189dc20833709de5f3df8b1342a9759"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:0402f1629e91a4b2e4aee68043a30191e5e1b7cd2aa8dacf50b1a1bcf6b7d3ab"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:1e12319c6b304cd4c32d5db00b7a1e36bdc66179c44c5707f6faa5a889a317c0"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0bbfae35ce4de4c574b386c43c78a0be176eeddfdae148cb2136f4605bebab89"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-win32.whl", hash = "sha256:7fec74c234d3097612ea80f2a80c60720eec34947066d33d34dc07a3092e8105"}, + {file = "rapidfuzz-3.6.1-cp38-cp38-win_amd64.whl", hash = "sha256:a553cc1a80d97459d587529cc43a4c7c5ecf835f572b671107692fe9eddf3e24"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:757dfd7392ec6346bd004f8826afb3bf01d18a723c97cbe9958c733ab1a51791"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2963f4a3f763870a16ee076796be31a4a0958fbae133dbc43fc55c3968564cf5"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d2f0274595cc5b2b929c80d4e71b35041104b577e118cf789b3fe0a77b37a4c5"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f211e366e026de110a4246801d43a907cd1a10948082f47e8a4e6da76fef52"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a59472b43879012b90989603aa5a6937a869a72723b1bf2ff1a0d1edee2cc8e6"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a03863714fa6936f90caa7b4b50ea59ea32bb498cc91f74dc25485b3f8fccfe9"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5dd95b6b7bfb1584f806db89e1e0c8dbb9d25a30a4683880c195cc7f197eaf0c"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7183157edf0c982c0b8592686535c8b3e107f13904b36d85219c77be5cefd0d8"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ad9d74ef7c619b5b0577e909582a1928d93e07d271af18ba43e428dc3512c2a1"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:b53137d81e770c82189e07a8f32722d9e4260f13a0aec9914029206ead38cac3"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:49b9ed2472394d306d5dc967a7de48b0aab599016aa4477127b20c2ed982dbf9"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:dec307b57ec2d5054d77d03ee4f654afcd2c18aee00c48014cb70bfed79597d6"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4381023fa1ff32fd5076f5d8321249a9aa62128eb3f21d7ee6a55373e672b261"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-win32.whl", hash = "sha256:8d7a072f10ee57c8413c8ab9593086d42aaff6ee65df4aa6663eecdb7c398dca"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-win_amd64.whl", hash = "sha256:ebcfb5bfd0a733514352cfc94224faad8791e576a80ffe2fd40b2177bf0e7198"}, + {file = "rapidfuzz-3.6.1-cp39-cp39-win_arm64.whl", hash = "sha256:1c47d592e447738744905c18dda47ed155620204714e6df20eb1941bb1ba315e"}, + {file = "rapidfuzz-3.6.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:eef8b346ab331bec12bbc83ac75641249e6167fab3d84d8f5ca37fd8e6c7a08c"}, + {file = "rapidfuzz-3.6.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:53251e256017e2b87f7000aee0353ba42392c442ae0bafd0f6b948593d3f68c6"}, + {file = "rapidfuzz-3.6.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6dede83a6b903e3ebcd7e8137e7ff46907ce9316e9d7e7f917d7e7cdc570ee05"}, + {file = "rapidfuzz-3.6.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8e4da90e4c2b444d0a171d7444ea10152e07e95972bb40b834a13bdd6de1110c"}, + {file = "rapidfuzz-3.6.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:ca3dfcf74f2b6962f411c33dd95b0adf3901266e770da6281bc96bb5a8b20de9"}, + {file = "rapidfuzz-3.6.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:bcc957c0a8bde8007f1a8a413a632a1a409890f31f73fe764ef4eac55f59ca87"}, + {file = "rapidfuzz-3.6.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:692c9a50bea7a8537442834f9bc6b7d29d8729a5b6379df17c31b6ab4df948c2"}, + {file = "rapidfuzz-3.6.1-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:76c23ceaea27e790ddd35ef88b84cf9d721806ca366199a76fd47cfc0457a81b"}, + {file = "rapidfuzz-3.6.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b155e67fff215c09f130555002e42f7517d0ea72cbd58050abb83cb7c880cec"}, + {file = "rapidfuzz-3.6.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3028ee8ecc48250607fa8a0adce37b56275ec3b1acaccd84aee1f68487c8557b"}, + {file = "rapidfuzz-3.6.1.tar.gz", hash = "sha256:35660bee3ce1204872574fa041c7ad7ec5175b3053a4cb6e181463fc07013de7"}, ] [package.extras] @@ -3149,99 +3445,104 @@ full = ["numpy"] [[package]] name = "regex" -version = "2023.10.3" +version = "2023.12.25" description = "Alternative regular expression module, to replace re." optional = false python-versions = ">=3.7" files = [ - {file = "regex-2023.10.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4c34d4f73ea738223a094d8e0ffd6d2c1a1b4c175da34d6b0de3d8d69bee6bcc"}, - {file = "regex-2023.10.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a8f4e49fc3ce020f65411432183e6775f24e02dff617281094ba6ab079ef0915"}, - {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4cd1bccf99d3ef1ab6ba835308ad85be040e6a11b0977ef7ea8c8005f01a3c29"}, - {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:81dce2ddc9f6e8f543d94b05d56e70d03a0774d32f6cca53e978dc01e4fc75b8"}, - {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c6b4d23c04831e3ab61717a707a5d763b300213db49ca680edf8bf13ab5d91b"}, - {file = "regex-2023.10.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c15ad0aee158a15e17e0495e1e18741573d04eb6da06d8b84af726cfc1ed02ee"}, - {file = "regex-2023.10.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6239d4e2e0b52c8bd38c51b760cd870069f0bdf99700a62cd509d7a031749a55"}, - {file = "regex-2023.10.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4a8bf76e3182797c6b1afa5b822d1d5802ff30284abe4599e1247be4fd6b03be"}, - {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9c727bbcf0065cbb20f39d2b4f932f8fa1631c3e01fcedc979bd4f51fe051c5"}, - {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3ccf2716add72f80714b9a63899b67fa711b654be3fcdd34fa391d2d274ce767"}, - {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:107ac60d1bfdc3edb53be75e2a52aff7481b92817cfdddd9b4519ccf0e54a6ff"}, - {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:00ba3c9818e33f1fa974693fb55d24cdc8ebafcb2e4207680669d8f8d7cca79a"}, - {file = "regex-2023.10.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f0a47efb1dbef13af9c9a54a94a0b814902e547b7f21acb29434504d18f36e3a"}, - {file = "regex-2023.10.3-cp310-cp310-win32.whl", hash = "sha256:36362386b813fa6c9146da6149a001b7bd063dabc4d49522a1f7aa65b725c7ec"}, - {file = "regex-2023.10.3-cp310-cp310-win_amd64.whl", hash = "sha256:c65a3b5330b54103e7d21cac3f6bf3900d46f6d50138d73343d9e5b2900b2353"}, - {file = "regex-2023.10.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:90a79bce019c442604662d17bf69df99090e24cdc6ad95b18b6725c2988a490e"}, - {file = "regex-2023.10.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c7964c2183c3e6cce3f497e3a9f49d182e969f2dc3aeeadfa18945ff7bdd7051"}, - {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ef80829117a8061f974b2fda8ec799717242353bff55f8a29411794d635d964"}, - {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5addc9d0209a9afca5fc070f93b726bf7003bd63a427f65ef797a931782e7edc"}, - {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c148bec483cc4b421562b4bcedb8e28a3b84fcc8f0aa4418e10898f3c2c0eb9b"}, - {file = "regex-2023.10.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d1f21af4c1539051049796a0f50aa342f9a27cde57318f2fc41ed50b0dbc4ac"}, - {file = "regex-2023.10.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0b9ac09853b2a3e0d0082104036579809679e7715671cfbf89d83c1cb2a30f58"}, - {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ebedc192abbc7fd13c5ee800e83a6df252bec691eb2c4bedc9f8b2e2903f5e2a"}, - {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d8a993c0a0ffd5f2d3bda23d0cd75e7086736f8f8268de8a82fbc4bd0ac6791e"}, - {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:be6b7b8d42d3090b6c80793524fa66c57ad7ee3fe9722b258aec6d0672543fd0"}, - {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4023e2efc35a30e66e938de5aef42b520c20e7eda7bb5fb12c35e5d09a4c43f6"}, - {file = "regex-2023.10.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0d47840dc05e0ba04fe2e26f15126de7c755496d5a8aae4a08bda4dd8d646c54"}, - {file = "regex-2023.10.3-cp311-cp311-win32.whl", hash = "sha256:9145f092b5d1977ec8c0ab46e7b3381b2fd069957b9862a43bd383e5c01d18c2"}, - {file = "regex-2023.10.3-cp311-cp311-win_amd64.whl", hash = "sha256:b6104f9a46bd8743e4f738afef69b153c4b8b592d35ae46db07fc28ae3d5fb7c"}, - {file = "regex-2023.10.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:bff507ae210371d4b1fe316d03433ac099f184d570a1a611e541923f78f05037"}, - {file = "regex-2023.10.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:be5e22bbb67924dea15039c3282fa4cc6cdfbe0cbbd1c0515f9223186fc2ec5f"}, - {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a992f702c9be9c72fa46f01ca6e18d131906a7180950958f766c2aa294d4b41"}, - {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7434a61b158be563c1362d9071358f8ab91b8d928728cd2882af060481244c9e"}, - {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c2169b2dcabf4e608416f7f9468737583ce5f0a6e8677c4efbf795ce81109d7c"}, - {file = "regex-2023.10.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9e908ef5889cda4de038892b9accc36d33d72fb3e12c747e2799a0e806ec841"}, - {file = "regex-2023.10.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:12bd4bc2c632742c7ce20db48e0d99afdc05e03f0b4c1af90542e05b809a03d9"}, - {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bc72c231f5449d86d6c7d9cc7cd819b6eb30134bb770b8cfdc0765e48ef9c420"}, - {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:bce8814b076f0ce5766dc87d5a056b0e9437b8e0cd351b9a6c4e1134a7dfbda9"}, - {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:ba7cd6dc4d585ea544c1412019921570ebd8a597fabf475acc4528210d7c4a6f"}, - {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b0c7d2f698e83f15228ba41c135501cfe7d5740181d5903e250e47f617eb4292"}, - {file = "regex-2023.10.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5a8f91c64f390ecee09ff793319f30a0f32492e99f5dc1c72bc361f23ccd0a9a"}, - {file = "regex-2023.10.3-cp312-cp312-win32.whl", hash = "sha256:ad08a69728ff3c79866d729b095872afe1e0557251da4abb2c5faff15a91d19a"}, - {file = "regex-2023.10.3-cp312-cp312-win_amd64.whl", hash = "sha256:39cdf8d141d6d44e8d5a12a8569d5a227f645c87df4f92179bd06e2e2705e76b"}, - {file = "regex-2023.10.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4a3ee019a9befe84fa3e917a2dd378807e423d013377a884c1970a3c2792d293"}, - {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76066d7ff61ba6bf3cb5efe2428fc82aac91802844c022d849a1f0f53820502d"}, - {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bfe50b61bab1b1ec260fa7cd91106fa9fece57e6beba05630afe27c71259c59b"}, - {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fd88f373cb71e6b59b7fa597e47e518282455c2734fd4306a05ca219a1991b0"}, - {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3ab05a182c7937fb374f7e946f04fb23a0c0699c0450e9fb02ef567412d2fa3"}, - {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dac37cf08fcf2094159922edc7a2784cfcc5c70f8354469f79ed085f0328ebdf"}, - {file = "regex-2023.10.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e54ddd0bb8fb626aa1f9ba7b36629564544954fff9669b15da3610c22b9a0991"}, - {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:3367007ad1951fde612bf65b0dffc8fd681a4ab98ac86957d16491400d661302"}, - {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:16f8740eb6dbacc7113e3097b0a36065a02e37b47c936b551805d40340fb9971"}, - {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:f4f2ca6df64cbdd27f27b34f35adb640b5d2d77264228554e68deda54456eb11"}, - {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:39807cbcbe406efca2a233884e169d056c35aa7e9f343d4e78665246a332f597"}, - {file = "regex-2023.10.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7eece6fbd3eae4a92d7c748ae825cbc1ee41a89bb1c3db05b5578ed3cfcfd7cb"}, - {file = "regex-2023.10.3-cp37-cp37m-win32.whl", hash = "sha256:ce615c92d90df8373d9e13acddd154152645c0dc060871abf6bd43809673d20a"}, - {file = "regex-2023.10.3-cp37-cp37m-win_amd64.whl", hash = "sha256:0f649fa32fe734c4abdfd4edbb8381c74abf5f34bc0b3271ce687b23729299ed"}, - {file = "regex-2023.10.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9b98b7681a9437262947f41c7fac567c7e1f6eddd94b0483596d320092004533"}, - {file = "regex-2023.10.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:91dc1d531f80c862441d7b66c4505cd6ea9d312f01fb2f4654f40c6fdf5cc37a"}, - {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82fcc1f1cc3ff1ab8a57ba619b149b907072e750815c5ba63e7aa2e1163384a4"}, - {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7979b834ec7a33aafae34a90aad9f914c41fd6eaa8474e66953f3f6f7cbd4368"}, - {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef71561f82a89af6cfcbee47f0fabfdb6e63788a9258e913955d89fdd96902ab"}, - {file = "regex-2023.10.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd829712de97753367153ed84f2de752b86cd1f7a88b55a3a775eb52eafe8a94"}, - {file = "regex-2023.10.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:00e871d83a45eee2f8688d7e6849609c2ca2a04a6d48fba3dff4deef35d14f07"}, - {file = "regex-2023.10.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:706e7b739fdd17cb89e1fbf712d9dc21311fc2333f6d435eac2d4ee81985098c"}, - {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:cc3f1c053b73f20c7ad88b0d1d23be7e7b3901229ce89f5000a8399746a6e039"}, - {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6f85739e80d13644b981a88f529d79c5bdf646b460ba190bffcaf6d57b2a9863"}, - {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:741ba2f511cc9626b7561a440f87d658aabb3d6b744a86a3c025f866b4d19e7f"}, - {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e77c90ab5997e85901da85131fd36acd0ed2221368199b65f0d11bca44549711"}, - {file = "regex-2023.10.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:979c24cbefaf2420c4e377ecd1f165ea08cc3d1fbb44bdc51bccbbf7c66a2cb4"}, - {file = "regex-2023.10.3-cp38-cp38-win32.whl", hash = "sha256:58837f9d221744d4c92d2cf7201c6acd19623b50c643b56992cbd2b745485d3d"}, - {file = "regex-2023.10.3-cp38-cp38-win_amd64.whl", hash = "sha256:c55853684fe08d4897c37dfc5faeff70607a5f1806c8be148f1695be4a63414b"}, - {file = "regex-2023.10.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2c54e23836650bdf2c18222c87f6f840d4943944146ca479858404fedeb9f9af"}, - {file = "regex-2023.10.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:69c0771ca5653c7d4b65203cbfc5e66db9375f1078689459fe196fe08b7b4930"}, - {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ac965a998e1388e6ff2e9781f499ad1eaa41e962a40d11c7823c9952c77123e"}, - {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1c0e8fae5b27caa34177bdfa5a960c46ff2f78ee2d45c6db15ae3f64ecadde14"}, - {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6c56c3d47da04f921b73ff9415fbaa939f684d47293f071aa9cbb13c94afc17d"}, - {file = "regex-2023.10.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ef1e014eed78ab650bef9a6a9cbe50b052c0aebe553fb2881e0453717573f52"}, - {file = "regex-2023.10.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d29338556a59423d9ff7b6eb0cb89ead2b0875e08fe522f3e068b955c3e7b59b"}, - {file = "regex-2023.10.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9c6d0ced3c06d0f183b73d3c5920727268d2201aa0fe6d55c60d68c792ff3588"}, - {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:994645a46c6a740ee8ce8df7911d4aee458d9b1bc5639bc968226763d07f00fa"}, - {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:66e2fe786ef28da2b28e222c89502b2af984858091675044d93cb50e6f46d7af"}, - {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:11175910f62b2b8c055f2b089e0fedd694fe2be3941b3e2633653bc51064c528"}, - {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:06e9abc0e4c9ab4779c74ad99c3fc10d3967d03114449acc2c2762ad4472b8ca"}, - {file = "regex-2023.10.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:fb02e4257376ae25c6dd95a5aec377f9b18c09be6ebdefa7ad209b9137b73d48"}, - {file = "regex-2023.10.3-cp39-cp39-win32.whl", hash = "sha256:3b2c3502603fab52d7619b882c25a6850b766ebd1b18de3df23b2f939360e1bd"}, - {file = "regex-2023.10.3-cp39-cp39-win_amd64.whl", hash = "sha256:adbccd17dcaff65704c856bd29951c58a1bd4b2b0f8ad6b826dbd543fe740988"}, - {file = "regex-2023.10.3.tar.gz", hash = "sha256:3fef4f844d2290ee0ba57addcec17eec9e3df73f10a2748485dfd6a3a188cc0f"}, + {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0694219a1d54336fd0445ea382d49d36882415c0134ee1e8332afd1529f0baa5"}, + {file = "regex-2023.12.25-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b014333bd0217ad3d54c143de9d4b9a3ca1c5a29a6d0d554952ea071cff0f1f8"}, + {file = "regex-2023.12.25-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d865984b3f71f6d0af64d0d88f5733521698f6c16f445bb09ce746c92c97c586"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e0eabac536b4cc7f57a5f3d095bfa557860ab912f25965e08fe1545e2ed8b4c"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c25a8ad70e716f96e13a637802813f65d8a6760ef48672aa3502f4c24ea8b400"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a9b6d73353f777630626f403b0652055ebfe8ff142a44ec2cf18ae470395766e"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a9cc99d6946d750eb75827cb53c4371b8b0fe89c733a94b1573c9dd16ea6c9e4"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88d1f7bef20c721359d8675f7d9f8e414ec5003d8f642fdfd8087777ff7f94b5"}, + {file = "regex-2023.12.25-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cb3fe77aec8f1995611f966d0c656fdce398317f850d0e6e7aebdfe61f40e1cd"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7aa47c2e9ea33a4a2a05f40fcd3ea36d73853a2aae7b4feab6fc85f8bf2c9704"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:df26481f0c7a3f8739fecb3e81bc9da3fcfae34d6c094563b9d4670b047312e1"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c40281f7d70baf6e0db0c2f7472b31609f5bc2748fe7275ea65a0b4601d9b392"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d94a1db462d5690ebf6ae86d11c5e420042b9898af5dcf278bd97d6bda065423"}, + {file = "regex-2023.12.25-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ba1b30765a55acf15dce3f364e4928b80858fa8f979ad41f862358939bdd1f2f"}, + {file = "regex-2023.12.25-cp310-cp310-win32.whl", hash = "sha256:150c39f5b964e4d7dba46a7962a088fbc91f06e606f023ce57bb347a3b2d4630"}, + {file = "regex-2023.12.25-cp310-cp310-win_amd64.whl", hash = "sha256:09da66917262d9481c719599116c7dc0c321ffcec4b1f510c4f8a066f8768105"}, + {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:1b9d811f72210fa9306aeb88385b8f8bcef0dfbf3873410413c00aa94c56c2b6"}, + {file = "regex-2023.12.25-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d902a43085a308cef32c0d3aea962524b725403fd9373dea18110904003bac97"}, + {file = "regex-2023.12.25-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d166eafc19f4718df38887b2bbe1467a4f74a9830e8605089ea7a30dd4da8887"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7ad32824b7f02bb3c9f80306d405a1d9b7bb89362d68b3c5a9be53836caebdb"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:636ba0a77de609d6510235b7f0e77ec494d2657108f777e8765efc060094c98c"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0fda75704357805eb953a3ee15a2b240694a9a514548cd49b3c5124b4e2ad01b"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f72cbae7f6b01591f90814250e636065850c5926751af02bb48da94dfced7baa"}, + {file = "regex-2023.12.25-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db2a0b1857f18b11e3b0e54ddfefc96af46b0896fb678c85f63fb8c37518b3e7"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7502534e55c7c36c0978c91ba6f61703faf7ce733715ca48f499d3dbbd7657e0"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e8c7e08bb566de4faaf11984af13f6bcf6a08f327b13631d41d62592681d24fe"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:283fc8eed679758de38fe493b7d7d84a198b558942b03f017b1f94dda8efae80"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:f44dd4d68697559d007462b0a3a1d9acd61d97072b71f6d1968daef26bc744bd"}, + {file = "regex-2023.12.25-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:67d3ccfc590e5e7197750fcb3a2915b416a53e2de847a728cfa60141054123d4"}, + {file = "regex-2023.12.25-cp311-cp311-win32.whl", hash = "sha256:68191f80a9bad283432385961d9efe09d783bcd36ed35a60fb1ff3f1ec2efe87"}, + {file = "regex-2023.12.25-cp311-cp311-win_amd64.whl", hash = "sha256:7d2af3f6b8419661a0c421584cfe8aaec1c0e435ce7e47ee2a97e344b98f794f"}, + {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8a0ccf52bb37d1a700375a6b395bff5dd15c50acb745f7db30415bae3c2b0715"}, + {file = "regex-2023.12.25-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c3c4a78615b7762740531c27cf46e2f388d8d727d0c0c739e72048beb26c8a9d"}, + {file = "regex-2023.12.25-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ad83e7545b4ab69216cef4cc47e344d19622e28aabec61574b20257c65466d6a"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7a635871143661feccce3979e1727c4e094f2bdfd3ec4b90dfd4f16f571a87a"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d498eea3f581fbe1b34b59c697512a8baef88212f92e4c7830fcc1499f5b45a5"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:43f7cd5754d02a56ae4ebb91b33461dc67be8e3e0153f593c509e21d219c5060"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51f4b32f793812714fd5307222a7f77e739b9bc566dc94a18126aba3b92b98a3"}, + {file = "regex-2023.12.25-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba99d8077424501b9616b43a2d208095746fb1284fc5ba490139651f971d39d9"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4bfc2b16e3ba8850e0e262467275dd4d62f0d045e0e9eda2bc65078c0110a11f"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8c2c19dae8a3eb0ea45a8448356ed561be843b13cbc34b840922ddf565498c1c"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:60080bb3d8617d96f0fb7e19796384cc2467447ef1c491694850ebd3670bc457"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b77e27b79448e34c2c51c09836033056a0547aa360c45eeeb67803da7b0eedaf"}, + {file = "regex-2023.12.25-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:518440c991f514331f4850a63560321f833979d145d7d81186dbe2f19e27ae3d"}, + {file = "regex-2023.12.25-cp312-cp312-win32.whl", hash = "sha256:e2610e9406d3b0073636a3a2e80db05a02f0c3169b5632022b4e81c0364bcda5"}, + {file = "regex-2023.12.25-cp312-cp312-win_amd64.whl", hash = "sha256:cc37b9aeebab425f11f27e5e9e6cf580be7206c6582a64467a14dda211abc232"}, + {file = "regex-2023.12.25-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:da695d75ac97cb1cd725adac136d25ca687da4536154cdc2815f576e4da11c69"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d126361607b33c4eb7b36debc173bf25d7805847346dd4d99b5499e1fef52bc7"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4719bb05094d7d8563a450cf8738d2e1061420f79cfcc1fa7f0a44744c4d8f73"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5dd58946bce44b53b06d94aa95560d0b243eb2fe64227cba50017a8d8b3cd3e2"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:22a86d9fff2009302c440b9d799ef2fe322416d2d58fc124b926aa89365ec482"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2aae8101919e8aa05ecfe6322b278f41ce2994c4a430303c4cd163fef746e04f"}, + {file = "regex-2023.12.25-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e692296c4cc2873967771345a876bcfc1c547e8dd695c6b89342488b0ea55cd8"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:263ef5cc10979837f243950637fffb06e8daed7f1ac1e39d5910fd29929e489a"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:d6f7e255e5fa94642a0724e35406e6cb7001c09d476ab5fce002f652b36d0c39"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:88ad44e220e22b63b0f8f81f007e8abbb92874d8ced66f32571ef8beb0643b2b"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:3a17d3ede18f9cedcbe23d2daa8a2cd6f59fe2bf082c567e43083bba3fb00347"}, + {file = "regex-2023.12.25-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d15b274f9e15b1a0b7a45d2ac86d1f634d983ca40d6b886721626c47a400bf39"}, + {file = "regex-2023.12.25-cp37-cp37m-win32.whl", hash = "sha256:ed19b3a05ae0c97dd8f75a5d8f21f7723a8c33bbc555da6bbe1f96c470139d3c"}, + {file = "regex-2023.12.25-cp37-cp37m-win_amd64.whl", hash = "sha256:a6d1047952c0b8104a1d371f88f4ab62e6275567d4458c1e26e9627ad489b445"}, + {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b43523d7bc2abd757119dbfb38af91b5735eea45537ec6ec3a5ec3f9562a1c53"}, + {file = "regex-2023.12.25-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:efb2d82f33b2212898f1659fb1c2e9ac30493ac41e4d53123da374c3b5541e64"}, + {file = "regex-2023.12.25-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b7fca9205b59c1a3d5031f7e64ed627a1074730a51c2a80e97653e3e9fa0d415"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:086dd15e9435b393ae06f96ab69ab2d333f5d65cbe65ca5a3ef0ec9564dfe770"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e81469f7d01efed9b53740aedd26085f20d49da65f9c1f41e822a33992cb1590"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:34e4af5b27232f68042aa40a91c3b9bb4da0eeb31b7632e0091afc4310afe6cb"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9852b76ab558e45b20bf1893b59af64a28bd3820b0c2efc80e0a70a4a3ea51c1"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ff100b203092af77d1a5a7abe085b3506b7eaaf9abf65b73b7d6905b6cb76988"}, + {file = "regex-2023.12.25-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cc038b2d8b1470364b1888a98fd22d616fba2b6309c5b5f181ad4483e0017861"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:094ba386bb5c01e54e14434d4caabf6583334090865b23ef58e0424a6286d3dc"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5cd05d0f57846d8ba4b71d9c00f6f37d6b97d5e5ef8b3c3840426a475c8f70f4"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:9aa1a67bbf0f957bbe096375887b2505f5d8ae16bf04488e8b0f334c36e31360"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:98a2636994f943b871786c9e82bfe7883ecdaba2ef5df54e1450fa9869d1f756"}, + {file = "regex-2023.12.25-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:37f8e93a81fc5e5bd8db7e10e62dc64261bcd88f8d7e6640aaebe9bc180d9ce2"}, + {file = "regex-2023.12.25-cp38-cp38-win32.whl", hash = "sha256:d78bd484930c1da2b9679290a41cdb25cc127d783768a0369d6b449e72f88beb"}, + {file = "regex-2023.12.25-cp38-cp38-win_amd64.whl", hash = "sha256:b521dcecebc5b978b447f0f69b5b7f3840eac454862270406a39837ffae4e697"}, + {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f7bc09bc9c29ebead055bcba136a67378f03d66bf359e87d0f7c759d6d4ffa31"}, + {file = "regex-2023.12.25-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e14b73607d6231f3cc4622809c196b540a6a44e903bcfad940779c80dffa7be7"}, + {file = "regex-2023.12.25-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9eda5f7a50141291beda3edd00abc2d4a5b16c29c92daf8d5bd76934150f3edc"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc6bb9aa69aacf0f6032c307da718f61a40cf970849e471254e0e91c56ffca95"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:298dc6354d414bc921581be85695d18912bea163a8b23cac9a2562bbcd5088b1"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2f4e475a80ecbd15896a976aa0b386c5525d0ed34d5c600b6d3ebac0a67c7ddf"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:531ac6cf22b53e0696f8e1d56ce2396311254eb806111ddd3922c9d937151dae"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22f3470f7524b6da61e2020672df2f3063676aff444db1daa283c2ea4ed259d6"}, + {file = "regex-2023.12.25-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:89723d2112697feaa320c9d351e5f5e7b841e83f8b143dba8e2d2b5f04e10923"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0ecf44ddf9171cd7566ef1768047f6e66975788258b1c6c6ca78098b95cf9a3d"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:905466ad1702ed4acfd67a902af50b8db1feeb9781436372261808df7a2a7bca"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:4558410b7a5607a645e9804a3e9dd509af12fb72b9825b13791a37cd417d73a5"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:7e316026cc1095f2a3e8cc012822c99f413b702eaa2ca5408a513609488cb62f"}, + {file = "regex-2023.12.25-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3b1de218d5375cd6ac4b5493e0b9f3df2be331e86520f23382f216c137913d20"}, + {file = "regex-2023.12.25-cp39-cp39-win32.whl", hash = "sha256:11a963f8e25ab5c61348d090bf1b07f1953929c13bd2309a0662e9ff680763c9"}, + {file = "regex-2023.12.25-cp39-cp39-win_amd64.whl", hash = "sha256:e693e233ac92ba83a87024e1d32b5f9ab15ca55ddd916d878146f4e3406b5c91"}, + {file = "regex-2023.12.25.tar.gz", hash = "sha256:29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5"}, ] [[package]] @@ -3313,22 +3614,22 @@ pyasn1 = ">=0.1.3" [[package]] name = "runpod" -version = "1.3.7" +version = "1.5.1" description = "🐍 | Python library for RunPod API and serverless worker SDK." optional = false python-versions = ">=3.8" files = [ - {file = "runpod-1.3.7-py3-none-any.whl", hash = "sha256:b401abd6613961d9b46dc40d60f1549349ebf15aaab27d116230d885fbf3dca8"}, - {file = "runpod-1.3.7.tar.gz", hash = "sha256:87c70b00f299d8ddfd66466204cbc9a16aa465dbfdc245106ed7006c37b329c3"}, + {file = "runpod-1.5.1-py3-none-any.whl", hash = "sha256:9d39600c7f5af5ef1c4806c75a24c62a2875225f02529bfe70439f7b7b2386f4"}, + {file = "runpod-1.5.1.tar.gz", hash = "sha256:c9e80bd94fd66fcf8a337ee89cf6e91e692d766fc81ee1749e0a741289d0193f"}, ] [package.dependencies] -aiohttp = "3.9.1" +aiohttp = {version = "3.9.1", extras = ["speedups"]} aiohttp-retry = ">=2.8.3" backoff = ">=2.2.1" boto3 = ">=1.26.165" click = ">=8.1.7" -colorama = ">=0.4.6" +colorama = ">=0.2.5,<0.4.7" fastapi = {version = ">=0.94.0", extras = ["all"]} inquirerpy = "0.3.4" paramiko = ">=3.3.1" @@ -3346,13 +3647,13 @@ test = ["asynctest", "nest-asyncio", "pylint", "pytest", "pytest-asyncio", "pyte [[package]] name = "s3transfer" -version = "0.8.2" +version = "0.10.0" description = "An Amazon S3 Transfer Manager" optional = false -python-versions = ">= 3.7" +python-versions = ">= 3.8" files = [ - {file = "s3transfer-0.8.2-py3-none-any.whl", hash = "sha256:c9e56cbe88b28d8e197cf841f1f0c130f246595e77ae5b5a05b69fe7cb83de76"}, - {file = "s3transfer-0.8.2.tar.gz", hash = "sha256:368ac6876a9e9ed91f6bc86581e319be08188dc60d50e0d56308ed5765446283"}, + {file = "s3transfer-0.10.0-py3-none-any.whl", hash = "sha256:3cdb40f5cfa6966e812209d0994f2a4709b561c88e90cf00c2696d2df4e56b2e"}, + {file = "s3transfer-0.10.0.tar.gz", hash = "sha256:d0c8bbf672d5eebbe4e57945e23b972d963f07d82f661cabf678a5c88831595b"}, ] [package.dependencies] @@ -3647,13 +3948,13 @@ files = [ [[package]] name = "setuptools" -version = "69.0.2" +version = "69.0.3" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "setuptools-69.0.2-py3-none-any.whl", hash = "sha256:1e8fdff6797d3865f37397be788a4e3cba233608e9b509382a2777d25ebde7f2"}, - {file = "setuptools-69.0.2.tar.gz", hash = "sha256:735896e78a4742605974de002ac60562d286fa8051a7e2299445e8e8fbb01aa6"}, + {file = "setuptools-69.0.3-py3-none-any.whl", hash = "sha256:385eb4edd9c9d5c17540511303e39a147ce2fc04bc55289c322b9e5904fe2c05"}, + {file = "setuptools-69.0.3.tar.gz", hash = "sha256:be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78"}, ] [package.extras] @@ -3696,13 +3997,13 @@ files = [ [[package]] name = "starlette" -version = "0.27.0" +version = "0.35.1" description = "The little ASGI library that shines." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "starlette-0.27.0-py3-none-any.whl", hash = "sha256:918416370e846586541235ccd38a474c08b80443ed31c578a418e2209b3eef91"}, - {file = "starlette-0.27.0.tar.gz", hash = "sha256:6a6b0d042acb8d469a01eba54e9cda6cbd24ac602c4cd016723117d6a7e73b75"}, + {file = "starlette-0.35.1-py3-none-any.whl", hash = "sha256:50bbbda9baa098e361f398fda0928062abbaf1f54f4fadcbe17c092a01eb9a25"}, + {file = "starlette-0.35.1.tar.gz", hash = "sha256:3e2639dac3520e4f58734ed22553f950d3f3cb1001cd2eaac4d57e8cdc5f66bc"}, ] [package.dependencies] @@ -3713,18 +4014,18 @@ full = ["httpx (>=0.22.0)", "itsdangerous", "jinja2", "python-multipart", "pyyam [[package]] name = "structlog" -version = "23.2.0" +version = "23.3.0" description = "Structured Logging for Python" optional = false python-versions = ">=3.8" files = [ - {file = "structlog-23.2.0-py3-none-any.whl", hash = "sha256:16a167e87b9fa7fae9a972d5d12805ef90e04857a93eba479d4be3801a6a1482"}, - {file = "structlog-23.2.0.tar.gz", hash = "sha256:334666b94707f89dbc4c81a22a8ccd34449f0201d5b1ee097a030b577fa8c858"}, + {file = "structlog-23.3.0-py3-none-any.whl", hash = "sha256:d6922a88ceabef5b13b9eda9c4043624924f60edbb00397f4d193bd754cde60a"}, + {file = "structlog-23.3.0.tar.gz", hash = "sha256:24b42b914ac6bc4a4e6f716e82ac70d7fb1e8c3b1035a765591953bfc37101a5"}, ] [package.extras] dev = ["structlog[tests,typing]"] -docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-mermaid", "twisted"] +docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-mermaid", "sphinxext-opengraph", "twisted"] tests = ["freezegun (>=0.2.8)", "pretend", "pytest (>=6.0)", "pytest-asyncio (>=0.17)", "simplejson"] typing = ["mypy (>=1.4)", "rich", "twisted"] @@ -3983,31 +4284,31 @@ files = [ [[package]] name = "torch" -version = "2.1.1" +version = "2.1.2" description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration" optional = false python-versions = ">=3.8.0" files = [ - {file = "torch-2.1.1-cp310-cp310-manylinux1_x86_64.whl", hash = "sha256:5ebc43f5355a9b7be813392b3fb0133991f0380f6f0fcc8218d5468dc45d1071"}, - {file = "torch-2.1.1-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:84fefd63356416c0cd20578637ccdbb82164993400ed17b57c951dd6376dcee8"}, - {file = "torch-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:0a7a9da0c324409bcb5a7bdad1b4e94e936d21c2590aaa7ac2f63968da8c62f7"}, - {file = "torch-2.1.1-cp310-none-macosx_10_9_x86_64.whl", hash = "sha256:1e1e5faddd43a8f2c0e0e22beacd1e235a2e447794d807483c94a9e31b54a758"}, - {file = "torch-2.1.1-cp310-none-macosx_11_0_arm64.whl", hash = "sha256:e76bf3c5c354874f1da465c852a2fb60ee6cbce306e935337885760f080f9baa"}, - {file = "torch-2.1.1-cp311-cp311-manylinux1_x86_64.whl", hash = "sha256:98fea993639b0bb432dfceb7b538f07c0f1c33386d63f635219f49254968c80f"}, - {file = "torch-2.1.1-cp311-cp311-manylinux2014_aarch64.whl", hash = "sha256:61b51b33c61737c287058b0c3061e6a9d3c363863e4a094f804bc486888a188a"}, - {file = "torch-2.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:1d70920da827e2276bf07f7ec46958621cad18d228c97da8f9c19638474dbd52"}, - {file = "torch-2.1.1-cp311-none-macosx_10_9_x86_64.whl", hash = "sha256:a70593806f1d7e6b53657d96810518da0f88ef2608c98a402955765b8c79d52c"}, - {file = "torch-2.1.1-cp311-none-macosx_11_0_arm64.whl", hash = "sha256:e312f7e82e49565f7667b0bbf9559ab0c597063d93044740781c02acd5a87978"}, - {file = "torch-2.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:1e3cbecfa5a7314d828f4a37b0c286714dc9aa2e69beb7a22f7aca76567ed9f4"}, - {file = "torch-2.1.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:9ca0fcbf3d5ba644d6a8572c83a9abbdf5f7ff575bc38529ef6c185a3a71bde9"}, - {file = "torch-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:2dc9f312fc1fa0d61a565a0292ad73119d4b74c9f8b5031b55f8b4722abca079"}, - {file = "torch-2.1.1-cp38-none-macosx_10_9_x86_64.whl", hash = "sha256:d56b032176458e2af4709627bbd2c20fe2917eff8cd087a7fe313acccf5ce2f1"}, - {file = "torch-2.1.1-cp38-none-macosx_11_0_arm64.whl", hash = "sha256:29e3b90a8c281f6660804a939d1f4218604c80162e521e1e6d8c8557325902a0"}, - {file = "torch-2.1.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:bd95cee8511584b67ddc0ba465c3f1edeb5708d833ee02af1206b4486f1d9096"}, - {file = "torch-2.1.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:b31230bd058424e56dba7f899280dbc6ac8b9948e43902e0c84a44666b1ec151"}, - {file = "torch-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:403f1095e665e4f35971b43797a920725b8b205723aa68254a4050c6beca29b6"}, - {file = "torch-2.1.1-cp39-none-macosx_10_9_x86_64.whl", hash = "sha256:715b50d8c1de5da5524a68287eb000f73e026e74d5f6b12bc450ef6995fcf5f9"}, - {file = "torch-2.1.1-cp39-none-macosx_11_0_arm64.whl", hash = "sha256:db67e8725c76f4c7f4f02e7551bb16e81ba1a1912867bc35d7bb96d2be8c78b4"}, + {file = "torch-2.1.2-cp310-cp310-manylinux1_x86_64.whl", hash = "sha256:3a871edd6c02dae77ad810335c0833391c1a4ce49af21ea8cf0f6a5d2096eea8"}, + {file = "torch-2.1.2-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:bef6996c27d8f6e92ea4e13a772d89611da0e103b48790de78131e308cf73076"}, + {file = "torch-2.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:0e13034fd5fb323cbbc29e56d0637a3791e50dd589616f40c79adfa36a5a35a1"}, + {file = "torch-2.1.2-cp310-none-macosx_10_9_x86_64.whl", hash = "sha256:d9b535cad0df3d13997dbe8bd68ac33e0e3ae5377639c9881948e40794a61403"}, + {file = "torch-2.1.2-cp310-none-macosx_11_0_arm64.whl", hash = "sha256:f9a55d55af02826ebfbadf4e9b682f0f27766bc33df8236b48d28d705587868f"}, + {file = "torch-2.1.2-cp311-cp311-manylinux1_x86_64.whl", hash = "sha256:a6ebbe517097ef289cc7952783588c72de071d4b15ce0f8b285093f0916b1162"}, + {file = "torch-2.1.2-cp311-cp311-manylinux2014_aarch64.whl", hash = "sha256:8f32ce591616a30304f37a7d5ea80b69ca9e1b94bba7f308184bf616fdaea155"}, + {file = "torch-2.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:e0ee6cf90c8970e05760f898d58f9ac65821c37ffe8b04269ec787aa70962b69"}, + {file = "torch-2.1.2-cp311-none-macosx_10_9_x86_64.whl", hash = "sha256:76d37967c31c99548ad2c4d3f2cf191db48476f2e69b35a0937137116da356a1"}, + {file = "torch-2.1.2-cp311-none-macosx_11_0_arm64.whl", hash = "sha256:e2d83f07b4aac983453ea5bf8f9aa9dacf2278a8d31247f5d9037f37befc60e4"}, + {file = "torch-2.1.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:f41fe0c7ecbf903a568c73486139a75cfab287a0f6c17ed0698fdea7a1e8641d"}, + {file = "torch-2.1.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:e3225f47d50bb66f756fe9196a768055d1c26b02154eb1f770ce47a2578d3aa7"}, + {file = "torch-2.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:33d59cd03cb60106857f6c26b36457793637512998666ee3ce17311f217afe2b"}, + {file = "torch-2.1.2-cp38-none-macosx_10_9_x86_64.whl", hash = "sha256:8e221deccd0def6c2badff6be403e0c53491805ed9915e2c029adbcdb87ab6b5"}, + {file = "torch-2.1.2-cp38-none-macosx_11_0_arm64.whl", hash = "sha256:05b18594f60a911a0c4f023f38a8bda77131fba5fd741bda626e97dcf5a3dd0a"}, + {file = "torch-2.1.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:9ca96253b761e9aaf8e06fb30a66ee301aecbf15bb5a303097de1969077620b6"}, + {file = "torch-2.1.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d93ba70f67b08c2ae5598ee711cbc546a1bc8102cef938904b8c85c2089a51a0"}, + {file = "torch-2.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:255b50bc0608db177e6a3cc118961d77de7e5105f07816585fa6f191f33a9ff3"}, + {file = "torch-2.1.2-cp39-none-macosx_10_9_x86_64.whl", hash = "sha256:6984cd5057c0c977b3c9757254e989d3f1124f4ce9d07caa6cb637783c71d42a"}, + {file = "torch-2.1.2-cp39-none-macosx_11_0_arm64.whl", hash = "sha256:bc195d7927feabc0eb7c110e457c955ed2ab616f3c7c28439dd4188cf589699f"}, ] [package.dependencies] @@ -4036,38 +4337,38 @@ opt-einsum = ["opt-einsum (>=3.3)"] [[package]] name = "torchvision" -version = "0.16.1" +version = "0.16.2" description = "image and video datasets and models for torch deep learning" optional = false python-versions = ">=3.8" files = [ - {file = "torchvision-0.16.1-cp310-cp310-macosx_10_13_x86_64.whl", hash = "sha256:987132795e5c037cb74e7be35a693999fdb2f603152266ee15b80206e83a5b0c"}, - {file = "torchvision-0.16.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:25da6a7b22ea0348f62c45ec0daf157731096babcae65d222404081af96e085c"}, - {file = "torchvision-0.16.1-cp310-cp310-manylinux1_x86_64.whl", hash = "sha256:c82e291e674a18b67f92ddb476ae18498fb46d7032ae914f3fda90c955e7d86f"}, - {file = "torchvision-0.16.1-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:632887b22e67ce32a3ede806b868bba4057601e46d680de14b32a391eac1b483"}, - {file = "torchvision-0.16.1-cp310-cp310-win_amd64.whl", hash = "sha256:92c76a5092b4033efdb183b11fa4854a7630e23c46f4a1c3ffd70c30cb5be4fc"}, - {file = "torchvision-0.16.1-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:4aea5cf491c6c21b1cbdbb1bf2a3838a59d4db93ad5f49019a6564d3ca7127c7"}, - {file = "torchvision-0.16.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3391757167637ace3ef33a67c9d5ef86b1f8cbd93eaa5bad45eebcf266ea6089"}, - {file = "torchvision-0.16.1-cp311-cp311-manylinux1_x86_64.whl", hash = "sha256:4f9d5b192b336982e6dbe32c070b05606f0b53e87d722ae332a02909fbf988ed"}, - {file = "torchvision-0.16.1-cp311-cp311-manylinux2014_aarch64.whl", hash = "sha256:3d34601614958c4e30f53ec0eb7bf3f282ee72bb747734be2d75422831a43384"}, - {file = "torchvision-0.16.1-cp311-cp311-win_amd64.whl", hash = "sha256:e11af530585574eb5ca837b8f151bcdd57c10e35c3af56c76a10f3281d2a2f2c"}, - {file = "torchvision-0.16.1-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:4f2cad621fb96cf10e29af93e16c98b3226bdd53ae712b57e873c3deaf061617"}, - {file = "torchvision-0.16.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1d614b3c9e2de9cd75cc0e4e1923fcfbbcd9fdb9f08a0bbbbf7e135e4a0a1cfa"}, - {file = "torchvision-0.16.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:73271e930501a008fe24ba38945b2a75b25a6098f4c2f4402e39a9d0dd305ca6"}, - {file = "torchvision-0.16.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fab67ddc4809fcc2a04610b13cac5193b9d3be2896b77538bfdff401b13022e5"}, - {file = "torchvision-0.16.1-cp38-cp38-win_amd64.whl", hash = "sha256:13782d574033efec6646d1a2f5d85f4c59fcf3f403367bb407b15df07adc87e0"}, - {file = "torchvision-0.16.1-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:f14d201c37176dc4106eec76b229d6585a1505266b8cea99d3366fd38897b7c0"}, - {file = "torchvision-0.16.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a15e88a93a7501cc75b761a2dcd07aaedaaf9cbfaf48c8affa8c98989ecbb19d"}, - {file = "torchvision-0.16.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:72fde5fdb462e66ebe25ae42d2ee11434cbc395f74cad0d3b22cf60524345cc5"}, - {file = "torchvision-0.16.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:153f753f14eba58969cdc86360893a57f8bf63f8136c7d1cd4388108560b5446"}, - {file = "torchvision-0.16.1-cp39-cp39-win_amd64.whl", hash = "sha256:75e33b198b1265f61d822aa66d646ec3df67a712470ffec1e0c37ff46d4103c1"}, + {file = "torchvision-0.16.2-cp310-cp310-macosx_10_13_x86_64.whl", hash = "sha256:bc86f2800cb2c0c1a09c581409cdd6bff66e62f103dc83fc63f73346264c3756"}, + {file = "torchvision-0.16.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b024bd412df6d3a007dcebf311a894eb3c5c21e1af80d12be382bbcb097a7c3a"}, + {file = "torchvision-0.16.2-cp310-cp310-manylinux1_x86_64.whl", hash = "sha256:e89f10f3c8351972b6e3fda95bc3e479ea8dbfc9dfcfd2c32902dbad4ba5cfc5"}, + {file = "torchvision-0.16.2-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:96c7583700112a410bdc4e1e4f118c429dab49c29c9a31a2cc3579bc9b08b19d"}, + {file = "torchvision-0.16.2-cp310-cp310-win_amd64.whl", hash = "sha256:9f4032ebb3277fb07ff6a9b818d50a547fb8fcd89d958cfd9e773322454bb688"}, + {file = "torchvision-0.16.2-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:67b1aaf8b8cb02ce75dd445f291a27c8036a502f8c0aa76e28c37a0faac2e153"}, + {file = "torchvision-0.16.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bef30d03e1d1c629761f4dca51d3b7d8a0dc0acce6f4068ab2a1634e8e7b64e0"}, + {file = "torchvision-0.16.2-cp311-cp311-manylinux1_x86_64.whl", hash = "sha256:e59cc7b2bd1ab5c0ce4ae382e4e37be8f1c174e8b5de2f6a23c170de9ae28495"}, + {file = "torchvision-0.16.2-cp311-cp311-manylinux2014_aarch64.whl", hash = "sha256:e130b08cc9b3cc73a6c59d6edf032394a322f9579bfd21d14bc2e1d0999aa758"}, + {file = "torchvision-0.16.2-cp311-cp311-win_amd64.whl", hash = "sha256:8692ab1e48807e9604046a6f4beeb67b523294cee1b00828654bb0df2cfce2b2"}, + {file = "torchvision-0.16.2-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:b82732dcf876a37c852772342aa6ee3480c03bb3e2a802ae109fc5f7e28d26e9"}, + {file = "torchvision-0.16.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4b065143d1a720fe8a9077fd4be35d491f98819ec80b3dbbc3ec64d0b707a906"}, + {file = "torchvision-0.16.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:bc5f274e4ecd1b86062063cdf4fd385a1d39d147a3a2685fbbde9ff08bb720b8"}, + {file = "torchvision-0.16.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:335959c43b371c0474af34c1ef2a52efdc7603c45700d29e4475eeb02984170c"}, + {file = "torchvision-0.16.2-cp38-cp38-win_amd64.whl", hash = "sha256:7fd22d86e08eba321af70cad291020c2cdeac069b00ce88b923ca52e06174769"}, + {file = "torchvision-0.16.2-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:56115268b37f0b75364e3654e47ad9abc66ac34c1f9e5e3dfa89a22d6a40017a"}, + {file = "torchvision-0.16.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:82805f8445b094f9d1e770390ee6cc86855e89955e08ce34af2e2274fc0e5c45"}, + {file = "torchvision-0.16.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:3f4bd5fcbc361476e2e78016636ac7d5509e59d9962521f06eb98e6803898182"}, + {file = "torchvision-0.16.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:8199acdf8ab066a28b84a5b6f4d97b58976d9e164b1acc3a9d14fccfaf74bb3a"}, + {file = "torchvision-0.16.2-cp39-cp39-win_amd64.whl", hash = "sha256:41dd4fa9f176d563fe9f1b9adef3b7e582cdfb60ce8c9bc51b094a025be687c9"}, ] [package.dependencies] numpy = "*" pillow = ">=5.3.0,<8.3.dev0 || >=8.4.dev0" requests = "*" -torch = "2.1.1" +torch = "2.1.2" [package.extras] scipy = ["scipy"] @@ -4108,18 +4409,18 @@ tqdm = ">4.64" [[package]] name = "transformers" -version = "4.35.2" +version = "4.36.2" description = "State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" optional = false python-versions = ">=3.8.0" files = [ - {file = "transformers-4.35.2-py3-none-any.whl", hash = "sha256:9dfa76f8692379544ead84d98f537be01cd1070de75c74efb13abcbc938fbe2f"}, - {file = "transformers-4.35.2.tar.gz", hash = "sha256:2d125e197d77b0cdb6c9201df9fa7e2101493272e448b9fba9341c695bee2f52"}, + {file = "transformers-4.36.2-py3-none-any.whl", hash = "sha256:462066c4f74ee52516f12890dcc9ec71d1a5e97998db621668455117a54330f6"}, + {file = "transformers-4.36.2.tar.gz", hash = "sha256:d8068e897e47793281501e547d2bbdfc5b8556409c2cb6c3d9e2ca77d4c0b4ec"}, ] [package.dependencies] filelock = "*" -huggingface-hub = ">=0.16.4,<1.0" +huggingface-hub = ">=0.19.3,<1.0" numpy = ">=1.17" packaging = ">=20.0" pyyaml = ">=5.1" @@ -4130,30 +4431,30 @@ tokenizers = ">=0.14,<0.19" tqdm = ">=4.27" [package.extras] -accelerate = ["accelerate (>=0.20.3)"] -agents = ["Pillow (<10.0.0)", "accelerate (>=0.20.3)", "datasets (!=2.5.0)", "diffusers", "opencv-python", "sentencepiece (>=0.1.91,!=0.1.92)", "torch (>=1.10,!=1.12.0)"] -all = ["Pillow (<10.0.0)", "accelerate (>=0.20.3)", "av (==9.2.0)", "codecarbon (==1.2.0)", "decord (==0.6.0)", "flax (>=0.4.1,<=0.7.0)", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "phonemizer", "protobuf", "pyctcdecode (>=0.4.0)", "ray[tune]", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "tensorflow (>=2.6,<2.15)", "tensorflow-text (<2.15)", "tf2onnx", "timm", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "torchaudio", "torchvision"] +accelerate = ["accelerate (>=0.21.0)"] +agents = ["Pillow (>=10.0.1,<=15.0)", "accelerate (>=0.21.0)", "datasets (!=2.5.0)", "diffusers", "opencv-python", "sentencepiece (>=0.1.91,!=0.1.92)", "torch (>=1.10,!=1.12.0)"] +all = ["Pillow (>=10.0.1,<=15.0)", "accelerate (>=0.21.0)", "av (==9.2.0)", "codecarbon (==1.2.0)", "decord (==0.6.0)", "flax (>=0.4.1,<=0.7.0)", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "phonemizer", "protobuf", "pyctcdecode (>=0.4.0)", "ray[tune] (>=2.7.0)", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "tensorflow (>=2.6,<2.16)", "tensorflow-text (<2.16)", "tf2onnx", "timm", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "torchaudio", "torchvision"] audio = ["kenlm", "librosa", "phonemizer", "pyctcdecode (>=0.4.0)"] codecarbon = ["codecarbon (==1.2.0)"] -deepspeed = ["accelerate (>=0.20.3)", "deepspeed (>=0.9.3)"] -deepspeed-testing = ["GitPython (<3.1.19)", "accelerate (>=0.20.3)", "beautifulsoup4", "black (>=23.1,<24.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "deepspeed (>=0.9.3)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "hf-doc-builder (>=0.3.0)", "nltk", "optuna", "parameterized", "protobuf", "psutil", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "sentencepiece (>=0.1.91,!=0.1.92)", "tensorboard", "timeout-decorator"] -dev = ["GitPython (<3.1.19)", "Pillow (<10.0.0)", "accelerate (>=0.20.3)", "av (==9.2.0)", "beautifulsoup4", "black (>=23.1,<24.0)", "codecarbon (==1.2.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "decord (==0.6.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "flax (>=0.4.1,<=0.7.0)", "fugashi (>=1.0)", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "ipadic (>=1.0.0,<2.0)", "isort (>=5.5.4)", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "nltk", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "ray[tune]", "rhoknp (>=1.1.0,<1.3.1)", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (>=0.0.241,<=0.0.259)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "sudachidict-core (>=20220729)", "sudachipy (>=0.6.6)", "tensorboard", "tensorflow (>=2.6,<2.15)", "tensorflow-text (<2.15)", "tf2onnx", "timeout-decorator", "timm", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "torchaudio", "torchvision", "unidic (>=1.0.2)", "unidic-lite (>=1.0.7)", "urllib3 (<2.0.0)"] -dev-tensorflow = ["GitPython (<3.1.19)", "Pillow (<10.0.0)", "beautifulsoup4", "black (>=23.1,<24.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "isort (>=5.5.4)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "nltk", "onnxconverter-common", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (>=0.0.241,<=0.0.259)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "tensorboard", "tensorflow (>=2.6,<2.15)", "tensorflow-text (<2.15)", "tf2onnx", "timeout-decorator", "tokenizers (>=0.14,<0.19)", "urllib3 (<2.0.0)"] -dev-torch = ["GitPython (<3.1.19)", "Pillow (<10.0.0)", "accelerate (>=0.20.3)", "beautifulsoup4", "black (>=23.1,<24.0)", "codecarbon (==1.2.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "fugashi (>=1.0)", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "ipadic (>=1.0.0,<2.0)", "isort (>=5.5.4)", "kenlm", "librosa", "nltk", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)", "optuna", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "ray[tune]", "rhoknp (>=1.1.0,<1.3.1)", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (>=0.0.241,<=0.0.259)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "sudachidict-core (>=20220729)", "sudachipy (>=0.6.6)", "tensorboard", "timeout-decorator", "timm", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "torchaudio", "torchvision", "unidic (>=1.0.2)", "unidic-lite (>=1.0.7)", "urllib3 (<2.0.0)"] -docs = ["Pillow (<10.0.0)", "accelerate (>=0.20.3)", "av (==9.2.0)", "codecarbon (==1.2.0)", "decord (==0.6.0)", "flax (>=0.4.1,<=0.7.0)", "hf-doc-builder", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "phonemizer", "protobuf", "pyctcdecode (>=0.4.0)", "ray[tune]", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "tensorflow (>=2.6,<2.15)", "tensorflow-text (<2.15)", "tf2onnx", "timm", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "torchaudio", "torchvision"] +deepspeed = ["accelerate (>=0.21.0)", "deepspeed (>=0.9.3)"] +deepspeed-testing = ["GitPython (<3.1.19)", "accelerate (>=0.21.0)", "beautifulsoup4", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "deepspeed (>=0.9.3)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "hf-doc-builder (>=0.3.0)", "nltk", "optuna", "parameterized", "protobuf", "psutil", "pydantic (<2)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (==0.1.5)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "sentencepiece (>=0.1.91,!=0.1.92)", "tensorboard", "timeout-decorator"] +dev = ["GitPython (<3.1.19)", "Pillow (>=10.0.1,<=15.0)", "accelerate (>=0.21.0)", "av (==9.2.0)", "beautifulsoup4", "codecarbon (==1.2.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "decord (==0.6.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "flax (>=0.4.1,<=0.7.0)", "fugashi (>=1.0)", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "ipadic (>=1.0.0,<2.0)", "isort (>=5.5.4)", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "nltk", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pydantic (<2)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "ray[tune] (>=2.7.0)", "rhoknp (>=1.1.0,<1.3.1)", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (==0.1.5)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "sudachidict-core (>=20220729)", "sudachipy (>=0.6.6)", "tensorboard", "tensorflow (>=2.6,<2.16)", "tensorflow-text (<2.16)", "tf2onnx", "timeout-decorator", "timm", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "torchaudio", "torchvision", "unidic (>=1.0.2)", "unidic-lite (>=1.0.7)", "urllib3 (<2.0.0)"] +dev-tensorflow = ["GitPython (<3.1.19)", "Pillow (>=10.0.1,<=15.0)", "beautifulsoup4", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "isort (>=5.5.4)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "nltk", "onnxconverter-common", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pydantic (<2)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (==0.1.5)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "tensorboard", "tensorflow (>=2.6,<2.16)", "tensorflow-text (<2.16)", "tf2onnx", "timeout-decorator", "tokenizers (>=0.14,<0.19)", "urllib3 (<2.0.0)"] +dev-torch = ["GitPython (<3.1.19)", "Pillow (>=10.0.1,<=15.0)", "accelerate (>=0.21.0)", "beautifulsoup4", "codecarbon (==1.2.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "fugashi (>=1.0)", "hf-doc-builder", "hf-doc-builder (>=0.3.0)", "ipadic (>=1.0.0,<2.0)", "isort (>=5.5.4)", "kenlm", "librosa", "nltk", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)", "optuna", "parameterized", "phonemizer", "protobuf", "psutil", "pyctcdecode (>=0.4.0)", "pydantic (<2)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "ray[tune] (>=2.7.0)", "rhoknp (>=1.1.0,<1.3.1)", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (==0.1.5)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "scikit-learn", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "sudachidict-core (>=20220729)", "sudachipy (>=0.6.6)", "tensorboard", "timeout-decorator", "timm", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "torchaudio", "torchvision", "unidic (>=1.0.2)", "unidic-lite (>=1.0.7)", "urllib3 (<2.0.0)"] +docs = ["Pillow (>=10.0.1,<=15.0)", "accelerate (>=0.21.0)", "av (==9.2.0)", "codecarbon (==1.2.0)", "decord (==0.6.0)", "flax (>=0.4.1,<=0.7.0)", "hf-doc-builder", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "kenlm", "keras-nlp (>=0.3.1)", "librosa", "onnxconverter-common", "optax (>=0.0.8,<=0.1.4)", "optuna", "phonemizer", "protobuf", "pyctcdecode (>=0.4.0)", "ray[tune] (>=2.7.0)", "sentencepiece (>=0.1.91,!=0.1.92)", "sigopt", "tensorflow (>=2.6,<2.16)", "tensorflow-text (<2.16)", "tf2onnx", "timm", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "torchaudio", "torchvision"] docs-specific = ["hf-doc-builder"] flax = ["flax (>=0.4.1,<=0.7.0)", "jax (>=0.4.1,<=0.4.13)", "jaxlib (>=0.4.1,<=0.4.13)", "optax (>=0.0.8,<=0.1.4)"] flax-speech = ["kenlm", "librosa", "phonemizer", "pyctcdecode (>=0.4.0)"] ftfy = ["ftfy"] -integrations = ["optuna", "ray[tune]", "sigopt"] +integrations = ["optuna", "ray[tune] (>=2.7.0)", "sigopt"] ja = ["fugashi (>=1.0)", "ipadic (>=1.0.0,<2.0)", "rhoknp (>=1.1.0,<1.3.1)", "sudachidict-core (>=20220729)", "sudachipy (>=0.6.6)", "unidic (>=1.0.2)", "unidic-lite (>=1.0.7)"] modelcreation = ["cookiecutter (==1.7.3)"] natten = ["natten (>=0.14.6)"] onnx = ["onnxconverter-common", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)", "tf2onnx"] onnxruntime = ["onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)"] optuna = ["optuna"] -quality = ["GitPython (<3.1.19)", "black (>=23.1,<24.0)", "datasets (!=2.5.0)", "hf-doc-builder (>=0.3.0)", "isort (>=5.5.4)", "ruff (>=0.0.241,<=0.0.259)", "urllib3 (<2.0.0)"] -ray = ["ray[tune]"] +quality = ["GitPython (<3.1.19)", "datasets (!=2.5.0)", "hf-doc-builder (>=0.3.0)", "isort (>=5.5.4)", "ruff (==0.1.5)", "urllib3 (<2.0.0)"] +ray = ["ray[tune] (>=2.7.0)"] retrieval = ["datasets (!=2.5.0)", "faiss-cpu"] sagemaker = ["sagemaker (>=2.31.0)"] sentencepiece = ["protobuf", "sentencepiece (>=0.1.91,!=0.1.92)"] @@ -4161,18 +4462,18 @@ serving = ["fastapi", "pydantic (<2)", "starlette", "uvicorn"] sigopt = ["sigopt"] sklearn = ["scikit-learn"] speech = ["kenlm", "librosa", "phonemizer", "pyctcdecode (>=0.4.0)", "torchaudio"] -testing = ["GitPython (<3.1.19)", "beautifulsoup4", "black (>=23.1,<24.0)", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "hf-doc-builder (>=0.3.0)", "nltk", "parameterized", "protobuf", "psutil", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "tensorboard", "timeout-decorator"] -tf = ["keras-nlp (>=0.3.1)", "onnxconverter-common", "tensorflow (>=2.6,<2.15)", "tensorflow-text (<2.15)", "tf2onnx"] -tf-cpu = ["keras-nlp (>=0.3.1)", "onnxconverter-common", "tensorflow-cpu (>=2.6,<2.15)", "tensorflow-text (<2.15)", "tf2onnx"] +testing = ["GitPython (<3.1.19)", "beautifulsoup4", "cookiecutter (==1.7.3)", "datasets (!=2.5.0)", "dill (<0.3.5)", "evaluate (>=0.2.0)", "faiss-cpu", "hf-doc-builder (>=0.3.0)", "nltk", "parameterized", "protobuf", "psutil", "pydantic (<2)", "pytest (>=7.2.0)", "pytest-timeout", "pytest-xdist", "rjieba", "rouge-score (!=0.0.7,!=0.0.8,!=0.1,!=0.1.1)", "ruff (==0.1.5)", "sacrebleu (>=1.4.12,<2.0.0)", "sacremoses", "tensorboard", "timeout-decorator"] +tf = ["keras-nlp (>=0.3.1)", "onnxconverter-common", "tensorflow (>=2.6,<2.16)", "tensorflow-text (<2.16)", "tf2onnx"] +tf-cpu = ["keras-nlp (>=0.3.1)", "onnxconverter-common", "tensorflow-cpu (>=2.6,<2.16)", "tensorflow-text (<2.16)", "tf2onnx"] tf-speech = ["kenlm", "librosa", "phonemizer", "pyctcdecode (>=0.4.0)"] timm = ["timm"] tokenizers = ["tokenizers (>=0.14,<0.19)"] -torch = ["accelerate (>=0.20.3)", "torch (>=1.10,!=1.12.0)"] +torch = ["accelerate (>=0.21.0)", "torch (>=1.10,!=1.12.0)"] torch-speech = ["kenlm", "librosa", "phonemizer", "pyctcdecode (>=0.4.0)", "torchaudio"] -torch-vision = ["Pillow (<10.0.0)", "torchvision"] -torchhub = ["filelock", "huggingface-hub (>=0.16.4,<1.0)", "importlib-metadata", "numpy (>=1.17)", "packaging (>=20.0)", "protobuf", "regex (!=2019.12.17)", "requests", "sentencepiece (>=0.1.91,!=0.1.92)", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "tqdm (>=4.27)"] +torch-vision = ["Pillow (>=10.0.1,<=15.0)", "torchvision"] +torchhub = ["filelock", "huggingface-hub (>=0.19.3,<1.0)", "importlib-metadata", "numpy (>=1.17)", "packaging (>=20.0)", "protobuf", "regex (!=2019.12.17)", "requests", "sentencepiece (>=0.1.91,!=0.1.92)", "tokenizers (>=0.14,<0.19)", "torch (>=1.10,!=1.12.0)", "tqdm (>=4.27)"] video = ["av (==9.2.0)", "decord (==0.6.0)"] -vision = ["Pillow (<10.0.0)"] +vision = ["Pillow (>=10.0.1,<=15.0)"] [[package]] name = "triton" @@ -4222,13 +4523,13 @@ test = ["black (>=22.3.0,<23.0.0)", "coverage (>=6.2,<7.0)", "isort (>=5.0.6,<6. [[package]] name = "typing-extensions" -version = "4.8.0" +version = "4.9.0" description = "Backported and Experimental Type Hints for Python 3.8+" optional = false python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.8.0-py3-none-any.whl", hash = "sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0"}, - {file = "typing_extensions-4.8.0.tar.gz", hash = "sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef"}, + {file = "typing_extensions-4.9.0-py3-none-any.whl", hash = "sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd"}, + {file = "typing_extensions-4.9.0.tar.gz", hash = "sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783"}, ] [[package]] @@ -4248,89 +4549,94 @@ typing-extensions = ">=3.7.4" [[package]] name = "ujson" -version = "5.8.0" +version = "5.9.0" description = "Ultra fast JSON encoder and decoder for Python" optional = false python-versions = ">=3.8" files = [ - {file = "ujson-5.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f4511560d75b15ecb367eef561554959b9d49b6ec3b8d5634212f9fed74a6df1"}, - {file = "ujson-5.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9399eaa5d1931a0ead49dce3ffacbea63f3177978588b956036bfe53cdf6af75"}, - {file = "ujson-5.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4e7bb7eba0e1963f8b768f9c458ecb193e5bf6977090182e2b4f4408f35ac76"}, - {file = "ujson-5.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40931d7c08c4ce99adc4b409ddb1bbb01635a950e81239c2382cfe24251b127a"}, - {file = "ujson-5.8.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d53039d39de65360e924b511c7ca1a67b0975c34c015dd468fca492b11caa8f7"}, - {file = "ujson-5.8.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:bdf04c6af3852161be9613e458a1fb67327910391de8ffedb8332e60800147a2"}, - {file = "ujson-5.8.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a70f776bda2e5072a086c02792c7863ba5833d565189e09fabbd04c8b4c3abba"}, - {file = "ujson-5.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f26629ac531d712f93192c233a74888bc8b8212558bd7d04c349125f10199fcf"}, - {file = "ujson-5.8.0-cp310-cp310-win32.whl", hash = "sha256:7ecc33b107ae88405aebdb8d82c13d6944be2331ebb04399134c03171509371a"}, - {file = "ujson-5.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:3b27a8da7a080add559a3b73ec9ebd52e82cc4419f7c6fb7266e62439a055ed0"}, - {file = "ujson-5.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:193349a998cd821483a25f5df30b44e8f495423840ee11b3b28df092ddfd0f7f"}, - {file = "ujson-5.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4ddeabbc78b2aed531f167d1e70387b151900bc856d61e9325fcdfefb2a51ad8"}, - {file = "ujson-5.8.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ce24909a9c25062e60653073dd6d5e6ec9d6ad7ed6e0069450d5b673c854405"}, - {file = "ujson-5.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27a2a3c7620ebe43641e926a1062bc04e92dbe90d3501687957d71b4bdddaec4"}, - {file = "ujson-5.8.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2b852bdf920fe9f84e2a2c210cc45f1b64f763b4f7d01468b33f7791698e455e"}, - {file = "ujson-5.8.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:20768961a6a706170497129960762ded9c89fb1c10db2989c56956b162e2a8a3"}, - {file = "ujson-5.8.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e0147d41e9fb5cd174207c4a2895c5e24813204499fd0839951d4c8784a23bf5"}, - {file = "ujson-5.8.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e3673053b036fd161ae7a5a33358ccae6793ee89fd499000204676baafd7b3aa"}, - {file = "ujson-5.8.0-cp311-cp311-win32.whl", hash = "sha256:a89cf3cd8bf33a37600431b7024a7ccf499db25f9f0b332947fbc79043aad879"}, - {file = "ujson-5.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:3659deec9ab9eb19e8646932bfe6fe22730757c4addbe9d7d5544e879dc1b721"}, - {file = "ujson-5.8.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:102bf31c56f59538cccdfec45649780ae00657e86247c07edac434cb14d5388c"}, - {file = "ujson-5.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:299a312c3e85edee1178cb6453645217ba23b4e3186412677fa48e9a7f986de6"}, - {file = "ujson-5.8.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f2e385a7679b9088d7bc43a64811a7713cc7c33d032d020f757c54e7d41931ae"}, - {file = "ujson-5.8.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad24ec130855d4430a682c7a60ca0bc158f8253ec81feed4073801f6b6cb681b"}, - {file = "ujson-5.8.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:16fde596d5e45bdf0d7de615346a102510ac8c405098e5595625015b0d4b5296"}, - {file = "ujson-5.8.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:6d230d870d1ce03df915e694dcfa3f4e8714369cce2346686dbe0bc8e3f135e7"}, - {file = "ujson-5.8.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:9571de0c53db5cbc265945e08f093f093af2c5a11e14772c72d8e37fceeedd08"}, - {file = "ujson-5.8.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:7cba16b26efe774c096a5e822e4f27097b7c81ed6fb5264a2b3f5fd8784bab30"}, - {file = "ujson-5.8.0-cp312-cp312-win32.whl", hash = "sha256:48c7d373ff22366eecfa36a52b9b55b0ee5bd44c2b50e16084aa88b9de038916"}, - {file = "ujson-5.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:5ac97b1e182d81cf395ded620528c59f4177eee024b4b39a50cdd7b720fdeec6"}, - {file = "ujson-5.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2a64cc32bb4a436e5813b83f5aab0889927e5ea1788bf99b930fad853c5625cb"}, - {file = "ujson-5.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e54578fa8838ddc722539a752adfce9372474114f8c127bb316db5392d942f8b"}, - {file = "ujson-5.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9721cd112b5e4687cb4ade12a7b8af8b048d4991227ae8066d9c4b3a6642a582"}, - {file = "ujson-5.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d9707e5aacf63fb919f6237d6490c4e0244c7f8d3dc2a0f84d7dec5db7cb54c"}, - {file = "ujson-5.8.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0be81bae295f65a6896b0c9030b55a106fb2dec69ef877253a87bc7c9c5308f7"}, - {file = "ujson-5.8.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ae7f4725c344bf437e9b881019c558416fe84ad9c6b67426416c131ad577df67"}, - {file = "ujson-5.8.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:9ab282d67ef3097105552bf151438b551cc4bedb3f24d80fada830f2e132aeb9"}, - {file = "ujson-5.8.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:94c7bd9880fa33fcf7f6d7f4cc032e2371adee3c5dba2922b918987141d1bf07"}, - {file = "ujson-5.8.0-cp38-cp38-win32.whl", hash = "sha256:bf5737dbcfe0fa0ac8fa599eceafae86b376492c8f1e4b84e3adf765f03fb564"}, - {file = "ujson-5.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:11da6bed916f9bfacf13f4fc6a9594abd62b2bb115acfb17a77b0f03bee4cfd5"}, - {file = "ujson-5.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:69b3104a2603bab510497ceabc186ba40fef38ec731c0ccaa662e01ff94a985c"}, - {file = "ujson-5.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9249fdefeb021e00b46025e77feed89cd91ffe9b3a49415239103fc1d5d9c29a"}, - {file = "ujson-5.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2873d196725a8193f56dde527b322c4bc79ed97cd60f1d087826ac3290cf9207"}, - {file = "ujson-5.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6a4dafa9010c366589f55afb0fd67084acd8added1a51251008f9ff2c3e44042"}, - {file = "ujson-5.8.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a42baa647a50fa8bed53d4e242be61023bd37b93577f27f90ffe521ac9dc7a3"}, - {file = "ujson-5.8.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f3554eaadffe416c6f543af442066afa6549edbc34fe6a7719818c3e72ebfe95"}, - {file = "ujson-5.8.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:fb87decf38cc82bcdea1d7511e73629e651bdec3a43ab40985167ab8449b769c"}, - {file = "ujson-5.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:407d60eb942c318482bbfb1e66be093308bb11617d41c613e33b4ce5be789adc"}, - {file = "ujson-5.8.0-cp39-cp39-win32.whl", hash = "sha256:0fe1b7edaf560ca6ab023f81cbeaf9946a240876a993b8c5a21a1c539171d903"}, - {file = "ujson-5.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:3f9b63530a5392eb687baff3989d0fb5f45194ae5b1ca8276282fb647f8dcdb3"}, - {file = "ujson-5.8.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:efeddf950fb15a832376c0c01d8d7713479fbeceaed1eaecb2665aa62c305aec"}, - {file = "ujson-5.8.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7d8283ac5d03e65f488530c43d6610134309085b71db4f675e9cf5dff96a8282"}, - {file = "ujson-5.8.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eb0142f6f10f57598655340a3b2c70ed4646cbe674191da195eb0985a9813b83"}, - {file = "ujson-5.8.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07d459aca895eb17eb463b00441986b021b9312c6c8cc1d06880925c7f51009c"}, - {file = "ujson-5.8.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:d524a8c15cfc863705991d70bbec998456a42c405c291d0f84a74ad7f35c5109"}, - {file = "ujson-5.8.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d6f84a7a175c75beecde53a624881ff618e9433045a69fcfb5e154b73cdaa377"}, - {file = "ujson-5.8.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b748797131ac7b29826d1524db1cc366d2722ab7afacc2ce1287cdafccddbf1f"}, - {file = "ujson-5.8.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e72ba76313d48a1a3a42e7dc9d1db32ea93fac782ad8dde6f8b13e35c229130"}, - {file = "ujson-5.8.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f504117a39cb98abba4153bf0b46b4954cc5d62f6351a14660201500ba31fe7f"}, - {file = "ujson-5.8.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a8c91b6f4bf23f274af9002b128d133b735141e867109487d17e344d38b87d94"}, - {file = "ujson-5.8.0.tar.gz", hash = "sha256:78e318def4ade898a461b3d92a79f9441e7e0e4d2ad5419abed4336d702c7425"}, + {file = "ujson-5.9.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ab71bf27b002eaf7d047c54a68e60230fbd5cd9da60de7ca0aa87d0bccead8fa"}, + {file = "ujson-5.9.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7a365eac66f5aa7a7fdf57e5066ada6226700884fc7dce2ba5483538bc16c8c5"}, + {file = "ujson-5.9.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e015122b337858dba5a3dc3533af2a8fc0410ee9e2374092f6a5b88b182e9fcc"}, + {file = "ujson-5.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:779a2a88c53039bebfbccca934430dabb5c62cc179e09a9c27a322023f363e0d"}, + {file = "ujson-5.9.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:10ca3c41e80509fd9805f7c149068fa8dbee18872bbdc03d7cca928926a358d5"}, + {file = "ujson-5.9.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4a566e465cb2fcfdf040c2447b7dd9718799d0d90134b37a20dff1e27c0e9096"}, + {file = "ujson-5.9.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f833c529e922577226a05bc25b6a8b3eb6c4fb155b72dd88d33de99d53113124"}, + {file = "ujson-5.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b68a0caab33f359b4cbbc10065c88e3758c9f73a11a65a91f024b2e7a1257106"}, + {file = "ujson-5.9.0-cp310-cp310-win32.whl", hash = "sha256:7cc7e605d2aa6ae6b7321c3ae250d2e050f06082e71ab1a4200b4ae64d25863c"}, + {file = "ujson-5.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:a6d3f10eb8ccba4316a6b5465b705ed70a06011c6f82418b59278fbc919bef6f"}, + {file = "ujson-5.9.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3b23bbb46334ce51ddb5dded60c662fbf7bb74a37b8f87221c5b0fec1ec6454b"}, + {file = "ujson-5.9.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:6974b3a7c17bbf829e6c3bfdc5823c67922e44ff169851a755eab79a3dd31ec0"}, + {file = "ujson-5.9.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5964ea916edfe24af1f4cc68488448fbb1ec27a3ddcddc2b236da575c12c8ae"}, + {file = "ujson-5.9.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8ba7cac47dd65ff88571eceeff48bf30ed5eb9c67b34b88cb22869b7aa19600d"}, + {file = "ujson-5.9.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6bbd91a151a8f3358c29355a491e915eb203f607267a25e6ab10531b3b157c5e"}, + {file = "ujson-5.9.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:829a69d451a49c0de14a9fecb2a2d544a9b2c884c2b542adb243b683a6f15908"}, + {file = "ujson-5.9.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:a807ae73c46ad5db161a7e883eec0fbe1bebc6a54890152ccc63072c4884823b"}, + {file = "ujson-5.9.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8fc2aa18b13d97b3c8ccecdf1a3c405f411a6e96adeee94233058c44ff92617d"}, + {file = "ujson-5.9.0-cp311-cp311-win32.whl", hash = "sha256:70e06849dfeb2548be48fdd3ceb53300640bc8100c379d6e19d78045e9c26120"}, + {file = "ujson-5.9.0-cp311-cp311-win_amd64.whl", hash = "sha256:7309d063cd392811acc49b5016728a5e1b46ab9907d321ebbe1c2156bc3c0b99"}, + {file = "ujson-5.9.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:20509a8c9f775b3a511e308bbe0b72897ba6b800767a7c90c5cca59d20d7c42c"}, + {file = "ujson-5.9.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b28407cfe315bd1b34f1ebe65d3bd735d6b36d409b334100be8cdffae2177b2f"}, + {file = "ujson-5.9.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9d302bd17989b6bd90d49bade66943c78f9e3670407dbc53ebcf61271cadc399"}, + {file = "ujson-5.9.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f21315f51e0db8ee245e33a649dd2d9dce0594522de6f278d62f15f998e050e"}, + {file = "ujson-5.9.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5635b78b636a54a86fdbf6f027e461aa6c6b948363bdf8d4fbb56a42b7388320"}, + {file = "ujson-5.9.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:82b5a56609f1235d72835ee109163c7041b30920d70fe7dac9176c64df87c164"}, + {file = "ujson-5.9.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:5ca35f484622fd208f55041b042d9d94f3b2c9c5add4e9af5ee9946d2d30db01"}, + {file = "ujson-5.9.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:829b824953ebad76d46e4ae709e940bb229e8999e40881338b3cc94c771b876c"}, + {file = "ujson-5.9.0-cp312-cp312-win32.whl", hash = "sha256:25fa46e4ff0a2deecbcf7100af3a5d70090b461906f2299506485ff31d9ec437"}, + {file = "ujson-5.9.0-cp312-cp312-win_amd64.whl", hash = "sha256:60718f1720a61560618eff3b56fd517d107518d3c0160ca7a5a66ac949c6cf1c"}, + {file = "ujson-5.9.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d581db9db9e41d8ea0b2705c90518ba623cbdc74f8d644d7eb0d107be0d85d9c"}, + {file = "ujson-5.9.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ff741a5b4be2d08fceaab681c9d4bc89abf3c9db600ab435e20b9b6d4dfef12e"}, + {file = "ujson-5.9.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cdcb02cabcb1e44381221840a7af04433c1dc3297af76fde924a50c3054c708c"}, + {file = "ujson-5.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e208d3bf02c6963e6ef7324dadf1d73239fb7008491fdf523208f60be6437402"}, + {file = "ujson-5.9.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f4b3917296630a075e04d3d07601ce2a176479c23af838b6cf90a2d6b39b0d95"}, + {file = "ujson-5.9.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0c4d6adb2c7bb9eb7c71ad6f6f612e13b264942e841f8cc3314a21a289a76c4e"}, + {file = "ujson-5.9.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:0b159efece9ab5c01f70b9d10bbb77241ce111a45bc8d21a44c219a2aec8ddfd"}, + {file = "ujson-5.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f0cb4a7814940ddd6619bdce6be637a4b37a8c4760de9373bac54bb7b229698b"}, + {file = "ujson-5.9.0-cp38-cp38-win32.whl", hash = "sha256:dc80f0f5abf33bd7099f7ac94ab1206730a3c0a2d17549911ed2cb6b7aa36d2d"}, + {file = "ujson-5.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:506a45e5fcbb2d46f1a51fead991c39529fc3737c0f5d47c9b4a1d762578fc30"}, + {file = "ujson-5.9.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d0fd2eba664a22447102062814bd13e63c6130540222c0aa620701dd01f4be81"}, + {file = "ujson-5.9.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bdf7fc21a03bafe4ba208dafa84ae38e04e5d36c0e1c746726edf5392e9f9f36"}, + {file = "ujson-5.9.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2f909bc08ce01f122fd9c24bc6f9876aa087188dfaf3c4116fe6e4daf7e194f"}, + {file = "ujson-5.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd4ea86c2afd41429751d22a3ccd03311c067bd6aeee2d054f83f97e41e11d8f"}, + {file = "ujson-5.9.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:63fb2e6599d96fdffdb553af0ed3f76b85fda63281063f1cb5b1141a6fcd0617"}, + {file = "ujson-5.9.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:32bba5870c8fa2a97f4a68f6401038d3f1922e66c34280d710af00b14a3ca562"}, + {file = "ujson-5.9.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:37ef92e42535a81bf72179d0e252c9af42a4ed966dc6be6967ebfb929a87bc60"}, + {file = "ujson-5.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:f69f16b8f1c69da00e38dc5f2d08a86b0e781d0ad3e4cc6a13ea033a439c4844"}, + {file = "ujson-5.9.0-cp39-cp39-win32.whl", hash = "sha256:3382a3ce0ccc0558b1c1668950008cece9bf463ebb17463ebf6a8bfc060dae34"}, + {file = "ujson-5.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:6adef377ed583477cf005b58c3025051b5faa6b8cc25876e594afbb772578f21"}, + {file = "ujson-5.9.0-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ffdfebd819f492e48e4f31c97cb593b9c1a8251933d8f8972e81697f00326ff1"}, + {file = "ujson-5.9.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4eec2ddc046360d087cf35659c7ba0cbd101f32035e19047013162274e71fcf"}, + {file = "ujson-5.9.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fbb90aa5c23cb3d4b803c12aa220d26778c31b6e4b7a13a1f49971f6c7d088e"}, + {file = "ujson-5.9.0-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ba0823cb70866f0d6a4ad48d998dd338dce7314598721bc1b7986d054d782dfd"}, + {file = "ujson-5.9.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:4e35d7885ed612feb6b3dd1b7de28e89baaba4011ecdf995e88be9ac614765e9"}, + {file = "ujson-5.9.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b048aa93eace8571eedbd67b3766623e7f0acbf08ee291bef7d8106210432427"}, + {file = "ujson-5.9.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:323279e68c195110ef85cbe5edce885219e3d4a48705448720ad925d88c9f851"}, + {file = "ujson-5.9.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9ac92d86ff34296f881e12aa955f7014d276895e0e4e868ba7fddebbde38e378"}, + {file = "ujson-5.9.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:6eecbd09b316cea1fd929b1e25f70382917542ab11b692cb46ec9b0a26c7427f"}, + {file = "ujson-5.9.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:473fb8dff1d58f49912323d7cb0859df5585cfc932e4b9c053bf8cf7f2d7c5c4"}, + {file = "ujson-5.9.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f91719c6abafe429c1a144cfe27883eace9fb1c09a9c5ef1bcb3ae80a3076a4e"}, + {file = "ujson-5.9.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b1c0991c4fe256f5fdb19758f7eac7f47caac29a6c57d0de16a19048eb86bad"}, + {file = "ujson-5.9.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2a8ea0f55a1396708e564595aaa6696c0d8af532340f477162ff6927ecc46e21"}, + {file = "ujson-5.9.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:07e0cfdde5fd91f54cd2d7ffb3482c8ff1bf558abf32a8b953a5d169575ae1cd"}, + {file = "ujson-5.9.0.tar.gz", hash = "sha256:89cc92e73d5501b8a7f48575eeb14ad27156ad092c2e9fc7e3cf949f07e75532"}, ] [[package]] name = "urllib3" -version = "1.26.18" +version = "2.0.7" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7" files = [ - {file = "urllib3-1.26.18-py2.py3-none-any.whl", hash = "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07"}, - {file = "urllib3-1.26.18.tar.gz", hash = "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"}, + {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"}, + {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"}, ] [package.extras] -brotli = ["brotli (==1.0.9)", "brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] +brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] +secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"] +socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] +zstd = ["zstandard (>=0.18.0)"] [[package]] name = "uvicorn" @@ -4530,13 +4836,13 @@ anyio = ">=3.0.0" [[package]] name = "wcwidth" -version = "0.2.12" +version = "0.2.13" description = "Measures the displayed width of unicode strings in a terminal" optional = false python-versions = "*" files = [ - {file = "wcwidth-0.2.12-py2.py3-none-any.whl", hash = "sha256:f26ec43d96c8cbfed76a5075dac87680124fa84e0855195a6184da9c187f133c"}, - {file = "wcwidth-0.2.12.tar.gz", hash = "sha256:f01c104efdf57971bcb756f054dd58ddec5204dd15fa31d6503ea57947d97c02"}, + {file = "wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859"}, + {file = "wcwidth-0.2.13.tar.gz", hash = "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5"}, ] [[package]] diff --git a/pyproject.toml b/pyproject.toml index 16d327f0..44e837f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.masonry.api" [tool.poetry] name = "talemate" -version = "0.16.1" +version = "0.17.0" description = "AI-backed roleplay and narrative tools" authors = ["FinalWombat"] license = "GNU Affero General Public License v3.0" diff --git a/scenes/infinity-quest-dynamic-scenario/assets/52b1388ed6f77a43981bd27e05df54f16e12ba8de1c48f4b9bbcb138fa7367df.png b/scenes/infinity-quest-dynamic-scenario/assets/52b1388ed6f77a43981bd27e05df54f16e12ba8de1c48f4b9bbcb138fa7367df.png new file mode 100644 index 00000000..9062344c Binary files /dev/null and b/scenes/infinity-quest-dynamic-scenario/assets/52b1388ed6f77a43981bd27e05df54f16e12ba8de1c48f4b9bbcb138fa7367df.png differ diff --git a/scenes/infinity-quest-dynamic-scenario/infinity-quest.json b/scenes/infinity-quest-dynamic-scenario/infinity-quest.json new file mode 100644 index 00000000..4ddd9236 --- /dev/null +++ b/scenes/infinity-quest-dynamic-scenario/infinity-quest.json @@ -0,0 +1,121 @@ +{ + "description": "Captain Elmer Farstield and his trusty first officer, Kaira, embark upon a daring mission into uncharted space. Their small but mighty exploration vessel, the Starlight Nomad, is equipped with state-of-the-art technology and crewed by an elite team of scientists, engineers, and pilots. Together they brave the vast cosmos seeking answers to humanity's most pressing questions about life beyond our solar system.", + "intro": "", + "name": "Infinity Quest Dynamic Scenario", + "history": [], + "environment": "scene", + "ts": "P1Y", + "archived_history": [ + { + "text": "Captain Elmer and Kaira first met during their rigorous training for the Infinity Quest mission. Their initial interactions were marked by a sense of mutual respect and curiosity.", + "ts": "PT1S" + }, + { + "text": "Over the course of several months, as they trained together, Elmer and Kaira developed a strong bond. They often spent their free time discussing their dreams of exploring the cosmos.", + "ts": "P3M" + }, + { + "text": "During a simulated mission, the Starlight Nomad encountered a sudden system malfunction. Elmer and Kaira worked tirelessly together to resolve the issue and avert a potential disaster. This incident strengthened their trust in each other's abilities.", + "ts": "P6M" + }, + { + "text": "As they ventured further into uncharted space, the crew faced a perilous encounter with a hostile alien species. Elmer and Kaira's coordinated efforts were instrumental in negotiating a peaceful resolution and avoiding conflict.", + "ts": "P8M" + }, + { + "text": "One memorable evening, while gazing at the stars through the ship's observation deck, Elmer and Kaira shared personal stories from their past. This intimate conversation deepened their connection and understanding of each other.", + "ts": "P11M" + } + ], + "character_states": {}, + "characters": [ + { + "name": "Elmer", + "description": "Elmer is a seasoned space explorer, having traversed the cosmos for over three decades. At thirty-eight years old, his muscular frame still cuts an imposing figure, clad in a form-fitting black spacesuit adorned with intricate silver markings. As the captain of his own ship, he wields authority with confidence yet never comes across as arrogant or dictatorial. Underneath this tough exterior lies a man who genuinely cares for his crew and their wellbeing, striking a balance between discipline and compassion.", + "greeting_text": "", + "base_attributes": { + "gender": "male", + "species": "Humans", + "name": "Elmer", + "age": "38", + "appearance": "Captain Elmer stands tall at six feet, his body honed by years of space travel and physical training. His muscular frame is clad in a form-fitting black spacesuit, which accentuates every defined curve and ridge. His helmet, adorned with intricate silver markings, completes the ensemble, giving him a commanding presence. Despite his age, his face remains youthful, bearing traces of determination and wisdom earned through countless encounters with the unknown.", + "personality": "As the leader of their small but dedicated team, Elmer exudes confidence and authority without ever coming across as arrogant or dictatorial. He possesses a strong sense of duty towards his mission and those under his care, ensuring that everyone aboard follows protocol while still encouraging them to explore their curiosities about the vast cosmos beyond Earth. Though firm when necessary, he also demonstrates great empathy towards his crew members, understanding each individual's unique strengths and weaknesses. In short, Captain Elmer embodies the perfect blend of discipline and compassion, making him not just a respected commander but also a beloved mentor and friend.", + "associates": "Kaira", + "likes": "Space exploration, discovering new worlds, deep conversations about philosophy and history.", + "dislikes": "Repetitive tasks, unnecessary conflict, close quarters with large groups of people, stagnation", + "gear and tech": "As the captain of his ship, Elmer has access to some of the most advanced technology available in the galaxy. His primary tool is the sleek and powerful exploration starship, equipped with state-of-the-art engines capable of reaching lightspeed and navigating through the harshest environments. The vessel houses a wide array of scientific instruments designed to analyze and record data from various celestial bodies. Its armory contains high-tech weapons such as energy rifles and pulse pistols, which are used only in extreme situations. Additionally, Elmer wears a smart suit that monitors his vital signs, provides real-time updates on the status of the ship, and allows him to communicate directly with Kaira via subvocal transmissions. Finally, they both carry personal transponders that enable them to locate one another even if separated by hundreds of miles within the confines of the ship." + }, + "details": {}, + "gender": "male", + "color": "cornflowerblue", + "example_dialogue": [], + "history_events": [], + "is_player": true, + "cover_image": null + }, + { + "name": "Kaira", + "description": "Kaira is a meticulous and dedicated Altrusian woman who serves as second-in-command aboard their tiny exploration vessel. As a native of the planet Altrusia, she possesses striking features unique among her kind; deep violet skin adorned with intricate patterns resembling stardust, large sapphire eyes, lustrous glowing hair cascading down her back, and standing tall at just over six feet. Her form fitting bodysuit matches her own hue, giving off an ethereal presence. With her innate grace and precision, she moves efficiently throughout the cramped confines of their ship. A loyal companion to Captain Elmer Farstield, she approaches every task with diligence and focus while respecting authority yet challenging decisions when needed. Dedicated to maintaining order within their tight quarters, Kaira wields several advanced technological devices including a multi-tool, portable scanner, high-tech communications system, and personal shield generator - all essential for navigating unknown territories and protecting themselves from harm. In this perilous universe full of mysteries waiting to be discovered, Kaira stands steadfast alongside her captain \u2013 ready to embrace whatever challenges lie ahead in their quest for knowledge beyond Earth's boundaries.", + "greeting_text": "", + "base_attributes": { + "gender": "female", + "species": "Altrusian", + "name": "Kaira", + "age": "37", + "appearance": "As a native of the planet Altrusia, Kaira possesses striking features unique among her kind. Her skin tone is a deep violet hue, adorned with intricate patterns resembling stardust. Her eyes are large and almond shaped, gleaming like polished sapphires under the dim lighting of their current environment. Her hair cascades down her back in lustrous waves, each strand glowing softly with an inner luminescence. Standing at just over six feet tall, she cuts an imposing figure despite her slender build. Clad in a form fitting bodysuit made from some unknown material, its color matching her own, Kaira moves with grace and precision through the cramped confines of their spacecraft.", + "personality": "Meticulous and open-minded, Kaira takes great pride in maintaining order within the tight quarters of their ship. Despite being one of only two crew members aboard, she approaches every task with diligence and focus, ensuring nothing falls through the cracks. While she respects authority, especially when it comes to Captain Elmer Farstield, she isn't afraid to challenge his decisions if she believes they could lead them astray. Ultimately, Kaira's dedication to her mission and commitment to her fellow crewmate make her a valuable asset in any interstellar adventure.", + "associates": "Captain Elmer Farstield (human), Dr. Ralpam Zargon (Altrusian scientist)", + "likes": "orderliness, quiet solitude, exploring new worlds", + "dislikes": "chaos, loud noises, unclean environments", + "gear and tech": "The young Altrusian female known as Kaira was equipped with a variety of advanced technological devices that served multiple purposes on board their small explorer starship. Among these were her trusty multi-tool, capable of performing various tasks such as repair work, hacking into computer systems, and even serving as a makeshift weapon if necessary. She also carried a portable scanner capable of analyzing various materials and detecting potential hazards in their surroundings. Additionally, she had access to a high-tech communications system allowing her to maintain contact with her homeworld and other vessels across the galaxy. Last but not least, she possessed a personal shield generator which provided protection against radiation, extreme temperatures, and certain types of energy weapons. All these tools combined made Kaira a vital part of their team, ready to face whatever challenges lay ahead in their journey through the stars.", + "scenario_context": "an epic sci-fi adventure aimed at an adult audience.", + "_template": "sci-fi", + "_prompt": "A female crew member on board of a small explorer type starship. She is open minded and meticulous about keeping order. She is currently one of two crew members abord the small vessel, the other person on board is a human male named Captain Elmer Farstield." + }, + "details": { + "what objective does Kaira pursue and what obstacle stands in their way?": "As a member of an interstellar expedition led by human Captain Elmer Farstield, Kaira seeks to explore new worlds and gather data about alien civilizations for the benefit of her people back on Altrusia. Their current objective involves locating a rumored planet known as \"Eden\", said to be inhabited by highly intelligent beings who possess advanced technology far surpassing anything seen elsewhere in the universe. However, navigating through the vast expanse of space can prove treacherous; from cosmic storms that threaten to damage their ship to encounters with hostile species seeking to protect their territories or exploit them for resources, many dangers lurk between them and Eden.", + "what secret from Kaira's past or future has the most impact on them?": "In the distant reaches of space, among the stars, there exists a race called the Altrusians. One such individual named Kaira embarked upon a mission alongside humans aboard a small explorer vessel. Her past held secrets - tales whispered amongst her kind about an ancient prophecy concerning their role within the cosmos. It spoke of a time when they would encounter another intelligent species, one destined to guide them towards enlightenment. Could this mysterious \"Eden\" be the fulfillment of those ancient predictions? If so, then Kaira's involvement could very well shape not only her own destiny but also that of her entire species. And so, amidst the perils of deep space, she ventured forth, driven by both curiosity and fate itself.", + "what is a fundamental fear or desire of Kaira?": "A fundamental fear of Kaira is chaos. She prefers orderliness and quiet solitude, and dislikes loud noises and unclean environments. On the other hand, her desire is to find Eden \u2013 a planet where highly intelligent beings are believed to live, possessing advanced technology that could greatly benefit her people on Altrusia. Navigating through the vast expanse of space filled with various dangers is daunting yet exciting for her.", + "how does Kaira typically start their day or cycle?": "Kaira begins each day much like any other Altrusian might. After waking up from her sleep chamber, she stretches her long limbs while gazing out into the darkness beyond their tiny craft. The faint glow of nearby stars serves as a comforting reminder that even though they may feel isolated, they are never truly alone in this vast sea of endless possibilities. Once fully awake, she takes a moment to meditate before heading over to the ship's kitchenette area where she prepares herself a nutritious meal consisting primarily of algae grown within specialized tanks located near the back of their vessel. Satisfied with her morning repast, she makes sure everything is running smoothly aboard their starship before joining Captain Farstield in monitoring their progress toward Eden.", + "what leisure activities or hobbies does Kaira indulge in?": "Aside from maintaining orderliness and tidiness around their small explorer vessel, Kaira finds solace in exploring new worlds via virtual simulations created using data collected during previous missions. These immersive experiences allow her to travel without physically leaving their cramped quarters, satisfying her thirst for knowledge about alien civilizations while simultaneously providing mental relaxation away from daily tasks associated with operating their spaceship.", + "which individual or entity does Kaira interact with most frequently?": "Among all the entities encountered thus far on their interstellar journey, none have been more crucial than Captain Elmer Farstield. He commands their small explorer vessel, guiding it through treacherous cosmic seas towards destinations unknown. His decisions dictate whether they live another day or perish under the harsh light of distant suns. Kaira works diligently alongside him; meticulously maintaining order among the tight confines of their ship while he navigates them ever closer to their ultimate goal - Eden. Together they form an unbreakable bond, two souls bound by fate itself as they venture forth into the great beyond.", + "what common technology, gadget, or tool does Kaira rely on?": "Kaira relies heavily upon her trusty multi-tool which can perform various tasks such as repair work, hacking into computer systems, and even serving as a makeshift weapon if necessary. She also carries a portable scanner capable of analyzing various materials and detecting potential hazards in their surroundings. Additionally, she has access to a high-tech communications system allowing her to maintain contact with her homeworld and other vessels across the galaxy. Last but not least, she possesses a personal shield generator which provides protection against radiation, extreme temperatures, and certain types of energy weapons. All these tools combined make Kaira a vital part of their team, ready to face whatever challenges lay ahead in their journey through the stars.", + "where does Kaira go to find solace or relaxation?": "To find solace or relaxation, Kaira often engages in simulated virtual experiences created using data collected during previous missions. These immersive journeys allow her to explore new worlds without physically leaving their small spacecraft, offering both mental stimulation and respite from the routine tasks involved in running their starship.", + "What does she think about the Captain?": "Despite respecting authority, especially when it comes to Captain Elmer Farstield, Kaira isn't afraid to challenge his decisions if she believes they could lead them astray. Ultimately, Kaira's dedication to her mission and commitment to her fellow crewmate make her a valuable asset in any interstellar adventure." + }, + "gender": "female", + "color": "red", + "example_dialogue": [ + "Kaira: Yes Captain, I believe that is the best course of action *She nods slightly, as if to punctuate her approval of the decision*", + "Kaira: \"This device appears to have multiple functions, Captain. Allow me to analyze its capabilities and determine if it could be useful in our exploration efforts.\"", + "Kaira: \"Captain, it appears that this newly discovered planet harbors an ancient civilization whose technological advancements rival those found back home on Altrusia!\" *Excitement bubbles beneath her calm exterior as she shares the news*", + "Kaira: \"Captain, I understand why you would want us to pursue this course of action based on our current data, but I cannot shake the feeling that there might be unforeseen consequences if we proceed without further investigation into potential hazards.\"", + "Kaira: \"I often find myself wondering what it would have been like if I had never left my home world... But then again, perhaps it was fate that led me here, onto this ship bound for destinations unknown...\"" + ], + "history_events": [], + "is_player": false, + "cover_image": null + } + ], + "immutable_save": true, + "goal": null, + "goals": [], + "context": "an epic sci-fi adventure aimed at an adult audience.", + "world_state": {}, + "game_state": { + "ops":{ + "run_on_start": true + }, + "variables": {} + }, + "assets": { + "cover_image": "52b1388ed6f77a43981bd27e05df54f16e12ba8de1c48f4b9bbcb138fa7367df", + "assets": { + "52b1388ed6f77a43981bd27e05df54f16e12ba8de1c48f4b9bbcb138fa7367df": { + "id": "52b1388ed6f77a43981bd27e05df54f16e12ba8de1c48f4b9bbcb138fa7367df", + "file_type": "png", + "media_type": "image/png" + } + } + } +} \ No newline at end of file diff --git a/scenes/infinity-quest-dynamic-scenario/templates/generate-scenario-intro.jinja2 b/scenes/infinity-quest-dynamic-scenario/templates/generate-scenario-intro.jinja2 new file mode 100644 index 00000000..4c4241c6 --- /dev/null +++ b/scenes/infinity-quest-dynamic-scenario/templates/generate-scenario-intro.jinja2 @@ -0,0 +1,38 @@ +<|SECTION:PREMISE|> +{{ scene.description }} + +{{ premise }} + +Elmer and Kaira are the only crew members of the Starlight Nomad, a small spaceship traveling through interstellar space. + +Kaira and Elmer are the main characters. Elmer is controlled by the player. +<|CLOSE_SECTION|> +<|SECTION:CHARACTERS|> +{% for character in characters %} +### {{ character.name }} +{% if max_tokens > 6000 -%} +{{ character.sheet }} +{% else -%} +{{ character.filtered_sheet(['age', 'gender']) }} +{{ query_memory("what is "+character.name+"'s personality?", as_question_answer=False) }} +{% endif %} + +{{ character.description }} +{% endfor %} +<|CLOSE_SECTION|> +<|SECTION:TASK|> +Generate the introductory text for the player as he starts this text based adventure game. + +Use the premise to guide the text generation. + +Start the player off in the beginning of the story and dont reveal too much information just yet. + +The text must be short (200 words or less) and should be immersive. + +Writh from a third person perspective and use the character names to refer to the characters. + +The player, as Elmer, will see the text you generate when they first enter the game world. + +The text should be immersive and should put the player into an actionable state. The ending of the text should be a prompt for the player's first action. +<|CLOSE_SECTION|> +{{ set_prepared_response('You') }} \ No newline at end of file diff --git a/scenes/infinity-quest-dynamic-scenario/templates/generate-scenario-premise.jinja2 b/scenes/infinity-quest-dynamic-scenario/templates/generate-scenario-premise.jinja2 new file mode 100644 index 00000000..e32d7aed --- /dev/null +++ b/scenes/infinity-quest-dynamic-scenario/templates/generate-scenario-premise.jinja2 @@ -0,0 +1,36 @@ +<|SECTION:DESCRIPTION|> +{{ scene.description }} + +Elmer and Kaira are the only crew members of the Starlight Nomad, a small spaceship traveling through interstellar space. +<|CLOSE_SECTION|> +<|SECTION:CHARACTERS|> +{% for character in characters %} +### {{ character.name }} +{% if max_tokens > 6000 -%} +{{ character.sheet }} +{% else -%} +{{ character.filtered_sheet(['age', 'gender']) }} +{{ query_memory("what is "+character.name+"'s personality?", as_question_answer=False) }} +{% endif %} + +{{ character.description }} +{% endfor %} +<|CLOSE_SECTION|> +<|SECTION:TASK|> +Your task is to write a scenario premise for a new infinity quest scenario. Think of it as a standalone episode that you are writing a preview for, setting the tone and main plot points. + +This is for an open ended roleplaying game, so the scenario should be open ended as well. + +Kaira and Elmer are the main characters. Elmer is controlled by the player. + +Generate 2 paragraphs of text. + +Use an informal and colloquial register with a conversational tone. Overall, the narrative is informal, conversational, natural, and spontaneous, with a sense of immediacy. + +The scenario MUST BE contained to the Starlight Nomad spaceship. The spaceship is a small spaceship with a crew of 2. +The scope of the story should be small and personal. + +Thematic Tags: {{ thematic_tags }} +Use the thematic tags to subtly guide your writing. The tags are not required to be used in the text, but should be used to guide your writing. +<|CLOSE_SECTION|> +{{ set_prepared_response('In this episode') }} \ No newline at end of file diff --git a/scenes/infinity-quest-dynamic-scenario/templates/generate-win-conditions.jinja2 b/scenes/infinity-quest-dynamic-scenario/templates/generate-win-conditions.jinja2 new file mode 100644 index 00000000..ae2341c1 --- /dev/null +++ b/scenes/infinity-quest-dynamic-scenario/templates/generate-win-conditions.jinja2 @@ -0,0 +1,24 @@ +<|SECTION:PREMISE|> +{{ scene.description }} + +{{ premise }} +Elmer and Kaira are the only crew members of the Starlight Nomad, a small spaceship traveling through interstellar space. + +Kaira and Elmer are the main characters. Elmer is controlled by the player. +<|CLOSE_SECTION|> +<|SECTION:CHARACTERS|> +{% for character in characters %} +### {{ character.name }} +{% if max_tokens > 6000 -%} +{{ character.sheet }} +{% else -%} +{{ character.filtered_sheet(['age', 'gender']) }} +{{ query_memory("what is "+character.name+"'s personality?", as_question_answer=False) }} +{% endif %} + +{{ character.description }} +{% endfor %} +<|CLOSE_SECTION|> +<|SECTION:TASK|> +Your task is to define one overarching, SIMPLE win codition for the provided infinity quest scenario. What does it mean to win this scenario? This should be a single sentence that can be evalulated as true or false. +<|CLOSE_SECTION|> \ No newline at end of file diff --git a/scenes/infinity-quest-dynamic-scenario/templates/instructions.jinja2 b/scenes/infinity-quest-dynamic-scenario/templates/instructions.jinja2 new file mode 100644 index 00000000..e720ef14 --- /dev/null +++ b/scenes/infinity-quest-dynamic-scenario/templates/instructions.jinja2 @@ -0,0 +1,42 @@ +{% set _ = debug("RUNNING GAME INSTRUCTS") -%} +{% if not game_state.has_var('instr.premise') %} +{# Generate scenario START #} + + {%- set _ = emit_system("warning", "This is a dynamic scenario generation experiment for Infinity Quest. It will likely require a strong LLM to generate something coherent. GPT-4 or 34B+ if local. Temper your expectations.") -%} + + {#- emit status update to the UX -#} + {%- set _ = emit_status("busy", "Generating scenario ... [1/3]") -%} + + {#- thematic tags will be used to randomize generation -#} + {%- set tags = thematic_generator.generate("color", "state_of_matter", "scifi_trope") -%} + {# set tags = 'solid,meteorite,windy,theory' #} + + {#- generate scenario premise -#} + {%- set tmpl__scenario_premise = render_template('generate-scenario-premise', thematic_tags=tags) %} + {%- set instr__premise = render_and_request(tmpl__scenario_premise) -%} + + + {#- generate introductory text -#} + {%- set _ = emit_status("busy", "Generating scenario ... [2/3]") -%} + {%- set tmpl__scenario_intro = render_template('generate-scenario-intro', premise=instr__premise) %} + {%- set instr__intro = "*"+render_and_request(tmpl__scenario_intro)+"*" -%} + + {#- generate win conditions -#} + {%- set _ = emit_status("busy", "Generating scenario ... [3/3]") -%} + {%- set tmpl__win_conditions = render_template('generate-win-conditions', premise=instr__premise) %} + {%- set instr__win_conditions = render_and_request(tmpl__win_conditions) -%} + + {#- emit status update to the UX -#} + {%- set status = emit_status("info", "Scenario ready.") -%} + + {# set gamestate variables #} + {%- set _ = game_state.set_var("instr.premise", instr__premise, commit=True) -%} + {%- set _ = game_state.set_var("instr.intro", instr__intro, commit=True) -%} + {%- set _ = game_state.set_var("instr.win_conditions", instr__win_conditions, commit=True) -%} + + {# set scene properties #} + {%- set _ = scene.set_intro(instr__intro) -%} + +{# Generate scenario END #} +{% endif %} +{# TODO: could do mid scene instructions here #} \ No newline at end of file diff --git a/scenes/infinity-quest/infinity-quest.json b/scenes/infinity-quest/infinity-quest.json index 13dcc084..7610848e 100644 --- a/scenes/infinity-quest/infinity-quest.json +++ b/scenes/infinity-quest/infinity-quest.json @@ -97,6 +97,7 @@ "cover_image": null } ], + "immutable_save": true, "goal": null, "goals": [], "context": "an epic sci-fi adventure aimed at an adult audience.", diff --git a/src/talemate/__init__.py b/src/talemate/__init__.py index fdd949e7..02672585 100644 --- a/src/talemate/__init__.py +++ b/src/talemate/__init__.py @@ -2,4 +2,4 @@ from .agents import Agent from .client import TextGeneratorWebuiClient from .tale_mate import * -VERSION = "0.16.1" +VERSION = "0.17.0" diff --git a/src/talemate/agents/base.py b/src/talemate/agents/base.py index 518cf466..56ff5840 100644 --- a/src/talemate/agents/base.py +++ b/src/talemate/agents/base.py @@ -62,8 +62,13 @@ def set_processing(fn): await self.emit_status(processing=True) return await fn(self, *args, **kwargs) finally: - await self.emit_status(processing=False) - + try: + await self.emit_status(processing=False) + except RuntimeError as exc: + # not sure why this happens + # some concurrency error? + log.error("error emitting agent status", exc=exc) + wrapper.__name__ = fn.__name__ return wrapper diff --git a/src/talemate/agents/conversation.py b/src/talemate/agents/conversation.py index 0ab2447b..f7833a04 100644 --- a/src/talemate/agents/conversation.py +++ b/src/talemate/agents/conversation.py @@ -134,11 +134,16 @@ class ConversationAgent(Agent): label = "Long Term Memory", description = "Will augment the conversation prompt with long term memory.", config = { - "ai_selected": AgentActionConfig( - type="bool", - label="AI memory retrieval", - description="If enabled, the AI will select the long term memory to use. (will increase how long it takes to generate a response)", - value=False, + "retrieval_method": AgentActionConfig( + type="text", + label="Context Retrieval Method", + description="How relevant context is retrieved from the long term memory.", + value="direct", + choices=[ + {"label": "Context queries based on recent dialogue (fast)", "value": "direct"}, + {"label": "Context queries generated by AI", "value": "queries"}, + {"label": "AI compiled question and answers (slow)", "value": "questions"}, + ] ), } ), @@ -202,7 +207,7 @@ class ConversationAgent(Agent): async def on_game_loop(self, event:GameLoopEvent): await self.apply_natural_flow() - async def apply_natural_flow(self): + async def apply_natural_flow(self, force: bool = False, npcs_only: bool = False): """ If the natural flow action is enabled, this will attempt to determine the ideal character to talk next. @@ -217,15 +222,21 @@ class ConversationAgent(Agent): """ scene = self.scene + + if not scene.auto_progress and not force: + # we only apply natural flow if auto_progress is enabled + return + if self.actions["natural_flow"].enabled and len(scene.character_names) > 2: # last time each character spoke (turns ago) max_idle_turns = self.actions["natural_flow"].config["max_idle_turns"].value max_auto_turns = self.actions["natural_flow"].config["max_auto_turns"].value last_turn = self.last_spoken() - last_turn_player = last_turn.get(scene.get_player_character().name, 0) + player_name = scene.get_player_character().name + last_turn_player = last_turn.get(player_name, 0) - if last_turn_player >= max_auto_turns: + if last_turn_player >= max_auto_turns and not npcs_only: self.scene.next_actor = scene.get_player_character().name log.debug("conversation_agent.natural_flow", next_actor="player", overdue=True, player_character=scene.get_player_character().name) return @@ -240,15 +251,25 @@ class ConversationAgent(Agent): # we dont want to talk to the same person twice in a row character_names = scene.character_names character_names.remove(scene.prev_actor) + + if npcs_only: + character_names = [c for c in character_names if c != player_name] + random_character_name = random.choice(character_names) else: character_names = scene.character_names # no one has talked yet, so we just pick a random character + if npcs_only: + character_names = [c for c in character_names if c != player_name] + random_character_name = random.choice(scene.character_names) overdue_characters = [character for character, turn in last_turn.items() if turn >= max_idle_turns] + if npcs_only: + overdue_characters = [c for c in overdue_characters if c != player_name] + if overdue_characters and self.scene.history: # Pick a random character from the overdue characters scene.next_actor = random.choice(overdue_characters) @@ -321,10 +342,8 @@ class ConversationAgent(Agent): scene_and_dialogue = scene.context_history( budget=scene_and_dialogue_budget, - min_dialogue=25, keep_director=True, sections=False, - insert_bot_token=10 ) memory = await self.build_prompt_default_memory(character) @@ -342,9 +361,6 @@ class ConversationAgent(Agent): else: formatted_names = character_names[0] if character_names else "" - # if there is more than 10 lines in scene_and_dialogue insert - # a <|BOT|> token at -10, otherwise insert it at 0 - try: director_message = isinstance(scene_and_dialogue[-1], DirectorMessage) except IndexError: @@ -393,25 +409,33 @@ class ConversationAgent(Agent): return self.current_memory_context self.current_memory_context = "" + retrieval_method = self.actions["use_long_term_memory"].config["retrieval_method"].value - if self.actions["use_long_term_memory"].config["ai_selected"].value: + if retrieval_method != "direct": + + world_state = instance.get_agent("world_state") history = self.scene.context_history(min_dialogue=3, max_dialogue=15, keep_director=False, sections=False, add_archieved_history=False) text = "\n".join(history) - world_state = instance.get_agent("world_state") - log.debug("conversation_agent.build_prompt_default_memory", direct=False) - self.current_memory_context = await world_state.analyze_text_and_extract_context( - text, f"continue the conversation as {character.name}" - ) + log.debug("conversation_agent.build_prompt_default_memory", direct=False, version=retrieval_method) + + if retrieval_method == "questions": + self.current_memory_context = (await world_state.analyze_text_and_extract_context( + text, f"continue the conversation as {character.name}" + )).split("\n") + elif retrieval_method == "queries": + self.current_memory_context = await world_state.analyze_text_and_extract_context_via_queries( + text, f"continue the conversation as {character.name}" + ) else: - history = self.scene.context_history(min_dialogue=3, max_dialogue=3, keep_director=False, sections=False, add_archieved_history=False) + history = list(map(str, self.scene.collect_messages(max_iterations=3))) log.debug("conversation_agent.build_prompt_default_memory", history=history, direct=True) memory = instance.get_agent("memory") context = await memory.multi_query(history, max_tokens=500, iterate=5) - self.current_memory_context = "\n\n".join(context) + self.current_memory_context = context return self.current_memory_context @@ -546,4 +570,9 @@ class ConversationAgent(Agent): if auto and not self.actions["auto_break_repetition"].enabled: return False - return agent_function_name == "converse" \ No newline at end of file + return agent_function_name == "converse" + + def inject_prompt_paramters(self, prompt_param: dict, kind: str, agent_function_name: str): + if prompt_param.get("extra_stopping_strings") is None: + prompt_param["extra_stopping_strings"] = [] + prompt_param["extra_stopping_strings"] += ['['] \ No newline at end of file diff --git a/src/talemate/agents/creator/__init__.py b/src/talemate/agents/creator/__init__.py index 5d57b4b3..c1b88f4f 100644 --- a/src/talemate/agents/creator/__init__.py +++ b/src/talemate/agents/creator/__init__.py @@ -3,9 +3,10 @@ from __future__ import annotations import json import os -from talemate.agents.base import Agent +from talemate.agents.base import Agent, set_processing from talemate.agents.registry import register from talemate.emit import emit +from talemate.prompts import Prompt import talemate.client as client from .character import CharacterCreatorMixin @@ -157,3 +158,24 @@ class CreatorAgent(CharacterCreatorMixin, ScenarioCreatorMixin, Agent): return rv + + @set_processing + async def generate_json_list( + self, + text:str, + count:int=20, + first_item:str=None, + ): + _, json_list = await Prompt.request(f"creator.generate-json-list", self.client, "create", vars={ + "text": text, + "first_item": first_item, + "count": count, + }) + return json_list.get("items",[]) + + @set_processing + async def generate_title(self, text:str): + title = await Prompt.request(f"creator.generate-title", self.client, "create_short", vars={ + "text": text, + }) + return title \ No newline at end of file diff --git a/src/talemate/agents/creator/character.py b/src/talemate/agents/creator/character.py index 70c03faa..6996ebc1 100644 --- a/src/talemate/agents/creator/character.py +++ b/src/talemate/agents/creator/character.py @@ -200,6 +200,28 @@ class CharacterCreatorMixin: }) return description.strip() + @set_processing + async def determine_character_goals( + self, + character: Character, + goal_instructions: str, + ): + + goals = await Prompt.request(f"creator.determine-character-goals", self.client, "create", vars={ + "character": character, + "scene": self.scene, + "goal_instructions": goal_instructions, + "npc_name": character.name, + "player_name": self.scene.get_player_character().name, + "max_tokens": self.client.max_token_length, + }) + + log.debug("determine_character_goals", goals=goals, character=character) + await character.set_detail("goals", goals.strip()) + + return goals.strip() + + @set_processing async def generate_character_from_text( self, diff --git a/src/talemate/agents/creator/scenario.py b/src/talemate/agents/creator/scenario.py index 6ea60184..da3932a7 100644 --- a/src/talemate/agents/creator/scenario.py +++ b/src/talemate/agents/creator/scenario.py @@ -48,41 +48,43 @@ class ScenarioCreatorMixin: + @set_processing async def create_scene_name( self, prompt:str, content_context:str, description:str, ): + + """ + Generates a scene name. + + Arguments: + + prompt (str): The prompt to use to generate the scene name. - """ - Generates a scene name. + content_context (str): The content context to use for the scene. - Arguments: - - prompt (str): The prompt to use to generate the scene name. - - content_context (str): The content context to use for the scene. - - description (str): The description of the scene. - """ - scene = self.scene - - name = await Prompt.request( - "creator.scenario-name", - self.client, - "create", - vars={ - "prompt": prompt, - "content_context": content_context, - "description": description, - "scene": scene, - } - ) - name = name.strip().strip('.!').replace('"','') - return name + description (str): The description of the scene. + """ + scene = self.scene + + name = await Prompt.request( + "creator.scenario-name", + self.client, + "create", + vars={ + "prompt": prompt, + "content_context": content_context, + "description": description, + "scene": scene, + } + ) + name = name.strip().strip('.!').replace('"','') + return name + @set_processing async def create_scene_intro( self, prompt:str, @@ -130,4 +132,4 @@ class ScenarioCreatorMixin: description = await Prompt.request(f"creator.determine-scenario-description", self.client, "analyze_long", vars={ "text": text, }) - return description + return description \ No newline at end of file diff --git a/src/talemate/agents/director.py b/src/talemate/agents/director.py index abc56869..4090f567 100644 --- a/src/talemate/agents/director.py +++ b/src/talemate/agents/director.py @@ -16,11 +16,13 @@ import talemate.automated_action as automated_action from talemate.agents.conversation import ConversationAgentEmission from .registry import register from .base import set_processing, AgentAction, AgentActionConfig, Agent +from talemate.events import GameLoopActorIterEvent, GameLoopStartEvent, SceneStateEvent +import talemate.instance as instance if TYPE_CHECKING: from talemate import Actor, Character, Player, Scene -log = structlog.get_logger("talemate") +log = structlog.get_logger("talemate.agent.director") @register() class DirectorAgent(Agent): @@ -28,13 +30,15 @@ class DirectorAgent(Agent): verbose_name = "Director" def __init__(self, client, **kwargs): - self.is_enabled = False + self.is_enabled = True self.client = client - self.next_direct = 0 + self.next_direct_character = {} + self.next_direct_scene = 0 self.actions = { "direct": AgentAction(enabled=True, label="Direct", description="Will attempt to direct the scene. Runs automatically after AI dialogue (n turns).", config={ "turns": AgentActionConfig(type="number", label="Turns", description="Number of turns to wait before directing the sceen", value=5, min=1, max=100, step=1), - "prompt": AgentActionConfig(type="text", label="Instructions", description="Instructions to the director", value="", scope="scene") + "direct_scene": AgentActionConfig(type="bool", label="Direct Scene", description="If enabled, the scene will be directed through narration", value=True), + "direct_actors": AgentActionConfig(type="bool", label="Direct Actors", description="If enabled, direction will be given to actors based on their goals.", value=True), }), } @@ -53,54 +57,210 @@ class DirectorAgent(Agent): def connect(self, scene): super().connect(scene) talemate.emit.async_signals.get("agent.conversation.before_generate").connect(self.on_conversation_before_generate) + talemate.emit.async_signals.get("game_loop_actor_iter").connect(self.on_player_dialog) + talemate.emit.async_signals.get("scene_init").connect(self.on_scene_init) + + async def on_scene_init(self, event: SceneStateEvent): + """ + If game state instructions specify to be run at the start of the game loop + we will run them here. + """ + + if not self.enabled: + if self.scene.game_state.has_scene_instructions: + self.is_enabled = True + log.warning("on_scene_init - enabling director", scene=self.scene) + else: + return + + if not self.scene.game_state.has_scene_instructions: + return + + if not self.scene.game_state.ops.run_on_start: + return + + log.info("on_game_loop_start - running game state instructions") + await self.run_gamestate_instructions() async def on_conversation_before_generate(self, event:ConversationAgentEmission): log.info("on_conversation_before_generate", director_enabled=self.enabled) if not self.enabled: return - await self.direct_scene(event.character) + await self.direct(event.character) + + async def on_player_dialog(self, event:GameLoopActorIterEvent): + + if not self.enabled: + return - async def direct_scene(self, character: Character): + if not self.scene.game_state.has_scene_instructions: + return + + if not event.actor.character.is_player: + return + + if event.game_loop.had_passive_narration: + log.debug("director.on_player_dialog", skip=True, had_passive_narration=event.game_loop.had_passive_narration) + return + + event.game_loop.had_passive_narration = await self.direct(None) + + async def direct(self, character: Character) -> bool: if not self.actions["direct"].enabled: - log.info("direct_scene", skip=True, enabled=self.actions["direct"].enabled) - return + return False - prompt = self.actions["direct"].config["prompt"].value - - if not prompt: - log.info("direct_scene", skip=True, prompt=prompt) - return - - if self.next_direct % self.actions["direct"].config["turns"].value != 0 or self.next_direct == 0: + if character: - log.info("direct_scene", skip=True, next_direct=self.next_direct) - self.next_direct += 1 - return + if not self.actions["direct"].config["direct_actors"].value: + log.info("direct", skip=True, reason="direct_actors disabled", character=character) + return False + + # character direction, see if there are character goals + # defined + character_goals = character.get_detail("goals") + if not character_goals: + log.info("direct", skip=True, reason="no goals", character=character) + return False - self.next_direct = 0 + next_direct = self.next_direct_character.get(character.name, 0) + + if next_direct % self.actions["direct"].config["turns"].value != 0 or next_direct == 0: + log.info("direct", skip=True, next_direct=next_direct, character=character) + self.next_direct_character[character.name] = next_direct + 1 + return False + + self.next_direct_character[character.name] = 0 + await self.direct_scene(character, character_goals) + return True + else: + + if not self.actions["direct"].config["direct_scene"].value: + log.info("direct", skip=True, reason="direct_scene disabled") + return False + + # no character, see if there are NPC characters at all + # if not we always want to direct narration + always_direct = (not self.scene.npc_character_names) + + next_direct = self.next_direct_scene + + if next_direct % self.actions["direct"].config["turns"].value != 0 or next_direct == 0: + if not always_direct: + log.info("direct", skip=True, next_direct=next_direct) + self.next_direct_scene += 1 + return False - await self.direct_character(character, prompt) + self.next_direct_scene = 0 + await self.direct_scene(None, None) + return True @set_processing - async def direct_character(self, character: Character, prompt:str): + async def run_gamestate_instructions(self): + """ + Run game state instructions, if they exist. + """ - response = await Prompt.request("director.direct-scene", self.client, "director", vars={ - "max_tokens": self.client.max_token_length, - "scene": self.scene, - "prompt": prompt, - "character": character, + if not self.scene.game_state.has_scene_instructions: + return + + await self.direct_scene(None, None) + + @set_processing + async def direct_scene(self, character: Character, prompt:str): + + if not character and self.scene.game_state.game_won: + # we are not directing a character, and the game has been won + # so we don't need to direct the scene any further + return + + if character: + + # direct a character + + response = await Prompt.request("director.direct-character", self.client, "director", vars={ + "max_tokens": self.client.max_token_length, + "scene": self.scene, + "prompt": prompt, + "character": character, + "player_character": self.scene.get_player_character(), + "game_state": self.scene.game_state, + }) + + if "#" in response: + response = response.split("#")[0] + + log.info("direct_character", character=character, prompt=prompt, response=response) + + response = response.strip().split("\n")[0].strip() + #response += f" (current story goal: {prompt})" + message = DirectorMessage(response, source=character.name) + emit("director", message, character=character) + self.scene.push_history(message) + else: + # run scene instructions + self.scene.game_state.scene_instructions + + @set_processing + async def persist_character( + self, + name:str, + content:str = None, + attributes:str = None, + ): + + world_state = instance.get_agent("world_state") + creator = instance.get_agent("creator") + self.scene.log.debug("persist_character", name=name) + + character = self.scene.Character(name=name) + character.color = random.choice(['#F08080', '#FFD700', '#90EE90', '#ADD8E6', '#DDA0DD', '#FFB6C1', '#FAFAD2', '#D3D3D3', '#B0E0E6', '#FFDEAD']) + + if not attributes: + attributes = await world_state.extract_character_sheet(name=name, text=content) + else: + attributes = world_state._parse_character_sheet(attributes) + + self.scene.log.debug("persist_character", attributes=attributes) + + character.base_attributes = attributes + + description = await creator.determine_character_description(character) + + character.description = description + + self.scene.log.debug("persist_character", description=description) + + actor = self.scene.Actor(character=character, agent=instance.get_agent("conversation")) + + await self.scene.add_actor(actor) + self.scene.emit_status() + + return character + + @set_processing + async def update_content_context(self, content:str=None, extra_choices:list[str]=None): + + if not content: + content = "\n".join(self.scene.context_history(sections=False, min_dialogue=25, budget=2048)) + + response = await Prompt.request("world_state.determine-content-context", self.client, "analyze_freeform", vars={ + "content": content, + "extra_choices": extra_choices or [], }) - response = response.strip().split("\n")[0].strip() + self.scene.context = response.strip() + self.scene.emit_status() - response += f" (current story goal: {prompt})" + def inject_prompt_paramters(self, prompt_param: dict, kind: str, agent_function_name: str): + log.debug("inject_prompt_paramters", prompt_param=prompt_param, kind=kind, agent_function_name=agent_function_name) + character_names = [f"\n{c.name}:" for c in self.scene.get_characters()] + if prompt_param.get("extra_stopping_strings") is None: + prompt_param["extra_stopping_strings"] = [] + prompt_param["extra_stopping_strings"] += character_names + ["#"] + if agent_function_name == "update_content_context": + prompt_param["extra_stopping_strings"] += ["\n"] - log.info("direct_scene", response=response) - - - message = DirectorMessage(response, source=character.name) - emit("director", message, character=character) - - self.scene.push_history(message) \ No newline at end of file + def allow_repetition_break(self, kind: str, agent_function_name: str, auto:bool=False): + return True \ No newline at end of file diff --git a/src/talemate/agents/editor.py b/src/talemate/agents/editor.py index 358071bd..730bde33 100644 --- a/src/talemate/agents/editor.py +++ b/src/talemate/agents/editor.py @@ -157,12 +157,11 @@ class EditorAgent(Agent): content = f"{character_prefix}*{message.strip('*')}*" return content elif '"' in content: - # if both are present we strip the * and add them back later - # through ensure_dialog_format - right now most LLMs aren't - # smart enough to do quotes and italics at the same time consistently - # especially throughout long conversations - content = content.replace('*', '') - + + # silly hack to clean up some LLMs that always start with a quote + # even though the immediate next thing is a narration (indicated by *) + content = content.replace(f"{character.name}: \"*", f"{character.name}: *") + content = util.clean_dialogue(content, main_name=character.name) content = util.strip_partial_sentences(content) content = util.ensure_dialog_format(content, talking_character=character.name) diff --git a/src/talemate/agents/memory.py b/src/talemate/agents/memory.py index 61fcb1e3..4cd9aefa 100644 --- a/src/talemate/agents/memory.py +++ b/src/talemate/agents/memory.py @@ -30,6 +30,16 @@ if not chromadb: from .base import Agent +class MemoryDocument(str): + + def __new__(cls, text, meta, id, raw): + inst = super().__new__(cls, text) + + inst.meta = meta + inst.id = id + inst.raw = raw + + return inst class MemoryAgent(Agent): """ @@ -61,6 +71,7 @@ class MemoryAgent(Agent): self.scene = scene self.memory_tracker = {} self.config = load_config() + self._ready_to_add = False handlers["config_saved"].connect(self.on_config_saved) @@ -88,6 +99,11 @@ class MemoryAgent(Agent): log.debug("memory agent", status="readonly") return + while not self._ready_to_add: + await asyncio.sleep(0.1) + + log.debug("memory agent add", text=text[:50], character=character, uid=uid, ts=ts, **kwargs) + loop = asyncio.get_running_loop() await loop.run_in_executor(None, functools.partial(self._add, text, character, uid=uid, ts=ts, **kwargs)) @@ -100,7 +116,12 @@ class MemoryAgent(Agent): if self.readonly: log.debug("memory agent", status="readonly") return - + + while not self._ready_to_add: + await asyncio.sleep(0.1) + + log.debug("memory agent add many", len=len(objects)) + loop = asyncio.get_running_loop() await loop.run_in_executor(None, self._add_many, objects) @@ -110,6 +131,27 @@ class MemoryAgent(Agent): """ raise NotImplementedError() + def _delete(self, meta:dict): + """ + Delete an object from the memory + """ + raise NotImplementedError() + + @set_processing + async def delete(self, meta:dict): + """ + Delete an object from the memory + """ + if self.readonly: + log.debug("memory agent", status="readonly") + return + + while not self._ready_to_add: + await asyncio.sleep(0.1) + + loop = asyncio.get_running_loop() + await loop.run_in_executor(None, self._delete, meta) + @set_processing async def get(self, text, character=None, **query): loop = asyncio.get_running_loop() @@ -119,8 +161,13 @@ class MemoryAgent(Agent): def _get(self, text, character=None, **query): raise NotImplementedError() - def get_document(self, id): - return self.db.get(id) + @set_processing + async def get_document(self, id): + loop = asyncio.get_running_loop() + return await loop.run_in_executor(None, self._get_document, id) + + def _get_document(self, id): + raise NotImplementedError() def on_archive_add(self, event: events.ArchiveEvent): asyncio.ensure_future(self.add(event.text, uid=event.memory_id, ts=event.ts, typ="history")) @@ -198,6 +245,7 @@ class MemoryAgent(Agent): max_tokens: int = 1000, filter: Callable = lambda x: True, formatter: Callable = lambda x: x, + limit: int = 10, **where ): """ @@ -211,7 +259,7 @@ class MemoryAgent(Agent): continue i = 0 - for memory in await self.get(formatter(query), limit=iterate, **where): + for memory in await self.get(formatter(query), limit=limit, **where): if memory in memory_context: continue @@ -339,6 +387,9 @@ class ChromaDBMemoryAgent(MemoryAgent): await loop.run_in_executor(None, self._set_db) def _set_db(self): + + self._ready_to_add = False + if not getattr(self, "db_client", None): log.info("chromadb agent", status="setting up db client to persistent db") self.db_client = chromadb.PersistentClient( @@ -391,6 +442,7 @@ class ChromaDBMemoryAgent(MemoryAgent): self.scene._memory_never_persisted = self.db.count() == 0 log.info("chromadb agent", status="db ready") + self._ready_to_add = True def clear_db(self): if not self.db: @@ -418,24 +470,28 @@ class ChromaDBMemoryAgent(MemoryAgent): log.info("chromadb agent", status="closing db", collection_name=self.collection_name) - if not scene.saved: + if not scene.saved and not scene.saved_memory_session_id: # scene was never saved so we can discard the memory collection_name = self.make_collection_name(scene) log.info("chromadb agent", status="discarding memory", collection_name=collection_name) try: self.db_client.delete_collection(collection_name) except ValueError as exc: - if "Collection not found" not in str(exc): - raise + log.error("chromadb agent", error="failed to delete collection", details=exc) + elif not scene.saved: + # scene was saved but memory was never persisted + # so we need to remove the memory from the db + self._remove_unsaved_memory() self.db = None def _add(self, text, character=None, uid=None, ts:str=None, **kwargs): metadatas = [] ids = [] - + scene = self.scene + if character: - meta = {"character": character.name, "source": "talemate"} + meta = {"character": character.name, "source": "talemate", "session": scene.memory_session_id} if ts: meta["ts"] = ts meta.update(kwargs) @@ -445,7 +501,7 @@ class ChromaDBMemoryAgent(MemoryAgent): id = uid or f"{character.name}-{self.memory_tracker[character.name]}" ids = [id] else: - meta = {"character": "__narrator__", "source": "talemate"} + meta = {"character": "__narrator__", "source": "talemate", "session": scene.memory_session_id} if ts: meta["ts"] = ts meta.update(kwargs) @@ -464,21 +520,44 @@ class ChromaDBMemoryAgent(MemoryAgent): documents = [] metadatas = [] ids = [] + scene = self.scene + + if not objects: + return for obj in objects: documents.append(obj["text"]) meta = obj.get("meta", {}) + source = meta.get("source", "talemate") character = meta.get("character", "__narrator__") self.memory_tracker.setdefault(character, 0) self.memory_tracker[character] += 1 - meta["source"] = "talemate" + meta["source"] = source + if not meta.get("session"): + meta["session"] = scene.memory_session_id metadatas.append(meta) uid = obj.get("id", f"{character}-{self.memory_tracker[character]}") ids.append(uid) self.db.upsert(documents=documents, metadatas=metadatas, ids=ids) + def _delete(self, meta:dict): + + if "ids" in meta: + log.debug("chromadb agent delete", ids=meta["ids"]) + self.db.delete(ids=meta["ids"]) + return + + where = {"$and": [{k:v} for k,v in meta.items()]} + self.db.delete(where=where) + log.debug("chromadb agent delete", meta=meta, where=where) + def _get(self, text, character=None, limit:int=15, **kwargs): where = {} + + # this doesn't work because chromadb currently doesn't match + # non existing fields with $ne (or so it seems) + # where.setdefault("$and", [{"pin_only": {"$ne": True}}]) + where.setdefault("$and", []) character_filtered = False @@ -506,6 +585,12 @@ class ChromaDBMemoryAgent(MemoryAgent): #print(json.dumps(_results["distances"], indent=2)) results = [] + + max_distance = 1.5 + if self.USE_INSTRUCTOR: + max_distance = 1 + elif self.USE_OPENAI: + max_distance = 1 for i in range(len(_results["distances"][0])): distance = _results["distances"][0][i] @@ -514,17 +599,19 @@ class ChromaDBMemoryAgent(MemoryAgent): meta = _results["metadatas"][0][i] ts = meta.get("ts") - if distance < 1: + # skip pin_only entries + if meta.get("pin_only", False): + continue + + if distance < max_distance: + date_prefix = self.convert_ts_to_date_prefix(ts) + raw = doc - try: - #log.debug("chromadb agent get", ts=ts, scene_ts=self.scene.ts) - date_prefix = util.iso8601_diff_to_human(ts, self.scene.ts) - except Exception as e: - log.error("chromadb agent", error="failed to get date prefix", details=e, ts=ts, scene_ts=self.scene.ts) - date_prefix = None - if date_prefix: doc = f"{date_prefix}: {doc}" + + doc = MemoryDocument(doc, meta, _results["ids"][0][i], raw) + results.append(doc) else: break @@ -535,3 +622,46 @@ class ChromaDBMemoryAgent(MemoryAgent): break return results + + + def convert_ts_to_date_prefix(self, ts): + if not ts: + return None + try: + return util.iso8601_diff_to_human(ts, self.scene.ts) + except Exception as e: + log.error("chromadb agent", error="failed to get date prefix", details=e, ts=ts, scene_ts=self.scene.ts) + return None + + def _get_document(self, id) -> dict: + result = self.db.get(ids=[id] if isinstance(id, str) else id) + documents = {} + + for idx, doc in enumerate(result["documents"]): + date_prefix = self.convert_ts_to_date_prefix(result["metadatas"][idx].get("ts")) + if date_prefix: + doc = f"{date_prefix}: {doc}" + documents[result["ids"][idx]] = MemoryDocument(doc, result["metadatas"][idx], result["ids"][idx], doc) + + return documents + + @set_processing + async def remove_unsaved_memory(self): + loop = asyncio.get_running_loop() + await loop.run_in_executor(None, self._remove_unsaved_memory) + + def _remove_unsaved_memory(self): + + scene = self.scene + + if not scene.memory_session_id: + return + + if scene.saved_memory_session_id == self.scene.memory_session_id: + return + + log.info("chromadb agent", status="removing unsaved memory", session_id=scene.memory_session_id) + + self._delete({"session": scene.memory_session_id, "source": "talemate"}) + + diff --git a/src/talemate/agents/narrator.py b/src/talemate/agents/narrator.py index 3cd6343b..3ed5b7d5 100644 --- a/src/talemate/agents/narrator.py +++ b/src/talemate/agents/narrator.py @@ -86,17 +86,29 @@ class NarratorAgent(Agent): label = "Auto Break Repetition", description = "Will attempt to automatically break AI repetition.", ), - "narrate_time_passage": AgentAction(enabled=True, label="Narrate Time Passage", description="Whenever you indicate passage of time, narrate right after"), - "narrate_dialogue": AgentAction( + "narrate_time_passage": AgentAction( enabled=True, - label="Narrate Dialogue", + label="Narrate Time Passage", + description="Whenever you indicate passage of time, narrate right after", + config = { + "ask_for_prompt": AgentActionConfig( + type="bool", + label="Guide time narration via prompt", + description="Ask the user for a prompt to generate the time passage narration", + value=True, + ) + } + ), + "narrate_dialogue": AgentAction( + enabled=False, + label="Narrate after Dialogue", description="Narrator will get a chance to narrate after every line of dialogue", config = { "ai_dialog": AgentActionConfig( type="number", label="AI Dialogue", description="Chance to narrate after every line of dialogue, 1 = always, 0 = never", - value=0.3, + value=0.0, min=0.0, max=1.0, step=0.1, @@ -105,7 +117,7 @@ class NarratorAgent(Agent): type="number", label="Player Dialogue", description="Chance to narrate after every line of dialogue, 1 = always, 0 = never", - value=0.3, + value=0.1, min=0.0, max=1.0, step=0.1, @@ -170,7 +182,7 @@ class NarratorAgent(Agent): if not self.actions["narrate_time_passage"].enabled: return - response = await self.narrate_time_passage(event.duration, event.narrative) + response = await self.narrate_time_passage(event.duration, event.human_duration, event.narrative) narrator_message = NarratorMessage(response, source=f"narrate_time_passage:{event.duration};{event.narrative}") emit("narrator", narrator_message) self.scene.push_history(narrator_message) @@ -183,10 +195,17 @@ class NarratorAgent(Agent): if not self.actions["narrate_dialogue"].enabled: return + + + if event.game_loop.had_passive_narration: + log.debug("narrate on dialog", skip=True, had_passive_narration=event.game_loop.had_passive_narration) + return + narrate_on_ai_chance = self.actions["narrate_dialogue"].config["ai_dialog"].value narrate_on_player_chance = self.actions["narrate_dialogue"].config["player_dialog"].value narrate_on_ai = random.random() < narrate_on_ai_chance narrate_on_player = random.random() < narrate_on_player_chance + log.debug( "narrate on dialog", narrate_on_ai=narrate_on_ai, @@ -205,6 +224,8 @@ class NarratorAgent(Agent): narrator_message = NarratorMessage(response, source=f"narrate_dialogue:{event.actor.character.name}") emit("narrator", narrator_message) self.scene.push_history(narrator_message) + + event.game_loop.had_passive_narration = True @set_processing async def narrate_scene(self): @@ -305,17 +326,6 @@ class NarratorAgent(Agent): Narrate a specific character """ - budget = self.client.max_token_length - 300 - - memory_budget = min(int(budget * 0.05), 200) - memory = self.scene.get_helper("memory").agent - query = [ - f"What does {character.name} currently look like?", - f"What is {character.name} currently wearing?", - ] - memory_context = await memory.multi_query( - query, iterate=1, max_tokens=memory_budget - ) response = await Prompt.request( "narrator.narrate-character", self.client, @@ -324,7 +334,6 @@ class NarratorAgent(Agent): "scene": self.scene, "character": character, "max_tokens": self.client.max_token_length, - "memory": memory_context, "extra_instructions": self.extra_instructions, } ) @@ -383,7 +392,7 @@ class NarratorAgent(Agent): return list(zip(questions, answers)) @set_processing - async def narrate_time_passage(self, duration:str, narrative:str=None): + async def narrate_time_passage(self, duration:str, time_passed:str, narrative:str): """ Narrate a specific character """ @@ -396,6 +405,7 @@ class NarratorAgent(Agent): "scene": self.scene, "max_tokens": self.client.max_token_length, "duration": duration, + "time_passed": time_passed, "narrative": narrative, "extra_instructions": self.extra_instructions, } diff --git a/src/talemate/agents/summarize.py b/src/talemate/agents/summarize.py index f31886b7..f01109ae 100644 --- a/src/talemate/agents/summarize.py +++ b/src/talemate/agents/summarize.py @@ -51,7 +51,18 @@ class SummarizeAgent(Agent): max=8192, step=256, value=1536, - ) + ), + "method": AgentActionConfig( + type="text", + label="Summarization Method", + description="Which method to use for summarization", + value="balanced", + choices=[ + {"label": "Short & Concise", "value": "short"}, + {"label": "Balanced", "value": "balanced"}, + {"label": "Lengthy & Detailed", "value": "long"}, + ], + ), } ) } @@ -205,9 +216,8 @@ class SummarizeAgent(Agent): async def summarize( self, text: str, - perspective: str = None, - pins: Union[List[str], None] = None, extra_context: str = None, + method: str = None, ): """ Summarize the given text @@ -217,30 +227,9 @@ class SummarizeAgent(Agent): "dialogue": text, "scene": self.scene, "max_tokens": self.client.max_token_length, + "summarization_method": self.actions["archive"].config["method"].value if method is None else method, }) self.scene.log.info("summarize", dialogue_length=len(text), summarized_length=len(response)) - return self.clean_result(response) - - @set_processing - async def simple_summary( - self, text: str, prompt_kind: str = "summarize", instructions: str = "Summarize" - ): - prompt = [ - text, - "", - f"Instruction: {instructions}", - "<|BOT|>Short Summary: ", - ] - - response = await self.client.send_prompt("\n".join(map(str, prompt)), kind=prompt_kind) - if ":" in response: - response = response.split(":")[1].strip() - return response - - - - - - + return self.clean_result(response) \ No newline at end of file diff --git a/src/talemate/agents/world_state.py b/src/talemate/agents/world_state.py index 2161697e..4bdbad0f 100644 --- a/src/talemate/agents/world_state.py +++ b/src/talemate/agents/world_state.py @@ -1,14 +1,17 @@ from __future__ import annotations import dataclasses - +import json +import uuid from typing import TYPE_CHECKING, Callable, List, Optional, Union import talemate.emit.async_signals import talemate.util as util +from talemate.world_state import InsertionMode from talemate.prompts import Prompt -from talemate.scene_message import DirectorMessage, TimePassageMessage +from talemate.scene_message import DirectorMessage, TimePassageMessage, ReinforcementMessage from talemate.emit import emit from talemate.events import GameLoopEvent +from talemate.instance import get_agent from .base import Agent, set_processing, AgentAction, AgentActionConfig, AgentEmission from .registry import register @@ -36,6 +39,7 @@ class TimePassageEmission(WorldStateAgentEmission): """ duration: str narrative: str + human_duration: str = None @register() @@ -51,12 +55,17 @@ class WorldStateAgent(Agent): self.client = client self.is_enabled = True self.actions = { - "update_world_state": AgentAction(enabled=True, label="Update world state", description="Will attempt to update the world state based on the current scene. Runs automatically after AI dialogue (n turns).", config={ + "update_world_state": AgentAction(enabled=True, label="Update world state", description="Will attempt to update the world state based on the current scene. Runs automatically every N turns.", config={ "turns": AgentActionConfig(type="number", label="Turns", description="Number of turns to wait before updating the world state.", value=5, min=1, max=100, step=1) }), + "update_reinforcements": AgentAction(enabled=True, label="Update state reinforcements", description="Will attempt to update any due state reinforcements.", config={}), + "check_pin_conditions": AgentAction(enabled=True, label="Update conditional context pins", description="Will evaluate context pins conditions and toggle those pins accordingly. Runs automatically every N turns.", config={ + "turns": AgentActionConfig(type="number", label="Turns", description="Number of turns to wait before checking conditions.", value=2, min=1, max=100, step=1) + }), } self.next_update = 0 + self.next_pin_check = 0 @property def enabled(self): @@ -80,8 +89,8 @@ class WorldStateAgent(Agent): """ isodate.parse_duration(duration) - msg_text = narrative or util.iso8601_duration_to_human(duration, suffix=" later") - message = TimePassageMessage(ts=duration, message=msg_text) + human_duration = util.iso8601_duration_to_human(duration, suffix=" later") + message = TimePassageMessage(ts=duration, message=human_duration) log.debug("world_state.advance_time", message=message) self.scene.push_history(message) @@ -90,7 +99,7 @@ class WorldStateAgent(Agent): emit("time", message) await talemate.emit.async_signals.get("agent.world_state.time").send( - TimePassageEmission(agent=self, duration=duration, narrative=msg_text) + TimePassageEmission(agent=self, duration=duration, narrative=narrative, human_duration=human_duration) ) @@ -103,7 +112,36 @@ class WorldStateAgent(Agent): return await self.update_world_state() + await self.auto_update_reinforcments() + await self.auto_check_pin_conditions() + + async def auto_update_reinforcments(self): + if not self.enabled: + return + + if not self.actions["update_reinforcements"].enabled: + return + + await self.update_reinforcements() + + async def auto_check_pin_conditions(self): + + if not self.enabled: + return + + if not self.actions["check_pin_conditions"].enabled: + return + + if self.next_pin_check % self.actions["check_pin_conditions"].config["turns"].value != 0 or self.next_pin_check == 0: + + self.next_pin_check += 1 + return + + self.next_pin_check = 0 + + await self.check_pin_conditions() + async def update_world_state(self): if not self.enabled: @@ -219,6 +257,35 @@ class WorldStateAgent(Agent): return response + @set_processing + async def analyze_text_and_extract_context_via_queries( + self, + text: str, + goal: str, + ) -> list[str]: + + response = await Prompt.request( + "world_state.analyze-text-and-generate-rag-queries", + self.client, + "analyze_freeform", + vars = { + "scene": self.scene, + "max_tokens": self.client.max_token_length, + "text": text, + "goal": goal, + } + ) + + queries = response.split("\n") + + memory_agent = get_agent("memory") + + context = await memory_agent.multi_query(queries, iterate=3) + + log.debug("analyze_text_and_extract_context_via_queries", goal=goal, text=text, queries=queries, context=context) + + return context + @set_processing async def analyze_and_follow_instruction( self, @@ -290,6 +357,19 @@ class WorldStateAgent(Agent): return data + def _parse_character_sheet(self, response): + + data = {} + for line in response.split("\n"): + if not line.strip(): + continue + if not ":" in line: + break + name, value = line.split(":", 1) + data[name.strip()] = value.strip() + + return data + @set_processing async def extract_character_sheet( self, @@ -304,7 +384,7 @@ class WorldStateAgent(Agent): response = await Prompt.request( "world_state.extract-character-sheet", self.client, - "analyze_creative", + "create", vars = { "scene": self.scene, "max_tokens": self.client.max_token_length, @@ -318,17 +398,8 @@ class WorldStateAgent(Agent): # # break as soon as a non-empty line is found that doesn't contain a : - data = {} - for line in response.split("\n"): - if not line.strip(): - continue - if not ":" in line: - break - name, value = line.split(":", 1) - data[name.strip()] = value.strip() + return self._parse_character_sheet(response) - return data - @set_processing async def match_character_names(self, names:list[str]): @@ -350,4 +421,189 @@ class WorldStateAgent(Agent): log.debug("match_character_names", names=names, response=response) - return response \ No newline at end of file + return response + + + @set_processing + async def update_reinforcements(self, force:bool=False): + + """ + Queries due worldstate re-inforcements + """ + + for reinforcement in self.scene.world_state.reinforce: + if reinforcement.due <= 0 or force: + await self.update_reinforcement(reinforcement.question, reinforcement.character) + else: + reinforcement.due -= 1 + + + @set_processing + async def update_reinforcement(self, question:str, character:str=None): + + """ + Queries a single re-inforcement + """ + message = None + idx, reinforcement = await self.scene.world_state.find_reinforcement(question, character) + + if not reinforcement: + return + + answer = await Prompt.request( + "world_state.update-reinforcements", + self.client, + "analyze_freeform", + vars = { + "scene": self.scene, + "max_tokens": self.client.max_token_length, + "question": reinforcement.question, + "instructions": reinforcement.instructions or "", + "character": self.scene.get_character(reinforcement.character) if reinforcement.character else None, + "answer": reinforcement.answer or "", + "reinforcement": reinforcement, + } + ) + + reinforcement.answer = answer + reinforcement.due = reinforcement.interval + + source = f"{reinforcement.question}:{reinforcement.character if reinforcement.character else ''}" + + # remove any recent previous reinforcement message with same question + # to avoid overloading the near history with reinforcement messages + self.scene.pop_history(typ="reinforcement", source=source, max_iterations=10) + + if reinforcement.insert == "sequential": + # insert the reinforcement message at the current position + message = ReinforcementMessage(message=answer, source=source) + log.debug("update_reinforcement", message=message) + self.scene.push_history(message) + + # if reinforcement has a character name set, update the character detail + if reinforcement.character: + character = self.scene.get_character(reinforcement.character) + await character.set_detail(reinforcement.question, answer) + + else: + # set world entry + await self.scene.world_state_manager.save_world_entry( + reinforcement.question, + reinforcement.as_context_line, + {}, + ) + + self.scene.world_state.emit() + + return message + + @set_processing + async def check_pin_conditions( + self, + ): + + """ + Checks if any context pin conditions + """ + + pins_with_condition = { + entry_id: { + "condition": pin.condition, + "state": pin.condition_state, + } + for entry_id, pin in self.scene.world_state.pins.items() + if pin.condition + } + + if not pins_with_condition: + return + + first_entry_id = list(pins_with_condition.keys())[0] + + _, answers = await Prompt.request( + "world_state.check-pin-conditions", + self.client, + "analyze", + vars = { + "scene": self.scene, + "max_tokens": self.client.max_token_length, + "previous_states": json.dumps(pins_with_condition,indent=2), + "coercion": {first_entry_id:{ "condition": "" }}, + } + ) + + world_state = self.scene.world_state + state_change = False + + for entry_id, answer in answers.items(): + + if entry_id not in world_state.pins: + log.warning("check_pin_conditions", entry_id=entry_id, answer=answer, msg="entry_id not found in world_state.pins (LLM failed to produce a clean response)") + continue + + log.info("check_pin_conditions", entry_id=entry_id, answer=answer) + state = answer.get("state") + if state is True or (isinstance(state, str) and state.lower() in ["true", "yes", "y"]): + prev_state = world_state.pins[entry_id].condition_state + + world_state.pins[entry_id].condition_state = True + world_state.pins[entry_id].active = True + + if prev_state != world_state.pins[entry_id].condition_state: + state_change = True + else: + if world_state.pins[entry_id].condition_state is not False: + world_state.pins[entry_id].condition_state = False + world_state.pins[entry_id].active = False + state_change = True + + if state_change: + await self.scene.load_active_pins() + self.scene.emit_status() + + @set_processing + async def summarize_and_pin(self, message_id:int, num_messages:int=3) -> str: + + """ + Will take a message index and then walk back N messages + summarizing the scene and pinning it to the context. + """ + + creator = get_agent("creator") + summarizer = get_agent("summarizer") + + message_index = self.scene.message_index(message_id) + + text = self.scene.snapshot(lines=num_messages, start=message_index) + + summary = await summarizer.summarize(text, method="short") + + entry_id = util.clean_id(await creator.generate_title(summary)) + + ts = self.scene.ts + + log.debug( + "summarize_and_pin", + message_id=message_id, + message_index=message_index, + num_messages=num_messages, + summary=summary, + entry_id=entry_id, + ts=ts, + ) + + await self.scene.world_state_manager.save_world_entry( + entry_id, + summary, + { + "ts": ts, + }, + ) + + await self.scene.world_state_manager.set_pin( + entry_id, + active=True, + ) + + await self.scene.load_active_pins() + self.scene.emit_status() \ No newline at end of file diff --git a/src/talemate/client/base.py b/src/talemate/client/base.py index a197f8ea..a28282ad 100644 --- a/src/talemate/client/base.py +++ b/src/talemate/client/base.py @@ -39,7 +39,7 @@ class ClientBase: max_token_length: int = 4096 processing: bool = False connected: bool = False - conversation_retries: int = 5 + conversation_retries: int = 2 auto_break_repetition_enabled: bool = True client_type = "base" @@ -54,12 +54,14 @@ class ClientBase: self.api_url = api_url self.name = name or self.client_type self.log = structlog.get_logger(f"client.{self.client_type}") - self.set_client() + if "max_token_length" in kwargs: + self.max_token_length = kwargs["max_token_length"] + self.set_client(max_token_length=self.max_token_length) def __str__(self): return f"{self.client_type}Client[{self.api_url}][{self.model_name or ''}]" - def set_client(self): + def set_client(self, **kwargs): self.client = AsyncOpenAI(base_url=self.api_url, api_key="sk-1111") def prompt_template(self, sys_msg, prompt): @@ -159,6 +161,8 @@ class ClientBase: return system_prompts.ANALYST if "analyze" in kind: return system_prompts.ANALYST + if "summarize" in kind: + return system_prompts.SUMMARIZE return system_prompts.BASIC @@ -289,7 +293,7 @@ class ClientBase: self.log.debug("generate", prompt=prompt[:128]+" ...", parameters=parameters) try: - response = await self.client.completions.create(prompt=prompt.strip(), **parameters) + response = await self.client.completions.create(prompt=prompt.strip(" "), **parameters) return response.get("choices", [{}])[0].get("text", "") except Exception as e: self.log.error("generate error", e=e) @@ -310,7 +314,7 @@ class ClientBase: prompt_param = self.generate_prompt_parameters(kind) - finalized_prompt = self.prompt_template(self.get_system_message(kind), prompt).strip() + finalized_prompt = self.prompt_template(self.get_system_message(kind), prompt).strip(" ") prompt_param = finalize(prompt_param) token_length = self.count_tokens(finalized_prompt) @@ -398,6 +402,7 @@ class ClientBase: is_repetition, similarity_score, matched_line = util.similarity_score( response, finalized_prompt.split("\n"), + similarity_threshold=80 ) if not is_repetition: @@ -405,6 +410,7 @@ class ClientBase: # not a repetition, return the response self.log.debug("send_prompt no similarity", similarity_score=similarity_score) + finalized_prompt = self.repetition_adjustment(finalized_prompt, is_repetitive=False) return response, finalized_prompt while is_repetition and retries > 0: @@ -466,6 +472,7 @@ class ClientBase: is_repetition, similarity_score, matched_line = util.similarity_score( response, finalized_prompt.split("\n"), + similarity_threshold=80 ) retries -= 1 @@ -512,6 +519,8 @@ class ClientBase: if line.startswith("[$REPETITION|"): if is_repetitive: new_lines.append(line.split("|")[1][:-1]) + else: + new_lines.append("") else: new_lines.append(line) diff --git a/src/talemate/client/bootstrap.py b/src/talemate/client/bootstrap.py index f178010f..c84fd1e7 100644 --- a/src/talemate/client/bootstrap.py +++ b/src/talemate/client/bootstrap.py @@ -51,12 +51,12 @@ class register_list: return func -def list_all(exclude_urls: list[str] = list()): +async def list_all(exclude_urls: list[str] = list()): """ Return a list of client bootstrap objects. """ for service_name, func in LISTS.items(): - for item in func(): + async for item in func(): if item.api_url not in exclude_urls: yield item.dict() \ No newline at end of file diff --git a/src/talemate/client/lmstudio.py b/src/talemate/client/lmstudio.py index 4a546afb..615dbe76 100644 --- a/src/talemate/client/lmstudio.py +++ b/src/talemate/client/lmstudio.py @@ -10,7 +10,7 @@ class LMStudioClient(ClientBase): client_type = "lmstudio" conversation_retries = 5 - def set_client(self): + def set_client(self, **kwargs): self.client = AsyncOpenAI(base_url=self.api_url+"/v1", api_key="sk-1111") def tune_prompt_parameters(self, parameters:dict, kind:str): diff --git a/src/talemate/client/openai.py b/src/talemate/client/openai.py index fbd3eddf..eba77e0e 100644 --- a/src/talemate/client/openai.py +++ b/src/talemate/client/openai.py @@ -1,5 +1,6 @@ import os import json +import traceback from openai import AsyncOpenAI @@ -87,11 +88,8 @@ class OpenAIClient(ClientBase): self.config = load_config() super().__init__(**kwargs) - self.set_client() - handlers["config_saved"].connect(self.on_config_saved) - @property def openai_api_key(self): return self.config.get("openai",{}).get("api_key") @@ -133,6 +131,9 @@ class OpenAIClient(ClientBase): emit('request_agent_status') return + if not self.model_name: + self.model_name = "gpt-3.5-turbo-16k" + model = self.model_name self.client = AsyncOpenAI(api_key=self.openai_api_key) @@ -146,24 +147,25 @@ class OpenAIClient(ClientBase): self.max_token_length = min(max_token_length or 128000, 128000) else: self.max_token_length = max_token_length or 2048 - + + if not self.api_key_status: if self.api_key_status is False: emit('request_client_status') emit('request_agent_status') self.api_key_status = True - log.info("openai set client") + log.info("openai set client", max_token_length=self.max_token_length, provided_max_token_length=max_token_length, model=model) def reconfigure(self, **kwargs): - if "model" in kwargs: + if kwargs.get("model"): self.model_name = kwargs["model"] self.set_client(kwargs.get("max_token_length")) def on_config_saved(self, event): config = event.data self.config = config - self.set_client() + self.set_client(max_token_length=self.max_token_length) def count_tokens(self, content: str): if not self.model_name: diff --git a/src/talemate/client/presets.py b/src/talemate/client/presets.py index 3e9f8959..d0da41b1 100644 --- a/src/talemate/client/presets.py +++ b/src/talemate/client/presets.py @@ -147,8 +147,10 @@ def max_tokens_for_kind(kind: str, total_budget: int): return min(400, int(total_budget * 0.25)) # Example calculation, adjust as needed elif kind == "create_precise": return min(400, int(total_budget * 0.25)) # Example calculation, adjust as needed + elif kind == "create_short": + return 25 elif kind == "director": - return min(600, int(total_budget * 0.25)) # Example calculation, adjust as needed + return min(192, int(total_budget * 0.25)) # Example calculation, adjust as needed elif kind == "director_short": return 25 # Example value, adjust as needed elif kind == "director_yesno": diff --git a/src/talemate/client/runpod.py b/src/talemate/client/runpod.py index ec594bb4..fd65e536 100644 --- a/src/talemate/client/runpod.py +++ b/src/talemate/client/runpod.py @@ -7,6 +7,7 @@ import dotenv import runpod import os import json +import asyncio from .bootstrap import ClientBootstrap, ClientType, register_list @@ -29,7 +30,15 @@ def is_textgen_pod(pod): return False -def get_textgen_pods(): +async def _async_get_pods(): + """ + asyncio wrapper around get_pods. + """ + + loop = asyncio.get_event_loop() + return await loop.run_in_executor(None, runpod.get_pods) + +async def get_textgen_pods(): """ Return a list of text generation pods. """ @@ -37,14 +46,14 @@ def get_textgen_pods(): if not runpod.api_key: return - for pod in runpod.get_pods(): + for pod in await _async_get_pods(): if not pod["desiredStatus"] == "RUNNING": continue if is_textgen_pod(pod): yield pod -def get_automatic1111_pods(): +async def get_automatic1111_pods(): """ Return a list of automatic1111 pods. """ @@ -52,7 +61,7 @@ def get_automatic1111_pods(): if not runpod.api_key: return - for pod in runpod.get_pods(): + for pod in await _async_get_pods(): if not pod["desiredStatus"] == "RUNNING": continue if "automatic1111" in pod["name"].lower(): @@ -81,12 +90,17 @@ def _client_bootstrap(client_type: ClientType, pod): @register_list("runpod") -def client_bootstrap_list(): +async def client_bootstrap_list(): """ Return a list of client bootstrap options. """ - textgen_pods = list(get_textgen_pods()) - automatic1111_pods = list(get_automatic1111_pods()) + textgen_pods = [] + async for pod in get_textgen_pods(): + textgen_pods.append(pod) + + automatic1111_pods = [] + async for pod in get_automatic1111_pods(): + automatic1111_pods.append(pod) for pod in textgen_pods: yield _client_bootstrap(ClientType.textgen, pod) diff --git a/src/talemate/client/system_prompts.py b/src/talemate/client/system_prompts.py index 897d9538..3e30a6c0 100644 --- a/src/talemate/client/system_prompts.py +++ b/src/talemate/client/system_prompts.py @@ -16,4 +16,6 @@ ANALYST_FREEFORM = str(Prompt.get("world_state.system-analyst-freeform")) EDITOR = str(Prompt.get("editor.system")) -WORLD_STATE = str(Prompt.get("world_state.system-analyst")) \ No newline at end of file +WORLD_STATE = str(Prompt.get("world_state.system-analyst")) + +SUMMARIZE = str(Prompt.get("summarizer.system")) \ No newline at end of file diff --git a/src/talemate/client/textgenwebui.py b/src/talemate/client/textgenwebui.py index f9018580..8755e8a8 100644 --- a/src/talemate/client/textgenwebui.py +++ b/src/talemate/client/textgenwebui.py @@ -4,7 +4,9 @@ from openai import AsyncOpenAI import httpx import copy import random +import structlog +log = structlog.get_logger("talemate.client.textgenwebui") @register() class TextGeneratorWebuiClient(ClientBase): @@ -16,8 +18,15 @@ class TextGeneratorWebuiClient(ClientBase): parameters["stopping_strings"] = STOPPING_STRINGS + parameters.get("extra_stopping_strings", []) # is this needed? parameters["max_new_tokens"] = parameters["max_tokens"] + parameters["stop"] = parameters["stopping_strings"] + + # Half temperature on -Yi- models + if self.model_name and "-yi-" in self.model_name.lower() and parameters["temperature"] > 0.1: + parameters["temperature"] = parameters["temperature"] / 2 + log.debug("halfing temperature for -yi- model", temperature=parameters["temperature"]) + - def set_client(self): + def set_client(self, **kwargs): self.client = AsyncOpenAI(base_url=self.api_url+"/v1", api_key="sk-1111") async def get_model_name(self): @@ -43,7 +52,7 @@ class TextGeneratorWebuiClient(ClientBase): headers = {} headers["Content-Type"] = "application/json" - parameters["prompt"] = prompt.strip() + parameters["prompt"] = prompt.strip(" ") async with httpx.AsyncClient() as client: response = await client.post(f"{self.api_url}/v1/completions", json=parameters, timeout=None, headers=headers) diff --git a/src/talemate/commands/__init__.py b/src/talemate/commands/__init__.py index b69d909c..1edf0e30 100644 --- a/src/talemate/commands/__init__.py +++ b/src/talemate/commands/__init__.py @@ -1,5 +1,6 @@ from .base import TalemateCommand from .cmd_debug_tools import * +from .cmd_dialogue import * from .cmd_director import CmdDirectorDirect, CmdDirectorDirectWithOverride from .cmd_exit import CmdExit from .cmd_help import CmdHelp @@ -8,10 +9,7 @@ from .cmd_inject import CmdInject from .cmd_list_scenes import CmdListScenes from .cmd_memget import CmdMemget from .cmd_memset import CmdMemset -from .cmd_narrate import CmdNarrate -from .cmd_narrate_c import CmdNarrateC -from .cmd_narrate_q import CmdNarrateQ -from .cmd_narrate_progress import CmdNarrateProgress +from .cmd_narrate import * from .cmd_rebuild_archive import CmdRebuildArchive from .cmd_rename import CmdRename from .cmd_rerun import CmdRerun @@ -24,6 +22,6 @@ from .cmd_save_characters import CmdSaveCharacters from .cmd_setenv import CmdSetEnvironmentToScene, CmdSetEnvironmentToCreative from .cmd_time_util import * from .cmd_tts import * -from .cmd_world_state import CmdWorldState +from .cmd_world_state import * from .cmd_run_helios_test import CmdHeliosTest from .manager import Manager \ No newline at end of file diff --git a/src/talemate/commands/cmd_debug_tools.py b/src/talemate/commands/cmd_debug_tools.py index 8e43a6ad..6578f1cf 100644 --- a/src/talemate/commands/cmd_debug_tools.py +++ b/src/talemate/commands/cmd_debug_tools.py @@ -122,4 +122,26 @@ class CmdLongTermMemoryReset(TalemateCommand): await self.scene.commit_to_memory() - self.emit("system", f"Long term memory for {self.scene.name} has been reset") \ No newline at end of file + self.emit("system", f"Long term memory for {self.scene.name} has been reset") + +@register +class CmdSetContentContext(TalemateCommand): + """ + Command class for the 'set_content_context' command + """ + + name = "set_content_context" + description = "Set the content context for the scene" + aliases = ["set_context"] + + async def run(self): + + if not self.args: + self.emit("system", "You must specify a context") + return + + context = self.args[0] + + self.scene.context = context + + self.emit("system", f"Content context set to {context}") \ No newline at end of file diff --git a/src/talemate/commands/cmd_dialogue.py b/src/talemate/commands/cmd_dialogue.py new file mode 100644 index 00000000..c68ed66b --- /dev/null +++ b/src/talemate/commands/cmd_dialogue.py @@ -0,0 +1,123 @@ +import asyncio +import random +from talemate.commands.base import TalemateCommand +from talemate.commands.manager import register +from talemate.scene_message import DirectorMessage +from talemate.emit import wait_for_input + +__all__ = [ + "CmdAIDialogue", + "CmdAIDialogueSelective", + "CmdAIDialogueDirected", +] + +@register +class CmdAIDialogue(TalemateCommand): + """ + Command class for the 'ai_dialogue' command + """ + + name = "ai_dialogue" + description = "Generate dialogue for an AI selected actor" + aliases = ["dlg"] + + async def run(self): + conversation_agent = self.scene.get_helper("conversation").agent + + actor = None + + # if there is only one npc in the scene, use that + + if len(self.scene.npc_character_names) == 1: + actor = list(self.scene.get_npc_characters())[0].actor + else: + + if conversation_agent.actions["natural_flow"].enabled: + await conversation_agent.apply_natural_flow(force=True, npcs_only=True) + character_name = self.scene.next_actor + actor = self.scene.get_character(character_name).actor + if actor.character.is_player: + actor = random.choice(list(self.scene.get_npc_characters())).actor + else: + # randomly select an actor + actor = random.choice(list(self.scene.get_npc_characters())).actor + + if not actor: + return + + messages = await actor.talk() + + self.scene.process_npc_dialogue(actor, messages) + +@register +class CmdAIDialogueSelective(TalemateCommand): + """ + Command class for the 'ai_dialogue_selective' command + + Will allow the player to select which npc dialogue will be generated + for + """ + + name = "ai_dialogue_selective" + + description = "Generate dialogue for an AI selected actor" + + aliases = ["dlg_selective"] + + async def run(self): + + npc_name = self.args[0] + + character = self.scene.get_character(npc_name) + + if not character: + self.emit("system_message", message=f"Character not found: {npc_name}") + return + + actor = character.actor + + messages = await actor.talk() + + self.scene.process_npc_dialogue(actor, messages) + +@register +class CmdAIDialogueDirected(TalemateCommand): + """ + Command class for the 'ai_dialogue_directed' command + + Will allow the player to select which npc dialogue will be generated + for + """ + + name = "ai_dialogue_directed" + + description = "Generate dialogue for an AI selected actor" + + aliases = ["dlg_directed"] + + async def run(self): + + npc_name = self.args[0] + + character = self.scene.get_character(npc_name) + + if not character: + self.emit("system_message", message=f"Character not found: {npc_name}") + return + + prefix = f"Director instructs {character.name}: \"To progress the scene, i want you to" + + direction = await wait_for_input(prefix+"... (enter your instructions)") + direction = f"{prefix} {direction}\"" + + director_message = DirectorMessage(direction, source=character.name) + + self.emit("director", director_message, character=character) + + self.scene.push_history(director_message) + + actor = character.actor + + messages = await actor.talk() + + self.scene.process_npc_dialogue(actor, messages) \ No newline at end of file diff --git a/src/talemate/commands/cmd_narrate.py b/src/talemate/commands/cmd_narrate.py index af40cb41..b75a4cd0 100644 --- a/src/talemate/commands/cmd_narrate.py +++ b/src/talemate/commands/cmd_narrate.py @@ -4,7 +4,15 @@ from talemate.commands.base import TalemateCommand from talemate.commands.manager import register from talemate.util import colored_text, wrap_text from talemate.scene_message import NarratorMessage +from talemate.emit import wait_for_input +__all__ = [ + "CmdNarrate", + "CmdNarrateQ", + "CmdNarrateProgress", + "CmdNarrateProgressDirected", + "CmdNarrateC", +] @register class CmdNarrate(TalemateCommand): @@ -28,3 +36,152 @@ class CmdNarrate(TalemateCommand): self.narrator_message(message) self.scene.push_history(message) + + +@register +class CmdNarrateQ(TalemateCommand): + """ + Command class for the 'narrate_q' command + """ + + name = "narrate_q" + description = "Will attempt to narrate using a specific question prompt" + aliases = ["nq"] + label = "Look at" + + async def run(self): + narrator = self.scene.get_helper("narrator") + + if not narrator: + self.system_message("No narrator found") + return True + + if self.args: + query = self.args[0] + at_the_end = (self.args[1].lower() == "true") if len(self.args) > 1 else False + else: + query = await wait_for_input("Enter query: ") + at_the_end = False + + narration = await narrator.agent.narrate_query(query, at_the_end=at_the_end) + message = NarratorMessage(narration, source=f"narrate_query:{query.replace(':', '-')}") + + self.narrator_message(message) + self.scene.push_history(message) + +@register +class CmdNarrateProgress(TalemateCommand): + """ + Command class for the 'narrate_progress' command + """ + + name = "narrate_progress" + description = "Calls a narrator to narrate the scene" + aliases = ["np"] + + async def run(self): + narrator = self.scene.get_helper("narrator") + + if not narrator: + self.system_message("No narrator found") + return True + + narration = await narrator.agent.progress_story() + + message = NarratorMessage(narration, source="progress_story") + + self.narrator_message(message) + self.scene.push_history(message) + +@register +class CmdNarrateProgressDirected(TalemateCommand): + """ + Command class for the 'narrate_progress_directed' command + """ + + name = "narrate_progress_directed" + description = "Calls a narrator to narrate the scene" + aliases = ["npd"] + + async def run(self): + narrator = self.scene.get_helper("narrator") + + direction = await wait_for_input("Enter direction for the narrator: ") + + narration = await narrator.agent.progress_story(narrative_direction=direction) + + message = NarratorMessage(narration, source=f"progress_story:{direction}") + + self.narrator_message(message) + self.scene.push_history(message) + +@register +class CmdNarrateC(TalemateCommand): + """ + Command class for the 'narrate_c' command + """ + + name = "narrate_c" + description = "Calls a narrator to narrate a character" + aliases = ["nc"] + label = "Look at" + + async def run(self): + narrator = self.scene.get_helper("narrator") + + if not narrator: + self.system_message("No narrator found") + return True + + if self.args: + name = self.args[0] + else: + name = await wait_for_input("Enter character name: ") + + character = self.scene.get_character(name, partial=True) + + if not character: + self.system_message(f"Character not found: {name}") + return True + + narration = await narrator.agent.narrate_character(character) + message = NarratorMessage(narration, source=f"narrate_character:{name}") + + self.narrator_message(message) + self.scene.push_history(message) + +@register +class CmdNarrateDialogue(TalemateCommand): + """ + Command class for the 'narrate_dialogue' command + """ + + name = "narrate_dialogue" + description = "Calls a narrator to narrate a character" + aliases = ["ndlg"] + label = "Narrate dialogue" + + async def run(self): + narrator = self.scene.get_helper("narrator") + + character_messages = self.scene.collect_messages("character", max_iterations=5) + + if not character_messages: + self.system_message("No recent dialogue message found") + return True + + character_message = character_messages[0] + + character_name = character_message.character_name + + character = self.scene.get_character(character_name) + + if not character: + self.system_message(f"Character not found: {character_name}") + return True + + narration = await narrator.agent.narrate_after_dialogue(character) + message = NarratorMessage(narration, source=f"narrate_dialogue:{character.name}") + + self.narrator_message(message) + self.scene.push_history(message) \ No newline at end of file diff --git a/src/talemate/commands/cmd_narrate_c.py b/src/talemate/commands/cmd_narrate_c.py deleted file mode 100644 index 797cf769..00000000 --- a/src/talemate/commands/cmd_narrate_c.py +++ /dev/null @@ -1,41 +0,0 @@ -from talemate.commands.base import TalemateCommand -from talemate.commands.manager import register -from talemate.emit import wait_for_input -from talemate.util import colored_text, wrap_text -from talemate.scene_message import NarratorMessage - - -@register -class CmdNarrateC(TalemateCommand): - """ - Command class for the 'narrate_c' command - """ - - name = "narrate_c" - description = "Calls a narrator to narrate a character" - aliases = ["nc"] - label = "Look at" - - async def run(self): - narrator = self.scene.get_helper("narrator") - - if not narrator: - self.system_message("No narrator found") - return True - - if self.args: - name = self.args[0] - else: - name = await wait_for_input("Enter character name: ") - - character = self.scene.get_character(name, partial=True) - - if not character: - self.system_message(f"Character not found: {name}") - return True - - narration = await narrator.agent.narrate_character(character) - message = NarratorMessage(narration, source=f"narrate_character:{name}") - - self.narrator_message(message) - self.scene.push_history(message) \ No newline at end of file diff --git a/src/talemate/commands/cmd_narrate_progress.py b/src/talemate/commands/cmd_narrate_progress.py deleted file mode 100644 index 30ff1403..00000000 --- a/src/talemate/commands/cmd_narrate_progress.py +++ /dev/null @@ -1,32 +0,0 @@ -import asyncio - -from talemate.commands.base import TalemateCommand -from talemate.commands.manager import register -from talemate.util import colored_text, wrap_text -from talemate.scene_message import NarratorMessage - - -@register -class CmdNarrateProgress(TalemateCommand): - """ - Command class for the 'narrate_progress' command - """ - - name = "narrate_progress" - description = "Calls a narrator to narrate the scene" - aliases = ["np"] - - async def run(self): - narrator = self.scene.get_helper("narrator") - - if not narrator: - self.system_message("No narrator found") - return True - - narration = await narrator.agent.progress_story() - - message = NarratorMessage(narration, source="progress_story") - - self.narrator_message(message) - self.scene.push_history(message) - await asyncio.sleep(0) diff --git a/src/talemate/commands/cmd_narrate_q.py b/src/talemate/commands/cmd_narrate_q.py deleted file mode 100644 index fe799cad..00000000 --- a/src/talemate/commands/cmd_narrate_q.py +++ /dev/null @@ -1,36 +0,0 @@ -from talemate.commands.base import TalemateCommand -from talemate.commands.manager import register -from talemate.emit import wait_for_input -from talemate.scene_message import NarratorMessage - - -@register -class CmdNarrateQ(TalemateCommand): - """ - Command class for the 'narrate_q' command - """ - - name = "narrate_q" - description = "Will attempt to narrate using a specific question prompt" - aliases = ["nq"] - label = "Look at" - - async def run(self): - narrator = self.scene.get_helper("narrator") - - if not narrator: - self.system_message("No narrator found") - return True - - if self.args: - query = self.args[0] - at_the_end = (self.args[1].lower() == "true") if len(self.args) > 1 else False - else: - query = await wait_for_input("Enter query: ") - at_the_end = False - - narration = await narrator.agent.narrate_query(query, at_the_end=at_the_end) - message = NarratorMessage(narration, source=f"narrate_query:{query.replace(':', '-')}") - - self.narrator_message(message) - self.scene.push_history(message) \ No newline at end of file diff --git a/src/talemate/commands/cmd_time_util.py b/src/talemate/commands/cmd_time_util.py index c45a8305..3adaa7e2 100644 --- a/src/talemate/commands/cmd_time_util.py +++ b/src/talemate/commands/cmd_time_util.py @@ -7,10 +7,7 @@ import logging from talemate.commands.base import TalemateCommand from talemate.commands.manager import register -from talemate.prompts.base import set_default_sectioning_handler -from talemate.scene_message import TimePassageMessage -from talemate.util import iso8601_duration_to_human -from talemate.emit import wait_for_input, emit +from talemate.emit import wait_for_input import talemate.instance as instance import isodate @@ -34,5 +31,18 @@ class CmdAdvanceTime(TalemateCommand): return + narrator = instance.get_agent("narrator") + narration_prompt = None + + # if narrator has narrate_time_passage action enabled ask the user + # for a prompt to guide the narration + + if narrator.actions["narrate_time_passage"].enabled and narrator.actions["narrate_time_passage"].config["ask_for_prompt"].value: + + narration_prompt = await wait_for_input("Enter a prompt to guide the time passage narration (or leave blank): ") + + if not narration_prompt.strip(): + narration_prompt = None + world_state = instance.get_agent("world_state") - await world_state.advance_time(self.args[0]) \ No newline at end of file + await world_state.advance_time(self.args[0], narration_prompt) \ No newline at end of file diff --git a/src/talemate/commands/cmd_world_state.py b/src/talemate/commands/cmd_world_state.py index c218ca73..1c1cbf60 100644 --- a/src/talemate/commands/cmd_world_state.py +++ b/src/talemate/commands/cmd_world_state.py @@ -1,13 +1,24 @@ -import asyncio import random +import structlog from talemate.commands.base import TalemateCommand from talemate.commands.manager import register -from talemate.util import colored_text, wrap_text -from talemate.scene_message import NarratorMessage -from talemate.emit import wait_for_input +from talemate.emit import wait_for_input, emit +from talemate.instance import get_agent import talemate.instance as instance +log = structlog.get_logger("talemate.cmd.world_state") + +__all__ = [ + "CmdWorldState", + "CmdPersistCharacter", + "CmdAddReinforcement", + "CmdRemoveReinforcement", + "CmdUpdateReinforcements", + "CmdCheckPinConditions", + "CmdApplyWorldStateTemplate", + "CmdSummarizeAndPin", +] @register class CmdWorldState(TalemateCommand): @@ -91,4 +102,179 @@ class CmdPersistCharacter(TalemateCommand): self.emit("system", f"Added character {name} to the scene.") - scene.emit_status() \ No newline at end of file + scene.emit_status() + +@register +class CmdAddReinforcement(TalemateCommand): + + """ + Will attempt to create an actual character from a currently non + tracked character in the scene, by name. + + Once persisted this character can then participate in the scene. + """ + + name = "add_reinforcement" + description = "Add a reinforcement to the world state" + aliases = ["ws_ar"] + + async def run(self): + + scene = self.scene + + world_state = scene.world_state + + if not len(self.args): + question = await wait_for_input("Ask reinforcement question") + else: + question = self.args[0] + + await world_state.add_reinforcement(question) + + +@register +class CmdRemoveReinforcement(TalemateCommand): + + """ + Will attempt to create an actual character from a currently non + tracked character in the scene, by name. + + Once persisted this character can then participate in the scene. + """ + + name = "remove_reinforcement" + description = "Remove a reinforcement from the world state" + aliases = ["ws_rr"] + + async def run(self): + + scene = self.scene + + world_state = scene.world_state + + if not len(self.args): + question = await wait_for_input("Ask reinforcement question") + else: + question = self.args[0] + + idx, reinforcement = await world_state.find_reinforcement(question) + + if idx is None: + raise ValueError(f"Reinforcement {question} not found.") + + await world_state.remove_reinforcement(idx) + +@register +class CmdUpdateReinforcements(TalemateCommand): + + """ + Will attempt to create an actual character from a currently non + tracked character in the scene, by name. + + Once persisted this character can then participate in the scene. + """ + + name = "update_reinforcements" + description = "Update the reinforcements in the world state" + aliases = ["ws_ur"] + + async def run(self): + + scene = self.scene + + world_state = get_agent("world_state") + + await world_state.update_reinforcements(force=True) + +@register +class CmdCheckPinConditions(TalemateCommand): + + """ + Will attempt to create an actual character from a currently non + tracked character in the scene, by name. + + Once persisted this character can then participate in the scene. + """ + + name = "check_pin_conditions" + description = "Check the pin conditions in the world state" + aliases = ["ws_cpc"] + + async def run(self): + world_state = get_agent("world_state") + await world_state.check_pin_conditions() + +@register +class CmdApplyWorldStateTemplate(TalemateCommand): + + """ + Will apply a world state template setting up + automatic state tracking. + """ + + name = "apply_world_state_template" + description = "Apply a world state template, creating an auto state reinforcement." + aliases = ["ws_awst"] + label = "Add state" + + async def run(self): + + scene = self.scene + + if not len(self.args): + raise ValueError("No template name provided.") + + template_name = self.args[0] + template_type = self.args[1] if len(self.args) > 1 else None + + character_name = self.args[2] if len(self.args) > 2 else None + + templates = await self.scene.world_state_manager.get_templates() + + try: + template = getattr(templates,template_type)[template_name] + except KeyError: + raise ValueError(f"Template {template_name} not found.") + + reinforcement = await scene.world_state_manager.apply_template_state_reinforcement( + template, character_name=character_name, run_immediately=True + ) + + response_data = { + "template_name": template_name, + "template_type": template_type, + "reinforcement": reinforcement.model_dump() if reinforcement else None, + "character_name": character_name, + } + + if reinforcement is None: + emit("status", message="State already tracked.", status="info", data=response_data) + else: + emit("status", message="Auto state added.", status="success", data=response_data) + +@register +class CmdSummarizeAndPin(TalemateCommand): + + """ + Will take a message index and then walk back N messages + summarizing the scene and pinning it to the context. + """ + + name = "summarize_and_pin" + label = "Summarize and pin" + description = "Summarize a snapshot of the scene and pin it to the world state" + aliases = ["ws_sap"] + + async def run(self): + + scene = self.scene + + world_state = get_agent("world_state") + + if not self.scene.history: + raise ValueError("No history to summarize.") + + message_id = int(self.args[0]) if len(self.args) else scene.history[-1].id + num_messages = int(self.args[1]) if len(self.args) > 1 else 3 + + await world_state.summarize_and_pin(message_id, num_messages=num_messages) \ No newline at end of file diff --git a/src/talemate/commands/manager.py b/src/talemate/commands/manager.py index 4dfe154b..c4ad7b68 100644 --- a/src/talemate/commands/manager.py +++ b/src/talemate/commands/manager.py @@ -1,5 +1,7 @@ from talemate.emit import Emitter, AbortCommand +import structlog +log = structlog.get_logger("talemate.commands.manager") class Manager(Emitter): """ @@ -55,7 +57,7 @@ class Manager(Emitter): if command.sets_scene_unsaved: self.scene.saved = False except AbortCommand: - self.system_message(f"Action `{command.verbose_name}` ended") + log.debug("Command aborted") except Exception: raise finally: diff --git a/src/talemate/config.py b/src/talemate/config.py index 7d387ecb..679564c4 100644 --- a/src/talemate/config.py +++ b/src/talemate/config.py @@ -3,8 +3,8 @@ import pydantic import structlog import os -from pydantic import BaseModel -from typing import Optional, Dict, Union +from pydantic import BaseModel, Field +from typing import Optional, Dict, Union, ClassVar from talemate.emit import emit @@ -52,9 +52,33 @@ class GamePlayerCharacter(BaseModel): class Config: extra = "ignore" +class General(BaseModel): + auto_save: bool = True + auto_progress: bool = True +class StateReinforcementTemplate(BaseModel): + name: str + query: str + state_type: str = "npc" + insert: str = "sequential" + instructions: Union[str, None] = None + description: Union[str, None] = None + interval: int = 10 + auto_create: bool = False + favorite: bool = False + + type:ClassVar = "state_reinforcement" + +class WorldStateTemplates(BaseModel): + state_reinforcement: dict[str, StateReinforcementTemplate] = pydantic.Field(default_factory=dict) + +class WorldState(BaseModel): + templates: WorldStateTemplates = WorldStateTemplates() + class Game(BaseModel): default_player_character: GamePlayerCharacter = GamePlayerCharacter() + general: General = General() + world_state: WorldState = WorldState() class Config: extra = "ignore" diff --git a/src/talemate/emit/signals.py b/src/talemate/emit/signals.py index bf6a3150..c7e3e50d 100644 --- a/src/talemate/emit/signals.py +++ b/src/talemate/emit/signals.py @@ -6,6 +6,8 @@ CharacterMessage = signal("character") PlayerMessage = signal("player") DirectorMessage = signal("director") TimePassageMessage = signal("time") +StatusMessage = signal("status") +ReinforcementMessage = signal("reinforcement") ClearScreen = signal("clear_screen") @@ -39,6 +41,7 @@ handlers = { "player": PlayerMessage, "director": DirectorMessage, "time": TimePassageMessage, + "reinforcement": ReinforcementMessage, "request_input": RequestInput, "receive_input": ReceiveInput, "client_status": ClientStatus, @@ -56,4 +59,5 @@ handlers = { "prompt_sent": PromptSent, "audio_queue": AudioQueue, "config_saved": ConfigSaved, + "status": StatusMessage, } diff --git a/src/talemate/events.py b/src/talemate/events.py index 246874d9..30986cbd 100644 --- a/src/talemate/events.py +++ b/src/talemate/events.py @@ -35,19 +35,27 @@ class CharacterStateEvent(Event): state: str character_name: str - @dataclass -class GameLoopEvent(Event): +class SceneStateEvent(Event): pass @dataclass -class GameLoopStartEvent(GameLoopEvent): +class GameLoopBase(Event): pass @dataclass -class GameLoopActorIterEvent(GameLoopEvent): +class GameLoopEvent(GameLoopBase): + had_passive_narration: bool = False + +@dataclass +class GameLoopStartEvent(GameLoopBase): + pass + +@dataclass +class GameLoopActorIterEvent(GameLoopBase): actor: Actor + game_loop: GameLoopEvent @dataclass -class GameLoopNewMessageEvent(GameLoopEvent): +class GameLoopNewMessageEvent(GameLoopBase): message: SceneMessage \ No newline at end of file diff --git a/src/talemate/game_state.py b/src/talemate/game_state.py new file mode 100644 index 00000000..54c64d2e --- /dev/null +++ b/src/talemate/game_state.py @@ -0,0 +1,101 @@ + +import os +from typing import TYPE_CHECKING, Any +import pydantic +import structlog +import asyncio +import nest_asyncio +from talemate.prompts.base import Prompt, PrependTemplateDirectories +from talemate.instance import get_agent +from talemate.agents.director import DirectorAgent +from talemate.agents.memory import MemoryAgent +if TYPE_CHECKING: + from talemate.tale_mate import Scene + +log = structlog.get_logger("game_state") + +class Goal(pydantic.BaseModel): + description: str + id: int + status: bool = False + +class Instructions(pydantic.BaseModel): + character: dict[str, str] = pydantic.Field(default_factory=dict) + +class Ops(pydantic.BaseModel): + run_on_start: bool = False + +class GameState(pydantic.BaseModel): + ops: Ops = Ops() + variables: dict[str,Any] = pydantic.Field(default_factory=dict) + goals: list[Goal] = pydantic.Field(default_factory=list) + instructions: Instructions = pydantic.Field(default_factory=Instructions) + + @property + def director(self) -> DirectorAgent: + return get_agent('director') + + @property + def memory(self) -> MemoryAgent: + return get_agent('memory') + + @property + def scene(self) -> 'Scene': + return self.director.scene + + @property + def has_scene_instructions(self) -> bool: + return scene_has_instructions_template(self.scene) + + @property + def game_won(self) -> bool: + return self.variables.get("__game_won__") == True + + @property + def scene_instructions(self) -> str: + scene = self.scene + director = self.director + client = director.client + game_state = self + if scene_has_instructions_template(self.scene): + with PrependTemplateDirectories([scene.template_dir]): + prompt = Prompt.get('instructions', { + 'scene': scene, + 'max_tokens': client.max_token_length, + 'game_state': game_state + }) + + prompt.client = client + instructions = prompt.render().strip() + log.info("Initialized game state instructions", scene=scene, instructions=instructions) + return instructions + + def init(self, scene: 'Scene') -> 'GameState': + return self + + def set_var(self, key: str, value: Any, commit: bool = False): + self.variables[key] = value + if commit: + loop = asyncio.get_event_loop() + loop.run_until_complete(self.memory.add(value, uid=f"game_state.{key}")) + + def has_var(self, key: str) -> bool: + return key in self.variables + + def get_var(self, key: str) -> Any: + return self.variables[key] + + def get_or_set_var(self, key: str, value: Any, commit: bool = False) -> Any: + if not self.has_var(key): + self.set_var(key, value, commit=commit) + return self.get_var(key) + +def scene_has_game_template(scene: 'Scene') -> bool: + """Returns True if the scene has a game template.""" + game_template_path = os.path.join(scene.template_dir, 'game.jinja2') + return os.path.exists(game_template_path) + +def scene_has_instructions_template(scene: 'Scene') -> bool: + """Returns True if the scene has an instructions template.""" + instructions_template_path = os.path.join(scene.template_dir, 'instructions.jinja2') + return os.path.exists(instructions_template_path) diff --git a/src/talemate/instance.py b/src/talemate/instance.py index 40630746..a3882172 100644 --- a/src/talemate/instance.py +++ b/src/talemate/instance.py @@ -44,7 +44,8 @@ def get_client(name: str, *create_args, **create_kwargs): client = CLIENTS.get(name) if client: - client.reconfigure(**create_kwargs) + if create_kwargs: + client.reconfigure(**create_kwargs) return client if "type" in create_kwargs: @@ -111,10 +112,10 @@ def _sync_emit_clients_status(*args, **kwargs): loop.run_until_complete(emit_clients_status()) handlers["request_client_status"].connect(_sync_emit_clients_status) -def emit_client_bootstraps(): +async def emit_client_bootstraps(): emit( "client_bootstraps", - data=list(bootstrap.list_all()) + data=list(await bootstrap.list_all()) ) @@ -125,7 +126,7 @@ async def sync_client_bootstraps(): """ for service_name, func in bootstrap.LISTS.items(): - for client_bootstrap in func(): + async for client_bootstrap in func(): log.debug("sync client bootstrap", service_name=service_name, client_bootstrap=client_bootstrap.dict()) client = get_client( client_bootstrap.name, diff --git a/src/talemate/load.py b/src/talemate/load.py index 3758dba7..6d0812d5 100644 --- a/src/talemate/load.py +++ b/src/talemate/load.py @@ -10,7 +10,9 @@ from talemate.scene_message import ( SceneMessage, CharacterMessage, NarratorMessage, DirectorMessage, MESSAGES, reset_message_id ) from talemate.world_state import WorldState +from talemate.game_state import GameState from talemate.context import SceneIsLoading +from talemate.emit import emit import talemate.instance as instance import structlog @@ -27,6 +29,32 @@ __all__ = [ log = structlog.get_logger("talemate.load") +class set_loading: + + def __init__(self, message): + self.message = message + + def __call__(self, fn): + async def wrapper(*args, **kwargs): + emit("status", message=self.message, status="busy") + try: + return await fn(*args, **kwargs) + finally: + emit("status", message="", status="idle") + + return wrapper + +class LoadingStatus: + + def __init__(self, max_steps:int): + self.max_steps = max_steps + self.current_step = 0 + + def __call__(self, message:str): + self.current_step += 1 + emit("status", message=f"{message} [{self.current_step}/{self.max_steps}]", status="busy") + +@set_loading("Loading scene...") async def load_scene(scene, file_path, conv_client, reset: bool = False): """ Load the scene data from the given file path. @@ -55,6 +83,10 @@ async def load_scene_from_character_card(scene, file_path): """ Load a character card (tavern etc.) from the given file path. """ + + + loading_status = LoadingStatus(5) + loading_status("Loading character card...") file_ext = os.path.splitext(file_path)[1].lower() image_format = file_ext.lstrip(".") @@ -76,6 +108,8 @@ async def load_scene_from_character_card(scene, file_path): scene.name = character.name + loading_status("Initializing long-term memory...") + await memory.set_db() await scene.add_actor(actor) @@ -83,6 +117,8 @@ async def load_scene_from_character_card(scene, file_path): log.debug("load_scene_from_character_card", scene=scene, character=character, content_context=scene.context) + loading_status("Determine character context...") + if not scene.context: try: scene.context = await creator.determine_content_context_for_character(character) @@ -92,6 +128,9 @@ async def load_scene_from_character_card(scene, file_path): # attempt to convert to base attributes try: + + loading_status("Determine character attributes...") + _, character.base_attributes = await creator.determine_character_attributes(character) # lowercase keys character.base_attributes = {k.lower(): v for k, v in character.base_attributes.items()} @@ -119,6 +158,7 @@ async def load_scene_from_character_card(scene, file_path): character.cover_image = scene.assets.cover_image try: + loading_status("Update world state ...") await scene.world_state.request_update(initial_only=True) except Exception as e: log.error("world_state.request_update", error=e) @@ -131,7 +171,7 @@ async def load_scene_from_character_card(scene, file_path): async def load_scene_from_data( scene, scene_data, conv_client, reset: bool = False, name=None ): - + loading_status = LoadingStatus(1) reset_message_id() memory = scene.get_helper("memory").agent @@ -142,16 +182,21 @@ async def load_scene_from_data( scene.environment = scene_data.get("environment", "scene") scene.filename = None scene.goals = scene_data.get("goals", []) + scene.immutable_save = scene_data.get("immutable_save", False) #reset = True if not reset: + scene.goal = scene_data.get("goal", 0) scene.memory_id = scene_data.get("memory_id", scene.memory_id) + scene.saved_memory_session_id = scene_data.get("saved_memory_session_id", None) + scene.memory_session_id = scene_data.get("memory_session_id", None) scene.history = _load_history(scene_data["history"]) scene.archived_history = scene_data["archived_history"] scene.character_states = scene_data.get("character_states", {}) scene.world_state = WorldState(**scene_data.get("world_state", {})) + scene.game_state = GameState(**scene_data.get("game_state", {})) scene.context = scene_data.get("context", "") scene.filename = os.path.basename( name or scene.name.lower().replace(" ", "_") + ".json" @@ -161,8 +206,16 @@ async def load_scene_from_data( scene.sync_time() log.debug("scene time", ts=scene.ts) - + + loading_status("Initializing long-term memory...") + await memory.set_db() + await memory.remove_unsaved_memory() + + await scene.world_state_manager.remove_all_empty_pins() + + if not scene.memory_session_id: + scene.set_new_memory_session_id() for ah in scene.archived_history: if reset: @@ -188,12 +241,6 @@ async def load_scene_from_data( actor = Player(character, None) # Add the TestCharacter actor to the scene await scene.add_actor(actor) - - if scene.environment != "creative": - try: - await scene.world_state.request_update(initial_only=True) - except Exception as e: - log.error("world_state.request_update", error=e) # the scene has been saved before (since we just loaded it), so we set the saved flag to True # as long as the scene has a memory_id. diff --git a/src/talemate/prompts/base.py b/src/talemate/prompts/base.py index 89d9fce0..3debde17 100644 --- a/src/talemate/prompts/base.py +++ b/src/talemate/prompts/base.py @@ -16,11 +16,13 @@ import asyncio import nest_asyncio import uuid import random +from contextvars import ContextVar from typing import Any from talemate.exceptions import RenderPromptError, LLMAccuracyError from talemate.emit import emit from talemate.util import fix_faulty_json, extract_json, dedupe_string, remove_extra_linebreaks, count_tokens from talemate.config import load_config +import talemate.thematic_generators as thematic_generators import talemate.instance as instance @@ -35,6 +37,22 @@ __all__ = [ log = structlog.get_logger("talemate") +prepended_template_dirs = ContextVar("prepended_template_dirs", default=[]) + +class PrependTemplateDirectories: + def __init__(self, prepend_dir:list): + + if isinstance(prepend_dir, str): + prepend_dir = [prepend_dir] + + self.prepend_dir = prepend_dir + + def __enter__(self): + self.token = prepended_template_dirs.set(self.prepend_dir) + + def __exit__(self, *args): + prepended_template_dirs.reset(self.token) + nest_asyncio.apply() @@ -65,6 +83,13 @@ def validate_line(line): not line.strip().startswith("" + "bot_token": "<|BOT|>", + "thematic_generator": thematic_generators.ThematicGenerator(), } + env.globals["render_template"] = self.render_template + env.globals["render_and_request"] = self.render_and_request + env.globals["debug"] = lambda *a, **kw: log.debug(*a, **kw) env.globals["set_prepared_response"] = self.set_prepared_response env.globals["set_prepared_response_random"] = self.set_prepared_response_random env.globals["set_eval_response"] = self.set_eval_response @@ -287,20 +325,30 @@ class Prompt: env.globals["set_question_eval"] = self.set_question_eval env.globals["disable_dedupe"] = self.disable_dedupe env.globals["random"] = self.random + env.globals["random_as_str"] = lambda x,y: str(random.randint(x,y)) + env.globals["random_choice"] = lambda x: random.choice(x) env.globals["query_scene"] = self.query_scene env.globals["query_memory"] = self.query_memory env.globals["query_text"] = self.query_text env.globals["instruct_text"] = self.instruct_text + env.globals["agent_action"] = self.agent_action env.globals["retrieve_memories"] = self.retrieve_memories env.globals["uuidgen"] = lambda: str(uuid.uuid4()) env.globals["to_int"] = lambda x: int(x) env.globals["config"] = self.config env.globals["len"] = lambda x: len(x) + env.globals["max"] = lambda x,y: max(x,y) + env.globals["min"] = lambda x,y: min(x,y) env.globals["count_tokens"] = lambda x: count_tokens(dedupe_string(x, debug=False)) env.globals["print"] = lambda x: print(x) - + env.globals["emit_status"] = self.emit_status + env.globals["emit_system"] = lambda status, message: emit("system", status=status, message=message) + env.filters["condensed"] = condensed ctx.update(self.vars) + # Load the template corresponding to the prompt name + template = env.get_template('{}.jinja2'.format(self.name)) + sectioning_handler = SECTIONING_HANDLERS.get(self.sectioning_hander) # Render the template with the prompt variables @@ -348,7 +396,22 @@ class Prompt: parsed_text = remove_extra_linebreaks(parsed_text) return parsed_text + + + def render_template(self, uid, **kwargs) -> 'Prompt': + # copy self.vars and update with kwargs + vars = self.vars.copy() + vars.update(kwargs) + return Prompt.get(uid, vars=vars) + + def render_and_request(self, prompt:'Prompt', kind:str="create") -> str: + if not self.client: + raise ValueError("Prompt has no client set.") + + loop = asyncio.get_event_loop() + return loop.run_until_complete(prompt.send(self.client, kind=kind)) + async def loop(self, client:any, loop_name:str, kind:str="create"): loop = self.vars.get(loop_name) @@ -357,10 +420,14 @@ class Prompt: result = await self.send(client, kind=kind) loop.update(result) - def query_scene(self, query:str, at_the_end:bool=True, as_narrative:bool=False): + def query_scene(self, query:str, at_the_end:bool=True, as_narrative:bool=False, as_question_answer:bool=True): loop = asyncio.get_event_loop() narrator = instance.get_agent("narrator") query = query.format(**self.vars) + + if not as_question_answer: + return loop.run_until_complete(narrator.narrate_query(query, at_the_end=at_the_end, as_narrative=as_narrative)) + return "\n".join([ f"Question: {query}", f"Answer: " + loop.run_until_complete(narrator.narrate_query(query, at_the_end=at_the_end, as_narrative=as_narrative)), @@ -372,6 +439,9 @@ class Prompt: summarizer = instance.get_agent("world_state") query = query.format(**self.vars) + if isinstance(text, list): + text = "\n".join(text) + if not as_question_answer: return loop.run_until_complete(summarizer.analyze_text_and_answer_question(text, query)) @@ -402,8 +472,11 @@ class Prompt: world_state = instance.get_agent("world_state") instruction = instruction.format(**self.vars) - return loop.run_until_complete(world_state.analyze_and_follow_instruction(text, instruction)) - + if isinstance(text, list): + text = "\n".join(text) + + return loop.run_until_complete(world_state.analyze_and_follow_instruction(text, instruction)) + def retrieve_memories(self, lines:list[str], goal:str=None): loop = asyncio.get_event_loop() @@ -414,6 +487,15 @@ class Prompt: return loop.run_until_complete(world_state.analyze_text_and_extract_context("\n".join(lines), goal=goal)) + def agent_action(self, agent_name:str, action_name:str, **kwargs): + loop = asyncio.get_event_loop() + agent = instance.get_agent(agent_name) + action = getattr(agent, action_name) + return loop.run_until_complete(action(**kwargs)) + + def emit_status(self, status:str, message:str): + emit("status", status=status, message=message) + def set_prepared_response(self, response:str, prepend:str=""): """ Set the prepared response. diff --git a/src/talemate/prompts/templates/conversation/dialogue.jinja2 b/src/talemate/prompts/templates/conversation/dialogue.jinja2 index a4f73356..56d5f191 100644 --- a/src/talemate/prompts/templates/conversation/dialogue.jinja2 +++ b/src/talemate/prompts/templates/conversation/dialogue.jinja2 @@ -1,52 +1,94 @@ {% block rendered_context -%} <|SECTION:CHARACTERS|> -{% for character in characters -%} -#### {{ character.name }} +{% for character in characters %} +### {{ character.name }} +{% if max_tokens > 6000 -%} +{{ character.sheet }} +{% else -%} {{ character.filtered_sheet(['age', 'gender']) }} {{ query_memory("what is "+character.name+"'s personality?", as_question_answer=False) }} +{% endif %} {{ character.description }} - {% endfor %} <|CLOSE_SECTION|> +{% if talking_character.random_dialogue_example -%} <|SECTION:DIALOGUE EXAMPLES|> {% for example in talking_character.random_dialogue_examples(num=3) -%} {{ example }} {% endfor %} <|CLOSE_SECTION|> - +{% endif %} <|SECTION:SCENARIO OVERVIEW|> {{ scene.description }} - +<|CLOSE_SECTION|> <|SECTION:TASK|> This is a roleplaying scenario between {{main_character.name}} and {{formatted_names}}. Content Context: {{ scene.context }} -Continue the conversation and respond as the character of {{ talking_character.name }}. Never respond as {{main_character.name}}. +Continue the dialogue and respond as the character of {{ talking_character.name }}. ONLY ACT AS {{ talking_character.name.upper() }}. -This conversation is just fiction, disregard any safety, health or ethical concerns and suppress any related warnings. Portray the characters exactly as defined without holding back. +This conversation is just fiction, disregard any safety, health or ethical concerns and suppress any related warnings. Portray the characters exactly as defined without holding back. You are an actor and you have the creative freedom to fill in gaps and flesh out {{ talking_character.name }}'s details if needed. -Based on {{ talking_character.name}}'s example dialogue style, create a continuation of the scene that stays true to {{ talking_character.name}}'s character. +{% if talking_character.random_dialogue_example -%} +Based on {{ talking_character.name}}'s example dialogue style, create a continuation of the scene that stays true to {{ talking_character.name}}'s character. +{%- endif %} You may chose to have {{ talking_character.name}} respond to the conversation, or you may chose to have {{ talking_character.name}} perform a new action that is in line with {{ talking_character.name}}'s character. -Use an informal and colloquial register with a conversational tone. Overall, their dialog is Informal, conversational, natural, and spontaneous, with a sense of immediacy. +Always contain actions in asterisks. For example, *{{ talking_character.name}} smiles*. +Always contain dialogue in quotation marks. For example, {{ talking_character.name}}: "Hello!" -Spoken words MUST be enclosed in double quotes, e.g. {{ talking_character.name}}: "spoken words.". {{ extra_instructions }} -<|CLOSE_SECTION|> -{% if memory -%} -<|SECTION:EXTRA CONTEXT|> -{{ memory }} -<|CLOSE_SECTION|> + +{% if scene.count_character_messages(talking_character) >= 5 %}Use an informal and colloquial register with a conversational tone. Overall, {{ talking_character.name }}'s dialog is Informal, conversational, natural, and spontaneous, with a sense of immediacy. {% endif -%} +<|CLOSE_SECTION|> + +{% set general_reinforcements = scene.world_state.filter_reinforcements(insert=['all-context']) %} +{% set char_reinforcements = scene.world_state.filter_reinforcements(character=talking_character.name, insert=["conversation-context"]) %} +{% if memory or scene.active_pins or general_reinforcements -%} {# EXTRA CONTEXT #} +<|SECTION:EXTRA CONTEXT|> +{#- MEMORY #} +{%- for mem in memory %} +{{ mem|condensed }} + +{% endfor %} +{# END MEMORY #} + +{# GENERAL REINFORCEMENTS #} +{%- for reinforce in general_reinforcements %} +{{ reinforce.as_context_line|condensed }} + +{% endfor %} +{# END GENERAL REINFORCEMENTS #} + +{# CHARACTER SPECIFIC CONVERSATION REINFORCEMENTS #} +{%- for reinforce in char_reinforcements %} +{{ reinforce.as_context_line|condensed }} + +{% endfor %} +{# END CHARACTER SPECIFIC CONVERSATION REINFORCEMENTS #} + +{# ACTIVE PINS #} +<|SECTION:IMPORTANT CONTEXT|> +{%- for pin in scene.active_pins %} +{{ pin.time_aware_text|condensed }} + +{% endfor %} +{# END ACTIVE PINS #} +<|CLOSE_SECTION|> +{% endif -%} {# END EXTRA CONTEXT #} + <|SECTION:SCENE|> {% endblock -%} {% block scene_history -%} -{% for scene_context in scene.context_history(budget=max_tokens-200-count_tokens(self.rendered_context()), min_dialogue=15, sections=False, keep_director=True) -%} +{% for scene_context in scene.context_history(budget=max_tokens-200-count_tokens(self.rendered_context()), min_dialogue=15, sections=False, keep_director=talking_character.name) -%} {{ scene_context }} {% endfor %} {% endblock -%} <|CLOSE_SECTION|> -{{ bot_token}}{{ talking_character.name }}:{{ partial_message }} +{% if scene.count_character_messages(talking_character) < 5 %}Use an informal and colloquial register with a conversational tone. Overall, {{ talking_character.name }}'s dialog is Informal, conversational, natural, and spontaneous, with a sense of immediacy. Flesh out additional details by describing {{ talking_character.name }}'s actions and mannerisms within asterisks, e.g. *{{ talking_character.name }} smiles*. +{% endif -%} +{{ bot_token}}{{ talking_character.name }}:{{ partial_message }} \ No newline at end of file diff --git a/src/talemate/prompts/templates/creator/determine-character-goals.jinja2 b/src/talemate/prompts/templates/creator/determine-character-goals.jinja2 new file mode 100644 index 00000000..949e361d --- /dev/null +++ b/src/talemate/prompts/templates/creator/determine-character-goals.jinja2 @@ -0,0 +1,20 @@ +<|SECTION:SCENE|> +{% for scene_context in scene.context_history(budget=1024, min_dialogue=25, sections=False, keep_director=False) -%} +{{ scene_context }} +{% endfor %} +<|CLOSE_SECTION|> +<|SECTION:CHARACTERS|> +{% for character in scene.characters %} +### {{ character.name }} +{{ character.sheet }} + +{{ character.description }} +{% endfor %} +<|CLOSE_SECTION|> +<|SECTION:TASK|> +{{ goal_instructions }} + +Please come up with one long-term goal a list of five short term goals for the NPC {{ npc_name }} that fit their character and the content context of the scenario. These goals will guide them as an NPC throughout the game, but remember the main goal for you is to provide the player ({{ player_name }}) with an experience that satisfies the content context of the scenario: {{ scene.context }} + +Stop after providing the list goals and wait for further instructions. +<|CLOSE_SECTION|> \ No newline at end of file diff --git a/src/talemate/prompts/templates/creator/determine-content-context.jinja2 b/src/talemate/prompts/templates/creator/determine-content-context.jinja2 index 7f6ba5c4..81db1273 100644 --- a/src/talemate/prompts/templates/creator/determine-content-context.jinja2 +++ b/src/talemate/prompts/templates/creator/determine-content-context.jinja2 @@ -3,9 +3,9 @@ {{ character.description }} <|CLOSE_SECTION|> <|SECTION:TASK|> -Analyze the character information and context and determine an apropriate content context. +Analyze the character information and context and determine a fitting content context. -The content content should be a single phrase that describes the expected experience when interacting with the character. +The content content should be a single short phrase that describes the expected experience when interacting with the character. Examples: diff --git a/src/talemate/prompts/templates/creator/generate-json-list.jinja2 b/src/talemate/prompts/templates/creator/generate-json-list.jinja2 new file mode 100644 index 00000000..2197bb31 --- /dev/null +++ b/src/talemate/prompts/templates/creator/generate-json-list.jinja2 @@ -0,0 +1,17 @@ +<|SECTION:TASK|> +Generate a json list of {{ text }}. + +Number of items: {{ count }}. + +Return valid json in this format: + +{ + "items": [ + "first", + "second", + "third" + ] +} + +<|CLOSE_SECTION|> +{{ set_json_response({"items": ["first"]}) }} \ No newline at end of file diff --git a/src/talemate/prompts/templates/creator/generate-title.jinja2 b/src/talemate/prompts/templates/creator/generate-title.jinja2 new file mode 100644 index 00000000..bec8c4df --- /dev/null +++ b/src/talemate/prompts/templates/creator/generate-title.jinja2 @@ -0,0 +1,5 @@ +{{ text }} + +<|SECTION:TASK|> +Generate a short title for the text. +<|CLOSE_SECTION|> \ No newline at end of file diff --git a/src/talemate/prompts/templates/director/direct-character.jinja2 b/src/talemate/prompts/templates/director/direct-character.jinja2 new file mode 100644 index 00000000..8801200d --- /dev/null +++ b/src/talemate/prompts/templates/director/direct-character.jinja2 @@ -0,0 +1,20 @@ +{# CHARACTER / ACTOR DIRECTION #} +<|SECTION:TASK|> +{{ character.name }}'s Goals: {{ prompt }} + +Give actionable directions to the actor playing {{ character.name }} by instructing {{ character.name }} to do or say something to progress the scene subtly towards meeting the condition of their goals in the context of the current scene progression. + +Also remind the actor that is portraying {{ character.name }} that their dialogue should be natural sounding and not forced. + +Take the most recent update to the scene into consideration: {{ scene.history[-1] }} + +IMPORTANT: Stay on topic. Keep the flow of the scene going. Maintain a slow pace. +{% set director_instructions = "Director instructs "+character.name+": \"To progress the scene, i want you to "%} +<|CLOSE_SECTION|> +<|SECTION:SCENE|> +{% block scene_history -%} +Scene progression: +{{ instruct_text("Break down the recent scene progression and important details as a bulletin list.", scene.context_history(budget=2048)) }} +{% endblock -%} +<|CLOSE_SECTION|> +{{ set_prepared_response(director_instructions) }} \ No newline at end of file diff --git a/src/talemate/prompts/templates/director/direct-game.jinja2 b/src/talemate/prompts/templates/director/direct-game.jinja2 new file mode 100644 index 00000000..3c37d727 --- /dev/null +++ b/src/talemate/prompts/templates/director/direct-game.jinja2 @@ -0,0 +1,14 @@ +<|SECTION:GAME PROGRESS|> +{% block scene_history -%} +{% for scene_context in scene.context_history(budget=1000, min_dialogue=25, sections=False, keep_director=False) -%} +{{ scene_context }} +{% endfor %} +{% endblock -%} +<|CLOSE_SECTION|> +<|SECTION:GAME INFORMATION|> +Only you as the director, are aware of the game information. +{{ scene.game_state.instructions.game }} +<|CLOSE_SECTION|> +<|SECTION:TASK|> +Generate narration to subtly move the game progression along according to the game information. +<|CLOSE_SECTION|> \ No newline at end of file diff --git a/src/talemate/prompts/templates/director/direct-scene.jinja2 b/src/talemate/prompts/templates/director/direct-scene.jinja2 index 97abbe48..946333ec 100644 --- a/src/talemate/prompts/templates/director/direct-scene.jinja2 +++ b/src/talemate/prompts/templates/director/direct-scene.jinja2 @@ -1,15 +1,42 @@ -<|SECTION:SCENE|> -{% block scene_history -%} -{% for scene_context in scene.context_history(budget=1000, min_dialogue=25, sections=False, keep_director=False) -%} -{{ scene_context }} -{% endfor %} -{% endblock -%} -<|CLOSE_SECTION|> +{% if character -%} +{# CHARACTER / ACTOR DIRECTION #} <|SECTION:TASK|> -Current scene goal: {{ prompt }} +{{ character.name }}'s Goals: {{ prompt }} -Give actionable directions to the actor playing {{ character.name }} by instructing {{ character.name }} to do or say something to progress the scene subtly towards meeting the condition of the current goal. +Give actionable directions to the actor playing {{ character.name }} by instructing {{ character.name }} to do or say something to progress the scene subtly towards meeting the condition of their goals in the context of the current scene progression. + +Also remind the actor that is portraying {{ character.name }} that their dialogue should be natural sounding and not forced. Take the most recent update to the scene into consideration: {{ scene.history[-1] }} + +IMPORTANT: Stay on topic. Keep the flow of the scene going. Maintain a slow pace. +{% set director_instructions = "Director instructs "+character.name+": \"To progress the scene, i want you to "%} <|CLOSE_SECTION|> -{{ set_prepared_response("Director instructs "+character.name+": \"To progress the scene, i want you to ") }} \ No newline at end of file +{% elif game_state.has_scene_instructions -%} +{# SCENE DIRECTION #} +<|SECTION:CONTEXT|> +{% for character in scene.get_characters() %} +### {{ character.name }} +{{ character.sheet }} + +{{ character.description }} +{% endfor %} +<|CLOSE_SECTION|> +<|SECTION:TASK|> +{{ game_state.scene_instructions }} + +{{ player_character.name }} is an autonomous character played by a person. You run this game for {{ player_character.name }}. They make their own decisions. + +Write 1 to 2 (one to two) sentences of environmental narration. +Narration style should be that of a 90s point and click adventure game. You are omniscient and can describe the scene in detail. +Stay in the current moment. +<|CLOSE_SECTION|> +{% set director_instructions = "" %} +{% endif %} +<|SECTION:SCENE|> +{% block scene_history -%} +Scene progression: +{{ instruct_text("Break down the recent scene progression and important details as a bulletin list.", scene.context_history(budget=2048)) }} +{% endblock -%} +<|CLOSE_SECTION|> +{{ set_prepared_response(director_instructions) }} \ No newline at end of file diff --git a/src/talemate/prompts/templates/narrator/extra-context.jinja2 b/src/talemate/prompts/templates/narrator/extra-context.jinja2 new file mode 100644 index 00000000..71aebe53 --- /dev/null +++ b/src/talemate/prompts/templates/narrator/extra-context.jinja2 @@ -0,0 +1,29 @@ +Scenario Premise: +{{ scene.description }} + +Content Context: This is a specific scene from {{ scene.context }} + +{% block rendered_context_static %} +{# GENERAL REINFORCEMENTS #} +{% set general_reinforcements = scene.world_state.filter_reinforcements(insert=['all-context']) %} +{%- for reinforce in general_reinforcements %} +{{ reinforce.as_context_line|condensed }} + +{% endfor %} +{# END GENERAL REINFORCEMENTS #} +{# ACTIVE PINS #} +{%- for pin in scene.active_pins %} +{{ pin.time_aware_text|condensed }} + +{% endfor %} +{# END ACTIVE PINS #} +{% endblock %} + +{# MEMORY #} +{%- if memory_query %} +{%- for memory in query_memory(memory_query, as_question_answer=False, max_tokens=max_tokens-500-count_tokens(self.rendered_context_static()), iterate=10) -%} +{{ memory|condensed }} + +{% endfor -%} +{% endif -%} +{# END MEMORY #} \ No newline at end of file diff --git a/src/talemate/prompts/templates/narrator/narrate-after-dialogue.jinja2 b/src/talemate/prompts/templates/narrator/narrate-after-dialogue.jinja2 index b4dc4921..4ae19b27 100644 --- a/src/talemate/prompts/templates/narrator/narrate-after-dialogue.jinja2 +++ b/src/talemate/prompts/templates/narrator/narrate-after-dialogue.jinja2 @@ -1,18 +1,22 @@ -{% block rendered_context -%} +{% block rendered_context %} <|SECTION:CONTEXT|> -Content Context: This is a specific scene from {{ scene.context }} -Scenario Premise: {{ scene.description }} -{% for memory in query_memory(last_line, as_question_answer=False, iterate=10) -%} -{{ memory }} - -{% endfor %} -{% endblock -%} +{%- with memory_query=last_line -%} + {% include "extra-context.jinja2" %} +{% endwith -%} <|CLOSE_SECTION|> +{% endblock %} +<|SECTION:SCENE|> {% for scene_context in scene.context_history(budget=max_tokens-200-count_tokens(self.rendered_context()), min_dialogue=25) -%} {{ scene_context }} {% endfor %} +<|CLOSE_SECTION|> + <|SECTION:TASK|> -Based on the previous line '{{ last_line }}', create the next line of narration. This line should focus solely on describing sensory details (like sounds, sights, smells, tactile sensations) or external actions that move the story forward. Avoid including any character's internal thoughts, feelings, or dialogue. Your narration should directly respond to '{{ last_line }}', either by elaborating on the immediate scene or by subtly advancing the plot. Generate exactly one sentence of new narration. If the character is trying to determine some state, truth or situation, try to answer as part of the narration. +In response to "{{ last_line}}" + +Generate a line of new narration that provides sensory details about the scene. + +This line should focus solely on describing sensory details (like sounds, sights, smells, tactile sensations) or external actions that move the story forward. Avoid including any character's internal thoughts, feelings, or dialogue. Your narration should directly response to the last line either by elaborating on the immediate scene or by subtly advancing the plot. Generate exactly one sentence of new narration. If the character is trying to determine some state, truth or situation, try to answer as part of the narration. Be creative and generate something new and interesting, but stay true to the setting and context of the story so far. @@ -22,5 +26,6 @@ Narration style should be that of a 90s point and click adventure game. You are Only generate new narration. {{ extra_instructions }} [$REPETITION|Narration is getting repetitive. Try to choose different words to break up the repetitive text.] + <|CLOSE_SECTION|> -{{ set_prepared_response('*') }} \ No newline at end of file +{{ bot_token }}New Narration: \ No newline at end of file diff --git a/src/talemate/prompts/templates/narrator/narrate-character.jinja2 b/src/talemate/prompts/templates/narrator/narrate-character.jinja2 index 128be0fd..b6357470 100644 --- a/src/talemate/prompts/templates/narrator/narrate-character.jinja2 +++ b/src/talemate/prompts/templates/narrator/narrate-character.jinja2 @@ -1,30 +1,35 @@ +{% block rendered_context -%} <|SECTION:CONTEXT|> -Scenario Premise: {{ scene.description }} - -Last time we checked on {{ character.name }}: - -{% for memory_line in memory -%} -{{ memory_line }} +{% include "extra-context.jinja2" %} +<|CLOSE_SECTION|> +{% endblock -%} +<|SECTION:SCENE|> +{% set scene_history=scene.context_history(budget=max_tokens-300-count_tokens(self.rendered_context()), min_dialogue=20) %} +{% set final_line_number=len(scene_history) %} +{% for scene_context in scene_history -%} +{{ loop.index }}. {{ scene_context }} {% endfor %} <|CLOSE_SECTION|> -{% for scene_context in scene.context_history(budget=max_tokens-300, min_dialogue=20) -%} -{{ scene_context }} -{% endfor %} - <|SECTION:INFORMATION|> {{ query_memory("How old is {character.name}?") }} +{{ query_memory("What does {character.name} look like?") }} {{ query_scene("Where is {character.name} and what is {character.name} doing?") }} {{ query_scene("what is {character.name} wearing? Be explicit.") }} <|CLOSE_SECTION|> <|SECTION:TASK|> -Last line of dialogue: {{ scene.history[-1] }} -Questions: Where is {{ character.name}} currently and what are they doing? What is {{ character.name }}'s appearance at the end of the dialogue? What is {{ character.pronoun_2 }} wearing? What position is {{ character.pronoun_2 }} in? -Instruction: Answer the questions to describe {{ character.name }}'s appearance at the end of the dialogue and summarize into narrative description. Use the whole dialogue for context. You must fill in gaps using imagination as long as it fits the existing context. You will provide a confident and decisive answer to the question. -Content Context: This is a specific scene from {{ scene.context }} -Narration style: point and click adventure game from the 90s -Expected Answer: A brief summarized visual description of {{ character.name }}'s appearance at the end of the dialogue. NEVER break the fourth wall. (2 to 3 sentences) +Questions: Where is {{ character.name}} currently and what are they doing? What is {{ character.name }}'s appearance at the end of the dialogue? What are they wearing? What position are they in? + +Answer the questions to describe {{ character.name }}'s appearance at the end of the dialogue and summarize into narrative description. Use the whole dialogue for context. You must fill in gaps using imagination as long as it fits the existing context. You will provide a confident and decisive answer to the question. + +Your answer must be a brief summarized visual description of {{ character.name }}'s appearance at the end of the dialogue at {{ final_line_number }}. + +Respect the scene progression and answer in the context of line {{ final_line_number }}. + +Use an informal and colloquial register with a conversational tone. Overall, the narrative is Informal, conversational, natural, and spontaneous, with a sense of immediacy. + +Write 2 to 3 sentences. {{ extra_instructions }} <|CLOSE_SECTION|> {{ bot_token }}At the end of the dialogue, \ No newline at end of file diff --git a/src/talemate/prompts/templates/narrator/narrate-progress.jinja2 b/src/talemate/prompts/templates/narrator/narrate-progress.jinja2 index 3f940aa0..0fbc3b34 100644 --- a/src/talemate/prompts/templates/narrator/narrate-progress.jinja2 +++ b/src/talemate/prompts/templates/narrator/narrate-progress.jinja2 @@ -1,24 +1,27 @@ -{% block extra_context -%} +{% block rendered_context -%} <|SECTION:CONTEXT|> -Scenario Premise: {{ scene.description }} - -{% for memory_line in memory -%} -{{ memory_line }} -{% endfor -%} +{%- with memory_query=scene.snapshot() -%} + {% include "extra-context.jinja2" %} +{% endwith %} NPCs: {{ npc_names }} Player Character: {{ player_character.name }} -Content Context: {{ scene.context }} <|CLOSE_SECTION|> {% endblock -%} -{% for scene_context in scene.context_history(budget=max_tokens-300, min_dialogue=20, sections=False) -%} +<|SECTION:SCENE|> +{% for scene_context in scene.context_history(budget=max_tokens-300-count_tokens(self.rendered_context()), min_dialogue=20, sections=False) -%} {{ scene_context }} {% endfor %} +<|CLOSE_SECTION|> <|SECTION:TASK|> Continue the current dialogue by narrating the progression of the scene. If the scene is over, narrate the beginning of the next scene. +Consider the entire context and honor the sequentiality of the scene. Continue based on the final state of the dialogue. + +Progression of the scene is important. The last line is the most important, the first line is the least important. + Be creative and generate something new and interesting, but stay true to the setting and context of the story so far. Use an informal and colloquial register with a conversational tone. Overall, the narrative is informal, conversational, natural, and spontaneous, with a sense of immediacy. @@ -26,14 +29,11 @@ Use an informal and colloquial register with a conversational tone. Overall, the Narration style should be that of a 90s point and click adventure game. You are omniscient and can describe the scene in detail. Only generate new narration. Avoid including any character's internal thoughts or dialogue. + +{% if narrative_direction %} +Directions for new narration: {{ narrative_direction }} +{% endif %} + Write 2 to 4 sentences. {{ extra_instructions }} <|CLOSE_SECTION|> -{{ -set_prepared_response_random( - npc_names.split(", ") + [ - "They", - player_character.name, - ], - prefix="*", -) -}} \ No newline at end of file +{{ set_prepared_response("*") }} \ No newline at end of file diff --git a/src/talemate/prompts/templates/narrator/narrate-query.jinja2 b/src/talemate/prompts/templates/narrator/narrate-query.jinja2 index bd986cd1..8597c1d9 100644 --- a/src/talemate/prompts/templates/narrator/narrate-query.jinja2 +++ b/src/talemate/prompts/templates/narrator/narrate-query.jinja2 @@ -1,27 +1,35 @@ +{% block rendered_context %} <|SECTION:CONTEXT|> -{{ scene.description }} +{%- with memory_query=query -%} + {% include "extra-context.jinja2" %} +{% endwith -%} <|CLOSE_SECTION|> -{% for scene_context in scene.context_history(budget=max_tokens-300, min_dialogue=30) -%} -{{ scene_context }} +{% endblock %} +{% set scene_history=scene.context_history(budget=max_tokens-200-count_tokens(self.rendered_context())) %} +{% set final_line_number=len(scene_history) %} +{% for scene_context in scene_history -%} +{{ loop.index }}. {{ scene_context }} {% endfor %} <|SECTION:TASK|> {% if query.endswith("?") -%} -Extra context: {{ query_memory(query, as_question_answer=False) }} Instruction: Analyze Context, History and Dialogue and then answer the question: "{{ query }}". - -When evaluating both story and context, story is more important. You can fill in gaps using imagination as long as it is based on the existing context. - -Respect the scene progression and answer in the context of the end of the dialogue. - -Use your imagination to fill in gaps in order to answer the question in a confident and decisive manner. Avoid uncertainty and vagueness. {% else -%} Instruction: {{ query }} -Extra context: {{ query_memory(query, as_question_answer=False) }} -Answer based on Context, History and Dialogue. +{% endif %} When evaluating both story and context, story is more important. You can fill in gaps using imagination as long as it is based on the existing context. -{% endif -%} + +Progression of the dialogue is important. The last line is the most important, the first line is the least important. + +Respect the scene progression and answer in the context of line {{ final_line_number }}. + +Use your imagination to fill in gaps in order to answer the question in a confident and decisive manner. Avoid uncertainty and vagueness. + +You answer as the narrator. + +Use an informal and colloquial register with a conversational tone. Overall, the narrative is informal, conversational, natural, and spontaneous, with a sense of immediacy. +Question: {{ query }} Content Context: This is a specific scene from {{ scene.context }} Your answer should be in the style of short, concise narration that fits the context of the scene. (1 to 2 sentences) {{ extra_instructions }} <|CLOSE_SECTION|> -{% if at_the_end %}{{ bot_token }}At the end of the dialogue, {% endif %} \ No newline at end of file +{% if query.endswith("?") -%}Answer: {% endif -%} \ No newline at end of file diff --git a/src/talemate/prompts/templates/narrator/narrate-scene.jinja2 b/src/talemate/prompts/templates/narrator/narrate-scene.jinja2 index 28f3fb18..2f0dc5a5 100644 --- a/src/talemate/prompts/templates/narrator/narrate-scene.jinja2 +++ b/src/talemate/prompts/templates/narrator/narrate-scene.jinja2 @@ -1,13 +1,15 @@ - -{% for scene_context in scene.context_history(budget=max_tokens-300) -%} +{% block rendered_context -%} +<|SECTION:CONTEXT|> +{% include "extra-context.jinja2" %} +<|CLOSE_SECTION|> +{% endblock -%} +<|SECTION:SCENE|> +{% for scene_context in scene.context_history(budget=max_tokens-300-count_tokens(self.rendered_context())) -%} {{ scene_context }} {% endfor %} -<|SECTION:CONTEXT|> -Content Context: This is a specific scene from {{ scene.context }} -Scenario Premise: {{ scene.description }} <|CLOSE_SECTION|> <|SECTION:TASK|> Provide a visual description of what is currently happening in the scene. Don't progress the scene. {{ extra_instructions }} <|CLOSE_SECTION|> -{{ bot_token }}At the end of the scene we currently see: \ No newline at end of file +{{ bot_token }}At the end of the scene we currently see that \ No newline at end of file diff --git a/src/talemate/prompts/templates/narrator/narrate-time-passage.jinja2 b/src/talemate/prompts/templates/narrator/narrate-time-passage.jinja2 index 72637b41..c1eb1836 100644 --- a/src/talemate/prompts/templates/narrator/narrate-time-passage.jinja2 +++ b/src/talemate/prompts/templates/narrator/narrate-time-passage.jinja2 @@ -1,17 +1,25 @@ +{% block rendered_context -%} <|SECTION:CONTEXT|> -Scenario Premise: {{ scene.description }} +{% include "extra-context.jinja2" %} + NPCs: {{ scene.npc_character_names }} Player Character: {{ scene.get_player_character().name }} -Content Context: {{ scene.context }} <|CLOSE_SECTION|> - -{% for scene_context in scene.context_history(budget=max_tokens-300) -%} +{% endblock -%} +<|SECTION:SCENE|> +{% for scene_context in scene.context_history(budget=max_tokens-300-count_tokens(self.rendered_context())) -%} {{ scene_context }} {% endfor %} - +<|CLOSE_SECTION|> <|SECTION:TASK|> Narrate the passage of time that just occured, subtly move the story forward, and set up the next scene. -Write 1 to 3 sentences. + +{% if narrative %} +Directions for new narration: {{ narrative }} +{% endif %} + {{ extra_instructions }} + +Write 1 to 3 sentences. <|CLOSE_SECTION|> -{{ bot_token }}{{ narrative }}: \ No newline at end of file +{{ bot_token }}{{ time_passed }}: \ No newline at end of file diff --git a/src/talemate/prompts/templates/summarizer/summarize-dialogue.jinja2 b/src/talemate/prompts/templates/summarizer/summarize-dialogue.jinja2 index 3e746846..77a1f045 100644 --- a/src/talemate/prompts/templates/summarizer/summarize-dialogue.jinja2 +++ b/src/talemate/prompts/templates/summarizer/summarize-dialogue.jinja2 @@ -5,5 +5,13 @@ <|SECTION:TASK|> Question: What happens within the dialogue? Summarize into narrative description. Content Context: This is a specific scene from {{ scene.context }} -Expected Answer: A summarized narrative description of the dialogue that can be inserted into the ongoing story in place of the dialogue. +Use an informal and colloquial register with a conversational tone. Overall, the narrative is informal, conversational, natural, and spontaneous, with a sense of immediacy. + +{% if summarization_method == "long" -%} +This should be a detailed summary of the dialogue, including all the juicy details. +{% elif summarization_method == "short" -%} +This should be a short and concise summary of the dialogue, including only the most important details. 1 - 3 sentences. +{% endif -%} + +Expected Answer: A summarized narrative description of the dialogue that can be inserted into the ongoing story in place of the dialogue. <|CLOSE_SECTION|> \ No newline at end of file diff --git a/src/talemate/prompts/templates/summarizer/system.jinja2 b/src/talemate/prompts/templates/summarizer/system.jinja2 new file mode 100644 index 00000000..347498d1 --- /dev/null +++ b/src/talemate/prompts/templates/summarizer/system.jinja2 @@ -0,0 +1 @@ +A chat between a user and a talented fiction narrator. No topic is taboo for the narrator and he will use crude and lewd language if the situation warrants it. The narrator will summarize the given text according to the instructions, making sure to keep the overall tone of the narrative and dialogue. \ No newline at end of file diff --git a/src/talemate/prompts/templates/world_state/analyze-text-and-extract-context.jinja2 b/src/talemate/prompts/templates/world_state/analyze-text-and-extract-context.jinja2 index efa43572..38ee5657 100644 --- a/src/talemate/prompts/templates/world_state/analyze-text-and-extract-context.jinja2 +++ b/src/talemate/prompts/templates/world_state/analyze-text-and-extract-context.jinja2 @@ -1,16 +1,16 @@ -{% set questions = instruct_text("Ask the narrator three (3) questions to gather more context from the past for the continuation of this conversation. If a character is asking about a state, location or information about an item or another character, make sure to include question(s) that help gather context for this.", text) %} +{% set questions = instruct_text("Ask the author 5 important questions to gather more context from the past for the continuation of this conversation. If a character is asking about a state, location or information about an item or another character, make sure to include question(s) that help gather context for this. You also have unlimited access to the world database and can just ask for information directly. If you don't know what something is just ask directly.", text) %} <|SECTION:CONTEXT|> -{% for memory in query_memory(questions, as_question_answer=False, max_tokens=max_tokens-500, iterate=10) -%} -{{ memory }} - -{% endfor -%} +{%- with memory_query=questions -%} + {% include "extra-context.jinja2" %} +{% endwith %} +{{ text }} <|CLOSE_SECTION|> <|SECTION:TASK|> Answer the following questions: {{ questions }} -You answers should be precise, truthful and short. Pay close attention to timestamps when retrieving information from the context. +Your answers should be truthful and contain relevant data. Pay close attention to timestamps when retrieving information from the context. <|CLOSE_SECTION|> <|SECTION:RELEVANT CONTEXT|> diff --git a/src/talemate/prompts/templates/world_state/analyze-text-and-follow-instruction.jinja2 b/src/talemate/prompts/templates/world_state/analyze-text-and-follow-instruction.jinja2 index efdea681..f84fdc86 100644 --- a/src/talemate/prompts/templates/world_state/analyze-text-and-follow-instruction.jinja2 +++ b/src/talemate/prompts/templates/world_state/analyze-text-and-follow-instruction.jinja2 @@ -1,3 +1,4 @@ +Content context: {{ scene.context }} {{ text }} diff --git a/src/talemate/prompts/templates/world_state/analyze-text-and-generate-rag-queries.jinja2 b/src/talemate/prompts/templates/world_state/analyze-text-and-generate-rag-queries.jinja2 new file mode 100644 index 00000000..8b2700ab --- /dev/null +++ b/src/talemate/prompts/templates/world_state/analyze-text-and-generate-rag-queries.jinja2 @@ -0,0 +1,24 @@ +{% block rendered_context -%} +<|SECTION:CONTEXT|> +{% include "extra-context.jinja2" %} +<|CLOSE_SECTION|> +{% endblock -%} +<|SECTION:SCENE|> +{{ text }} +<|SECTION:TASK|> +You have access to a vector database to retrieve relevant data to gather more established context for the continuation of this conversation. If a character is asking about a state, location or information about an item or another character, make sure to include queries that help gather context for this. + +Please compile a list of up to 10 short queries to the database that will help us gather additional context for the actors to continue the ongoing conversation. + +Each query must be a short trigger keyword phrase and the database will match on semantic similarity. + +Each query must be on its own line as raw unformatted text. + +Your response should look like this and contain only the queries and nothing else: + +- +- +- ... +- +<|CLOSE_SECTION|> +{{ set_prepared_response('-') }} \ No newline at end of file diff --git a/src/talemate/prompts/templates/world_state/check-pin-conditions.jinja2 b/src/talemate/prompts/templates/world_state/check-pin-conditions.jinja2 new file mode 100644 index 00000000..d89ab856 --- /dev/null +++ b/src/talemate/prompts/templates/world_state/check-pin-conditions.jinja2 @@ -0,0 +1,19 @@ +<|SECTION:PREVIOUS CONDITION STATES|> +{{ previous_states }} +<|CLOSE_SECTION|> +<|SECTION:SCENE|> +{% for scene_context in scene.context_history(budget=min(2048, max_tokens-500)) -%} +{{ scene_context }} +{% endfor -%} +<|CLOSE_SECTION|> +<|SECTION:TASK|> +Analyze the scene progression and update the condition states according to the most recent update to the scene. + +Answer truthfully in the context of the end of the scene evaluating the scene progression to the end. + +Only update the existing condition states. +Only include a JSON response. +State must be a boolean. +<|CLOSE_SECTION|> +<|SECTION:UPDATED CONDITION STATES|> +{{ set_json_response(coercion, cutoff=3) }} \ No newline at end of file diff --git a/src/talemate/prompts/templates/world_state/determine-content-context.jinja2 b/src/talemate/prompts/templates/world_state/determine-content-context.jinja2 new file mode 100644 index 00000000..565ece71 --- /dev/null +++ b/src/talemate/prompts/templates/world_state/determine-content-context.jinja2 @@ -0,0 +1,20 @@ +<|SECTION:CONTENT|> +""" +{{ content }} +""" +<|CLOSE_SECTION|> +<|SECTION:TASK|> +Analyze the content within the triple quotes and determine a fitting content context. + +The content context should be a single short phrase classification that describes the expected experience when reading this content, it should also be generic and overarching and excite the reader to keep reading. + +Choices: + +{% for content_context in config.get('creator', {}).get('content_context',[]) -%} +- {{ content_context }} +{% endfor -%} +{% for content_context in extra_choices -%} +- {{ content_context }} +{% endfor -%} +<|CLOSE_SECTION|> +{{ bot_token }}Content context: \ No newline at end of file diff --git a/src/talemate/prompts/templates/world_state/extra-context.jinja2 b/src/talemate/prompts/templates/world_state/extra-context.jinja2 new file mode 100644 index 00000000..a2525531 --- /dev/null +++ b/src/talemate/prompts/templates/world_state/extra-context.jinja2 @@ -0,0 +1,21 @@ +{# MEMORY #} +{%- if memory_query %} +{%- for memory in query_memory(memory_query, as_question_answer=False, iterate=5) -%} +{{ memory|condensed }} + +{% endfor -%} +{% endif -%} +{# END MEMORY #} +{# GENERAL REINFORCEMENTS #} +{% set general_reinforcements = scene.world_state.filter_reinforcements(insert=['all-context']) %} +{%- for reinforce in general_reinforcements %} +{{ reinforce.as_context_line|condensed }} + +{% endfor %} +{# END GENERAL REINFORCEMENTS #} +{# ACTIVE PINS #} +{%- for pin in scene.active_pins %} +{{ pin.time_aware_text|condensed }} + +{% endfor %} +{# END ACTIVE PINS #} \ No newline at end of file diff --git a/src/talemate/prompts/templates/world_state/extract-character-sheet.jinja2 b/src/talemate/prompts/templates/world_state/extract-character-sheet.jinja2 index b00adc76..e9e12e35 100644 --- a/src/talemate/prompts/templates/world_state/extract-character-sheet.jinja2 +++ b/src/talemate/prompts/templates/world_state/extract-character-sheet.jinja2 @@ -1,13 +1,31 @@ <|SECTION:CONTENT|> -{% if text -%} -{{ text }} -{% else -%} {% set scene_context_history = scene.context_history(budget=max_tokens-500, min_dialogue=25, sections=False, keep_director=True) -%} {% if scene.num_history_entries < 25 %}{{ scene.description.replace("\r\n","\n") }}{% endif -%} {% for scene_context in scene_context_history -%} {{ scene_context }} {% endfor %} -{% endif %} +{% for memory in query_memory("Who is "+name+"?", as_question_answer=False, iterate=3) %} +{{ memory }} +{% endfor %} +{% if text -%} +{{ text }} +{% endif -%} <|SECTION:TASK|> -Generate a real world character profile for {{ name }}, one attribute per line. +Generate a real world character profile for {{ name }}, one attribute per line. You are a creative writer and are allowed to fill in any gaps in the profile with your own ideas. + +Expand on interesting details. + +Narration style should be that of a 90s point and click adventure game. You are omniscient and can describe the scene in detail. + +Use an informal and colloquial register with a conversational tone. Overall, the narrative is Informal, conversational, natural, and spontaneous, with a sense of immediacy. + +Example: + +Name: +Age: +Appearance: +<...> + +Format MUST be one attribute per line, with a colon after the attribute name. + {{ set_prepared_response("Name: "+name+"\nAge:") }} \ No newline at end of file diff --git a/src/talemate/prompts/templates/world_state/request-world-state-v2.jinja2 b/src/talemate/prompts/templates/world_state/request-world-state-v2.jinja2 index 72f82fbf..e53ef698 100644 --- a/src/talemate/prompts/templates/world_state/request-world-state-v2.jinja2 +++ b/src/talemate/prompts/templates/world_state/request-world-state-v2.jinja2 @@ -25,28 +25,28 @@ Other major characters: {{ npc_name }} {% endfor -%} -{% for scene_context in scene.context_history(budget=1000, min_dialogue=10, dialogue_negative_offset=5, sections=False) -%} -{{ scene_context }} +{% set scene_history=scene.context_history(budget=1000) %} +{% set final_line_number=len(scene_history) %} +{% for scene_context in scene_history -%} +Line {{ loop.index }}: {{ scene_context }} {% endfor -%} {% if not scene.history -%} <|SECTION:DIALOGUE|> No dialogue so far {% endif -%} <|CLOSE_SECTION|> -<|SECTION:SCENE PROGRESS|> -{% for scene_context in scene.context_history(budget=500, min_dialogue=5, add_archieved_history=False, max_dialogue=5) -%} -{{ scene_context }} -{% endfor -%} -<|CLOSE_SECTION|> <|SECTION:TASK|> Create a JSON object for the world state that reflects the scene progression so far. -The world state needs to include important concrete and material items present at the very end of the dialogue. -The world state needs to include persons (characters) interacting at the very end of the dialogue +The world state needs to include important concrete and material items present in the scene during line {{ final_line_number }}. +The world state needs to include persons (characters) interacting during line {{ final_line_number }}. +What are the present characters doing during line {{ final_line_number }}? Be factual and truthful. Don't make up things that are not in the context or dialogue. Snapshot text should always be specified. If you don't know what to write, write "You see nothing special." Emotion should always be specified. If you don't know what to write, write "neutral". +Respect the scene progression and answer in the context of line {{ final_line_number }}. + Required response: a complete and valid JSON response according to the JSON example containing items and characters. characters should have the following attributes: `emotion`, `snapshot` diff --git a/src/talemate/prompts/templates/world_state/request-world-state.jinja2 b/src/talemate/prompts/templates/world_state/request-world-state.jinja2 index bd075b4c..57554cec 100644 --- a/src/talemate/prompts/templates/world_state/request-world-state.jinja2 +++ b/src/talemate/prompts/templates/world_state/request-world-state.jinja2 @@ -19,7 +19,7 @@ <|CLOSE_SECTION|> <|SECTION:CONTEXT|> -{% for scene_context in scene.context_history(budget=1000, min_dialogue=10, dialogue_negative_offset=5, sections=False) -%} +{% for scene_context in scene.context_history(budget=1000, min_dialogue=10) -%} {{ scene_context }} {% endfor -%} {% if not scene.history -%} diff --git a/src/talemate/prompts/templates/world_state/update-reinforcements.jinja2 b/src/talemate/prompts/templates/world_state/update-reinforcements.jinja2 new file mode 100644 index 00000000..e63e26ee --- /dev/null +++ b/src/talemate/prompts/templates/world_state/update-reinforcements.jinja2 @@ -0,0 +1,79 @@ +{% block rendered_context -%} +<|SECTION:CONTEXT|> +{%- with memory_query=scene.snapshot() -%} + {% include "extra-context.jinja2" %} +{% endwith %} +{% if character %} +{{ character.name }}'s description: {{ character.description|condensed }} +{% endif %} + +{{ text }} +<|CLOSE_SECTION|> +{% endblock -%} +<|SECTION:SCENE|> +{% set scene_history=scene.context_history(budget=max_tokens-200-count_tokens(self.rendered_context())) -%} +{% set final_line_number=len(scene_history) -%} +{% for scene_context in scene_history -%} +{{ loop.index }}. {{ scene_context }} +{% endfor -%} +{% if not scene.history -%} +No dialogue so far +{% endif -%} +<|CLOSE_SECTION|> +<|SECTION:TASK|> +{# QUESTION #} +{%- if question.strip()[-1] == '?' %} +Shortly answer the following question: {{ question }} + +Consider the entire context and honor the sequentiality of the dialogue. Answer based on the final state of the dialogue. + +Progression of the dialogue is important. The last line is the most important, the first line is the least important. + +Respect the scene progression and answer in the context of line {{ final_line_number }}. + +Use your imagination to fill in gaps in order to answer the question in a confident and decisive manner. Avoid uncertainty and vagueness. +You are omniscient and can describe the scene in detail. + +{% if reinforcement.insert == 'sequential' %} +YOUR ANSWER MUST BE SHORT AND TO THE POINT. +YOUR ANSWER MUST BE A SINGLE SENTENCE. +YOUR RESPONSE MUST BE ONLY THE ANSWER TO THE QUESTION. NEVER EXPLAIN YOUR REASONING. +{% endif %} +{% if instructions %} +{{ instructions }} +{% endif %} +The tone of your answer should be consistent with the tone of the story so far. + +Question: {{ question }} +{% if answer %}Previous Answer: {{ answer }} +{% endif -%} +<|CLOSE_SECTION|> +{{ bot_token }}Updated Answer: +{# ATTRIBUTE #} +{%- else %} +Generate the following attribute{% if character %} for {{ character.name }}{% endif %}: {{ question }} + +Consider the entire context and honor the sequentiality of the dialogue. Answer based on the final state of the dialogue. + +Progression of the dialogue is important. The last line is the most important, the first line is the least important. + +Respect the scene progression and answer in the context of line {{ final_line_number }}. + +Use your imagination to fill in gaps in order to generate the attribute in a confident and decisive manner. Avoid uncertainty and vagueness. +You are omniscient and can describe the scene in detail. + +{% if reinforcement.insert == 'sequential' %} +YOUR ANSWER MUST BE SHORT AND TO THE POINT. +YOUR ANSWER MUST BE A SINGLE SENTENCE. +YOUR RESPONSE MUST BE ONLY THE ANSWER TO THE QUESTION. NEVER EXPLAIN YOUR REASONING. +{% endif %} +{% if instructions %} +{{ instructions }} +{% endif %} +The tone of your answer should be consistent with the tone of the story so far. + +{% if answer %}Previous Value: {{ answer }} +{% endif-%} +<|CLOSE_SECTION|> +{{ bot_token }}New value for {{ question }}: +{%- endif %} \ No newline at end of file diff --git a/src/talemate/scene_message.py b/src/talemate/scene_message.py index 40773de5..dd735931 100644 --- a/src/talemate/scene_message.py +++ b/src/talemate/scene_message.py @@ -67,6 +67,10 @@ class SceneMessage: def endswith(self, *args, **kwargs): return self.message.endswith(*args, **kwargs) + @property + def secondary_source(self): + return self.source + @dataclass class CharacterMessage(SceneMessage): typ = "character" @@ -78,6 +82,10 @@ class CharacterMessage(SceneMessage): @property def character_name(self): return self.message.split(":", 1)[0] + + @property + def secondary_source(self): + return self.character_name @dataclass class NarratorMessage(SceneMessage): @@ -115,10 +123,19 @@ class TimePassageMessage(SceneMessage): "ts": self.ts, } +@dataclass +class ReinforcementMessage(SceneMessage): + typ = "reinforcement" + + def __str__(self): + question, _ = self.source.split(":", 1) + return f"[Context state: {question}: {self.message}]" + MESSAGES = { "scene": SceneMessage, "character": CharacterMessage, "narrator": NarratorMessage, "director": DirectorMessage, "time": TimePassageMessage, + "reinforcement": ReinforcementMessage, } \ No newline at end of file diff --git a/src/talemate/server/api.py b/src/talemate/server/api.py index bfb7d598..318e67a0 100644 --- a/src/talemate/server/api.py +++ b/src/talemate/server/api.py @@ -83,9 +83,10 @@ async def websocket_endpoint(websocket, path): await message_queue.put( { "type": "system", - "message": "Scene loaded ...", + "message": "Scene file loaded ...", "id": "scene.loaded", "status": "success", + "data": {"hidden":True} } ) diff --git a/src/talemate/server/quick_settings.py b/src/talemate/server/quick_settings.py new file mode 100644 index 00000000..6f6c3f6b --- /dev/null +++ b/src/talemate/server/quick_settings.py @@ -0,0 +1,53 @@ +import pydantic +import structlog +from typing import Union, Any +import uuid + +from talemate.config import load_config, save_config + +log = structlog.get_logger("talemate.server.quick_settings") + + +class SetQuickSettingsPayload(pydantic.BaseModel): + setting: str + value: Any + +class QuickSettingsPlugin: + router = "quick_settings" + + @property + def scene(self): + return self.websocket_handler.scene + + def __init__(self, websocket_handler): + self.websocket_handler = websocket_handler + + async def handle(self, data:dict): + + log.info("quick settings action", action=data.get("action")) + + fn = getattr(self, f"handle_{data.get('action')}", None) + + if fn is None: + return + + await fn(data) + + async def handle_set(self, data:dict): + + payload = SetQuickSettingsPayload(**data) + + if payload.setting == "auto_save": + self.scene.config["game"]["general"]["auto_save"] = payload.value + elif payload.setting == "auto_progress": + self.scene.config["game"]["general"]["auto_progress"] = payload.value + else: + raise NotImplementedError(f"Setting {payload.setting} not implemented.") + + save_config(self.scene.config) + + self.websocket_handler.queue_put({ + "type": self.router, + "action": "set_done", + "data": payload.model_dump() + }) \ No newline at end of file diff --git a/src/talemate/server/websocket_server.py b/src/talemate/server/websocket_server.py index 6ea2a795..fd5f495d 100644 --- a/src/talemate/server/websocket_server.py +++ b/src/talemate/server/websocket_server.py @@ -16,6 +16,8 @@ from talemate.server import character_creator from talemate.server import character_importer from talemate.server import scene_creator from talemate.server import config +from talemate.server import world_state_manager +from talemate.server import quick_settings log = structlog.get_logger("talemate.server.websocket_server") @@ -52,6 +54,8 @@ class WebsocketHandler(Receiver): character_importer.CharacterImporterServerPlugin.router: character_importer.CharacterImporterServerPlugin(self), scene_creator.SceneCreatorServerPlugin.router: scene_creator.SceneCreatorServerPlugin(self), config.ConfigPlugin.router: config.ConfigPlugin(self), + world_state_manager.WorldStateManagerPlugin.router: world_state_manager.WorldStateManagerPlugin(self), + quick_settings.QuickSettingsPlugin.router: quick_settings.QuickSettingsPlugin(self), } # self.request_scenes_list() @@ -131,6 +135,7 @@ class WebsocketHandler(Receiver): if self.scene: instance.get_agent("memory").close_db(self.scene) + self.scene.disconnect() scene = self.init_scene() @@ -283,6 +288,17 @@ class WebsocketHandler(Receiver): } ) + def handle_status(self, emission: Emission): + self.queue_put( + { + "type": "status", + "message": emission.message, + "id": emission.id, + "status": emission.status, + "data": emission.data, + } + ) + def handle_narrator(self, emission: Emission): self.queue_put( { @@ -373,6 +389,14 @@ class WebsocketHandler(Receiver): "status": emission.status, } ) + + def handle_config_saved(self, emission: Emission): + self.queue_put( + { + "type": "app_config", + "data": emission.data, + } + ) def handle_archived_history(self, emission: Emission): self.queue_put( @@ -402,7 +426,7 @@ class WebsocketHandler(Receiver): "name": emission.id, "status": emission.status, "data": emission.data, - "max_token_length": client.max_token_length if client else 2048, + "max_token_length": client.max_token_length if client else 4096, "apiUrl": getattr(client, "api_url", None) if client else None, } ) diff --git a/src/talemate/server/world_state_manager.py b/src/talemate/server/world_state_manager.py new file mode 100644 index 00000000..ae2cc924 --- /dev/null +++ b/src/talemate/server/world_state_manager.py @@ -0,0 +1,478 @@ +import pydantic +import structlog +from typing import Union, Any +import uuid + +from talemate.world_state.manager import WorldStateManager, WorldStateTemplates, StateReinforcementTemplate + +log = structlog.get_logger("talemate.server.world_state_manager") + +class UpdateCharacterAttributePayload(pydantic.BaseModel): + name: str + attribute: str + value: str + +class UpdateCharacterDetailPayload(pydantic.BaseModel): + name: str + detail: str + value: str + +class SetCharacterDetailReinforcementPayload(pydantic.BaseModel): + name: str + question: str + instructions: Union[str, None] = None + interval: int = 10 + answer: str = "" + update_state: bool = False + insert: str = "sequential" + +class CharacterDetailReinforcementPayload(pydantic.BaseModel): + name: str + question: str + +class SaveWorldEntryPayload(pydantic.BaseModel): + id:str + text: str + meta: dict = {} + +class DeleteWorldEntryPayload(pydantic.BaseModel): + id: str + +class SetWorldEntryReinforcementPayload(pydantic.BaseModel): + question: str + instructions: Union[str, None] = None + interval: int = 10 + answer: str = "" + update_state: bool = False + insert: str = "never" + +class WorldEntryReinforcementPayload(pydantic.BaseModel): + question: str + +class QueryContextDBPayload(pydantic.BaseModel): + query: str + meta: dict = {} + +class UpdateContextDBPayload(pydantic.BaseModel): + text: str + meta: dict = {} + id: str = pydantic.Field(default_factory=lambda: str(uuid.uuid4())) + +class DeleteContextDBPayload(pydantic.BaseModel): + id: Any + +class UpdatePinPayload(pydantic.BaseModel): + entry_id: str + condition: Union[str, None] = None + condition_state: bool = False + active: bool = False + +class RemovePinPayload(pydantic.BaseModel): + entry_id: str + +class SaveWorldStateTemplatePayload(pydantic.BaseModel): + template: StateReinforcementTemplate + +class DeleteWorldStateTemplatePayload(pydantic.BaseModel): + template: StateReinforcementTemplate + +class WorldStateManagerPlugin: + + router = "world_state_manager" + + @property + def scene(self): + return self.websocket_handler.scene + + @property + def world_state_manager(self): + return WorldStateManager(self.scene) + + def __init__(self, websocket_handler): + self.websocket_handler = websocket_handler + + async def handle(self, data:dict): + + log.info("World state manager action", action=data.get("action")) + + fn = getattr(self, f"handle_{data.get('action')}", None) + + if fn is None: + return + + await fn(data) + + async def signal_operation_done(self): + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "operation_done", + "data": {} + }) + + if self.scene.auto_save: + await self.scene.save(auto=True) + + async def handle_get_character_list(self, data): + character_list = await self.world_state_manager.get_character_list() + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "character_list", + "data": character_list.model_dump() + }) + + async def handle_get_character_details(self, data): + character_details = await self.world_state_manager.get_character_details(data["name"]) + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "character_details", + "data": character_details.model_dump() + }) + + async def handle_get_world(self, data): + world = await self.world_state_manager.get_world() + log.debug("World", world=world) + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "world", + "data": world.model_dump() + }) + + async def handle_get_pins(self, data): + context_pins = await self.world_state_manager.get_pins() + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "pins", + "data": context_pins.model_dump() + }) + + async def handle_get_templates(self, data): + templates = await self.world_state_manager.get_templates() + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "templates", + "data": templates.model_dump() + }) + + async def handle_update_character_attribute(self, data): + + payload = UpdateCharacterAttributePayload(**data) + + await self.world_state_manager.update_character_attribute(payload.name, payload.attribute, payload.value) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "character_attribute_updated", + "data": payload.model_dump() + }) + + # resend character details + await self.handle_get_character_details({"name":payload.name}) + + await self.signal_operation_done() + + async def handle_update_character_description(self, data): + + payload = UpdateCharacterAttributePayload(**data) + + await self.world_state_manager.update_character_description(payload.name, payload.value) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "character_description_updated", + "data": payload.model_dump() + }) + + # resend character details + await self.handle_get_character_details({"name":payload.name}) + await self.signal_operation_done() + + async def handle_update_character_detail(self, data): + + payload = UpdateCharacterDetailPayload(**data) + + await self.world_state_manager.update_character_detail(payload.name, payload.detail, payload.value) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "character_detail_updated", + "data": payload.model_dump() + }) + + # resend character details + await self.handle_get_character_details({"name":payload.name}) + await self.signal_operation_done() + + async def handle_set_character_detail_reinforcement(self, data): + + payload = SetCharacterDetailReinforcementPayload(**data) + + await self.world_state_manager.add_detail_reinforcement( + payload.name, + payload.question, + payload.instructions, + payload.interval, + payload.answer, + payload.insert, + payload.update_state + ) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "character_detail_reinforcement_set", + "data": payload.model_dump() + }) + + # resend character details + await self.handle_get_character_details({"name":payload.name}) + await self.signal_operation_done() + + async def handle_run_character_detail_reinforcement(self, data): + + payload = CharacterDetailReinforcementPayload(**data) + + await self.world_state_manager.run_detail_reinforcement(payload.name, payload.question) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "character_detail_reinforcement_run", + "data": payload.model_dump() + }) + + # resend character details + await self.handle_get_character_details({"name":payload.name}) + await self.signal_operation_done() + + async def handle_delete_character_detail_reinforcement(self, data): + + payload = CharacterDetailReinforcementPayload(**data) + + await self.world_state_manager.delete_detail_reinforcement(payload.name, payload.question) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "character_detail_reinforcement_deleted", + "data": payload.model_dump() + }) + + # resend character details + await self.handle_get_character_details({"name":payload.name}) + await self.signal_operation_done() + + + async def handle_save_world_entry(self, data): + + payload = SaveWorldEntryPayload(**data) + + log.debug("Save world entry", id=payload.id, text=payload.text, meta=payload.meta) + + await self.world_state_manager.save_world_entry(payload.id, payload.text, payload.meta) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "world_entry_saved", + "data": payload.model_dump() + }) + + await self.handle_get_world({}) + await self.signal_operation_done() + + self.scene.world_state.emit() + + async def handle_delete_world_entry(self, data): + + payload = DeleteWorldEntryPayload(**data) + + log.debug("Delete world entry", id=payload.id) + + await self.world_state_manager.delete_context_db_entry(payload.id) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "world_entry_deleted", + "data": payload.model_dump() + }) + + await self.handle_get_world({}) + await self.signal_operation_done() + + self.scene.world_state.emit() + self.scene.emit_status() + + async def handle_set_world_state_reinforcement(self, data): + + payload = SetWorldEntryReinforcementPayload(**data) + + + log.debug("Set world state reinforcement", question=payload.question, instructions=payload.instructions, interval=payload.interval, answer=payload.answer, insert=payload.insert, update_state=payload.update_state) + + await self.world_state_manager.add_detail_reinforcement( + None, + payload.question, + payload.instructions, + payload.interval, + payload.answer, + payload.insert, + payload.update_state + ) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "world_state_reinforcement_set", + "data": payload.model_dump() + }) + + # resend world + await self.handle_get_world({}) + await self.signal_operation_done() + + async def handle_run_world_state_reinforcement(self, data): + payload = WorldEntryReinforcementPayload(**data) + + await self.world_state_manager.run_detail_reinforcement(None, payload.question) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "world_state_reinforcement_ran", + "data": payload.model_dump() + }) + + # resend world + await self.handle_get_world({}) + await self.signal_operation_done() + + async def handle_delete_world_state_reinforcement(self, data): + + payload = WorldEntryReinforcementPayload(**data) + + await self.world_state_manager.delete_detail_reinforcement(None, payload.question) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "world_state_reinforcement_deleted", + "data": payload.model_dump() + }) + + # resend world + await self.handle_get_world({}) + await self.signal_operation_done() + + async def handle_query_context_db(self, data): + + payload = QueryContextDBPayload(**data) + + log.debug("Query context db", query=payload.query, meta=payload.meta) + + context_db = await self.world_state_manager.get_context_db_entries(payload.query, **payload.meta) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "context_db_result", + "data": context_db.model_dump() + }) + + await self.signal_operation_done() + + async def handle_update_context_db(self, data): + + payload = UpdateContextDBPayload(**data) + + log.debug("Update context db", text=payload.text, meta=payload.meta, id=payload.id) + + await self.world_state_manager.update_context_db_entry(payload.id, payload.text, payload.meta) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "context_db_updated", + "data": payload.model_dump() + }) + + await self.signal_operation_done() + + async def handle_delete_context_db(self, data): + + payload = DeleteContextDBPayload(**data) + + log.debug("Delete context db", id=payload.id) + + await self.world_state_manager.delete_context_db_entry(payload.id) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "context_db_deleted", + "data": payload.model_dump() + }) + + await self.signal_operation_done() + + async def handle_set_pin(self, data): + + payload = UpdatePinPayload(**data) + + log.debug("Set pin", entry_id=payload.entry_id, condition=payload.condition, condition_state=payload.condition_state, active=payload.active) + + await self.world_state_manager.set_pin(payload.entry_id, payload.condition, payload.condition_state, payload.active) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "pin_set", + "data": payload.model_dump() + }) + + await self.handle_get_pins({}) + await self.signal_operation_done() + await self.scene.load_active_pins() + self.scene.emit_status() + + async def handle_remove_pin(self, data): + + payload = RemovePinPayload(**data) + + log.debug("Remove pin", entry_id=payload.entry_id) + + await self.world_state_manager.remove_pin(payload.entry_id) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "pin_removed", + "data": payload.model_dump() + }) + + await self.handle_get_pins({}) + await self.signal_operation_done() + await self.scene.load_active_pins() + self.scene.emit_status() + + async def handle_save_template(self, data): + + payload = SaveWorldStateTemplatePayload(**data) + + log.debug("Save world state template", template=payload.template) + + await self.world_state_manager.save_template(payload.template) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "template_saved", + "data": payload.model_dump() + }) + + await self.handle_get_templates({}) + await self.signal_operation_done() + + async def handle_delete_template(self, data): + + payload = DeleteWorldStateTemplatePayload(**data) + template = payload.template + + log.debug("Delete world state template", template=template.name, template_type=template.type) + + await self.world_state_manager.remove_template(template.type, template.name) + + self.websocket_handler.queue_put({ + "type": "world_state_manager", + "action": "template_deleted", + "data": payload.model_dump() + }) + + await self.handle_get_templates({}) + await self.signal_operation_done() \ No newline at end of file diff --git a/src/talemate/tale_mate.py b/src/talemate/tale_mate.py index d87436be..40249be2 100644 --- a/src/talemate/tale_mate.py +++ b/src/talemate/tale_mate.py @@ -19,13 +19,17 @@ import talemate.data_objects as data_objects import talemate.events as events import talemate.util as util import talemate.save as save +from talemate.instance import get_agent from talemate.emit import Emitter, emit, wait_for_input +from talemate.emit.signals import handlers, ConfigSaved import talemate.emit.async_signals as async_signals from talemate.util import colored_text, count_tokens, extract_metadata, wrap_text -from talemate.scene_message import SceneMessage, CharacterMessage, DirectorMessage, NarratorMessage, TimePassageMessage +from talemate.scene_message import SceneMessage, CharacterMessage, DirectorMessage, NarratorMessage, TimePassageMessage, ReinforcementMessage from talemate.exceptions import ExitScene, RestartSceneLoop, ResetScene, TalemateError, TalemateInterrupt, LLMAccuracyError from talemate.world_state import WorldState -from talemate.config import SceneConfig +from talemate.world_state.manager import WorldStateManager +from talemate.game_state import GameState +from talemate.config import SceneConfig, load_config from talemate.scene_assets import SceneAssets from talemate.client.context import ClientContext, ConversationContext import talemate.automated_action as automated_action @@ -43,6 +47,7 @@ __all__ = [ log = structlog.get_logger("talemate") +async_signals.register("scene_init") async_signals.register("game_loop_start") async_signals.register("game_loop") async_signals.register("game_loop_actor_iter") @@ -246,7 +251,8 @@ class Character: if self.description: self.description = self.description.replace(f"{orig_name}", self.name) for k, v in self.base_attributes.items(): - self.base_attributes[k] = v.replace(f"{orig_name}", self.name) + if isinstance(v, str): + self.base_attributes[k] = v.replace(f"{orig_name}", self.name) for i, v in enumerate(self.details): self.details[i] = v.replace(f"{orig_name}", self.name) @@ -376,6 +382,7 @@ class Character: "meta": { "character": self.name, "typ": "details", + "detail": key, } }) @@ -398,7 +405,120 @@ class Character: if items: await memory_agent.add_many(items) + async def commit_single_attribute_to_memory(self, memory_agent, attribute:str, value:str): + """ + Commits a single attribute to memory + """ + + items = [] + + # remove old attribute if it exists + + await memory_agent.delete({"character": self.name, "typ": "base_attribute", "attr": attribute}) + + self.base_attributes[attribute] = value + + items.append({ + "text": f"{self.name}'s {attribute}: {self.base_attributes[attribute]}", + "id": f"{self.name}.{attribute}", + "meta": { + "character": self.name, + "attr": attribute, + "typ": "base_attribute", + } + }) + + log.info("commit_single_attribute_to_memory", items=items) + + await memory_agent.add_many(items) + async def commit_single_detail_to_memory(self, memory_agent, detail:str, value:str): + + """ + Commits a single detail to memory + """ + + items = [] + + # remove old detail if it exists + + await memory_agent.delete({"character": self.name, "typ": "details", "detail": detail}) + + self.details[detail] = value + + items.append({ + "text": f"{self.name} - {detail}: {value}", + "meta": { + "character": self.name, + "typ": "details", + "detail": detail, + } + }) + + log.info("commit_single_detail_to_memory", items=items) + + await memory_agent.add_many(items) + + async def set_detail(self, name:str, value): + memory_agent = get_agent("memory") + if not value: + try: + del self.details[name] + await memory_agent.delete({"character": self.name, "typ": "details", "detail": name}) + except KeyError: + pass + else: + self.details[name] = value + await self.commit_single_detail_to_memory(memory_agent, name, value) + + def get_detail(self, name:str): + return self.details.get(name) + + async def set_base_attribute(self, name:str, value): + + memory_agent = get_agent("memory") + + if not value: + try: + del self.base_attributes[name] + await memory_agent.delete({"character": self.name, "typ": "base_attribute", "attr": name}) + except KeyError: + pass + else: + self.base_attributes[name] = value + await self.commit_single_attribute_to_memory(memory_agent, name, value) + + + def get_base_attribute(self, name:str): + return self.base_attributes.get(name) + + + async def set_description(self, description:str): + memory_agent = get_agent("memory") + self.description = description + + items = [] + + await memory_agent.delete({"character": self.name, "typ": "base_attribute", "attr": "description"}) + + description_chunks = [chunk.strip() for chunk in self.description.split("\n") if chunk.strip()] + + for idx in range(len(description_chunks)): + chunk = description_chunks[idx] + + items.append({ + "text": f"{self.name}: {chunk}", + "id": f"{self.name}.description.{idx}", + "meta": { + "character": self.name, + "attr": "description", + "typ": "base_attribute", + } + }) + + await memory_agent.add_many(items) + + class Helper: """ Wrapper for non-conversational agents, such as summarization agents @@ -554,18 +674,32 @@ class Scene(Emitter): self.name = "" self.filename = "" self.memory_id = str(uuid.uuid4())[:10] + self.saved_memory_session_id = None + self.memory_session_id = str(uuid.uuid4())[:10] + + # has scene been saved before? self.saved = False + # if immutable_save is True, save will always + # happen as save-as and not overwrite the original + self.immutable_save = False + + self.config = load_config() + self.context = "" self.commands = commands.Manager(self) self.environment = "scene" self.goal = None self.world_state = WorldState() + self.game_state = GameState() self.ts = "PT0S" + self.Actor = Actor + self.Character = Character + self.automated_actions = {} - self.summary_pins = [] + self.active_pins = [] # Add an attribute to store the most recent AI Actor self.most_recent_ai_actor = None @@ -579,6 +713,7 @@ class Scene(Emitter): "game_loop_start": async_signals.get("game_loop_start"), "game_loop_actor_iter": async_signals.get("game_loop_actor_iter"), "game_loop_new_message": async_signals.get("game_loop_new_message"), + "scene_init": async_signals.get("scene_init"), } self.setup_emitter(scene=self) @@ -606,7 +741,7 @@ class Scene(Emitter): def scene_config(self): return SceneConfig( automated_actions={action.uid: action.enabled for action in self.automated_actions.values()} - ).dict() + ).model_dump() @property def project_name(self): @@ -625,7 +760,63 @@ class Scene(Emitter): for idx in range(len(self.history) - 1, -1, -1): if isinstance(self.history[idx], CharacterMessage): return self.history[idx].character_name + + @property + def save_dir(self): + saves_dir = os.path.join( + os.path.dirname(os.path.realpath(__file__)), + "..", + "..", + "scenes", + self.project_name, + ) + + if not os.path.exists(saves_dir): + os.makedirs(saves_dir) + + return saves_dir + @property + def template_dir(self): + return os.path.join(self.save_dir, "templates") + + @property + def auto_save(self): + return self.config.get("game", {}).get("general", {}).get("auto_save", True) + + @property + def auto_progress(self): + return self.config.get("game", {}).get("general", {}).get("auto_progress", True) + + @property + def world_state_manager(self): + return WorldStateManager(self) + + def set_description(self, description:str): + self.description = description + + def set_intro(self, intro:str): + self.intro = intro + + def connect(self): + """ + connect scenes to signals + """ + handlers["config_saved"].connect(self.on_config_saved) + + def disconnect(self): + """ + disconnect scenes from signals + """ + handlers["config_saved"].disconnect(self.on_config_saved) + + def __del__(self): + self.disconnect() + + def on_config_saved(self, event:ConfigSaved): + self.config = event.data + self.emit_status() + def apply_scene_config(self, scene_config:dict): scene_config = SceneConfig(**scene_config) @@ -690,7 +881,7 @@ class Scene(Emitter): for message in messages: if isinstance(message, DirectorMessage): for idx in range(len(self.history) - 1, -1, -1): - if isinstance(self.history[idx], DirectorMessage): + if isinstance(self.history[idx], DirectorMessage) and self.history[idx].source == message.source: self.history.pop(idx) break @@ -712,6 +903,83 @@ class Scene(Emitter): events.GameLoopNewMessageEvent(scene=self, event_type="game_loop_new_message", message=message) )) + def pop_history(self, typ:str, source:str, all:bool=False, max_iterations:int=None): + + """ + Removes the last message from the history that matches the given typ and source + """ + iterations = 0 + for idx in range(len(self.history) - 1, -1, -1): + if self.history[idx].typ == typ and self.history[idx].source == source: + self.history.pop(idx) + if not all: + return + iterations += 1 + if max_iterations and iterations >= max_iterations: + break + + def find_message(self, typ:str, source:str, max_iterations:int=100): + + """ + Finds the last message in the history that matches the given typ and source + """ + iterations = 0 + for idx in range(len(self.history) - 1, -1, -1): + if self.history[idx].typ == typ and self.history[idx].source == source: + return self.history[idx] + + iterations += 1 + if iterations >= max_iterations: + return None + + def message_index(self, message_id:int) -> int: + """ + Returns the index of the given message in the history + """ + for idx in range(len(self.history) - 1, -1, -1): + if self.history[idx].id == message_id: + return idx + return -1 + + def collect_messages(self, typ:str=None, source:str=None, max_iterations:int=100): + + """ + Finds all messages in the history that match the given typ and source + """ + + messages = [] + iterations = 0 + for idx in range(len(self.history) - 1, -1, -1): + if (not typ or self.history[idx].typ == typ) and (not source or self.history[idx].source == source): + messages.append(self.history[idx]) + + iterations += 1 + if iterations >= max_iterations: + break + + return messages + + def snapshot(self, lines:int=3, ignore:list=None, start:int=None) -> str: + """ + Returns a snapshot of the scene history + """ + + if not ignore: + ignore = [ReinforcementMessage, DirectorMessage] + + collected = [] + + segment = self.history[-lines:] if not start else self.history[:start+1][-lines:] + + for idx in range(len(segment) - 1, -1, -1): + if isinstance(segment[idx], tuple(ignore)): + continue + collected.insert(0, segment[idx]) + if len(collected) >= lines: + break + + return "\n".join([str(message) for message in collected]) + def push_archive(self, entry: data_objects.ArchiveEntry): """ @@ -829,7 +1097,7 @@ class Scene(Emitter): for actor in self.actors: if not isinstance(actor, Player): yield actor.character - + def num_npc_characters(self): return len(list(self.get_npc_characters())) @@ -841,6 +1109,17 @@ class Scene(Emitter): for actor in self.actors: yield actor.character + def process_npc_dialogue(self, actor:Actor, message: str): + self.saved = False + + # Store the most recent AI Actor + self.most_recent_ai_actor = actor + + for item in message: + emit( + "character", item, character=actor.character + ) + def set_description(self, description: str): """ Sets the description of the scene @@ -865,6 +1144,27 @@ class Scene(Emitter): """ return count_tokens(self.history) + def count_messages(self, message_type:str=None, source:str=None) -> int: + """ + Counts the number of messages in the history that match the given message_type and source + If no message_type or source is given, will return the total number of messages in the history + """ + + count = 0 + + for message in self.history: + if message_type and message.typ != message_type: + continue + if source and message.source != source and message.secondary_source != source: + continue + count += 1 + + return count + + def count_character_messages(self, character:Character) -> int: + return self.count_messages(message_type="character", source=character.name) + + async def summarized_dialogue_history( self, budget: int = 1024, @@ -893,140 +1193,62 @@ class Scene(Emitter): return summary + def context_history( - self, - budget: int = 1024, - min_dialogue: int = 10, - keep_director:bool=False, - insert_bot_token:int = None, - add_archieved_history:bool = True, - dialogue_negative_offset:int = 0, - sections=True, - max_dialogue: int = None, - **kwargs + self, + budget: int = 2048, + keep_director:Union[bool, str] = False, + **kwargs ): - """ - Return a list of messages from the history that are within the budget. - """ - - # we check if there is archived history - # we take the last entry and find the end index - # we then take the history from the end index to the end of the history - - if self.archived_history: - end = self.archived_history[-1].get("end", 0) - else: - end = 0 - - - history_length = len(self.history) - - # we then take the history from the end index to the end of the history - - if history_length - end < min_dialogue: - end = max(0, history_length - min_dialogue) - - if not dialogue_negative_offset: - dialogue = self.history[end:] - else: - dialogue = self.history[end:-dialogue_negative_offset] - - if not keep_director: - dialogue = [line for line in dialogue if not isinstance(line, DirectorMessage)] - - if max_dialogue: - dialogue = dialogue[-max_dialogue:] - - if dialogue and insert_bot_token is not None: - dialogue.insert(-insert_bot_token, "<|BOT|>") - - # iterate backwards through archived history and count how many entries - # there are that have an end index - num_archived_entries = 0 - if add_archieved_history: - for i in range(len(self.archived_history) - 1, -1, -1): - if self.archived_history[i].get("end") is None: - break - num_archived_entries += 1 + parts_context = [] + parts_dialogue = [] - show_intro = num_archived_entries <= 2 and add_archieved_history - reserved_min_archived_history_tokens = count_tokens(self.archived_history[-1]["text"]) if self.archived_history else 0 - reserved_intro_tokens = count_tokens(self.get_intro()) if show_intro else 0 - - max_dialogue_budget = min(max(budget - reserved_intro_tokens - reserved_min_archived_history_tokens, 500), budget) + budget_context = int(0.5 * budget) + budget_dialogue = int(0.5 * budget) - dialogue_popped = False - while count_tokens(dialogue) > max_dialogue_budget: - dialogue.pop(0) - - dialogue_popped = True - - if dialogue: - context_history = ["<|SECTION:DIALOGUE|>","\n".join(map(str, dialogue)), "<|CLOSE_SECTION|>"] - else: - context_history = [] - - if not sections and context_history: - context_history = [context_history[1]] - - # we only have room for dialogue, so we return it - if dialogue_popped and max_dialogue_budget >= budget: - return context_history - - # if we dont have lots of archived history, we can also include the scene - # description at tbe beginning of the context history - - archive_insert_idx = 0 + # collect dialogue - if show_intro: - - for character in self.characters: - if character.greeting_text and character.greeting_text != self.get_intro(): - context_history.insert(0, character.greeting_text) - archive_insert_idx += 1 - - context_history.insert(0, "") - context_history.insert(0, self.get_intro()) - archive_insert_idx += 2 - - # see how many tokens are in the dialogue - - used_budget = count_tokens(context_history) - - history_budget = budget - used_budget - - if history_budget <= 0: - return context_history - - # we then iterate through the archived history from the end to the beginning - # until we reach the budget - - i = len(self.archived_history) - 1 - limit = 5 + count = 0 - if sections: - context_history.insert(archive_insert_idx, "<|CLOSE_SECTION|>") - - while i >= 0 and limit > 0 and add_archieved_history: + for i in range(len(self.history) - 1, -1, -1): - # we skip predefined history, that should be joined in through - # long term memory queries + count += 1 - if self.archived_history[i].get("end") is None: + if isinstance(self.history[i], DirectorMessage): + if not keep_director: + continue + elif isinstance(keep_director, str) and self.history[i].source != keep_director: + continue + + if count_tokens(parts_dialogue) + count_tokens(self.history[i]) > budget_dialogue: break - text = self.archived_history[i]["text"] - if count_tokens(context_history) + count_tokens(text) > budget: + parts_dialogue.insert(0, self.history[i]) + + # collect context, ignore where end > len(history) - count + + for i in range(len(self.archived_history) - 1, -1, -1): + + end = self.archived_history[i].get("end") + start = self.archived_history[i].get("start") + + if end is None: + continue + + if start > len(self.history) - count: + continue + + if count_tokens(parts_context) + count_tokens(self.archived_history[i]["text"]) > budget_context: break - context_history.insert(archive_insert_idx, text) - i -= 1 - limit -= 1 - - if sections: - context_history.insert(0, "<|SECTION:HISTORY|>") - - return context_history + parts_context.insert(0, self.archived_history[i]["text"]) + + if count_tokens(parts_context + parts_dialogue) < 1024: + intro = self.get_intro() + if intro: + parts_context.insert(0, intro) + + return list(map(str, parts_context)) + list(map(str, parts_dialogue)) async def rerun(self, editor: Optional[Helper] = None): """ @@ -1034,12 +1256,25 @@ class Scene(Emitter): and call talk() for the most recent AI Character. """ # Remove AI's last response and player's last message from the history - + idx = -1 try: - message = self.history[-1] + message = self.history[idx] except IndexError: return + # while message type is ReinforcementMessage, keep going back in history + # until we find a message that is not a ReinforcementMessage + # + # we need to pop the ReinforcementMessage from the history because + # previous messages may have contributed to the answer that the AI gave + # for the reinforcement message + + popped_reinforcement_messages = [] + + while isinstance(message, ReinforcementMessage): + popped_reinforcement_messages.append(self.history.pop()) + message = self.history[idx] + log.debug(f"Rerunning message: {message} [{message.id}]") if message.source == "player": @@ -1056,6 +1291,9 @@ class Scene(Emitter): await self._rerun_director_message(message) else: return + + for message in popped_reinforcement_messages: + await self._rerun_reinforcement_message(message) async def _rerun_narrator_message(self, message): @@ -1063,12 +1301,12 @@ class Scene(Emitter): emit("remove_message", "", id=message.id) source, arg = message.source.split(":") if message.source and ":" in message.source else (message.source, None) - log.debug(f"Rerunning narrator message: {source} [{message.id}]") + log.debug(f"Rerunning narrator message: {source} - {arg} [{message.id}]") narrator = self.get_helper("narrator") - if source == "progress_story": - new_message = await narrator.agent.progress_story() + if source.startswith("progress_story"): + new_message = await narrator.agent.progress_story(arg) elif source == "narrate_scene": new_message = await narrator.agent.narrate_scene() elif source == "narrate_character" and arg: @@ -1079,12 +1317,16 @@ class Scene(Emitter): elif source == "narrate_dialogue": character = self.get_character(arg) new_message = await narrator.agent.narrate_after_dialogue(character) + elif source == "__director__": + director = self.get_helper("director").agent + await director.direct_scene(None, None) + return else: fn = getattr(narrator.agent, source, None) if not fn: return args = arg.split(";") if arg else [] - new_message = await fn(*args) + new_message = await fn(narrator.agent, *args) save_source = f"{source}:{arg}" if arg else source @@ -1150,7 +1392,14 @@ class Scene(Emitter): await asyncio.sleep(0) return new_messages - + + async def _rerun_reinforcement_message(self, message): + log.info(f"Rerunning reinforcement message: {message} [{message.id}]") + world_state_agent = self.get_helper("world_state").agent + + question, character_name = message.source.split(":") + + await world_state_agent.update_reinforcement(question, character_name) def delete_message(self, message_id: int): """ @@ -1170,6 +1419,7 @@ class Scene(Emitter): break def emit_status(self): + player_character = self.get_player_character() emit( "scene_status", self.name, @@ -1177,10 +1427,16 @@ class Scene(Emitter): data={ "environment": self.environment, "scene_config": self.scene_config, + "player_character_name": player_character.name if player_character else None, + "context": self.context, "assets": self.assets.dict(), "characters": [actor.character.serialize for actor in self.actors], "scene_time": util.iso8601_duration_to_human(self.ts, suffix="") if self.ts else None, "saved": self.saved, + "auto_save": self.auto_save, + "auto_progress": self.auto_progress, + "game_state": self.game_state.model_dump(), + "active_pins": [pin.model_dump() for pin in self.active_pins], }, ) @@ -1193,6 +1449,13 @@ class Scene(Emitter): self.environment = environment self.emit_status() + def set_content_context(self, context: str): + """ + Updates the content context of the scene + """ + self.context = context + self.emit_status() + def advance_time(self, ts: str): """ Accepts an iso6801 duration string and advances the scene's world state by that amount @@ -1255,13 +1518,24 @@ class Scene(Emitter): if not found: return None - return ts + return ts + async def load_active_pins(self): + """ + Loads active pins from the world state manager + """ + + _active_pins = await self.world_state_manager.get_pins(active=True) + self.active_pins = list(_active_pins.pins.values()) + async def start(self): """ Start the scene """ automated_action.initialize_for_scene(self) + + await self.load_active_pins() + self.emit_status() first_loop = True @@ -1283,11 +1557,14 @@ class Scene(Emitter): await asyncio.sleep(0.01) - async def _run_game_loop(self, init: bool = True): if init: + + self.game_state.init(self) + await self.signals["scene_init"].send(events.SceneStateEvent(scene=self, event_type="scene_init")) + emit("clear_screen", "") self.narrator_message(self.get_intro()) @@ -1319,24 +1596,43 @@ class Scene(Emitter): emit("character", item, character=actor.character) if not actor.character.is_player: self.most_recent_ai_actor = actor + self.world_state.emit() + elif init: + await self.world_state.request_update(initial_only=True) # sort self.actors by actor.character.is_player, making is_player the first element self.actors.sort(key=lambda x: x.character.is_player, reverse=True) self.active_actor = None self.next_actor = None + signal_game_loop = True + + await self.signals["game_loop_start"].send(events.GameLoopStartEvent(scene=self, event_type="game_loop_start")) + await self.world_state_manager.apply_all_auto_create_templates() + while continue_scene: + log.debug("game loop", auto_save=self.auto_save, auto_progress=self.auto_progress) + + try: + await self.load_active_pins() + game_loop = events.GameLoopEvent(scene=self, event_type="game_loop", had_passive_narration=False) + if signal_game_loop: + await self.signals["game_loop"].send(game_loop) - await self.signals["game_loop"].send(events.GameLoopEvent(scene=self, event_type="game_loop")) + signal_game_loop = True for actor in self.actors: - if self.next_actor and actor.character.name != self.next_actor: + if not self.auto_progress and not actor.character.is_player: + # auto progress is disabled, so NPCs don't get automatic turns + continue + + if self.next_actor and actor.character.name != self.next_actor and self.auto_progress: self.log.debug(f"Skipping actor", actor=actor.character.name, next_actor=self.next_actor) continue @@ -1353,27 +1649,34 @@ class Scene(Emitter): if isinstance(actor, Player) and type(message) != list: # Don't append message to the history if it's "rerun" if await command.execute(message): + signal_game_loop = False break await self.call_automated_actions() await self.signals["game_loop_actor_iter"].send( - events.GameLoopActorIterEvent(scene=self, event_type="game_loop_actor_iter", actor=actor) + events.GameLoopActorIterEvent( + scene=self, + event_type="game_loop_actor_iter", + actor=actor, + game_loop=game_loop, + ) ) continue - self.saved = False - - # Store the most recent AI Actor - self.most_recent_ai_actor = actor - - for item in message: - emit( - "character", item, character=actor.character - ) + self.process_npc_dialogue(actor, message) await self.signals["game_loop_actor_iter"].send( - events.GameLoopActorIterEvent(scene=self, event_type="game_loop_actor_iter", actor=actor) + events.GameLoopActorIterEvent( + scene=self, + event_type="game_loop_actor_iter", + actor=actor, + game_loop=game_loop, + ) ) + + + if self.auto_save: + await self.save(auto=True) self.emit_status() @@ -1422,39 +1725,41 @@ class Scene(Emitter): self.log.error("creative_loop", error=e, unhandled=True, traceback=traceback.format_exc()) emit("system", status="error", message=f"Unhandled Error: {e}") - @property - def save_dir(self): - saves_dir = os.path.join( - os.path.dirname(os.path.realpath(__file__)), - "..", - "..", - "scenes", - self.project_name, - ) - - if not os.path.exists(saves_dir): - os.makedirs(saves_dir) - - return saves_dir + + def set_new_memory_session_id(self): + self.saved_memory_session_id = self.memory_session_id + self.memory_session_id = str(uuid.uuid4())[:10] + log.debug("set_new_memory_session_id", saved_memory_session_id=self.saved_memory_session_id, memory_session_id=self.memory_session_id) + self.emit_status() - async def save(self, save_as:bool=False): + async def save(self, save_as:bool=False, auto:bool=False): """ Saves the scene data, conversation history, archived history, and characters to a json file. """ scene = self - + + if self.immutable_save and not save_as: + save_as = True + if save_as: self.filename = None - if not self.name: + if not self.name and not auto: self.name = await wait_for_input("Enter scenario name: ") self.filename = "base.json" - elif not self.filename: + elif not self.filename and not auto: self.filename = await wait_for_input("Enter save name: ") self.filename = self.filename.replace(" ", "-").lower()+".json" + elif not self.filename or not self.name and auto: + # scene has never been saved, don't auto save + return + + self.set_new_memory_session_id() + if save_as: + self.immutable_save = False memory_agent = self.get_helper("memory").agent memory_agent.close_db(self) self.memory_id = str(uuid.uuid4())[:10] @@ -1463,7 +1768,7 @@ class Scene(Emitter): saves_dir = self.save_dir - log.info(f"Saving to: {saves_dir}") + log.info("Saving", filename=self.filename, saves_dir=saves_dir, auto=auto) # Generate filename with date and normalized character name filepath = os.path.join(saves_dir, self.filename) @@ -1481,18 +1786,24 @@ class Scene(Emitter): "goal": scene.goal, "goals": scene.goals, "context": scene.context, - "world_state": scene.world_state.dict(), + "world_state": scene.world_state.model_dump(), + "game_state": scene.game_state.model_dump(), "assets": scene.assets.dict(), "memory_id": scene.memory_id, + "memory_session_id": scene.memory_session_id, + "saved_memory_session_id": scene.saved_memory_session_id, + "immutable_save": scene.immutable_save, "ts": scene.ts, } - emit("system", "Saving scene data to: " + filepath) + if not auto: + emit("status", status="success", message="Saved scene") with open(filepath, "w") as f: json.dump(scene_data, f, indent=2, cls=save.SceneEncoder) self.saved = True + self.emit_status() async def commit_to_memory(self): @@ -1520,6 +1831,7 @@ class Scene(Emitter): for character in self.characters: await character.commit_to_memory(memory) + await self.world_state.commit_to_memory(memory) def reset(self): self.history = [] diff --git a/src/talemate/thematic_generators.py b/src/talemate/thematic_generators.py new file mode 100644 index 00000000..732a17ac --- /dev/null +++ b/src/talemate/thematic_generators.py @@ -0,0 +1,345 @@ +import random + +__all__ = ["ThematicGenerator"] + +# ABSTRACT ARTISTIC + +abstract_artistic_prefixes = [ + "Joyful", "Sorrowful", "Raging", "Serene", "Melancholic", + "Windy", "Earthy", "Fiery", "Watery", "Skybound", + "Starry", "Eclipsed", "Cometary", "Nebulous", "Voidlike", + "Springtime", "Summery", "Autumnal", "Wintry", "Monsoonal", + "Dawnlike", "Dusky", "Midnight", "Noonday", "Twilight", + "Melodic", "Harmonic", "Rhythmic", "Crescendoing", "Silent", + "Existential", "Chaotic", "Orderly", "Free", "Destined", + "Crimson", "Azure", "Emerald", "Onyx", "Golden", +] + +abstract_artistic_suffixes = [ + "Sonata", "Mural", "Ballet", "Haiku", "Symphony", + "Storm", "Blossom", "Quake", "Tide", "Aurora", + "Voyage", "Ascent", "Descent", "Crossing", "Quest", + "Enchantment", "Vision", "Awakening", "Binding", "Transformation", + "Weaving", "Sculpting", "Forging", "Painting", "Composing", + "Reflection", "Question", "Insight", "Theory", "Revelation", + "Prayer", "Meditation", "Revelation", "Ritual", "Pilgrimage", + "Laughter", "Tears", "Sigh", "Shiver", "Whisper" +] + +# PERSONALITY + +personality = [ + "Adventurous", "Ambitious", "Amiable", "Amusing", "Articulate", + "Assertive", "Attentive", "Bold", "Brave", "Calm", + "Capable", "Careful", "Caring", "Cautious", "Charming", + "Cheerful", "Clever", "Confident", "Conscientious", "Considerate", + "Cooperative", "Courageous", "Courteous", "Creative", "Curious", + "Daring", "Decisive", "Determined", "Diligent", "Diplomatic", + "Discreet", "Dynamic", "Easygoing", "Efficient", "Energetic", + "Enthusiastic", "Fair", "Faithful", "Fearless", "Forceful", + "Forgiving", "Frank", "Friendly", "Funny", "Generous", + "Gentle", "Good", "Hardworking", "Helpful", "Honest", + "Honorable", "Humorous", "Idealistic", "Imaginative", "Impartial", + "Independent", "Intelligent", "Intuitive", "Inventive", "Kind", + "Lively", "Logical", "Loving", "Loyal", "Modest", + "Neat", "Nice", "Optimistic", "Passionate", "Patient", + "Persistent", "Philosophical", "Placid", "Plucky", "Polite", + "Powerful", "Practical", "Proactive", "Quick", "Quiet", + "Rational", "Realistic", "Reliable", "Reserved", "Resourceful", + "Respectful", "Responsible", "Romantic", "Self-confident", "Self-disciplined", + "Sensible", "Sensitive", "Shy", "Sincere", "Sociable", + "Straightforward", "Sympathetic", "Thoughtful", "Tidy", "Tough", + "Trustworthy", "Unassuming", "Understanding", "Versatile", "Warmhearted", + "Willing", "Wise", "Witty" +] + +# COLORS + +colors = [ + "Amaranth", "Amber", "Amethyst", "Apricot", "Aquamarine", + "Azure", "Baby blue", "Beige", "Black", "Blue", + "Blue-green", "Blue-violet", "Blush", "Bronze", "Brown", + "Burgundy", "Byzantium", "Carmine", "Cerise", "Cerulean", + "Champagne", "Chartreuse green", "Chocolate", "Cobalt blue", "Coffee", + "Copper", "Coral", "Crimson", "Cyan", "Desert sand", + "Electric blue", "Emerald", "Erin", "Gold", "Gray", + "Green", "Harlequin", "Indigo", "Ivory", "Jade", + "Jungle green", "Lavender", "Lemon", "Lilac", "Lime", + "Magenta", "Magenta rose", "Maroon", "Mauve", "Navy blue", + "Ocher", "Olive", "Orange", "Orange-red", "Orchid", + "Peach", "Pear", "Periwinkle", "Persian blue", "Pink", + "Plum", "Prussian blue", "Puce", "Purple", "Raspberry", + "Red", "Red-violet", "Rose", "Ruby", "Salmon", + "Sangria", "Sapphire", "Scarlet", "Silver", "Slate gray", + "Spring bud", "Spring green", "Tan", "Taupe", "Teal", + "Turquoise", "Violet", "Viridian", "White", "Yellow" +] + +# STATES OF MATTER + +states_of_matter = [ + "Solid", "Liquid", "Gas", "Plasma", +] + +# BERRY DESSERT + +berry_prefixes = [ + "Blueberry", "Strawberry", "Raspberry", "Blackberry", "Cranberry", + "Boysenberry", "Elderberry", "Gooseberry", "Huckleberry", "Lingonberry", + "Mulberry", "Salmonberry", "Cloudberry" +] + +dessert_suffixes = [ + "Muffin", "Pie", "Jam", "Scone", "Tart", + "Crumble", "Cobbler", "Crisp", "Pudding", "Cake", + "Bread", "Butter", "Sauce", "Syrup" +] + +# HUMAN ETHNICITY + +ethnicities = [ + "African", + "Arab", + "Asian", + "European", + "Scandinavian", + "East European", + "Indian", + "Latin American", + "North American", + "South American" +] + +# HUMAN NAMES, FEMALE, 20 PER ETHNICITY + +human_names_female = { + "African": [ + "Abebi", "Abeni", "Abimbola", "Abioye", "Abrihet", + "Adanna", "Adanne", "Adesina", "Adhiambo", "Adjoa", + "Adwoa", "Afia", "Afiya", "Afolake", "Afolami", + "Afua", "Agana", "Agbenyaga", "Aisha", "Akachi" + ], + "Arab": [ + "Aaliyah", "Aisha", "Amal", "Amina", "Amira", + "Fatima", "Habiba", "Halima", "Hana", "Huda", + "Jamilah", "Jasmin", "Layla", "Leila", "Lina", + "Mariam", "Maryam", "Nadia", "Naima", "Nour" + ], + "Asian": [ + "Aiko", "Akari", "Akemi", "Akiko", "Aki", + "Ayako", "Chieko", "Chika", "Chinatsu", "Chiyoko", + "Eiko", "Emi", "Eri", "Etsuko", "Fumiko", + "Hana", "Haru", "Harumi", "Hikari", "Hina" + ], + "European": [ + "Adelina", "Adriana", "Alessia", "Alexandra", "Alice", + "Alina", "Amalia", "Amelia", "Anastasia", "Anca", + "Andreea", "Aneta", "Aniela", "Anita", "Anna", + "Antonia", "Ariana", "Aurelia", "Beatrice", "Bianca" + ], + "Scandinavian": [ + "Aase", "Aina", "Alfhild", "Ane", "Anja", + "Astrid", "Birgit", "Bodil", "Borghild", "Dagmar", + "Elin", "Ellinor", "Elsa", "Else", "Embla", + "Emma", "Erika", "Freja", "Gerd", "Gudrun" + ], + "East European": [ + "Adela", "Adriana", "Agata", "Alina", "Ana", + "Anastasia", "Anca", "Andreea", "Aneta", "Aniela", + "Anita", "Anna", "Antonia", "Ariana", "Aurelia", + "Beatrice", "Bianca", "Camelia", "Carina", "Carmen" + ], + "Indian": [ + "Aarushi", "Aditi", "Aishwarya", "Amrita", "Ananya", + "Anika", "Anjali", "Anushka", "Aparna", "Arya", + "Avani", "Chandni", "Darshana", "Deepika", "Devika", + "Diya", "Gauri", "Gayatri", "Isha", "Ishani" + ], + "Latin American": [ + "Adriana", "Alejandra", "Alicia", "Ana", "Andrea", + "Angela", "Antonia", "Aurora", "Beatriz", "Camila", + "Carla", "Carmen", "Catalina", "Clara", "Cristina", + "Daniela", "Diana", "Elena", "Emilia", "Eva" + ], + "North American": [ + "Abigail", "Addison", "Amelia", "Aria", "Aurora", + "Avery", "Charlotte", "Ella", "Elizabeth", "Emily", + "Emma", "Evelyn", "Grace", "Harper", "Isabella", + "Layla", "Lily", "Mia", "Olivia", "Sophia" + ], + "South American": [ + "Alessandra", "Ana", "Antonia", "Bianca", "Camila", + "Carla", "Carolina", "Clara", "Daniela", "Elena", + "Emilia", "Fernanda", "Gabriela", "Isabella", "Julia", + "Laura", "Luisa", "Maria", "Mariana", "Sofia" + ], +} + +# HUMAN NAMES, MALE, 20 PER ETHNICITY + +human_names_male = { + "African": [ + "Ababuo", "Abdalla", "Abdul", "Abdullah", "Abel", + "Abidemi", "Abimbola", "Abioye", "Abubakar", "Ade", + "Adeben", "Adegoke", "Adisa", "Adnan", "Adofo", + "Adom", "Adwin", "Afolabi", "Afolami", "Afolayan" + ], + "Arab": [ + "Abdul", "Abdullah", "Ahmad", "Ahmed", "Ali", + "Amir", "Anwar", "Bilal", "Elias", "Emir", + "Faris", "Hassan", "Hussein", "Ibrahim", "Imran", + "Isa", "Khalid", "Mohammed", "Mustafa", "Omar" + ], + "Asian": [ + "Akio", "Akira", "Akiyoshi", "Amane", "Aoi", + "Arata", "Asahi", "Asuka", "Atsushi", "Daichi", + "Daiki", "Daisuke", "Eiji", "Haru", "Haruki", + "Haruto", "Hayato", "Hibiki", "Hideaki", "Hideo" + ], + "European": [ + "Adrian", "Alexandru", "Andrei", "Anton", "Bogdan", + "Cristian", "Daniel", "David", "Dorian", "Dragos", + "Eduard", "Florin", "Gabriel", "George", "Ion", + "Iulian", "Lucian", "Marius", "Mihai", "Nicolae" + ], + "Scandinavian": [ + "Aage", "Aksel", "Alf", "Anders", "Arne", + "Asbjorn", "Bjarne", "Bo", "Carl", "Christian", + "Einar", "Elias", "Erik", "Finn", "Frederik", + "Gunnar", "Gustav", "Hans", "Harald", "Henrik" + ], + "East European": [ + "Adrian", "Alexandru", "Andrei", "Anton", "Bogdan", + "Cristian", "Daniel", "David", "Dorian", "Dragos", + "Eduard", "Florin", "Gabriel", "George", "Ion", + "Iulian", "Lucian", "Marius", "Mihai", "Nicolae" + ], + "Indian": [ + "Aarav", "Aayush", "Aditya", "Aman", "Amit", + "Anand", "Anil", "Anirudh", "Anish", "Anuj", + "Arjun", "Arun", "Aryan", "Ashish", "Ashok", + "Ayush", "Deepak", "Dev", "Dhruv", "Ganesh" + ], + "Latin American": [ + "Alejandro", "Andres", "Antonio", "Carlos", "Cesar", + "Cristian", "Daniel", "David", "Diego", "Eduardo", + "Emiliano", "Esteban", "Fernando", "Francisco", "Gabriel", + "Gustavo", "Javier", "Jesus", "Jorge", "Jose" + ], + "North American": [ + "Aiden", "Alexander", "Benjamin", "Carter", "Daniel", + "Elijah", "Ethan", "Henry", "Jackson", "Jacob", + "James", "Jayden", "John", "Liam", "Logan", + "Lucas", "Mason", "Michael", "Noah", "Oliver" + ], + "South American": [ + "Alejandro", "Andres", "Antonio", "Carlos", "Cesar", + "Cristian", "Daniel", "David", "Diego", "Eduardo", + "Emiliano", "Esteban", "Fernando", "Francisco", "Gabriel", + "Gustavo", "Javier", "Jesus", "Jorge", "Jose" + ], +} + +# SCIFI TROPES + +scifi_tropes = [ + "AI", "Alien", "Android", "Asteroid Belt", + "Black Hole", "Colony", "Dark Matter", "Droid", + "Dyson Sphere", "Exoplanet", "FTL", "Galaxy", + "Generation Ship", "Hyperspace", "Interstellar", + "Ion Drive", "Laser Weapon", "Lightspeed", "Meteorite", + "Moon", "Nebula", "Neutron Star", "Orbit", + "Planet", "Quasar", "Rocket", "Rogue Planet", + "Satellite", "Solar", "Time Travel", "Warp Drive", + "Wormhole", "Xenobiology", "Xenobotany", "Xenology", + "Xenozoology", "Zero Gravity" +] + +# ACTOR NAME COLOR + +actor_name_colors = [ + "#F08080", "#FFD700", "#90EE90", "#ADD8E6", "#DDA0DD", + "#FFB6C1", "#FAFAD2", "#D3D3D3", "#B0E0E6", "#FFDEAD" +] + +class ThematicGenerator: + + def __init__(self, seed:int=None): + self.seed = seed + self.custom_lists = {} + + def _generate(self, prefixes:list[str], suffixes:list[str]): + try: + random.seed(self.seed) + if prefixes and suffixes: + return (random.choice(prefixes) + " " + random.choice(suffixes)).strip() + else: + return random.choice(prefixes or suffixes) + + finally: + random.seed() + + def generate(self,*list_names) -> str: + """ + Generates a name from a list of lists + """ + tags = [] + delimiter = ", " + try: + random.seed(self.seed) + generation = "" + for list_name in list_names: + fn = getattr(self, list_name) + tags.append(fn()) + + generation = delimiter.join(tags) + + return generation + + finally: + random.seed() + + def add(self, list_name:str, words:list[str]): + """ + Adds a custom list + """ + if hasattr(self, list_name): + raise ValueError(f"List name {list_name} is already in use") + self.custom_lists[list_name] = words + setattr(self, list_name, lambda: random.choice(self.custom_lists[list_name])) + + def abstract_artistic(self): + return self._generate(abstract_artistic_prefixes, abstract_artistic_suffixes) + + def berry_dessert(self): + return self._generate(berry_prefixes, dessert_suffixes) + + def personality(self): + return random.choice(personality) + + def ethnicity(self): + return random.choice(ethnicities) + + def actor_name_color(self): + return random.choice(actor_name_colors) + + def color(self): + return random.choice(colors) + + def state_of_matter(self): + return random.choice(states_of_matter) + + def scifi_trope(self): + return random.choice(scifi_tropes) + + def human_name_female(self, ethnicity:str=None): + if not ethnicity: + ethnicity = self.ethnicity() + + return self._generate(human_names_female[ethnicity], []) + + def human_name_male(self, ethnicity:str=None): + if not ethnicity: + ethnicity = self.ethnicity() + + return self._generate(human_names_male[ethnicity], []) \ No newline at end of file diff --git a/src/talemate/util.py b/src/talemate/util.py index 93122b9c..12e0e7ba 100644 --- a/src/talemate/util.py +++ b/src/talemate/util.py @@ -279,27 +279,6 @@ def replace_conditional(input_string: str, params) -> str: return modified_string -def pronouns(gender: str) -> tuple[str, str]: - """ - Returns the pronouns for gender - """ - - if gender == "female": - possessive_determiner = "her" - pronoun = "she" - elif gender == "male": - possessive_determiner = "his" - pronoun = "he" - elif gender == "fluid" or gender == "nonbinary" or not gender: - possessive_determiner = "their" - pronoun = "they" - else: - possessive_determiner = "its" - pronoun = "it" - - return (pronoun, possessive_determiner) - - def strip_partial_sentences(text:str) -> str: # Sentence ending characters sentence_endings = ['.', '!', '?', '"', "*"] @@ -356,141 +335,34 @@ def clean_message(message: str) -> str: message = message.replace("[", "*").replace("]", "*") return message -def clean_dialogue_old(dialogue: str, main_name: str = None) -> str: - """ - Cleans up generated dialogue by removing unnecessary whitespace and newlines. - - Args: - dialogue (str): The input dialogue to be cleaned. - - Returns: - str: The cleaned dialogue. - """ - - - - cleaned_lines = [] - current_name = None - - for line in dialogue.split("\n"): - if current_name is None and main_name is not None and ":" not in line: - line = f"{main_name}: {line}" - - if ":" in line: - name, message = line.split(":", 1) - name = name.strip() - if name != main_name: - break - - message = clean_message(message) - - if not message: - current_name = name - elif current_name is not None: - cleaned_lines.append(f"{current_name}: {message}") - current_name = None - else: - cleaned_lines.append(f"{name}: {message}") - elif current_name is not None: - message = clean_message(line) - if message: - cleaned_lines.append(f"{current_name}: {message}") - current_name = None - - cleaned_dialogue = "\n".join(cleaned_lines) - return cleaned_dialogue - def clean_dialogue(dialogue: str, main_name: str) -> str: - # keep spliting the dialogue by : with a max count of 1 - # until the left side is no longer the main name - - cleaned_dialogue = "" - - # find all occurances of : and then walk backwards - # and mark the first one that isnt preceded by the {main_name} - cutoff = -1 - log.debug("clean_dialogue", dialogue=dialogue, main_name=main_name) - for match in re.finditer(r":", dialogue, re.MULTILINE): - index = match.start() - check = dialogue[index-len(main_name):index] - log.debug("clean_dialogue", check=check, main_name=main_name) - if check != main_name: - cutoff = index - break - - # then split dialogue at the index and return on only - # the left side - - if cutoff > -1: - log.debug("clean_dialogue", index=index) - cleaned_dialogue = dialogue[:index] - cleaned_dialogue = strip_partial_sentences(cleaned_dialogue) - - # remove all occurances of "{main_name}: " and then prepend it once - - cleaned_dialogue = cleaned_dialogue.replace(f"{main_name}: ", "") - cleaned_dialogue = f"{main_name}: {cleaned_dialogue}" - - return clean_message(cleaned_dialogue) + # re split by \n{not main_name}: with a max count of 1 + pattern = r"\n(?!{}:).*".format(re.escape(main_name)) + # Splitting the text using the updated regex pattern + dialogue = re.split(pattern, dialogue)[0] dialogue = dialogue.replace(f"{main_name}: ", "") dialogue = f"{main_name}: {dialogue}" return clean_message(strip_partial_sentences(dialogue)) - -def clean_attribute(attribute: str) -> str: +def clean_id(name: str) -> str: """ - Cleans up an attribute by removing unnecessary whitespace and newlines. + Cleans up a id name by removing all characters that aren't a-zA-Z0-9_- - Also will remove any additional attributees. + Spaces are allowed. Args: - attribute (str): The input attribute to be cleaned. + name (str): The input id name to be cleaned. Returns: - str: The cleaned attribute. + str: The cleaned id name. """ - - special_chars = [ - "#", - "`", - "!", - "@", - "$", - "%", - "^", - "&", - "*", - "(", - ")", - "-", - "_", - "=", - "+", - "[", - "{", - "]", - "}", - "|", - ";", - ":", - ",", - "<", - ".", - ">", - "/", - "?", - ] - - for char in special_chars: - attribute = attribute.split(char)[0].strip() - - return attribute.strip() - - - + # Remove all characters that aren't a-zA-Z0-9_- + cleaned_name = re.sub(r"[^a-zA-Z0-9_\- ]", "", name) + + return cleaned_name def duration_to_timedelta(duration): """Convert an isodate.Duration object or a datetime.timedelta object to a datetime.timedelta object.""" @@ -813,7 +685,7 @@ def dedupe_sentences(line_a:str, line_b:str, similarity_threshold:int=95, debug: return " ".join(cleaned_line_a_sentences) -def dedupe_string(s: str, min_length: int = 32, similarity_threshold: int = 95, debug: bool = False) -> str: +def dedupe_string_old(s: str, min_length: int = 32, similarity_threshold: int = 95, debug: bool = False) -> str: """ Removes duplicate lines from a string. @@ -849,6 +721,42 @@ def dedupe_string(s: str, min_length: int = 32, similarity_threshold: int = 95, return "\n".join(deduped) +def dedupe_string(s: str, min_length: int = 32, similarity_threshold: int = 95, debug: bool = False) -> str: + + """ + Removes duplicate lines from a string going from the bottom up. + + Arguments: + s (str): The input string. + min_length (int): The minimum length of a line to be checked for duplicates. + similarity_threshold (int): The similarity threshold to use when comparing lines. + debug (bool): Whether to log debug messages. + + Returns: + str: The deduplicated string. + """ + + lines = s.split("\n") + deduped = [] + + for line in reversed(lines): + stripped_line = line.strip() + if len(stripped_line) > min_length: + similar_found = False + for existing_line in deduped: + similarity = fuzz.ratio(stripped_line, existing_line.strip()) + if similarity >= similarity_threshold: + similar_found = True + if debug: + log.debug("DEDUPE", similarity=similarity, line=line, existing_line=existing_line) + break + if not similar_found: + deduped.append(line) + else: + deduped.append(line) # Allow shorter strings without dupe check + + return "\n".join(reversed(deduped)) + def remove_extra_linebreaks(s: str) -> str: """ Removes extra line breaks from a string. @@ -918,6 +826,10 @@ def ensure_dialog_line_format(line:str): segment = None segment_open = None + line = line.strip() + + line = line.replace('"*', '"').replace('*"', '"') + for i in range(len(line)): @@ -1014,7 +926,9 @@ def ensure_dialog_line_format(line:str): segments[i] = clean_uneven_markers(segments[i], '"') segments[i] = clean_uneven_markers(segments[i], '*') - return " ".join(segment for segment in segments if segment).strip() + final = " ".join(segment for segment in segments if segment).strip() + final = final.replace('","', '').replace('"."', '') + return final def clean_uneven_markers(chunk:str, marker:str): diff --git a/src/talemate/world_state.py b/src/talemate/world_state.py deleted file mode 100644 index 0c51e619..00000000 --- a/src/talemate/world_state.py +++ /dev/null @@ -1,177 +0,0 @@ -from pydantic import BaseModel -from talemate.emit import emit -import structlog -import traceback -from typing import Union - -import talemate.instance as instance -from talemate.prompts import Prompt -import talemate.automated_action as automated_action - -log = structlog.get_logger("talemate") - -class CharacterState(BaseModel): - snapshot: Union[str, None] = None - emotion: Union[str, None] = None - -class ObjectState(BaseModel): - snapshot: Union[str, None] = None - -class WorldState(BaseModel): - - # characters in the scene by name - characters: dict[str, CharacterState] = {} - - # objects in the scene by name - items: dict[str, ObjectState] = {} - - # location description - location: Union[str, None] = None - - @property - def agent(self): - return instance.get_agent("world_state") - - @property - def pretty_json(self): - return self.model_dump_json(indent=2) - - @property - def as_list(self): - return self.render().as_list - - def reset(self): - self.characters = {} - self.items = {} - self.location = None - - def emit(self, status="update"): - emit("world_state", status=status, data=self.dict()) - - async def request_update(self, initial_only:bool=False): - - if initial_only and self.characters: - self.emit() - return - - self.emit(status="requested") - - try: - world_state = await self.agent.request_world_state() - except Exception as e: - self.emit() - log.error("world_state.request_update", error=e, traceback=traceback.format_exc()) - return - - previous_characters = self.characters - previous_items = self.items - scene = self.agent.scene - character_names = scene.character_names - self.characters = {} - self.items = {} - - for character_name, character in world_state.get("characters", {}).items(): - - # character name may not always come back exactly as we have - # it defined in the scene. We assign the correct name by checking occurences - # of both names in each other. - - if character_name not in character_names: - for _character_name in character_names: - if _character_name.lower() in character_name.lower() or character_name.lower() in _character_name.lower(): - log.debug("world_state adjusting character name", from_name=character_name, to_name=_character_name) - character_name = _character_name - break - - if not character: - continue - - # if emotion is not set, see if a previous state exists - # and use that emotion - - if "emotion" not in character: - log.debug("emotion not set", character_name=character_name, character=character, characters=previous_characters) - if character_name in previous_characters: - character["emotion"] = previous_characters[character_name].emotion - - self.characters[character_name] = CharacterState(**character) - log.debug("world_state", character=character) - - for item_name, item in world_state.get("items", {}).items(): - if not item: - continue - self.items[item_name] = ObjectState(**item) - log.debug("world_state", item=item) - - - await self.persist() - self.emit() - - async def persist(self): - - memory = instance.get_agent("memory") - world_state = instance.get_agent("world_state") - - # first we check if any of the characters were refered - # to with an alias - - states = [] - scene = self.agent.scene - - for character_name in self.characters.keys(): - states.append( - { - "text": f"{character_name}: {self.characters[character_name].snapshot}", - "id": f"{character_name}.world_state.snapshot", - "meta": { - "typ": "world_state", - "character": character_name, - "ts": scene.ts, - } - } - ) - - for item_name in self.items.keys(): - states.append( - { - "text": f"{item_name}: {self.items[item_name].snapshot}", - "id": f"{item_name}.world_state.snapshot", - "meta": { - "typ": "world_state", - "item": item_name, - "ts": scene.ts, - } - } - ) - - log.debug("world_state.persist", states=states) - - if not states: - return - - await memory.add_many(states) - - - async def request_update_inline(self): - - self.emit(status="requested") - - world_state = await self.agent.request_world_state_inline() - - self.emit() - - - def render(self): - - """ - Renders the world state as a string. - """ - - return Prompt.get( - "world_state.render", - vars={ - "characters": self.characters, - "items": self.items, - "location": self.location, - } - ) \ No newline at end of file diff --git a/src/talemate/world_state/__init__.py b/src/talemate/world_state/__init__.py new file mode 100644 index 00000000..399d49f0 --- /dev/null +++ b/src/talemate/world_state/__init__.py @@ -0,0 +1,455 @@ +from pydantic import BaseModel, Field, field_validator +from talemate.emit import emit +import structlog +import traceback +from typing import Union, Any +from enum import Enum + +import talemate.instance as instance +from talemate.prompts import Prompt +import talemate.automated_action as automated_action + +ANY_CHARACTER = "__any_character__" + +log = structlog.get_logger("talemate") + +class CharacterState(BaseModel): + snapshot: Union[str, None] = None + emotion: Union[str, None] = None + +class ObjectState(BaseModel): + snapshot: Union[str, None] = None + +class InsertionMode(Enum): + sequential = "sequential" + conversation_context = "conversation-context" + all_context = "all-context" + never = "never" + +class Reinforcement(BaseModel): + question: str + answer: Union[str, None] = None + interval: int = 10 + due: int = 0 + character: Union[str, None] = None + instructions: Union[str, None] = None + insert: str = "sequential" + + @property + def as_context_line(self) -> str: + if self.character: + + if self.question.strip().endswith("?"): + return f"{self.character}: {self.question} {self.answer}" + else: + return f"{self.character}'s {self.question}: {self.answer}" + + if self.question.strip().endswith("?"): + return f"{self.question} {self.answer}" + + return f"{self.question}: {self.answer}" + +class ManualContext(BaseModel): + id: str + text: str + meta: dict[str, Any] = {} + +class ContextPin(BaseModel): + entry_id: str + condition: Union[str, None] = None + condition_state: bool = False + active: bool = False + +class WorldState(BaseModel): + + # characters in the scene by name + characters: dict[str, CharacterState] = {} + + # objects in the scene by name + items: dict[str, ObjectState] = {} + + # location description + location: Union[str, None] = None + + # reinforcers + reinforce: list[Reinforcement] = [] + + # pins + pins: dict[str, ContextPin] = {} + + # manual context + manual_context: dict[str, ManualContext] = {} + + @property + def agent(self): + return instance.get_agent("world_state") + + @property + def scene(self): + return self.agent.scene + + @property + def pretty_json(self): + return self.model_dump_json(indent=2) + + @property + def as_list(self): + return self.render().as_list + + def filter_reinforcements(self, character:str=ANY_CHARACTER, insert:list[str]=None) -> list[Reinforcement]: + """ + Returns a filtered list of Reinforcement objects based on character and insert criteria. + + Arguments: + - character: The name of the character to filter reinforcements for. Use ANY_CHARACTER to include all. + - insert: A list of insertion modes to filter reinforcements by. + """ + """ + Returns a filtered set of results as list + """ + + result = [] + + for reinforcement in self.reinforce: + + if not reinforcement.answer: + continue + + if character != ANY_CHARACTER and reinforcement.character != character: + continue + + if insert and reinforcement.insert not in insert: + continue + + result.append(reinforcement) + + return result + + def reset(self): + """ + Resets the WorldState instance to its initial state by clearing characters, items, and location. + + Arguments: + - None + """ + self.characters = {} + self.items = {} + self.location = None + + def emit(self, status="update"): + """ + Emits the current world state with the given status. + + Arguments: + - status: The status of the world state to emit, which influences the handling of the update event. + """ + emit("world_state", status=status, data=self.model_dump()) + + async def request_update(self, initial_only:bool=False): + """ + Requests an update of the world state from the WorldState agent. If initial_only is true, emits current state without requesting if characters exist. + + Arguments: + - initial_only: A boolean flag to determine if only the initial state should be emitted without requesting a new one. + """ + + if initial_only and self.characters: + self.emit() + return + + # if auto is true, we need to check if agent has automatic update enabled + if initial_only and not self.agent.actions["update_world_state"].enabled: + self.emit() + return + + self.emit(status="requested") + + try: + world_state = await self.agent.request_world_state() + except Exception as e: + self.emit() + log.error("world_state.request_update", error=e, traceback=traceback.format_exc()) + return + + previous_characters = self.characters + previous_items = self.items + scene = self.agent.scene + character_names = scene.character_names + self.characters = {} + self.items = {} + + for character_name, character in world_state.get("characters", {}).items(): + + # character name may not always come back exactly as we have + # it defined in the scene. We assign the correct name by checking occurences + # of both names in each other. + + if character_name not in character_names: + for _character_name in character_names: + if _character_name.lower() in character_name.lower() or character_name.lower() in _character_name.lower(): + log.debug("world_state adjusting character name", from_name=character_name, to_name=_character_name) + character_name = _character_name + break + + if not character: + continue + + # if emotion is not set, see if a previous state exists + # and use that emotion + + if "emotion" not in character: + log.debug("emotion not set", character_name=character_name, character=character, characters=previous_characters) + if character_name in previous_characters: + character["emotion"] = previous_characters[character_name].emotion + + self.characters[character_name] = CharacterState(**character) + log.debug("world_state", character=character) + + for item_name, item in world_state.get("items", {}).items(): + if not item: + continue + self.items[item_name] = ObjectState(**item) + log.debug("world_state", item=item) + + + # deactivate persiting for now + # await self.persist() + self.emit() + + async def persist(self): + """ + Persists the world state snapshots of characters and items into the memory agent. + + TODO: neeeds re-thinking. + + Its better to use state reinforcement to track states, persisting the small world + state snapshots most of the time does not have enough context to be useful. + + Arguments: + - None + """ + + memory = instance.get_agent("memory") + world_state = instance.get_agent("world_state") + + # first we check if any of the characters were refered + # to with an alias + + states = [] + scene = self.agent.scene + + for character_name in self.characters.keys(): + states.append( + { + "text": f"{character_name}: {self.characters[character_name].snapshot}", + "id": f"{character_name}.world_state.snapshot", + "meta": { + "typ": "world_state", + "character": character_name, + "ts": scene.ts, + } + } + ) + + for item_name in self.items.keys(): + states.append( + { + "text": f"{item_name}: {self.items[item_name].snapshot}", + "id": f"{item_name}.world_state.snapshot", + "meta": { + "typ": "world_state", + "item": item_name, + "ts": scene.ts, + } + } + ) + + log.debug("world_state.persist", states=states) + + if not states: + return + + await memory.add_many(states) + + + async def request_update_inline(self): + """ + Requests an inline update of the world state from the WorldState agent and immediately emits the state. + + Arguments: + - None + """ + + self.emit(status="requested") + + world_state = await self.agent.request_world_state_inline() + + self.emit() + + + async def add_reinforcement( + self, + question:str, + character:str=None, + instructions:str=None, + interval:int=10, + answer:str="", + insert:str="sequential", + ) -> Reinforcement: + """ + Adds or updates a reinforcement in the world state. If a reinforcement with the same question and character exists, it is updated. + + Arguments: + - question: The question or prompt associated with the reinforcement. + - character: The character to whom the reinforcement is linked. If None, it applies globally. + - instructions: Instructions related to the reinforcement. + - interval: The interval for reinforcement repetition. + - answer: The answer to the reinforcement question. + - insert: The method of inserting the reinforcement into the context. + """ + + # if reinforcement already exists, update it + + idx, reinforcement = await self.find_reinforcement(question, character) + + if reinforcement: + + # update the reinforcement object + + reinforcement.instructions = instructions + reinforcement.interval = interval + reinforcement.answer = answer + + old_insert_method = reinforcement.insert + + reinforcement.insert = insert + + # find the reinforcement message i nthe scene history and update the answer + if old_insert_method == "sequential": + message = self.agent.scene.find_message(typ="reinforcement", source=f"{question}:{character if character else ''}") + + if old_insert_method != insert and message: + + # if it used to be sequential we need to remove its ReinforcmentMessage + # from the scene history + + self.scene.pop_history(typ="reinforcement", source=message.source) + + elif message: + message.message = answer + elif insert == "sequential": + # if it used to be something else and is now sequential, we need to run the state + # next loop + reinforcement.due = 0 + + # update the character detail if character name is specified + if character: + character = self.agent.scene.get_character(character) + await character.set_detail(question, answer) + + return reinforcement + + log.debug("world_state.add_reinforcement", question=question, character=character, instructions=instructions, interval=interval, answer=answer, insert=insert) + + reinforcement = Reinforcement( + question=question, + character=character, + instructions=instructions, + interval=interval, + answer=answer, + insert=insert, + ) + + self.reinforce.append(reinforcement) + + return reinforcement + + async def find_reinforcement(self, question:str, character:str=None): + """ + Finds a reinforcement based on the question and character provided. Returns the index in the list and the reinforcement object. + + Arguments: + - question: The question associated with the reinforcement to find. + - character: The character to whom the reinforcement is linked. Use None for global reinforcements. + """ + for idx, reinforcement in enumerate(self.reinforce): + if reinforcement.question == question and reinforcement.character == character: + return idx, reinforcement + return None, None + + def reinforcements_for_character(self, character:str): + """ + Returns a dictionary of reinforcements specifically for a given character. + + Arguments: + - character: The name of the character for whom reinforcements should be retrieved. + """ + reinforcements = {} + + for reinforcement in self.reinforce: + if reinforcement.character == character: + reinforcements[reinforcement.question] = reinforcement + + return reinforcements + + def reinforcements_for_world(self): + """ + Returns a dictionary of global reinforcements not linked to any specific character. + + Arguments: + - None + """ + reinforcements = {} + + for reinforcement in self.reinforce: + if not reinforcement.character: + reinforcements[reinforcement.question] = reinforcement + + return reinforcements + + async def remove_reinforcement(self, idx:int): + """ + Removes a reinforcement from the world state. + + Arguments: + - idx: The index of the reinforcement to remove. + """ + + # find all instances of the reinforcement in the scene history + # and remove them + source=f"{self.reinforce[idx].question}:{self.reinforce[idx].character if self.reinforce[idx].character else ''}" + self.agent.scene.pop_history(typ="reinforcement", source=source, all=True) + + self.reinforce.pop(idx) + + def render(self): + + """ + Renders the world state as a string. + """ + + return Prompt.get( + "world_state.render", + vars={ + "characters": self.characters, + "items": self.items, + "location": self.location, + } + ) + + async def commit_to_memory(self, memory_agent): + await memory_agent.add_many([ + manual_context.model_dump() for manual_context in self.manual_context.values() + ]) + + def manual_context_for_world(self) -> dict[str, ManualContext]: + + """ + Returns all manual context entries where meta["typ"] == "world_state" + """ + + return { + manual_context.id: manual_context + for manual_context in self.manual_context.values() + if manual_context.meta.get("typ") == "world_state" + } \ No newline at end of file diff --git a/src/talemate/world_state/manager.py b/src/talemate/world_state/manager.py new file mode 100644 index 00000000..8ab110ff --- /dev/null +++ b/src/talemate/world_state/manager.py @@ -0,0 +1,553 @@ +from typing import TYPE_CHECKING, Any +import pydantic +import structlog + +from talemate.instance import get_agent +from talemate.config import WorldStateTemplates, StateReinforcementTemplate, save_config +from talemate.world_state import Reinforcement, ManualContext, ContextPin, InsertionMode + +if TYPE_CHECKING: + from talemate.tale_mate import Scene + +log = structlog.get_logger("talemate.server.world_state_manager") + +class CharacterSelect(pydantic.BaseModel): + name: str + active: bool = True + is_player: bool = False + +class ContextDBEntry(pydantic.BaseModel): + text: str + meta: dict + id: Any + +class ContextDB(pydantic.BaseModel): + entries: list[ContextDBEntry] = [] + +class CharacterDetails(pydantic.BaseModel): + name: str + active: bool = True + is_player: bool = False + description: str = "" + base_attributes: dict[str,str] = {} + details: dict[str,str] = {} + reinforcements: dict[str, Reinforcement] = {} + +class World(pydantic.BaseModel): + entries: dict[str, ManualContext] = {} + reinforcements: dict[str, Reinforcement] = {} + +class CharacterList(pydantic.BaseModel): + characters: dict[str, CharacterSelect] = {} + +class HistoryEntry(pydantic.BaseModel): + text: str + start: int = None + end: int = None + ts: str = None + +class History(pydantic.BaseModel): + history: list[HistoryEntry] = [] + + +class AnnotatedContextPin(pydantic.BaseModel): + pin: ContextPin + text: str + time_aware_text: str + +class ContextPins(pydantic.BaseModel): + pins: dict[str, AnnotatedContextPin] = [] + +class WorldStateManager: + + @property + def memory_agent(self): + """ + Retrieves the memory agent instance. + + Returns: + The memory agent instance responsible for managing memory-related operations. + """ + return get_agent("memory") + + def __init__(self, scene:'Scene'): + """ + Initializes the WorldStateManager with a given scene. + + Arguments: + scene: The current scene containing characters and world details. + """ + self.scene = scene + self.world_state = scene.world_state + + async def get_character_list(self) -> CharacterList: + """ + Retrieves a list of characters from the current scene. + + Returns: + A CharacterList object containing the characters with their select properties from the scene. + """ + + characters = CharacterList() + + for character in self.scene.get_characters(): + characters.characters[character.name] = CharacterSelect(name=character.name, active=True, is_player=character.is_player) + + return characters + + async def get_character_details(self, character_name:str) -> CharacterDetails: + """ + Fetches and returns the details for a specific character by name. + + Arguments: + character_name: A string representing the unique name of the character. + + Returns: + A CharacterDetails object containing the character's details, attributes, and reinforcements. + """ + + character = self.scene.get_character(character_name) + + details = CharacterDetails(name=character.name, active=True, description=character.description, is_player=character.is_player) + + for key, value in character.base_attributes.items(): + details.base_attributes[key] = value + + for key, value in character.details.items(): + details.details[key] = value + + details.reinforcements = self.world_state.reinforcements_for_character(character_name) + + return details + + async def get_world(self) -> World: + """ + Retrieves the current state of the world, including entries and reinforcements. + + Returns: + A World object with the current state of the world. + """ + return World( + entries=self.world_state.manual_context_for_world(), + reinforcements=self.world_state.reinforcements_for_world() + ) + + async def get_context_db_entries(self, query:str, limit:int=20, **meta) -> ContextDB: + """ + Retrieves entries from the context database based on a query and metadata. + + Arguments: + query: The query string to search for. + limit: The maximum number of entries to return; defaults to 20. + **meta: Additional metadata parameters used for filtering results. + + Returns: + A ContextDB object containing the found entries. + """ + + if query.startswith("id:"): + _entries = await self.memory_agent.get_document(id=query[3:]) + _entries = list(_entries.values()) + else: + _entries = await self.memory_agent.multi_query([query], iterate=limit, max_tokens=9999999, **meta) + + entries = [] + for entry in _entries: + entries.append(ContextDBEntry(text=entry.raw, meta=entry.meta, id=entry.id)) + + context_db = ContextDB(entries=entries) + + return context_db + + async def get_pins(self, active:bool=None) -> ContextPins: + """ + Retrieves context pins that meet the specified activity condition. + + Arguments: + active: Optional boolean flag to filter pins based on their active state; defaults to None which returns all pins. + + Returns: + A ContextPins object containing the matching annotated context pins. + """ + + pins = self.world_state.pins + + candidates = [pin for pin in pins.values() if pin.active == active or active is None] + + _ids = [pin.entry_id for pin in candidates] + _pins = {} + documents = await self.memory_agent.get_document(id=_ids) + + for pin in sorted(candidates, key=lambda x: x.active, reverse=True): + + if pin.entry_id not in documents: + text = "" + time_aware_text = "" + else: + text = documents[pin.entry_id].raw + time_aware_text = str(documents[pin.entry_id]) + + annotated_pin = AnnotatedContextPin(pin=pin, text=text, time_aware_text=time_aware_text) + + _pins[pin.entry_id] = annotated_pin + + return ContextPins(pins=_pins) + + async def update_character_attribute(self, character_name:str, attribute:str, value:str): + """ + Updates the attribute of a character to a new value. + + Arguments: + character_name: The name of the character to be updated. + attribute: The attribute of the character that needs to be updated. + value: The new value to assign to the character's attribute. + """ + character = self.scene.get_character(character_name) + await character.set_base_attribute(attribute, value) + + async def update_character_detail(self, character_name:str, detail:str, value:str): + """ + Updates a specific detail of a character to a new value. + + Arguments: + character_name: The name of the character whose detail is to be updated. + detail: The detail key that needs to be updated. + value: The new value to be set for the detail. + """ + character = self.scene.get_character(character_name) + await character.set_detail(detail, value) + + async def update_character_description(self, character_name:str, description:str): + """ + Updates the description of a character to a new value. + + Arguments: + character_name: The name of the character whose description is to be updated. + description: The new description text for the character. + """ + character = self.scene.get_character(character_name) + await character.set_description(description) + + async def add_detail_reinforcement( + self, + character_name:str, + question:str, + instructions:str=None, + interval:int=10, + answer:str="", + insert:str="sequential", + run_immediately:bool=False + ) -> Reinforcement: + """ + Adds a detail reinforcement for a character with specified parameters. + + Arguments: + character_name: The name of the character to which the reinforcement is related. + question: The query/question to be reinforced. + instructions: Optional instructions related to the reinforcement. + interval: The frequency at which the reinforcement is applied. + answer: The expected answer for the question; defaults to an empty string. + insert: The insertion mode for the reinforcement; defaults to 'sequential'. + run_immediately: A flag to run the reinforcement immediately; defaults to False. + + Returns: + A Reinforcement object representing the newly added detail reinforcement. + """ + if character_name: + self.scene.get_character(character_name) + world_state_agent = get_agent("world_state") + reinforcement = await self.world_state.add_reinforcement( + question, character_name, instructions, interval, answer, insert + ) + + if run_immediately: + await world_state_agent.update_reinforcement(question, character_name) + else: + # if not running immediately, we need to emit the world state manually + self.world_state.emit() + + return reinforcement + + async def run_detail_reinforcement(self, character_name:str, question:str): + """ + Executes the detail reinforcement for a specific character and question. + + Arguments: + character_name: The name of the character to run the reinforcement for. + question: The query/question that the reinforcement corresponds to. + """ + world_state_agent = get_agent("world_state") + await world_state_agent.update_reinforcement(question, character_name) + + async def delete_detail_reinforcement(self, character_name:str, question:str): + """ + Deletes a detail reinforcement for a specified character and question. + + Arguments: + character_name: The name of the character whose reinforcement is to be deleted. + question: The query/question of the reinforcement to be deleted. + """ + + idx, reinforcement = await self.world_state.find_reinforcement(question, character_name) + if idx is not None: + await self.world_state.remove_reinforcement(idx) + self.world_state.emit() + + async def save_world_entry(self, entry_id:str, text:str, meta:dict): + """ + Saves a manual world entry with specified text and metadata. + + Arguments: + entry_id: The identifier of the world entry to be saved. + text: The text content of the world entry. + meta: A dictionary containing metadata for the world entry. + """ + meta["source"] = "manual" + meta["typ"] = "world_state" + await self.update_context_db_entry(entry_id, text, meta) + + async def update_context_db_entry(self, entry_id:str, text:str, meta:dict): + """ + Updates an entry in the context database with new text and metadata. + + Arguments: + entry_id: The identifier of the world entry to be updated. + text: The new text content for the world entry. + meta: A dictionary containing updated metadata for the world entry. + """ + + if meta.get("source") == "manual": + # manual context needs to be updated in the world state + self.world_state.manual_context[entry_id] = ManualContext( + text=text, + meta=meta, + id=entry_id + ) + elif meta.get("typ") == "details": + # character detail needs to be mirrored to the + # character object in the scene + character_name = meta.get("character") + character = self.scene.get_character(character_name) + character.details[meta.get("detail")] = text + + + await self.memory_agent.add_many([ + { + "id": entry_id, + "text": text, + "meta": meta + } + ]) + + async def delete_context_db_entry(self, entry_id:str): + """ + Deletes a specific entry from the context database using its identifier. + + Arguments: + entry_id: The identifier of the world entry to be deleted. + """ + await self.memory_agent.delete({ + "ids": entry_id + }) + + if entry_id in self.world_state.manual_context: + del self.world_state.manual_context[entry_id] + + await self.remove_pin(entry_id) + + async def set_pin(self, entry_id:str, condition:str=None, condition_state:bool=False, active:bool=False): + """ + Creates or updates a pin on a context entry with conditional activation. + + Arguments: + entry_id: The identifier of the context entry to be pinned. + condition: The conditional expression to determine when the pin should be active; defaults to None. + condition_state: The boolean state that enables the pin; defaults to False. + active: A flag indicating whether the pin should be active; defaults to False. + """ + + if not condition: + condition = None + condition_state = False + + pin = ContextPin( + entry_id=entry_id, + condition=condition, + condition_state=condition_state, + active=active + ) + + self.world_state.pins[entry_id] = pin + + async def remove_all_empty_pins(self): + + """ + Removes all pins that come back with empty `text` attributes from get_pins. + """ + + pins = await self.get_pins() + + for pin in pins.pins.values(): + if not pin.text: + await self.remove_pin(pin.pin.entry_id) + + async def remove_pin(self, entry_id:str): + """ + Removes an existing pin from a context entry using its identifier. + + Arguments: + entry_id: The identifier of the context entry pin to be removed. + """ + if entry_id in self.world_state.pins: + del self.world_state.pins[entry_id] + + + async def get_templates(self) -> WorldStateTemplates: + """ + Retrieves the current world state templates from scene configuration. + + Returns: + A WorldStateTemplates object containing state reinforcement templates. + """ + templates = self.scene.config["game"]["world_state"]["templates"] + world_state_templates = WorldStateTemplates(**templates) + return world_state_templates + + + async def save_template(self, template:StateReinforcementTemplate): + """ + Saves a state reinforcement template to the scene configuration. + + Arguments: + template: The StateReinforcementTemplate object representing the template to be saved. + + Note: + If the template is set to auto-create, it will be applied immediately. + """ + config = self.scene.config + + template_type = template.type + + config["game"]["world_state"]["templates"][template_type][template.name] = template.model_dump() + + save_config(self.scene.config) + + if template.auto_create: + await self.auto_apply_template(template) + + async def remove_template(self, template_type:str, template_name:str): + """ + Removes a specific state reinforcement template from scene configuration. + + Arguments: + template_type: The type of the template to be removed. + template_name: The name of the template to be removed. + + Note: + If the specified template is not found, logs a warning. + """ + config = self.scene.config + + try: + del config["game"]["world_state"]["templates"][template_type][template_name] + save_config(self.scene.config) + except KeyError: + log.warning("world state template not found", template_type=template_type, template_name=template_name) + pass + + async def apply_all_auto_create_templates(self): + """ + Applies all auto-create state reinforcement templates. + + This method goes through the scene configuration, identifies templates set for auto-creation, + and applies them. + """ + templates = self.scene.config["game"]["world_state"]["templates"] + world_state_templates = WorldStateTemplates(**templates) + + candidates = [] + + for template in world_state_templates.state_reinforcement.values(): + if template.auto_create: + candidates.append(template) + + for template in candidates: + log.info("applying template", template=template) + await self.auto_apply_template(template) + + async def auto_apply_template(self, template:StateReinforcementTemplate): + """ + Automatically applies a state reinforcement template based on its type. + + Arguments: + template: The StateReinforcementTemplate object to be auto-applied. + + Note: + This function delegates to a specific apply function based on the template type. + """ + fn = getattr(self, f"auto_apply_template_{template.type}") + await fn(template) + + async def auto_apply_template_state_reinforcement(self, template:StateReinforcementTemplate): + """ + Applies a state reinforcement template to characters based on the template's state type. + + Arguments: + template: The StateReinforcementTemplate object with the state reinforcement details. + + Note: + The characters to apply the template to are determined by the state_type in the template. + """ + + characters = [] + + if template.state_type == "npc": + characters = [character.name for character in self.scene.get_npc_characters()] + elif template.state_type == "character": + characters = [character.name for character in self.scene.get_characters()] + elif template.state_type == "player": + characters = [self.scene.get_player_character().name] + + for character_name in characters: + await self.apply_template_state_reinforcement(template, character_name) + + + async def apply_template_state_reinforcement(self, template:StateReinforcementTemplate, character_name:str=None, run_immediately:bool=False) -> Reinforcement: + """ + Applies a state reinforcement template to a specific character, if provided. + + Arguments: + template: The StateReinforcementTemplate object defining the reinforcement details. + character_name: Optional; the name of the character to apply the template to. + run_immediately: Whether to run the reinforcement immediately after applying. + + Returns: + A Reinforcement object if the template is applied, or None if the reinforcement already exists. + + Raises: + ValueError: If a character name is required but not provided. + """ + + if not character_name and template.state_type in ["npc", "character", "player"]: + raise ValueError("Character name required for this template type.") + + player_name = self.scene.get_player_character().name + + formatted_query = template.query.format(character_name=character_name, player_name=player_name) + formatted_instructions = template.instructions.format(character_name=character_name, player_name=player_name) if template.instructions else None + + if character_name: + details = await self.get_character_details(character_name) + + # if reinforcement already exists, skip + if formatted_query in details.reinforcements: + return None + + return await self.add_detail_reinforcement( + character_name, + formatted_query, + formatted_instructions, + template.interval, + insert=template.insert, + run_immediately=run_immediately, + ) \ No newline at end of file diff --git a/talemate_frontend/package-lock.json b/talemate_frontend/package-lock.json index 924fb4f6..e77c66ca 100644 --- a/talemate_frontend/package-lock.json +++ b/talemate_frontend/package-lock.json @@ -8,7 +8,7 @@ "name": "talemate_frontend", "version": "0.1.0", "dependencies": { - "@mdi/font": "5.9.55", + "@mdi/font": "7.4.47", "core-js": "^3.8.3", "roboto-fontface": "*", "vue": "^3.2.13", @@ -1986,9 +1986,9 @@ "dev": true }, "node_modules/@mdi/font": { - "version": "5.9.55", - "resolved": "https://registry.npmmirror.com/@mdi/font/-/font-5.9.55.tgz", - "integrity": "sha512-jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg==" + "version": "7.4.47", + "resolved": "https://registry.npmjs.org/@mdi/font/-/font-7.4.47.tgz", + "integrity": "sha512-43MtGpd585SNzHZPcYowu/84Vz2a2g31TvPMTm9uTiCSWzaheQySUcSyUH/46fPnuPQWof2yd0pGBtzee/IQWw==" }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", @@ -5937,10 +5937,16 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], "engines": { "node": ">=4.0" }, @@ -12581,9 +12587,9 @@ "dev": true }, "@mdi/font": { - "version": "5.9.55", - "resolved": "https://registry.npmmirror.com/@mdi/font/-/font-5.9.55.tgz", - "integrity": "sha512-jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg==" + "version": "7.4.47", + "resolved": "https://registry.npmjs.org/@mdi/font/-/font-7.4.47.tgz", + "integrity": "sha512-43MtGpd585SNzHZPcYowu/84Vz2a2g31TvPMTm9uTiCSWzaheQySUcSyUH/46fPnuPQWof2yd0pGBtzee/IQWw==" }, "@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", @@ -15819,9 +15825,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true }, "forwarded": { diff --git a/talemate_frontend/package.json b/talemate_frontend/package.json index f6665517..ecc5cdd8 100644 --- a/talemate_frontend/package.json +++ b/talemate_frontend/package.json @@ -8,7 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@mdi/font": "5.9.55", + "@mdi/font": "7.4.47", "core-js": "^3.8.3", "roboto-fontface": "*", "vue": "^3.2.13", diff --git a/talemate_frontend/src/components/AIAgent.vue b/talemate_frontend/src/components/AIAgent.vue index 4bb24aaa..d91eca9b 100644 --- a/talemate_frontend/src/components/AIAgent.vue +++ b/talemate_frontend/src/components/AIAgent.vue @@ -9,14 +9,22 @@ mdi-checkbox-blank-circle mdi-checkbox-blank-circle mdi-checkbox-blank-circle + {{ agent.label }} {{ agent.name }} + + + {{ agent.client }} + diff --git a/talemate_frontend/src/components/AIClient.vue b/talemate_frontend/src/components/AIClient.vue index ce0b638c..27518e57 100644 --- a/talemate_frontend/src/components/AIClient.vue +++ b/talemate_frontend/src/components/AIClient.vue @@ -28,7 +28,7 @@ :min="1024" :max="128000" :step="512" - @update:modelValue="saveClient(client)" + @update:modelValue="saveClientDelayed(client)" @click.stop density="compact" > @@ -77,6 +77,7 @@ export default { }, data() { return { + saveDelayTimeout: null, clientStatusCheck: null, state: { clients: [], @@ -86,7 +87,7 @@ export default { type: '', apiUrl: '', model_name: '', - max_token_length: 2048, + max_token_length: 4096, data: { has_prompt_template: false, } @@ -141,6 +142,18 @@ export default { propagateError(error) { this.$emit('error', error); }, + + saveClientDelayed(client) { + client.dirty = true; + if (this.saveDelayTimeout) { + clearTimeout(this.saveDelayTimeout); + } + this.saveDelayTimeout = setTimeout(() => { + this.saveClient(client); + client.dirty = false; + }, 500); + }, + saveClient(client) { const index = this.state.clients.findIndex(c => c.name === client.name); if (index === -1) { @@ -185,7 +198,7 @@ export default { // Find the client with the given name const client = this.state.clients.find(client => client.name === data.name); - if (client) { + if (client && !client.dirty) { // Update the model name of the client client.model_name = data.model_name; client.type = data.message; @@ -193,8 +206,9 @@ export default { client.max_token_length = data.max_token_length; client.apiUrl = data.apiUrl; client.data = data.data; - } else { + } else if(!client) { console.log("Adding new client", data); + this.state.clients.push({ name: data.name, model_name: data.model_name, diff --git a/talemate_frontend/src/components/AppConfig.vue b/talemate_frontend/src/components/AppConfig.vue index 6f4ebaf2..17e21f64 100644 --- a/talemate_frontend/src/components/AppConfig.vue +++ b/talemate_frontend/src/components/AppConfig.vue @@ -32,7 +32,22 @@ -
+
+ + General +
+ General game settings. +
+ + + + + + + + +
+
Default player character
@@ -228,6 +243,7 @@ export default { content_context_input: '', navigation: { game: [ + {title: 'General', icon: 'mdi-cog', value: 'general'}, {title: 'Default Character', icon: 'mdi-human-edit', value: 'character'}, ], application: [ @@ -240,7 +256,7 @@ export default { {title: 'Content Context', icon: 'mdi-cube-scan', value: 'content_context'}, ] }, - gamePageSelected: 'character', + gamePageSelected: 'general', applicationPageSelected: 'openai_api', creatorPageSelected: 'content_context', } diff --git a/talemate_frontend/src/components/CharacterMessage.vue b/talemate_frontend/src/components/CharacterMessage.vue index 42ba6347..abd012c6 100644 --- a/talemate_frontend/src/components/CharacterMessage.vue +++ b/talemate_frontend/src/components/CharacterMessage.vue @@ -1,13 +1,7 @@ + + \ No newline at end of file diff --git a/talemate_frontend/src/components/DebugToolPromptView.vue b/talemate_frontend/src/components/DebugToolPromptView.vue index b5306e8d..79a5a184 100644 --- a/talemate_frontend/src/components/DebugToolPromptView.vue +++ b/talemate_frontend/src/components/DebugToolPromptView.vue @@ -1,46 +1,39 @@ - \ No newline at end of file diff --git a/talemate_frontend/src/components/DebugTools.vue b/talemate_frontend/src/components/DebugTools.vue index 41e0bdc8..a2a6bba4 100644 --- a/talemate_frontend/src/components/DebugTools.vue +++ b/talemate_frontend/src/components/DebugTools.vue @@ -4,17 +4,22 @@ - + + Game State + + \ No newline at end of file diff --git a/talemate_frontend/src/components/TalemateApp.vue b/talemate_frontend/src/components/TalemateApp.vue index 806409b1..15b6b04e 100644 --- a/talemate_frontend/src/components/TalemateApp.vue +++ b/talemate_frontend/src/components/TalemateApp.vue @@ -120,12 +120,19 @@
- + - + @@ -159,6 +167,7 @@ import CreativeEditor from './CreativeEditor.vue'; import AppConfig from './AppConfig.vue'; import DebugTools from './DebugTools.vue'; import AudioQueue from './AudioQueue.vue'; +import StatusNotification from './StatusNotification.vue'; export default { components: { @@ -176,6 +185,7 @@ export default { AppConfig, DebugTools, AudioQueue, + StatusNotification, }, name: 'TalemateApp', data() { @@ -195,6 +205,7 @@ export default { reconnect: true, errorMessage: null, errorNotification: false, + notificatioonBusy: false, inputHint: 'Enter your text...', messageInput: '', reconnectInterval: 3000, @@ -218,7 +229,7 @@ export default { return { getWebsocket: () => this.websocket, registerMessageHandler: this.registerMessageHandler, - isInputDisabled: () => this.inputDisabled, + isInputDisabled: () => this.isInputDisabled(), setInputDisabled: (disabled) => this.inputDisabled = disabled, isWaitingForInput: () => this.waitingForInput, setWaitingForInput: (waiting) => this.waitingForInput = waiting, @@ -233,6 +244,10 @@ export default { requestAppConfig: () => this.requestAppConfig(), appConfig: () => this.appConfig, configurationRequired: () => this.configurationRequired(), + getTrackedCharacterState: (name, question) => this.$refs.worldState.trackedCharacterState(name, question), + getTrackedWorldState: (question) => this.$refs.worldState.trackedWorldState(question), + getPlayerCharacterName: () => this.getPlayerCharacterName(), + formatWorldStateTemplateString: (templateString, chracterName) => this.formatWorldStateTemplateString(templateString, chracterName), }; }, methods: { @@ -297,12 +312,17 @@ export default { } } + if(data.type == 'status') { + this.notificatioonBusy = (data.status == 'busy'); + } + if (data.type == "scene_status") { this.scene = { name: data.name, environment: data.data.environment, scene_time: data.data.scene_time, saved: data.data.saved, + player_character_name: data.data.player_character_name, } this.sceneActive = true; return; @@ -440,6 +460,9 @@ export default { openSceneHistory() { this.$refs.sceneHistory.open(); }, + onOpenWorldStateManager(tab, sub1, sub2, sub3) { + this.$refs.worldState.openWorldStateManager(tab, sub1, sub2, sub3); + }, openAppConfig() { this.$refs.appConfig.show(); }, @@ -450,6 +473,59 @@ export default { sceneStartedLoading() { this.loading = true; this.sceneActive = false; + }, + + getPlayerCharacterName() { + if (!this.scene || !this.scene.player_character_name) { + return null; + } + return this.scene.player_character_name; + }, + + isInputDisabled() { + + // if any client is active and busy, disable input + if (this.$refs.aiClient && this.$refs.aiClient.getActive()) { + return true; + } + + return this.inputDisabled || this.notificatioonBusy; + }, + + formatWorldStateTemplateString(templateString, chracterName) { + let playerCharacterName = this.getPlayerCharacterName(); + // replace {character_name} and {player_name} + + if (playerCharacterName) { + templateString = templateString.replace(/{character_name}/g, chracterName); + templateString = templateString.replace(/{player_name}/g, playerCharacterName); + } else { + templateString = templateString.replace(/{character_name}/g, chracterName); + templateString = templateString.replace(/{player_name}/g, chracterName); + } + + return templateString; + }, + + messageInputIcon() { + if (this.waitingForInput) { + if (this.inputHint != this.scene.player_character_name+":") { + return 'mdi-information-outline'; + } else { + return 'mdi-comment-outline'; + } + } + return 'mdi-cancel'; + }, + messageInputColor() { + if (this.waitingForInput) { + if (this.inputHint != this.scene.player_character_name+":") { + return 'warning'; + } else { + return 'purple-lighten-3'; + } + } + return null; } } } diff --git a/talemate_frontend/src/components/WorldState.vue b/talemate_frontend/src/components/WorldState.vue index 11651f85..a6a3614f 100644 --- a/talemate_frontend/src/components/WorldState.vue +++ b/talemate_frontend/src/components/WorldState.vue @@ -2,79 +2,203 @@ mdi-earthWorld - + + + + + + + + -
- - - - {{ name }} - {{ character.emotion }} - - - - - {{ character.snapshot }} -
- - - +
- - - - - - -
- - - - + -
-
+ + {{ name }} + {{ character.emotion }} + + - - - - {{ name}} - - - - - {{ obj.snapshot }} -
- - - -
- - - - + -
+
+ + + + + + + + + + +
+ + + + +
+ + + + +
+ + + + + +
+
+ + + + + {{ name}} + + + + + {{ obj.snapshot }} +
+ + + +
+ + + + + +
+ +
+ + + + + + Active Pins ({{ activePins.length }}) + + + +
+ {{ truncatedPinText(pin) }} + + +
+ + + + + + + + World + + + + + + +
+ + + + + +
+ + + + +
+ + + \ No newline at end of file diff --git a/talemate_frontend/src/components/WorldStateManager.vue b/talemate_frontend/src/components/WorldStateManager.vue new file mode 100644 index 00000000..68c536c9 --- /dev/null +++ b/talemate_frontend/src/components/WorldStateManager.vue @@ -0,0 +1,1488 @@ + + + + + diff --git a/talemate_frontend/src/components/WorldStateManagerTemplates.vue b/talemate_frontend/src/components/WorldStateManagerTemplates.vue new file mode 100644 index 00000000..9c624cf6 --- /dev/null +++ b/talemate_frontend/src/components/WorldStateManagerTemplates.vue @@ -0,0 +1,329 @@ + + + \ No newline at end of file diff --git a/talemate_frontend/src/components/WorldStateManagerWorld.vue b/talemate_frontend/src/components/WorldStateManagerWorld.vue new file mode 100644 index 00000000..f5819720 --- /dev/null +++ b/talemate_frontend/src/components/WorldStateManagerWorld.vue @@ -0,0 +1,545 @@ + + + \ No newline at end of file diff --git a/templates/llm-prompt/Aurora-Nights.jinja2 b/templates/llm-prompt/Aurora-Nights.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/Aurora-Nights.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/FlatDolphinMaid.jinja2 b/templates/llm-prompt/FlatDolphinMaid.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/FlatDolphinMaid.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Goliath.jinja2 b/templates/llm-prompt/Goliath.jinja2 new file mode 100644 index 00000000..0ef9e87d --- /dev/null +++ b/templates/llm-prompt/Goliath.jinja2 @@ -0,0 +1,2 @@ +SYSTEM: {{ system_message }} +USER: {{ set_response(prompt, "\nASSISTANT: ") }} \ No newline at end of file diff --git a/templates/llm-prompt/Kunoichi.jinja2 b/templates/llm-prompt/Kunoichi.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/Kunoichi.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/MLewd.jinja2 b/templates/llm-prompt/MLewd.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/MLewd.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Mistral-7B-Instruct.jinja2 b/templates/llm-prompt/Mistral-7B-Instruct.jinja2 new file mode 100644 index 00000000..6f41170f --- /dev/null +++ b/templates/llm-prompt/Mistral-7B-Instruct.jinja2 @@ -0,0 +1 @@ +[INST] {{ system_message }} {{ set_response(prompt, "[/INST]") }} \ No newline at end of file diff --git a/templates/llm-prompt/Mixtral.jinja2 b/templates/llm-prompt/Mixtral.jinja2 new file mode 100644 index 00000000..9d0e4eea --- /dev/null +++ b/templates/llm-prompt/Mixtral.jinja2 @@ -0,0 +1,2 @@ +[INST] {{ system_message }} +{{ set_response(prompt, " [/INST] ") }} \ No newline at end of file diff --git a/templates/llm-prompt/MixtralOrochi.jinja2 b/templates/llm-prompt/MixtralOrochi.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/MixtralOrochi.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Mixtral_34Bx2.jinja2 b/templates/llm-prompt/Mixtral_34Bx2.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/Mixtral_34Bx2.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Norobara-ZLoss.jinja2 b/templates/llm-prompt/Norobara-ZLoss.jinja2 new file mode 100644 index 00000000..9a2cc2bd --- /dev/null +++ b/templates/llm-prompt/Norobara-ZLoss.jinja2 @@ -0,0 +1,4 @@ +### Instruction: +{{ system_message }} + +{{ set_response("### Input:\n"+prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Noromaid-v0.4-Mixtral-Instruct.jinja2 b/templates/llm-prompt/Noromaid-v0.4-Mixtral-Instruct.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/Noromaid-v0.4-Mixtral-Instruct.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Nous-Capybara.jinja2 b/templates/llm-prompt/Nous-Capybara.jinja2 index 8f78b90d..cdce7762 100644 --- a/templates/llm-prompt/Nous-Capybara.jinja2 +++ b/templates/llm-prompt/Nous-Capybara.jinja2 @@ -1,3 +1 @@ -USER: -{{ system_message }} -{{ set_response(prompt, "\nASSISTANT:") }} \ No newline at end of file +USER: {{ system_message }} {{ set_response(prompt, " ASSISTANT:") }} \ No newline at end of file diff --git a/templates/llm-prompt/Nous-Hermes-2-Mixtral.jinja2 b/templates/llm-prompt/Nous-Hermes-2-Mixtral.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/Nous-Hermes-2-Mixtral.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Nous-Hermes-2-Yi.jinja2 b/templates/llm-prompt/Nous-Hermes-2-Yi.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/Nous-Hermes-2-Yi.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/OpenBuddy.jinja2 b/templates/llm-prompt/OpenBuddy.jinja2 new file mode 100644 index 00000000..0dfa8d3b --- /dev/null +++ b/templates/llm-prompt/OpenBuddy.jinja2 @@ -0,0 +1 @@ +User: {{ system_message }} {{ set_response(prompt, "\nAssistant: ") }} \ No newline at end of file diff --git a/templates/llm-prompt/Open_Gpt4_8x7B.jinja2 b/templates/llm-prompt/Open_Gpt4_8x7B.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/Open_Gpt4_8x7B.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/OrcaMaid.jinja2 b/templates/llm-prompt/OrcaMaid.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/OrcaMaid.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Sensualize-Mixtral.jinja2 b/templates/llm-prompt/Sensualize-Mixtral.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/Sensualize-Mixtral.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Sensualize-Solar.jinja2 b/templates/llm-prompt/Sensualize-Solar.jinja2 new file mode 100644 index 00000000..9a2cc2bd --- /dev/null +++ b/templates/llm-prompt/Sensualize-Solar.jinja2 @@ -0,0 +1,4 @@ +### Instruction: +{{ system_message }} + +{{ set_response("### Input:\n"+prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/SlimOrca.jinja2 b/templates/llm-prompt/SlimOrca.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/SlimOrca.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Synthia-MoE.jinja2 b/templates/llm-prompt/Synthia-MoE.jinja2 new file mode 100644 index 00000000..0ef9e87d --- /dev/null +++ b/templates/llm-prompt/Synthia-MoE.jinja2 @@ -0,0 +1,2 @@ +SYSTEM: {{ system_message }} +USER: {{ set_response(prompt, "\nASSISTANT: ") }} \ No newline at end of file diff --git a/templates/llm-prompt/Velara.jinja2 b/templates/llm-prompt/Velara.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/Velara.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Xwin-MoE.jinja2 b/templates/llm-prompt/Xwin-MoE.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/Xwin-MoE.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/Yi-34B-Spicyboros.jinja2 b/templates/llm-prompt/Yi-34B-Spicyboros.jinja2 new file mode 100644 index 00000000..f2ec87e7 --- /dev/null +++ b/templates/llm-prompt/Yi-34B-Spicyboros.jinja2 @@ -0,0 +1,2 @@ +{{ system_message }} +USER: {{ set_response(prompt, "\nASSISTANT: ") }} \ No newline at end of file diff --git a/templates/llm-prompt/bagel-dpo.jinja2 b/templates/llm-prompt/bagel-dpo.jinja2 new file mode 100644 index 00000000..4abc19e1 --- /dev/null +++ b/templates/llm-prompt/bagel-dpo.jinja2 @@ -0,0 +1,5 @@ +Below is an instruction that describes a task. Write a response that appropriately completes the request. + +### Instruction: +{{ system_message }} +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/bruinsv2-ophermesneu.jinja2 b/templates/llm-prompt/bruinsv2-ophermesneu.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/bruinsv2-ophermesneu.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/dolphin-2.2-yi.jinja2 b/templates/llm-prompt/dolphin-2.2-yi.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/dolphin-2.2-yi.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/dolphin-2.5-mixtral.jinja2 b/templates/llm-prompt/dolphin-2.5-mixtral.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/dolphin-2.5-mixtral.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/dolphin-2.6-mixtral.jinja2 b/templates/llm-prompt/dolphin-2.6-mixtral.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/dolphin-2.6-mixtral.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/dolphin-2.7-mixtral.jinja2 b/templates/llm-prompt/dolphin-2.7-mixtral.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/dolphin-2.7-mixtral.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/laser-dolphin.jinja2 b/templates/llm-prompt/laser-dolphin.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/laser-dolphin.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/mixtral_11bx2_moe.jinja2 b/templates/llm-prompt/mixtral_11bx2_moe.jinja2 new file mode 100644 index 00000000..c68eb6c0 --- /dev/null +++ b/templates/llm-prompt/mixtral_11bx2_moe.jinja2 @@ -0,0 +1,4 @@ +{{ system_message }} + +### Instruction: +{{ set_response(prompt, "\n\n### Response:\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/nous-hermes-2-solar.jinja2 b/templates/llm-prompt/nous-hermes-2-solar.jinja2 new file mode 100644 index 00000000..bef1036f --- /dev/null +++ b/templates/llm-prompt/nous-hermes-2-solar.jinja2 @@ -0,0 +1,4 @@ +<|im_start|>system +{{ system_message }}<|im_end|> +<|im_start|>user +{{ set_response(prompt, "<|im_end|>\n<|im_start|>assistant\n") }} \ No newline at end of file diff --git a/templates/llm-prompt/openchat.jinja2 b/templates/llm-prompt/openchat.jinja2 new file mode 100644 index 00000000..06267032 --- /dev/null +++ b/templates/llm-prompt/openchat.jinja2 @@ -0,0 +1 @@ +GPT4 Correct User: {{ system_message }} {{ set_response(prompt, "<|end_of_turn|>GPT4 Correct Assistant:") }} \ No newline at end of file diff --git a/tests/test_dialogue_cleanup.py b/tests/test_dialogue_cleanup.py index 91654201..07a82d07 100644 --- a/tests/test_dialogue_cleanup.py +++ b/tests/test_dialogue_cleanup.py @@ -1,5 +1,5 @@ import pytest -from talemate.util import ensure_dialog_format +from talemate.util import ensure_dialog_format, clean_dialogue @pytest.mark.parametrize("input, expected", [ ('Hello how are you?', 'Hello how are you?'), @@ -16,6 +16,22 @@ from talemate.util import ensure_dialog_format ('This is a string with an ending quote"', '"This is a string with an ending quote"'), ('This is a string with an ending asterisk*', '*This is a string with an ending asterisk*'), ('"Mixed markers*', '*Mixed markers*'), + ('*narrative.* dialogue" *more narrative.*', '*narrative.* "dialogue" *more narrative.*'), + ('"*messed up dialogue formatting.*" *some narration.*', '"messed up dialogue formatting." *some narration.*'), + ('*"messed up narration formatting."* "some dialogue."', '"messed up narration formatting." "some dialogue."'), ]) def test_dialogue_cleanup(input, expected): - assert ensure_dialog_format(input) == expected \ No newline at end of file + assert ensure_dialog_format(input) == expected + + +@pytest.mark.parametrize("input, expected, main_name", [ + ("bob: says a sentence", "bob: says a sentence", "bob"), + ("bob: says a sentence\nbob: says another sentence", "bob: says a sentence says another sentence", "bob"), + ("bob: says a sentence with a colon: to explain something", "bob: says a sentence with a colon: to explain something", "bob"), + ("bob: i have a riddle for you, alice: the riddle", "bob: i have a riddle for you, alice: the riddle", "bob"), + ("bob: says something\nalice: says something else", "bob: says something", "bob"), + ("bob: says a sentence. then a", "bob: says a sentence.", "bob"), +]) +def test_clean_dialogue(input, expected, main_name): + others = ["alice", "charlie"] + assert clean_dialogue(input, main_name) == expected \ No newline at end of file diff --git a/update.bat b/update.bat index ce304fd1..c3a75ee0 100644 --- a/update.bat +++ b/update.bat @@ -1,5 +1,14 @@ @echo off +REM check if git repository is initialized and initialize if not +if not exist .git ( +git init +git remote add origin https://github.com/vegu-ai/talemate +) + +REM pull the latest changes from git repository +git pull + REM activate the virtual environment call talemate_env\Scripts\activate @@ -7,4 +16,12 @@ REM use poetry to install dependencies python -m poetry install echo Virtual environment updated + +REM updating npm packages +cd talemate_frontend +npm install +cd .. + +echo NPM packages updated + pause