provider: revert to simple dex:post (API key confirmed valid)
Some checks failed
Deploy (Gitea) / deploy (push) Failing after 2s

This commit is contained in:
2026-05-04 20:41:46 -04:00
parent d8929aeb24
commit d782f58291
2 changed files with 22 additions and 52 deletions

View File

@@ -51,13 +51,6 @@
`((model . ,model-id) `((model . ,model-id)
(messages . (( (role . "system") (content . ,system-prompt) ) (messages . (( (role . "system") (content . ,system-prompt) )
( (role . "user") (content . ,prompt) ))))))) ( (role . "user") (content . ,prompt) )))))))
(handler-case
(let* ((result nil)
(lock (bt:make-lock "llm-lock"))
(cvar (bt:make-condition-variable))
(thread (bt:make-thread
(lambda ()
(unwind-protect
(handler-case (handler-case
(let* ((response (dex:post url :headers headers :content body (let* ((response (dex:post url :headers headers :content body
:connect-timeout (min 10 timeout) :connect-timeout (min 10 timeout)
@@ -67,17 +60,9 @@
(first-choice (car choices)) (first-choice (car choices))
(message (cdr (assoc :message first-choice))) (message (cdr (assoc :message first-choice)))
(content (cdr (assoc :content message)))) (content (cdr (assoc :content message))))
(setf result (list :status :success :content content))) (if content
(error (c) (list :status :success :content content)
(setf result (list :status :error :message (format nil "~a Error: ~a" provider c))))) (list :status :error :message (format nil "~a: No content" provider))))
(bt:with-lock-held (lock)
(bt:condition-notify cvar))))
:name (format nil "llm-~a" provider))))
(bt:with-lock-held (lock)
(unless result
(bt:condition-wait cvar lock :timeout timeout)))
(or result
(list :status :error :message (format nil "~a: Request timed out after ~d seconds" provider timeout))))
(error (c) (error (c)
(list :status :error :message (format nil "~a Failure: ~a" provider c)))))) (list :status :error :message (format nil "~a Failure: ~a" provider c))))))

View File

@@ -79,13 +79,6 @@ Providers register themselves at boot. No API key? That provider doesn't registe
`((model . ,model-id) `((model . ,model-id)
(messages . (( (role . "system") (content . ,system-prompt) ) (messages . (( (role . "system") (content . ,system-prompt) )
( (role . "user") (content . ,prompt) ))))))) ( (role . "user") (content . ,prompt) )))))))
(handler-case
(let* ((result nil)
(lock (bt:make-lock "llm-lock"))
(cvar (bt:make-condition-variable))
(thread (bt:make-thread
(lambda ()
(unwind-protect
(handler-case (handler-case
(let* ((response (dex:post url :headers headers :content body (let* ((response (dex:post url :headers headers :content body
:connect-timeout (min 10 timeout) :connect-timeout (min 10 timeout)
@@ -95,17 +88,9 @@ Providers register themselves at boot. No API key? That provider doesn't registe
(first-choice (car choices)) (first-choice (car choices))
(message (cdr (assoc :message first-choice))) (message (cdr (assoc :message first-choice)))
(content (cdr (assoc :content message)))) (content (cdr (assoc :content message))))
(setf result (list :status :success :content content))) (if content
(error (c) (list :status :success :content content)
(setf result (list :status :error :message (format nil "~a Error: ~a" provider c))))) (list :status :error :message (format nil "~a: No content" provider))))
(bt:with-lock-held (lock)
(bt:condition-notify cvar))))
:name (format nil "llm-~a" provider))))
(bt:with-lock-held (lock)
(unless result
(bt:condition-wait cvar lock :timeout timeout)))
(or result
(list :status :error :message (format nil "~a: Request timed out after ~d seconds" provider timeout))))
(error (c) (error (c)
(list :status :error :message (format nil "~a Failure: ~a" provider c)))))) (list :status :error :message (format nil "~a Failure: ~a" provider c))))))
#+end_src #+end_src