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

.python-version

@@ -0,0 +1 @@
+3.10

.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: red
 colorTo: purple
 sdk: gradio
-sdk_version: 4.36.1
+sdk_version: 5.9.1
 app_file: app.py
 pinned: false
 license: mit

app.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import annotations
-
 import os
 
 import gradio as gr
@@ -53,11 +51,10 @@ def run(
         length_penalty=length_penalty,
         temperature=temperature,
     )
-    generated_caption = processor.batch_decode(generated_ids, skip_special_tokens=True)[0].strip()
-    return generated_caption
+    return processor.batch_decode(generated_ids, skip_special_tokens=True)[0].strip()
 
 
-with gr.Blocks(css="style.css") as demo:
+with gr.Blocks(css_paths="style.css") as demo:
     gr.Markdown(DESCRIPTION)
 
     with gr.Row():

pyproject.toml

@@ -0,0 +1,50 @@
+[project]
+name = "instructblip"
+version = "0.1.0"
+description = ""
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "accelerate>=1.2.1",
+    "gradio>=5.9.1",
+    "spaces>=0.31.1",
+    "torch==2.4.0",
+    "torchvision>=0.19.0",
+    "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,7 +1,244 @@
-accelerate==0.31.0
-gradio==4.36.1
-Pillow==10.3.0
-spaces==0.28.3
-torch==2.0.1
-torchvision==0.15.2
-transformers==4.41.2
+# This file was autogenerated by uv via the following command:
+#    uv pip compile pyproject.toml -o requirements.txt
+accelerate==1.2.1
+    # via instructblip (pyproject.toml)
+aiofiles==23.2.1
+    # via gradio
+annotated-types==0.7.0
+    # via pydantic
+anyio==4.7.0
+    # via
+    #   gradio
+    #   httpx
+    #   starlette
+certifi==2024.12.14
+    # via
+    #   httpcore
+    #   httpx
+    #   requests
+charset-normalizer==3.4.1
+    # via requests
+click==8.1.8
+    # via
+    #   typer
+    #   uvicorn
+exceptiongroup==1.2.2
+    # via anyio
+fastapi==0.115.6
+    # via gradio
+ffmpy==0.5.0
+    # via gradio
+filelock==3.16.1
+    # via
+    #   huggingface-hub
+    #   torch
+    #   transformers
+    #   triton
+fsspec==2024.12.0
+    # via
+    #   gradio-client
+    #   huggingface-hub
+    #   torch
+gradio==5.9.1
+    # via
+    #   instructblip (pyproject.toml)
+    #   spaces
+gradio-client==1.5.2
+    # via gradio
+h11==0.14.0
+    # via
+    #   httpcore
+    #   uvicorn
+httpcore==1.0.7
+    # via httpx
+httpx==0.28.1
+    # via
+    #   gradio
+    #   gradio-client
+    #   safehttpx
+    #   spaces
+huggingface-hub==0.27.0
+    # via
+    #   accelerate
+    #   gradio
+    #   gradio-client
+    #   tokenizers
+    #   transformers
+idna==3.10
+    # via
+    #   anyio
+    #   httpx
+    #   requests
+jinja2==3.1.5
+    # via
+    #   gradio
+    #   torch
+markdown-it-py==3.0.0
+    # via rich
+markupsafe==2.1.5
+    # via
+    #   gradio
+    #   jinja2
+mdurl==0.1.2
+    # via markdown-it-py
+mpmath==1.3.0
+    # via sympy
+networkx==3.4.2
+    # via torch
+numpy==2.2.1
+    # via
+    #   accelerate
+    #   gradio
+    #   pandas
+    #   torchvision
+    #   transformers
+nvidia-cublas-cu12==12.1.3.1
+    # via
+    #   nvidia-cudnn-cu12
+    #   nvidia-cusolver-cu12
+    #   torch
+nvidia-cuda-cupti-cu12==12.1.105
+    # via torch
+nvidia-cuda-nvrtc-cu12==12.1.105
+    # via torch
+nvidia-cuda-runtime-cu12==12.1.105
+    # via torch
+nvidia-cudnn-cu12==9.1.0.70
+    # via torch
+nvidia-cufft-cu12==11.0.2.54
+    # via torch
+nvidia-curand-cu12==10.3.2.106
+    # via torch
+nvidia-cusolver-cu12==11.4.5.107
+    # via torch
+nvidia-cusparse-cu12==12.1.0.106
+    # via
+    #   nvidia-cusolver-cu12
+    #   torch
+nvidia-nccl-cu12==2.20.5
+    # via torch
+nvidia-nvjitlink-cu12==12.6.85
+    # via
+    #   nvidia-cusolver-cu12
+    #   nvidia-cusparse-cu12
+nvidia-nvtx-cu12==12.1.105
+    # via torch
+orjson==3.10.13
+    # via gradio
+packaging==24.2
+    # via
+    #   accelerate
+    #   gradio
+    #   gradio-client
+    #   huggingface-hub
+    #   spaces
+    #   transformers
+pandas==2.2.3
+    # via gradio
+pillow==11.0.0
+    # via
+    #   gradio
+    #   torchvision
+psutil==5.9.8
+    # via
+    #   accelerate
+    #   spaces
+pydantic==2.10.4
+    # via
+    #   fastapi
+    #   gradio
+    #   spaces
+pydantic-core==2.27.2
+    # via pydantic
+pydub==0.25.1
+    # via gradio
+pygments==2.18.0
+    # via rich
+python-dateutil==2.9.0.post0
+    # via pandas
+python-multipart==0.0.20
+    # via gradio
+pytz==2024.2
+    # via pandas
+pyyaml==6.0.2
+    # via
+    #   accelerate
+    #   gradio
+    #   huggingface-hub
+    #   transformers
+regex==2024.11.6
+    # via transformers
+requests==2.32.3
+    # via
+    #   huggingface-hub
+    #   spaces
+    #   transformers
+rich==13.9.4
+    # via typer
+ruff==0.8.4
+    # via gradio
+safehttpx==0.1.6
+    # via gradio
+safetensors==0.4.5
+    # via
+    #   accelerate
+    #   transformers
+semantic-version==2.10.0
+    # via gradio
+shellingham==1.5.4
+    # via typer
+six==1.17.0
+    # via python-dateutil
+sniffio==1.3.1
+    # via anyio
+spaces==0.31.1
+    # via instructblip (pyproject.toml)
+starlette==0.41.3
+    # via
+    #   fastapi
+    #   gradio
+sympy==1.13.3
+    # via torch
+tokenizers==0.21.0
+    # via transformers
+tomlkit==0.13.2
+    # via gradio
+torch==2.4.0
+    # via
+    #   instructblip (pyproject.toml)
+    #   accelerate
+    #   torchvision
+torchvision==0.19.0
+    # via instructblip (pyproject.toml)
+tqdm==4.67.1
+    # via
+    #   huggingface-hub
+    #   transformers
+transformers==4.47.1
+    # via instructblip (pyproject.toml)
+triton==3.0.0
+    # via torch
+typer==0.15.1
+    # via gradio
+typing-extensions==4.12.2
+    # via
+    #   anyio
+    #   fastapi
+    #   gradio
+    #   gradio-client
+    #   huggingface-hub
+    #   pydantic
+    #   pydantic-core
+    #   rich
+    #   spaces
+    #   torch
+    #   typer
+    #   uvicorn
+tzdata==2024.2
+    # via pandas
+urllib3==2.3.0
+    # via requests
+uvicorn==0.34.0
+    # via gradio
+websockets==14.1
+    # via gradio-client