Identify built-in generation preparation failures

This commit is contained in:
2026-11-05 13:48:16 +00:00
parent b8dc8a49a9
commit 1c075bd510
8 changed files with 54 additions and 8 deletions

View File

@@ -85,6 +85,12 @@ func (c *Coordinator) GenerateWithEvidence(
return c.generate(ctx, req, true)
}
// PreparationError identifies a built-in request preparation failure.
type PreparationError struct{ Cause error }
func (e *PreparationError) Error() string { return e.Cause.Error() }
func (e *PreparationError) Unwrap() error { return e.Cause }
func (c *Coordinator) generate(
ctx context.Context,
req domain.GenerateRequest,
@@ -95,7 +101,7 @@ func (c *Coordinator) generate(
}
prepared, err := c.builtIn.PrepareGeneration(req)
if err != nil {
return nil, err, GenerationEvidence{}
return nil, &PreparationError{Cause: err}, GenerationEvidence{PreparationFailed: true}
}
evidence := GenerationEvidence{}

View File

@@ -10,6 +10,8 @@ import (
// GenerationEvidence contains invocation-local request evidence without raw
// provider bodies, headers, credentials, or generated content.
type GenerationEvidence struct {
// PreparationFailed identifies a built-in request rejected before attempts.
PreparationFailed bool
// InitialEndpoint is the frozen built-in request URL, if prepared.
// Injected generation leaves it unknown.
InitialEndpoint string

View File

@@ -498,7 +498,7 @@ func TestRunnerRunPreparedReleasesAdmissionAcrossExecutionErrors(t *testing.T) {
}},
},
repairer: &fakeRepairer{err: repairInvalidRequest},
wantError: ErrInvalidRequest,
wantError: ErrLLMGenerate,
wantSource: repairInvalidRequest,
},
{

View File

@@ -18,6 +18,7 @@ import (
"go.maximumdirect.net/promptkit/internal/capacity"
"go.maximumdirect.net/promptkit/internal/defaults"
"go.maximumdirect.net/promptkit/internal/domain"
"go.maximumdirect.net/promptkit/internal/generation"
"go.maximumdirect.net/promptkit/internal/jsonvalue"
"go.maximumdirect.net/promptkit/internal/llm"
"go.maximumdirect.net/promptkit/internal/observation"
@@ -269,6 +270,9 @@ func (r *Runner) executePreparedRun(
}
func wrapGenerationError(err error) error {
if _, ok := err.(*generation.PreparationError); ok {
return &OperationError{Category: ErrInvalidRequest, Cause: err}
}
return &OperationError{Category: ErrLLMGenerate, Cause: err}
}

View File

@@ -2074,7 +2074,7 @@ func TestRunnerRunCancellationPreservesGenerationCategory(t *testing.T) {
}
}
func TestRunnerRunLLMInvalidRequestMapsToUsecaseInvalidRequest(t *testing.T) {
func TestRunnerRunInjectedInvalidRequestRemainsGenerationFailure(t *testing.T) {
runner := NewRunner(
&fakePromptRepo{def: promptDef(domain.FormatText, domain.ValidationNone, 0)},
&fakeExecutionProfileRepo{profiles: map[string]*domain.ExecutionProfile{"exec": defaultExecutionProfile()}},
@@ -2089,11 +2089,8 @@ func TestRunnerRunLLMInvalidRequestMapsToUsecaseInvalidRequest(t *testing.T) {
ProfileID: "exec",
Inputs: singleInputRef(),
})
if !errors.Is(err, ErrInvalidRequest) {
t.Fatalf("expected ErrInvalidRequest, got %v", err)
}
if errors.Is(err, ErrLLMGenerate) {
t.Fatalf("did not expect ErrLLMGenerate, got %v", err)
if !errors.Is(err, ErrLLMGenerate) || !errors.Is(err, llm.ErrInvalidRequest) {
t.Fatalf("expected generation error retaining cause, got %v", err)
}
}

View File

@@ -210,6 +210,9 @@ func (t *SmokeTester) runInference(
report.Failure = generation.ClassifyFailure(contextErr)
return finish(contextErr)
}
if evidence.PreparationFailed && generationErr != nil {
return nil, &OperationError{Category: ErrInvalidRequest, Cause: generationErr}
}
if generationErr != nil {
report.Failure = generation.ClassifyFailure(generationErr)
report.Completed = true