Update all prompts to use the extractor naming convention

slimslenderslacks · slimslenderslacks · commit 5897d9ec2e66 · 2024-08-14T17:06:40.000-07:00
diff --git a/functions/docker_scout_tag_recommendation/init.clj b/functions/docker_scout_tag_recommendation/init.clj
@@ -1,14 +1,25 @@
 (ns init
   (:require
    [babashka.fs :as fs]
-   [babashka.process :as process]
+   [babashka.http-client :as http]
    [cheshire.core :as json]
    [clojure.string :as string]))
 
+(def language-gateway-endpoint "https://api.scout.docker.com/v1/language-gateway")
+
+(defn- recommendation-request [image]
+  (http/post
+   (format "%s/%s" language-gateway-endpoint "image")
+   {:body (json/generate-string {:image image})}))
+
+(defn- recommendation-response [response]
+  response)
+
 (defn -command [& args]
   (try
     (let [repository (:repository (json/parse-string (second args) true))]
-      (println "22-slim"))
+      (println 
+        ((comp recommendation-response recommendation-request) repository)))
     (catch Throwable t
       (binding [*out* *err*]
         (println t))
diff --git a/prompts/clj-kondo/README.md b/prompts/clj-kondo/README.md
@@ -1,6 +1,6 @@
 ---
 extractors:
-  - name: go-linguist 
+  - name: linguist 
   - name: project-facts
 model: gpt-4
 stream: true
@@ -23,38 +23,27 @@ functions:
 
 Ask about violations in a project that contains clojure code.
 
-## Running the tool
+## How to run
 
 ```sh
+# docker:command=clj-kondo
 docker run --rm \
            -it \
            -v /var/run/docker.sock:/var/run/docker.sock \
            --mount type=volume,source=docker-prompts,target=/prompts \
            --mount type=bind,source=$HOME/.openai-api-key,target=/root/.openai-api-key \
-           --mount type=bind,source=/Users/slim/docker/labs-ai-tools-for-devs/prompts,target=/app/local \
+           --mount type=bind,source=$PWD,target=/app/local \
            --workdir /app \
            vonwig/prompts:local run \
                                  --host-dir /Users/slim/docker/labs-ai-tools-for-devs \
                                  --user jimclark106 \
                                  --platform "$(uname -o)" \
-                                 --prompts local/clj-kondo \
+                                 --prompts local \
                                  --pat "$(cat ~/.secrets/dockerhub-pat-ai-tools-for-devs.txt)" \
                                  --thread-id "clj-kondo"
 ```
 
-```sh
-bb -m prompts run \
-                  --host-dir /Users/slim/docker/labs-ai-tools-for-devs \
-                  --user jimclark106 \
-                  --platform "$(uname -o)" \
-                  --prompts-dir prompts/clj-kondo \
-                  --url http://localhost:11434/v1/chat/completions \
-                  --model "llama3-groq-tool-use:latest" \
-                  --thread-id "clj-kondo"
-```
-
 ## TODO
 
 - [ ] the clj-kondo function is downloading into an `\?/.m2` repository in the project root.  We can't have this.
 
-
diff --git a/prompts/curl/README.md b/prompts/curl/README.md
@@ -1,6 +1,6 @@
 ---
 extractors:
-  - name: go-linguist 
+  - name: linguist 
   - name: docker-lsp
 model: gpt-4
 stream: true
@@ -28,20 +28,20 @@ Also, what about defining outcomes and having the tool verify that we actually r
 
 At the end, we should report the command line, and the version of curl that we used.
 
-## Running the tool
+## How to run
 
 ```sh
-DIR=$PWD
+# docker:command=curl
 docker run --rm -it \
            -v /var/run/docker.sock:/var/run/docker.sock \
            --mount type=volume,source=docker-prompts,target=/prompts \
            --mount type=bind,source=$HOME/.openai-api-key,target=/root/.openai-api-key \
-           --mount type=bind,source=/Users/slim/docker/labs-make-runbook/prompts,target=/my-prompts \
-           --workdir /my-prompts \
+           --mount type=bind,source=$PWD,target=/app/local \
+           --workdir /app \
            vonwig/prompts:latest run \
-                                 $DIR \
-                                 $USER \
-                                 "$(uname -o)" \
-                                 project_type
+                                 --host-dir $PWD \
+                                 --user $USER \
+                                 --platform "$(uname -o)" \
+                                 --prompts-dir local
                                  # "github:docker/labs-make-runbook?ref=main&path=prompts/curl"
 ```
diff --git a/prompts/docker/020_user_prompt.md b/prompts/docker/020_user_prompt.md
@@ -18,32 +18,32 @@ I'm logged in to Docker Hub as {{username}}
 
 My project has the following Dockerfiles:
 
-{{#project.dockerfiles}}
+{{#project-facts.dockerfiles}}
 --- Dockerfile ---
 Dockerfile at `./{{path}}` contains:
 
 ```dockerfile
 {{content}}
 ```
 
-{{/project.dockerfiles}}
+{{/project-facts.dockerfiles}}
 
 --- Docker Compose Files ---
 
-{{#project.composefiles}}
+{{#project-facts.composefiles}}
 --- Compose File ---
 Compose file at `./{{path}}` contains:
 
 ```composefile
 {{content}}
 ```
 
-{{/project.composefiles}}
-{{^project.composefiles}}
+{{/project-facts.composefiles}}
+{{^project-facts.composefiles}}
 
 I am not using Docker Compose in this project.
 
-{{/project.composefiles}}
+{{/project-facts.composefiles}}
 
 My project uses the following languages:
 
diff --git a/prompts/docker/README.md b/prompts/docker/README.md
@@ -3,10 +3,24 @@ extractors:
   - name: project-facts
 ---
 
-## Description
+# Background
 
-The prompts for docker rely only on the classic lsp project extraction function.
+Generate a docker runbook for a project.
 
-The output of running this container is a json document that will be merged into the
-context that is provided to the moustache template based prompts.
+## How to run
+
+```sh
+# docker:command=curl
+docker run --rm -it \
+           -v /var/run/docker.sock:/var/run/docker.sock \
+           --mount type=volume,source=docker-prompts,target=/prompts \
+           --mount type=bind,source=$HOME/.openai-api-key,target=/root/.openai-api-key \
+           --mount type=bind,source=$PWD,target=/app/local \
+           --workdir /app \
+           vonwig/prompts:latest run \
+                                 --host-dir ~/docker/lsp \
+                                 --user $USER \
+                                 --platform "$(uname -o)" \
+                                 --prompts-dir local
+```
 
diff --git a/prompts/dockerfiles/README.md b/prompts/dockerfiles/README.md
@@ -1,6 +1,6 @@
 ---
 extractors:
-  - name: go-linguist
+  - name: linguist
 tool_choice: auto
 model: gpt-4
 stream: true
diff --git a/prompts/dockerfiles_llama3.1/README.md b/prompts/dockerfiles_llama3.1/README.md
@@ -1,6 +1,6 @@
 ---
 extractors:
-  - name: go-linguist
+  - name: linguist
 tool_choice: auto
 model: gpt-4
 stream: true
diff --git a/prompts/dockerfiles_mistral-nemo/README.md b/prompts/dockerfiles_mistral-nemo/README.md
@@ -1,6 +1,6 @@
 ---
 extractors:
-  - name: go-linguist
+  - name: linguist
 tool_choice: auto
 model: gpt-4
 stream: true
diff --git a/prompts/recommended_tags/100_user_prompt.md b/prompts/recommended_tags/100_user_prompt.md
@@ -1 +1 @@
-What is the recommended tag to use for the `hazy` repository?  Use the output from the recommendation function to answer this question.
+What is the recommended tag to use for the `node` repository?  Use the output from the recommendation function to answer this question.
diff --git a/prompts/recommended_tags/README.md b/prompts/recommended_tags/README.md
@@ -8,7 +8,7 @@ functions:
   - name: docker_scout_tag_recommendation
 ---
 
-# Background
+# How to Run
 
 ```sh
 # docker:command=recommended-tags
@@ -20,3 +20,6 @@ bb -m prompts run \
               --nostream
 ```
 
+```clj
+(core.println "hey")
+```
diff --git a/runbook.md b/runbook.md
@@ -24,6 +24,15 @@ bb -m prompts --host-dir /Users/slim/docker/labs-ai-tools-for-devs \
               --pretty-print-prompts
 ```
 
+```sh
+bb -m prompts --host-dir /Users/slim/docker/labs-ai-tools-for-devs \
+              --user jimclark106 \
+              --platform darwin \
+              --prompts-dir prompts/project_type/ \
+              --pretty-print-prompts
+```
+
+
 ### Running prompts/dockerfiles Conversation Loops
 
 #### test prompts/project_type
diff --git a/src/prompts.clj b/src/prompts.clj
@@ -29,10 +29,10 @@
   (medley/deep-merge
    {:platform platform
     :username user
-    :project {:files (-> project-facts :project/files)
-              :dockerfiles (-> project-facts :project/dockerfiles)
-              :composefiles (-> project-facts :project/composefiles)
-              :languages (-> project-facts :github/lingust)}
+    :project-facts {:files (-> project-facts :project-facts :project/files)
+                    :dockerfiles (-> project-facts :project-facts :project/dockerfiles)
+                    :composefiles (-> project-facts :project-facts :project/composefiles)
+                    :languages (-> project-facts :project-facts :github/lingust)}
     :languages (->> project-facts
                     :github/linguist
                     keys
@@ -68,9 +68,14 @@
                                            (-> container-definition
                                                (assoc :host-dir dir)))]
        (when (= 0 exit-code)
-         (case (:output-handler container-definition)
-           "linguist" (->> (json/parse-string pty-output keyword) vals (into []) (assoc {} :linguist))
-           (json/parse-string pty-output keyword)))))
+         (let [context
+               (case (:output-handler container-definition)
+                 ;; we have one output-handler registered right now - it extracts the vals from a map
+                 "linguist" (->> (json/parse-string pty-output keyword) vals (into []))
+                 (json/parse-string pty-output keyword))]
+           (if-let [extractor-name (:name container-definition)]
+             {(keyword extractor-name) context}
+             context)))))
     (catch Throwable ex
       (warn
        "unable to run extractors \n```\n{{ container-definition }}\n```\n - {{ exception }}"
@@ -85,7 +90,8 @@
                     (map (fn [m] (merge (registry/get-extractor m) m))))]
     (if (seq extractors)
       extractors
-      [{:image "docker/lsp:latest"
+      [{:name "project-facts"
+        :image "docker/lsp:latest"
         :entrypoint "/app/result/bin/docker-lsp"
         :command ["project-facts"
                   "--vs-machine-id" "none"
@@ -172,7 +178,7 @@
           (jsonrpc/notify :message {:content (format "## (%s) sub-prompt" (:ref definition))})
           (let [{:keys [messages _finish-reason] :as m}
                 (async/<!! (conversation-loop
-                             (assoc opts :prompts-dir (git/prompt-dir (:ref definition)))))]
+                            (assoc opts :prompts-dir (git/prompt-dir (:ref definition)))))]
             (jsonrpc/notify :message {:content (format "## (%s) end sub-prompt" (:ref definition))})
             (resolve (->> messages
                           (filter #(= "assistant" (:role %)))
@@ -201,11 +207,12 @@
     (try
       (openai/openai
        (merge
-        m 
-        {:messages prompts :stream stream}
+        m
+        {:messages prompts}
         (when (seq functions) {:tools functions})
         (when url {:url url})
-        (when model {:model model})) h)
+        (when model {:model model})
+        (when (and stream (nil? (:stream m))) {:stream stream})) h)
       (catch ConnectException _
         ;; when the conversation-loop can not connect to an openai compatible endpoint
         (async/>!! c {:messages [{:role "assistant" :content "I cannot connect to an openai compatible endpoint."}]
@@ -276,11 +283,11 @@
                [nil "--thread-id THREAD_ID" "use this thread-id for the next conversation"
                 :assoc-fn (fn [m k v] (assoc m k v :save-thread-volume true))]
                [nil "--model MODEL" "use this model on the openai compatible endpoint"]
-               [nil "--stream" "stream responses" 
+               [nil "--stream" "stream responses"
                 :id :stream
                 :default true
                 :assoc-fn (fn [m k _] (assoc m k true))]
-               [nil "--nostream" "disable streaming responses" 
+               [nil "--nostream" "disable streaming responses"
                 :id :stream
                 :assoc-fn (fn [m k _] (assoc m k false))]
                [nil "--debug" "add debug logging"]
@@ -377,8 +384,8 @@
             (System/exit 0))
           (let [cmd (apply command options arguments)]
             (alter-var-root
-              #'jsonrpc/notify
-              (fn [_] (partial (if (:jsonrpc options) jsonrpc/-notify jsonrpc/-println) options)))
+             #'jsonrpc/notify
+             (fn [_] (partial (if (:jsonrpc options) jsonrpc/-notify jsonrpc/-println) options)))
             ((if (:pretty-print-prompts options) output-prompts output-handler)
              (cmd))))))
     (catch Throwable t
diff --git a/test/prompts_t.clj b/test/prompts_t.clj
@@ -24,7 +24,7 @@
     (->>
      (prompts/fact-reducer "/Users/slim/docker/labs-make-runbook"
                            {}
-                           {:name "go-linguist"
+                           {:name "linguist"
                             :image "vonwig/go-linguist:latest"
                             :command ["-json"]
                             :output-handler "linguist"
@@ -40,11 +40,11 @@
   (t/is
    (=
     (prompts/collect-extractors "prompts/docker")
-    '({:name "project-facts", :image "docker/lsp:latest", :entrypoint "/app/result/bin/docker-lsp", :command ["project-facts" "--vs-machine-id" "none" "--workspace" "/docker"]})))
+    '({:name "project-facts", :image "docker/lsp:latest", :entrypoint "/app/result/bin/docker-lsp", :command ["project-facts" "--vs-machine-id" "none" "--workspace" "/project"]})))
   (t/is
    (=
     (prompts/collect-extractors "prompts/dockerfiles")
-    '({:name "go-linguist", :image "vonwig/go-linguist:latest", :command ["-json"], :output-handler "linguist"}))))
+    '({:name "linguist", :image "vonwig/go-linguist:latest", :command ["-json"], :output-handler "linguist"}))))
 
 (comment
   (prompts/run-extractors

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-What is the recommended tag to use for the `hazy` repository? Use the output from the recommendation function to answer this question.
	`1`	+What is the recommended tag to use for the `node` repository? Use the output from the recommendation function to answer this question.