Skip to content

fix: return suggested results and add resultType to dataset items #73

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

Merged
merged 2 commits into from
May 6, 2025
Merged

fix: return suggested results and add resultType to dataset items #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
940fcc4
return also suggested results, add resultType to output dataset items
MQ37 May 5, 2025
14ff431
improve readability
MQ37 May 6, 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
12 changes: 11 additions & 1 deletion .actor/actor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
"title": "Overview",
"description": "An view showing just basic properties for simplicity.",
"transformation": {
"flatten": ["metadata"],
"flatten": ["metadata", "searchResult"],
"fields": [
"metadata.url",
"metadata.title",
"searchResult.resultType",
"markdown"
]
},
Expand All @@ -34,6 +35,10 @@
"label": "Page title",
"format": "text"
},
"searchResult.resultType": {
"label": "Result type",
"format": "text"
},
"text": {
"label": "Extracted Markdown",
"format": "text"
Expand All @@ -49,6 +54,7 @@
"fields": [
"searchResult.title",
"searchResult.description",
"searchResult.resultType",
"searchResult.url"
]
},
Expand All @@ -63,6 +69,10 @@
"label": "Title",
"format": "text"
},
"searchResult.resultType": {
"label": "Result type",
"format": "text"
},
"searchResult.url": {
"label": "URL",
"format": "text"
Expand Down
16 changes: 10 additions & 6 deletions src/google-search/google-extractors-urls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { CheerioAPI } from 'cheerio';
import type { Element } from 'domhandler';

import type { OrganicResult } from '../types.js';
import type { OrganicResult, SearchResultType } from '../types.js';

/**
* Deduplicates search results based on their title and URL (source @apify/google-search).
Expand Down Expand Up @@ -64,7 +64,7 @@ const areTheResultsSuggestions = ($: CheerioAPI) => {
/**
* Extracts organic search results from the given Cheerio instance (source: @apify/google-search).
*/
export const scrapeOrganicResults = ($: CheerioAPI) => {
export const scrapeOrganicResults = ($: CheerioAPI): OrganicResult[] => {
const resultSelectors2023January = [
'.hlcw0c', // Top result with site links
'.g.Ww4FFb', // General search results
Expand All @@ -75,10 +75,14 @@ export const scrapeOrganicResults = ($: CheerioAPI) => {
'.sATSHe', // another new selector in March 2025
];

const searchResults = extractResultsFromSelectors($, resultSelectors2023January);
const deduplicatedResults = deduplicateResults(searchResults);
let resultType: SearchResultType = 'ORGANIC';
if (areTheResultsSuggestions($)) {
return [];
resultType = 'SUGGESTED';
}

const searchResults = extractResultsFromSelectors($, resultSelectors2023January);
return deduplicateResults(searchResults);
return deduplicatedResults.map((result) => ({
...result,
resultType,
}));
};
3 changes: 3 additions & 0 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@ export type Input = {
scrapingTool: ScrapingTool;
};

export type SearchResultType = 'ORGANIC' | 'SUGGESTED';

export type OrganicResult = {
description?: string;
title?: string;
rank?: number;
url?: string;
resultType?: SearchResultType;
};

export interface TimeMeasure {
Expand Down