resolve merge conflict

This commit is contained in:
cotran 2024-10-16 15:00:04 -07:00
commit 46a1407080
41 changed files with 5756 additions and 351 deletions

View file

@ -8,28 +8,33 @@ repos:
- id: trailing-whitespace
- repo: local
hooks:
- id: cargo-fmt
name: cargo-fmt
language: system
types: [file, rust]
entry: bash -c "cd arch && cargo fmt -p intelligent-prompt-gateway -- --check"
entry: bash -c "cd crates/llm_gateway && cargo fmt -- --check"
- id: cargo-clippy
name: cargo-clippy
language: system
types: [file, rust]
entry: bash -c "cd arch && cargo clippy -p intelligent-prompt-gateway --all"
entry: bash -c "cd crates/llm_gateway && cargo clippy --all"
- id: cargo-test
name: cargo-test
language: system
types: [file, rust]
# --lib is to only test the library, since when integration tests are made,
# they will be in a seperate tests directory
entry: bash -c "cd arch && cargo test -p intelligent-prompt-gateway --lib"
entry: bash -c "cd crates/llm_gateway && cargo test --lib"
- id: python-tests
name: Run Python Tests with pytest
language: system
entry: bash -c "cd model_server && pytest --maxfail=5 --disable-warnings"
types: [python]
- repo: https://github.com/psf/black
rev: 23.1.0
hooks: