Unify PromptKit and ConfigKit source wiring
This commit is contained in:
@@ -18,6 +18,8 @@ scaffolding, or conversation and coordination features.
|
|||||||
|
|
||||||
## Stage 1: Unify dependencies and framework source wiring
|
## Stage 1: Unify dependencies and framework source wiring
|
||||||
|
|
||||||
|
**Status: Complete.**
|
||||||
|
|
||||||
1. Update `go.mod` to require `go.maximumdirect.net/promptkit v0.23.2` and
|
1. Update `go.mod` to require `go.maximumdirect.net/promptkit v0.23.2` and
|
||||||
`go.maximumdirect.net/configkit v1.2.1`. Remove the old PromptKit and
|
`go.maximumdirect.net/configkit v1.2.1`. Remove the old PromptKit and
|
||||||
ConfigKit requirements and both old catalog requirements. Replace Go
|
ConfigKit requirements and both old catalog requirements. Replace Go
|
||||||
|
|||||||
13
go.mod
13
go.mod
@@ -3,15 +3,12 @@ module gitea.maximumdirect.net/eric/scriptorium
|
|||||||
go 1.27.0
|
go 1.27.0
|
||||||
|
|
||||||
require (
|
require (
|
||||||
gitea.maximumdirect.net/eric/ConfigKit v0.5.0
|
go.maximumdirect.net/configkit v1.2.1
|
||||||
gitea.maximumdirect.net/eric/promptkit v0.12.0
|
go.maximumdirect.net/promptkit v0.23.2
|
||||||
go.maximumdirect.net/configkit v1.2.0
|
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
gitea.maximumdirect.net/eric/promptkit-backend-openrouter/v3 v3.20260930.0 // indirect
|
github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 // indirect
|
||||||
gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome/v3 v3.20260930.0 // indirect
|
go.yaml.in/yaml/v4 v4.0.0 // indirect
|
||||||
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
|
golang.org/x/text v0.44.0 // indirect
|
||||||
go.yaml.in/yaml/v4 v4.0.0-rc.6 // indirect
|
|
||||||
golang.org/x/text v0.14.0 // indirect
|
|
||||||
)
|
)
|
||||||
|
|||||||
10
go.sum
10
go.sum
@@ -10,11 +10,21 @@ github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxK
|
|||||||
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
|
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
|
||||||
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
|
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
|
||||||
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
|
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
|
||||||
|
github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 h1:1EYB5IzjZawrrnELUi78f9fPu57HuXjmddZPjrls/28=
|
||||||
|
github.com/santhosh-tekuri/jsonschema/v6 v6.0.3/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
|
||||||
go.maximumdirect.net/configkit v1.2.0 h1:c4tDJ6Xeh/Jg90UZplLxsnf500lvrZBVj0E3i1ysir8=
|
go.maximumdirect.net/configkit v1.2.0 h1:c4tDJ6Xeh/Jg90UZplLxsnf500lvrZBVj0E3i1ysir8=
|
||||||
go.maximumdirect.net/configkit v1.2.0/go.mod h1:s1zLJ9GGB/1Q4a+aOHMLISonJxWFgNWpA6SpPlOafeA=
|
go.maximumdirect.net/configkit v1.2.0/go.mod h1:s1zLJ9GGB/1Q4a+aOHMLISonJxWFgNWpA6SpPlOafeA=
|
||||||
|
go.maximumdirect.net/configkit v1.2.1 h1:f+/6WjNl6CULbMr6ZSVwi4aty9rmuDfJlvpeU7I+HZM=
|
||||||
|
go.maximumdirect.net/configkit v1.2.1/go.mod h1:ewu6blSokUDCMovy8JBXAdXRikGmlHXAQpFghnPWRfs=
|
||||||
|
go.maximumdirect.net/promptkit v0.23.2 h1:nE+Qqqbw5GN4PHD2e5OEWUHXcYkESZm3ryZVBsKWwFQ=
|
||||||
|
go.maximumdirect.net/promptkit v0.23.2/go.mod h1:vPFg76VXcffP0JBFMS2WADCHwV5FYvO2O4bvIoiDlwc=
|
||||||
go.yaml.in/yaml/v4 v4.0.0-rc.6 h1:1h7H1ohdUh93/FyE4YaDa1Zh64K6VVbjF4K6WUxMtH4=
|
go.yaml.in/yaml/v4 v4.0.0-rc.6 h1:1h7H1ohdUh93/FyE4YaDa1Zh64K6VVbjF4K6WUxMtH4=
|
||||||
go.yaml.in/yaml/v4 v4.0.0-rc.6/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
|
go.yaml.in/yaml/v4 v4.0.0-rc.6/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
|
||||||
|
go.yaml.in/yaml/v4 v4.0.0 h1:/LG1pNO84Z4l603j/xMn69CcS5OYhMQ/f7l2LoQUGuw=
|
||||||
|
go.yaml.in/yaml/v4 v4.0.0/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
|
||||||
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
|
||||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||||
|
golang.org/x/text v0.44.0 h1:YItdp/mQNGnsmrgpcdA5yQ3bnRxCfo/Tj/iByGW9GGo=
|
||||||
|
golang.org/x/text v0.44.0/go.mod h1:S4FR1waQ9LbjQTls97SyRjDaUUVkaM+cXwwuG/G+MwY=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
|
|
||||||
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
||||||
"go.maximumdirect.net/configkit"
|
"go.maximumdirect.net/configkit"
|
||||||
)
|
)
|
||||||
@@ -54,18 +53,12 @@ func loadApplicationSettings(configPath, overlay string, explicit bool, override
|
|||||||
func writeApplicationError(output io.Writer, label string, err error) {
|
func writeApplicationError(output io.Writer, label string, err error) {
|
||||||
var loadError *configkit.LoadError
|
var loadError *configkit.LoadError
|
||||||
if errors.As(err, &loadError) {
|
if errors.As(err, &loadError) {
|
||||||
|
_, _ = fmt.Fprintf(output, "%s error:\n", label)
|
||||||
if writeErr := configkit.WriteDiagnostics(output, loadError.Diagnostics()); writeErr != nil {
|
if writeErr := configkit.WriteDiagnostics(output, loadError.Diagnostics()); writeErr != nil {
|
||||||
_, _ = fmt.Fprintf(output, "%s diagnostic write error: %v\n", label, writeErr)
|
_, _ = fmt.Fprintf(output, "%s diagnostic write error: %v\n", label, writeErr)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var legacyLoadError *legacyconfigkit.LoadError
|
|
||||||
if errors.As(err, &legacyLoadError) {
|
|
||||||
if writeErr := legacyconfigkit.WriteDiagnostics(output, legacyLoadError.Diagnostics()); writeErr != nil {
|
|
||||||
_, _ = fmt.Fprintf(output, "%s diagnostic write error: %v\n", label, writeErr)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
_, _ = fmt.Fprintf(output, "%s error: %v\n", label, err)
|
_, _ = fmt.Fprintf(output, "%s error: %v\n", label, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
|
|
||||||
"go.maximumdirect.net/configkit"
|
"go.maximumdirect.net/configkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -23,8 +22,8 @@ type frameworkConfigurationConfig struct {
|
|||||||
type frameworkConfigurationSource struct {
|
type frameworkConfigurationSource struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Label string `json:"label"`
|
Label string `json:"label"`
|
||||||
Layer legacyconfigkit.Layer `json:"layer"`
|
Layer configkit.Layer `json:"layer"`
|
||||||
Kind legacyconfigkit.SourceKind `json:"kind"`
|
Kind configkit.SourceKind `json:"kind"`
|
||||||
UnderlayIndex int `json:"underlay_index"`
|
UnderlayIndex int `json:"underlay_index"`
|
||||||
Path string `json:"path,omitempty"`
|
Path string `json:"path,omitempty"`
|
||||||
ImportedFrom *frameworkConfigurationLocation `json:"imported_from,omitempty"`
|
ImportedFrom *frameworkConfigurationLocation `json:"imported_from,omitempty"`
|
||||||
@@ -42,9 +41,9 @@ func inspectFrameworkConfigurationCommand(args []string, stdout, stderr io.Write
|
|||||||
writeApplicationError(stderr, "inspect configuration parse", err)
|
writeApplicationError(stderr, "inspect configuration parse", err)
|
||||||
return ExitRuntimeError
|
return ExitRuntimeError
|
||||||
}
|
}
|
||||||
var explanationPath legacyconfigkit.Path
|
var explanationPath configkit.Path
|
||||||
if cfg.mode == "explain" {
|
if cfg.mode == "explain" {
|
||||||
explanationPath, err = legacyconfigkit.ParsePath(cfg.path)
|
explanationPath, err = configkit.ParsePath(cfg.path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeApplicationError(stderr, "inspect configuration path", err)
|
writeApplicationError(stderr, "inspect configuration path", err)
|
||||||
return ExitRuntimeError
|
return ExitRuntimeError
|
||||||
@@ -68,7 +67,7 @@ func inspectFrameworkConfigurationCommand(args []string, stdout, stderr io.Write
|
|||||||
writeApplicationError(stderr, "inspect configuration", err)
|
writeApplicationError(stderr, "inspect configuration", err)
|
||||||
return ExitRuntimeError
|
return ExitRuntimeError
|
||||||
}
|
}
|
||||||
if err := legacyconfigkit.WriteDiagnostics(stderr, view.Diagnostics()); err != nil {
|
if err := configkit.WriteDiagnostics(stderr, view.Diagnostics()); err != nil {
|
||||||
return ExitRuntimeError
|
return ExitRuntimeError
|
||||||
}
|
}
|
||||||
if cfg.mode == "validate" {
|
if cfg.mode == "validate" {
|
||||||
@@ -147,7 +146,7 @@ func resolveAppSettingsForFrameworkConfiguration(cfg *frameworkConfigurationConf
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func frameworkConfigurationSources(sources []legacyconfigkit.SourceInfo) []frameworkConfigurationSource {
|
func frameworkConfigurationSources(sources []configkit.SourceInfo) []frameworkConfigurationSource {
|
||||||
result := make([]frameworkConfigurationSource, 0, len(sources))
|
result := make([]frameworkConfigurationSource, 0, len(sources))
|
||||||
for _, source := range sources {
|
for _, source := range sources {
|
||||||
item := frameworkConfigurationSource{
|
item := frameworkConfigurationSource{
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
configkit "gitea.maximumdirect.net/eric/ConfigKit"
|
|
||||||
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
|
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
|
||||||
|
configkit "go.maximumdirect.net/configkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFrameworkConfigurationCommandsNeedNoPromptOrCredential(t *testing.T) {
|
func TestFrameworkConfigurationCommandsNeedNoPromptOrCredential(t *testing.T) {
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
|
"go.maximumdirect.net/configkit"
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
type promptKitSourceFlagEntry struct {
|
type promptKitSourceFlagEntry struct {
|
||||||
@@ -71,5 +71,5 @@ func writeFrameworkDiagnostics(output io.Writer, engine *promptkit.Engine) error
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("inspect captured PromptKit diagnostics: %w", err)
|
return fmt.Errorf("inspect captured PromptKit diagnostics: %w", err)
|
||||||
}
|
}
|
||||||
return legacyconfigkit.WriteDiagnostics(output, view.Diagnostics())
|
return configkit.WriteDiagnostics(output, view.Diagnostics())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,9 +10,9 @@ import (
|
|||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
configkit "gitea.maximumdirect.net/eric/ConfigKit"
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
|
||||||
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
||||||
|
configkit "go.maximumdirect.net/configkit"
|
||||||
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFrameworkSourceGroupsComposeAndValidateEffectiveDefinitions(t *testing.T) {
|
func TestFrameworkSourceGroupsComposeAndValidateEffectiveDefinitions(t *testing.T) {
|
||||||
|
|||||||
@@ -13,14 +13,13 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
|
||||||
httpadapter "gitea.maximumdirect.net/eric/scriptorium/internal/adapter/http"
|
httpadapter "gitea.maximumdirect.net/eric/scriptorium/internal/adapter/http"
|
||||||
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
||||||
"gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
|
"gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
|
||||||
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
|
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
|
||||||
executionreport "gitea.maximumdirect.net/eric/scriptorium/internal/report"
|
executionreport "gitea.maximumdirect.net/eric/scriptorium/internal/report"
|
||||||
"go.maximumdirect.net/configkit"
|
"go.maximumdirect.net/configkit"
|
||||||
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -544,12 +543,12 @@ func (c serveConfig) engineSettings() engineSettings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func newEngine(settings engineSettings, options ...promptkit.Option) (*promptkit.Engine, error) {
|
func newEngine(settings engineSettings, options ...promptkit.Option) (*promptkit.Engine, error) {
|
||||||
underlays := make([]legacyconfigkit.Underlay, 0, len(settings.promptkitSources))
|
underlays := make([]configkit.Underlay, 0, len(settings.promptkitSources))
|
||||||
for index, selection := range settings.promptkitSources {
|
for index, selection := range settings.promptkitSources {
|
||||||
var inputs []legacyconfigkit.Input
|
var inputs []configkit.Input
|
||||||
switch {
|
switch {
|
||||||
case selection.File != "" && selection.Directory == "":
|
case selection.File != "" && selection.Directory == "":
|
||||||
inputs = []legacyconfigkit.Input{{Source: legacyconfigkit.File(selection.File), Imports: true}}
|
inputs = []configkit.Input{{Source: configkit.File(selection.File), Imports: true}}
|
||||||
case selection.Directory != "" && selection.File == "":
|
case selection.Directory != "" && selection.File == "":
|
||||||
var err error
|
var err error
|
||||||
inputs, err = promptkit.DirectoryInputs(selection.Directory)
|
inputs, err = promptkit.DirectoryInputs(selection.Directory)
|
||||||
@@ -561,7 +560,7 @@ func newEngine(settings engineSettings, options ...promptkit.Option) (*promptkit
|
|||||||
cause := fmt.Errorf("PromptKit source %d must select exactly one file or directory", index+1)
|
cause := fmt.Errorf("PromptKit source %d must select exactly one file or directory", index+1)
|
||||||
return nil, fmt.Errorf("engine initialization from application configuration: %w", errors.Join(promptkit.ErrInvalidConfig, cause))
|
return nil, fmt.Errorf("engine initialization from application configuration: %w", errors.Join(promptkit.ErrInvalidConfig, cause))
|
||||||
}
|
}
|
||||||
underlays = append(underlays, legacyconfigkit.Underlay{Inputs: inputs})
|
underlays = append(underlays, configkit.Underlay{Inputs: inputs})
|
||||||
}
|
}
|
||||||
engine, err := promptkit.NewEngine(promptkit.Config{
|
engine, err := promptkit.NewEngine(promptkit.Config{
|
||||||
Sources: promptkit.ConfigurationSources{Underlays: underlays},
|
Sources: promptkit.ConfigurationSources{Underlays: underlays},
|
||||||
|
|||||||
@@ -18,12 +18,11 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
legacyconfigkit "gitea.maximumdirect.net/eric/ConfigKit"
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
|
||||||
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
appconfig "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
||||||
"gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
|
"gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
|
||||||
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
|
renderformat "gitea.maximumdirect.net/eric/scriptorium/internal/format"
|
||||||
"go.maximumdirect.net/configkit"
|
"go.maximumdirect.net/configkit"
|
||||||
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestParseMappingsSingleAndRepeated(t *testing.T) {
|
func TestParseMappingsSingleAndRepeated(t *testing.T) {
|
||||||
@@ -569,9 +568,9 @@ func TestConfigurationErrorsUseTheirNativeDiagnosticWriters(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
_, err := newEngine(engineSettings{promptkitSources: []appconfig.SourceSelection{{File: framework}}})
|
_, err := newEngine(engineSettings{promptkitSources: []appconfig.SourceSelection{{File: framework}}})
|
||||||
var legacyError *legacyconfigkit.LoadError
|
var loadError *configkit.LoadError
|
||||||
if !errors.As(err, &legacyError) {
|
if !errors.As(err, &loadError) {
|
||||||
t.Fatalf("framework load lost legacy diagnostic identity: %v", err)
|
t.Fatalf("framework load lost diagnostic identity: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
scriptoriumModulePath = "gitea.maximumdirect.net/eric/scriptorium"
|
scriptoriumModulePath = "gitea.maximumdirect.net/eric/scriptorium"
|
||||||
promptkitInternalPath = "gitea.maximumdirect.net/eric/promptkit/internal"
|
promptkitInternalPath = "go.maximumdirect.net/promptkit/internal"
|
||||||
promptkitOpenRouterCatalogPath = "gitea.maximumdirect.net/eric/promptkit-backend-openrouter"
|
promptkitOpenRouterCatalogPath = "gitea.maximumdirect.net/eric/promptkit-backend-openrouter"
|
||||||
promptkitRakestrawhomeCatalogPath = "gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome"
|
promptkitRakestrawhomeCatalogPath = "gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome"
|
||||||
)
|
)
|
||||||
@@ -149,7 +149,7 @@ func TestForbiddenImportScannerAllowsRetainedApplicationPackages(t *testing.T) {
|
|||||||
source := `package consumer
|
source := `package consumer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
_ "gitea.maximumdirect.net/eric/promptkit"
|
_ "go.maximumdirect.net/promptkit"
|
||||||
_ "gitea.maximumdirect.net/eric/scriptorium/internal/adapter/http"
|
_ "gitea.maximumdirect.net/eric/scriptorium/internal/adapter/http"
|
||||||
_ "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
_ "gitea.maximumdirect.net/eric/scriptorium/internal/config"
|
||||||
_ "gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
|
_ "gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestRestrictedArtifactReaderReadsContainedFiles(t *testing.T) {
|
func TestRestrictedArtifactReaderReadsContainedFiles(t *testing.T) {
|
||||||
|
|||||||
@@ -10,9 +10,9 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
|
||||||
"gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
|
"gitea.maximumdirect.net/eric/scriptorium/internal/defaults"
|
||||||
executionreport "gitea.maximumdirect.net/eric/scriptorium/internal/report"
|
executionreport "gitea.maximumdirect.net/eric/scriptorium/internal/report"
|
||||||
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Runner interface {
|
type Runner interface {
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gitea.maximumdirect.net/eric/ConfigKit"
|
"go.maximumdirect.net/configkit"
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
type fakeRunner struct {
|
type fakeRunner struct {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
type PromptInspection struct {
|
type PromptInspection struct {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFormatPromptInspectionPreservesDeclaredOrderAndEmptyValues(t *testing.T) {
|
func TestFormatPromptInspectionPreservesDeclaredOrderAndEmptyValues(t *testing.T) {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
var ErrUnknownPreparedRunFormat = errors.New("unknown prepared run format")
|
var ErrUnknownPreparedRunFormat = errors.New("unknown prepared run format")
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestTextFormatterIncludesPreparedRunDetails(t *testing.T) {
|
func TestTextFormatterIncludesPreparedRunDetails(t *testing.T) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package report
|
package report
|
||||||
|
|
||||||
import "gitea.maximumdirect.net/eric/promptkit"
|
import "go.maximumdirect.net/promptkit"
|
||||||
|
|
||||||
// Execution is the terminal observation exposed by Scriptorium's opt-in adapters.
|
// Execution is the terminal observation exposed by Scriptorium's opt-in adapters.
|
||||||
type Execution struct {
|
type Execution struct {
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gitea.maximumdirect.net/eric/ConfigKit"
|
"go.maximumdirect.net/configkit"
|
||||||
"gitea.maximumdirect.net/eric/promptkit"
|
"go.maximumdirect.net/promptkit"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestCollectorProjectsOnlyTerminalAggregates(t *testing.T) {
|
func TestCollectorProjectsOnlyTerminalAggregates(t *testing.T) {
|
||||||
|
|||||||
Reference in New Issue
Block a user