Cut over public engine construction to ConfigKit sources

examples/go-library/observe/main.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"strings"
 
+	"gitea.maximumdirect.net/eric/ConfigKit"
 	"gitea.maximumdirect.net/eric/promptkit"
 )
 
@@ -78,14 +79,24 @@ type summary struct {
 
 func run() (summary, error) {
 	transport := &scriptedTransport{}
-	engine, err := promptkit.NewEngine(promptkit.Config{HTTPClient: &http.Client{Transport: transport}},
-		promptkit.WithPromptFS(assets, "prompts"),
-		promptkit.WithSchemaFS(assets, "schemas"),
-		promptkit.WithBackend(promptkit.Backend{ID: "offline-backend", Endpoint: "https://example.invalid/v1", ConcurrencyLimit: 1}),
-		promptkit.WithProfiles(
-			promptkit.Profile{ID: "proposal-profile", BackendID: "offline-backend", Model: "proposal-model"},
-			promptkit.Profile{ID: "assessment-profile", BackendID: "offline-backend", Model: "assessment-model"},
-		))
+	inputs, err := promptkit.FilesystemInputs("example prompts", assets, "prompts")
+	if err != nil {
+		return summary{}, err
+	}
+	backendID, proposalModel, assessmentModel := "offline-backend", "proposal-model", "assessment-model"
+	inputs = append(inputs,
+		configkit.Input{Source: promptkit.BackendSource("example backend", map[string]promptkit.BackendConfig{
+			backendID: promptkit.LocalBackend("https://example.invalid/v1", 1),
+		})},
+		configkit.Input{Source: promptkit.ProfileSource("example profiles", map[string]promptkit.ProfileConfig{
+			"proposal-profile":   {Backend: &backendID, Model: &proposalModel},
+			"assessment-profile": {Backend: &backendID, Model: &assessmentModel},
+		})},
+	)
+	engine, err := promptkit.NewEngine(promptkit.Config{
+		Sources:    promptkit.ConfigurationSources{Underlays: []configkit.Underlay{{Inputs: inputs}}},
+		HTTPClient: &http.Client{Transport: transport},
+	}, promptkit.WithSchemaFS(assets, "schemas"))
 	if err != nil {
 		return summary{}, err
 	}

examples/go-library/observe/prompts/assessment.yaml

@@ -1,17 +1,18 @@
-id: example.assessment
-version: "1.0.0"
-default_profile: assessment-profile
-description: Assess a structured proposal independently of schema validity.
-inputs:
-  - name: proposal
-    required: true
-    content_type: application/json
-messages:
-  - role: system
-    content: Return a concise assessment as JSON.
-  - role: user
-    content: '{{input "proposal"}}'
-output:
-  format: json
-  validation_mode: json_schema
-  schema_path: assessment.schema.json
+prompts:
+  example.assessment:
+    "1.0.0":
+      default_profile: assessment-profile
+      description: Assess a structured proposal independently of schema validity.
+      inputs:
+        - name: proposal
+          required: true
+          content_type: application/json
+      messages:
+        - role: system
+          content: Return a concise assessment as JSON.
+        - role: user
+          content: '{{input "proposal"}}'
+      output:
+        format: json
+        validation_mode: json_schema
+        schema_path: assessment.schema.json

examples/go-library/observe/prompts/proposal.yaml

@@ -1,17 +1,18 @@
-id: example.proposal
-version: "1.0.0"
-default_profile: proposal-profile
-description: Propose a bounded improvement from a synthetic idea.
-inputs:
-  - name: idea
-    required: true
-    content_type: text/plain
-messages:
-  - role: system
-    content: Return a concise proposal as JSON.
-  - role: user
-    content: '{{input "idea"}}'
-output:
-  format: json
-  validation_mode: json_schema
-  schema_path: proposal.schema.json
+prompts:
+  example.proposal:
+    "1.0.0":
+      default_profile: proposal-profile
+      description: Propose a bounded improvement from a synthetic idea.
+      inputs:
+        - name: idea
+          required: true
+          content_type: text/plain
+      messages:
+        - role: system
+          content: Return a concise proposal as JSON.
+        - role: user
+          content: '{{input "idea"}}'
+      output:
+        format: json
+        validation_mode: json_schema
+        schema_path: proposal.schema.json

examples/go-library/prepare/main.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 
+	"gitea.maximumdirect.net/eric/ConfigKit"
 	"gitea.maximumdirect.net/eric/promptkit"
 )
 
@@ -18,15 +19,13 @@ type summary struct {
 }
 
 func main() {
-	engine, err := promptkit.NewEngine(
-		promptkit.Config{},
-		promptkit.WithPromptFile("examples/go-library/prepare/prompt.yaml"),
-		promptkit.WithProfiles(promptkit.Profile{
-			ID:       "offline-example",
-			Endpoint: "https://example.invalid/v1",
-			Model:    "offline-model",
-		}),
-	)
+	endpoint, model := "https://example.invalid/v1", "offline-model"
+	engine, err := promptkit.NewEngine(promptkit.Config{Sources: promptkit.ConfigurationSources{
+		Underlays: []configkit.Underlay{{Inputs: []configkit.Input{{Source: promptkit.ProfileSource("example profile", map[string]promptkit.ProfileConfig{
+			"offline-example": {Endpoint: &endpoint, Model: &model},
+		})}}}},
+		Main: &configkit.Input{Source: configkit.File("examples/go-library/prepare/prompt.yaml")},
+	}})
 	if err != nil {
 		exit(err)
 	}

examples/go-library/prepare/prompt.yaml

@@ -1,16 +1,17 @@
-id: example.prepare
-version: "1.0.0"
-default_profile: offline-example
-description: Prepare a prompt without contacting a model provider.
-inputs:
-  - name: note
-    required: true
-    content_type: text/plain
-messages:
-  - role: system
-    content: Summarize the note in one sentence.
-  - role: user
-    content: '{{input "note"}}'
-output:
-  format: text
-  validation_mode: basic
+prompts:
+  example.prepare:
+    "1.0.0":
+      default_profile: offline-example
+      description: Prepare a prompt without contacting a model provider.
+      inputs:
+        - name: note
+          required: true
+          content_type: text/plain
+      messages:
+        - role: system
+          content: Summarize the note in one sentence.
+        - role: user
+          content: '{{input "note"}}'
+      output:
+        format: text
+        validation_mode: basic

examples/go-library/run/main.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 
+	"gitea.maximumdirect.net/eric/ConfigKit"
 	"gitea.maximumdirect.net/eric/promptkit"
 )
 
@@ -38,16 +39,13 @@ type summary struct {
 }
 
 func main() {
-	engine, err := promptkit.NewEngine(
-		promptkit.Config{},
-		promptkit.WithPromptFile("examples/go-library/run/prompt.yaml"),
-		promptkit.WithProfiles(promptkit.Profile{
-			ID:       "offline-example",
-			Endpoint: "https://example.invalid/v1",
-			Model:    "offline-model",
-		}),
-		promptkit.WithLLMClient(deterministicClient{}),
-	)
+	endpoint, model := "https://example.invalid/v1", "offline-model"
+	engine, err := promptkit.NewEngine(promptkit.Config{Sources: promptkit.ConfigurationSources{
+		Underlays: []configkit.Underlay{{Inputs: []configkit.Input{{Source: promptkit.ProfileSource("example profile", map[string]promptkit.ProfileConfig{
+			"offline-example": {Endpoint: &endpoint, Model: &model},
+		})}}}},
+		Main: &configkit.Input{Source: configkit.File("examples/go-library/run/prompt.yaml")},
+	}}, promptkit.WithLLMClient(deterministicClient{}))
 	if err != nil {
 		exit(err)
 	}

examples/go-library/run/prompt.yaml

@@ -1,16 +1,17 @@
-id: example.run
-version: "1.0.0"
-default_profile: offline-example
-description: Run a prompt with a deterministic injected model client.
-inputs:
-  - name: note
-    required: true
-    content_type: text/plain
-messages:
-  - role: system
-    content: Summarize the note in one sentence.
-  - role: user
-    content: '{{input "note"}}'
-output:
-  format: text
-  validation_mode: basic
+prompts:
+  example.run:
+    "1.0.0":
+      default_profile: offline-example
+      description: Run a prompt with a deterministic injected model client.
+      inputs:
+        - name: note
+          required: true
+          content_type: text/plain
+      messages:
+        - role: system
+          content: Summarize the note in one sentence.
+        - role: user
+          content: '{{input "note"}}'
+      output:
+        format: text
+        validation_mode: basic