marek/MtoRagSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

p34

Browse Source
This commit is contained in:
team 1
2026-05-04 15:46:52 +02:00
parent 16e3d0a0ae
commit 33b2b30d99
1 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Config/RetriexEffectiveConfigProvider.php
View File

@@ -289,7 +289,7 @@ final readonly class RetriexEffectiveConfigProvider
$errors[] = 'Shop query optimizer prompt no longer contains the configured original query.'; $errors[] = 'Shop query optimizer prompt no longer contains the configured original query.';
} }
$metaOnlyTerms = $this->agentRunnerConfig->getShopQueryMetaOnlyTerms(); $metaOnlyTerms = $this->effectiveShopQueryMetaGuardTerms();
foreach ($this->governanceConfig->getRegressionShopQueryMetaGuardTerms() as $term) { foreach ($this->governanceConfig->getRegressionShopQueryMetaGuardTerms() as $term) {
$key = 'shop_query_meta_guard_term_' . $this->guardrailCheckKey($term); $key = 'shop_query_meta_guard_term_' . $this->guardrailCheckKey($term);
$checks[$key] = in_array($term, $metaOnlyTerms, true); $checks[$key] = in_array($term, $metaOnlyTerms, true);
@@ -302,7 +302,7 @@ final readonly class RetriexEffectiveConfigProvider
$errors[] = 'Shop query context fallback is disabled.'; $errors[] = 'Shop query context fallback is disabled.';
} }
$contextFallbackFilterTerms = $this->agentRunnerConfig->getShopQueryContextFallbackFilterTerms(); $contextFallbackFilterTerms = $this->effectiveShopQueryContextFallbackFilterTerms();
foreach ($this->governanceConfig->getRegressionShopQueryContextFallbackFilterTerms() as $term) { foreach ($this->governanceConfig->getRegressionShopQueryContextFallbackFilterTerms() as $term) {
$key = 'shop_query_context_fallback_filter_' . $this->guardrailCheckKey($term); $key = 'shop_query_context_fallback_filter_' . $this->guardrailCheckKey($term);
$checks[$key] = in_array($term, $contextFallbackFilterTerms, true); $checks[$key] = in_array($term, $contextFallbackFilterTerms, true);
@@ -339,6 +339,56 @@ final readonly class RetriexEffectiveConfigProvider
'warnings' => $warnings, 'warnings' => $warnings,
]; ];
} }
/** @return string[] */
private function effectiveShopQueryMetaGuardTerms(): array
{
$profileName = $this->agentRunnerConfig->getShopQueryContextFallbackCleanupProfile();
return $this->mergeUniqueStrings(
$this->mergeUniqueStrings(
$this->languageCleanupConfig->getStopWordsForProfile($profileName),
$this->languageCleanupConfig->getPhrasesForProfile($profileName)
),
$this->mergeUniqueStrings(
$this->languageCleanupConfig->getMetaTermsForProfile($profileName),
$this->agentRunnerConfig->getShopQueryMetaOnlyTerms()
)
);
}
/** @return string[] */
private function effectiveShopQueryContextFallbackFilterTerms(): array
{
$profileName = $this->agentRunnerConfig->getShopQueryContextFallbackCleanupProfile();
return $this->mergeUniqueStrings(
$this->effectiveShopQueryMetaGuardTerms(),
$this->agentRunnerConfig->getShopQueryContextFallbackFilterTerms()
);
}
/**
* @param string[] $left
* @param string[] $right
* @return string[]
*/
private function mergeUniqueStrings(array $left, array $right): array
{
$out = [];
foreach (array_merge($left, $right) as $item) {
$item = trim((string) $item);
if ($item === '' || isset($out[$item])) {
continue;
}
$out[$item] = $item;
}
return array_values($out);
}
/** @param string[] $markers */ /** @param string[] $markers */
private function containsAnyConfiguredMarker(string $haystack, array $markers): bool private function containsAnyConfiguredMarker(string $haystack, array $markers): bool
{ {