Slim/mcptests (#84)

* add mcp tests
* Add github-mcp-server
* response to resource template requests

Author: slimslenderslacks

dev/catalog.clj

@@ -7,12 +7,12 @@
    [clojure.pprint :refer [pprint]]
    [clojure.string :as string]
    [flatland.ordered.map :refer [ordered-map]]
-   git
+   [git]
    [markdown :as markdown-parser]
    [mcp.client :as client]
    [medley.core :as medley]
-   prompts
-   repl))
+   [prompts]
+   [repl]))
 
 (defn mcp-metadata-cache [f]
   (edn/read-string
@@ -29,7 +29,7 @@
       (println t))))
 
 (defn f->prompt [f]
-  (try (prompts/get-prompts {:prompts f}) (catch Throwable t (println t) {})))
+  (try (prompts/read-prompts {:prompts f}) (catch Throwable t (println t) {})))
 
 (defn tile-metadata [m]
   {:tools (->> (:functions m)
@@ -57,6 +57,18 @@
                   (map #(into [] %))
                   (into {}))})))))
 
+(defn secrets [prompt]
+  (cond
+    (-> prompt :metadata :mcp)
+    (->> (-> prompt :metadata :mcp)
+         (map (fn [m] m))
+         (into []))
+    (-> prompt :functions)
+    (->> (-> prompt :functions)
+         (map (fn [m] (select-keys (:function m) [:container :secrets :source])))
+         (into []))
+    :else []))
+
 (comment
   ;; setup stdout logger
   (repl/setup-stdout-logger)
@@ -66,33 +78,54 @@
   (count (:registry catalog))
   (string/join "," (->> (:registry catalog) keys (map name)))
 
-  ;; raw github urls to for the slim/cleanup branch
+  (def prompt-ref-strings
+    (->> catalog
+         :registry
+         vals
+         (map :ref)))
+
+  ;; raw github urls (map to other branches if checking a merge)
   (def prompt-refs
     (->> catalog
          :registry
          vals
          (map :ref)
-         (map #(git/parse-github-ref %))
-         (map #(assoc % :ref "slim/cleanup"))
+         (map (fn [ref-string] (assoc (git/parse-github-ref ref-string) :ref-string ref-string)))
+         #_(map #(assoc % :ref "slim/cleanup"))
          #_(map #(format "https://raw.githubusercontent.com/%s/%s/refs/heads/%s/%s" (:owner %) (:repo %) (or (:ref %) "main") (:path %)))))
 
   ;; current git ref files
   (def local-prompt-files
     (->> prompt-refs
-         (map git/ref-map->prompt-file)))
-
-;; parse all of the current git prompts
-  (with-redefs [client/get-mcp-tools-from-prompt (constantly [])]
-    (def all-prompt-files (map (fn [[k v]] [k (f->prompt v)]) local-prompt-files)))
-
-  (pprint (->> all-prompt-files
-               (map (fn [[k v]] [k (dissoc v :mcp/resources)]))
-               (into {})))
-  (spit "crap.json" (json/generate-string
-                     (->> all-prompt-files
-                          (map (fn [[k v]] [k (dissoc v :mcp/resources :mcp/prompt-registry)]))
-                          (into {}))
-                     {:pretty true}))
+         (map (fn [k] {:ref k
+                       :file (git/ref-map->prompt-file k)}))))
+
+  ;; parse all of the current git prompts
+  (def local-prompt-files-parsed
+    (map (fn [m] (-> m (assoc :prompt (f->prompt (:file m))))) local-prompt-files))
+
+  ;; make sure prompts are present - should be empty
+  (->> local-prompt-files-parsed
+       (filter (complement #(seq (:prompt %)))))
+
+  ;; extract secrets, source and container image info
+  (def container-summary
+    (->> local-prompt-files-parsed
+         (map (fn [m] [(-> m :ref :ref-string) (secrets (:prompt m))]))
+         (into {})))
+
+  ;; secret summary
+  (->> container-summary
+       vals
+       (mapcat #(->> % (map (comp :secrets :container))))
+       (filter seq))
+
+  ;; summary
+  (->> container-summary
+       (mapcat (fn [[k v]] (->> v (map (fn [m]
+                                         {:image (-> m :container :image)
+                                          :source (-> m :source :url)
+                                          :ref k}))))))
 
   (def all-images
     (->>

functions/github-mcp-server/Dockerfile

@@ -0,0 +1,10 @@
+FROM ghcr.io/github/github-mcp-server as github
+
+FROM debian:bookworm-slim
+
+WORKDIR /server
+
+COPY --from=github /server/github-mcp-server .
+
+ENTRYPOINT ["/server/github-mcp-server", "stdio"]
+

functions/github-mcp-server/runbook.md

@@ -0,0 +1,12 @@
+
+```sh
+docker buildx build \
+    --builder hydrobuild \
+    --platform linux/amd64,linux/arm64 \
+    --tag mcp/github-mcp-server:latest \
+    --file Dockerfile \
+    --push .
+docker pull mcp/github-mcp-server:latest
+```
+
+

namespaces.dot

@@ -0,0 +1,49 @@
+digraph G {
+    // Graph settings
+    rankdir=LR;  // Left to right layout
+    node [shape=box, style=filled, fillcolor=lightblue, fontname="Arial"];
+    edge [fontname="Arial", fontsize=10];
+    
+    // Main node
+    "jsonrpc.server" [fillcolor=lightgreen];
+    
+    // Connected nodes
+    "jsonrpc.db";
+    "tools";
+    "volumes";
+    "mcp.client";
+    "git";
+    "docker";
+    "interpolate";
+    "prompts";
+    "markdown";
+    
+    // Connections from jsonrpc.server to other nodes
+    "jsonrpc.server" -> "jsonrpc.db";
+    "jsonrpc.server" -> "tools";
+    "jsonrpc.server" -> "volumes";
+    "jsonrpc.server" -> "mcp.client";
+    "jsonrpc.server" -> "git";
+    "jsonrpc.server" -> "docker";
+
+    "git" -> "docker";
+    "markdown" -> "docker";
+
+    // tools 
+    "tools" -> "mcp.client";
+    "tools" -> "interpolate";
+    "tools" -> "docker";
+    "tools" -> "git";
+    
+    // Additional connections from mcp.client
+    "mcp.client" -> "docker";
+    "mcp.client" -> "interpolate";
+    
+    // Additional connections from jsonrpc.db
+    "jsonrpc.db" -> "git";
+    "jsonrpc.db" -> "prompts";
+    
+    // Additional connections from prompts
+    "prompts" -> "mcp.client";
+    "prompts" -> "markdown";
+}

prompts/catalog.yaml

@@ -478,4 +478,11 @@ registry:
             description: comma separated list of reply to email addresses
     secrets:
       - {name: resend.api_key}
+  GitHub MCP Server:
+    description: |
+      Provides seamless integration with GitHub APIs, enabling advanced automation and interaction capabilities for developers and tools.
+    ref: github:docker/labs-ai-tools-for-devs?path=prompts/mcp/github-official.md
+    icon: https://cdn.jsdelivr.net/npm/simple-icons@v7/icons/github.svg
+    secrets:
+    - {name: github.personal_access_token}
 

prompts/chrome.md

@@ -30,6 +30,8 @@ tools:
         - "-n1"
         - "-H=Host: localhost:9222"
         - '{{endpoint|safe}}'
+    source:
+      url: https://github.com/docker/labs-ai-tools-for-devs/tree/main/functions/hub
   - name: curl
     description: Run a curl command to get the websocket url and make sure that Chrome's websocket server is running. ALWAYS USE THIS TOOL FIRST. MAKE SURE TO USE THE CORRECT HOST HEADER AND ENDPOINT.
     parameters:

prompts/examples/mcp-sqlite.md

@@ -47,6 +47,7 @@ tools:
         - *db
         - "SELECT name from sqlite_master WHERE type='table'"
       volumes: *mounts
+    source: *sqlite-source
   - name: describe-table
     description: Get the schema information for a specific table
     parameters:

prompts/mcp/github-official.md

@@ -0,0 +1,10 @@
+---
+mcp:
+  - container:
+      image: mcp/github-mcp-server:latest
+      secrets:
+        github.personal_access_token: GITHUB_PERSONAL_ACCESS_TOKEN
+    source:
+      url: https://github.com/docker/labs-ai-tools-for-devs/tree/main/functions/github-mcp-server
+---
+

src/docker.clj

@@ -1,4 +1,18 @@
 (ns docker
+  "run-container runs containers with a few flavors
+     - run with stdin content
+     - run a container but don't wait for it to stop
+     - run in the background but wait for one message on stdout and then stop
+     - simply run function without stdin
+  
+   attach-socket - to running container
+   write-stdin - 
+   read-loop - input: attached socket output: channel messages
+   write-to-stdin -input: attached socket, string
+   inject-secret-transform - transform container entrypoint for secrets
+   
+   run-streaming-function-with-no-stdin - runs continuously
+     and read stdout to a callback (used in watcher)"
   (:require
    [babashka.curl :as curl]
    [babashka.fs :as fs]
@@ -129,10 +143,6 @@
      [(format "%s/%s" (:port container) (:protocol container)) [{:HostPort (:port host)}]])
    (into {})))
 
-(comment
-  (port-bindings ["9222:9222"])
-  (exposed-ports ["9222:9222"]))
-
 ;; check for 201
 ;; entrypoint is an array of strings
 ;; env is a map
@@ -290,10 +300,6 @@
       image
       (str image ":latest"))))
 
-(comment
-  (add-latest "vonwig/go-linguist")
-  (add-latest "blah/what:tag"))
-
 (defn -pull [m]
   (pull (merge m
                {:image (add-latest (:image m))}
@@ -336,12 +342,6 @@
         [s])
        (string/join " ; ")))
 
-(comment
-  (injected-entrypoint {:a "A"} ["BLAH=whatever"] "my command")
-  (injected-entrypoint nil nil "my command")
-  (injected-entrypoint {:a "A"} nil "my command")
-  (injected-entrypoint nil nil nil))
-
 (defn inject-secret-transform [container-definition]
   (check-then-pull container-definition)
   (let [{:keys [Entrypoint Cmd Env]}
@@ -627,12 +627,9 @@
       (delete x))
     (async/go-loop
      [block (async/<! c)]
-      (logger/info "background socket read loop " block)
       (cond
         (#{:stopped :timeout} block)
-        (do
-          (logger/info "socket read loop " block)
-          (async/put! output-channel block))
+        (async/put! output-channel block) 
         (nil? block)
         (async/put! output-channel :closed)
         :else
@@ -645,7 +642,10 @@
      :write (fn [s] (write-to-stdin socket-channel s)))))
 
 (defn finish-call
-  "This is a blocking call that waits for the container to finish and then returns the output and exit code."
+  "Waits (blocking) for call to container to finish, retrieves stdout logs
+    params 
+      running container
+    returns ::container-response"
   [{:keys [timeout] :or {timeout 10000} :as x}]
   ;; close stdin socket
   (.close ^SocketChannel (:socket x))
@@ -708,7 +708,9 @@
      - deletes the container"
   [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)))))
@@ -717,7 +719,7 @@
   " params ::container-definition
      returns ::container-response"
   [m]
-  ;; (schema/validate :schema/container-definition)
+  ;; (schema/validate :schema/tool-container)
   (cond
     (-> m :stdin)
     (run-with-stdin-content m)
@@ -728,19 +730,6 @@
     :else
     (run-function m)))
 
-(comment
-  (repl/setup-stdout-logger)
-  (run-container
-   {:image "vonwig/gdrive:latest"
-    :background-callback true
-    :workdir "/app"
-    :ports ["3000:3000"]
-    :volumes ["mcp-gdrive:/gdrive-server"]
-    :environment {"GDRIVE_CREDENTIALS_PATH" "/gdrive-server/credentials.json"
-                  "GDRIVE_OAUTH_PATH" "/secret/google.gcp-oauth.keys.json"}
-    :secrets {:google.gcp-oauth.keys.json "GDRIVE"}
-    :command ["auth"]}))
-
 (defn get-login-info-from-desktop-backend
   "returns token or nil if not logged in or backend.sock is not available"
   []

src/jsonrpc/db.clj

@@ -140,23 +140,3 @@
    (vals)
    (map (fn [m] (assoc m :type :dynamic)))))
 
-(comment
-  (repl/setup-stdout-logger)
-  (println @db*)
-  (-> @db* :mcp.prompts/registry (get "github-issues"))
-  (update-prompt {} "github-issues" (slurp "prompts/examples/github_issues.md"))
-  ; in /$HOME/registry.yaml
-  (git/collect-unique-cache-dirs
-   (git-cache-refs
-    (registry-refs prompts.core/registry)))
-
-  ; prompts will come from prompts-cache
-  ;   /prompts or $HOME/.prompts-cache
-  (git/hashch {:owner "docker" :repo "labs-ai-tools-for-devs" :ref "slim/config"})
-  (add-refs (registry-refs prompts.core/registry))
-  (-> @db*
-      :mcp.prompts/registry
-      vals
-      pprint)
-  (parameter-values "read_file"))
-