Updated ruff and Makefile, added toml-sort and `pre-commit-hook…

…s` (#7889)

.github/workflows/build_package.yml

@@ -37,4 +37,3 @@ jobs:
         working-directory: ${{ vars.RUNNER_TEMP }}
         run: |
           python -c "import llama_index"
-        

.github/workflows/dev_docs.yml

@@ -18,4 +18,4 @@ jobs:
           destination-repository-name: 'llama_index'
           user-email: github-actions[bot]@users.noreply.github.com
           target-branch: main
-          target-directory: docs
+          target-directory: docs

.github/workflows/publish_release.yml

@@ -56,4 +56,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: dist/${{ env.name }}
           asset_name: ${{ env.name }}
-          asset_content_type: application/zip
+          asset_content_type: application/zip

.github/workflows/unit_test.yml

@@ -28,4 +28,3 @@ jobs:
         env:
           CI: true
         run: pytest tests
-

.pre-commit-config.yaml

@@ -3,11 +3,29 @@ default_language_version:
     python: python3
 
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-byte-order-marker
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-toml
+      - id: check-yaml
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+      - id: trailing-whitespace
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.243
+    rev: v0.0.292
+
     hooks:
       - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/psf/black-pre-commit-mirror
     rev: 23.9.1
     hooks:
       - id: black-jupyter
+  - repo: https://github.com/pappasam/toml-sort
+    rev: v0.23.1
+    hooks:
+      - id: toml-sort-fix

CHANGELOG.md

@@ -9,6 +9,7 @@
 ### Bug Fixes / Nits
 - Fix `LocalAI` chat capability without `max_tokens` (#7942)
 - Added `codespell` for automated checking (#7941)
+- `ruff` modernization and autofixes (#7889)
 
 ## [0.8.38] - 2023-10-02
 

CITATION.cff

@@ -7,4 +7,4 @@ authors:
 title: "LlamaIndex"
 doi: 10.5281/zenodo.1234
 date-released: 2022-11-1
-url: "https://github.com/jerryjliu/llama_index"
+url: "https://github.com/jerryjliu/llama_index"

CONTRIBUTING.md

@@ -103,7 +103,7 @@ See [Storage guide](https://gpt-index.readthedocs.io/en/latest/how_to/storage.ht
 
 A managed index is used to represent an index that's managed via an API, exposing API calls to index documents and query documents.
 
-Currently we support the [VectaraIndex](https://github.com/run-llama/llama_index/tree/ca09272af000307762d301c99da46ddc70d3bfd2/llama_index/indices/managed/vectara). 
+Currently we support the [VectaraIndex](https://github.com/run-llama/llama_index/tree/ca09272af000307762d301c99da46ddc70d3bfd2/llama_index/indices/managed/vectara).
 Open to contributions!
 
 See [Managed Index docs](https://gpt-index.readthedocs.io/en/stable/community/integrations/managed_indices.html) for details.

LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

MANIFEST.in

@@ -1,3 +1,3 @@
 include llama_index/py.typed
 include llama_index/VERSION
-include LICENSE
+include LICENSE

Makefile

@@ -1,16 +1,18 @@
 GIT_ROOT ?= $(shell git rev-parse --show-toplevel)
-help: ## Show all Makefile targets
+
+help:	## Show all Makefile targets.
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[33m%-30s\033[0m %s\n", $$1, $$2}'
 
-.PHONY: format lint
-format: ## Run code formatter: black
+format:	## Run code autoformatters (black).
 	black .
+
 lint: ## Run linters: mypy, black, codespell, ruff
+	pre-commit install && pre-commit run --all-files
 	mypy .
-	black . --check
 	codespell .
-	ruff check .
-test: ## Run tests
+
+test:	## Run tests via pytest.
 	pytest tests
-watch-docs: ## Build and watch documentation
+
+watch-docs:	## Build and watch documentation.
 	sphinx-autobuild docs/ docs/_build/html --open-browser --watch $(GIT_ROOT)/llama_index/