AI/reader
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/jina-ai/reader synced 2025-08-14 17:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove ip based query filling for serper

Browse Source
This commit is contained in:
yanlong.wang 2025-03-26 14:37:18 +08:00
parent 65ed1157c2
commit 2073c40a4f
No known key found for this signature in database
GPG Key ID: C0A623C0BADF9F37
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/services/serper-search.ts
View File

@ -2,9 +2,8 @@ import { AsyncService, AutoCastable, DownstreamServiceFailureError, Prop, RPC_CA
import { singleton } from 'tsyringe'; import { singleton } from 'tsyringe';
import { GlobalLogger } from './logger'; import { GlobalLogger } from './logger';
import { SecretExposer } from '../shared/services/secrets'; import { SecretExposer } from '../shared/services/secrets';
import { GEOIP_SUPPORTED_LANGUAGES, GeoIPService } from './geoip';
import { AsyncLocalContext } from './async-context'; import { AsyncLocalContext } from './async-context';
import { SerperBingHTTP, SerperGoogleHTTP, SerperImageSearchResponse, SerperNewsSearchResponse, SerperSearchQueryParams, SerperWebSearchResponse, WORLD_COUNTRIES } from '../shared/3rd-party/serper-search'; import { SerperBingHTTP, SerperGoogleHTTP, SerperImageSearchResponse, SerperNewsSearchResponse, SerperSearchQueryParams, SerperWebSearchResponse } from '../shared/3rd-party/serper-search';
import { BlackHoleDetector } from './blackhole-detector'; import { BlackHoleDetector } from './blackhole-detector';
import { Context } from './registry'; import { Context } from './registry';
import { ServiceBadAttemptError } from '../shared'; import { ServiceBadAttemptError } from '../shared';
@ -20,7 +19,6 @@ export class SerperSearchService extends AsyncService {
constructor( constructor(
protected globalLogger: GlobalLogger, protected globalLogger: GlobalLogger,
protected secretExposer: SecretExposer, protected secretExposer: SecretExposer,
protected geoipControl: GeoIPService,
protected threadLocal: AsyncLocalContext, protected threadLocal: AsyncLocalContext,
protected blackHoleDetector: BlackHoleDetector, protected blackHoleDetector: BlackHoleDetector,
) { ) {
@ -49,30 +47,6 @@ export class SerperSearchService extends AsyncService {
doSearch(variant: 'images', query: SerperSearchQueryParams): Promise<SerperImageSearchResponse>; doSearch(variant: 'images', query: SerperSearchQueryParams): Promise<SerperImageSearchResponse>;
doSearch(variant: 'news', query: SerperSearchQueryParams): Promise<SerperNewsSearchResponse>; doSearch(variant: 'news', query: SerperSearchQueryParams): Promise<SerperNewsSearchResponse>;
async doSearch(variant: 'web' | 'images' | 'news', query: SerperSearchQueryParams) { async doSearch(variant: 'web' | 'images' | 'news', query: SerperSearchQueryParams) {
const ip = this.threadLocal.get('ip');
if (ip) {
const geoip = await this.geoipControl.lookupCity(ip, GEOIP_SUPPORTED_LANGUAGES.EN);
const locationChunks = [];
if (geoip?.city) {
locationChunks.push(geoip.city);
}
if (geoip?.subdivisions?.length) {
for (const x of geoip.subdivisions) {
locationChunks.push(x.name);
}
}
if (geoip?.country) {
const code = geoip.country.code?.toLowerCase();
if (code && code.toUpperCase() in WORLD_COUNTRIES) {
query.gl ??= code;
}
locationChunks.push(geoip.country.name);
}
if (locationChunks.length) {
query.location ??= locationChunks.join(', ');
}
}
const clientIt = this.iterClient(); const clientIt = this.iterClient();
let client = clientIt.next().value; let client = clientIt.next().value;
if (!client) { if (!client) {