Skip to content

Make BulkInfoProviderService GREAT again. #1110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make BulkInfoProviderService GREAT again. #1110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eb233c
Implement provider key cleaning logic in BulkInfoProvider
RawSmokeTerribilus Nov 16, 2025
e3a5061
Merge pull request #1 from RawSmokeTerribilus/RawSmokeTerribilus-patch-1
RawSmokeTerribilus Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 109 additions & 7 deletions src/Services/InfoProviderSystem/BulkInfoProviderService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public function performBulkSearch(array $parts, array $fieldMappings, bool $pref
if (empty($parts)) {
throw new \InvalidArgumentException('No valid parts found for bulk import');
}

$this->logger->info("BulkInfoProvider: Starting bulk search for " . count($parts) . " parts.");

$partResults = [];
$hasAnyResults = false;
Expand All @@ -52,14 +54,46 @@ public function performBulkSearch(array $parts, array $fieldMappings, bool $pref
$batchProviders = [];
$regularProviders = [];

// [INICIO DE PARCHE 11 - Lógica de limpieza de clave]
foreach ($fieldMappings as $mapping) {
foreach ($mapping->providers as $providerKey) {

// Lógica de limpieza de claves de proveedor
if (!is_string($providerKey)) {
if (is_array($providerKey) || is_object($providerKey)) {
// 1. Extrae la clave del array (puede tener null bytes, ej: \0App\...\LCSCProvider\0)
$classNameKey = array_key_first((array) $providerKey);

if (is_string($classNameKey)) {

// 2. ¡¡¡LIMPIAR NULL BYTES!!!
$cleanedKey = str_replace("\0", '', $classNameKey);

// 3. Usa Regex en la clave limpia para extraer el *último* nombre de la clase
// El '.*\\\' busca de forma codiciosa hasta la última barra invertida.
if (preg_match('/.*\\\\([\w]+Provider)/', $cleanedKey, $matches)) {
// $matches[1] ahora SÍ será "LCSCProvider"
$className = $matches[1];

// 4. Convierte "LCSCProvider" a "lcsc"
$newKey = strtolower(str_replace('Provider', '', $className));
$this->logger->info("BulkInfoProvider: Converted provider key '{$classNameKey}' to '{$newKey}'");
$providerKey = $newKey; // $providerKey ahora es un string
} else {
$this->logger->warning("BulkInfoProvider: Regex failed to match on cleaned key", ['key' => $cleanedKey]);
}
}
}
}
// Fin de la lógica de limpieza

// Si después de la limpieza aún no es una cadena, ahora sí es un error
if (!is_string($providerKey)) {
$this->logger->error('Invalid provider key type', [
$this->logger->error('Invalid provider key type AFTER cleanup', [
'providerKey' => $providerKey,
'type' => gettype($providerKey)
]);
continue;
continue; // Saltar este proveedor mal formado
}

$provider = $this->providerRegistry->getProviderByKey($providerKey);
Expand All @@ -70,12 +104,24 @@ public function performBulkSearch(array $parts, array $fieldMappings, bool $pref
}
}
}
// [FIN DE PARCHE 11]

$this->logger->info("BulkInfoProvider: Identified " . count($batchProviders) . " batch providers and " . count($regularProviders) . " regular providers.");
if (!empty($batchProviders)) {
$this->logger->debug("BulkInfoProvider: Batch providers found: " . implode(', ', array_keys($batchProviders)));
}
if (!empty($regularProviders)) {
$this->logger->debug("BulkInfoProvider: Regular providers found: " . implode(', ', array_keys($regularProviders)));
}

// Process batch providers first (more efficient)
$batchResults = $this->processBatchProviders($parts, $fieldMappings, $batchProviders);
$this->logger->info("BulkInfoProvider: Completed batch processing. Batch results count: " . count($batchResults));


// Process regular providers
$regularResults = $this->processRegularProviders($parts, $fieldMappings, $regularProviders, $batchResults);
$this->logger->info("BulkInfoProvider: Completed regular processing. Regular results count: " . count($regularResults));

// Combine and format results for each part
foreach ($parts as $part) {
Expand All @@ -100,6 +146,7 @@ public function performBulkSearch(array $parts, array $fieldMappings, bool $pref
}

if (!$hasAnyResults) {
$this->logger->warning("BulkInfoProvider: No search results found for any parts after processing.");
throw new \RuntimeException('No search results found for any of the selected parts');
}

Expand All @@ -109,9 +156,43 @@ public function performBulkSearch(array $parts, array $fieldMappings, bool $pref
if ($prefetchDetails) {
$this->prefetchDetailsForResults($response);
}


$this->logger->info("BulkInfoProvider: Bulk search completed successfully with results.");
return $response;
}

/**
* [INICIO PARCHE 11]
* Helper function to check for provider key match, handling corrupted keys.
*/
private function providerKeyMatches(string $cleanedKey, array $providerList): bool
{
foreach ($providerList as $providerKey) {
if (is_string($providerKey)) {
if ($providerKey === $cleanedKey) {
return true;
}
continue;
}

// Start of our cleaning logic
if (is_array($providerKey) || is_object($providerKey)) {
$classNameKey = array_key_first((array) $providerKey);
if (is_string($classNameKey)) {
$cleanedListKey = str_replace("\0", '', $classNameKey);
if (preg_match('/.*\\\\([\w]+Provider)/', $cleanedListKey, $matches)) {
$className = $matches[1];
$newKey = strtolower(str_replace('Provider', '', $className));
if ($newKey === $cleanedKey) {
return true;
}
}
}
}
}
return false;
}
// [FIN PARCHE 11]

/**
* Process parts using batch-capable info providers.
Expand All @@ -127,18 +208,25 @@ private function processBatchProviders(array $parts, array $fieldMappings, array

foreach ($batchProviders as $providerKey => $provider) {
$keywords = $this->collectKeywordsForProvider($parts, $fieldMappings, $providerKey);
$this->logger->info("BulkInfoProvider: processBatchProviders: Collected " . count($keywords) . " keywords for provider '{$providerKey}'");

if (empty($keywords)) {
continue;
}

$this->logger->debug("BulkInfoProvider: processBatchProviders: Keywords for '{$providerKey}':", $keywords);

try {
$providerResults = $provider->searchByKeywordsBatch($keywords);
$this->logger->info("BulkInfoProvider: processBatchProviders: Received " . count($providerResults) . " results from '{$providerKey}' batch search.");

// Map results back to parts
foreach ($parts as $part) {
foreach ($fieldMappings as $mapping) {
if (!in_array($providerKey, $mapping->providers, true)) {

// [INICIO PARCHE 11] - Corrección de la comprobación
if (!$this->providerKeyMatches($providerKey, $mapping->providers)) {
// [FIN PARCHE 11]
continue;
}

Expand Down Expand Up @@ -189,8 +277,16 @@ private function processRegularProviders(array $parts, array $fieldMappings, arr
}

foreach ($fieldMappings as $mapping) {
$providers = array_intersect($mapping->providers, array_keys($regularProviders));


// [INICIO PARCHE 11] - Corrección de la intersección
$providers = [];
foreach (array_keys($regularProviders) as $regProviderKey) {
if ($this->providerKeyMatches($regProviderKey, $mapping->providers)) {
$providers[] = $regProviderKey;
}
}
// [FIN PARCHE 11]

if (empty($providers)) {
continue;
}
Expand All @@ -199,9 +295,12 @@ private function processRegularProviders(array $parts, array $fieldMappings, arr
if (!$keyword) {
continue;
}

$this->logger->info("BulkInfoProvider: processRegularProviders: Searching for keyword '{$keyword}' with providers: " . implode(',', $providers));

try {
$dtos = $this->infoRetriever->searchByKeyword($keyword, $providers);
$this->logger->info("BulkInfoProvider: processRegularProviders: Found " . count($dtos) . " results for keyword '{$keyword}'");

foreach ($dtos as $dto) {
$regularResults[$part->getId()][] = new BulkSearchPartResultDTO(
Expand Down Expand Up @@ -239,7 +338,10 @@ private function collectKeywordsForProvider(array $parts, array $fieldMappings,

foreach ($parts as $part) {
foreach ($fieldMappings as $mapping) {
if (!in_array($providerKey, $mapping->providers, true)) {

// [INICIO PARCHE 11] - Corrección de la comprobación
if (!$this->providerKeyMatches($providerKey, $mapping->providers)) {
// [FIN PARCHE 11]
continue;
}

Expand Down