Compose a tool command with the agent

Author: slimslenderslacks

prompts/examples/generate-dockerfile.md

@@ -4,6 +4,7 @@ tools:
   - image: vonwig/function_write_files:latest
   - image: vonwig/docker_scout_tag_recommendation:latest
   - image: vonwig/docker-rag:latest
+host-dir: /Users/slim/vonwig/altaservice
 ---
 
 # prompt system

prompts/sql/Chinook.db

@@ -1,9 +1,27 @@
 ---
-agent: sql
+tools:
+  - name: curl
+  - name: sql-agent
+    description: Execute a SQL query against a sqlite database
+    parameters:
+      type: object
+      properties:
+        database:
+          type: string
+          description: the sqlite database file
+        prompt:
+          type: string
+          description: a human description of the query we need to run
+    type: "prompt"
+    prompt: sql-agent.md
 host-dir: /Users/slim/docker/labs-ai-tools-for-devs/prompts/sql  # override host-dir while testing
 ---
 
 # prompt user
 
-find all artists in the database ./Chinook.db
+1.  use curl to download 'https://storage.googleapis.com/benchmarks-artifacts/chinook/Chinook.db' and write to ./Chinook.db
+2.  use the sql-agent tool to run the following prompt.
 
+> find all artists 
+
+Do not try to generate sql. Pass this prompt directly to the agent.  

prompts/sql/prompt.md

@@ -0,0 +1,7 @@
+---
+agent: sql
+---
+
+# prompt user
+
+{{prompt}} in the database {{database}}

prompts/sql/sql-agent.md

@@ -10,7 +10,6 @@
    git
    [git.registry :as registry]
    graph
-   graphs.sql
    jsonrpc
    [logging :refer [warn]]
    prompts
@@ -182,8 +181,8 @@
                                        (-> (with-options opts (rest args))
                                            (assoc :thread-id thread-id))))]
                          (graph/stream
-                          (if (= (-> m :metadata :agent) "sql")
-                            (graphs.sql/graph state)
+                          (if (-> m :metadata :agent)
+                            ((graph/require-graph (-> m :metadata :agent)) state)
                             (graph/chat-with-tools state))
                           m))))
                     user-loop/state-reducer

src/docker/main.clj

@@ -84,14 +84,14 @@
              (async/<!
               (->> (tools/make-tool-calls
                     (or (-> state :opts :level) 0)
-                    (partial 
-                      tools/function-handler 
+                    (partial
+                     tools/function-handler
                       ;; defaults for tool handling are opts, current state functions, and a host-dir override
-                      (merge 
-                        (:opts state) 
-                        (select-keys state [:functions])
+                     (merge
+                      (:opts state)
+                      (select-keys state [:functions])
                         ;; note that host-dir, if it exists, is an override here
-                        (select-keys (:metadata state) [:host-dir :timeout])))
+                      (select-keys (:metadata state) [:host-dir :timeout])))
                     calls)
                    (async/reduce conj []))))})))
 
@@ -104,6 +104,11 @@
   [_]
   (async/go {}))
 
+(defn require-graph [s]
+  (let [graphs-ns-symbol (symbol (format "graphs.%s" s))]
+    (require graphs-ns-symbol)
+    (ns-resolve graphs-ns-symbol 'graph)))
+
 (declare stream chat-with-tools)
 
 (defn apply-functions [coll]
@@ -117,22 +122,33 @@
   [{:keys [init-state construct-graph next-state]}]
   (fn [state]
     (async/go
-      (let [sub-graph-state
-            (async/<!
-             (stream
-              ((or construct-graph chat-with-tools) state)
+      (try
+        (let [new-conversation-state
               (->
-               ((or
-                 ;; the sub-graph might have a function or a vector of state overlays to apply 
-                 (and
-                  init-state
-                  (if (coll? init-state)
-                    (apply-functions init-state)
-                    init-state))
-                 ;; default is to assume there's a tool call with a function that contains a prompt
-                 (comp state/construct-initial-state-from-prompts state/add-prompt-ref)) state)
-               (update-in [:opts :level] (fnil inc 0)))))]
-        ((or next-state state/add-last-message-as-tool-call) state sub-graph-state)))))
+                ((or
+                   ;; the sub-graph might have a function or a vector of state overlays to apply 
+                   (and
+                     init-state
+                     (if (coll? init-state)
+                       (apply-functions init-state)
+                       init-state))
+                   ;; default is to assume there's a tool call with a function that contains a prompt
+                   (comp state/construct-initial-state-from-prompts state/add-prompt-ref)) state)
+                (update-in [:opts :level] (fnil inc 0)))
+
+              sub-graph-state
+              (async/<!
+                (stream
+                  ((or construct-graph
+                       (if-let [agent (-> new-conversation-state :metadata :agent)]
+                         (require-graph agent)
+                         chat-with-tools)) state)
+                  (-> new-conversation-state
+                      (update-in [:metadata] dissoc :agent))))]
+          ((or next-state state/add-last-message-as-tool-call) state sub-graph-state))
+        (catch Throwable t
+          (jsonrpc/notify :error {:content (str t)})
+          {:error (format "unable to enter sub-graph: %s" t)})))))
 
 ; =====================================================
 ; edge functions takes state and returns next node
@@ -163,6 +179,9 @@
 (defn state-reducer
   "reduce the state with the change from running a node"
   [state change]
+  (jsonrpc/notify :message {:debug (format "---\n%s\n---\n%s\n---\n" 
+                                           (with-out-str (pprint/pprint (state/summarize state)))
+                                           (with-out-str (pprint/pprint change)))})
   (-> state
       (merge (dissoc change :messages :tools))
       (update :messages concat (:messages change))
@@ -176,7 +195,6 @@
     [state m
      node "start"]
      (jsonrpc/notify :message {:debug (format "\n-> entering %s\n\n" node)})
-     #_(jsonrpc/notify :message {:debug (with-out-str (pprint/pprint (state/summarize (dissoc state :opts))))})
      ;; TODO handling bad graphs with missing nodes
      (let [enter-node (get-in graph [:nodes node])
            new-state (state-reducer state (async/<! (enter-node state)))]
@@ -224,13 +242,12 @@
 (defn chat-with-tools [_]
   (construct-graph
    [[["start"       start]
-     ["tools-query" tools-query]
      ["completion"  completion]
      [:edge         tool-or-end]]
     [["sub-graph"   (sub-graph-node {})]
-     ["tools-query"]]
+     ["completion"]]
     [["tool"        (tool-node {})]
-     ["tools-query"]]
+     ["completion"]]
     [["end"         end]]]))
 
 (defn generate-one-tool-call [_]

src/graph.clj

@@ -1,5 +1,6 @@
 (ns graphs.sql
   (:require
+   [cheshire.core :as json]
    [clojure.core.async :as async]
    [clojure.string :as string]
    [graph]
@@ -64,12 +65,22 @@
                      :content (failed-tool-call-message (-> tc :function :name))
                      :tool_call_id id}))))})))
 
+(defn summary [{:keys [messages]}]
+  (async/go
+    (let [[{:keys [id] :as tc}] (:tool_calls (last messages))
+          content (-> tc :function :arguments (json/parse-string) (get "final_answer"))]
+      {:messages [{:role "tool"
+                   :content (or content (str tc))
+                   :tool_call_id id}
+                  {:role "assistant"
+                   :content (or content (str tc))}]})))
+
 (defn should-continue
   "end, correct-query, or query-gen"
   [{:keys [messages]}]
   (let [last-message (last messages)]
     (cond
-      (contains? last-message :tool_calls) "end"
+      (contains? last-message :tool_calls) "summary"
       ;; prevent inifinite loops of errors
       (string/starts-with? (:content last-message) "Error:") "query-gen"
       ;; how many times should we try to correct because correct-query will always end up back here 
@@ -100,5 +111,6 @@
                                   :construct-graph graph/generate-one-tool-call
                                   :next-state state/append-new-messages})]
      ["query-gen"]]
-    [["end"                     graph/end]]]))
+    [["summary"                 summary]
+     ["end"                     graph/end]]]))
 

src/graphs/sql.clj

@@ -172,5 +172,6 @@
    #'jsonrpc/notify
    (fn [_] (partial (if (:jsonrpc {}) jsonrpc/-notify jsonrpc/-println) {})))
   (get-prompts {:prompts (fs/file "./prompts/examples/curl.md")})
-  (get-prompts {:prompts (fs/file "./prompts/examples/generate-dockerfile.md")}))
+  (get-prompts {:prompts (fs/file "./prompts/examples/generate-dockerfile.md")})
+  (get-prompts {:prompts (fs/file "./README.md")}))
 

src/prompts.clj

@@ -25,7 +25,8 @@
   (-> m :function :name))
 
 (defn summarize [state]
-  (-> (select-keys state [:messages :metadata])
+  (-> (select-keys state [:messages :metadata :opts])
+      (update :opts #(select-keys % [:level :prompts :parameters]))
       (update :messages (each
                           ;summarize-content 
                           ;summarize-tool-calls
@@ -48,6 +49,11 @@
                     (-> % :name))))
          first)))
 
+(defn prompt-file [state s]
+  (if (string/starts-with? s "github:")
+    (git/prompt-file s)
+    (fs/file (-> state :opts :prompts fs/parent) s)))
+
 (def prompt-tool? (comp prompt? get-function-definition))
 
 (defn add-tool-call-id [m id] (assoc m :role "tool" :tool_call_id id))
@@ -76,10 +82,13 @@
   (let [definition (state/get-function-definition state)
         arg-context (let [raw-args (-> state :messages last :tool_calls first :function :arguments)]
                       (tools/arg-context raw-args))]
-    ; this is the only place where parameters can be passed into the next prompts (extractors only)
+      ; this is the only place where parameters can be passed into the next prompts (extractors only)
     (-> state
         (dissoc :messages)
-        (update-in [:opts :prompts] (constantly (git/prompt-file (-> definition :function :ref))))
+        (update-in [:opts :prompts] (constantly (when-let [s (or
+                                                              (-> definition :function :prompt)
+                                                              (-> definition :function :ref))]
+                                                  (prompt-file state s))))
         (update-in [:opts :parameters] (constantly arg-context)))))
 
 ; ========================================
@@ -127,9 +136,7 @@
 (defn messages-from-prompt [s]
   (fn [_ state]
     (-> state
-        (update-in [:opts :prompts] (constantly (if (string/starts-with? s "github:") 
-                                                  (git/prompt-file s)
-                                                  (fs/file (-> state :opts :prompts fs/parent) s))))
+        (update-in [:opts :prompts] (constantly (prompt-file state s)))
         (construct-initial-state-from-prompts))))
 
 (defn metadata-merge [k]