From dd55c36d47ca7033ad2f87051fb469857c3d8312 Mon Sep 17 00:00:00 2001 From: Mayk Caldas Date: Tue, 10 Dec 2024 09:57:58 -0800 Subject: [PATCH] Included support to python 3.13 --- .github/workflows/test.yaml | 4 ++-- pyproject.toml | 4 +++- uv.lock | 19 ++++++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index da4238a..56520f8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,7 +12,7 @@ jobs: if: github.event_name == 'pull_request' # pre-commit-ci/lite-action only runs here strategy: matrix: - python-version: [3.11, 3.12] # Our min and max supported Python versions + python-version: [3.11, 3.13] # Our min and max supported Python versions steps: - uses: actions/checkout@v4 with: @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.11] # Our min supported Python version + python-version: [3.11, 3.13] # Our min and max supported Python versions steps: - uses: actions/checkout@v4 - uses: astral-sh/setup-uv@v3 diff --git a/pyproject.toml b/pyproject.toml index a85772d..1018308 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,16 +19,18 @@ classifiers = [ "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Programming Language :: Python", ] dependencies = [ "coredis", "fhaviary>=0.8.2", # For core namespace "limits", - "litellm>=1.44", # For LITELLM_LOG addition "pydantic~=2.0,>=2.10.1,<2.10.2", "tiktoken>=0.4.0", "typing-extensions; python_version <= '3.11'", # for typing.override + 'litellm; python_version < "3.13"', # NOTE: paper-qa==5.3 doesn't support 3.13 yet + 'litellm>=1.49.1; python_version >= "3.13"', # For removal of imghdr ] description = "A client to provide LLM responses for FutureHouse applications." dynamic = ["version"] diff --git a/uv.lock b/uv.lock index a161538..bb99f48 100644 --- a/uv.lock +++ b/uv.lock @@ -5,10 +5,14 @@ resolution-markers = [ "python_full_version < '3.12' and platform_python_implementation != 'PyPy' and sys_platform != 'linux'", "python_full_version < '3.12' and platform_python_implementation == 'PyPy' and sys_platform == 'linux'", "python_full_version < '3.12' and platform_python_implementation != 'PyPy' and sys_platform == 'linux'", - "python_full_version >= '3.12' and platform_python_implementation == 'PyPy' and sys_platform == 'linux'", - "python_full_version >= '3.12' and platform_python_implementation != 'PyPy' and sys_platform == 'linux'", - "python_full_version >= '3.12' and platform_python_implementation == 'PyPy' and sys_platform != 'linux'", - "python_full_version >= '3.12' and platform_python_implementation != 'PyPy' and sys_platform != 'linux'", + "python_full_version == '3.12.*' and platform_python_implementation == 'PyPy' and sys_platform == 'linux'", + "python_full_version >= '3.13' and platform_python_implementation == 'PyPy' and sys_platform == 'linux'", + "python_full_version == '3.12.*' and platform_python_implementation != 'PyPy' and sys_platform == 'linux'", + "python_full_version >= '3.13' and platform_python_implementation != 'PyPy' and sys_platform == 'linux'", + "python_full_version == '3.12.*' and platform_python_implementation == 'PyPy' and sys_platform != 'linux'", + "python_full_version >= '3.13' and platform_python_implementation == 'PyPy' and sys_platform != 'linux'", + "python_full_version == '3.12.*' and platform_python_implementation != 'PyPy' and sys_platform != 'linux'", + "python_full_version >= '3.13' and platform_python_implementation != 'PyPy' and sys_platform != 'linux'", ] [[package]] @@ -563,7 +567,7 @@ wheels = [ [[package]] name = "fh-llm-client" -version = "0.0.4.dev3+g418fa3b.d20241209" +version = "0.0.4.dev6+g5a2deb7.d20241210" source = { editable = "." } dependencies = [ { name = "coredis" }, @@ -652,7 +656,8 @@ requires-dist = [ { name = "fhaviary", extras = ["xml"], marker = "extra == 'dev'" }, { name = "ipython", marker = "extra == 'dev'", specifier = ">=8" }, { name = "limits" }, - { name = "litellm", specifier = ">=1.44" }, + { name = "litellm", marker = "python_full_version < '3.13'" }, + { name = "litellm", marker = "python_full_version >= '3.13'", specifier = ">=1.49.1" }, { name = "mypy", marker = "extra == 'dev'", specifier = ">=1.8" }, { name = "numpy", marker = "extra == 'local'" }, { name = "pre-commit", marker = "extra == 'dev'", specifier = ">=3.4" }, @@ -2803,7 +2808,7 @@ name = "triton" version = "3.1.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "filelock" }, + { name = "filelock", marker = "python_full_version < '3.13'" }, ] wheels = [ { url = "https://files.pythonhosted.org/packages/86/17/d9a5cf4fcf46291856d1e90762e36cbabd2a56c7265da0d1d9508c8e3943/triton-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f34f6e7885d1bf0eaaf7ba875a5f0ce6f3c13ba98f9503651c1e6dc6757ed5c", size = 209506424 },