Skip to content

Commit

Permalink
Update error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@slimslenderslacks
slimslenderslacks committed Oct 3, 2024
1 parent c3fa7c1 commit 970db3a
Show file tree
Hide file tree
Showing 7 changed files with 116 additions and 92 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
.clj-kondo
.lsp
/prompts/stable-diffusion/*.png
**/.DS_Store
2 changes: 1 addition & 1 deletion graphs/prompts/pages/jsonrpc.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
probably represents something like a networking error or a configuration problem.

```json
{"params": {"content": "error message"}}
{"params": {"content": "error message", "exception": "..."}}
```
- ### Request Methods
- #### prompt
Expand Down
Binary file removed prompts/.DS_Store
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion prompts/curl/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ tools:

# prompt user

Run the curl command to fetch gists for user slimslenderslacks from GitHub.
Run the curl command, in silent mode, to fetch gists for user slimslenderslacks from GitHub.

2 changes: 1 addition & 1 deletion src/docker.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
(def extract-facts run-function)

(defn write-stdin [container-id content]
(let [buf (ByteBuffer/allocate (* 4 (count content)))
(let [buf (ByteBuffer/allocate (* 1024 20))
address (UnixDomainSocketAddress/of "/var/run/docker.sock")
client (SocketChannel/open address)]

Expand Down
31 changes: 18 additions & 13 deletions src/openai.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
returns nil
throws exception if response can't be initiated or if we get a non 200 status code"
[request cb]
(jsonrpc/notify :message {:content "\n## ROLE assistant\n"})
(jsonrpc/notify :start {:level (or (:level request) 0) :role "assistant"})
(let [b (merge
{:model "gpt-4"}
(dissoc request :url))
(dissoc request :url :level))
response
(http/post
(or (:url request) "https://api.openai.com/v1/chat/completions")
Expand All @@ -43,27 +43,31 @@
(slurp (:body response))))
(doseq [chunk (line-seq (io/reader (:body response)))]
(cb chunk)))
(throw (ex-info "Failed to call OpenAI API" {:body (if (string? (:body response))
(:body response)
(slurp (:body response)))})))))
(let [s (if (string? (:body response))
(:body response)
(slurp (:body response)))]
(jsonrpc/notify :message {:content s})
(throw (ex-info "Failed to call OpenAI API" {:body s}))))))

(defn call-function
" returns channel that will emit one message and then close"
[function-handler function-name arguments tool-call-id]
[level function-handler function-name arguments tool-call-id]
(let [c (async/chan)]
(try
(function-handler
function-name
arguments
{:resolve
(fn [output]
(jsonrpc/notify :message {:content (format "\n## ROLE tool (%s)\n%s\n" function-name output)})
(jsonrpc/notify :start {:level level :role "tool" :content function-name})
(jsonrpc/notify :message {:content (format "\n%s\n" output)})
(async/go
(async/>! c {:content output :role "tool" :tool_call_id tool-call-id})
(async/close! c)))
:fail
(fn [output]
(jsonrpc/notify :message {:content (format "\n## ROLE tool\n function call %s failed %s" function-name output)})
(jsonrpc/notify :start {:level level :role "tool" :content function-name})
(jsonrpc/notify :message {:content (format "function call failed %s" output)})
(async/go
(async/>! c {:content output :role "tool" :tool_call_id tool-call-id})
(async/close! c)))})
Expand All @@ -76,10 +80,10 @@

(defn make-tool-calls
" returns channel with all messages from completed executions of tools"
[function-handler tool-calls]
[level function-handler tool-calls]
(->>
(for [{{:keys [arguments name]} :function tool-call-id :id} tool-calls]
(call-function function-handler name arguments tool-call-id))
(call-function level function-handler name arguments tool-call-id))
(async/merge)))

(defn function-merge [m {:keys [name arguments]}]
Expand Down Expand Up @@ -114,7 +118,7 @@
"handle one response stream that we read from input channel c
adds content or tool_calls while streaming and call any functions when done
returns channel that will emit the an event with a ::response"
[c]
[level c]
(let [response (atom {})]
(async/go-loop
[]
Expand All @@ -137,6 +141,7 @@
(async/<!
(->>
(make-tool-calls
level
(:tool-handler e)
(vals calls))
(async/reduce conj messages)))})
Expand All @@ -160,9 +165,9 @@
(defn chunk-handler
"sets up a response handler loop for use with an OpenAI API call
returns [channel openai-handler] - channel will emit the updated chat messages after dispatching any functions"
[function-handler]
[level function-handler]
(let [c (async/chan 1)]
[(response-loop c)
[(response-loop level c)
(fn [chunk]
;; TODO this only supports when there's a single choice
(let [{[{:keys [delta message finish_reason _role]}] :choices
Expand Down
169 changes: 93 additions & 76 deletions src/prompts.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@
:error
{:content
(logging/render
"unable to run extractors \n```\n{{ container-definition }}\n```\n - {{ exception }}"
"unable to run extractors \n```\n{{ container-definition }}\n```\n"
{:dir host-dir
:container-definition (str container-definition)
:exception (str ex)})})
:container-definition (str container-definition)})
:exception (str ex)})
m)))

(defn- metadata-file [prompts-file]
Expand All @@ -95,12 +95,7 @@
(map (fn [m] (merge (registry/get-extractor m) m))))]
(if (seq extractors)
extractors
[{:name "project-facts"
:image "docker/lsp:latest"
:entrypoint "/app/result/bin/docker-lsp"
:command ["project-facts"
"--vs-machine-id" "none"
"--workspace" "/project"]}])))
[])))

(def hub-images
#{"curl" "qrencode" "toilet" "figlet" "gh" "typos" "fzf" "jq" "fmpeg" "pylint"})
Expand All @@ -109,50 +104,58 @@
"get either :functions or :tools collection
returns collection of openai compatiable tool definitions augmented with container info"
[f]
(->>
(->
(markdown/parse-metadata (metadata-file f))
first
(select-keys [:tools :functions])
seq
first ;; will take the first either tools or functions randomly
second ;; returns the tools or functions array
)
(mapcat
(fn [m]
(if-let [tool (hub-images (:name m))]
;; these come from our own public hub images
[{:type "function"
:function
{:name (format "%s-manual" tool)
:description (format "Run the man page for %s" tool)
:container
{:image (format "vonwig/%s:latest" tool)
:command
["{{raw|safe}}" "man"]}}}
{:type "function"
:function
(merge
{:description (format "Run a %s command." tool)
:parameters
{:type "object"
:properties
{:args
{:type "string"
:description (format "The arguments to pass to %s" tool)}}}
:container
{:image (format "vonwig/%s:latest" tool)
:command ["{{raw|safe}}"]}}
m)}]
[{:type "function" :function (merge (registry/get-function m) (dissoc m :image))}])))))
(try
(->>
(->
(markdown/parse-metadata (metadata-file f))
first
(select-keys [:tools :functions])
seq
first ;; will take the first either tools or functions randomly
second ;; returns the tools or functions array
)
(mapcat
(fn [m]
(if-let [tool (hub-images (:name m))]
;; these come from our own public hub images
[{:type "function"
:function
{:name (format "%s-manual" tool)
:description (format "Run the man page for %s" tool)
:container
{:image (format "vonwig/%s:latest" tool)
:command
["{{raw|safe}}" "man"]}}}
{:type "function"
:function
(merge
{:description (format "Run a %s command." tool)
:parameters
{:type "object"
:properties
{:args
{:type "string"
:description (format "The arguments to pass to %s" tool)}}}
:container
{:image (format "vonwig/%s:latest" tool)
:command ["{{raw|safe}}"]}}
m)}]
[{:type "function" :function (merge (registry/get-function m) (dissoc m :image))}]))))
(catch Throwable _
;; TODO warn about empty yaml front matter?
[])))

(defn collect-metadata
"collect metadata from yaml front-matter in README.md
skip functions and extractors"
[f]
(dissoc
(-> (markdown/parse-metadata (metadata-file f)) first)
:extractors :functions))
(try
(dissoc
(-> (markdown/parse-metadata (metadata-file f)) first)
:extractors :functions)
(catch Throwable _
;; TODO warn about empty yaml front matter?
{})))

(defn run-extractors
"returns a map of extracted *math-context*
Expand Down Expand Up @@ -190,13 +193,20 @@
m (merge (run-extractors opts) parameters)
renderer (partial selma-render prompts (facts m user platform))
prompts (if (fs/directory? prompts)
;; directory based prompts
(->> (fs/list-dir prompts)
(filter (name-matches prompt-file-pattern))
(sort-by fs/file-name)
(map (fn [f] {:role (let [[_ role] (re-find prompt-file-pattern (fs/file-name f))] role)
:content (slurp (fs/file f))}))
(into []))
(markdown-parser/parse-markdown (slurp prompts)))]
;; file based prompts
(try
(let [p (slurp prompts)]
(markdown-parser/parse-markdown p))
(catch Throwable t
(jsonrpc/notify :error {:content (format "failed to parse prompts from markdown %s" t)})
[])))]
(map renderer prompts)))

(defn interpolate [m template]
Expand All @@ -215,7 +225,7 @@
function-name - the name of the function that the LLM has selected
json-arg-string - the JSON arg string that the LLM has generated
resolve fail - callbacks"
[{:keys [functions user jwt timeout] :as opts} function-name json-arg-string {:keys [resolve fail]}]
[{:keys [functions user jwt timeout level] :as opts :or {level 0}} function-name json-arg-string {:keys [resolve fail]}]
(if-let [definition (->
(->> (filter #(= function-name (-> % :function :name)) functions)
first)
Expand Down Expand Up @@ -258,13 +268,15 @@

(= "prompt" (:type definition)) ;; asynchronous call to another agent - new conversation-loop
(do
(jsonrpc/notify :message {:content (format "## (%s) sub-prompt" (:ref definition))})
(jsonrpc/notify :start {:level level
:role "tool"
:content (:ref definition)})
(let [{:keys [messages _finish-reason]}
(async/<!! (conversation-loop
(assoc opts
:level (inc (or (:level opts) 0))
:prompts (git/prompt-file (:ref definition))
:parameters arg-context)))]
(jsonrpc/notify :message {:content (format "## (%s) end sub-prompt" (:ref definition))})
(resolve (->> messages
(filter #(= "assistant" (:role %)))
(last)
Expand All @@ -275,37 +287,44 @@
(fail (format "system failure %s" t)))))
(fail "no function found")))

(defn- stop-looping [c s]
(jsonrpc/notify :error {:content s})
(async/>!! c {:messages [{:role "assistant" :content s}]
:finish-reason "error"}))

(defn- run-prompts
"call openai compatible chat completion endpoint and handle tool requests
params
prompts is the conversation history
args for extracting functions, host-dir, user, platform
returns channel that will contain the final set of messages and a finish-reason"
[messages {:keys [prompts url model stream] :as opts}]
[messages {:keys [prompts url model stream level] :as opts :or {level 0}}]
(let [m (collect-metadata prompts)
functions (collect-functions prompts)
[c h] (openai/chunk-handler (partial
function-handler
(merge
opts
(select-keys m [:timeout])
{:functions functions})))]
[c h] (openai/chunk-handler
level
(partial
function-handler
(merge
opts
(select-keys m [:timeout])
{:functions functions})))]
(try
(openai/openai
(merge
m
{:messages messages}
(when (seq functions) {:tools functions})
(when url {:url url})
(when model {:model model})
(when (and stream (nil? (:stream m))) {:stream stream})) h)
(if (seq messages)
(openai/openai
(merge
m
{:messages messages
:level level}
(when (seq functions) {:tools functions})
(when url {:url url})
(when model {:model model})
(when (and stream (nil? (:stream m))) {:stream stream})) h)
(stop-looping c "This is an empty set of prompts. Define prompts using h1 sections (eg `# prompt user`)" ))
(catch ConnectException _
;; when the conversation-loop can not connect to an openai compatible endpoint
(async/>!! c {:messages [{:role "assistant" :content "I cannot connect to an openai compatible endpoint."}]
:finish-reason "error"}))
(stop-looping c "I cannot connect to an openai compatible endpoint."))
(catch Throwable t
(async/>!! c {:messages [{:role "assistant" :content (str t)}]
:finish-reason "error"})))
(stop-looping c (str t))))
c))

(defn- conversation-loop
Expand Down Expand Up @@ -333,7 +352,7 @@
(catch Throwable ex
(let [c (async/promise-chan)]
(jsonrpc/notify :error {:content
(format "not a valid prompt configuration: %s" (with-out-str (pprint opts)))
(format "failure for prompt configuration:\n %s" (with-out-str (pprint (dissoc opts :pat :jwt))))
:exception (str ex)})
(async/>! c {:messages [] :done "error"})
c))))
Expand Down Expand Up @@ -410,9 +429,7 @@
{:content
(json/generate-string
(if (map? x)
(if (= "error" (:done x))
(update x :messages last)
(select-keys x [:done]))
(select-keys x [:done])
x))})))

(defn output-prompts [coll]
Expand Down

0 comments on commit 970db3a

Please sign in to comment.