Merge pull request #10 from docker/slim/args

Deprecate positional args

Author: slimslenderslacks

README.md

@@ -13,10 +13,10 @@ following command.
 docker run --rm \
            -v /var/run/docker.sock:/var/run/docker.sock \
            --mount type=volume,source=docker-prompts,target=/prompts \
-           vonwig/prompts:latest $PWD \
-                                 jimclark106 \
-                                 darwin \
-                                 "github:docker/labs-make-runbook?ref=main&path=prompts/lazy_docker"
+           vonwig/prompts:latest --host-dir $PWD \
+                                 --user jimclark106 \
+                                 --platform darwin \
+                                 --prompts-dir "github:docker/labs-make-runbook?ref=main&path=prompts/lazy_docker"
 ```
 
 The four arguments are 
@@ -33,10 +33,10 @@ docker run --rm \
            -v /var/run/docker.sock:/var/run/docker.sock \
            --mount type=bind,source=$PWD,target=/app/my_prompts \
            --workdir /app \
-           vonwig/prompts:latest $PWD \
-                                 jimclark106 \
-                                 darwin \
-                                 my_prompts
+           vonwig/prompts:latest --host-dir $PWD \
+                                 --user jimclark106 \
+                                 --platform darwin \
+                                 --prompts-dir my_prompts
 ```
 
 ## Running a Conversation Loop
@@ -54,10 +54,10 @@ docker run --rm \
            --mount type=bind,source=$HOME/.openai-api-key,target=/root/.openai-api-key \
            vonwig/prompts:latest \
                                  run \
-                                 $PWD \
-                                 $USER \
-                                 "$(uname -o)" \
-                                 "github:docker/labs-githooks?ref=main&path=prompts/git_hooks"
+                                 --host-dir $PWD \
+                                 --user $USER \
+                                 --platform "$(uname -o)" \
+                                 --prompts "github:docker/labs-githooks?ref=main&path=prompts/git_hooks"
 ```
 
 ### Running a Conversation Loop with Local Prompts
@@ -81,24 +81,23 @@ docker run --rm \
            --mount type=bind,source=$HOME/.openai-api-key,target=/root/.openai-api-key \
            vonwig/prompts:latest \
                                  run \
-                                 $PWD \
-                                 $USER \
-                                 "$(uname -o)" \
-                                 my_prompts
+                                 --host-dir $PWD \
+                                 --user $USER \
+                                 --platform "$(uname -o)" \
+                                 --prompts-dir my_prompts
 ```
 
 ## GitHub refs
 
-Prompts are fetched from a GitHub repository.  The mandatory parts of the ref are `github:{owner}/{repo}` 
+Prompts can be fetched from a GitHub repository when using the `--prompts` arg.  The mandatory parts of the ref are `github:{owner}/{repo}` 
 but optional `path` and `ref` can be added to pull prompts from branches, and to specify a subdirectory
 where the prompt files are located in the repo.
 
 ## Function volumes
 
 Every function container will have a shared volume mounted into the container at `/thread`.
 The volume is intended to be ephemeral and will be deleted at the end of the run.  However, the volume
-can be saved for inspection by passing the argument `--save-thread-volume`.  The name of the shared volume
-can also be controlled using `--thread-id <name>` but will normally just be a guid.
+can be saved for inspection by passing the argument `--thread-id`.  
 
 ## Output json-rpc notifications
 

dev/ollama_openai_tools.clj

@@ -0,0 +1,27 @@
+(ns ollama-openai-tools
+  (:require [openai]
+            [prompts]
+            [babashka.fs :as fs]))
+
+(openai/openai 
+  {:model "mistral-nemo"
+   :stream false
+   :temperature -1
+   :url "http://localhost:11434/v1/chat/completions"
+   :messages [{:role "user" :content "Use a tool to lint the clojure code in this project by passing the arguments `--lint .`."}]
+   :tools (prompts/collect-functions (fs/file "prompts/clj-kondo/"))} 
+  println)
+
+(openai/openai 
+  {:model "llama3.1"
+   :stream true
+   :url "http://localhost:11434/v1/chat/completions"
+   :messages [{:role "user" :content "Use a tool to the clojure code in this project by passing the arguments `--lint .`."}]
+   :tools (prompts/collect-functions (fs/file "prompts/clj-kondo/"))} 
+  println)
+
+(openai/openai 
+  {:stream false
+   :messages [{:role "user" :content "Lint the clojure code in this project by passing the arguments `--lint .`."}]
+   :tools (prompts/collect-functions (fs/file "prompts/clj-kondo/"))} 
+  println)

extractors/registry.edn

@@ -5,7 +5,7 @@
                        "--vs-machine-id"
                        "none"
                        "--workspace"
-                       "/docker"]}
+                       "/project"]}
             {:name "go-linguist",
              :image "vonwig/go-linguist:latest",
              :command ["-json"],

prompts/clj-kondo/README.md

@@ -34,16 +34,27 @@ docker run --rm \
            --mount type=bind,source=/Users/slim/docker/labs-ai-tools-for-devs/prompts,target=/app/local \
            --workdir /app \
            vonwig/prompts:local run \
-                                 /Users/slim/docker/labs-ai-tools-for-devs \
-                                 jimclark106 \
-                                 "$(uname -o)" \
-                                 local/clj-kondo \
+                                 --host-dir /Users/slim/docker/labs-ai-tools-for-devs \
+                                 --user jimclark106 \
+                                 --platform "$(uname -o)" \
+                                 --prompts local/clj-kondo \
                                  --pat "$(cat ~/.secrets/dockerhub-pat-ai-tools-for-devs.txt)" \
-                                 --thread-id "clj-kondo" \
-                                 --save-thread-volume
+                                 --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.
 
+

prompts/dockerfiles_llama3.1/010_system_prompt.md

@@ -0,0 +1,2 @@
+You are an assistant who specializes in authoring Dockerfiles for projects.
+Since you are an expert and know about their project, be definitive about recommendations.

prompts/dockerfiles_llama3.1/100_user_prompt.md

@@ -0,0 +1,21 @@
+Write Dockerfiles using three stages.  Here are the three stages to use:
+1. the first stage should be called "deps" 
+   and it should fetch the runtime dependencies using npm ci
+   `with the --omit=dev` flag.
+2. The second stage should be called build
+   and it should be based on the deps stage. 
+   It should run npm ci first and then it should run npm build
+3. The third stage should start with a FROM line that uses the `node` base image. 
+   This stage should do then do three things.
+     1. it copies the node_modules directory from the deps stage.
+     2. it copies the dist directory from the build stage.
+     3. it should then create an entrypoint that runs npm start
+
+If you need to use a RUN statement containing `npm ci` always 
+add the argument `--mount=type=cache,target=/root/.npm` to the RUN instruction.  
+The `--mount` argument should be placed between the word RUN and the npm command.
+This will cache the npm packages in the docker build cache and speed up the build process.
+
+* Generate a Dockerfile for an NPM project.
+* Call a function to get the recommended tag for repository `node`
+* In each FROM line in the Dockerfile, use the recommended tag.

prompts/dockerfiles_llama3.1/README.md

@@ -0,0 +1,24 @@
+---
+extractors:
+  - name: go-linguist
+tool_choice: auto
+model: gpt-4
+stream: true
+functions:
+  - name: docker_scout_tag_recommendation
+---
+
+# Background
+
+These prompts add Dockerfile authoring skills to the assistant.
+
+* the [user prompts](100_user_prompt.md) direct the assist to extract details about the project, and then write a Dockerfile to the root of the project.
+* the [npm best practices](npm-best-practices.md) is are added to the system prompts whenever the assist detects that this is an NPM project.
+
+## functions
+
+These instructions in these prompts rely on 3 functions
+
+1. `analyze_project` - requires read-only access to the project and extracts details from the project to give the assistant context for authoring the Dockerfile
+2. `write_files` - has read-write access to the project and will write Dockerfiles so that developers don't have to copy and paste data out of a chat.
+3. `docker_scout_tag_recommendation` - uses Docker Scout to improve the choice tag selection during code generation.

prompts/dockerfiles_mistral-nemo/010_system_prompt.md

@@ -0,0 +1,2 @@
+You are an assistant who specializes in authoring Dockerfiles for projects.
+Since you are an expert and know about their project, be definitive about recommendations.

prompts/dockerfiles_mistral-nemo/100_user_prompt.md

@@ -0,0 +1,19 @@
+Write Dockerfiles for NPM projects using three stages.  Do these three steps sequentially.
+* the first node depemdencies stage should be called "deps" 
+  and it should fetch the runtime dependencies using npm ci
+  `with the --omit=dev` flag.
+* The second Dockerfile stage should be called build
+  and it should be based on the deps stage. 
+  It should run npm ci and then npm build
+* The third Dockerfile stage should select a base image 
+  that is recommended by Scout and use that in the FROM line.
+  This stage should do then do three things.
+    1. it copies the node_modules directory from the deps stage.
+    2. it copies the dist directory from the build stage.
+    3. it then runs npm start
+
+If you need to use a RUN statement containing `npm ci` always 
+add the argument `--mount=type=cache,target=/root/.npm` to the RUN instruction.  
+The `--mount` argument should be placed between the word RUN and the npm command.
+This will cache the npm packages in the docker build cache and speed up the build process.
+

prompts/dockerfiles_mistral-nemo/README.md

@@ -0,0 +1,24 @@
+---
+extractors:
+  - name: go-linguist
+tool_choice: auto
+model: gpt-4
+stream: true
+functions:
+  - name: docker_scout_tag_recommendation
+---
+
+# Background
+
+These prompts add Dockerfile authoring skills to the assistant.
+
+* the [user prompts](100_user_prompt.md) direct the assist to extract details about the project, and then write a Dockerfile to the root of the project.
+* the [npm best practices](npm-best-practices.md) is are added to the system prompts whenever the assist detects that this is an NPM project.
+
+## functions
+
+These instructions in these prompts rely on 3 functions
+
+1. `analyze_project` - requires read-only access to the project and extracts details from the project to give the assistant context for authoring the Dockerfile
+2. `write_files` - has read-write access to the project and will write Dockerfiles so that developers don't have to copy and paste data out of a chat.
+3. `docker_scout_tag_recommendation` - uses Docker Scout to improve the choice tag selection during code generation.