Add support for Ollama

.github/workflows/ci.yml

@@ -10,6 +10,8 @@ concurrency:
 
 env:
   CARGO_TERM_COLOR: always
+  TEST_MODEL: SlyOtis/git-auto-message:latest
+  OPENAI_API_URL: http://localhost:4010/v1
 
 jobs:
   lint:
@@ -58,6 +60,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Start test services
+        if: startsWith(matrix.os, 'ubuntu')
+        uses: hoverkraft-tech/compose-action@v2.2.0
+        with:
+          services: prism
+
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -84,10 +92,25 @@ jobs:
         if: startsWith(matrix.os, 'macos')
         run: brew install fish
 
-      - name: Run integration tests
+      - name: Install ollama
+        if: startsWith(matrix.os, 'ubuntu')
+        run: curl -fsSL https://ollama.com/install.sh | sh
+
+      - name: Run ollama
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          ollama serve &
+          ollama pull SlyOtis/git-auto-message:latest
+
+      - name: Run comprehensive tests
         run: |
-          ./scripts/integration-tests
           cargo build --release
           cargo test --release
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+
+      - name: Run integration tests (ubuntu)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: ./scripts/integration-tests
+        env:
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}

.gitignore

@@ -4,7 +4,6 @@ http-cacache/*
 .secrets
 .env.local
 ${env:TMPDIR}
-bin/
 tmp/
 finetune_verify.jsonl
 finetune_train.jsonl

Cargo.toml

@@ -5,6 +5,9 @@ edition = "2021"
 description = "Git AI: Automates commit messages using ChatGPT. Stage your files, and Git AI generates the messages."
 license = "MIT"
 repository = "https://github.com/oleander/git-ai"
+readme = "README.md"
+keywords = ["git", "ai", "commit", "message", "generator"]
+categories = ["development-tools", "command-line-utilities"]
 
 # https://github.com/oleander/git-ai/actions/runs/11872246630/artifacts/2196924470
 [package.metadata.binstall]
@@ -31,7 +34,9 @@ thiserror = "2.0.11"
 tokio = { version = "1.43", features = ["full"] }
 futures = "0.3"
 parking_lot = "0.12.3"
+async-trait = "0.1"
 tracing = "0.1"
+url = "2.5.0"
 
 # CLI and UI
 
@@ -53,6 +58,8 @@ serde_ini = "0.2.0"
 serde_json = "1.0"
 
 # OpenAI integration
+
+ollama-rs = { version = "0.2.5", features = ["stream"] }
 async-openai = { version = "0.27.2", default-features = false }
 tiktoken-rs = "0.6.0"
 reqwest = { version = "0.12.12", default-features = true }
@@ -78,6 +85,10 @@ structopt = "0.3.26"
 mustache = "0.9.0"
 maplit = "1.0.2"
 
+# New dependencies
+once_cell = "1.19.0"
+xxhash-rust = { version = "0.8.10", features = ["xxh3"] }
+
 [dev-dependencies]
 tempfile = "3.16.0"
 
@@ -90,3 +101,7 @@ lto = true
 [profile.release.package."*"]
 codegen-units = 1
 opt-level = 3
+
+[features]
+default = []
+integration_tests = []

README.md

@@ -70,6 +70,7 @@ Customize Git AI's behavior with these commands:
 - `git-ai config set max-tokens <tokens>` (default: 512): Set the maximum number of tokens for the assistant.
 - `git-ai config set model <model>` (default: "gpt-3.5-turbo"): Set the OpenAI model to use.
 - `git-ai config set openai-api-key <api-key>`: Set your OpenAI API key.
+- `git-ai config set url <url>` (default: "https://api.openai.com/v1"): Set the OpenAI API URL. Useful for using alternative OpenAI-compatible APIs or proxies.
 
 ## Contributing
 

docker-compose.yml

@@ -0,0 +1,16 @@
+services:
+  prism:
+    image: stoplight/prism:latest
+    platform: linux/amd64
+    command: ["mock", "-h", "0.0.0.0", "--cors", "/app/openapi-mock.yaml"]
+    ports:
+      - "4010:4010"
+    volumes:
+      - ./openapi-mock.yaml:/app/openapi-mock.yaml
+    restart: unless-stopped
+    stop_grace_period: 1s
+    develop:
+      watch:
+        - action: sync+restart
+          path: ./openapi-mock.yaml
+          target: /app/openapi-mock.yaml