Upgrade deps and migrate to Gradio 6

.python-version

@@ -1 +1 @@
-3.10
+3.12

README.md

@@ -4,7 +4,8 @@ emoji: 🌖
 colorFrom: blue
 colorTo: pink
 sdk: gradio
-sdk_version: 5.12.0
+sdk_version: 6.14.0
+python_version: 3.12.12
 app_file: app.py
 pinned: false
 license: bsd-3-clause

app.py

@@ -106,7 +106,7 @@ def chat(
     top_p: float = 0.9,
     history_orig: list[str] | None = None,
     history_qa: list[str] | None = None,
-) -> tuple[list[tuple[str, str]], list[str], list[str]]:
+) -> tuple[list[dict[str, str]], list[str], list[str]]:
     history_orig = history_orig or []
     history_qa = history_qa or []
     history_orig.append(text)
@@ -130,7 +130,7 @@ def chat(
     history_orig.append(output)
     history_qa.append(output)
 
-    chat_val = list(zip(history_orig[0::2], history_orig[1::2], strict=False))
+    chat_val = [{"role": "user" if i % 2 == 0 else "assistant", "content": h} for i, h in enumerate(history_orig)]
     return chat_val, history_orig, history_qa
 
 

pyproject.toml

@@ -3,13 +3,12 @@ name = "blip2"
 version = "0.1.0"
 description = ""
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dependencies = [
     "accelerate>=1.2.1",
     "bitsandbytes>=0.45.0",
-    "gradio>=5.12.0",
-    "hf-transfer>=0.1.9",
-    "spaces>=0.32.0",
+    "gradio[mcp,oauth]>=6.14.0",
+    "spaces>=0.48.3",
     "torch==2.4.0",
     "torchvision==0.19.0",
     "transformers>=4.48.0",
@@ -56,3 +55,6 @@ docstring-code-format = true
 dev = [
     "pre-commit>=4.6.0",
 ]
+hf-spaces = [
+    "datasets",
+]

requirements.txt

@@ -1,36 +1,53 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile pyproject.toml -o requirements.txt
+#    uv export --no-hashes --no-dev --no-emit-package typer-slim --no-emit-package spaces -o requirements.txt
 accelerate==1.2.1
-    # via blip2 (pyproject.toml)
-aiofiles==23.2.1
-    # via gradio
+    # via blip2
 annotated-types==0.7.0
     # via pydantic
 anyio==4.8.0
     # via
     #   gradio
     #   httpx
+    #   mcp
+    #   sse-starlette
     #   starlette
+attrs==26.1.0
+    # via
+    #   jsonschema
+    #   referencing
+audioop-lts==0.2.1 ; python_full_version >= '3.13'
+    # via gradio
+authlib==1.7.0
+    # via gradio
 bitsandbytes==0.45.0
-    # via blip2 (pyproject.toml)
+    # via blip2
+brotli==1.2.0
+    # via gradio
 certifi==2024.12.14
     # via
     #   httpcore
     #   httpx
     #   requests
+cffi==2.0.0 ; platform_python_implementation != 'PyPy'
+    # via cryptography
 charset-normalizer==3.4.1
     # via requests
 click==8.1.8
     # via
     #   typer
     #   uvicorn
-exceptiongroup==1.2.2
-    # via anyio
+colorama==0.4.6 ; sys_platform == 'win32'
+    # via
+    #   click
+    #   tqdm
+cryptography==47.0.0
+    # via
+    #   authlib
+    #   joserfc
+    #   pyjwt
 fastapi==0.115.6
     # via gradio
-ffmpy==0.5.0
-    # via gradio
-filelock==3.16.1
+filelock==3.29.0
     # via
     #   huggingface-hub
     #   torch
@@ -41,27 +58,36 @@ fsspec==2024.12.0
     #   gradio-client
     #   huggingface-hub
     #   torch
-gradio==5.12.0
+gradio==6.14.0
     # via
-    #   blip2 (pyproject.toml)
+    #   blip2
     #   spaces
-gradio-client==1.5.4
+gradio-client==2.5.0
+    # via
+    #   gradio
+    #   hf-gradio
+groovy==0.1.2
     # via gradio
 h11==0.14.0
     # via
     #   httpcore
     #   uvicorn
-hf-transfer==0.1.9
-    # via blip2 (pyproject.toml)
+hf-gradio==0.4.1
+    # via gradio
+hf-xet==1.4.3 ; platform_machine == 'aarch64' or platform_machine == 'amd64' or platform_machine == 'arm64' or platform_machine == 'x86_64'
+    # via huggingface-hub
 httpcore==1.0.7
     # via httpx
 httpx==0.28.1
     # via
     #   gradio
     #   gradio-client
+    #   mcp
     #   safehttpx
     #   spaces
-huggingface-hub==0.27.1
+httpx-sse==0.4.3
+    # via mcp
+huggingface-hub==0.36.2
     # via
     #   accelerate
     #   gradio
@@ -73,23 +99,33 @@ idna==3.10
     #   anyio
     #   httpx
     #   requests
+itsdangerous==2.2.0
+    # via gradio
 jinja2==3.1.5
     # via
     #   gradio
     #   torch
+joserfc==1.6.4
+    # via authlib
+jsonschema==4.26.0
+    # via mcp
+jsonschema-specifications==2025.9.1
+    # via jsonschema
 markdown-it-py==3.0.0
     # via rich
 markupsafe==2.1.5
     # via
     #   gradio
     #   jinja2
+mcp==1.27.0
+    # via gradio
 mdurl==0.1.2
     # via markdown-it-py
 mpmath==1.3.0
     # via sympy
 networkx==3.4.2
     # via torch
-numpy==2.2.1
+numpy==1.26.4
     # via
     #   accelerate
     #   bitsandbytes
@@ -97,36 +133,36 @@ numpy==2.2.1
     #   pandas
     #   torchvision
     #   transformers
-nvidia-cublas-cu12==12.1.3.1
+nvidia-cublas-cu12==12.1.3.1 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via
     #   nvidia-cudnn-cu12
     #   nvidia-cusolver-cu12
     #   torch
-nvidia-cuda-cupti-cu12==12.1.105
+nvidia-cuda-cupti-cu12==12.1.105 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
-nvidia-cuda-nvrtc-cu12==12.1.105
+nvidia-cuda-nvrtc-cu12==12.1.105 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
-nvidia-cuda-runtime-cu12==12.1.105
+nvidia-cuda-runtime-cu12==12.1.105 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
-nvidia-cudnn-cu12==9.1.0.70
+nvidia-cudnn-cu12==9.1.0.70 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
-nvidia-cufft-cu12==11.0.2.54
+nvidia-cufft-cu12==11.0.2.54 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
-nvidia-curand-cu12==10.3.2.106
+nvidia-curand-cu12==10.3.2.106 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
-nvidia-cusolver-cu12==11.4.5.107
+nvidia-cusolver-cu12==11.4.5.107 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
-nvidia-cusparse-cu12==12.1.0.106
+nvidia-cusparse-cu12==12.1.0.106 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via
     #   nvidia-cusolver-cu12
     #   torch
-nvidia-nccl-cu12==2.20.5
+nvidia-nccl-cu12==2.20.5 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
-nvidia-nvjitlink-cu12==12.6.85
+nvidia-nvjitlink-cu12==12.6.85 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via
     #   nvidia-cusolver-cu12
     #   nvidia-cusparse-cu12
-nvidia-nvtx-cu12==12.1.105
+nvidia-nvtx-cu12==12.1.105 ; platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
 orjson==3.10.14
     # via gradio
@@ -148,29 +184,49 @@ psutil==5.9.8
     # via
     #   accelerate
     #   spaces
-pydantic==2.10.5
+pycparser==3.0 ; implementation_name != 'PyPy' and platform_python_implementation != 'PyPy'
+    # via cffi
+pydantic==2.12.5
     # via
     #   fastapi
     #   gradio
+    #   mcp
+    #   pydantic-settings
     #   spaces
-pydantic-core==2.27.2
+pydantic-core==2.41.5
     # via pydantic
+pydantic-settings==2.14.0
+    # via mcp
 pydub==0.25.1
     # via gradio
 pygments==2.19.1
     # via rich
+pyjwt==2.12.1
+    # via mcp
 python-dateutil==2.9.0.post0
     # via pandas
+python-dotenv==1.2.2
+    # via pydantic-settings
 python-multipart==0.0.20
-    # via gradio
+    # via
+    #   gradio
+    #   mcp
 pytz==2024.2
-    # via pandas
+    # via
+    #   gradio
+    #   pandas
+pywin32==311 ; sys_platform == 'win32'
+    # via mcp
 pyyaml==6.0.2
     # via
     #   accelerate
     #   gradio
     #   huggingface-hub
     #   transformers
+referencing==0.37.0
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
 regex==2024.11.6
     # via transformers
 requests==2.32.3
@@ -180,9 +236,11 @@ requests==2.32.3
     #   transformers
 rich==13.9.4
     # via typer
-ruff==0.9.1
-    # via gradio
-safehttpx==0.1.6
+rpds-py==0.30.0
+    # via
+    #   jsonschema
+    #   referencing
+safehttpx==0.1.7
     # via gradio
 safetensors==0.5.2
     # via
@@ -190,18 +248,21 @@ safetensors==0.5.2
     #   transformers
 semantic-version==2.10.0
     # via gradio
+setuptools==82.0.1
+    # via torch
 shellingham==1.5.4
     # via typer
 six==1.17.0
     # via python-dateutil
 sniffio==1.3.1
     # via anyio
-spaces==0.32.0
-    # via blip2 (pyproject.toml)
+sse-starlette==3.0.3
+    # via mcp
 starlette==0.41.3
     # via
     #   fastapi
     #   gradio
+    #   mcp
 sympy==1.13.3
     # via torch
 tokenizers==0.21.0
@@ -210,23 +271,25 @@ tomlkit==0.13.2
     # via gradio
 torch==2.4.0
     # via
-    #   blip2 (pyproject.toml)
     #   accelerate
     #   bitsandbytes
+    #   blip2
     #   torchvision
 torchvision==0.19.0
-    # via blip2 (pyproject.toml)
+    # via blip2
 tqdm==4.67.1
     # via
     #   huggingface-hub
     #   transformers
 transformers==4.48.0
-    # via blip2 (pyproject.toml)
-triton==3.0.0
+    # via blip2
+triton==3.0.0 ; python_full_version < '3.13' and platform_machine == 'x86_64' and sys_platform == 'linux'
     # via torch
 typer==0.15.1
-    # via gradio
-typing-extensions==4.12.2
+    # via
+    #   gradio
+    #   hf-gradio
+typing-extensions==4.15.0
     # via
     #   anyio
     #   bitsandbytes
@@ -234,18 +297,24 @@ typing-extensions==4.12.2
     #   gradio
     #   gradio-client
     #   huggingface-hub
+    #   mcp
     #   pydantic
     #   pydantic-core
-    #   rich
+    #   referencing
     #   spaces
     #   torch
     #   typer
-    #   uvicorn
+    #   typing-inspection
+typing-inspection==0.4.2
+    # via
+    #   mcp
+    #   pydantic
+    #   pydantic-settings
 tzdata==2024.2
     # via pandas
 urllib3==2.3.0
     # via requests
 uvicorn==0.34.0
-    # via gradio
-websockets==14.1
-    # via gradio-client
+    # via
+    #   gradio
+    #   mcp