feat: non-blocking Ollama script with hook_process_hashtable, no debug logs

Author: prietus

python/ollama.py

@@ -28,7 +28,6 @@
 Dependencies:
 - Requires an Ollama server running locally at http://localhost:11434/api/generate
 """
-
 SCRIPT_NAME = "ollama"
 SCRIPT_AUTHOR = "teraflops"
 SCRIPT_VERSION = "2.1"
@@ -46,37 +45,48 @@ def setup_config():
 setup_config()
 
 def ask_ollama_async(prompt, buffer, prefix=""):
-    data = json.dumps({
-        "model": "gemma",
+    payload = json.dumps({
+        "model": "gemma2:2b",
         "prompt": prompt,
         "stream": False
     })
-    headers = "Content-Type: application/json\n"
-    timeout_ms = 10000
+
+    curl_path = "/usr/bin/curl"  # If curl is elsewhere, adjust this path
+    escaped_payload = payload.replace('"', '\\"')
+
+    cmd = (
+        f"{curl_path} -s -X POST "
+        "-H 'Content-Type: application/json' "
+        f'--data \"{escaped_payload}\" {OLLAMA_API_URL}'
+    )
+
     user_data = f"{buffer}||{prefix}"
-    weechat.hook_url(
-        OLLAMA_API_URL,
-        headers,
-        "POST",
-        data,
-        timeout_ms,
+    # This is the non-blocking call that uses hook_process_hashtable:
+    weechat.hook_process_hashtable(
+        cmd,
+        {"timeout": "10000"},  # 10s
+        10000,
         "ollama_response_callback",
         user_data
     )
 
 def ollama_response_callback(data, command, return_code, out, err):
     buffer, prefix = data.split("||", 1)
-    if return_code == 0:
+
+    if return_code is None or return_code == weechat.WEECHAT_HOOK_PROCESS_ERROR:
+        response = "[Ollama] Error executing request."
+    elif out.strip() == "":
+        response = "[Ollama] Empty response from Ollama."
+    else:
         try:
-            response = json.loads(out).get("response", "No response received from Ollama.")
+            parsed = json.loads(out)
+            response = parsed.get("response", "[Ollama] No 'response' field in reply.")
         except Exception:
-            response = "Error parsing Ollama response."
-    else:
-        response = f"Error: {err}"
+            response = "[Ollama] Error parsing server response."
 
-    if prefix:  # Private message
+    if prefix:
         weechat.command(buffer, f"/msg {prefix} {response}")
-    else:  # Channel
+    else:
         weechat.command(buffer, f"/say {response}")
 
     return weechat.WEECHAT_RC_OK
@@ -98,12 +108,15 @@ def message_callback(data, buffer, date, tags, displayed, highlight, prefix, mes
     username = weechat.info_get("irc_nick", "")
     is_mentioned = f"@{username.lower()}" in message.lower()
 
+    # Skip PM if pm_response=off
     if is_private and weechat.config_get_plugin("pm_response") == "off":
         return weechat.WEECHAT_RC_OK
 
+    # Only respond to PM if ends with '?'
     if is_private and not message.strip().endswith("?"):
         return weechat.WEECHAT_RC_OK
 
+    # In channels, respond only if highlight or explicit mention
     if not is_private and not is_mentioned and not int(highlight):
         return weechat.WEECHAT_RC_OK
 
@@ -118,7 +131,15 @@ def config_callback(data, option, value):
 weechat.config_set_desc_plugin("pm_response", "Automatically respond to private messages (on/off)")
 weechat.hook_config("plugins.var.python.ollama.highlight_response", "config_callback", "")
 weechat.hook_config("plugins.var.python.ollama.pm_response", "config_callback", "")
-weechat.hook_command("ollama", "Ask something to Ollama", "<question>", "Example: /ollama What is Python?", "", "command_ollama", "")
+weechat.hook_command(
+    "ollama",
+    "Ask something to Ollama",
+    "<question>",
+    "Example: /ollama What is Python?",
+    "",
+    "command_ollama",
+    ""
+)
 weechat.hook_print("", "notify_highlight", "", 1, "message_callback", "")
 weechat.hook_print("", "notify_message", "", 1, "message_callback", "")
 weechat.hook_print("", "notify_private", "", 1, "message_callback", "")