Refactor sql graph

Author: slimslenderslacks

src/graph.clj

@@ -1,8 +1,8 @@
 (ns graph
   (:require
-   [babashka.fs :as fs]
    [clojure.core.async :as async]
    [clojure.core.match :refer [match]]
+   [clojure.pprint :as pprint]
    git
    jsonrpc
    openai
@@ -155,7 +155,7 @@
     [state m
      node "start"]
      (jsonrpc/notify :message {:debug (format "\n-> entering %s\n\n" node)})
-     #_(jsonrpc/notify :message {:debug (with-out-str (pprint (state/summarize (dissoc state :opts))))})
+     (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)))]
@@ -256,3 +256,6 @@
    [["tool" (tool-node {})]
     ["end"]]])
 
+(defn generate-start-with-tool [_]
+  (construct-graph start-with-tool))
+

src/graphs/sql.clj

@@ -114,8 +114,8 @@
    [[["start"                   graph/start]
      ["list-tables-tool"        (graph/sub-graph-node 
                                   {:init-state seed-list-tables-conversation
-                                   :construct-graph (fn [_] (graph/construct-graph graph/start-with-tool))
-                                   :next-state state/take-last-two-messages})]
+                                   :construct-graph graph/generate-start-with-tool 
+                                   :next-state (state/take-last-messages 2)})]
      ["model-get-schema"        (graph/sub-graph-node
                                  {:init-state seed-get-schema-conversation
                                   :next-state state/append-new-messages})]

src/state.clj

@@ -1,4 +1,4 @@
-(ns state 
+(ns state
   (:require
    git
    jsonrpc
@@ -22,10 +22,10 @@
 
 (defn summarize [state]
   (-> state
-      (update :messages (each 
+      (update :messages (each
                           ;summarize-content 
                           ;summarize-tool-calls
-                          ))))
+                         ))))
 
 (defn prompt? [m]
   (= "prompt" (-> m :function :type)))
@@ -75,7 +75,6 @@
         (update-in [:opts :prompts] (constantly (git/prompt-file (-> definition :function :ref))))
         (update-in [:opts :parameters] (constantly arg-context)))))
 
-
 (defn add-last-message-as-tool-call
   [state sub-graph-state]
   {:messages [(-> sub-graph-state
@@ -88,9 +87,11 @@
   {:messages (->> (:messages sub-graph-state)
                   (filter (complement (fn [m] (some #(= m %) (:messages state))))))})
 
-(defn take-last-two-messages
-  [_ sub-graph-state]
-  {:messages (->> (:messages sub-graph-state)
-                  (take-last 2))})
+(defn take-last-messages
+  [n]
+  (fn
+    [_ sub-graph-state]
+    {:messages (->> (:messages sub-graph-state)
+                    (take-last n))}))