Fix regression on in-docker tests with github prompt refs

Author: slimslenderslacks

prompts/examples/qrencode.md

@@ -6,7 +6,7 @@ tools:
 # Prompt user
 
 Generate a QR code for the content 
-'https://raw.githubusercontent.com/docker/labs-ai-tools-for-devs/main/prompts/qrencode/README.md'.
+'https://github.com/docker/labs-ai-tools-for-devs'.
 Save the generated image to `qrcode.png`.
 If the command fails, read the man page and try again.
 If successful, output the path to the generated image in markdown syntax.
@@ -16,6 +16,6 @@ If successful, output the path to the generated image in markdown syntax.
 After running the above prompt, there should be a file named `qrcode.png` in the current project's host directory.
 
 ```bash
-open qrcode.png
+open ~/vonwig/altaservice/qrcode.png
 ```
 

src/docker.clj

@@ -8,6 +8,7 @@
    [clojure.spec.alpha :as spec]
    [clojure.string :as string]
    [creds]
+   jsonrpc
    logging)
   (:import
    [java.net UnixDomainSocketAddress]
@@ -107,22 +108,23 @@
 ;; Tty wraps the process in a pseudo terminal
 {:StdinOnce true
  :OpenStdin true}
-(defn create-container [{:keys [image entrypoint working-dir command host-dir env thread-id opts mounts] :or {opts {:Tty true}}}]
+(defn create-container [{:keys [image entrypoint working-dir command host-dir env thread-id opts mounts] :or {opts {:Tty true}} :as m}]
+  #_(jsonrpc/notify :message {:content (str m)})
   (let [payload (json/generate-string
                  (merge
                   {:Image image}
                   opts
                   (when env {:env (->> env
                                        (map (fn [[k v]] (format "%s=%s" (name k) v)))
                                        (into []))})
-                  (when host-dir {:HostConfig
-                                  {:Binds
-                                   (concat [(format "%s:/project:rw" host-dir)
-                                            "docker-lsp:/docker-lsp"
-                                            "/var/run/docker.sock:/var/run/docker.sock"]
-                                           (when thread-id [(format "%s:/thread:rw" thread-id)])
-                                           mounts)}
-                                  :WorkingDir (or working-dir "/project")})
+                  {:HostConfig
+                   {:Binds
+                    (concat ["docker-lsp:/docker-lsp"
+                             "/var/run/docker.sock:/var/run/docker.sock"]
+                            (when host-dir [(format "%s:/project:rw" host-dir)])
+                            (when thread-id [(format "%s:/thread:rw" thread-id)])
+                            mounts)}
+                   :WorkingDir (or working-dir "/project")}
                   (when entrypoint {:Entrypoint entrypoint})
                   (when command {:Cmd command})))]
     (curl/post

src/git.clj

@@ -1,11 +1,11 @@
 (ns git
   (:require
    [babashka.fs :as fs]
-   [clojure.pprint :as pprint]
    [clojure.string :as string]
    dir
    docker
-   [hasch.core :as hasch]))
+   [hasch.core :as hasch]
+   jsonrpc))
 
 (set! *warn-on-reflection* true)
 
@@ -58,18 +58,29 @@
 
 (defn pull [{:keys [dir ref]}]
   (docker/run-container
-   {:image "alpine/git:latest"
-    :host-dir (str dir)
-    :command (concat ["pull" "origin"]
-                     (when ref [ref]))}))
+   (merge
+    {:image "alpine/git:latest"
+     :command (concat ["pull" "origin"]
+                      (when ref [ref]))}
+    (if (string/starts-with? (str dir) "/prompts")
+      {:working-dir (str dir)
+       :mounts ["docker-prompts:/prompts:rw"]}
+      {:host-dir (str dir)}))))
 
 (defn clone [{:keys [dir owner repo ref ref-hash]}]
   (docker/run-container
-   {:image "alpine/git:latest"
-    :host-dir (str dir)
-    :command (concat ["clone" "--depth" "1" (format "https://github.com/%s/%s" owner repo)]
-                            (when ref ["-b" ref])
-                            [(format "/project/%s" ref-hash)])}))
+   (merge
+    {:image "alpine/git:latest"}
+    (if (string/starts-with? (str dir) "/prompts")
+      {:working-dir (str dir)
+       :command (concat ["clone" "--depth" "1" (format "https://github.com/%s/%s" owner repo)]
+                        (when ref ["-b" ref])
+                        [(format "/prompts/%s" ref-hash)])
+       :mounts ["docker-prompts:/prompts:rw"]}
+      {:host-dir (str dir)
+       :command (concat ["clone" "--depth" "1" (format "https://github.com/%s/%s" owner repo)]
+                        (when ref ["-b" ref])
+                        [(format "/project/%s" ref-hash)])}))))
 
 (defn prompt-file
   "returns the path or nil if the github ref does not resolve
@@ -78,9 +89,11 @@
   (when-let [{:keys [ref path] :as git-ref-map} (parse-github-ref ref)]
     (let [ref-hash (hashch (select-keys git-ref-map [:owner :repo :ref]))
           dir (fs/file (prompts-cache) ref-hash)
-          _ (if (fs/exists? dir)
+          m (if (fs/exists? dir)
               (pull {:dir dir :ref ref})
               (clone (merge git-ref-map {:dir (fs/parent dir) :ref-hash ref-hash})))]
+      (when (not (= 0 (:exit-code m)))
+        (jsonrpc/notify :error {:content (str m)}))
       (if path
         (let [cached-path (fs/file dir path)]
           (if (fs/exists? cached-path)