Skip to content

Fix response error checking for fuzzy requests #145

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
KlimTodrik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix response error checking for fuzzy requests #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 46 additions & 12 deletions src/ManticoreSearch/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
use Ds\Vector;
use Exception;
use Generator;
use Manticoresearch\Buddy\Core\Error\GenericError;
use Manticoresearch\Buddy\Core\Error\ManticoreSearchClientError;
use Manticoresearch\Buddy\Core\Error\ManticoreSearchResponseError;
use Manticoresearch\Buddy\Core\Network\Struct;
use Manticoresearch\Buddy\Core\Tool\Arrays;
use Manticoresearch\Buddy\Core\Tool\Buddy;
Expand Down Expand Up @@ -632,7 +634,11 @@ protected function fetchSettings(): Settings {
* @param bool $forceBigrams When set to true, passes "1 as force_bigrams" to all CALL SUGGEST requests
* @param int $distance Maximum edit distance for suggestions
* @param int $limit Maximum number of suggestions per word
*
* @return array{0: array<Variation>, 1: Map<string, float>} Words and score map
* @throws ManticoreSearchResponseError
* @throws ManticoreSearchClientError
* @throws GenericError
*/
public function fetchFuzzyVariations(
string $query,
Expand All @@ -645,8 +651,12 @@ public function fetchFuzzyVariations(
$query = addcslashes($query, '*%?\'');
// 1. Tokenize the query first with the keywords function
$q = "CALL KEYWORDS('{$query}', '{$table}')";
$request = $this->sendRequest($q);
if ($request->hasError()) {
ManticoreSearchResponseError::throw((string)$request->getError());
}
/** @var array<array{data:array<array{normalized:string,tokenized:string}>}> $keywordsResult */
$keywordsResult = $this->sendRequest($q)->getResult();
$keywordsResult = $request->getResult();
$normalized = array_column($keywordsResult[0]['data'] ?? [], 'normalized');

/** @var array<Variation> $words */
Expand Down Expand Up @@ -714,7 +724,10 @@ public function fetchFuzzyVariations(
* @param Map<string,int> $docMap Reference to document map to be populated
* @param array<int,bool> $processedTokens Reference to processed tokens tracking
* @param bool $forceBigrams When set to true, passes "1 as force_bigrams" to all CALL SUGGEST requests
*
* @return int Number of tokens consumed (1 for individual, 2+ for merged)
* @throws ManticoreSearchClientError
* @throws GenericError
*/
private function processSuggestion(
string $word,
Expand All @@ -739,16 +752,24 @@ private function processSuggestion(
{$forceBigramsOption}
)";


$request = $this->sendRequest($query);
if ($request->hasError()) {
ManticoreSearchResponseError::throw((string)$request->getError());
}

/**
* @var array<array{
* data: array<array{
* suggest: string,
* distance: int,
* docs: int
* }>
* }> $suggestResult
*/
$suggestResult = $this->sendRequest($query)->getResult();
* @var array<array{
* data: array<array{
* suggest: string,
* distance: int,
* docs: int
* }>
* }> $suggestResult
*/

$suggestResult = $request->getResult();


/** @var array<array{suggest:string,distance:int,docs:int}> $suggestions */
$suggestions = $suggestResult[0]['data'] ?? [];
Expand Down Expand Up @@ -859,7 +880,10 @@ private function shouldAttemptMerge(string $word, string $nextWord): bool {
* @param int $distance
* @param array<string> $choices
* @param Map<string,int> $distanceMap
*
* @return array{original:string,choices:array<string>,distanceMap:Map<string,int>,docMap:array<string,int>}|null
* @throws ManticoreSearchClientError
* @throws GenericError
*/
private function tryMergeWithNext(
string $word,
Expand Down Expand Up @@ -890,8 +914,13 @@ private function tryMergeWithNext(
{$forceBigramsOption}
)";

$request = $this->sendRequest($query);
if ($request->hasError()) {
ManticoreSearchResponseError::throw((string)$request->getError());
}

/** @var array<array{data:array<array{suggest:string,distance:int,docs:int}>}> $combinedSuggestResult */
$combinedSuggestResult = $this->sendRequest($query)->getResult();
$combinedSuggestResult = $request->getResult();

$combinedSuggestions = $combinedSuggestResult[0]['data'] ?? [];

Expand Down Expand Up @@ -923,8 +952,13 @@ private function tryMergeWithNext(
{$forceBigramsOption}
)";

$request = $this->sendRequest($nextWordQuery);
if ($request->hasError()) {
ManticoreSearchResponseError::throw((string)$request->getError());
}

/** @var array<array{data:array<array{suggest:string,distance:int,docs:int}>}> $nextWordResult */
$nextWordResult = $this->sendRequest($nextWordQuery)->getResult();
$nextWordResult = $request->getResult();
$nextWordSuggestions = $nextWordResult[0]['data'] ?? [];
$nextWordChoices = array_column($nextWordSuggestions, 'suggest');

Expand Down
Loading