Update

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-executables-have-shebangs
       - id: check-json
@@ -18,13 +18,15 @@ repos:
     hooks:
       - id: docformatter
         args: ["--in-place"]
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.8.4
     hooks:
-      - id: isort
-        args: ["--profile", "black"]
+      - id: ruff
+        args: ["--fix"]
+      - id: ruff-format
+        args: ["--line-length", "119"]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.9.0
+    rev: v1.14.0
     hooks:
       - id: mypy
         args: ["--ignore-missing-imports"]
@@ -35,14 +37,8 @@ repos:
             "types-PyYAML",
             "types-pytz",
           ]
-  - repo: https://github.com/psf/black
-    rev: 24.4.0
-    hooks:
-      - id: black
-        language_version: python3.10
-        args: ["--line-length", "119"]
   - repo: https://github.com/kynan/nbstripout
-    rev: 0.7.1
+    rev: 0.8.1
     hooks:
       - id: nbstripout
         args:
@@ -51,7 +47,7 @@ repos:
             "metadata.interpreter metadata.kernelspec cell.metadata.pycharm",
           ]
   - repo: https://github.com/nbQA-dev/nbQA
-    rev: 1.8.5
+    rev: 1.9.1
     hooks:
       - id: nbqa-black
       - id: nbqa-pyupgrade

.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+    "recommendations": [
+        "ms-python.python",
+        "charliermarsh.ruff",
+        "streetsidesoftware.code-spell-checker",
+        "tamasfe.even-better-toml"
+    ]
+}

.vscode/settings.json

@@ -2,29 +2,20 @@
     "editor.formatOnSave": true,
     "files.insertFinalNewline": false,
     "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.defaultFormatter": "charliermarsh.ruff",
         "editor.formatOnType": true,
         "editor.codeActionsOnSave": {
+            "source.fixAll.ruff": "explicit",
             "source.organizeImports": "explicit"
         }
     },
     "[jupyter]": {
         "files.insertFinalNewline": false
     },
-    "black-formatter.args": [
-        "--line-length=119"
-    ],
-    "isort.args": ["--profile", "black"],
-    "flake8.args": [
-        "--max-line-length=119"
-    ],
-    "ruff.lint.args": [
-        "--line-length=119"
-    ],
     "notebook.output.scrolling": true,
     "notebook.formatOnCellExecution": true,
     "notebook.formatOnSave.enabled": true,
-        "notebook.codeActionsOnSave": {
-            "source.organizeImports": "explicit"
-        }
+    "notebook.codeActionsOnSave": {
+        "source.organizeImports": "explicit"
+    }
 }

README.md

@@ -4,7 +4,7 @@ emoji: 🌖
 colorFrom: blue
 colorTo: pink
 sdk: gradio
-sdk_version: 4.44.1
+sdk_version: 5.9.1
 app_file: app.py
 pinned: false
 license: bsd-3-clause

app.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import os
 import string
 
@@ -9,7 +7,7 @@ import gradio as gr
 import PIL.Image
 import spaces
 import torch
-from transformers import AutoProcessor, Blip2ForConditionalGeneration
+from transformers import AutoProcessor, BitsAndBytesConfig, Blip2ForConditionalGeneration
 
 DESCRIPTION = "# [BLIP-2](https://github.com/salesforce/LAVIS/tree/main/projects/blip2)"
 
@@ -23,11 +21,15 @@ MODEL_ID_OPT_6_7B = "Salesforce/blip2-opt-6.7b"
 MODEL_ID_FLAN_T5_XL = "Salesforce/blip2-flan-t5-xl"
 MODEL_ID_FLAN_T5_XXL = "Salesforce/blip2-flan-t5-xxl"
 MODEL_ID = os.getenv("MODEL_ID", MODEL_ID_FLAN_T5_XXL)
-assert MODEL_ID in [MODEL_ID_OPT_2_7B, MODEL_ID_OPT_6_7B, MODEL_ID_FLAN_T5_XL, MODEL_ID_FLAN_T5_XXL]
+if MODEL_ID not in [MODEL_ID_OPT_2_7B, MODEL_ID_OPT_6_7B, MODEL_ID_FLAN_T5_XL, MODEL_ID_FLAN_T5_XXL]:
+    error_message = f"Invalid MODEL_ID: {MODEL_ID}"
+    raise ValueError(error_message)
 
 if torch.cuda.is_available():
     processor = AutoProcessor.from_pretrained(MODEL_ID)
-    model = Blip2ForConditionalGeneration.from_pretrained(MODEL_ID, device_map="auto", load_in_8bit=True)
+    model = Blip2ForConditionalGeneration.from_pretrained(
+        MODEL_ID, device_map="auto", quantization_config=BitsAndBytesConfig(load_in_8bit=True)
+    )
 
 
 @spaces.GPU
@@ -54,8 +56,7 @@ def generate_caption(
         num_beams=num_beams,
         top_p=top_p,
     )
-    result = processor.batch_decode(generated_ids, skip_special_tokens=True)[0].strip()
-    return result
+    return processor.batch_decode(generated_ids, skip_special_tokens=True)[0].strip()
 
 
 @spaces.GPU
@@ -83,8 +84,7 @@ def answer_question(
         num_beams=num_beams,
         top_p=top_p,
     )
-    result = processor.batch_decode(generated_ids, skip_special_tokens=True)[0].strip()
-    return result
+    return processor.batch_decode(generated_ids, skip_special_tokens=True)[0].strip()
 
 
 def postprocess_output(output: str) -> str:
@@ -104,9 +104,11 @@ def chat(
     min_length: int = 1,
     num_beams: int = 5,
     top_p: float = 0.9,
-    history_orig: list[str] = [],
-    history_qa: list[str] = [],
+    history_orig: list[str] | None = None,
+    history_qa: list[str] | None = None,
 ) -> tuple[list[tuple[str, str]], list[str], list[str]]:
+    history_orig = history_orig or []
+    history_qa = history_qa or []
     history_orig.append(text)
     text_qa = f"Question: {text} Answer:"
     history_qa.append(text_qa)
@@ -128,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]))
+    chat_val = list(zip(history_orig[0::2], history_orig[1::2], strict=False))
     return chat_val, history_orig, history_qa
 
 
@@ -155,7 +157,7 @@ examples = [
     ],
 ]
 
-with gr.Blocks(css="style.css") as demo:
+with gr.Blocks(css_paths="style.css") as demo:
     gr.Markdown(DESCRIPTION)
     gr.DuplicateButton(
         value="Duplicate Space for private use",

pyproject.toml

@@ -5,12 +5,48 @@ description = ""
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "accelerate>=0.34.2",
-    "bitsandbytes>=0.44.1",
-    "gradio>=4.44.1",
+    "accelerate>=1.2.1",
+    "bitsandbytes>=0.45.0",
+    "gradio>=5.9.1",
     "hf-transfer>=0.1.8",
-    "spaces>=0.30.3",
+    "spaces>=0.31.1",
     "torch==2.4.0",
     "torchvision==0.19.0",
-    "transformers>=4.45.1",
+    "transformers>=4.47.1",
 ]
+
+[tool.ruff]
+line-length = 119
+
+[tool.ruff.lint]
+select = ["ALL"]
+ignore = [
+    "COM812", # missing-trailing-comma
+    "D203",   # one-blank-line-before-class
+    "D213",   # multi-line-summary-second-line
+    "E501",   # line-too-long
+    "SIM117", # multiple-with-statements
+]
+extend-ignore = [
+    "D100",    # undocumented-public-module
+    "D101",    # undocumented-public-class
+    "D102",    # undocumented-public-method
+    "D103",    # undocumented-public-function
+    "D104",    # undocumented-public-package
+    "D105",    # undocumented-magic-method
+    "D107",    # undocumented-public-init
+    "EM101",   # raw-string-in-exception
+    "FBT001",  # boolean-type-hint-positional-argument
+    "FBT002",  # boolean-default-value-positional-argument
+    "PD901",   # pandas-df-variable-name
+    "PGH003",  # blanket-type-ignore
+    "PLR0913", # too-many-arguments
+    "PLR0915", # too-many-statements
+    "TRY003",  # raise-vanilla-args
+]
+unfixable = [
+    "F401", # unused-import
+]
+
+[tool.ruff.format]
+docstring-code-format = true

requirements.txt

@@ -1,38 +1,34 @@
 # This file was autogenerated by uv via the following command:
 #    uv pip compile pyproject.toml -o requirements.txt
-accelerate==0.34.2
+accelerate==1.2.1
     # via blip2 (pyproject.toml)
 aiofiles==23.2.1
     # via gradio
 annotated-types==0.7.0
     # via pydantic
-anyio==4.6.0
+anyio==4.7.0
     # via
     #   gradio
     #   httpx
     #   starlette
-bitsandbytes==0.44.1
+bitsandbytes==0.45.0
     # via blip2 (pyproject.toml)
-certifi==2024.8.30
+certifi==2024.12.14
     # via
     #   httpcore
     #   httpx
     #   requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.1
     # via requests
-click==8.1.7
+click==8.1.8
     # via
     #   typer
     #   uvicorn
-contourpy==1.3.0
-    # via matplotlib
-cycler==0.12.1
-    # via matplotlib
 exceptiongroup==1.2.2
     # via anyio
-fastapi==0.115.0
+fastapi==0.115.6
     # via gradio
-ffmpy==0.4.0
+ffmpy==0.5.0
     # via gradio
 filelock==3.16.1
     # via
@@ -40,18 +36,16 @@ filelock==3.16.1
     #   torch
     #   transformers
     #   triton
-fonttools==4.54.1
-    # via matplotlib
-fsspec==2024.9.0
+fsspec==2024.12.0
     # via
     #   gradio-client
     #   huggingface-hub
     #   torch
-gradio==4.44.1
+gradio==5.9.1
     # via
     #   blip2 (pyproject.toml)
     #   spaces
-gradio-client==1.3.0
+gradio-client==1.5.2
     # via gradio
 h11==0.14.0
     # via
@@ -59,14 +53,15 @@ h11==0.14.0
     #   uvicorn
 hf-transfer==0.1.8
     # via blip2 (pyproject.toml)
-httpcore==1.0.6
+httpcore==1.0.7
     # via httpx
-httpx==0.27.2
+httpx==0.28.1
     # via
     #   gradio
     #   gradio-client
+    #   safehttpx
     #   spaces
-huggingface-hub==0.25.1
+huggingface-hub==0.27.0
     # via
     #   accelerate
     #   gradio
@@ -78,35 +73,27 @@ idna==3.10
     #   anyio
     #   httpx
     #   requests
-importlib-resources==6.4.5
-    # via gradio
-jinja2==3.1.4
+jinja2==3.1.5
     # via
     #   gradio
     #   torch
-kiwisolver==1.4.7
-    # via matplotlib
 markdown-it-py==3.0.0
     # via rich
 markupsafe==2.1.5
     # via
     #   gradio
     #   jinja2
-matplotlib==3.9.2
-    # via gradio
 mdurl==0.1.2
     # via markdown-it-py
 mpmath==1.3.0
     # via sympy
-networkx==3.3
+networkx==3.4.2
     # via torch
-numpy==2.1.1
+numpy==2.2.1
     # via
     #   accelerate
     #   bitsandbytes
-    #   contourpy
     #   gradio
-    #   matplotlib
     #   pandas
     #   torchvision
     #   transformers
@@ -135,52 +122,46 @@ nvidia-cusparse-cu12==12.1.0.106
     #   torch
 nvidia-nccl-cu12==2.20.5
     # via torch
-nvidia-nvjitlink-cu12==12.6.77
+nvidia-nvjitlink-cu12==12.6.85
     # via
     #   nvidia-cusolver-cu12
     #   nvidia-cusparse-cu12
 nvidia-nvtx-cu12==12.1.105
     # via torch
-orjson==3.10.7
+orjson==3.10.13
     # via gradio
-packaging==24.1
+packaging==24.2
     # via
     #   accelerate
     #   gradio
     #   gradio-client
     #   huggingface-hub
-    #   matplotlib
     #   spaces
     #   transformers
 pandas==2.2.3
     # via gradio
-pillow==10.3.0
+pillow==11.0.0
     # via
     #   gradio
-    #   matplotlib
     #   torchvision
 psutil==5.9.8
     # via
     #   accelerate
     #   spaces
-pydantic==2.9.2
+pydantic==2.10.4
     # via
     #   fastapi
     #   gradio
     #   spaces
-pydantic-core==2.23.4
+pydantic-core==2.27.2
     # via pydantic
 pydub==0.25.1
     # via gradio
 pygments==2.18.0
     # via rich
-pyparsing==3.1.4
-    # via matplotlib
 python-dateutil==2.9.0.post0
-    # via
-    #   matplotlib
-    #   pandas
-python-multipart==0.0.12
+    # via pandas
+python-multipart==0.0.20
     # via gradio
 pytz==2024.2
     # via pandas
@@ -190,16 +171,18 @@ pyyaml==6.0.2
     #   gradio
     #   huggingface-hub
     #   transformers
-regex==2024.9.11
+regex==2024.11.6
     # via transformers
 requests==2.32.3
     # via
     #   huggingface-hub
     #   spaces
     #   transformers
-rich==13.9.2
+rich==13.9.4
     # via typer
-ruff==0.6.9
+ruff==0.8.4
+    # via gradio
+safehttpx==0.1.6
     # via gradio
 safetensors==0.4.5
     # via
@@ -209,21 +192,21 @@ semantic-version==2.10.0
     # via gradio
 shellingham==1.5.4
     # via typer
-six==1.16.0
+six==1.17.0
     # via python-dateutil
 sniffio==1.3.1
-    # via
-    #   anyio
-    #   httpx
-spaces==0.30.3
+    # via anyio
+spaces==0.31.1
     # via blip2 (pyproject.toml)
-starlette==0.38.6
-    # via fastapi
+starlette==0.41.3
+    # via
+    #   fastapi
+    #   gradio
 sympy==1.13.3
     # via torch
-tokenizers==0.20.0
+tokenizers==0.21.0
     # via transformers
-tomlkit==0.12.0
+tomlkit==0.13.2
     # via gradio
 torch==2.4.0
     # via
@@ -233,19 +216,20 @@ torch==2.4.0
     #   torchvision
 torchvision==0.19.0
     # via blip2 (pyproject.toml)
-tqdm==4.66.5
+tqdm==4.67.1
     # via
     #   huggingface-hub
     #   transformers
-transformers==4.45.1
+transformers==4.47.1
     # via blip2 (pyproject.toml)
 triton==3.0.0
     # via torch
-typer==0.12.5
+typer==0.15.1
     # via gradio
 typing-extensions==4.12.2
     # via
     #   anyio
+    #   bitsandbytes
     #   fastapi
     #   gradio
     #   gradio-client
@@ -259,11 +243,9 @@ typing-extensions==4.12.2
     #   uvicorn
 tzdata==2024.2
     # via pandas
-urllib3==2.2.3
-    # via
-    #   gradio
-    #   requests
-uvicorn==0.31.0
+urllib3==2.3.0
+    # via requests
+uvicorn==0.34.0
     # via gradio
-websockets==12.0
+websockets==14.1
     # via gradio-client