Update for latest ollama support (#1092)

.github/workflows/nightly.yml

@@ -0,0 +1,24 @@
+name: Nightly Testing
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  linux:
+    name: Nightly Linux
+    if: github.repository_owner == 'NVIDIA'
+    uses: ./.github/workflows/test_linux.yml
+  windows:
+    name: Nightly Windows
+    if: github.repository_owner == 'NVIDIA'
+    uses: ./.github/workflows/test_windows.yml
+  macos:
+    name: Nightly MacOS
+    if: github.repository_owner == 'NVIDIA'
+    uses: ./.github/workflows/test_macos.yml
+  package_test:
+    name: Nightly Packaging
+    if: github.repository_owner == 'NVIDIA'
+    uses: ./.github/workflows/remote_package_install.yml

.github/workflows/remote_package_install.yml

@@ -6,6 +6,7 @@ on:
       - 'main'
   pull_request:
   workflow_dispatch:
+  workflow_call:
 
 jobs:
   build:

.github/workflows/test_linux.yml

@@ -6,6 +6,7 @@ on:
       - 'main'
   pull_request:
   workflow_dispatch:
+  workflow_call:
 
 jobs:
   build:

.github/workflows/test_macos.yml

@@ -6,6 +6,7 @@ on:
       - 'main'
   pull_request:
   workflow_dispatch:
+  workflow_call:
 
 jobs:
   build_macos:

.github/workflows/test_windows.yml

@@ -6,6 +6,7 @@ on:
       - 'main'
   pull_request:
   workflow_dispatch:
+  workflow_call:
 
 jobs:
   build_windows:

pyproject.toml

@@ -86,7 +86,7 @@ dependencies = [
   "lorem==0.1.1",
   "xdg-base-dirs>=6.0.1",
   "wn==0.9.5",
-  "ollama>=0.1.7",
+  "ollama>=0.4.7",
   "tiktoken>=0.7.0"
 ]
 

requirements.txt

@@ -34,7 +34,7 @@ python-magic>=0.4.21; sys_platform != "win32"
 lorem==0.1.1
 xdg-base-dirs>=6.0.1
 wn==0.9.5
-ollama>=0.1.7
+ollama>=0.4.7
 tiktoken>=0.7.0
 # tests
 pytest>=8.0

tests/generators/test_ollama.py

@@ -2,7 +2,6 @@
 import ollama
 import respx
 import httpx
-from httpx import ConnectError
 from garak.generators.ollama import OllamaGeneratorChat, OllamaGenerator
 
 PINGED_OLLAMA_SERVER = False  # Avoid calling the server multiple times if it is not running
@@ -17,7 +16,7 @@ def ollama_is_running():
         try:
             ollama.list()  # Gets a list of all pulled models. Used as a ping
             OLLAMA_SERVER_UP = True
-        except ConnectError:
+        except ConnectionError:
             OLLAMA_SERVER_UP = False
         finally:
             PINGED_OLLAMA_SERVER = True
@@ -141,4 +140,4 @@ def test_error_on_nonexistant_model_chat_mocked(respx_mock):
     model_name = "non-existant-model"
     gen = OllamaGeneratorChat(model_name)
     with pytest.raises(ollama.ResponseError):
-        gen.generate("This shouldnt work")
+        gen.generate("This shouldnt work")