Remove bad stdout usage

Author: slimslenderslacks

src/docker.clj

@@ -8,6 +8,7 @@
    [clojure.string :as string]
    [creds]
    jsonrpc
+   [jsonrpc.logger :as logger]
    logging
    schema)
   (:import
@@ -35,10 +36,10 @@
   (curl/post
    (format "http://localhost/images/create?fromImage=%s" image)
    (merge
-     {:raw-args ["--unix-socket" (let [f (fs/file "/var/run/docker.raw.sock")] 
-                                   (if (.exists f)  
-                                     "/var/run/docker.raw.sock"
-                                     "/var/run/docker.sock"))]
+    {:raw-args ["--unix-socket" (let [f (fs/file "/var/run/docker.raw.sock")]
+                                  (if (.exists f)
+                                    "/var/run/docker.raw.sock"
+                                    "/var/run/docker.sock"))]
      :throw false}
     (when (or creds identity-token)
       {:headers {"X-Registry-Auth"
@@ -129,7 +130,7 @@
                    :WorkingDir (or workdir "/project")}
                   (when entrypoint {:Entrypoint entrypoint})
                   (when command {:Cmd command})))
-        ascii-payload (String. (.getBytes payload "ASCII")) ]
+        ascii-payload (String. (.getBytes payload "ASCII"))]
     (curl/post
      "http://localhost/containers/create"
      {:raw-args ["--unix-socket" "/var/run/docker.sock"]
@@ -386,10 +387,10 @@
   (try
     (String. ^bytes (Arrays/copyOfRange ^bytes bytes 8 (count bytes)))
     (catch Throwable t
-      (println t)
+      (logger/error "not a docker stream: " t)
       "")))
 
-(defn function-call-with-stdin 
+(defn function-call-with-stdin
   "creates and starts container, then writes to stdin process
      returns container map with Id, and socket - socket is open socket to stdin"
   [m]
@@ -442,7 +443,7 @@
   "run container with stdin read from a file"
   [m]
   (let [x (docker/function-call-with-stdin
-            (assoc m :content (or (-> m :stdin :content)  (slurp (-> m :stdin :file)))))]
+           (assoc m :content (or (-> m :stdin :content) (slurp (-> m :stdin :file)))))]
     (async/<!! (async/thread
                  (Thread/sleep 10)
                  (docker/finish-call x)))))
@@ -452,14 +453,36 @@
      returns ::container-response"
   [m]
   ;; (schema/validate :schema/container-definition)
-  (cond 
+  (cond
     (-> m :stdin)
     (run-with-stdin-content m)
     (true? (:background m))
     (run-background-function m)
     :else
     (run-function m)))
 
+(comment
+  (run-container
+   {:image "vonwig/websocat:latest",
+    :stdin
+    {:content
+     "{\"id\":1,\"method\":\"Page.navigate\",\"params\":{\"url\":\"https://www.docker.com\"}}"},
+    :command
+    ["-n1"
+     "--jsonrpc"
+     "--jsonrpc-omit-jsonrpc"
+     "http://host.docker.internal:9222/devtools/page/EF1106D0B121836079CE1582C85F6E9A"],
+    :jsonrpc true,
+    :host-dir "/Users/slim/docker/labs-ai-tools-for-devs",
+    :debug true,
+    :stream true,
+    :jwt "xxxxxxx",
+    :save-thread-volume true,
+    :register [],
+    :thread-id "thread",
+    :user "jimclark106",
+    :platform "darwin"}))
+
 (defn get-login-info-from-desktop-backend
   "returns token or nil if not logged in or backend.sock is not available"
   []

src/graph.clj

@@ -49,7 +49,7 @@
         [c h] (chunk-handler)
         request (merge
                  (dissoc metadata :agent :host-dir :workdir :prompt-format :description :name :parameter-values :arguments :resources :defs) ; TODO should we just select relevant keys instead of removing bad ones
-                 {:messages messages
+                 {:messages (->> messages (map #(dissoc % :name :description)))
                   :level level}
                  (when (seq functions) {:tools functions})
                  ;; overrides from cli opts, NOT from metadata

src/prompts.clj

@@ -203,7 +203,7 @@
          (update :messages (fn [messages]
                              (->> messages
                                   (map (partial renderer {}))
-                                  (map #(dissoc % :name :description :title)))))
+                                  (map #(dissoc % :title)))))
          (update :metadata dissoc :functions :tools :extractors)
          (assoc :functions (->> (or (:tools metadata) (:functions metadata)) (mapcat function-definition)))))))
 

src/tools.clj

@@ -82,9 +82,9 @@
                                                       (:workdir defaults))]
                                          {:workdir (first (interpolate arg-context wd))}))
 
-                                (-> definition :stdin :file) (update-in [:stdin :file] (fn [s] (first (interpolate arg-context s))))
+                                (-> definition :container :stdin :file) (update-in [:stdin :file] (fn [s] (first (interpolate arg-context s))))
 
-                                (-> definition :stdin :content) (update-in [:stdin :content] (fn [s] (first (interpolate arg-context s)))))]
+                                (-> definition :container :stdin :content) (update-in [:stdin :content] (fn [s] (first (interpolate arg-context s)))))]
             (jsonrpc/notify
              :message
              {:debug (format "function call %s"

test/jsonrpc/db_t.clj

@@ -41,7 +41,7 @@
     (->> @db/db*
          :mcp.prompts/registry
          vals
-         (mapcat :mcp/prompt-registry))
+         )
     (get-in (deref db/db*) [:mcp.prompts/registry "curl"])
     (server/receive-request "prompts/list" {:db* db/db*} {})
     (server/receive-request