Skip to content
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.

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

feat(ranking): do tie breaking based on the magnitude of downloads #178

Merged
merged 4 commits into from
Apr 13, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,14 @@ For every single NPM package, we create a record in the Algolia index. The resul
// [...]
],
"lastCrawl": "2017-10-24T08:29:24.672Z",
"popularName": "babel-core",
"dependents": 3321,
"humanDependents": "3.3k",
"changelogFilename": null, // if babel-core had a changelog, it would be the raw GitHub url here
"objectID": "babel-core"
"objectID": "babel-core",
"_searchInternal": {
"popularName": "babel-core",
"downloadsMagnitude": 8
}
}
```

Expand All @@ -135,7 +138,7 @@ If you want to learn more about how Algolia's ranking algorithm is working, you

We're restricting the search to use a subset of the attributes only:

* `popularName`
* `_searchInternal.popularName`
* `name`
* `description`
* `keywords`
Expand Down Expand Up @@ -237,9 +240,10 @@ When the process starts with `seq=0`:
* watch for registry changes continuously and replicate them

Replicate and watch are separated because:
1. In replicate we want to replicate a batch of documents in a fast way
2. In watch we want new changes as fast as possible, one by one. If watch was
asking for batches of 100, new packages would be added too late to the index

1. In replicate we want to replicate a batch of documents in a fast way
2. In watch we want new changes as fast as possible, one by one. If watch was
asking for batches of 100, new packages would be added too late to the index

## Tests

Expand Down
12 changes: 7 additions & 5 deletions src/__tests__/__snapshots__/config.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ Object {
Object {
"condition": Object {
"anchoring": "is",
"pattern": "{facet:concatenatedName}",
"pattern": "{facet:_searchInternal.concatenatedName}",
},
"consequence": Object {
"params": Object {
"automaticOptionalFacetFilters": Array [
"concatenatedName",
"_searchInternal.concatenatedName",
],
},
},
Expand All @@ -26,13 +26,15 @@ Object {
],
"indexSettings": Object {
"attributesForFaceting": Array [
"filterOnly(concatenatedName)",
"filterOnly(_searchInternal.concatenatedName)",
"searchable(keywords)",
"searchable(computedKeywords)",
"searchable(owner.name)",
"deprecated",
],
"customRanking": Array [
"desc(_searchInternal.downloadsMagnitude)",
"desc(dependents)",
"desc(downloadsLast30Days)",
],
"disableExactOnAttributes": Array [
Expand Down Expand Up @@ -68,9 +70,9 @@ Object {
],
"replaceSynonymsInHighlight": false,
"searchableAttributes": Array [
"unordered(popularName)",
"unordered(_searchInternal.popularName)",
"unordered(name)",
"unordered(concatenatedName)",
"unordered(_searchInternal.concatenatedName)",
"unordered(description)",
"unordered(keywords)",
"owner.name",
Expand Down
17 changes: 10 additions & 7 deletions src/__tests__/__snapshots__/formatPkg.test.js.snap

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/__tests__/formatPkg.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ it('truncates long readmes', () => {
formatted.readme.length - truncatedEnding.length
);

expect(formatted.readme).toHaveLength(451134);
expect(formatted.readme).toHaveLength(451140);
expect(ending).toBe(truncatedEnding);

formatted.lastCrawl = '<!-- date replaced -->';
Expand Down
31 changes: 25 additions & 6 deletions src/__tests__/npm.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,27 +76,36 @@ describe('getDownloads()', () => {
expect.objectContaining({
downloadsLast30Days: expect.any(Number),
downloadsRatio: expect.any(Number),
popular: true,
popularName: 'jest',
humanDownloadsLast30Days: expect.any(String),
popular: true,
_searchInternal: {
popularName: 'jest',
downloadsMagnitude: expect.any(Number),
},
}),
expect.objectContaining({
downloadsLast30Days: expect.any(Number),
downloadsRatio: expect.any(Number),
popular: true,
popularName: '@angular/core',
humanDownloadsLast30Days: expect.any(String),
popular: true,
_searchInternal: {
popularName: '@angular/core',
downloadsMagnitude: expect.any(Number),
},
}),
expect.objectContaining({
downloadsLast30Days: expect.any(Number),
downloadsRatio: expect.any(Number),
popular: false,
humanDownloadsLast30Days: expect.any(String),
popular: false,
_searchInternal: {
downloadsMagnitude: expect.any(Number),
},
}),
]);
});

it('has the right approximate value', () => {
it('has the right approximate value for downloadsLast30Days', () => {
const [jest, angular, holmes] = downloads.map(
pkg => pkg.downloadsLast30Days
);
Expand All @@ -113,4 +122,14 @@ describe('getDownloads()', () => {
expect(holmes).toBeGreaterThan(250);
expect(holmes).toBeLessThan(550);
});

it('has the right approximate value for downloadsMagnitude', () => {
const [jest, angular, holmes] = downloads.map(
pkg => pkg._searchInternal.downloadsMagnitude
);

expect(jest).toBe(7);
expect(angular).toBe(7);
expect(holmes).toBe(3);
});
});
16 changes: 10 additions & 6 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,26 @@ const defaultConfig = {
seq: null,
indexSettings: {
searchableAttributes: [
'unordered(popularName)',
'unordered(_searchInternal.popularName)',
'unordered(name)',
'unordered(concatenatedName)',
'unordered(_searchInternal.concatenatedName)',
'unordered(description)',
'unordered(keywords)',
'owner.name',
'owners.name',
],
attributesForFaceting: [
'filterOnly(concatenatedName)' /* optionalFacetFilters to boost the name */,
'filterOnly(_searchInternal.concatenatedName)' /* optionalFacetFilters to boost the name */,
'searchable(keywords)',
'searchable(computedKeywords)',
'searchable(owner.name)',
'deprecated',
],
customRanking: ['desc(downloadsLast30Days)'],
customRanking: [
'desc(_searchInternal.downloadsMagnitude)',
'desc(dependents)',
'desc(downloadsLast30Days)',
],
disablePrefixOnAttributes: ['keywords', 'owner.name', 'owners.name'],
disableExactOnAttributes: [
'description',
Expand Down Expand Up @@ -69,12 +73,12 @@ const defaultConfig = {
objectID: 'promote-exact',
description: 'promote exact matches',
condition: {
pattern: '{facet:concatenatedName}',
pattern: '{facet:_searchInternal.concatenatedName}',
anchoring: 'is',
},
consequence: {
params: {
automaticOptionalFacetFilters: ['concatenatedName'],
automaticOptionalFacetFilters: ['_searchInternal.concatenatedName'],
},
},
},
Expand Down
16 changes: 3 additions & 13 deletions src/formatPkg.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ export default function formatPkg(pkg) {
: null;

const owner = getOwner(repository, lastPublisher, author); // always favor the repository owner
const badPackage = isBadPackage(owner);
const { computedKeywords, computedMetadata } = getComputedData(cleaned);
const keywords = getKeywords(cleaned);

Expand All @@ -65,7 +64,6 @@ export default function formatPkg(pkg) {
const rawPkg = {
objectID: cleaned.name,
name: cleaned.name,
concatenatedName,
downloadsLast30Days: 0,
downloadsRatio: 0,
humanDownloadsLast30Days: numeral(0).format('0.[0]a'),
Expand All @@ -83,7 +81,6 @@ export default function formatPkg(pkg) {
readme: pkg.readme,
owner,
deprecated: cleaned.deprecated !== undefined ? cleaned.deprecated : false,
badPackage,
homepage: getHomePage(cleaned.homepage, cleaned.repository),
license,
keywords,
Expand All @@ -94,6 +91,9 @@ export default function formatPkg(pkg) {
lastPublisher,
owners: (cleaned.owners || []).map(formatUser),
lastCrawl: new Date().toISOString(),
_searchInternal: {
concatenatedName,
},
};

const totalSize = sizeof(rawPkg);
Expand All @@ -108,16 +108,6 @@ export default function formatPkg(pkg) {
return traverse(rawPkg).forEach(maybeEscape);
}

function isBadPackage(owner) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed this function since npmdoc and npmtest have since been removed from the ecosystem

// the organisations `npmtest` and `npmdoc` are just republishing everything
// this is a total mess, and shouldn't ever be used, because it makes results
// messy. We're ignoring packages by those "authors"
if (owner === 'npmdoc' || owner === 'npmtest') {
return true;
}
return false;
}

function maybeEscape(node) {
if (this.isLeaf && typeof node === 'string') {
if (this.key === 'readme') {
Expand Down
14 changes: 9 additions & 5 deletions src/npm.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,20 @@ export async function getDownloads(pkgs) {
: 0;
const downloadsRatio = downloadsLast30Days / totalNpmDownloads * 100;
const popular = downloadsRatio > c.popularDownloadsRatio;
// if the package is popular, we copy its name to a dedicated attribute
// which will make popular records' `name` matches to be ranked higher than other matches
// see the `searchableAttributes` index setting
const popularAttributes = popular ? { popularName: name } : {};
const downloadsMagnitude = downloadsLast30Days.toString().length;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good simple trick to use the string length :)


return {
...popularAttributes,
downloadsLast30Days,
humanDownloadsLast30Days: numeral(downloadsLast30Days).format('0.[0]a'),
downloadsRatio,
popular,
_searchInternal: {
// if the package is popular, we copy its name to a dedicated attribute
// which will make popular records' `name` matches to be ranked higher than other matches
// see the `searchableAttributes` index setting
...(popular && { popularName: name }),
downloadsMagnitude,
},
};
});
}
Expand Down
6 changes: 6 additions & 0 deletions src/saveDocs.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ function addMetaData(pkgs) {
...downloads[index],
...dependents[index],
...changelogs[index],
_searchInternal: {
...pkg._searchInternal,
...downloads[index]._searchInternal,
...dependents[index]._searchInternal,
...changelogs[index]._searchInternal,
},
}))
);
}