mirror of
https://github.com/searxng/searxng.git
synced 2026-09-12 17:26:05 +00:00
Compare commits
20 Commits
094c33d406
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
401d7f9f51 | ||
|
|
aee33412aa | ||
|
|
79c8ffe0da | ||
|
|
2b1c88c54c | ||
|
|
d226b78bc4 | ||
|
|
bdbf9774f5 | ||
|
|
451c46aa32 | ||
|
|
a30b2d4749 | ||
|
|
9fea41204f | ||
|
|
777ba8fa48 | ||
|
|
a4cb7df053 | ||
|
|
bbb3c7d829 | ||
|
|
f31ff05db3 | ||
|
|
5f4005996e | ||
|
|
487d7a96e0 | ||
|
|
8d3dd0cd45 | ||
|
|
5ffd32ca2f | ||
|
|
374939b888 | ||
|
|
b2da6b90f2 | ||
|
|
36698aff6b |
2
.github/workflows/data-update.yml
vendored
2
.github/workflows/data-update.yml
vendored
@@ -31,7 +31,7 @@ jobs:
|
|||||||
- update_external_bangs.py
|
- update_external_bangs.py
|
||||||
- update_firefox_version.py
|
- update_firefox_version.py
|
||||||
- update_engine_traits.py
|
- update_engine_traits.py
|
||||||
- update_wikidata_units.py
|
- update_wikidata.py
|
||||||
- update_engine_descriptions.py
|
- update_engine_descriptions.py
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
this file is generated automatically by searxng_extra/update/update_pygments.py
|
this file is generated automatically by searxng_extra/update/update_pygments.py
|
||||||
using pygments version 2.20.0:
|
using pygments version 2.21.0:
|
||||||
|
|
||||||
./manage templates.simple.pygments
|
./manage templates.simple.pygments
|
||||||
*/
|
*/
|
||||||
@@ -114,14 +114,14 @@
|
|||||||
.gd { color: #FF4689 } /* Generic.Deleted */
|
.gd { color: #FF4689 } /* Generic.Deleted */
|
||||||
.ge { color: #F8F8F2; font-style: italic } /* Generic.Emph */
|
.ge { color: #F8F8F2; font-style: italic } /* Generic.Emph */
|
||||||
.ges { color: #F8F8F2; font-weight: bold; font-style: italic } /* Generic.EmphStrong */
|
.ges { color: #F8F8F2; font-weight: bold; font-style: italic } /* Generic.EmphStrong */
|
||||||
.gr { color: #F8F8F2 } /* Generic.Error */
|
.gr { color: #FF4689 } /* Generic.Error */
|
||||||
.gh { color: #F8F8F2 } /* Generic.Heading */
|
.gh { color: #F8F8F2 } /* Generic.Heading */
|
||||||
.gi { color: #A6E22E } /* Generic.Inserted */
|
.gi { color: #A6E22E } /* Generic.Inserted */
|
||||||
.go { color: #66D9EF } /* Generic.Output */
|
.go { color: #66D9EF } /* Generic.Output */
|
||||||
.gp { color: #FF4689; font-weight: bold } /* Generic.Prompt */
|
.gp { color: #FF4689; font-weight: bold } /* Generic.Prompt */
|
||||||
.gs { color: #F8F8F2; font-weight: bold } /* Generic.Strong */
|
.gs { color: #F8F8F2; font-weight: bold } /* Generic.Strong */
|
||||||
.gu { color: #959077 } /* Generic.Subheading */
|
.gu { color: #959077 } /* Generic.Subheading */
|
||||||
.gt { color: #F8F8F2 } /* Generic.Traceback */
|
.gt { color: #66D9EF } /* Generic.Traceback */
|
||||||
.kc { color: #66D9EF } /* Keyword.Constant */
|
.kc { color: #66D9EF } /* Keyword.Constant */
|
||||||
.kd { color: #66D9EF } /* Keyword.Declaration */
|
.kd { color: #66D9EF } /* Keyword.Declaration */
|
||||||
.kn { color: #FF4689 } /* Keyword.Namespace */
|
.kn { color: #FF4689 } /* Keyword.Namespace */
|
||||||
@@ -132,7 +132,7 @@
|
|||||||
.m { color: #AE81FF } /* Literal.Number */
|
.m { color: #AE81FF } /* Literal.Number */
|
||||||
.s { color: #E6DB74 } /* Literal.String */
|
.s { color: #E6DB74 } /* Literal.String */
|
||||||
.na { color: #A6E22E } /* Name.Attribute */
|
.na { color: #A6E22E } /* Name.Attribute */
|
||||||
.nb { color: #F8F8F2 } /* Name.Builtin */
|
.nb { color: #A6E22E } /* Name.Builtin */
|
||||||
.nc { color: #A6E22E } /* Name.Class */
|
.nc { color: #A6E22E } /* Name.Class */
|
||||||
.no { color: #66D9EF } /* Name.Constant */
|
.no { color: #66D9EF } /* Name.Constant */
|
||||||
.nd { color: #A6E22E } /* Name.Decorator */
|
.nd { color: #A6E22E } /* Name.Decorator */
|
||||||
@@ -166,7 +166,7 @@
|
|||||||
.sr { color: #E6DB74 } /* Literal.String.Regex */
|
.sr { color: #E6DB74 } /* Literal.String.Regex */
|
||||||
.s1 { color: #E6DB74 } /* Literal.String.Single */
|
.s1 { color: #E6DB74 } /* Literal.String.Single */
|
||||||
.ss { color: #E6DB74 } /* Literal.String.Symbol */
|
.ss { color: #E6DB74 } /* Literal.String.Symbol */
|
||||||
.bp { color: #F8F8F2 } /* Name.Builtin.Pseudo */
|
.bp { color: #A6E22E } /* Name.Builtin.Pseudo */
|
||||||
.fm { color: #A6E22E } /* Name.Function.Magic */
|
.fm { color: #A6E22E } /* Name.Function.Magic */
|
||||||
.vc { color: #F8F8F2 } /* Name.Variable.Class */
|
.vc { color: #F8F8F2 } /* Name.Variable.Class */
|
||||||
.vg { color: #F8F8F2 } /* Name.Variable.Global */
|
.vg { color: #F8F8F2 } /* Name.Variable.Global */
|
||||||
|
|||||||
550
client/simple/package-lock.json
generated
550
client/simple/package-lock.json
generated
@@ -9,18 +9,18 @@
|
|||||||
"version": "0.0.0",
|
"version": "0.0.0",
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ionicons": "^8.0.13",
|
"ionicons": "^8.1.0",
|
||||||
"normalize.css": "8.0.1",
|
"normalize.css": "8.0.1",
|
||||||
"ol": "^10.9.0",
|
"ol": "^10.10.0",
|
||||||
"swiped-events": "1.2.0"
|
"swiped-events": "1.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "2.5.5",
|
"@biomejs/biome": "2.5.9",
|
||||||
"@types/node": "^26.1.1",
|
"@types/node": "^26.2.0",
|
||||||
"browserslist": "^4.28.7",
|
"browserslist": "^4.28.8",
|
||||||
"browserslist-to-esbuild": "^2.1.1",
|
"browserslist-to-esbuild": "^2.1.1",
|
||||||
"edge.js": "^6.5.1",
|
"edge.js": "^6.5.1",
|
||||||
"less": "^4.8.0",
|
"less": "^4.9.0",
|
||||||
"mathjs": "^15.2.0",
|
"mathjs": "^15.2.0",
|
||||||
"sharp": "~0.35.3",
|
"sharp": "~0.35.3",
|
||||||
"sort-package-json": "^4.0.0",
|
"sort-package-json": "^4.0.0",
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
"stylelint-prettier": "^5.0.3",
|
"stylelint-prettier": "^5.0.3",
|
||||||
"svgo": "^4.0.2",
|
"svgo": "^4.0.2",
|
||||||
"typescript": "~7.0.2",
|
"typescript": "~7.0.2",
|
||||||
"vite": "^8.1.5",
|
"vite": "^8.2.1",
|
||||||
"vite-bundle-analyzer": "^1.3.9"
|
"vite-bundle-analyzer": "^1.3.9"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -69,9 +69,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/biome": {
|
"node_modules/@biomejs/biome": {
|
||||||
"version": "2.5.5",
|
"version": "2.5.9",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.5.9.tgz",
|
||||||
"integrity": "sha512-r1S8nFsAG1MY+vJFZALzIvwXAJv6ejDQ0mxP21Tgr9YK3ZFtjrvbBwDdNhx1rUqvccEIeNg20cYCNzl6Cr69pQ==",
|
"integrity": "sha512-KkgCvdHB4IhtpHpF564plA9jo6fDOwWGQ/3jvreLzgOtRLEDoPqr7QO9qejNA8jKwDsSkAKr77hqBHnyUbIw4g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -85,20 +85,20 @@
|
|||||||
"url": "https://opencollective.com/biome"
|
"url": "https://opencollective.com/biome"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@biomejs/cli-darwin-arm64": "2.5.5",
|
"@biomejs/cli-darwin-arm64": "2.5.9",
|
||||||
"@biomejs/cli-darwin-x64": "2.5.5",
|
"@biomejs/cli-darwin-x64": "2.5.9",
|
||||||
"@biomejs/cli-linux-arm64": "2.5.5",
|
"@biomejs/cli-linux-arm64": "2.5.9",
|
||||||
"@biomejs/cli-linux-arm64-musl": "2.5.5",
|
"@biomejs/cli-linux-arm64-musl": "2.5.9",
|
||||||
"@biomejs/cli-linux-x64": "2.5.5",
|
"@biomejs/cli-linux-x64": "2.5.9",
|
||||||
"@biomejs/cli-linux-x64-musl": "2.5.5",
|
"@biomejs/cli-linux-x64-musl": "2.5.9",
|
||||||
"@biomejs/cli-win32-arm64": "2.5.5",
|
"@biomejs/cli-win32-arm64": "2.5.9",
|
||||||
"@biomejs/cli-win32-x64": "2.5.5"
|
"@biomejs/cli-win32-x64": "2.5.9"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-darwin-arm64": {
|
"node_modules/@biomejs/cli-darwin-arm64": {
|
||||||
"version": "2.5.5",
|
"version": "2.5.9",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.5.9.tgz",
|
||||||
"integrity": "sha512-kUrAhXVWUrwmAUnV2iXSK7umxKFysTwvqK+Ty6ptUcLY/7T3SnCAjUowE4uvwaEej6nXZ7hu/dTtbokKdsPeag==",
|
"integrity": "sha512-am22pX2aBqznqq1eMyIj/bZ++riF3Lk6ct7cbv+gQK0csFhr+d8O0RkOi2FF2qSgFgANbqNkIZ0/PxlnW2pLFg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -113,9 +113,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-darwin-x64": {
|
"node_modules/@biomejs/cli-darwin-x64": {
|
||||||
"version": "2.5.5",
|
"version": "2.5.9",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.5.9.tgz",
|
||||||
"integrity": "sha512-DamiYc5bUYZ2uxlfc+RLEPtz1Abb6PO5eTbOkufLpSGwd/7AMQAdxhFYiXmwwkJL8IsT8S7GvdgwDHqaMFAvKw==",
|
"integrity": "sha512-l44KWDHLDvEnD0N/XcrVs7VXb3A18xL7QS3WB0eL93wbmk529ffIG55vleGCqaunpRUjLrdnjK05Qki1dsjylg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -130,9 +130,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-linux-arm64": {
|
"node_modules/@biomejs/cli-linux-arm64": {
|
||||||
"version": "2.5.5",
|
"version": "2.5.9",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.5.9.tgz",
|
||||||
"integrity": "sha512-lRKF/pH/1RiYiBKExi3TCZVAtvzEm77aifrvcNiDFrR9WxeAnDUjDnseb6y2XV85mjitLs6SILGm2XG77cHtSQ==",
|
"integrity": "sha512-ICaK+IYaVZvKbBxX2rwrPT0DdUDMnE9Vm3nQGe+mltQPmUg19pONzkPWGdY4FCsoreDETWDynvdt4ysCbF5gNQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -150,9 +150,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-linux-arm64-musl": {
|
"node_modules/@biomejs/cli-linux-arm64-musl": {
|
||||||
"version": "2.5.5",
|
"version": "2.5.9",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.5.9.tgz",
|
||||||
"integrity": "sha512-U4WMl/sy/E/Q73vf15VspakLRRs2LDFcCeBxJnQfXzssb88zpV6PJPaQ3ezhQ7H6Ht2/8bvuZeHgJWzmoxllZg==",
|
"integrity": "sha512-7ImVPwBLCtkmpR5esd8RHhTqW94f0JLJQum6AneYcy94jRm18TaPPm7slaigGzFhfgt3QiD1Vj52LKmBAnKizA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -170,9 +170,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-linux-x64": {
|
"node_modules/@biomejs/cli-linux-x64": {
|
||||||
"version": "2.5.5",
|
"version": "2.5.9",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.5.9.tgz",
|
||||||
"integrity": "sha512-H/O39nJEw/2Zm/fm7hrmxxoF8kK/aU1uCoPp70ruXVbomaAdLpJJnCmL11Q2JotT8QVHH06So04Oq53lCSwSwQ==",
|
"integrity": "sha512-z22Q/zFYSvbIJfW1CbfZPu4X8PddS6Qd2ORbc6h+aT6EcwAxUF3m6fA4HjNvA3TU4X0dTJRwNPB165ES3PJXzg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -190,9 +190,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-linux-x64-musl": {
|
"node_modules/@biomejs/cli-linux-x64-musl": {
|
||||||
"version": "2.5.5",
|
"version": "2.5.9",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.5.9.tgz",
|
||||||
"integrity": "sha512-m7wC7tjX5Lrmo69dc4md8FeKpPU1NTCY1v7xUoQQ2vadWwNnBS0KZOG8471otFPHrTHihQJAjQPgMObpLvDe6A==",
|
"integrity": "sha512-RXGaD0o1/pTTguYw1aeDJh9ad6Lfrui0fI7mBderTyGr7WuUJkBIttgLkR3XJyoxOkkgfBDspaUT8wXArTqLZw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -210,9 +210,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-win32-arm64": {
|
"node_modules/@biomejs/cli-win32-arm64": {
|
||||||
"version": "2.5.5",
|
"version": "2.5.9",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.5.9.tgz",
|
||||||
"integrity": "sha512-7BryINPuYypLUAH3o/o5ZdgomJ4zn3EDR0ChZJst7n32S6ZhKbgHXuYydLu+YAnx59ehGFR0z/MG6qnzQi3Yyw==",
|
"integrity": "sha512-nHK+/HHC+D0ogAHUxomgoSTdjImb6fmNNVTKmf0tyu4eDL1DqPKIHc+i+UL8+b0RnAu8224qo8F2tCVnaT0A3w==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -227,9 +227,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@biomejs/cli-win32-x64": {
|
"node_modules/@biomejs/cli-win32-x64": {
|
||||||
"version": "2.5.5",
|
"version": "2.5.9",
|
||||||
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.5.5.tgz",
|
"resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.5.9.tgz",
|
||||||
"integrity": "sha512-bIBFo+n6MIxdNcVFy5CrurbKiZQiUciK3bt8+O9I4wjFZNTfXLpi+giq47522eXqW5NBc9ulx7dR1SlZKi2J5g==",
|
"integrity": "sha512-Yiq0H56LjXSSw/hd9YkXgSLQfzyDJzbzU2TezozxyNw+uKWAqOtqGVvBfzKRRDiaFF5avGAhHdWKx7LtDOShUw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -429,40 +429,6 @@
|
|||||||
"postcss-selector-parser": "^7.1.1"
|
"postcss-selector-parser": "^7.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@emnapi/core": {
|
|
||||||
"version": "1.11.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz",
|
|
||||||
"integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@emnapi/wasi-threads": "1.2.2",
|
|
||||||
"tslib": "^2.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@emnapi/runtime": {
|
|
||||||
"version": "1.11.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz",
|
|
||||||
"integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@emnapi/wasi-threads": {
|
|
||||||
"version": "1.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
|
|
||||||
"integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@img/colour": {
|
"node_modules/@img/colour": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz",
|
||||||
@@ -1073,25 +1039,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@napi-rs/wasm-runtime": {
|
|
||||||
"version": "1.1.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz",
|
|
||||||
"integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@tybys/wasm-util": "^0.10.3"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "github",
|
|
||||||
"url": "https://github.com/sponsors/Brooooooklyn"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@emnapi/core": "^1.7.1",
|
|
||||||
"@emnapi/runtime": "^1.7.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@nodelib/fs.scandir": {
|
"node_modules/@nodelib/fs.scandir": {
|
||||||
"version": "2.1.5",
|
"version": "2.1.5",
|
||||||
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
|
||||||
@@ -1131,9 +1078,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@oxc-project/types": {
|
"node_modules/@oxc-project/types": {
|
||||||
"version": "0.139.0",
|
"version": "0.144.0",
|
||||||
"resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.139.0.tgz",
|
"resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.144.0.tgz",
|
||||||
"integrity": "sha512-r9gHphtCs+1M7J0pw6Sn/hh/Wpa/iQrOOkrNAlVLF/gHq+/CJmHIWKKUUhdWjcD6CIa8idarspCsASiXCXvFUw==",
|
"integrity": "sha512-nuhZIOLuI6TFQ32I/WnUx+SCPY7SdSKwgnFHydAuoS1+Z4BRcaP+RRJmGzl9lw+0OFF7UmaESf7KQRXaNLHypg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"funding": {
|
"funding": {
|
||||||
@@ -1215,9 +1162,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-android-arm64": {
|
"node_modules/@rolldown/binding-android-arm64": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.4.tgz",
|
||||||
"integrity": "sha512-lZg8fqIv2v7FF237bwMgzGZEJvGL79/s5knJ/i6FmsGF4XXlzccZ4jb+TrFIxtSSxFtIpdsgrPZeMk1I9AFcyQ==",
|
"integrity": "sha512-jHC2cnyKz5xU2fhECtFl8OZ83cYNt13GZQD+0uMJ/X3o+ijmd56okHhTUwxVSHPx1IRVIJEZ1/1pPzeLCU6XKA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1232,9 +1179,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-darwin-arm64": {
|
"node_modules/@rolldown/binding-darwin-arm64": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.4.tgz",
|
||||||
"integrity": "sha512-51Bnx9pNiMRKSUNtBfySkNJ9vMU9Hh3I1ozDd6gyPPYzaXCfnptUcEZxXGYFn+ul2dtcMUiqGR1Yai2K10uoTw==",
|
"integrity": "sha512-Dc5mPD8F5F/FS8i01syd7FTF6yB2fVthH/TRkjwJkzUK6EpoxHtqvZQP5Zwq80/5z19TWYHIg1KOHboCgVx/aQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1249,9 +1196,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-darwin-x64": {
|
"node_modules/@rolldown/binding-darwin-x64": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.4.tgz",
|
||||||
"integrity": "sha512-Tm+gbfC0aHu1tBA/JvKQh32S0K6YgCHkiAF4/W6xX0K0RmNuc94VeK419dJoE65R5aRxmo+noZQSWrAMF6yb6g==",
|
"integrity": "sha512-fpDm4oBo6SqLvWUYCmFhdde3U9KH2fRNNMeAnAPAIwxRL345xutL0EtEUcuoxsoazdJGv/MuDBQHlCDrtbvqOg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1266,9 +1213,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-freebsd-x64": {
|
"node_modules/@rolldown/binding-freebsd-x64": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.4.tgz",
|
||||||
"integrity": "sha512-JMzDKCCXq93YccG5gz3hvOs1oXRKAf0XYpfOS88e+wZrC8Iugj6j68867vrYZkvpDDpKn/KoKORThmchMpF6TA==",
|
"integrity": "sha512-rSJoreDE/HoIzoaib6MTp5jQtCTdMHKIvItAKT/ImS6Y6Ww76oUaeMyp4Vc/fAgd/ehji068IxetHXAnqUwN9A==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1283,9 +1230,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-linux-arm-gnueabihf": {
|
"node_modules/@rolldown/binding-linux-arm-gnueabihf": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.4.tgz",
|
||||||
"integrity": "sha512-uML21j2K5TfPGutKxub+M+nLjZIrWjXQ5Grx4lCe/nimTj9B4L63zHpjXLl4y0L3mcm2htEQIb06oCG/szerNw==",
|
"integrity": "sha512-/jm8OGHgn7oGaJu3i/qZI9spUGcJ+y/lk43ttQ/iO1tOd9NissG6o97bighBCiL+BKRngmcDuR6ikfwYdJmVuQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
@@ -1300,9 +1247,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-linux-arm64-gnu": {
|
"node_modules/@rolldown/binding-linux-arm64-gnu": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.4.tgz",
|
||||||
"integrity": "sha512-navSiuTMogvnQoZoM/v+l3ZWo50/NTwSHSzheABx/RCnmUPaKwq9qSo4Br2OYRs21+Fz8uFqITZM3H4opOB0/Q==",
|
"integrity": "sha512-tIP06BeD9EqvECBrPZ+sqdPlYrT+aYaAiu1wYziVx5elRK/ftm33JxVDy2bXGbr6J0CrtirCkR87/X5a2euEng==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1320,9 +1267,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-linux-arm64-musl": {
|
"node_modules/@rolldown/binding-linux-arm64-musl": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.4.tgz",
|
||||||
"integrity": "sha512-lAryqH7IteztmCXQXk0etKj4wBQ7Gx5S6LjKhsgp9zb8I5bsuvU/2llH1hDQcjsFeqIsovMVN339/8pUDDBXxA==",
|
"integrity": "sha512-Ql1Q0EQqVThvn9VAVlwNzsUvbSFtCMGjLpRRi4pk5i7NZZ4n5ISiLMjHYtus4VQ2PvkSw24zyaCVsiS+sXPj1w==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1340,9 +1287,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-linux-ppc64-gnu": {
|
"node_modules/@rolldown/binding-linux-ppc64-gnu": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.4.tgz",
|
||||||
"integrity": "sha512-fsK/sNBnxzBlL4O1JNrZakVQxPspqpED5dLtNsZS9oOKmtSpdNIzxH2kkol5HYTWJN47sE20ztMJPxfZ89qGOg==",
|
"integrity": "sha512-GjbjXD4XXfN19D0LZNbmiCBUoDiRACsYHr0yaIbbn8aFsXjHZifcYqu/W5Er5X2X990WjHXFrxarn5chzItorQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"ppc64"
|
"ppc64"
|
||||||
],
|
],
|
||||||
@@ -1360,9 +1307,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-linux-s390x-gnu": {
|
"node_modules/@rolldown/binding-linux-s390x-gnu": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.4.tgz",
|
||||||
"integrity": "sha512-gLYb4BIadlfTOYT5gO503n8zQjXflgzpD0FcyKh0Mzx3rqCZKnHoJWV9xe1KXUJ5lx2JfcSHr/mhzS0PC/McAA==",
|
"integrity": "sha512-p5WR0NOwaRmJ/B1b6IjEFLLivwEsf3PrdBIhRbhTCQisbo2SvHHpG4ELB/+FgQNnB88LTOF86upmJmbvZdQ2lw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"s390x"
|
"s390x"
|
||||||
],
|
],
|
||||||
@@ -1380,9 +1327,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-linux-x64-gnu": {
|
"node_modules/@rolldown/binding-linux-x64-gnu": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.4.tgz",
|
||||||
"integrity": "sha512-FjcpEKUyJygHgs1o50VYNvkt5+7Le/VEdYt0AkRpkL33MnyQfwr8l5mXwMmfmTbyMPr5vJLC+8/Gd9gXnwU1QQ==",
|
"integrity": "sha512-4/GyVjmhR+Tc6HLJvwc1sOhPqAZtySiSMesOZyX6JQ5XBxoTDEMKQzvo07NIK6nTon/SivlZqvhzvuVBNQhObQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1400,9 +1347,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-linux-x64-musl": {
|
"node_modules/@rolldown/binding-linux-x64-musl": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.4.tgz",
|
||||||
"integrity": "sha512-Me+PfPI2TMeOQk0gYWfLQZtTktrmzbr8cDboqX83XKc7UrgAi55gF+2dUkWdxd19n55Essp2yeca+O9N5rBxHg==",
|
"integrity": "sha512-l9eeLsCNvPpmSXUej0etw/J1eqV0Jj1D5G/xG6YTijmE6dkv6E2QezgWbTfQk63v952DPqrjOCoiqxq7Bw0YUQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1420,9 +1367,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-openharmony-arm64": {
|
"node_modules/@rolldown/binding-openharmony-arm64": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.4.tgz",
|
||||||
"integrity": "sha512-yc5WrLzXks6zCQfn9Oxr8pORKyl/pF+QjHmW/Qx3qu0oyrrNC+y2JLTU1E2rcWYAmzlnqngWXHQjy51VzW70Vw==",
|
"integrity": "sha512-e0F355MSTMm3+UOqtV3L24gFUp2N5m1f8L/7d56deik6va+AXdrt9F8LbzGpeWGWRbZEDq4m8NVnJDeBtf9DZg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1436,29 +1383,10 @@
|
|||||||
"node": "^20.19.0 || >=22.12.0"
|
"node": "^20.19.0 || >=22.12.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-wasm32-wasi": {
|
|
||||||
"version": "1.1.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.5.tgz",
|
|
||||||
"integrity": "sha512-VbQGPX2b4r48TAMIM2cjgluIM1HYutm4pcTEJsle7iEP7sB1dFqtPLBVbdLAZCxy1txCcPxf4QFf4v8uvltPqA==",
|
|
||||||
"cpu": [
|
|
||||||
"wasm32"
|
|
||||||
],
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@emnapi/core": "1.11.1",
|
|
||||||
"@emnapi/runtime": "1.11.1",
|
|
||||||
"@napi-rs/wasm-runtime": "^1.1.6"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "^20.19.0 || >=22.12.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@rolldown/binding-win32-arm64-msvc": {
|
"node_modules/@rolldown/binding-win32-arm64-msvc": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.4.tgz",
|
||||||
"integrity": "sha512-gHv82k63z4qpV5+Q1y/12KrK0ltWBukVDI8nZcbT7Tt/ZlOIVwppazneq0F93oDxTo3IgAMEDIoQh3E2n6mVsw==",
|
"integrity": "sha512-AWLi0uBRYh6QlE7OKhiz+phZC0qwtij2QZmhmOdsLdFn64m7oMpooE9ICE3lhm9xMb4SpDo2WbHcxX1iFLFtqw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -1473,9 +1401,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rolldown/binding-win32-x64-msvc": {
|
"node_modules/@rolldown/binding-win32-x64-msvc": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.4.tgz",
|
||||||
"integrity": "sha512-tTZuDBPw85tEN5PQi1pnEBzDy0Z49HtScLAbD5t6hyeU92A95pRWaSMw1GZZi/RwgSgUIl0xrSlXIT/9QzvYSA==",
|
"integrity": "sha512-UwSDJOg3dqCAejWdxclJjCsh3Qq4vLYMDxmyHqo1btz3stK2VqgwNd3mm5tuIwzSlGIQ/1H9Hr+Zn09mrezNqQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -1529,6 +1457,9 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
|
"libc": [
|
||||||
|
"glibc"
|
||||||
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1542,6 +1473,9 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
|
"libc": [
|
||||||
|
"musl"
|
||||||
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1555,6 +1489,9 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
|
"libc": [
|
||||||
|
"glibc"
|
||||||
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1568,6 +1505,9 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
|
"libc": [
|
||||||
|
"musl"
|
||||||
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1614,9 +1554,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@stencil/core": {
|
"node_modules/@stencil/core": {
|
||||||
"version": "4.43.4",
|
"version": "4.44.0",
|
||||||
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.43.4.tgz",
|
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.44.0.tgz",
|
||||||
"integrity": "sha512-QWawMM1XIpSz4k+k+VyHZMr2YSxlCNAPWO/jTdJ+2kdgdN7ZQVEFZpc4WBm3E3mrDPTZ79lLcnIPa399bg4XOg==",
|
"integrity": "sha512-A3kArg+80t9zJdul7FLUcxcjqvYrF76nDavfm2L8R7hGKWPbTTGM/tkOSf7MJqMd1ED0ztYoa9X90UlEXY3nLA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"bin": {
|
"bin": {
|
||||||
"stencil": "bin/stencil"
|
"stencil": "bin/stencil"
|
||||||
@@ -1636,21 +1576,10 @@
|
|||||||
"@rollup/rollup-win32-x64-msvc": "4.44.0"
|
"@rollup/rollup-win32-x64-msvc": "4.44.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@tybys/wasm-util": {
|
|
||||||
"version": "0.10.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
|
|
||||||
"integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "26.1.1",
|
"version": "26.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-26.2.0.tgz",
|
||||||
"integrity": "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw==",
|
"integrity": "sha512-5IviulTZeRNp2vAJ514cc/HUlY5nZ9fCbq9DMyC52BrhFZACo3nI0R7qBxhQmo/d27NFe96ur/b7Wwxklda+kg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -2107,9 +2036,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/baseline-browser-mapping": {
|
"node_modules/baseline-browser-mapping": {
|
||||||
"version": "2.11.1",
|
"version": "2.11.14",
|
||||||
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.1.tgz",
|
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.14.tgz",
|
||||||
"integrity": "sha512-HYXq73DDpCtNzOmrFsm9eSwCvWCql0RzqjpDzXN9EadiLJ4DNat0nsZ/Bzmy+Ud12mb4/zKDY0cQ805ZzN+i0A==",
|
"integrity": "sha512-JyJ954WzuIR8/FFzX0o5krdSTrBAkcCSRfWSleRsIHSWV+cZe2FI1PKggVkFke1hBldRs+LRxUczzE9iPmgZww==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -2140,9 +2069,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/browserslist": {
|
"node_modules/browserslist": {
|
||||||
"version": "4.28.7",
|
"version": "4.28.8",
|
||||||
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz",
|
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.8.tgz",
|
||||||
"integrity": "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==",
|
"integrity": "sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -2160,11 +2089,11 @@
|
|||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"baseline-browser-mapping": "^2.10.44",
|
"baseline-browser-mapping": "^2.11.12",
|
||||||
"caniuse-lite": "^1.0.30001806",
|
"caniuse-lite": "^1.0.30001809",
|
||||||
"electron-to-chromium": "^1.5.393",
|
"electron-to-chromium": "^1.5.402",
|
||||||
"node-releases": "^2.0.51",
|
"node-releases": "^2.0.53",
|
||||||
"update-browserslist-db": "^1.2.3"
|
"update-browserslist-db": "^1.3.0"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"browserslist": "cli.js"
|
"browserslist": "cli.js"
|
||||||
@@ -2217,9 +2146,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/caniuse-lite": {
|
"node_modules/caniuse-lite": {
|
||||||
"version": "1.0.30001806",
|
"version": "1.0.30001809",
|
||||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz",
|
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001809.tgz",
|
||||||
"integrity": "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==",
|
"integrity": "sha512-xxWVywk6a6Arlk+hymeycyn/VgqEfLDxupvhH/xiY5SJ/18kmi9o6MiO320DCUzypORHLtvh0I4i04tUhCNHNQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -2635,9 +2564,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/electron-to-chromium": {
|
"node_modules/electron-to-chromium": {
|
||||||
"version": "1.5.396",
|
"version": "1.5.406",
|
||||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.396.tgz",
|
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.406.tgz",
|
||||||
"integrity": "sha512-yHiw2Y3C3H9U6TMbOfoWK/BPreiOPXRfTWPBwQBoZG6/8TB6eOPnsy5oaRYuatR7Fw2SJ4kKforgufeo7fq0EQ==",
|
"integrity": "sha512-hWH5ORBi3d0IipnMh7BN5GDTaAmrSSSWmznwt2zltdiRNEWoEQyTwF0FFSBxzHO7hLSRT6loQu3IQGV0wg/Tvg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
@@ -2881,9 +2810,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/geotiff": {
|
"node_modules/geotiff": {
|
||||||
"version": "3.0.5",
|
"version": "3.1.0-beta.0",
|
||||||
"resolved": "https://registry.npmjs.org/geotiff/-/geotiff-3.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/geotiff/-/geotiff-3.1.0-beta.0.tgz",
|
||||||
"integrity": "sha512-OWcL9S9+yDZ6iAlXMt32T1iwUApJM8UiD47xbm6ZP1h33d10fqkPs14EG/ttT5EnefpZSx3G15iDFC5FxUNUwA==",
|
"integrity": "sha512-wbVwOaQYuN+ywly5NoMXn37nHslwkQg5EFHqMeUTtjDACrSag0EEVlFsc+2DK3Pzmmp6XzJW2RTZOamPsBM6ng==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@petamoriken/float16": "^3.9.3",
|
"@petamoriken/float16": "^3.9.3",
|
||||||
@@ -3115,12 +3044,12 @@
|
|||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/ionicons": {
|
"node_modules/ionicons": {
|
||||||
"version": "8.0.13",
|
"version": "8.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-8.0.13.tgz",
|
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-8.1.0.tgz",
|
||||||
"integrity": "sha512-2QQVyG2P4wszne79jemMjWYLp0DBbDhr4/yFroPCxvPP1wtMxgdIV3l5n+XZ5E9mgoXU79w7yTWpm2XzJsISxQ==",
|
"integrity": "sha512-XSM2gYWTXxSYTwjmKWAoy4yR7AbAFDjpc5ZIivAiGXskM0fe5CdMPfs6InQRUcrYtVb2WZ/0HQ1/jeh3JW78SA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@stencil/core": "^4.35.3"
|
"@stencil/core": "^4.43.5"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/is-arrayish": {
|
"node_modules/is-arrayish": {
|
||||||
@@ -3304,9 +3233,9 @@
|
|||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/less": {
|
"node_modules/less": {
|
||||||
"version": "4.8.0",
|
"version": "4.9.0",
|
||||||
"resolved": "https://registry.npmjs.org/less/-/less-4.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/less/-/less-4.9.0.tgz",
|
||||||
"integrity": "sha512-7Y7DJBMbsW29UGjOG6NGvxQEx71AaDcrryBwYCMaFwn0kj8FkSueKN9r9WexVOetKEhXh38kL++WJncfkEpS+g==",
|
"integrity": "sha512-umRhrCH7fCi8Uj2RcwKjJdvUORTjeWqkdKx0LbcZvjIwsAVsnIAGcxHaqowPeBFBjQuWOeC/bve0AlpFzF/+SQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -3330,9 +3259,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss": {
|
"node_modules/lightningcss": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz",
|
||||||
"integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
|
"integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -3346,23 +3275,23 @@
|
|||||||
"url": "https://opencollective.com/parcel"
|
"url": "https://opencollective.com/parcel"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"lightningcss-android-arm64": "1.32.0",
|
"lightningcss-android-arm64": "1.33.0",
|
||||||
"lightningcss-darwin-arm64": "1.32.0",
|
"lightningcss-darwin-arm64": "1.33.0",
|
||||||
"lightningcss-darwin-x64": "1.32.0",
|
"lightningcss-darwin-x64": "1.33.0",
|
||||||
"lightningcss-freebsd-x64": "1.32.0",
|
"lightningcss-freebsd-x64": "1.33.0",
|
||||||
"lightningcss-linux-arm-gnueabihf": "1.32.0",
|
"lightningcss-linux-arm-gnueabihf": "1.33.0",
|
||||||
"lightningcss-linux-arm64-gnu": "1.32.0",
|
"lightningcss-linux-arm64-gnu": "1.33.0",
|
||||||
"lightningcss-linux-arm64-musl": "1.32.0",
|
"lightningcss-linux-arm64-musl": "1.33.0",
|
||||||
"lightningcss-linux-x64-gnu": "1.32.0",
|
"lightningcss-linux-x64-gnu": "1.33.0",
|
||||||
"lightningcss-linux-x64-musl": "1.32.0",
|
"lightningcss-linux-x64-musl": "1.33.0",
|
||||||
"lightningcss-win32-arm64-msvc": "1.32.0",
|
"lightningcss-win32-arm64-msvc": "1.33.0",
|
||||||
"lightningcss-win32-x64-msvc": "1.32.0"
|
"lightningcss-win32-x64-msvc": "1.33.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-android-arm64": {
|
"node_modules/lightningcss-android-arm64": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz",
|
||||||
"integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
|
"integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -3381,9 +3310,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-darwin-arm64": {
|
"node_modules/lightningcss-darwin-arm64": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz",
|
||||||
"integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
|
"integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -3402,9 +3331,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-darwin-x64": {
|
"node_modules/lightningcss-darwin-x64": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz",
|
||||||
"integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
|
"integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -3423,9 +3352,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-freebsd-x64": {
|
"node_modules/lightningcss-freebsd-x64": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz",
|
||||||
"integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
|
"integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -3444,9 +3373,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-linux-arm-gnueabihf": {
|
"node_modules/lightningcss-linux-arm-gnueabihf": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz",
|
||||||
"integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
|
"integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
@@ -3465,13 +3394,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-linux-arm64-gnu": {
|
"node_modules/lightningcss-linux-arm64-gnu": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz",
|
||||||
"integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
|
"integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"libc": [
|
||||||
|
"glibc"
|
||||||
|
],
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -3486,13 +3418,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-linux-arm64-musl": {
|
"node_modules/lightningcss-linux-arm64-musl": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz",
|
||||||
"integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
|
"integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"libc": [
|
||||||
|
"musl"
|
||||||
|
],
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -3507,13 +3442,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-linux-x64-gnu": {
|
"node_modules/lightningcss-linux-x64-gnu": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz",
|
||||||
"integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
|
"integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"libc": [
|
||||||
|
"glibc"
|
||||||
|
],
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -3528,13 +3466,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-linux-x64-musl": {
|
"node_modules/lightningcss-linux-x64-musl": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz",
|
||||||
"integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
|
"integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"libc": [
|
||||||
|
"musl"
|
||||||
|
],
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -3549,9 +3490,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-win32-arm64-msvc": {
|
"node_modules/lightningcss-win32-arm64-msvc": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz",
|
||||||
"integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
|
"integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
@@ -3570,9 +3511,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lightningcss-win32-x64-msvc": {
|
"node_modules/lightningcss-win32-x64-msvc": {
|
||||||
"version": "1.32.0",
|
"version": "1.33.0",
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
|
"resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz",
|
||||||
"integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
|
"integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==",
|
||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
@@ -3727,9 +3668,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/nanoid": {
|
"node_modules/nanoid": {
|
||||||
"version": "3.3.16",
|
"version": "3.3.18",
|
||||||
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
|
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz",
|
||||||
"integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==",
|
"integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -3764,9 +3705,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/node-releases": {
|
"node_modules/node-releases": {
|
||||||
"version": "2.0.51",
|
"version": "2.0.53",
|
||||||
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.51.tgz",
|
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.53.tgz",
|
||||||
"integrity": "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==",
|
"integrity": "sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -3812,15 +3753,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/ol": {
|
"node_modules/ol": {
|
||||||
"version": "10.9.0",
|
"version": "10.10.0",
|
||||||
"resolved": "https://registry.npmjs.org/ol/-/ol-10.9.0.tgz",
|
"resolved": "https://registry.npmjs.org/ol/-/ol-10.10.0.tgz",
|
||||||
"integrity": "sha512-svbbgVQUmEHaKpLQ8kRySojs59Brvgl2zYIrqG9eQNXGfsbi55rQasZIDpwpQzDL6OlzrUb0H4hQaiX9wDoGmA==",
|
"integrity": "sha512-tLPKn6zl+6uWdPufYlqG/lQzuVUTVmfwahQqVr5+wZNyZecyAtIhMTyOtKpu7ooNDLY2sEjKZNXw9HL+sOjC1A==",
|
||||||
"license": "BSD-2-Clause",
|
"license": "BSD-2-Clause",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/rbush": "4.0.0",
|
"@types/rbush": "4.0.0",
|
||||||
"earcut": "^3.0.0",
|
"earcut": "^3.0.0",
|
||||||
"geotiff": "^3.0.5 || ^3.1.0-beta.0",
|
"geotiff": "^3.1.0-beta.0",
|
||||||
"pbf": "4.0.1",
|
"pbf": "5.1.2",
|
||||||
"rbush": "^4.0.0",
|
"rbush": "^4.0.0",
|
||||||
"zarrita": "^0.7.1"
|
"zarrita": "^0.7.1"
|
||||||
},
|
},
|
||||||
@@ -3830,9 +3771,19 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/pako": {
|
"node_modules/pako": {
|
||||||
"version": "2.1.0",
|
"version": "2.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/pako/-/pako-2.2.0.tgz",
|
||||||
"integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
|
"integrity": "sha512-zJq6RP/5q+TO2OpFV3FHzlPnFjmkb7Nc99a5SNjJE+uu/PkpChs+NIZSSzbBoD+6kjiISXjfYdwj1ZRQ81dz/w==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/puzrin"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/nodeca"
|
||||||
|
}
|
||||||
|
],
|
||||||
"license": "(MIT AND Zlib)"
|
"license": "(MIT AND Zlib)"
|
||||||
},
|
},
|
||||||
"node_modules/parent-module": {
|
"node_modules/parent-module": {
|
||||||
@@ -3884,9 +3835,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/pbf": {
|
"node_modules/pbf": {
|
||||||
"version": "4.0.1",
|
"version": "5.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/pbf/-/pbf-5.1.2.tgz",
|
||||||
"integrity": "sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==",
|
"integrity": "sha512-mnvGdvOrIvJOBGUEdGkrVXjN8E/VkIJCkf2eS1DH2yv82ORUlLttmDt0rWY38yYZmVwciZwBUvHM20qxBZf40w==",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"resolve-protobuf-schema": "^2.1.0"
|
"resolve-protobuf-schema": "^2.1.0"
|
||||||
@@ -3926,9 +3877,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/postcss": {
|
"node_modules/postcss": {
|
||||||
"version": "8.5.22",
|
"version": "8.5.26",
|
||||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.22.tgz",
|
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz",
|
||||||
"integrity": "sha512-KBDEIpLrvpv16pp3K0Fw+UCoZfopFjjgeB+0tA/aaThfEE74kKDLrgg603YvOWJyg3+WYtyq3xYsQWsIyZlPqQ==",
|
"integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -3946,7 +3897,7 @@
|
|||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"nanoid": "^3.3.16",
|
"nanoid": "^3.3.17",
|
||||||
"picocolors": "^1.1.1",
|
"picocolors": "^1.1.1",
|
||||||
"source-map-js": "^1.2.1"
|
"source-map-js": "^1.2.1"
|
||||||
},
|
},
|
||||||
@@ -4259,13 +4210,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/rolldown": {
|
"node_modules/rolldown": {
|
||||||
"version": "1.1.5",
|
"version": "1.2.4",
|
||||||
"resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.4.tgz",
|
||||||
"integrity": "sha512-t9z29cJjXf/vxQ8dyhCSpt6H6aSwHTk8cT5I3iy6SMXuFpk5mB6PL6XfC8PCwrPTx93udwKUm9HRteAlTGBLiA==",
|
"integrity": "sha512-rSr7irW0K7QRWzjdJXqZowkcRdDtjRduh43rBltnVKd0VFq839l1lJoDvGJb6gl7+4rTTCrPWu+YfujUL8Ug7w==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@oxc-project/types": "=0.139.0",
|
"@oxc-project/types": "=0.144.0",
|
||||||
"@rolldown/pluginutils": "^1.0.0"
|
"@rolldown/pluginutils": "^1.0.0"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -4275,21 +4226,20 @@
|
|||||||
"node": "^20.19.0 || >=22.12.0"
|
"node": "^20.19.0 || >=22.12.0"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@rolldown/binding-android-arm64": "1.1.5",
|
"@rolldown/binding-android-arm64": "1.2.4",
|
||||||
"@rolldown/binding-darwin-arm64": "1.1.5",
|
"@rolldown/binding-darwin-arm64": "1.2.4",
|
||||||
"@rolldown/binding-darwin-x64": "1.1.5",
|
"@rolldown/binding-darwin-x64": "1.2.4",
|
||||||
"@rolldown/binding-freebsd-x64": "1.1.5",
|
"@rolldown/binding-freebsd-x64": "1.2.4",
|
||||||
"@rolldown/binding-linux-arm-gnueabihf": "1.1.5",
|
"@rolldown/binding-linux-arm-gnueabihf": "1.2.4",
|
||||||
"@rolldown/binding-linux-arm64-gnu": "1.1.5",
|
"@rolldown/binding-linux-arm64-gnu": "1.2.4",
|
||||||
"@rolldown/binding-linux-arm64-musl": "1.1.5",
|
"@rolldown/binding-linux-arm64-musl": "1.2.4",
|
||||||
"@rolldown/binding-linux-ppc64-gnu": "1.1.5",
|
"@rolldown/binding-linux-ppc64-gnu": "1.2.4",
|
||||||
"@rolldown/binding-linux-s390x-gnu": "1.1.5",
|
"@rolldown/binding-linux-s390x-gnu": "1.2.4",
|
||||||
"@rolldown/binding-linux-x64-gnu": "1.1.5",
|
"@rolldown/binding-linux-x64-gnu": "1.2.4",
|
||||||
"@rolldown/binding-linux-x64-musl": "1.1.5",
|
"@rolldown/binding-linux-x64-musl": "1.2.4",
|
||||||
"@rolldown/binding-openharmony-arm64": "1.1.5",
|
"@rolldown/binding-openharmony-arm64": "1.2.4",
|
||||||
"@rolldown/binding-wasm32-wasi": "1.1.5",
|
"@rolldown/binding-win32-arm64-msvc": "1.2.4",
|
||||||
"@rolldown/binding-win32-arm64-msvc": "1.1.5",
|
"@rolldown/binding-win32-x64-msvc": "1.2.4"
|
||||||
"@rolldown/binding-win32-x64-msvc": "1.1.5"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/run-parallel": {
|
"node_modules/run-parallel": {
|
||||||
@@ -5056,9 +5006,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/update-browserslist-db": {
|
"node_modules/update-browserslist-db": {
|
||||||
"version": "1.2.3",
|
"version": "1.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
|
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.1.tgz",
|
||||||
"integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
|
"integrity": "sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -5094,16 +5044,16 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/vite": {
|
"node_modules/vite": {
|
||||||
"version": "8.1.5",
|
"version": "8.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/vite/-/vite-8.1.5.tgz",
|
"resolved": "https://registry.npmjs.org/vite/-/vite-8.2.1.tgz",
|
||||||
"integrity": "sha512-7ULLwsCdYx/nRyrpiEwvqb5TFHrMVZyBt+rg/OAXT7rgj/z+DtTDyKFeLAdDkubDVDKD8jOsndmy7m55XcfUsw==",
|
"integrity": "sha512-EU/eS7BH3XROHh2YnBefjM6DBKA6ZeMZEYQbj7NLWg5wHYlhB8B/Mayd5XsgWq+NFYccDOTemRpdETWR6Ka/lw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"lightningcss": "^1.32.0",
|
"lightningcss": "^1.33.0",
|
||||||
"picomatch": "^4.0.5",
|
"picomatch": "^4.0.5",
|
||||||
"postcss": "^8.5.17",
|
"postcss": "^8.5.25",
|
||||||
"rolldown": "~1.1.5",
|
"rolldown": "~1.2.1",
|
||||||
"tinyglobby": "^0.2.17"
|
"tinyglobby": "^0.2.17"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
@@ -5120,7 +5070,7 @@
|
|||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@types/node": "^20.19.0 || >=22.12.0",
|
"@types/node": "^20.19.0 || >=22.12.0",
|
||||||
"@vitejs/devtools": "^0.3.0",
|
"@vitejs/devtools": "^0.4.0",
|
||||||
"esbuild": "^0.27.0 || ^0.28.0",
|
"esbuild": "^0.27.0 || ^0.28.0",
|
||||||
"jiti": ">=1.21.0",
|
"jiti": ">=1.21.0",
|
||||||
"less": "^4.0.0",
|
"less": "^4.0.0",
|
||||||
|
|||||||
@@ -23,18 +23,18 @@
|
|||||||
"not dead"
|
"not dead"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ionicons": "^8.0.13",
|
"ionicons": "^8.1.0",
|
||||||
"normalize.css": "8.0.1",
|
"normalize.css": "8.0.1",
|
||||||
"ol": "^10.9.0",
|
"ol": "^10.10.0",
|
||||||
"swiped-events": "1.2.0"
|
"swiped-events": "1.2.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "2.5.5",
|
"@biomejs/biome": "2.5.9",
|
||||||
"@types/node": "^26.1.1",
|
"@types/node": "^26.2.0",
|
||||||
"browserslist": "^4.28.7",
|
"browserslist": "^4.28.8",
|
||||||
"browserslist-to-esbuild": "^2.1.1",
|
"browserslist-to-esbuild": "^2.1.1",
|
||||||
"edge.js": "^6.5.1",
|
"edge.js": "^6.5.1",
|
||||||
"less": "^4.8.0",
|
"less": "^4.9.0",
|
||||||
"mathjs": "^15.2.0",
|
"mathjs": "^15.2.0",
|
||||||
"sharp": "~0.35.3",
|
"sharp": "~0.35.3",
|
||||||
"sort-package-json": "^4.0.0",
|
"sort-package-json": "^4.0.0",
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
"stylelint-prettier": "^5.0.3",
|
"stylelint-prettier": "^5.0.3",
|
||||||
"svgo": "^4.0.2",
|
"svgo": "^4.0.2",
|
||||||
"typescript": "~7.0.2",
|
"typescript": "~7.0.2",
|
||||||
"vite": "^8.1.5",
|
"vite": "^8.2.1",
|
||||||
"vite-bundle-analyzer": "^1.3.9"
|
"vite-bundle-analyzer": "^1.3.9"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,7 +80,12 @@ export default class Calculator extends Plugin {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const node = Calculator.math.parse(searchInput.value);
|
const node = Calculator.math.parse(searchInput.value);
|
||||||
return `${node.toString()} = ${node.evaluate()}`;
|
const value = node.evaluate();
|
||||||
|
if (typeof value !== "number") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `${node.toString()} = ${value}`;
|
||||||
} catch {
|
} catch {
|
||||||
// not a compatible math expression
|
// not a compatible math expression
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export const appendAnswerElement = (element: HTMLElement | string | number): voi
|
|||||||
|
|
||||||
if (!(element instanceof HTMLElement)) {
|
if (!(element instanceof HTMLElement)) {
|
||||||
const span = document.createElement("span");
|
const span = document.createElement("span");
|
||||||
span.innerHTML = element.toString();
|
span.textContent = element.toString();
|
||||||
// biome-ignore lint/style/noParameterAssign: TODO
|
// biome-ignore lint/style/noParameterAssign: TODO
|
||||||
element = span;
|
element = span;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,8 +80,8 @@ same environment, here are a few examples::
|
|||||||
# to test one of the update scripts
|
# to test one of the update scripts
|
||||||
(dev.env)$ searxng_extra/update/update_engine_traits.py --help
|
(dev.env)$ searxng_extra/update/update_engine_traits.py --help
|
||||||
|
|
||||||
# to test the update of the wikidata units
|
# to test the update of the wikidata units and property names
|
||||||
(dev.env)$ searxng_extra/update/update_wikidata_units.py
|
(dev.env)$ searxng_extra/update/update_wikidata.py
|
||||||
|
|
||||||
|
|
||||||
.. sidebar:: further read
|
.. sidebar:: further read
|
||||||
|
|||||||
@@ -90,10 +90,10 @@ Scripts to update static data in :origin:`searx/data/`
|
|||||||
:members:
|
:members:
|
||||||
|
|
||||||
|
|
||||||
``update_wikidata_units.py``
|
``update_wikidata.py``
|
||||||
============================
|
============================
|
||||||
|
|
||||||
:origin:`[source] <searxng_extra/update/update_wikidata_units.py>`
|
:origin:`[source] <searxng_extra/update/update_wikidata.py>`
|
||||||
|
|
||||||
.. automodule:: searxng_extra.update.update_wikidata_units
|
.. automodule:: searxng_extra.update.update_wikidata
|
||||||
:members:
|
:members:
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
mock==5.2.0
|
mock==5.2.0
|
||||||
nose2[coverage_plugin]==0.16.0
|
nose2[coverage_plugin]==0.16.0
|
||||||
cov-core==1.15.0
|
cov-core==1.15.0
|
||||||
black==25.9.0
|
black==26.5.1
|
||||||
pylint==4.0.6
|
pylint==4.0.7
|
||||||
splinter==0.21.0
|
splinter==0.21.0
|
||||||
selenium==4.46.0
|
selenium==4.47.0
|
||||||
Sphinx==8.2.3;python_version <= "3.11"
|
Sphinx==8.2.3;python_version <= "3.11"
|
||||||
Sphinx==9.1.0; python_version > "3.11"
|
Sphinx==9.1.0; python_version > "3.11"
|
||||||
sphinx-issues==6.0.0
|
sphinx-issues==6.0.0
|
||||||
@@ -18,11 +18,11 @@ myst-parser==5.0.0
|
|||||||
linuxdoc==20260504
|
linuxdoc==20260504
|
||||||
aiounittest==1.5.0
|
aiounittest==1.5.0
|
||||||
yamllint==1.38.0
|
yamllint==1.38.0
|
||||||
wlc==2.1.0
|
wlc==2.1.1
|
||||||
coloredlogs==15.0.1
|
coloredlogs==15.0.1
|
||||||
docutils>=0.21.2;python_version <= "3.11"
|
docutils>=0.21.2;python_version <= "3.11"
|
||||||
docutils>=0.22.4; python_version > "3.11"
|
docutils>=0.22.4; python_version > "3.11"
|
||||||
parameterized==0.9.0
|
parameterized==0.9.0
|
||||||
granian[reload]==2.7.9
|
granian[reload]==2.8.2
|
||||||
basedpyright==1.39.9
|
basedpyright==1.39.10
|
||||||
types-lxml==2026.2.16
|
types-lxml==2026.2.16
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
granian==2.7.9
|
granian==2.8.2
|
||||||
granian[pname]==2.7.9
|
granian[pname]==2.8.2
|
||||||
|
|||||||
@@ -3,17 +3,17 @@ babel==2.18.0
|
|||||||
flask-babel==4.0.0
|
flask-babel==4.0.0
|
||||||
flask==3.1.3
|
flask==3.1.3
|
||||||
jinja2==3.1.6
|
jinja2==3.1.6
|
||||||
lxml==6.1.1
|
lxml==6.1.2
|
||||||
pygments==2.20.0
|
pygments==2.21.0
|
||||||
python-dateutil==2.9.0.post0
|
python-dateutil==2.9.0.post0
|
||||||
pyyaml==6.0.3
|
pyyaml==6.0.3
|
||||||
httpx[http2]==0.28.1
|
httpx[http2]==0.28.1
|
||||||
httpx-socks[asyncio]==0.10.0
|
httpx-socks[asyncio]==0.13.1
|
||||||
sniffio==1.3.1
|
sniffio==1.3.1
|
||||||
valkey==6.1.1
|
valkey==6.1.1
|
||||||
markdown-it-py==4.2.0
|
markdown-it-py==4.2.0
|
||||||
msgspec==0.21.1
|
msgspec==0.21.1
|
||||||
typer==0.27.0
|
typer==0.27.1
|
||||||
isodate==0.7.2
|
isodate==0.7.2
|
||||||
whitenoise==6.12.0
|
whitenoise==6.12.0
|
||||||
typing-extensions==4.16.0
|
typing-extensions==4.16.0
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""Implementation of the :py:obj:`preference <searx.preference>` settings."""
|
"""Implementation of the :py:obj:`preference <searx.preference>` settings."""
|
||||||
|
|
||||||
# pylint: disable = too-few-public-methods
|
# pylint: disable = too-few-public-methods
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ area:
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["AnswererInfo", "Answerer", "AnswerStorage"]
|
__all__ = ["AnswererInfo", "Answerer", "AnswerStorage"]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ from dataclasses import dataclass
|
|||||||
from searx.utils import load_module
|
from searx.utils import load_module
|
||||||
from searx.result_types.answer import BaseAnswer
|
from searx.result_types.answer import BaseAnswer
|
||||||
|
|
||||||
|
|
||||||
_default = pathlib.Path(__file__).parent
|
_default = pathlib.Path(__file__).parent
|
||||||
log: logging.Logger = logging.getLogger("searx.answerers")
|
log: logging.Logger = logging.getLogger("searx.answerers")
|
||||||
|
|
||||||
|
|||||||
@@ -127,18 +127,17 @@ def duckduckgo(query: str, sxng_locale: str) -> list[str]:
|
|||||||
|
|
||||||
|
|
||||||
def google_complete(query: str, sxng_locale: str) -> list[str]:
|
def google_complete(query: str, sxng_locale: str) -> list[str]:
|
||||||
"""Autocomplete from Google. Supports Google's languages and subdomains
|
"""Autocomplete from Google. Supports Google's languages
|
||||||
(:py:obj:`searx.engines.google.get_google_info`) by using the async REST
|
(:py:obj:`searx.engines.google.get_google_info`) by using the async REST
|
||||||
API::
|
API::
|
||||||
|
|
||||||
https://{subdomain}/complete/search?{args}
|
https://www.google.com/complete/search?{args}
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
data = ENGINE_TRAITS.get("google") or {}
|
data = ENGINE_TRAITS.get("google") or {}
|
||||||
traits = EngineTraits(**data)
|
traits = EngineTraits(**data)
|
||||||
google_info: dict[str, t.Any] = google.get_google_info({'searxng_locale': sxng_locale}, traits)
|
google_info: dict[str, t.Any] = google.get_google_info({'searxng_locale': sxng_locale}, traits)
|
||||||
url = 'https://{subdomain}/complete/search?{args}'
|
|
||||||
args = urlencode(
|
args = urlencode(
|
||||||
{
|
{
|
||||||
'q': query,
|
'q': query,
|
||||||
@@ -148,7 +147,7 @@ def google_complete(query: str, sxng_locale: str) -> list[str]:
|
|||||||
)
|
)
|
||||||
results: list[str] = []
|
results: list[str] = []
|
||||||
|
|
||||||
resp = get(url.format(subdomain=google_info['subdomain'], args=args))
|
resp = get('https://www.google.com/complete/search?' + args)
|
||||||
if resp and resp.ok:
|
if resp and resp.ok:
|
||||||
json_txt = resp.text[resp.text.find('[') : resp.text.find(']', -3) + 1]
|
json_txt = resp.text[resp.text.find('[') : resp.text.find(']', -3) + 1]
|
||||||
data = json.loads(json_txt)
|
data = json.loads(json_txt)
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ Implementations used for bot detection.
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["init", "dump_request", "get_network", "too_many_requests", "ProxyFix"]
|
__all__ = ["init", "dump_request", "get_network", "too_many_requests", "ProxyFix"]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ class Config:
|
|||||||
if default is UNSET:
|
if default is UNSET:
|
||||||
raise KeyError(name)
|
raise KeyError(name)
|
||||||
return default
|
return default
|
||||||
(modulename, name) = str(fqn).rsplit('.', 1)
|
modulename, name = str(fqn).rsplit('.', 1)
|
||||||
m = __import__(modulename, {}, {}, [name], 0)
|
m = __import__(modulename, {}, {}, [name], 0)
|
||||||
return getattr(m, name)
|
return getattr(m, name)
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ Accept_ header ..
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
from ipaddress import (
|
from ipaddress import (
|
||||||
IPv4Network,
|
IPv4Network,
|
||||||
IPv6Network,
|
IPv6Network,
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ bot if the Accept-Encoding_ header ..
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
from ipaddress import (
|
from ipaddress import (
|
||||||
IPv4Network,
|
IPv4Network,
|
||||||
IPv6Network,
|
IPv6Network,
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ if the Accept-Language_ header is unset.
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
from ipaddress import (
|
from ipaddress import (
|
||||||
IPv4Network,
|
IPv4Network,
|
||||||
IPv6Network,
|
IPv6Network,
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ the Connection_ header is set to ``close``.
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
from ipaddress import (
|
from ipaddress import (
|
||||||
IPv4Network,
|
IPv4Network,
|
||||||
IPv6Network,
|
IPv6Network,
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ Metadata`_. A request is filtered out in case of:
|
|||||||
|
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=unused-argument
|
# pylint: disable=unused-argument
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ the User-Agent_ header is unset or matches the regular expression
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
import re
|
import re
|
||||||
from ipaddress import (
|
from ipaddress import (
|
||||||
IPv4Network,
|
IPv4Network,
|
||||||
@@ -25,7 +24,6 @@ import flask
|
|||||||
from . import config
|
from . import config
|
||||||
from ._helpers import too_many_requests
|
from ._helpers import too_many_requests
|
||||||
|
|
||||||
|
|
||||||
USER_AGENT = (
|
USER_AGENT = (
|
||||||
r'('
|
r'('
|
||||||
+ r'unknown'
|
+ r'unknown'
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ from ._helpers import (
|
|||||||
logger,
|
logger,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
logger = logger.getChild('ip_limit')
|
logger = logger.getChild('ip_limit')
|
||||||
|
|
||||||
BURST_WINDOW = 20
|
BURST_WINDOW = 20
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ The ``ip_lists`` method implements :py:obj:`block-list <block_ip>` and
|
|||||||
]
|
]
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=unused-argument
|
# pylint: disable=unused-argument
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""Implementation of a middleware to determine the real IP of an HTTP request
|
"""Implementation of a middleware to determine the real IP of an HTTP request
|
||||||
(:py:obj:`flask.request.remote_addr`) behind a proxy chain."""
|
(:py:obj:`flask.request.remote_addr`) behind a proxy chain."""
|
||||||
|
|
||||||
# pylint: disable=too-many-branches
|
# pylint: disable=too-many-branches
|
||||||
|
|
||||||
|
|
||||||
@@ -63,6 +64,20 @@ class ProxyFix:
|
|||||||
proxy_list: list[str] = cfg.get("botdetection.trusted_proxies", default=[])
|
proxy_list: list[str] = cfg.get("botdetection.trusted_proxies", default=[])
|
||||||
return [ip_network(net, strict=False) for net in proxy_list]
|
return [ip_network(net, strict=False) for net in proxy_list]
|
||||||
|
|
||||||
|
def is_trusted_proxy(
|
||||||
|
self,
|
||||||
|
addr: IPv4Address | IPv6Address | None,
|
||||||
|
trusted_proxies: list[IPv4Network | IPv6Network],
|
||||||
|
) -> bool:
|
||||||
|
if addr is None:
|
||||||
|
return False
|
||||||
|
|
||||||
|
for net in trusted_proxies:
|
||||||
|
if addr.version == net.version and addr in net:
|
||||||
|
return True
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
def trusted_remote_addr(
|
def trusted_remote_addr(
|
||||||
self,
|
self,
|
||||||
x_forwarded_for: list[IPv4Address | IPv6Address],
|
x_forwarded_for: list[IPv4Address | IPv6Address],
|
||||||
@@ -70,16 +85,8 @@ class ProxyFix:
|
|||||||
) -> str:
|
) -> str:
|
||||||
# always rtl
|
# always rtl
|
||||||
for addr in reversed(x_forwarded_for):
|
for addr in reversed(x_forwarded_for):
|
||||||
trust: bool = False
|
if not self.is_trusted_proxy(addr, trusted_proxies):
|
||||||
|
logger.debug("client address from X-Forwarded-For: %s", addr)
|
||||||
for net in trusted_proxies:
|
|
||||||
if addr.version == net.version and addr in net:
|
|
||||||
logger.debug("trust proxy %s (member of %s)", addr, net)
|
|
||||||
trust = True
|
|
||||||
break
|
|
||||||
|
|
||||||
# client address
|
|
||||||
if not trust:
|
|
||||||
return addr.compressed
|
return addr.compressed
|
||||||
|
|
||||||
# fallback to first address
|
# fallback to first address
|
||||||
@@ -95,19 +102,21 @@ class ProxyFix:
|
|||||||
# in this function!
|
# in this function!
|
||||||
|
|
||||||
orig_remote_addr: str | None = environ.pop("REMOTE_ADDR")
|
orig_remote_addr: str | None = environ.pop("REMOTE_ADDR")
|
||||||
|
orig_remote_ip: IPv4Address | IPv6Address | None = None
|
||||||
|
|
||||||
# Validate the IPs involved in this game and delete all invalid ones
|
# Validate the IPs involved in this game and delete all invalid ones
|
||||||
# from the WSGI environment.
|
# from the WSGI environment.
|
||||||
|
|
||||||
if orig_remote_addr:
|
if orig_remote_addr:
|
||||||
try:
|
try:
|
||||||
addr = ip_address(orig_remote_addr)
|
orig_remote_ip = ip_address(orig_remote_addr)
|
||||||
if addr.version == 6 and addr.ipv4_mapped:
|
if orig_remote_ip.version == 6 and orig_remote_ip.ipv4_mapped:
|
||||||
addr = addr.ipv4_mapped
|
orig_remote_ip = orig_remote_ip.ipv4_mapped
|
||||||
orig_remote_addr = addr.compressed
|
orig_remote_addr = orig_remote_ip.compressed
|
||||||
except ValueError as exc:
|
except ValueError as exc:
|
||||||
logger.error("REMOTE_ADDR: %s / discard REMOTE_ADDR from WSGI environment", exc)
|
logger.error("REMOTE_ADDR: %s / discard REMOTE_ADDR from WSGI environment", exc)
|
||||||
orig_remote_addr = None
|
orig_remote_addr = None
|
||||||
|
orig_remote_ip = None
|
||||||
|
|
||||||
x_real_ip: str | None = environ.get("HTTP_X_REAL_IP")
|
x_real_ip: str | None = environ.get("HTTP_X_REAL_IP")
|
||||||
if x_real_ip:
|
if x_real_ip:
|
||||||
@@ -141,11 +150,13 @@ class ProxyFix:
|
|||||||
if not x_forwarded_for and not x_real_ip:
|
if not x_forwarded_for and not x_real_ip:
|
||||||
log_error_only_once("X-Forwarded-For nor X-Real-IP header is set!")
|
log_error_only_once("X-Forwarded-For nor X-Real-IP header is set!")
|
||||||
|
|
||||||
if x_forwarded_for and not trusted_proxies:
|
if x_forwarded_for or x_real_ip:
|
||||||
|
if not trusted_proxies:
|
||||||
log_error_only_once("missing botdetection.trusted_proxies config")
|
log_error_only_once("missing botdetection.trusted_proxies config")
|
||||||
# without trusted_proxies, this variable is useless for determining
|
|
||||||
# the real IP
|
if not self.is_trusted_proxy(orig_remote_ip, trusted_proxies):
|
||||||
x_forwarded_for = []
|
x_forwarded_for = []
|
||||||
|
x_real_ip = None
|
||||||
|
|
||||||
# securing the WSGI environment variables that are adjusted
|
# securing the WSGI environment variables that are adjusted
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""Providing a Valkey database for the botdetection methods."""
|
"""Providing a Valkey database for the botdetection methods."""
|
||||||
|
|
||||||
|
|
||||||
import valkey
|
import valkey
|
||||||
|
|
||||||
__all__ = ["set_valkey_client", "get_valkey_client"]
|
__all__ = ["set_valkey_client", "get_valkey_client"]
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""Implementations needed for a branding of SearXNG."""
|
"""Implementations needed for a branding of SearXNG."""
|
||||||
|
|
||||||
# pylint: disable=too-few-public-methods
|
# pylint: disable=too-few-public-methods
|
||||||
|
|
||||||
# Struct fields aren't discovered in Python 3.14
|
# Struct fields aren't discovered in Python 3.14
|
||||||
|
|||||||
@@ -465,7 +465,7 @@ class ExpireCacheSQLite(sqlitedb.SQLiteAppl, ExpireCache):
|
|||||||
|
|
||||||
# Check if value is expired. It's possible that it's expired but has not
|
# Check if value is expired. It's possible that it's expired but has not
|
||||||
# yet been automatically deleted by the periodic maintenance
|
# yet been automatically deleted by the periodic maintenance
|
||||||
(value, expire) = row
|
value, expire = row
|
||||||
now = time.time()
|
now = time.time()
|
||||||
if expire < now:
|
if expire < now:
|
||||||
# The record is deleted during the maintenance interval. Deleting
|
# The record is deleted during the maintenance interval. Deleting
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
import warnings
|
import warnings
|
||||||
|
|
||||||
|
|
||||||
# limiter backward compatibility
|
# limiter backward compatibility
|
||||||
# ------------------------------
|
# ------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
make data.all
|
make data.all
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=invalid-name
|
# pylint: disable=invalid-name
|
||||||
|
|
||||||
__all__ = ["ahmia_blacklist_loader", "data_dir", "get_cache"]
|
__all__ = ["ahmia_blacklist_loader", "data_dir", "get_cache"]
|
||||||
@@ -32,6 +33,13 @@ class WikiDataUnitType(t.TypedDict):
|
|||||||
to_si_factor: float
|
to_si_factor: float
|
||||||
|
|
||||||
|
|
||||||
|
WikiDataPropertyNameType = str | dict[str, str]
|
||||||
|
"""Name of a Wikidata property. Can be either the plain name or a dictionary of
|
||||||
|
language code to property name, e.g. ``{"en": "Date of birth"}``."""
|
||||||
|
WikiDataPropertiesType = dict[str, WikiDataPropertyNameType]
|
||||||
|
"""Dictionary from wikidata property ID to property name."""
|
||||||
|
|
||||||
|
|
||||||
class LocalesType(t.TypedDict):
|
class LocalesType(t.TypedDict):
|
||||||
"""Data structure of an item in ``locales.json``"""
|
"""Data structure of an item in ``locales.json``"""
|
||||||
|
|
||||||
@@ -41,6 +49,7 @@ class LocalesType(t.TypedDict):
|
|||||||
|
|
||||||
USER_AGENTS: UserAgentType
|
USER_AGENTS: UserAgentType
|
||||||
WIKIDATA_UNITS: dict[str, WikiDataUnitType]
|
WIKIDATA_UNITS: dict[str, WikiDataUnitType]
|
||||||
|
WIKIDATA_PROPERTIES: WikiDataPropertiesType
|
||||||
TRACKER_PATTERNS: TrackerPatternsDB
|
TRACKER_PATTERNS: TrackerPatternsDB
|
||||||
LOCALES: LocalesType
|
LOCALES: LocalesType
|
||||||
CURRENCIES: CurrenciesDB
|
CURRENCIES: CurrenciesDB
|
||||||
@@ -52,11 +61,12 @@ ENGINE_DESCRIPTIONS: dict[str, dict[str, t.Any]]
|
|||||||
ENGINE_TRAITS: dict[str, dict[str, t.Any]]
|
ENGINE_TRAITS: dict[str, dict[str, t.Any]]
|
||||||
|
|
||||||
|
|
||||||
lazy_globals = {
|
lazy_globals: dict[str, t.Any] = {
|
||||||
"CURRENCIES": CurrenciesDB(),
|
"CURRENCIES": CurrenciesDB(),
|
||||||
"USER_AGENTS": None,
|
"USER_AGENTS": None,
|
||||||
"EXTERNAL_URLS": None,
|
"EXTERNAL_URLS": None,
|
||||||
"WIKIDATA_UNITS": None,
|
"WIKIDATA_UNITS": None,
|
||||||
|
"WIKIDATA_PROPERTIES": None,
|
||||||
"EXTERNAL_BANGS": None,
|
"EXTERNAL_BANGS": None,
|
||||||
"OSM_KEYS_TAGS": None,
|
"OSM_KEYS_TAGS": None,
|
||||||
"ENGINE_DESCRIPTIONS": None,
|
"ENGINE_DESCRIPTIONS": None,
|
||||||
@@ -69,6 +79,7 @@ data_json_files = {
|
|||||||
"USER_AGENTS": "useragents.json",
|
"USER_AGENTS": "useragents.json",
|
||||||
"EXTERNAL_URLS": "external_urls.json",
|
"EXTERNAL_URLS": "external_urls.json",
|
||||||
"WIKIDATA_UNITS": "wikidata_units.json",
|
"WIKIDATA_UNITS": "wikidata_units.json",
|
||||||
|
"WIKIDATA_PROPERTIES": "wikidata_properties.json",
|
||||||
"EXTERNAL_BANGS": "external_bangs.json",
|
"EXTERNAL_BANGS": "external_bangs.json",
|
||||||
"OSM_KEYS_TAGS": "osm_keys_tags.json",
|
"OSM_KEYS_TAGS": "osm_keys_tags.json",
|
||||||
"ENGINE_DESCRIPTIONS": "engine_descriptions.json",
|
"ENGINE_DESCRIPTIONS": "engine_descriptions.json",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,6 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""Simple implementation to store TrackerPatterns data in a SQL database."""
|
"""Simple implementation to store TrackerPatterns data in a SQL database."""
|
||||||
|
|
||||||
# pylint: disable=too-many-branches
|
# pylint: disable=too-many-branches
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
],
|
],
|
||||||
"ua": "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}",
|
"ua": "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}",
|
||||||
"versions": [
|
"versions": [
|
||||||
"153.0",
|
"154.0",
|
||||||
"152.0"
|
"153.0"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
23618
searx/data/wikidata_properties.json
Normal file
23618
searx/data/wikidata_properties.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -3474,11 +3474,6 @@
|
|||||||
"symbol": "mm⁻²",
|
"symbol": "mm⁻²",
|
||||||
"to_si_factor": 1e-06
|
"to_si_factor": 1e-06
|
||||||
},
|
},
|
||||||
"Q136039973": {
|
|
||||||
"si_name": "Q6137407",
|
|
||||||
"symbol": "FPS",
|
|
||||||
"to_si_factor": 1.0
|
|
||||||
},
|
|
||||||
"Q1361854": {
|
"Q1361854": {
|
||||||
"si_name": "Q11570",
|
"si_name": "Q11570",
|
||||||
"symbol": "dwt",
|
"symbol": "dwt",
|
||||||
@@ -5254,6 +5249,11 @@
|
|||||||
"symbol": "μA",
|
"symbol": "μA",
|
||||||
"to_si_factor": 1e-06
|
"to_si_factor": 1e-06
|
||||||
},
|
},
|
||||||
|
"Q31274648": {
|
||||||
|
"si_name": "Q6137407",
|
||||||
|
"symbol": "FPS",
|
||||||
|
"to_si_factor": 1.0
|
||||||
|
},
|
||||||
"Q3186734": {
|
"Q3186734": {
|
||||||
"si_name": "Q3186734",
|
"si_name": "Q3186734",
|
||||||
"symbol": "J/(m³ K)",
|
"symbol": "J/(m³ K)",
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ To use this engine, add an entry similar to the following to your engine list in
|
|||||||
https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-register-app
|
https://learn.microsoft.com/en-us/entra/identity-platform/quickstart-register-app
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|
||||||
from searx.enginelib import EngineCache
|
from searx.enginelib import EngineCache
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""BASE (Scholar publications)"""
|
"""BASE (Scholar publications)"""
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
|||||||
@@ -83,7 +83,6 @@ from threading import Thread
|
|||||||
from searx import logger
|
from searx import logger
|
||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
|
|
||||||
|
|
||||||
engine_type = 'offline'
|
engine_type = 'offline'
|
||||||
paging = True
|
paging = True
|
||||||
command = []
|
command = []
|
||||||
|
|||||||
@@ -1,11 +1,18 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""Deviantart (Images)"""
|
"""Deviantart (Images)"""
|
||||||
|
|
||||||
|
import typing as t
|
||||||
|
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
from lxml import html
|
from lxml import html
|
||||||
|
|
||||||
|
from searx.result_types import EngineResults
|
||||||
from searx.utils import extract_text, eval_xpath, eval_xpath_list
|
from searx.utils import extract_text, eval_xpath, eval_xpath_list
|
||||||
|
|
||||||
|
if t.TYPE_CHECKING:
|
||||||
|
from searx.extended_types import SXNG_Response
|
||||||
|
from searx.search.processors import OnlineParams
|
||||||
|
|
||||||
# about
|
# about
|
||||||
about = {
|
about = {
|
||||||
"website": 'https://www.deviantart.com/',
|
"website": 'https://www.deviantart.com/',
|
||||||
@@ -23,63 +30,62 @@ paging = True
|
|||||||
# search-url
|
# search-url
|
||||||
base_url = 'https://www.deviantart.com'
|
base_url = 'https://www.deviantart.com'
|
||||||
|
|
||||||
results_xpath = '//div[@class="V_S0t_"]/div/div/a'
|
results_xpath = '//div[@data-testid="content_row"]//a[.//*[@data-testid="thumb"]]'
|
||||||
url_xpath = './@href'
|
img_src_xpath = './/img/@srcset'
|
||||||
thumbnail_src_xpath = './div/img/@src'
|
thumbnail_src_xpath = './/img/@src'
|
||||||
img_src_xpath = './div/img/@srcset'
|
author_xpath = './/*[@property="schema:name"]/@content'
|
||||||
title_xpath = './@aria-label'
|
cursor_xpath = '//a[contains(@href, "cursor=") and contains(., "Next")]/@href'
|
||||||
premium_xpath = '../div/div/div/text()'
|
|
||||||
premium_keytext = 'Watch the artist to view this deviation'
|
|
||||||
cursor_xpath = '(//a[@class="vQ2brP"]/@href)[last()]'
|
|
||||||
|
|
||||||
|
|
||||||
def request(query, params):
|
def request(query: str, params: "OnlineParams"):
|
||||||
|
|
||||||
# https://www.deviantart.com/search?q=foo
|
# https://www.deviantart.com/search?q=foo
|
||||||
|
|
||||||
nextpage_url = params['engine_data'].get('nextpage')
|
args = {'q': query}
|
||||||
# don't use nextpage when user selected to jump back to page 1
|
if params['pageno'] > 1:
|
||||||
if params['pageno'] > 1 and nextpage_url is not None:
|
cursor = params['engine_data'].get('cursor')
|
||||||
params['url'] = nextpage_url
|
if cursor:
|
||||||
else:
|
args['cursor'] = cursor
|
||||||
params['url'] = f"{base_url}/search?{urllib.parse.urlencode({'q': query})}"
|
|
||||||
|
|
||||||
return params
|
params['url'] = f"{base_url}/search?{urllib.parse.urlencode(args)}"
|
||||||
|
|
||||||
|
|
||||||
def response(resp):
|
def response(resp: "SXNG_Response") -> EngineResults:
|
||||||
|
|
||||||
results = []
|
res = EngineResults()
|
||||||
dom = html.fromstring(resp.text)
|
dom = html.fromstring(resp.text)
|
||||||
|
|
||||||
for result in eval_xpath_list(dom, results_xpath):
|
for result in eval_xpath_list(dom, results_xpath):
|
||||||
# skip images that are blurred
|
thumbnail_src = extract_text(eval_xpath(result, thumbnail_src_xpath))
|
||||||
_text = extract_text(eval_xpath(result, premium_xpath))
|
|
||||||
if _text and premium_keytext in _text:
|
|
||||||
continue
|
|
||||||
img_src = extract_text(eval_xpath(result, img_src_xpath))
|
img_src = extract_text(eval_xpath(result, img_src_xpath))
|
||||||
|
# mature locked thumbs have blur transform (blur_15, blur_30 etc..)
|
||||||
|
if ',blur_' in f'{thumbnail_src}{img_src}':
|
||||||
|
continue
|
||||||
if img_src:
|
if img_src:
|
||||||
img_src = img_src.split(' ')[0]
|
img_src = img_src.split(' ')[0]
|
||||||
parsed_url = urllib.parse.urlparse(img_src)
|
parsed_url = urllib.parse.urlparse(img_src)
|
||||||
img_src = parsed_url._replace(path=parsed_url.path.split('/v1')[0]).geturl()
|
img_src = parsed_url._replace(path=parsed_url.path.split('/v1')[0]).geturl()
|
||||||
|
|
||||||
results.append(
|
author = extract_text(eval_xpath(result, author_xpath))
|
||||||
{
|
|
||||||
'template': 'images.html',
|
res.add(
|
||||||
'url': extract_text(eval_xpath(result, url_xpath)),
|
res.types.Image(
|
||||||
'img_src': img_src,
|
template='images.html',
|
||||||
'thumbnail_src': extract_text(eval_xpath(result, thumbnail_src_xpath)),
|
url=result.get('href'),
|
||||||
'title': extract_text(eval_xpath(result, title_xpath)),
|
img_src=img_src or "",
|
||||||
}
|
thumbnail_src=thumbnail_src or "",
|
||||||
|
title=result.get('aria-label'),
|
||||||
|
author=author or "",
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
nextpage_url = extract_text(eval_xpath(dom, cursor_xpath))
|
nextpage_url = extract_text(eval_xpath(dom, cursor_xpath))
|
||||||
if nextpage_url:
|
cursor = urllib.parse.parse_qs(urllib.parse.urlparse(nextpage_url or '').query).get('cursor', [None])[0]
|
||||||
results.append(
|
if cursor:
|
||||||
{
|
res.add(
|
||||||
'engine_data': nextpage_url.replace("http://", "https://"),
|
res.types.LegacyResult(
|
||||||
'key': 'nextpage',
|
engine_data=cursor,
|
||||||
}
|
key='cursor',
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
return results
|
return res
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""Docker Hub (IT)"""
|
"""Docker Hub (IT)"""
|
||||||
|
|
||||||
# pylint: disable=use-dict-literal
|
# pylint: disable=use-dict-literal
|
||||||
|
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
|
|||||||
@@ -164,6 +164,7 @@ Terms / phrases that you keep coming across:
|
|||||||
https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Accept-Language
|
https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Accept-Language
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=global-statement
|
# pylint: disable=global-statement
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ least we could not find out how language support should work. It seems that
|
|||||||
most of the features are based on English terms.
|
most of the features are based on English terms.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|
||||||
from urllib.parse import urlencode, urlparse, urljoin
|
from urllib.parse import urlencode, urlparse, urljoin
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ from searx.result_types import EngineResults
|
|||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
from searx import weather
|
from searx import weather
|
||||||
|
|
||||||
|
|
||||||
about = {
|
about = {
|
||||||
"website": 'https://duckduckgo.com/',
|
"website": 'https://duckduckgo.com/',
|
||||||
"wikidata_id": 'Q12805',
|
"wikidata_id": 'Q12805',
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
# pylint: disable=invalid-name
|
# pylint: disable=invalid-name
|
||||||
"""Dummy Offline"""
|
"""Dummy Offline"""
|
||||||
|
|
||||||
|
|
||||||
# about
|
# about
|
||||||
about = {
|
about = {
|
||||||
"wikidata_id": None,
|
"wikidata_id": None,
|
||||||
|
|||||||
@@ -65,7 +65,6 @@ code lines are just relabeled (starting from 1) and appended (a disjoint set of
|
|||||||
code blocks in a single file might be returned from the API).
|
code blocks in a single file might be returned from the API).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
|
|
||||||
|
|||||||
@@ -9,12 +9,15 @@ engines:
|
|||||||
- :ref:`google scholar engine`
|
- :ref:`google scholar engine`
|
||||||
- :ref:`google autocomplete`
|
- :ref:`google autocomplete`
|
||||||
|
|
||||||
|
This implementation uses Nokia user agents to request an XML layout from Google.
|
||||||
|
The normal web version requires executing JavaScript to load the results and
|
||||||
|
therefore is currently not used here. See `Google discussion`_ for more
|
||||||
|
information on that topic.
|
||||||
|
|
||||||
|
.. _Google discussion: https://github.com/searxng/searxng/issues/6359
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import random
|
import random
|
||||||
import re
|
|
||||||
import string
|
|
||||||
import time
|
|
||||||
import typing as t
|
import typing as t
|
||||||
from urllib.parse import unquote, urlencode
|
from urllib.parse import unquote, urlencode
|
||||||
|
|
||||||
@@ -44,16 +47,16 @@ about = {
|
|||||||
"official_api_documentation": "https://developers.google.com/custom-search/",
|
"official_api_documentation": "https://developers.google.com/custom-search/",
|
||||||
"use_official_api": False,
|
"use_official_api": False,
|
||||||
"require_api_key": False,
|
"require_api_key": False,
|
||||||
"results": "HTML",
|
"results": "XML",
|
||||||
}
|
}
|
||||||
|
|
||||||
# engine dependent config
|
# engine dependent config
|
||||||
categories = ["general", "web"]
|
categories = ["general", "web"]
|
||||||
paging = True
|
paging = True
|
||||||
max_page = 50
|
max_page = 50
|
||||||
"""`Google max 50 pages`_
|
"""Google supports up to 50 pages of results, see the `Google max_page discussion`_.
|
||||||
|
|
||||||
.. _Google max 50 pages: https://github.com/searxng/searxng/issues/2982
|
.. _Google max_page discussion: https://github.com/searxng/searxng/issues/2982
|
||||||
"""
|
"""
|
||||||
time_range_support = True
|
time_range_support = True
|
||||||
language_support = True
|
language_support = True
|
||||||
@@ -64,38 +67,23 @@ time_range_dict = {"day": "d", "week": "w", "month": "m", "year": "y"}
|
|||||||
# Filter results. 0: None, 1: Moderate, 2: Strict
|
# Filter results. 0: None, 1: Moderate, 2: Strict
|
||||||
filter_mapping = {0: "off", 1: "medium", 2: "high"}
|
filter_mapping = {0: "off", 1: "medium", 2: "high"}
|
||||||
|
|
||||||
|
# https://github.com/searxng/searxng/issues/6359
|
||||||
|
nokia_useragents = (
|
||||||
|
"Nokia7610/2.0 (5.0509.0) SymbianOS/7.0s Series60/2.1 Profile/MIDP-2.0 Configuration/CLDC-1.0",
|
||||||
|
"Nokia7610/2.0 (7.0642.0) SymbianOS/7.0s Series60/2.1 Profile/MIDP-2.0 Configuration/CLDC-1.0",
|
||||||
|
"Nokia6230/2.0 (05.50) Profile/MIDP-2.0 Configuration/CLDC-1.1",
|
||||||
|
"Nokia6230i/2.0 (03.80) Profile/MIDP-2.0 Configuration/CLDC-1.1",
|
||||||
|
"Nokia6280/2.0 (03.60) Profile/MIDP-2.0 Configuration/CLDC-1.1",
|
||||||
|
"NokiaN72/2.0617.1.0.3 Series60/2.8 Profile/MIDP-2.0 Configuration/CLDC-1.1",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# specific xpath variables
|
# specific xpath variables
|
||||||
# ------------------------
|
# ------------------------
|
||||||
|
|
||||||
# Suggestions are links placed in a *card-section*, we extract only the text
|
# Suggestions are links placed in a *card-section*, we extract only the text
|
||||||
# from the links not the links itself.
|
# from the links not the links itself.
|
||||||
suggestion_xpath = '//div[contains(@class, "gGQDvd iIWm4b")]//a'
|
suggestion_xpath = '//table[contains(@class, "HExoMb")]//a[contains(@class, "ZWRArf")]'
|
||||||
|
|
||||||
|
|
||||||
_arcid_range = string.ascii_letters + string.digits + "_-"
|
|
||||||
_arcid_random: tuple[str, int] | None = None
|
|
||||||
|
|
||||||
|
|
||||||
def ui_async(start: int) -> str:
|
|
||||||
"""Format of the response from UI's async request.
|
|
||||||
|
|
||||||
- ``arc_id:<...>,use_ac:true,_fmt:prog``
|
|
||||||
|
|
||||||
The arc_id is random generated every hour.
|
|
||||||
"""
|
|
||||||
global _arcid_random # pylint: disable=global-statement
|
|
||||||
|
|
||||||
use_ac = "use_ac:true"
|
|
||||||
# _fmt:html returns a HTTP 500 when user search for celebrities like
|
|
||||||
# '!google natasha allegri' or '!google chris evans'
|
|
||||||
_fmt = "_fmt:prog"
|
|
||||||
|
|
||||||
# create a new random arc_id every hour
|
|
||||||
if not _arcid_random or (int(time.time()) - _arcid_random[1]) > 3600:
|
|
||||||
_arcid_random = ("".join(random.choices(_arcid_range, k=23)), int(time.time()))
|
|
||||||
arc_id = f"arc_id:srp_{_arcid_random[0]}_1{start:02}"
|
|
||||||
|
|
||||||
return ",".join([arc_id, use_ac, _fmt])
|
|
||||||
|
|
||||||
|
|
||||||
def get_google_info(params: "OnlineParams", eng_traits: EngineTraits) -> dict[str, t.Any]:
|
def get_google_info(params: "OnlineParams", eng_traits: EngineTraits) -> dict[str, t.Any]:
|
||||||
@@ -127,19 +115,11 @@ def get_google_info(params: "OnlineParams", eng_traits: EngineTraits) -> dict[st
|
|||||||
A instance of :py:obj:`babel.core.Locale` build from the
|
A instance of :py:obj:`babel.core.Locale` build from the
|
||||||
``searxng_locale`` value.
|
``searxng_locale`` value.
|
||||||
|
|
||||||
subdomain:
|
|
||||||
Google subdomain :py:obj:`google_domains` that fits to the country
|
|
||||||
code.
|
|
||||||
|
|
||||||
params:
|
params:
|
||||||
Py-Dictionary with additional request arguments (can be passed to
|
Py-Dictionary with additional request arguments (can be passed to
|
||||||
:py:func:`urllib.parse.urlencode`).
|
:py:func:`urllib.parse.urlencode`).
|
||||||
|
|
||||||
- ``hl`` parameter: specifies the interface language of user interface.
|
- ``hl`` parameter: specifies the interface language of user interface.
|
||||||
- ``lr`` parameter: restricts search results to documents written in
|
|
||||||
a particular language.
|
|
||||||
- ``cr`` parameter: restricts search results to documents
|
|
||||||
originating in a particular country.
|
|
||||||
- ``ie`` parameter: sets the character encoding scheme that should
|
- ``ie`` parameter: sets the character encoding scheme that should
|
||||||
be used to interpret the query string ('utf8').
|
be used to interpret the query string ('utf8').
|
||||||
- ``oe`` parameter: sets the character encoding scheme that should
|
- ``oe`` parameter: sets the character encoding scheme that should
|
||||||
@@ -156,7 +136,6 @@ def get_google_info(params: "OnlineParams", eng_traits: EngineTraits) -> dict[st
|
|||||||
ret_val: dict[str, t.Any] = {
|
ret_val: dict[str, t.Any] = {
|
||||||
"language": None,
|
"language": None,
|
||||||
"country": None,
|
"country": None,
|
||||||
"subdomain": None,
|
|
||||||
"params": {},
|
"params": {},
|
||||||
"headers": {},
|
"headers": {},
|
||||||
"cookies": {},
|
"cookies": {},
|
||||||
@@ -169,7 +148,7 @@ def get_google_info(params: "OnlineParams", eng_traits: EngineTraits) -> dict[st
|
|||||||
except babel.core.UnknownLocaleError:
|
except babel.core.UnknownLocaleError:
|
||||||
locale = None
|
locale = None
|
||||||
|
|
||||||
eng_lang = eng_traits.get_language(sxng_locale, "lang_en")
|
eng_lang = eng_traits.get_language(sxng_locale) or "lang_en"
|
||||||
lang_code = eng_lang.split("_")[-1] # lang_zh-TW --> zh-TW / lang_en --> en
|
lang_code = eng_lang.split("_")[-1] # lang_zh-TW --> zh-TW / lang_en --> en
|
||||||
country = eng_traits.get_region(sxng_locale, eng_traits.all_locale)
|
country = eng_traits.get_region(sxng_locale, eng_traits.all_locale)
|
||||||
|
|
||||||
@@ -184,7 +163,6 @@ def get_google_info(params: "OnlineParams", eng_traits: EngineTraits) -> dict[st
|
|||||||
ret_val["language"] = eng_lang
|
ret_val["language"] = eng_lang
|
||||||
ret_val["country"] = country
|
ret_val["country"] = country
|
||||||
ret_val["locale"] = locale
|
ret_val["locale"] = locale
|
||||||
ret_val["subdomain"] = eng_traits.custom["supported_domains"].get(country.upper(), "www.google.com")
|
|
||||||
|
|
||||||
# hl parameter:
|
# hl parameter:
|
||||||
# The hl parameter specifies the interface language (host language) of
|
# The hl parameter specifies the interface language (host language) of
|
||||||
@@ -223,6 +201,8 @@ def get_google_info(params: "OnlineParams", eng_traits: EngineTraits) -> dict[st
|
|||||||
|
|
||||||
# specify a region (country) only if a region is given in the selected
|
# specify a region (country) only if a region is given in the selected
|
||||||
# locale --> https://github.com/searxng/searxng/issues/2672
|
# locale --> https://github.com/searxng/searxng/issues/2672
|
||||||
|
|
||||||
|
if country is not None:
|
||||||
ret_val["params"]["cr"] = ""
|
ret_val["params"]["cr"] = ""
|
||||||
if len(sxng_locale.split("-")) > 1:
|
if len(sxng_locale.split("-")) > 1:
|
||||||
ret_val["params"]["cr"] = "country" + country
|
ret_val["params"]["cr"] = "country" + country
|
||||||
@@ -300,88 +280,77 @@ def detect_google_sorry(resp: "SXNG_Response"):
|
|||||||
raise SearxEngineCaptchaException()
|
raise SearxEngineCaptchaException()
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
def unwrap_google_url(raw_url: str) -> str:
|
||||||
"""Google search request"""
|
# remove redirector from url
|
||||||
# pylint: disable=line-too-long
|
if raw_url.startswith("/url?q="):
|
||||||
start = (params["pageno"] - 1) * 10
|
return unquote(raw_url[7:].split("&sa=U")[0])
|
||||||
google_info = get_google_info(params, traits)
|
return raw_url
|
||||||
|
|
||||||
# https://www.google.de/search?q=corona&hl=de&lr=lang_de&start=0&tbs=qdr%3Ad&safe=medium
|
|
||||||
query_url = (
|
|
||||||
"https://"
|
|
||||||
+ google_info["subdomain"]
|
|
||||||
+ "/search"
|
|
||||||
+ "?"
|
|
||||||
+ urlencode(
|
|
||||||
{
|
|
||||||
"q": query,
|
|
||||||
**google_info["params"],
|
|
||||||
"filter": "0",
|
|
||||||
"start": start,
|
|
||||||
# 'vet': '12ahUKEwik3ZbIzfn7AhXMX_EDHbUDBh0QxK8CegQIARAC..i',
|
|
||||||
# 'ved': '2ahUKEwik3ZbIzfn7AhXMX_EDHbUDBh0Q_skCegQIARAG',
|
|
||||||
# 'cs' : 1,
|
|
||||||
# 'sa': 'N',
|
|
||||||
# 'yv': 3,
|
|
||||||
# 'prmd': 'vin',
|
|
||||||
# 'ei': 'GASaY6TxOcy_xc8PtYeY6AE',
|
|
||||||
# 'sa': 'N',
|
|
||||||
# 'sstk': 'AcOHfVkD7sWCSAheZi-0tx_09XDO55gTWY0JNq3_V26cNN-c8lfD45aZYPI8s_Bqp8s57AHz5pxchDtAGCA_cikAWSjy9kw3kgg'
|
|
||||||
# formally known as use_mobile_ui
|
|
||||||
# "asearch": "arc",
|
|
||||||
# "async": str_async,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
if params["time_range"] in time_range_dict:
|
|
||||||
query_url += "&" + urlencode({"tbs": "qdr:" + time_range_dict[params["time_range"]]})
|
|
||||||
if params["safesearch"]:
|
|
||||||
query_url += "&" + urlencode({"safe": filter_mapping[params["safesearch"]]})
|
|
||||||
params["url"] = query_url
|
|
||||||
|
|
||||||
params["cookies"] = google_info["cookies"]
|
|
||||||
params["headers"].update(google_info["headers"])
|
|
||||||
|
|
||||||
|
|
||||||
# regex match to get image map that is found inside the returned javascript:
|
def wml_dom(resp: "SXNG_Response"):
|
||||||
# (function(){var s='...';var i=['...'] ...}
|
|
||||||
RE_DATA_IMAGE = re.compile(r"(data:image[^']*?)'[^']*?'((?:dimg|pimg|tsuid)[^']*)")
|
|
||||||
|
|
||||||
|
|
||||||
def parse_url_images(text: str):
|
|
||||||
data_image_map = {}
|
|
||||||
|
|
||||||
for image_url, img_id in RE_DATA_IMAGE.findall(text):
|
|
||||||
data_image_map[img_id] = image_url.encode('utf-8').decode("unicode-escape")
|
|
||||||
logger.debug("data:image objects --> %s", list(data_image_map.keys()))
|
|
||||||
return data_image_map
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response"):
|
|
||||||
"""Get response from google's search request"""
|
|
||||||
# pylint: disable=too-many-branches, too-many-statements
|
|
||||||
detect_google_sorry(resp)
|
detect_google_sorry(resp)
|
||||||
data_image_map = parse_url_images(resp.text)
|
text = resp.text
|
||||||
|
if text.lstrip().startswith("<?xml"):
|
||||||
|
text = text.split("?>", 1)[-1]
|
||||||
|
return html.fromstring(text)
|
||||||
|
|
||||||
|
|
||||||
|
def google_request(
|
||||||
|
query: str,
|
||||||
|
params: "OnlineParams",
|
||||||
|
extra_args: dict[str, t.Any] | None = None,
|
||||||
|
*,
|
||||||
|
eng_traits: EngineTraits | None = None,
|
||||||
|
use_time_range: bool = True,
|
||||||
|
use_safesearch: bool = True,
|
||||||
|
safesearch_map: dict[int, str] | None = None,
|
||||||
|
use_locales: bool = True,
|
||||||
|
) -> None:
|
||||||
|
google_info = get_google_info(params, eng_traits or traits)
|
||||||
|
if not use_locales:
|
||||||
|
google_info["params"].pop("lr")
|
||||||
|
google_info["params"].pop("cr")
|
||||||
|
|
||||||
|
start = (params["pageno"] - 1) * 10
|
||||||
|
args: dict[str, t.Any] = {
|
||||||
|
"q": query,
|
||||||
|
"sca_esv": "1",
|
||||||
|
**google_info["params"],
|
||||||
|
**(extra_args or {}),
|
||||||
|
}
|
||||||
|
if start:
|
||||||
|
args["start"] = start
|
||||||
|
if use_time_range and params["time_range"] in time_range_dict:
|
||||||
|
args["tbs"] = "qdr:" + time_range_dict[params["time_range"]]
|
||||||
|
if use_safesearch and params["safesearch"]:
|
||||||
|
args["safe"] = (safesearch_map or filter_mapping)[params["safesearch"]]
|
||||||
|
|
||||||
|
params["url"] = f"https://www.google.com/wml/search?{urlencode(args)}"
|
||||||
|
params["headers"]["User-Agent"] = random.choice(nokia_useragents)
|
||||||
|
|
||||||
|
|
||||||
|
def request(query: str, params: "OnlineParams") -> None:
|
||||||
|
google_request(query, params)
|
||||||
|
|
||||||
|
|
||||||
|
def response(resp: "SXNG_Response") -> EngineResults:
|
||||||
results = EngineResults()
|
results = EngineResults()
|
||||||
|
dom = wml_dom(resp)
|
||||||
# convert the text to dom
|
|
||||||
dom = html.fromstring(resp.text)
|
|
||||||
|
|
||||||
# parse results
|
# parse results
|
||||||
for result in eval_xpath_list(dom, '//a[@data-ved and not(@class)]'):
|
for result in eval_xpath_list(dom, '//div[contains(@class, "zMzFAb")]'):
|
||||||
# pylint: disable=too-many-nested-blocks
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
title_tag = eval_xpath_getindex(result, './/div[@style]', 0, default=None)
|
title_tag = eval_xpath_getindex(
|
||||||
|
result, './/a[contains(@class, "fuLhoc")]//span[contains(@class, "CVA68e")]', 0, default=None
|
||||||
|
)
|
||||||
if title_tag is None:
|
if title_tag is None:
|
||||||
# this not one of the common google results *section*
|
# this not one of the common google results *section*
|
||||||
logger.debug("ignoring item from the result_xpath list: missing title")
|
logger.debug("ignoring item from the result_xpath list: missing title")
|
||||||
continue
|
continue
|
||||||
title = extract_text(title_tag)
|
title = extract_text(title_tag)
|
||||||
|
|
||||||
raw_url = result.get("href")
|
raw_url = eval_xpath_getindex(result, './/a[contains(@class, "fuLhoc")]/@href', 0, default=None)
|
||||||
if raw_url is None:
|
if raw_url is None:
|
||||||
logger.debug(
|
logger.debug(
|
||||||
'ignoring item from the result_xpath list: missing url of title "%s"',
|
'ignoring item from the result_xpath list: missing url of title "%s"',
|
||||||
@@ -389,30 +358,19 @@ def response(resp: "SXNG_Response"):
|
|||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if raw_url.startswith('/url?q='):
|
url = unwrap_google_url(raw_url)
|
||||||
url = unquote(raw_url[7:].split("&sa=U")[0]) # remove the google redirector
|
content = extract_text(
|
||||||
else:
|
eval_xpath(result, './/div[contains(@class, "taTFJ")]//span[contains(@class, "FrIlee")]')
|
||||||
url = raw_url
|
)
|
||||||
|
thumbnail = eval_xpath_getindex(result, './/img[contains(@src, "encrypted-tbn")]/@src', 0, default=None)
|
||||||
content_nodes = eval_xpath(result, '../..//div[contains(@class, "ilUpNd H66NU aSRlid")]')
|
results.add(
|
||||||
for item in content_nodes:
|
results.types.MainResult(
|
||||||
for script in item.xpath(".//script"):
|
url=url,
|
||||||
script.getparent().remove(script)
|
title=title or "",
|
||||||
|
content=content or "",
|
||||||
content = extract_text(content_nodes[0])
|
thumbnail=thumbnail or "",
|
||||||
|
)
|
||||||
# Images that are NOT the favicon
|
)
|
||||||
xpath_image = eval_xpath_getindex(result, './/img', index=0, default=None)
|
|
||||||
|
|
||||||
thumbnail = None
|
|
||||||
if xpath_image is not None:
|
|
||||||
thumbnail = xpath_image.get("src")
|
|
||||||
if thumbnail.startswith("data:image"):
|
|
||||||
img_id = xpath_image.get("id")
|
|
||||||
if img_id:
|
|
||||||
thumbnail = data_image_map.get(img_id)
|
|
||||||
|
|
||||||
results.append({"url": url, "title": title, "content": content or '', "thumbnail": thumbnail})
|
|
||||||
|
|
||||||
except Exception as e: # pylint: disable=broad-except
|
except Exception as e: # pylint: disable=broad-except
|
||||||
logger.error(e, exc_info=True)
|
logger.error(e, exc_info=True)
|
||||||
@@ -420,10 +378,8 @@ def response(resp: "SXNG_Response"):
|
|||||||
|
|
||||||
# parse suggestion
|
# parse suggestion
|
||||||
for suggestion in eval_xpath_list(dom, suggestion_xpath):
|
for suggestion in eval_xpath_list(dom, suggestion_xpath):
|
||||||
# append suggestion
|
results.add(results.types.LegacyResult(suggestion=extract_text(suggestion)))
|
||||||
results.append({"suggestion": extract_text(suggestion)})
|
|
||||||
|
|
||||||
# return results
|
|
||||||
return results
|
return results
|
||||||
|
|
||||||
|
|
||||||
@@ -456,14 +412,12 @@ skip_countries = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
def fetch_traits(engine_traits: EngineTraits, add_domains: bool = True):
|
def fetch_traits(engine_traits: EngineTraits):
|
||||||
"""Fetch languages from Google."""
|
"""Fetch languages from Google."""
|
||||||
# pylint: disable=import-outside-toplevel, too-many-branches
|
# pylint: disable=import-outside-toplevel, too-many-branches
|
||||||
|
|
||||||
from searx.network import get # see https://github.com/searxng/searxng/issues/762
|
from searx.network import get # see https://github.com/searxng/searxng/issues/762
|
||||||
|
|
||||||
engine_traits.custom["supported_domains"] = {}
|
|
||||||
|
|
||||||
resp = get("https://www.google.com/preferences", timeout=5)
|
resp = get("https://www.google.com/preferences", timeout=5)
|
||||||
if not resp.ok:
|
if not resp.ok:
|
||||||
raise RuntimeError("Response from Google preferences is not OK.")
|
raise RuntimeError("Response from Google preferences is not OK.")
|
||||||
@@ -514,22 +468,3 @@ def fetch_traits(engine_traits: EngineTraits, add_domains: bool = True):
|
|||||||
|
|
||||||
# alias regions
|
# alias regions
|
||||||
engine_traits.regions["zh-CN"] = "HK"
|
engine_traits.regions["zh-CN"] = "HK"
|
||||||
|
|
||||||
# supported domains
|
|
||||||
|
|
||||||
if add_domains:
|
|
||||||
resp = get("https://www.google.com/supported_domains", timeout=5)
|
|
||||||
if not resp.ok:
|
|
||||||
raise RuntimeError("Response from Google supported domains is not OK.")
|
|
||||||
|
|
||||||
for domain in resp.text.split():
|
|
||||||
domain = domain.strip()
|
|
||||||
if not domain or domain in [
|
|
||||||
".google.com",
|
|
||||||
]:
|
|
||||||
continue
|
|
||||||
region = domain.split(".")[-1].upper()
|
|
||||||
engine_traits.custom["supported_domains"][region] = "www" + domain
|
|
||||||
if region == "HK":
|
|
||||||
# There is no google.cn, we use .com.hk for zh-CN
|
|
||||||
engine_traits.custom["supported_domains"]["CN"] = "www" + domain
|
|
||||||
|
|||||||
@@ -95,12 +95,11 @@ def request(query: str, params: "OnlineParams") -> None:
|
|||||||
token = _cse_token()
|
token = _cse_token()
|
||||||
|
|
||||||
google_info = get_google_info(params, traits)
|
google_info = get_google_info(params, traits)
|
||||||
info: dict[str, str] = google_info["params"]
|
|
||||||
|
|
||||||
args = {
|
args = {
|
||||||
"rsz": "filtered_cse",
|
"rsz": "filtered_cse",
|
||||||
"num": str(page_size),
|
"num": str(page_size),
|
||||||
"hl": info["hl"],
|
"hl": google_info["params"]["hl"],
|
||||||
"cselibv": token["cselibv"],
|
"cselibv": token["cselibv"],
|
||||||
"cx": CX,
|
"cx": CX,
|
||||||
"q": query,
|
"q": query,
|
||||||
@@ -114,10 +113,6 @@ def request(query: str, params: "OnlineParams") -> None:
|
|||||||
start_date, end_date = _get_start_and_end_date_str(params["time_range"])
|
start_date, end_date = _get_start_and_end_date_str(params["time_range"])
|
||||||
args["sort"] = f"date:r:{start_date}:{end_date}"
|
args["sort"] = f"date:r:{start_date}:{end_date}"
|
||||||
|
|
||||||
if info.get("lr"):
|
|
||||||
args["lr"] = info["lr"]
|
|
||||||
if info.get("cr"):
|
|
||||||
args["cr"] = info["cr"]
|
|
||||||
if google_info["country"] not in (None, "ZZ"):
|
if google_info["country"] not in (None, "ZZ"):
|
||||||
args["gl"] = google_info["country"]
|
args["gl"] = google_info["country"]
|
||||||
if token["exp"]:
|
if token["exp"]:
|
||||||
|
|||||||
@@ -1,122 +1,75 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""This is the implementation of the Google Images engine using the internal
|
"""Google Images: see :py:obj:`searx.engines.google`."""
|
||||||
Google API used by the Google Go Android app.
|
|
||||||
|
|
||||||
This internal API offer results in
|
import typing as t
|
||||||
|
from urllib.parse import parse_qs, unquote, urlparse
|
||||||
- JSON (``_fmt:json``)
|
|
||||||
- Protobuf_ (``_fmt:pb``)
|
|
||||||
- Protobuf_ compressed? (``_fmt:pc``)
|
|
||||||
- HTML (``_fmt:html``)
|
|
||||||
- Protobuf_ encoded in JSON (``_fmt:jspb``).
|
|
||||||
|
|
||||||
.. _Protobuf: https://en.wikipedia.org/wiki/Protocol_Buffers
|
|
||||||
"""
|
|
||||||
|
|
||||||
from urllib.parse import urlencode
|
|
||||||
from json import loads
|
|
||||||
|
|
||||||
from searx.engines.google import fetch_traits # pylint: disable=unused-import
|
from searx.engines.google import fetch_traits # pylint: disable=unused-import
|
||||||
from searx.engines.google import (
|
from searx.engines.google import google_request, wml_dom
|
||||||
get_google_info,
|
from searx.result_types import EngineResults
|
||||||
time_range_dict,
|
from searx.utils import eval_xpath_list
|
||||||
detect_google_sorry,
|
|
||||||
)
|
if t.TYPE_CHECKING:
|
||||||
|
from searx.extended_types import SXNG_Response
|
||||||
|
from searx.search.processors import OnlineParams
|
||||||
|
|
||||||
# about
|
# about
|
||||||
about = {
|
about = {
|
||||||
"website": 'https://images.google.com',
|
"website": "https://images.google.com",
|
||||||
"wikidata_id": 'Q521550',
|
"wikidata_id": "Q521550",
|
||||||
"official_api_documentation": 'https://developers.google.com/custom-search',
|
"official_api_documentation": "https://developers.google.com/custom-search",
|
||||||
"use_official_api": False,
|
"use_official_api": False,
|
||||||
"require_api_key": False,
|
"require_api_key": False,
|
||||||
"results": 'JSON',
|
"results": "XML",
|
||||||
}
|
}
|
||||||
|
|
||||||
# engine dependent config
|
# engine dependent config
|
||||||
categories = ['images', 'web']
|
categories = ["images", "web"]
|
||||||
paging = True
|
paging = True
|
||||||
max_page = 50
|
max_page = 50
|
||||||
"""`Google max 50 pages`_
|
"""Google supports up to 50 pages of results, see the `Google max_page discussion`_.
|
||||||
|
|
||||||
.. _Google max 50 pages: https://github.com/searxng/searxng/issues/2982
|
.. _Google max_page discussion: https://github.com/searxng/searxng/issues/2982
|
||||||
"""
|
"""
|
||||||
|
|
||||||
time_range_support = True
|
time_range_support = True
|
||||||
language_support = True
|
language_support = True
|
||||||
safesearch = True
|
safesearch = True
|
||||||
|
|
||||||
filter_mapping = {0: 'images', 1: 'active', 2: 'active'}
|
filter_mapping = {0: "images", 1: "active", 2: "active"}
|
||||||
|
|
||||||
|
|
||||||
def request(query, params):
|
def request(query: str, params: "OnlineParams") -> None:
|
||||||
"""Google-Image search request"""
|
google_request(
|
||||||
|
query,
|
||||||
google_info = get_google_info(params, traits)
|
params,
|
||||||
|
{"tbm": "isch"},
|
||||||
query_url = (
|
eng_traits=traits,
|
||||||
'https://'
|
safesearch_map=filter_mapping,
|
||||||
+ google_info['subdomain']
|
use_locales=False,
|
||||||
+ '/search'
|
|
||||||
+ '?'
|
|
||||||
+ urlencode({'q': query, 'tbm': "isch", **google_info['params'], 'asearch': 'isch'})
|
|
||||||
# don't urlencode this because wildly different AND bad results
|
|
||||||
# pagination uses Zero-based numbering
|
|
||||||
+ f'&async=_fmt:json,p:1,ijn:{params["pageno"] - 1}'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if params['time_range'] in time_range_dict:
|
|
||||||
query_url += '&' + urlencode({'tbs': 'qdr:' + time_range_dict[params['time_range']]})
|
def response(resp: "SXNG_Response") -> EngineResults:
|
||||||
if params['safesearch']:
|
results = EngineResults()
|
||||||
query_url += '&' + urlencode({'safe': filter_mapping[params['safesearch']]})
|
dom = wml_dom(resp)
|
||||||
params['url'] = query_url
|
|
||||||
params['cookies'] = google_info['cookies']
|
for link in eval_xpath_list(dom, '//a[contains(@href, "/imgres?")]'):
|
||||||
params['headers'].update(google_info['headers'])
|
qs = parse_qs(urlparse(link.get("href", "")).query)
|
||||||
# this ua will allow getting ~50 results instead of 10. #1641
|
img_src = qs.get("imgurl", [""])[0]
|
||||||
params['headers']['User-Agent'] = (
|
url = qs.get("imgrefurl", [""])[0]
|
||||||
'NSTN/3.60.474802233.release Dalvik/2.1.0 (Linux; U; Android 12;' f' {google_info.get("country", "US")}) gzip'
|
if not img_src or not url:
|
||||||
|
continue
|
||||||
|
width, height = qs.get("w", [""])[0], qs.get("h", [""])[0]
|
||||||
|
tbnid = qs.get("tbnid", [""])[0]
|
||||||
|
results.add(
|
||||||
|
results.types.Image(
|
||||||
|
url=url,
|
||||||
|
title=unquote(urlparse(img_src).path.rsplit("/", 1)[-1]) or urlparse(url).netloc,
|
||||||
|
img_src=img_src,
|
||||||
|
thumbnail_src=f"https://encrypted-tbn0.gstatic.com/images?q=tbn:{tbnid}",
|
||||||
|
resolution=f"{width} x {height}" if width and height else "",
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
return params
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp):
|
|
||||||
"""Get response from google's search request"""
|
|
||||||
results = []
|
|
||||||
|
|
||||||
detect_google_sorry(resp)
|
|
||||||
|
|
||||||
json_start = resp.text.find('{"ischj":')
|
|
||||||
json_data = loads(resp.text[json_start:])
|
|
||||||
|
|
||||||
for item in json_data["ischj"].get("metadata", []):
|
|
||||||
result_item = {
|
|
||||||
'url': item["result"]["referrer_url"],
|
|
||||||
'title': item["result"]["page_title"],
|
|
||||||
'content': item["text_in_grid"]["snippet"],
|
|
||||||
'source': item["result"]["site_title"],
|
|
||||||
'resolution': f'{item["original_image"]["width"]} x {item["original_image"]["height"]}',
|
|
||||||
'img_src': item["original_image"]["url"],
|
|
||||||
'thumbnail_src': item["thumbnail"]["url"],
|
|
||||||
'template': 'images.html',
|
|
||||||
}
|
|
||||||
|
|
||||||
author = item["result"].get('iptc', {}).get('creator')
|
|
||||||
if author:
|
|
||||||
result_item['author'] = ', '.join(author)
|
|
||||||
|
|
||||||
copyright_notice = item["result"].get('iptc', {}).get('copyright_notice')
|
|
||||||
if copyright_notice:
|
|
||||||
result_item['source'] += ' | ' + copyright_notice
|
|
||||||
|
|
||||||
freshness_date = item["result"].get("freshness_date")
|
|
||||||
if freshness_date:
|
|
||||||
result_item['source'] += ' | ' + freshness_date
|
|
||||||
|
|
||||||
file_size = item.get('gsa', {}).get('file_size')
|
|
||||||
if file_size:
|
|
||||||
result_item['source'] += ' (%s)' % file_size
|
|
||||||
|
|
||||||
results.append(result_item)
|
|
||||||
|
|
||||||
return results
|
return results
|
||||||
|
|||||||
@@ -1,324 +1,91 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""This is the implementation of the Google News engine.
|
"""Google News: see :py:obj:`searx.engines.google`."""
|
||||||
|
|
||||||
Google News has a different region handling compared to Google WEB.
|
|
||||||
|
|
||||||
- the ``ceid`` argument has to be set (:py:obj:`ceid_list`)
|
|
||||||
- the hl_ argument has to be set correctly (and different to Google WEB)
|
|
||||||
- the gl_ argument is mandatory
|
|
||||||
|
|
||||||
If one of this argument is not set correctly, the request is redirected to
|
|
||||||
CONSENT dialog::
|
|
||||||
|
|
||||||
https://consent.google.com/m?continue=
|
|
||||||
|
|
||||||
The google news API ignores some parameters from the common :ref:`google API`:
|
|
||||||
|
|
||||||
- num_ : the number of search results is ignored / there is no paging all
|
|
||||||
results for a query term are in the first response.
|
|
||||||
- save_ : is ignored / Google-News results are always *SafeSearch*
|
|
||||||
|
|
||||||
.. _hl: https://developers.google.com/custom-search/docs/xml_results#hlsp
|
|
||||||
.. _gl: https://developers.google.com/custom-search/docs/xml_results#glsp
|
|
||||||
.. _num: https://developers.google.com/custom-search/docs/xml_results#numsp
|
|
||||||
.. _save: https://developers.google.com/custom-search/docs/xml_results#safesp
|
|
||||||
"""
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|
||||||
import json
|
from searx.engines.google import fetch_traits # pylint: disable=unused-import
|
||||||
import base64
|
from searx.engines.google import google_request, unwrap_google_url, wml_dom
|
||||||
from urllib.parse import urlencode
|
from searx.result_types import EngineResults
|
||||||
from lxml import html
|
|
||||||
import babel
|
|
||||||
|
|
||||||
from searx import locales
|
|
||||||
from searx.utils import (
|
from searx.utils import (
|
||||||
eval_xpath,
|
|
||||||
eval_xpath_list,
|
|
||||||
eval_xpath_getindex,
|
eval_xpath_getindex,
|
||||||
|
eval_xpath_list,
|
||||||
extract_text,
|
extract_text,
|
||||||
)
|
)
|
||||||
|
|
||||||
from searx.engines.google import fetch_traits as _fetch_traits # pylint: disable=unused-import
|
|
||||||
from searx.engines.google import (
|
|
||||||
get_google_info,
|
|
||||||
detect_google_sorry,
|
|
||||||
)
|
|
||||||
from searx.enginelib.traits import EngineTraits
|
|
||||||
|
|
||||||
from searx.result_types import EngineResults
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
from searx.search.processors import OnlineParams
|
from searx.search.processors import OnlineParams
|
||||||
|
|
||||||
# about
|
# about
|
||||||
about = {
|
about = {
|
||||||
"website": "https://news.google.com",
|
"website": "https://www.google.com",
|
||||||
"wikidata_id": "Q12020",
|
"wikidata_id": "Q12020",
|
||||||
"official_api_documentation": "https://developers.google.com/custom-search",
|
"official_api_documentation": "https://developers.google.com/custom-search",
|
||||||
"use_official_api": False,
|
"use_official_api": False,
|
||||||
"require_api_key": False,
|
"require_api_key": False,
|
||||||
"results": "HTML",
|
"results": "XML",
|
||||||
}
|
}
|
||||||
|
|
||||||
# engine dependent config
|
# engine dependent config
|
||||||
categories = ["news"]
|
categories = ["news"]
|
||||||
paging = False
|
paging = True
|
||||||
|
max_page = 50
|
||||||
|
"""Google supports up to 50 pages of results, see the `Google max_page discussion`_.
|
||||||
|
|
||||||
|
.. _Google max_page discussion: https://github.com/searxng/searxng/issues/2982
|
||||||
|
"""
|
||||||
time_range_support = False
|
time_range_support = False
|
||||||
language_support = True
|
language_support = True
|
||||||
|
safesearch = False
|
||||||
# Google-News results are always *SafeSearch*. Option 'safesearch' is set to
|
|
||||||
# False here.
|
|
||||||
#
|
|
||||||
# safesearch : results are identical for safesearch=0 and safesearch=2
|
|
||||||
safesearch = True
|
|
||||||
base_url: str = "https://news.google.com"
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
def request(query: str, params: "OnlineParams") -> None:
|
||||||
"""Google-News search request"""
|
google_request(
|
||||||
|
query,
|
||||||
sxng_locale = params.get("searxng_locale", "en-US")
|
params,
|
||||||
ceid: str = locales.get_engine_locale(
|
{"tbm": "nws"},
|
||||||
sxng_locale, traits.custom["ceid"], default="US:en"
|
eng_traits=traits,
|
||||||
) # pyright: ignore[reportAssignmentType]
|
use_time_range=False,
|
||||||
google_info = get_google_info(params, traits)
|
use_safesearch=False,
|
||||||
google_info["subdomain"] = "news.google.com" # google news has only one domain
|
use_locales=False,
|
||||||
|
|
||||||
ceid_region, ceid_lang = ceid.split(":")
|
|
||||||
ceid_lang, ceid_suffix = (
|
|
||||||
ceid_lang.split(":")
|
|
||||||
+ [
|
|
||||||
"",
|
|
||||||
]
|
|
||||||
)[:2]
|
|
||||||
|
|
||||||
google_info["params"]["hl"] = ceid_lang
|
|
||||||
|
|
||||||
if ceid_suffix and ceid_suffix not in ["Hans", "Hant"]:
|
|
||||||
|
|
||||||
if ceid_region.lower() == ceid_lang:
|
|
||||||
google_info["params"]["hl"] = ceid_lang + "-" + ceid_region
|
|
||||||
else:
|
|
||||||
google_info["params"]["hl"] = ceid_lang + "-" + ceid_suffix
|
|
||||||
|
|
||||||
elif ceid_region.lower() != ceid_lang:
|
|
||||||
|
|
||||||
if ceid_region in ["AT", "BE", "CH", "IL", "SA", "IN", "BD", "PT"]:
|
|
||||||
google_info["params"]["hl"] = ceid_lang
|
|
||||||
else:
|
|
||||||
google_info["params"]["hl"] = ceid_lang + "-" + ceid_region
|
|
||||||
|
|
||||||
google_info["params"]["lr"] = "lang_" + ceid_lang.split("-")[0]
|
|
||||||
google_info["params"]["gl"] = ceid_region
|
|
||||||
|
|
||||||
query_url = (
|
|
||||||
"https://"
|
|
||||||
+ google_info["subdomain"]
|
|
||||||
+ "/search?"
|
|
||||||
+ urlencode(
|
|
||||||
{"q": query, **google_info["params"]},
|
|
||||||
)
|
|
||||||
# ceid includes a ':' character which must not be urlencoded
|
|
||||||
+ ("&ceid=%s" % ceid)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
params["url"] = query_url
|
|
||||||
params["cookies"] = google_info["cookies"]
|
def _span_text(link, css_class: str):
|
||||||
params["headers"].update(google_info["headers"])
|
return extract_text(
|
||||||
|
eval_xpath_getindex(link, f'.//span[contains(@class, "{css_class}")]', 0, default=None),
|
||||||
|
allow_none=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def response(resp: "SXNG_Response") -> EngineResults:
|
def response(resp: "SXNG_Response") -> EngineResults:
|
||||||
"""Get response from google's search request"""
|
results = EngineResults()
|
||||||
|
seen = set()
|
||||||
res = EngineResults()
|
for link in eval_xpath_list(wml_dom(resp), '//a[contains(@href, "/url?q=")]'):
|
||||||
|
href = link.get("href")
|
||||||
detect_google_sorry(resp)
|
if not href:
|
||||||
|
|
||||||
# convert the text to dom
|
|
||||||
dom = html.fromstring(resp.text)
|
|
||||||
|
|
||||||
for result in eval_xpath_list(dom, "//div[@jslog and @data-n-tid and @jsdata]"):
|
|
||||||
|
|
||||||
url: str = eval_xpath_getindex(result, "./a[@target='_blank']/@href", 0, default=0)
|
|
||||||
if not url:
|
|
||||||
continue
|
|
||||||
if url.startswith("./"):
|
|
||||||
url = base_url + url[1:]
|
|
||||||
|
|
||||||
# The real URL is often encoded in the "jslog" attribute
|
|
||||||
jslog: str | None = eval_xpath_getindex(result, "./a[@target='_blank']/@jslog", 0, default=None)
|
|
||||||
|
|
||||||
# Try to extract the real URL from jslog
|
|
||||||
real_url: str | None = None
|
|
||||||
if jslog:
|
|
||||||
# jslog format is usually: "95014; 5:<base64>; track:click,vis". We
|
|
||||||
# want the second part (index 1) after splitting by ";"
|
|
||||||
parts: list[str] = jslog.split(";")
|
|
||||||
if len(parts) > 1:
|
|
||||||
b64_data: str = parts[1].split(":")[-1].strip()
|
|
||||||
# Pad base64 if necessary
|
|
||||||
b64_data += "=" * (-len(b64_data) % 4)
|
|
||||||
decoded_data: list[str | None] = json.loads(base64.b64decode(b64_data).decode("utf-8"))
|
|
||||||
# The URL is typically the last element in the decoded array
|
|
||||||
if (
|
|
||||||
isinstance(decoded_data, list)
|
|
||||||
and isinstance(decoded_data[-1], str)
|
|
||||||
and decoded_data[-1].startswith("http")
|
|
||||||
):
|
|
||||||
real_url = decoded_data[-1]
|
|
||||||
if real_url:
|
|
||||||
url = real_url
|
|
||||||
else:
|
|
||||||
logger.error(f"no real-url found: {url}")
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
title = extract_text(eval_xpath(result, "./h4")) or ""
|
url = unwrap_google_url(href)
|
||||||
|
if url in seen or "google.com/search" in url:
|
||||||
|
continue
|
||||||
|
|
||||||
# The pub_date is mostly a string like 'yesterday', not a real timezone
|
title = _span_text(link, "M3vVJe") or _span_text(link, "fuLhoc")
|
||||||
# date or time. Therefore we can't use publishedDate and place the
|
if not title:
|
||||||
# *pub* sting into the content.
|
continue
|
||||||
|
|
||||||
pub_date = extract_text(eval_xpath(result, ".//time"))
|
source = _span_text(link, "dXDvrc")
|
||||||
pub_origin = extract_text(eval_xpath(result, ".//div[contains(@class, 'vr1PYe')]"))
|
pub_date = _span_text(link, "YVIcad")
|
||||||
content = " / ".join([x for x in [pub_origin, pub_date] if x])
|
thumbnail = eval_xpath_getindex(link, './/img[contains(@src, "encrypted-tbn")]/@src', 0, default=None)
|
||||||
|
|
||||||
thumbnail: str = eval_xpath_getindex(result, ".//figure/img/@src", 0, default="")
|
seen.add(url)
|
||||||
if thumbnail and thumbnail.startswith("/"):
|
results.add(
|
||||||
thumbnail = base_url + thumbnail
|
results.types.MainResult(
|
||||||
|
|
||||||
res.add(
|
|
||||||
res.types.MainResult(
|
|
||||||
url=url,
|
url=url,
|
||||||
title=title,
|
title=title,
|
||||||
content=content,
|
content=" / ".join(x for x in [source, pub_date] if x),
|
||||||
thumbnail=thumbnail,
|
thumbnail=thumbnail or "",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
return res
|
return results
|
||||||
|
|
||||||
|
|
||||||
ceid_list = [
|
|
||||||
"AE:ar",
|
|
||||||
"AR:es-419",
|
|
||||||
"AT:de",
|
|
||||||
"AU:en",
|
|
||||||
"BD:bn",
|
|
||||||
"BE:fr",
|
|
||||||
"BE:nl",
|
|
||||||
"BG:bg",
|
|
||||||
"BR:pt-419",
|
|
||||||
"BW:en",
|
|
||||||
"CA:en",
|
|
||||||
"CA:fr",
|
|
||||||
"CH:de",
|
|
||||||
"CH:fr",
|
|
||||||
"CL:es-419",
|
|
||||||
"CN:zh-Hans",
|
|
||||||
"CO:es-419",
|
|
||||||
"CU:es-419",
|
|
||||||
"CZ:cs",
|
|
||||||
"DE:de",
|
|
||||||
"EE:et",
|
|
||||||
"EG:ar",
|
|
||||||
"ES:ca",
|
|
||||||
"ES:es",
|
|
||||||
"ET:en",
|
|
||||||
"FI:fi",
|
|
||||||
"FR:fr",
|
|
||||||
"GB:en",
|
|
||||||
"GH:en",
|
|
||||||
"GR:el",
|
|
||||||
"HK:zh-Hant",
|
|
||||||
"HU:hu",
|
|
||||||
"ID:en",
|
|
||||||
"ID:id",
|
|
||||||
"IE:en",
|
|
||||||
"IL:en",
|
|
||||||
"IL:he",
|
|
||||||
"IN:bn",
|
|
||||||
"IN:en",
|
|
||||||
"IN:gu",
|
|
||||||
"IN:hi",
|
|
||||||
"IN:ml",
|
|
||||||
"IN:mr",
|
|
||||||
"IN:pa",
|
|
||||||
"IN:ta",
|
|
||||||
"IN:te",
|
|
||||||
"IT:it",
|
|
||||||
"JP:ja",
|
|
||||||
"KE:en",
|
|
||||||
"KR:ko",
|
|
||||||
"LB:ar",
|
|
||||||
"LT:lt",
|
|
||||||
"LV:en",
|
|
||||||
"LV:lv",
|
|
||||||
"MA:fr",
|
|
||||||
"MY:en",
|
|
||||||
"MY:ms",
|
|
||||||
"NA:en",
|
|
||||||
"NG:en",
|
|
||||||
"NL:nl",
|
|
||||||
"NO:no",
|
|
||||||
"NZ:en",
|
|
||||||
"PH:en",
|
|
||||||
"PK:en",
|
|
||||||
"PL:pl",
|
|
||||||
"RO:ro",
|
|
||||||
"RS:sr",
|
|
||||||
"RU:ru",
|
|
||||||
"SA:ar",
|
|
||||||
"SE:sv",
|
|
||||||
"SG:en",
|
|
||||||
"SI:sl",
|
|
||||||
"SK:sk",
|
|
||||||
"SN:fr",
|
|
||||||
"TH:th",
|
|
||||||
"TR:tr",
|
|
||||||
"TZ:en",
|
|
||||||
"UA:ru",
|
|
||||||
"UA:uk",
|
|
||||||
"UG:en",
|
|
||||||
"US:en",
|
|
||||||
"VN:vi",
|
|
||||||
"ZA:en",
|
|
||||||
"ZW:en",
|
|
||||||
]
|
|
||||||
"""List of region/language combinations supported by Google News. Values of the
|
|
||||||
``ceid`` argument of the Google News REST API."""
|
|
||||||
|
|
||||||
|
|
||||||
_skip_values = [
|
|
||||||
"ET:en", # english (ethiopia)
|
|
||||||
"ID:en", # english (indonesia)
|
|
||||||
"LV:en", # english (latvia)
|
|
||||||
]
|
|
||||||
|
|
||||||
_ceid_locale_map = {"NO:no": "nb-NO"}
|
|
||||||
|
|
||||||
|
|
||||||
def fetch_traits(engine_traits: EngineTraits):
|
|
||||||
_fetch_traits(engine_traits, add_domains=False)
|
|
||||||
|
|
||||||
engine_traits.custom["ceid"] = {}
|
|
||||||
|
|
||||||
for ceid in ceid_list:
|
|
||||||
if ceid in _skip_values:
|
|
||||||
continue
|
|
||||||
|
|
||||||
region, lang = ceid.split(":")
|
|
||||||
x = lang.split("-")
|
|
||||||
if len(x) > 1:
|
|
||||||
if x[1] not in ["Hant", "Hans"]:
|
|
||||||
lang = x[0]
|
|
||||||
|
|
||||||
sxng_locale = _ceid_locale_map.get(ceid, lang + "-" + region)
|
|
||||||
try:
|
|
||||||
locale = babel.Locale.parse(sxng_locale, sep="-")
|
|
||||||
except babel.UnknownLocaleError:
|
|
||||||
print("ERROR: %s -> %s is unknown by babel" % (ceid, sxng_locale))
|
|
||||||
continue
|
|
||||||
|
|
||||||
engine_traits.custom["ceid"][locales.region_tag(locale)] = ceid
|
|
||||||
|
|||||||
@@ -77,8 +77,6 @@ def request(query: str, params: "OnlineParams") -> None:
|
|||||||
"""Google-Scholar search request"""
|
"""Google-Scholar search request"""
|
||||||
|
|
||||||
google_info = get_google_info(params, traits)
|
google_info = get_google_info(params, traits)
|
||||||
# subdomain is: scholar.google.xy
|
|
||||||
google_info["subdomain"] = google_info["subdomain"].replace("www.", "scholar.")
|
|
||||||
|
|
||||||
args = {
|
args = {
|
||||||
"q": query,
|
"q": query,
|
||||||
@@ -89,7 +87,7 @@ def request(query: str, params: "OnlineParams") -> None:
|
|||||||
}
|
}
|
||||||
args.update(time_range_args(params))
|
args.update(time_range_args(params))
|
||||||
|
|
||||||
params["url"] = "https://" + google_info["subdomain"] + "/scholar?" + urlencode(args)
|
params["url"] = "https://scholar.google.com/scholar?" + urlencode(args)
|
||||||
params["cookies"] = google_info["cookies"]
|
params["cookies"] = google_info["cookies"]
|
||||||
params["headers"].update(google_info["headers"])
|
params["headers"].update(google_info["headers"])
|
||||||
|
|
||||||
|
|||||||
@@ -1,185 +1,87 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""This is the implementation of the Google Videos engine.
|
"""Google Videos: see :py:obj:`searx.engines.google`."""
|
||||||
|
|
||||||
.. admonition:: Content-Security-Policy (CSP)
|
import typing as t
|
||||||
|
|
||||||
This engine needs to allow images from the `data URLs`_ (prefixed with the
|
|
||||||
``data:`` scheme)::
|
|
||||||
|
|
||||||
Header set Content-Security-Policy "img-src 'self' data: ;"
|
|
||||||
|
|
||||||
.. _data URLs:
|
|
||||||
https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
|
|
||||||
"""
|
|
||||||
import re
|
|
||||||
from urllib.parse import urlencode, urlparse, parse_qs, unquote
|
|
||||||
from lxml import html
|
|
||||||
|
|
||||||
from searx.utils import (
|
|
||||||
eval_xpath_list,
|
|
||||||
eval_xpath_getindex,
|
|
||||||
extract_text,
|
|
||||||
)
|
|
||||||
|
|
||||||
from searx.engines.google import fetch_traits # pylint: disable=unused-import
|
from searx.engines.google import fetch_traits # pylint: disable=unused-import
|
||||||
from searx.engines.google import (
|
from searx.engines.google import google_request, unwrap_google_url, wml_dom
|
||||||
get_google_info,
|
from searx.result_types import EngineResults
|
||||||
time_range_dict,
|
from searx.utils import (
|
||||||
filter_mapping,
|
eval_xpath_getindex,
|
||||||
suggestion_xpath,
|
eval_xpath_list,
|
||||||
detect_google_sorry,
|
extract_text,
|
||||||
ui_async,
|
get_embeded_stream_url,
|
||||||
|
parse_duration_string,
|
||||||
)
|
)
|
||||||
from searx.utils import get_embeded_stream_url
|
|
||||||
|
if t.TYPE_CHECKING:
|
||||||
|
from searx.extended_types import SXNG_Response
|
||||||
|
from searx.search.processors import OnlineParams
|
||||||
|
|
||||||
# about
|
# about
|
||||||
about = {
|
about = {
|
||||||
"website": 'https://www.google.com',
|
"website": "https://www.google.com",
|
||||||
"wikidata_id": 'Q219885',
|
"wikidata_id": "Q219885",
|
||||||
"official_api_documentation": 'https://developers.google.com/custom-search',
|
"official_api_documentation": "https://developers.google.com/custom-search",
|
||||||
"use_official_api": False,
|
"use_official_api": False,
|
||||||
"require_api_key": False,
|
"require_api_key": False,
|
||||||
"results": 'HTML',
|
"results": "XML",
|
||||||
}
|
}
|
||||||
|
|
||||||
# engine dependent config
|
# engine dependent config
|
||||||
categories = ['videos', 'web']
|
categories = ["videos", "web"]
|
||||||
paging = True
|
paging = True
|
||||||
max_page = 50
|
max_page = 50
|
||||||
|
"""Google supports up to 50 pages of results, see the `Google max_page discussion`_.
|
||||||
|
|
||||||
|
.. _Google max_page discussion: https://github.com/searxng/searxng/issues/2982
|
||||||
|
"""
|
||||||
language_support = True
|
language_support = True
|
||||||
time_range_support = True
|
time_range_support = True
|
||||||
safesearch = True
|
safesearch = True
|
||||||
|
|
||||||
|
|
||||||
# =26;[3,"dimg_ZNMiZPCqE4apxc8P3a2tuAQ_137"]a87;data:image/jpeg;base64,/9j/4AAQSkZJRgABA
|
def request(query: str, params: "OnlineParams") -> None:
|
||||||
# ...6T+9Nl4cnD+gr9OK8I56/tX3l86nWYw//2Q==26;
|
google_request(
|
||||||
RE_DATA_IMAGE = re.compile(r'"(dimg_[^"]*)"[^;]*;(data:image[^;]*;[^;]*);?')
|
query,
|
||||||
|
params,
|
||||||
|
{"tbm": "vid"},
|
||||||
def parse_data_images(text: str):
|
eng_traits=traits,
|
||||||
data_image_map = {}
|
use_locales=False,
|
||||||
|
|
||||||
for img_id, data_image in RE_DATA_IMAGE.findall(text):
|
|
||||||
end_pos = data_image.rfind("=")
|
|
||||||
if end_pos > 0:
|
|
||||||
data_image = data_image[: end_pos + 1]
|
|
||||||
data_image_map[img_id] = data_image
|
|
||||||
logger.debug("data:image objects --> %s", list(data_image_map.keys()))
|
|
||||||
return data_image_map
|
|
||||||
|
|
||||||
|
|
||||||
def request(query, params):
|
|
||||||
"""Google-Video search request"""
|
|
||||||
google_info = get_google_info(params, traits)
|
|
||||||
start = (params['pageno'] - 1) * 10
|
|
||||||
|
|
||||||
query_url = (
|
|
||||||
'https://'
|
|
||||||
+ google_info['subdomain']
|
|
||||||
+ '/search'
|
|
||||||
+ "?"
|
|
||||||
+ urlencode(
|
|
||||||
{
|
|
||||||
'q': query,
|
|
||||||
'tbm': "vid",
|
|
||||||
'start': start,
|
|
||||||
**google_info['params'],
|
|
||||||
'asearch': 'arc',
|
|
||||||
'async': ui_async(start),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if params['time_range'] in time_range_dict:
|
|
||||||
query_url += '&' + urlencode({'tbs': 'qdr:' + time_range_dict[params['time_range']]})
|
|
||||||
if 'safesearch' in params:
|
|
||||||
query_url += '&' + urlencode({'safe': filter_mapping[params['safesearch']]})
|
|
||||||
params['url'] = query_url
|
|
||||||
|
|
||||||
params['cookies'] = google_info['cookies']
|
def response(resp: "SXNG_Response") -> EngineResults:
|
||||||
params['headers'].update(google_info['headers'])
|
results = EngineResults()
|
||||||
return params
|
|
||||||
|
|
||||||
|
for result in eval_xpath_list(wml_dom(resp), '//div[contains(@class, "zMzFAb")]'):
|
||||||
def response(resp):
|
|
||||||
"""Get response from google's search request"""
|
|
||||||
results = []
|
|
||||||
|
|
||||||
detect_google_sorry(resp)
|
|
||||||
data_image_map = parse_data_images(resp.text)
|
|
||||||
|
|
||||||
# convert the text to dom
|
|
||||||
dom = html.fromstring(resp.text)
|
|
||||||
|
|
||||||
result_divs = eval_xpath_list(dom, '//div[contains(@class, "MjjYud")]')
|
|
||||||
|
|
||||||
# parse results
|
|
||||||
for result in result_divs:
|
|
||||||
title = extract_text(
|
title = extract_text(
|
||||||
eval_xpath_getindex(result, './/h3[contains(@class, "LC20lb")] | .//div[@role="heading"]', 0, default=None),
|
eval_xpath_getindex(result, './/span[contains(@class, "CVA68e")]', 0, default=None),
|
||||||
allow_none=True,
|
allow_none=True,
|
||||||
)
|
)
|
||||||
url = eval_xpath_getindex(
|
raw_url = eval_xpath_getindex(result, './/a[contains(@class, "fuLhoc")]/@href', 0, default=None)
|
||||||
result, './/a[@jsname="UWckNb"]/@href | .//a[contains(@href, "/url?q=")]/@href', 0, default=None
|
if not title or not raw_url:
|
||||||
|
continue
|
||||||
|
|
||||||
|
url = unwrap_google_url(raw_url)
|
||||||
|
thumbnail = eval_xpath_getindex(result, './/img[contains(@class, "SygO9d")]/@src', 0, default="")
|
||||||
|
if "/default.jpg" in thumbnail:
|
||||||
|
thumbnail = thumbnail.split("?")[0].replace("/default.jpg", "/hqdefault.jpg")
|
||||||
|
length = None
|
||||||
|
for span in eval_xpath_list(result, './/span[contains(@class, "YVIcad")]'):
|
||||||
|
length = parse_duration_string(extract_text(span) or "")
|
||||||
|
if length:
|
||||||
|
break
|
||||||
|
|
||||||
|
results.add(
|
||||||
|
results.types.MainResult(
|
||||||
|
url=url,
|
||||||
|
title=title,
|
||||||
|
thumbnail=thumbnail,
|
||||||
|
length=length,
|
||||||
|
iframe_src=get_embeded_stream_url(url) or "",
|
||||||
|
template="videos.html",
|
||||||
)
|
)
|
||||||
if url and url.startswith('/url?q='):
|
|
||||||
url = unquote(url[7:].split('&sa=U')[0])
|
|
||||||
|
|
||||||
content = extract_text(
|
|
||||||
eval_xpath_getindex(result, './/div[contains(@class, "ITZIwc")]', 0, default=None), allow_none=True
|
|
||||||
)
|
)
|
||||||
pub_info = extract_text(
|
|
||||||
eval_xpath_getindex(
|
|
||||||
result, './/div[contains(@class, "gqF9jc")] | .//div[contains(@class, "WRu9Cd")]', 0, default=None
|
|
||||||
),
|
|
||||||
allow_none=True,
|
|
||||||
)
|
|
||||||
# Broader XPath to find any <img> element
|
|
||||||
thumbnail = eval_xpath_getindex(result, './/img/@src', 0, default=None)
|
|
||||||
duration = extract_text(
|
|
||||||
eval_xpath_getindex(result, './/span[contains(@class, "k1U36b")]', 0, default=None), allow_none=True
|
|
||||||
)
|
|
||||||
video_id = eval_xpath_getindex(result, './/div[@jscontroller="rTuANe"]/@data-vid', 0, default=None)
|
|
||||||
|
|
||||||
# Fallback for video_id from URL if not found via XPath
|
|
||||||
if not video_id and url and 'youtube.com' in url:
|
|
||||||
parsed_url = urlparse(url)
|
|
||||||
video_id = parse_qs(parsed_url.query).get('v', [None])[0]
|
|
||||||
|
|
||||||
# Handle thumbnail
|
|
||||||
if thumbnail and thumbnail.startswith('data:image'):
|
|
||||||
img_id = eval_xpath_getindex(result, './/img/@id', 0, default=None)
|
|
||||||
if img_id and img_id in data_image_map:
|
|
||||||
thumbnail = data_image_map[img_id]
|
|
||||||
else:
|
|
||||||
thumbnail = None
|
|
||||||
if not thumbnail and video_id:
|
|
||||||
thumbnail = f"https://img.youtube.com/vi/{video_id}/hqdefault.jpg"
|
|
||||||
|
|
||||||
# Handle video embed URL
|
|
||||||
embed_url = None
|
|
||||||
if video_id:
|
|
||||||
embed_url = get_embeded_stream_url(f"https://www.youtube.com/watch?v={video_id}")
|
|
||||||
elif url:
|
|
||||||
embed_url = get_embeded_stream_url(url)
|
|
||||||
|
|
||||||
# Only append results with valid title and url
|
|
||||||
if title and url:
|
|
||||||
results.append(
|
|
||||||
{
|
|
||||||
'url': url,
|
|
||||||
'title': title,
|
|
||||||
'content': content or '',
|
|
||||||
'author': pub_info,
|
|
||||||
'thumbnail': thumbnail,
|
|
||||||
'length': duration,
|
|
||||||
'iframe_src': embed_url,
|
|
||||||
'template': 'videos.html',
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
# parse suggestion
|
|
||||||
for suggestion in eval_xpath_list(dom, suggestion_xpath):
|
|
||||||
results.append({'suggestion': extract_text(suggestion)})
|
|
||||||
|
|
||||||
return results
|
return results
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from dateutil import parser
|
from dateutil import parser
|
||||||
|
|
||||||
|
|
||||||
about = {
|
about = {
|
||||||
# pylint: disable=line-too-long
|
# pylint: disable=line-too-long
|
||||||
"website": "https://hex.pm/",
|
"website": "https://hex.pm/",
|
||||||
|
|||||||
@@ -108,14 +108,12 @@ def get_infobox(alt_forms, result_url, definitions):
|
|||||||
infobox_content.append(f'<p><i>Other forms:</i> {", ".join(alt_forms[1:])}</p>')
|
infobox_content.append(f'<p><i>Other forms:</i> {", ".join(alt_forms[1:])}</p>')
|
||||||
|
|
||||||
# definitions
|
# definitions
|
||||||
infobox_content.append(
|
infobox_content.append('''
|
||||||
'''
|
|
||||||
<small><a href="https://www.edrdg.org/wiki/index.php/JMdict-EDICT_Dictionary_Project">JMdict</a>
|
<small><a href="https://www.edrdg.org/wiki/index.php/JMdict-EDICT_Dictionary_Project">JMdict</a>
|
||||||
and <a href="https://www.edrdg.org/enamdict/enamdict_doc.html">JMnedict</a>
|
and <a href="https://www.edrdg.org/enamdict/enamdict_doc.html">JMnedict</a>
|
||||||
by <a href="https://www.edrdg.org/edrdg/licence.html">EDRDG</a>, CC BY-SA 3.0.</small>
|
by <a href="https://www.edrdg.org/edrdg/licence.html">EDRDG</a>, CC BY-SA 3.0.</small>
|
||||||
<ul>
|
<ul>
|
||||||
'''
|
''')
|
||||||
)
|
|
||||||
for pos, engdef, extra in definitions:
|
for pos, engdef, extra in definitions:
|
||||||
if pos == 'Wikipedia definition':
|
if pos == 'Wikipedia definition':
|
||||||
infobox_content.append('</ul><small>Wikipedia, CC BY-SA 3.0.</small><ul>')
|
infobox_content.append('</ul><small>Wikipedia, CC BY-SA 3.0.</small><ul>')
|
||||||
|
|||||||
@@ -6,6 +6,27 @@ Lofgren .
|
|||||||
.. _Marginalia Search:
|
.. _Marginalia Search:
|
||||||
https://about.marginalia-search.com/
|
https://about.marginalia-search.com/
|
||||||
|
|
||||||
|
|
||||||
|
.. _marginalia filters:
|
||||||
|
|
||||||
|
Marginalia Filters
|
||||||
|
=================
|
||||||
|
|
||||||
|
Custom filters enable server-side customization of Marginalia search results.
|
||||||
|
Filter definitions are written in XML and scoped to an API key. Filters can
|
||||||
|
not be used with the public API key ``public``. The
|
||||||
|
`Marginalia Filter Editor`_ can be used to create custom filters with a GUI.
|
||||||
|
Alternatively, filters can be written manually in XML. To associate a filter
|
||||||
|
definition with an API key, upload the XML data to the ``/filter/<NAME>`` API
|
||||||
|
endpoint, where ``<NAME>`` is the name for the newly created filter. For more
|
||||||
|
information, see the `Marginalia filters announcement blogpost`_ and the
|
||||||
|
official `Marginalia API documentation`_.
|
||||||
|
|
||||||
|
.. _Marginalia Filter Editor: https://marginalia-search.com/filters
|
||||||
|
.. _Marginalia filters announcement blogpost: https://www.marginalia.nu/log/a_127_index_filtering/
|
||||||
|
.. _Marginalia API documentation: https://about.marginalia-search.com/article/api/
|
||||||
|
|
||||||
|
|
||||||
Configuration
|
Configuration
|
||||||
=============
|
=============
|
||||||
|
|
||||||
@@ -13,6 +34,10 @@ The engine has the following required settings:
|
|||||||
|
|
||||||
- :py:obj:`api_key`
|
- :py:obj:`api_key`
|
||||||
|
|
||||||
|
The engine has the following optional settings:
|
||||||
|
|
||||||
|
- :py:obj:`filter_name`
|
||||||
|
|
||||||
You can configure a Marginalia engine by:
|
You can configure a Marginalia engine by:
|
||||||
|
|
||||||
.. code:: yaml
|
.. code:: yaml
|
||||||
@@ -21,6 +46,7 @@ You can configure a Marginalia engine by:
|
|||||||
engine: marginalia
|
engine: marginalia
|
||||||
shortcut: mar
|
shortcut: mar
|
||||||
api_key: ...
|
api_key: ...
|
||||||
|
filter_name: ...
|
||||||
|
|
||||||
Implementations
|
Implementations
|
||||||
===============
|
===============
|
||||||
@@ -29,6 +55,8 @@ Implementations
|
|||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
|
|
||||||
|
from searx.network import get
|
||||||
from searx.utils import searxng_useragent
|
from searx.utils import searxng_useragent
|
||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
@@ -54,6 +82,8 @@ api_key = None
|
|||||||
https://about.marginalia-search.com/article/api/
|
https://about.marginalia-search.com/article/api/
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
filter_name: str | None = None
|
||||||
|
"""The name of the custom filter to apply to each search."""
|
||||||
|
|
||||||
|
|
||||||
class ApiSearchResult(t.TypedDict):
|
class ApiSearchResult(t.TypedDict):
|
||||||
@@ -83,6 +113,25 @@ class ApiSearchResults(t.TypedDict):
|
|||||||
results: list[ApiSearchResult]
|
results: list[ApiSearchResult]
|
||||||
|
|
||||||
|
|
||||||
|
def _marginalia_headers() -> dict[str, t.Any]:
|
||||||
|
return {
|
||||||
|
"User-Agent": searxng_useragent(),
|
||||||
|
"API-Key": api_key,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _get_filter_names() -> list[str]:
|
||||||
|
|
||||||
|
resp = get(f"{base_url}/filter", headers=_marginalia_headers())
|
||||||
|
if resp.ok:
|
||||||
|
filter_names = resp.json()
|
||||||
|
else:
|
||||||
|
filter_names = []
|
||||||
|
if not isinstance(filter_names, list):
|
||||||
|
raise TypeError("marginalia api returned invalid filter list format")
|
||||||
|
return filter_names
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: dict[str, t.Any]):
|
def request(query: str, params: dict[str, t.Any]):
|
||||||
|
|
||||||
query_params = {
|
query_params = {
|
||||||
@@ -91,10 +140,11 @@ def request(query: str, params: dict[str, t.Any]):
|
|||||||
"nsfw": min(params["safesearch"], 1),
|
"nsfw": min(params["safesearch"], 1),
|
||||||
"query": query,
|
"query": query,
|
||||||
}
|
}
|
||||||
|
if filter_name:
|
||||||
|
query_params["filter"] = filter_name
|
||||||
|
|
||||||
params["url"] = f"{base_url}/search?{urlencode(query_params)}"
|
params["url"] = f"{base_url}/search?{urlencode(query_params)}"
|
||||||
params["headers"]["User-Agent"] = searxng_useragent()
|
params["headers"].update(_marginalia_headers())
|
||||||
params["headers"]["API-Key"] = api_key
|
|
||||||
|
|
||||||
|
|
||||||
def response(resp: SXNG_Response):
|
def response(resp: SXNG_Response):
|
||||||
@@ -114,14 +164,18 @@ def response(resp: SXNG_Response):
|
|||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
||||||
def init(engine_settings: dict[str, t.Any]):
|
def init(_: dict[str, t.Any]):
|
||||||
|
|
||||||
_api_key = engine_settings.get("api_key")
|
if not api_key:
|
||||||
if not _api_key:
|
|
||||||
logger.error("missing api_key: see https://about.marginalia-search.com/article/api")
|
logger.error("missing api_key: see https://about.marginalia-search.com/article/api")
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if _api_key == "public":
|
if api_key == "public":
|
||||||
logger.error("invalid api_key (%s): see https://about.marginalia-search.com/article/api", api_key)
|
logger.error("invalid api_key (%s): see https://about.marginalia-search.com/article/api", api_key)
|
||||||
|
elif filter_name:
|
||||||
|
filter_names: list[str] = _get_filter_names()
|
||||||
|
if filter_name not in filter_names:
|
||||||
|
logger.error(f"invalid value for filter_name: '{filter_name}'")
|
||||||
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ except ImportError:
|
|||||||
|
|
||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
|
|
||||||
|
|
||||||
engine_type = 'offline'
|
engine_type = 'offline'
|
||||||
|
|
||||||
# mongodb connection variables
|
# mongodb connection variables
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from dateutil import parser
|
from dateutil import parser
|
||||||
|
|
||||||
|
|
||||||
about = {
|
about = {
|
||||||
"website": "https://npms.io/",
|
"website": "https://npms.io/",
|
||||||
"wikidata_id": "Q7067518",
|
"wikidata_id": "Q7067518",
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ from datetime import datetime
|
|||||||
from searx.result_types import EngineResults, WeatherAnswer
|
from searx.result_types import EngineResults, WeatherAnswer
|
||||||
from searx import weather
|
from searx import weather
|
||||||
|
|
||||||
|
|
||||||
about = {
|
about = {
|
||||||
"website": "https://open-meteo.com",
|
"website": "https://open-meteo.com",
|
||||||
"wikidata_id": None,
|
"wikidata_id": None,
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ from flask_babel import gettext
|
|||||||
|
|
||||||
from searx.data import OSM_KEYS_TAGS, CURRENCIES
|
from searx.data import OSM_KEYS_TAGS, CURRENCIES
|
||||||
from searx.external_urls import get_external_url
|
from searx.external_urls import get_external_url
|
||||||
from searx.engines.wikidata import send_wikidata_query, sparql_string_escape, get_thumbnail
|
from searx.wikidata import send_wikidata_query
|
||||||
|
from searx.engines.wikidata import sparql_string_escape, get_thumbnail
|
||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
|
|
||||||
# about
|
# about
|
||||||
@@ -290,7 +291,8 @@ def get_title_address(result):
|
|||||||
'house_number': address_raw.get('house_number'),
|
'house_number': address_raw.get('house_number'),
|
||||||
'road': address_raw.get('road'),
|
'road': address_raw.get('road'),
|
||||||
'locality': address_raw.get(
|
'locality': address_raw.get(
|
||||||
'city', address_raw.get('town', address_raw.get('village')) # noqa
|
'city',
|
||||||
|
address_raw.get('town', address_raw.get('village')), # noqa
|
||||||
), # noqa
|
), # noqa
|
||||||
'postcode': address_raw.get('postcode'),
|
'postcode': address_raw.get('postcode'),
|
||||||
'country': address_raw.get('country'),
|
'country': address_raw.get('country'),
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ Openverse (formerly known as: Creative Commons search engine) [Images]
|
|||||||
from json import loads
|
from json import loads
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
|
|
||||||
|
|
||||||
about = {
|
about = {
|
||||||
"website": 'https://openverse.org/',
|
"website": 'https://openverse.org/',
|
||||||
"wikidata_id": None,
|
"wikidata_id": None,
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ from searx.enginelib import EngineCache
|
|||||||
from searx.exceptions import SearxEngineAPIException, SearxEngineAccessDeniedException
|
from searx.exceptions import SearxEngineAPIException, SearxEngineAccessDeniedException
|
||||||
from searx.network import get
|
from searx.network import get
|
||||||
|
|
||||||
|
|
||||||
# about
|
# about
|
||||||
about = {
|
about = {
|
||||||
"website": 'https://www.pexels.com',
|
"website": 'https://www.pexels.com',
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ Implementations
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
import time
|
import time
|
||||||
import random
|
import random
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ from searx.utils import eval_xpath_list, eval_xpath, extract_text, get_embeded_s
|
|||||||
from searx.locales import region_tag
|
from searx.locales import region_tag
|
||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
from lxml.etree import ElementBase
|
from lxml.etree import ElementBase
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ Implementations
|
|||||||
===============
|
===============
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|
||||||
from datetime import date, timedelta
|
from datetime import date, timedelta
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ from searx.exceptions import SearxEngineAPIException
|
|||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
|
|
||||||
|
|
||||||
base_url = 'http://localhost:8983'
|
base_url = 'http://localhost:8983'
|
||||||
collection = ''
|
collection = ''
|
||||||
rows = 10
|
rows = 10
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ Implementations
|
|||||||
===============
|
===============
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
import sqlite3
|
import sqlite3
|
||||||
import contextlib
|
import contextlib
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ Startpage's category (for Web-search, News, Videos, ..) is set by
|
|||||||
Supported categories are ``web``, ``news`` and ``images``.
|
Supported categories are ``web``, ``news`` and ``images``.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=too-many-statements
|
# pylint: disable=too-many-statements
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|||||||
@@ -74,7 +74,6 @@ Implementations
|
|||||||
===============
|
===============
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from dateutil.parser import parse
|
from dateutil.parser import parse
|
||||||
from searx.utils import html_to_text, humanize_number
|
from searx.utils import html_to_text, humanize_number
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ from lxml import html
|
|||||||
from searx.result_types import EngineResults
|
from searx.result_types import EngineResults
|
||||||
from searx.utils import eval_xpath_list, eval_xpath, extract_text
|
from searx.utils import eval_xpath_list, eval_xpath, extract_text
|
||||||
|
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
from lxml.etree import ElementBase
|
from lxml.etree import ElementBase
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
|
|||||||
@@ -3,28 +3,34 @@
|
|||||||
|
|
||||||
Some implementations are shared from :ref:`wikipedia engine`.
|
Some implementations are shared from :ref:`wikipedia engine`.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=missing-class-docstring
|
# pylint: disable=missing-class-docstring
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|
||||||
import os
|
|
||||||
from hashlib import md5
|
from hashlib import md5
|
||||||
from urllib.parse import urlencode, unquote
|
from urllib.parse import urlencode, unquote
|
||||||
from json import loads
|
from json import loads
|
||||||
|
|
||||||
from dateutil.parser import isoparse
|
|
||||||
from babel.dates import format_datetime, format_date, format_time, get_datetime_format
|
|
||||||
|
|
||||||
from searx.enginelib import EngineCache
|
|
||||||
from searx.data import WIKIDATA_UNITS
|
|
||||||
from searx.network import post, get
|
from searx.network import post, get
|
||||||
from searx.utils import searxng_useragent, get_string_replaces_function
|
from searx.utils import get_string_replaces_function
|
||||||
from searx.external_urls import get_external_url, get_earth_coordinates_url, area_to_osm_zoom
|
from searx.external_urls import area_to_osm_zoom
|
||||||
from searx.engines.wikipedia import (
|
from searx.engines.wikipedia import (
|
||||||
fetch_wikimedia_traits,
|
fetch_wikimedia_traits,
|
||||||
get_wiki_params,
|
get_wiki_params,
|
||||||
)
|
)
|
||||||
from searx.enginelib.traits import EngineTraits
|
from searx.enginelib.traits import EngineTraits
|
||||||
|
from searx.wikidata_properties import (
|
||||||
|
QUERY_TEMPLATE,
|
||||||
|
WDArticle,
|
||||||
|
WDAttrList,
|
||||||
|
WDGeoAttribute,
|
||||||
|
WDImageAttribute,
|
||||||
|
WDURLAttribute,
|
||||||
|
get_attributes,
|
||||||
|
)
|
||||||
|
from searx.wikidata import SPARQL_ENDPOINT_URL, SPARQL_EXPLAIN_URL, get_wikidata_headers
|
||||||
|
|
||||||
if t.TYPE_CHECKING:
|
if t.TYPE_CHECKING:
|
||||||
from searx.extended_types import SXNG_Response
|
from searx.extended_types import SXNG_Response
|
||||||
@@ -47,78 +53,6 @@ display_type = ["infobox"]
|
|||||||
one will add a hit to the result list. The first one will show a hit in the
|
one will add a hit to the result list. The first one will show a hit in the
|
||||||
info box. Both values can be set, or one of the two can be set."""
|
info box. Both values can be set, or one of the two can be set."""
|
||||||
|
|
||||||
CACHE: EngineCache
|
|
||||||
"""Persistent (SQLite) key/value cache that deletes its values after ``expire``
|
|
||||||
seconds."""
|
|
||||||
|
|
||||||
# SPARQL
|
|
||||||
SPARQL_ENDPOINT_URL = "https://query.wikidata.org/sparql"
|
|
||||||
SPARQL_EXPLAIN_URL = "https://query.wikidata.org/bigdata/namespace/wdq/sparql?explain"
|
|
||||||
WDPType = dict[str | tuple[str, str], str]
|
|
||||||
WIKIDATA_PROPERTIES: WDPType = {
|
|
||||||
"P434": "MusicBrainz",
|
|
||||||
"P435": "MusicBrainz",
|
|
||||||
"P436": "MusicBrainz",
|
|
||||||
"P966": "MusicBrainz",
|
|
||||||
"P345": "IMDb",
|
|
||||||
"P2397": "YouTube",
|
|
||||||
"P1651": "YouTube",
|
|
||||||
"P2002": "Twitter",
|
|
||||||
"P2013": "Facebook",
|
|
||||||
"P2003": "Instagram",
|
|
||||||
"P4033": "Mastodon",
|
|
||||||
"P11947": "Lemmy",
|
|
||||||
"P12622": "PeerTube",
|
|
||||||
}
|
|
||||||
|
|
||||||
# SERVICE wikibase:mwapi : https://www.mediawiki.org/wiki/Wikidata_Query_Service/User_Manual/MWAPI
|
|
||||||
# SERVICE wikibase:label: https://en.wikibooks.org/wiki/SPARQL/SERVICE_-_Label#Manual_Label_SERVICE
|
|
||||||
# https://en.wikibooks.org/wiki/SPARQL/WIKIDATA_Precision,_Units_and_Coordinates
|
|
||||||
# https://www.mediawiki.org/wiki/Wikibase/Indexing/RDF_Dump_Format#Data_model
|
|
||||||
# optimization:
|
|
||||||
# * https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/query_optimization
|
|
||||||
# * https://github.com/blazegraph/database/wiki/QueryHints
|
|
||||||
QUERY_TEMPLATE = """
|
|
||||||
SELECT ?item ?itemLabel ?itemDescription ?lat ?long %SELECT%
|
|
||||||
WHERE
|
|
||||||
{
|
|
||||||
SERVICE wikibase:mwapi {
|
|
||||||
bd:serviceParam wikibase:endpoint "www.wikidata.org";
|
|
||||||
wikibase:api "EntitySearch";
|
|
||||||
wikibase:limit 1;
|
|
||||||
mwapi:search "%QUERY%";
|
|
||||||
mwapi:language "%LANGUAGE%".
|
|
||||||
?item wikibase:apiOutputItem mwapi:item.
|
|
||||||
}
|
|
||||||
hint:Prior hint:runFirst "true".
|
|
||||||
|
|
||||||
%WHERE%
|
|
||||||
|
|
||||||
SERVICE wikibase:label {
|
|
||||||
bd:serviceParam wikibase:language "%LANGUAGE%,en".
|
|
||||||
?item rdfs:label ?itemLabel .
|
|
||||||
?item schema:description ?itemDescription .
|
|
||||||
%WIKIBASE_LABELS%
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
GROUP BY ?item ?itemLabel ?itemDescription ?lat ?long %GROUP_BY%
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Get the calendar names and the property names
|
|
||||||
QUERY_PROPERTY_NAMES = """
|
|
||||||
SELECT ?item ?name
|
|
||||||
WHERE {
|
|
||||||
{
|
|
||||||
SELECT ?item
|
|
||||||
WHERE { ?item wdt:P279* wd:Q12132 }
|
|
||||||
} UNION {
|
|
||||||
VALUES ?item { %ATTRIBUTES% }
|
|
||||||
}
|
|
||||||
OPTIONAL { ?item rdfs:label ?name. }
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
|
|
||||||
# see the property "dummy value" of https://www.wikidata.org/wiki/Q2013 (Wikidata)
|
# see the property "dummy value" of https://www.wikidata.org/wiki/Q2013 (Wikidata)
|
||||||
# hard coded here to avoid to an additional SPARQL request when the server starts
|
# hard coded here to avoid to an additional SPARQL request when the server starts
|
||||||
DUMMY_ENTITY_URLS = set(
|
DUMMY_ENTITY_URLS = set(
|
||||||
@@ -130,357 +64,13 @@ DUMMY_ENTITY_URLS = set(
|
|||||||
# https://lists.w3.org/Archives/Public/public-rdf-dawg/2011OctDec/0175.html
|
# https://lists.w3.org/Archives/Public/public-rdf-dawg/2011OctDec/0175.html
|
||||||
sparql_string_escape = get_string_replaces_function(
|
sparql_string_escape = get_string_replaces_function(
|
||||||
# fmt: off
|
# fmt: off
|
||||||
{
|
{"\t": "\\\t", "\n": "\\\n", "\r": "\\\r", "\b": "\\\b", "\f": "\\\f", "\"": "\\\"", "'": "\\'", "\\": "\\\\"}
|
||||||
"\t": "\\\t",
|
|
||||||
"\n": "\\\n",
|
|
||||||
"\r": "\\\r",
|
|
||||||
"\b": "\\\b",
|
|
||||||
"\f": "\\\f",
|
|
||||||
"\"": "\\\"",
|
|
||||||
"\'": "\\\'",
|
|
||||||
"\\": "\\\\"
|
|
||||||
}
|
|
||||||
# fmt: on
|
# fmt: on
|
||||||
)
|
)
|
||||||
|
|
||||||
replace_http_by_https = get_string_replaces_function({"http:": "https:"})
|
replace_http_by_https = get_string_replaces_function({"http:": "https:"})
|
||||||
|
|
||||||
|
|
||||||
class WDAttribute:
|
|
||||||
|
|
||||||
def __init__(self, name: str):
|
|
||||||
self.name: str = name
|
|
||||||
|
|
||||||
def get_select(self):
|
|
||||||
return "(group_concat(distinct ?{name};separator=', ') as ?{name}s)".replace("{name}", self.name)
|
|
||||||
|
|
||||||
def get_label(self, language: str):
|
|
||||||
return get_label_for_entity(self.name, language)
|
|
||||||
|
|
||||||
def get_where(self):
|
|
||||||
return "OPTIONAL { ?item wdt:{name} ?{name} . }".replace("{name}", self.name)
|
|
||||||
|
|
||||||
def get_wikibase_label(self) -> str:
|
|
||||||
return ""
|
|
||||||
|
|
||||||
def get_group_by(self) -> str:
|
|
||||||
return ""
|
|
||||||
|
|
||||||
def get_str(self, result: dict[str, t.Any], language: str) -> str | None: # pylint: disable=unused-argument
|
|
||||||
return result.get(self.name + "s")
|
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return "<" + str(type(self).__name__) + ":" + self.name + ">"
|
|
||||||
|
|
||||||
|
|
||||||
class WDAmountAttribute(WDAttribute):
|
|
||||||
def get_select(self) -> str:
|
|
||||||
return "?{name} ?{name}Unit".replace("{name}", self.name)
|
|
||||||
|
|
||||||
def get_where(self):
|
|
||||||
return """ OPTIONAL { ?item p:{name} ?{name}Node .
|
|
||||||
?{name}Node rdf:type wikibase:BestRank ; ps:{name} ?{name} .
|
|
||||||
OPTIONAL { ?{name}Node psv:{name}/wikibase:quantityUnit ?{name}Unit. } }""".replace(
|
|
||||||
'{name}', self.name
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_group_by(self) -> str:
|
|
||||||
return self.get_select()
|
|
||||||
|
|
||||||
def get_str(self, result: dict[str, t.Any], language: str) -> str | None:
|
|
||||||
value: str | None = result.get(self.name)
|
|
||||||
unit: str | None = result.get(self.name + "Unit")
|
|
||||||
if unit is not None:
|
|
||||||
unit = unit.replace("http://www.wikidata.org/entity/", "")
|
|
||||||
return str(value) + " " + get_label_for_entity(unit, language)
|
|
||||||
return value
|
|
||||||
|
|
||||||
|
|
||||||
class WDArticle(WDAttribute):
|
|
||||||
|
|
||||||
def __init__(self, language: str, kwargs: dict[str, t.Any] | None = None):
|
|
||||||
super().__init__("wikipedia")
|
|
||||||
self.language: str = language
|
|
||||||
self.kwargs: dict[str, t.Any] = kwargs or {}
|
|
||||||
|
|
||||||
def get_label(self, language: str):
|
|
||||||
# language parameter is ignored
|
|
||||||
return "Wikipedia ({language})".replace("{language}", self.language)
|
|
||||||
|
|
||||||
def get_select(self):
|
|
||||||
return "?article{language} ?articleName{language}".replace("{language}", self.language)
|
|
||||||
|
|
||||||
def get_where(self):
|
|
||||||
return """OPTIONAL { ?article{language} schema:about ?item ;
|
|
||||||
schema:inLanguage "{language}" ;
|
|
||||||
schema:isPartOf <https://{language}.wikipedia.org/> ;
|
|
||||||
schema:name ?articleName{language} . }""".replace(
|
|
||||||
'{language}', self.language
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_group_by(self):
|
|
||||||
return self.get_select()
|
|
||||||
|
|
||||||
def get_str(self, result: dict[str, t.Any], language: str) -> str | None:
|
|
||||||
key = "article{language}".replace("{language}", self.language)
|
|
||||||
return result.get(key)
|
|
||||||
|
|
||||||
|
|
||||||
class WDLabelAttribute(WDAttribute):
|
|
||||||
def get_select(self):
|
|
||||||
return "(group_concat(distinct ?{name}Label;separator=', ') as ?{name}Labels)".replace("{name}", self.name)
|
|
||||||
|
|
||||||
def get_where(self):
|
|
||||||
return "OPTIONAL { ?item wdt:{name} ?{name} . }".replace("{name}", self.name)
|
|
||||||
|
|
||||||
def get_wikibase_label(self) -> str:
|
|
||||||
return "?{name} rdfs:label ?{name}Label .".replace("{name}", self.name)
|
|
||||||
|
|
||||||
def get_str(self, result: dict[str, t.Any], language: str) -> str | None:
|
|
||||||
return result.get(self.name + "Labels")
|
|
||||||
|
|
||||||
|
|
||||||
class WDURLAttribute(WDAttribute):
|
|
||||||
|
|
||||||
HTTP_WIKIMEDIA_IMAGE: str = "http://commons.wikimedia.org/wiki/Special:FilePath/"
|
|
||||||
|
|
||||||
def __init__(
|
|
||||||
self,
|
|
||||||
name: str,
|
|
||||||
url_id: str | None = None,
|
|
||||||
url_path_prefix: str | None = None,
|
|
||||||
kwargs: dict[str, t.Any] | None = None,
|
|
||||||
):
|
|
||||||
"""
|
|
||||||
:param url_id: ID matching one key in ``external_urls.json`` for
|
|
||||||
converting IDs to full URLs.
|
|
||||||
|
|
||||||
:param url_path_prefix: Path prefix if the values are of format
|
|
||||||
``account@domain``. If provided, value are rewritten to
|
|
||||||
``https://<domain><url_path_prefix><account>``. For example::
|
|
||||||
|
|
||||||
WDURLAttribute('P4033', url_path_prefix='/@')
|
|
||||||
|
|
||||||
Adds Property `P4033 <https://www.wikidata.org/wiki/Property:P4033>`_
|
|
||||||
to the wikidata query. This field might return for example
|
|
||||||
``libreoffice@fosstodon.org`` and the URL built from this is then:
|
|
||||||
|
|
||||||
- account: ``libreoffice``
|
|
||||||
- domain: ``fosstodon.org``
|
|
||||||
- result url: https://fosstodon.org/@libreoffice
|
|
||||||
"""
|
|
||||||
|
|
||||||
super().__init__(name)
|
|
||||||
self.url_id: str | None = url_id
|
|
||||||
self.url_path_prefix: str | None = url_path_prefix
|
|
||||||
self.kwargs: dict[str, t.Any] = kwargs or {}
|
|
||||||
|
|
||||||
def get_str(self, result: dict[str, t.Any], language: str) -> str | None:
|
|
||||||
value: str | None = result.get(self.name + "s")
|
|
||||||
if not value:
|
|
||||||
return None
|
|
||||||
|
|
||||||
value = value.split(",")[0]
|
|
||||||
if self.url_id:
|
|
||||||
url_id = self.url_id
|
|
||||||
if value.startswith(WDURLAttribute.HTTP_WIKIMEDIA_IMAGE):
|
|
||||||
value = value[len(WDURLAttribute.HTTP_WIKIMEDIA_IMAGE) :]
|
|
||||||
url_id = "wikimedia_image"
|
|
||||||
return get_external_url(url_id, value)
|
|
||||||
|
|
||||||
if self.url_path_prefix:
|
|
||||||
[account, domain] = [x.strip("@ ") for x in value.rsplit("@", 1)]
|
|
||||||
return f"https://{domain}{self.url_path_prefix}{account}"
|
|
||||||
|
|
||||||
return value
|
|
||||||
|
|
||||||
|
|
||||||
class WDGeoAttribute(WDAttribute):
|
|
||||||
def get_label(self, language: str):
|
|
||||||
return "OpenStreetMap"
|
|
||||||
|
|
||||||
def get_select(self):
|
|
||||||
return "?{name}Lat ?{name}Long".replace("{name}", self.name)
|
|
||||||
|
|
||||||
def get_where(self):
|
|
||||||
return """OPTIONAL { ?item p:{name}/psv:{name} [
|
|
||||||
wikibase:geoLatitude ?{name}Lat ;
|
|
||||||
wikibase:geoLongitude ?{name}Long ] }""".replace(
|
|
||||||
'{name}', self.name
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_group_by(self):
|
|
||||||
return self.get_select()
|
|
||||||
|
|
||||||
def get_str(self, result: dict[str, t.Any], language: str) -> str | None:
|
|
||||||
latitude: str | None = result.get(self.name + "Lat")
|
|
||||||
longitude: str | None = result.get(self.name + "Long")
|
|
||||||
if latitude and longitude:
|
|
||||||
return latitude + " " + longitude
|
|
||||||
return None
|
|
||||||
|
|
||||||
def get_geo_url(self, result: dict[str, t.Any], osm_zoom: int = 19) -> str | None:
|
|
||||||
latitude: str | None = result.get(self.name + "Lat")
|
|
||||||
longitude: str | None = result.get(self.name + "Long")
|
|
||||||
if latitude and longitude:
|
|
||||||
return get_earth_coordinates_url(latitude, longitude, osm_zoom)
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
class WDImageAttribute(WDURLAttribute):
|
|
||||||
|
|
||||||
def __init__(self, name: str, url_id: str | None = None, priority: int = 100):
|
|
||||||
super().__init__(name, url_id)
|
|
||||||
self.priority: int = priority
|
|
||||||
|
|
||||||
|
|
||||||
class WDDateAttribute(WDAttribute):
|
|
||||||
def get_select(self):
|
|
||||||
return "?{name} ?{name}timePrecision ?{name}timeZone ?{name}timeCalendar".replace("{name}", self.name)
|
|
||||||
|
|
||||||
def get_where(self):
|
|
||||||
# To remove duplicate, add
|
|
||||||
# FILTER NOT EXISTS { ?item p:{name}/psv:{name}/wikibase:timeValue ?{name}bis FILTER (?{name}bis < ?{name}) }
|
|
||||||
# this filter is too slow, so the response function ignore duplicate results
|
|
||||||
# (see the seen_entities variable)
|
|
||||||
return """OPTIONAL { ?item p:{name}/psv:{name} [
|
|
||||||
wikibase:timeValue ?{name} ;
|
|
||||||
wikibase:timePrecision ?{name}timePrecision ;
|
|
||||||
wikibase:timeTimezone ?{name}timeZone ;
|
|
||||||
wikibase:timeCalendarModel ?{name}timeCalendar ] . }
|
|
||||||
hint:Prior hint:rangeSafe true;""".replace(
|
|
||||||
'{name}', self.name
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_group_by(self):
|
|
||||||
return self.get_select()
|
|
||||||
|
|
||||||
def format_8(self, value: str, locale: str) -> str: # pylint: disable=unused-argument
|
|
||||||
# precision: less than a year
|
|
||||||
return value
|
|
||||||
|
|
||||||
def format_9(self, value: str, locale: str) -> str:
|
|
||||||
year = int(value)
|
|
||||||
# precision: year
|
|
||||||
if year < 1584:
|
|
||||||
if year < 0:
|
|
||||||
return str(year - 1)
|
|
||||||
return str(year)
|
|
||||||
timestamp = isoparse(value)
|
|
||||||
return format_date(timestamp, format="yyyy", locale=locale)
|
|
||||||
|
|
||||||
def format_10(self, value: str, locale: str) -> str:
|
|
||||||
# precision: month
|
|
||||||
timestamp = isoparse(value)
|
|
||||||
return format_date(timestamp, format="MMMM y", locale=locale)
|
|
||||||
|
|
||||||
def format_11(self, value: str, locale: str) -> str:
|
|
||||||
# precision: day
|
|
||||||
timestamp = isoparse(value)
|
|
||||||
return format_date(timestamp, format="full", locale=locale)
|
|
||||||
|
|
||||||
def format_13(self, value: str, locale: str) -> str:
|
|
||||||
timestamp = isoparse(value)
|
|
||||||
# precision: minute
|
|
||||||
return (
|
|
||||||
get_datetime_format(format, locale=locale)
|
|
||||||
.replace("'", "")
|
|
||||||
.replace("{0}", format_time(timestamp, "full", tzinfo=None, locale=locale))
|
|
||||||
.replace("{1}", format_date(timestamp, "short", locale=locale))
|
|
||||||
)
|
|
||||||
|
|
||||||
def format_14(self, value: str, locale: str) -> str:
|
|
||||||
# precision: second.
|
|
||||||
return format_datetime(isoparse(value), format="full", locale=locale)
|
|
||||||
|
|
||||||
DATE_FORMAT: dict[str, tuple[str, int]] = {
|
|
||||||
"0": ("format_8", 1000000000),
|
|
||||||
"1": ("format_8", 100000000),
|
|
||||||
"2": ("format_8", 10000000),
|
|
||||||
"3": ("format_8", 1000000),
|
|
||||||
"4": ("format_8", 100000),
|
|
||||||
"5": ("format_8", 10000),
|
|
||||||
"6": ("format_8", 1000),
|
|
||||||
"7": ("format_8", 100),
|
|
||||||
"8": ("format_8", 10),
|
|
||||||
"9": ("format_9", 1), # year
|
|
||||||
"10": ("format_10", 1), # month
|
|
||||||
"11": ("format_11", 0), # day
|
|
||||||
"12": ("format_13", 0), # hour (not supported by babel, display minute)
|
|
||||||
"13": ("format_13", 0), # minute
|
|
||||||
"14": ("format_14", 0), # second
|
|
||||||
}
|
|
||||||
|
|
||||||
def get_str(self, result: dict[str, t.Any], language: str) -> str | None:
|
|
||||||
value: str | None = result.get(self.name)
|
|
||||||
if value == "" or value is None:
|
|
||||||
return None
|
|
||||||
_p: str = result.get(self.name + "timePrecision") or "1"
|
|
||||||
date_format = WDDateAttribute.DATE_FORMAT.get(_p)
|
|
||||||
if date_format is not None:
|
|
||||||
format_method = getattr(self, date_format[0])
|
|
||||||
precision: int = date_format[1]
|
|
||||||
try:
|
|
||||||
if precision >= 1:
|
|
||||||
_t = value.split("-")
|
|
||||||
if value.startswith("-"):
|
|
||||||
value = "-" + _t[1]
|
|
||||||
else:
|
|
||||||
value = _t[0]
|
|
||||||
return format_method(value, language)
|
|
||||||
except Exception: # pylint: disable=broad-except
|
|
||||||
return value
|
|
||||||
return value
|
|
||||||
|
|
||||||
|
|
||||||
WDAttrType = (
|
|
||||||
WDAttribute
|
|
||||||
| WDAmountAttribute
|
|
||||||
| WDArticle
|
|
||||||
| WDLabelAttribute
|
|
||||||
| WDURLAttribute
|
|
||||||
| WDGeoAttribute
|
|
||||||
| WDImageAttribute
|
|
||||||
| WDDateAttribute
|
|
||||||
)
|
|
||||||
WDAttrList = list[WDAttrType]
|
|
||||||
|
|
||||||
|
|
||||||
def get_headers() -> dict[str, str]:
|
|
||||||
# user agent: https://www.mediawiki.org/wiki/Wikidata_Query_Service/User_Manual#Query_limits
|
|
||||||
return {
|
|
||||||
"Accept": "application/sparql-results+json",
|
|
||||||
"User-Agent": f"wikidata engine - {searxng_useragent()}",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def get_label_for_entity(entity_id: str, language: str) -> str:
|
|
||||||
name = WIKIDATA_PROPERTIES.get(entity_id)
|
|
||||||
if name is None:
|
|
||||||
name = WIKIDATA_PROPERTIES.get((entity_id, language))
|
|
||||||
if name is None:
|
|
||||||
name = WIKIDATA_PROPERTIES.get((entity_id, language.split("-")[0]))
|
|
||||||
if name is None:
|
|
||||||
name = WIKIDATA_PROPERTIES.get((entity_id, "en"))
|
|
||||||
if name is None:
|
|
||||||
name = entity_id
|
|
||||||
return name
|
|
||||||
|
|
||||||
|
|
||||||
def send_wikidata_query(query: str, method: str = "GET", **kwargs: dict[str, t.Any]) -> dict[str, t.Any]:
|
|
||||||
if method == "GET":
|
|
||||||
# query will be cached by wikidata
|
|
||||||
http_response = get(SPARQL_ENDPOINT_URL + "?" + urlencode({"query": query}), headers=get_headers(), **kwargs)
|
|
||||||
else:
|
|
||||||
# query won't be cached by wikidata
|
|
||||||
http_response = post(SPARQL_ENDPOINT_URL, data={"query": query}, headers=get_headers(), **kwargs)
|
|
||||||
if http_response.status_code != 200:
|
|
||||||
logger.debug("SPARQL endpoint error %s", http_response.content.decode())
|
|
||||||
logger.debug("request time %s", str(http_response.elapsed))
|
|
||||||
http_response.raise_for_status()
|
|
||||||
return loads(http_response.content.decode())
|
|
||||||
|
|
||||||
|
|
||||||
def request(query: str, params: "OnlineParams") -> None:
|
def request(query: str, params: "OnlineParams") -> None:
|
||||||
|
|
||||||
attributes: WDAttrList
|
attributes: WDAttrList
|
||||||
@@ -491,7 +81,7 @@ def request(query: str, params: "OnlineParams") -> None:
|
|||||||
params["method"] = "POST"
|
params["method"] = "POST"
|
||||||
params["url"] = SPARQL_ENDPOINT_URL
|
params["url"] = SPARQL_ENDPOINT_URL
|
||||||
params["data"] = {"query": query}
|
params["data"] = {"query": query}
|
||||||
params["headers"] = get_headers()
|
params["headers"] = get_wikidata_headers()
|
||||||
|
|
||||||
# additional parameters (not a part of OnlineParams)
|
# additional parameters (not a part of OnlineParams)
|
||||||
params["language"] = eng_tag # type: ignore
|
params["language"] = eng_tag # type: ignore
|
||||||
@@ -584,7 +174,6 @@ def get_results(
|
|||||||
for attribute in attributes:
|
for attribute in attributes:
|
||||||
value: str | None = attribute.get_str(attribute_result, language)
|
value: str | None = attribute.get_str(attribute_result, language)
|
||||||
if value is not None and value != "":
|
if value is not None and value != "":
|
||||||
|
|
||||||
if isinstance(attribute, (WDURLAttribute, WDArticle)):
|
if isinstance(attribute, (WDURLAttribute, WDArticle)):
|
||||||
# get_select() method : there is group_concat(distinct ...;separator=", ")
|
# get_select() method : there is group_concat(distinct ...;separator=", ")
|
||||||
# split the value here
|
# split the value here
|
||||||
@@ -670,212 +259,15 @@ def get_query(query: str, language: str) -> tuple[str, WDAttrList]:
|
|||||||
return query, attributes
|
return query, attributes
|
||||||
|
|
||||||
|
|
||||||
def get_attributes(language: str):
|
|
||||||
# pylint: disable=too-many-statements
|
|
||||||
attributes: WDAttrList = []
|
|
||||||
|
|
||||||
def add_value(name: str):
|
|
||||||
attributes.append(WDAttribute(name))
|
|
||||||
|
|
||||||
def add_amount(name: str):
|
|
||||||
attributes.append(WDAmountAttribute(name))
|
|
||||||
|
|
||||||
def add_label(name: str):
|
|
||||||
attributes.append(WDLabelAttribute(name))
|
|
||||||
|
|
||||||
def add_url(name: str, url_id: str | None = None, url_path_prefix: str | None = None, **kwargs: dict[str, t.Any]):
|
|
||||||
attributes.append(WDURLAttribute(name, url_id, url_path_prefix, kwargs))
|
|
||||||
|
|
||||||
def add_image(name: str, url_id: str | None = None, priority: int = 1):
|
|
||||||
attributes.append(WDImageAttribute(name, url_id, priority))
|
|
||||||
|
|
||||||
def add_date(name: str):
|
|
||||||
attributes.append(WDDateAttribute(name))
|
|
||||||
|
|
||||||
# Dates
|
|
||||||
for p in [
|
|
||||||
"P571", # inception date
|
|
||||||
"P576", # dissolution date
|
|
||||||
"P580", # start date
|
|
||||||
"P582", # end date
|
|
||||||
"P569", # date of birth
|
|
||||||
"P570", # date of death
|
|
||||||
"P619", # date of spacecraft launch
|
|
||||||
"P620",
|
|
||||||
]: # date of spacecraft landing
|
|
||||||
add_date(p)
|
|
||||||
|
|
||||||
for p in [
|
|
||||||
"P27", # country of citizenship
|
|
||||||
"P495", # country of origin
|
|
||||||
"P17", # country
|
|
||||||
"P159",
|
|
||||||
]: # headquarters location
|
|
||||||
add_label(p)
|
|
||||||
|
|
||||||
# Places
|
|
||||||
for p in [
|
|
||||||
"P36", # capital
|
|
||||||
"P35", # head of state
|
|
||||||
"P6", # head of government
|
|
||||||
"P122", # basic form of government
|
|
||||||
"P37",
|
|
||||||
]: # official language
|
|
||||||
add_label(p)
|
|
||||||
|
|
||||||
add_value("P1082") # population
|
|
||||||
add_amount("P2046") # area
|
|
||||||
add_amount("P281") # postal code
|
|
||||||
add_label("P38") # currency
|
|
||||||
add_amount("P2048") # height (building)
|
|
||||||
|
|
||||||
# Media
|
|
||||||
for p in [
|
|
||||||
"P400", # platform (videogames, computing)
|
|
||||||
"P50", # author
|
|
||||||
"P170", # creator
|
|
||||||
"P57", # director
|
|
||||||
"P175", # performer
|
|
||||||
"P178", # developer
|
|
||||||
"P162", # producer
|
|
||||||
"P176", # manufacturer
|
|
||||||
"P58", # screenwriter
|
|
||||||
"P272", # production company
|
|
||||||
"P264", # record label
|
|
||||||
"P123", # publisher
|
|
||||||
"P449", # original network
|
|
||||||
"P750", # distributed by
|
|
||||||
"P86",
|
|
||||||
]: # composer
|
|
||||||
add_label(p)
|
|
||||||
|
|
||||||
add_date("P577") # publication date
|
|
||||||
add_label("P136") # genre (music, film, artistic...)
|
|
||||||
add_label("P364") # original language
|
|
||||||
add_value("P212") # ISBN-13
|
|
||||||
add_value("P957") # ISBN-10
|
|
||||||
add_label("P275") # copyright license
|
|
||||||
add_label("P277") # programming language
|
|
||||||
add_value("P348") # version
|
|
||||||
add_label("P840") # narrative location
|
|
||||||
|
|
||||||
# Languages
|
|
||||||
add_value("P1098") # number of speakers
|
|
||||||
add_label("P282") # writing system
|
|
||||||
add_label("P1018") # language regulatory body
|
|
||||||
add_value("P218") # language code (ISO 639-1)
|
|
||||||
|
|
||||||
# Other
|
|
||||||
add_label("P169") # ceo
|
|
||||||
add_label("P112") # founded by
|
|
||||||
add_label("P1454") # legal form (company, organization)
|
|
||||||
add_label("P137") # operator (service, facility, ...)
|
|
||||||
add_label("P1029") # crew members (tripulation)
|
|
||||||
add_label("P225") # taxon name
|
|
||||||
add_value("P274") # chemical formula
|
|
||||||
add_label("P1346") # winner (sports, contests, ...)
|
|
||||||
add_value("P1120") # number of deaths
|
|
||||||
add_value("P498") # currency code (ISO 4217)
|
|
||||||
|
|
||||||
# URL
|
|
||||||
kwargs: dict[str, t.Any] = {"official": True}
|
|
||||||
add_url("P856", **kwargs) # official website
|
|
||||||
attributes.append(WDArticle(language)) # wikipedia (user language)
|
|
||||||
if not language.startswith("en"):
|
|
||||||
attributes.append(WDArticle("en")) # wikipedia (english)
|
|
||||||
|
|
||||||
add_url("P1324") # source code repository
|
|
||||||
add_url("P1581") # blog
|
|
||||||
add_url("P434", url_id="musicbrainz_artist")
|
|
||||||
add_url("P435", url_id="musicbrainz_work")
|
|
||||||
add_url("P436", url_id="musicbrainz_release_group")
|
|
||||||
add_url("P966", url_id="musicbrainz_label")
|
|
||||||
add_url("P345", url_id="imdb_id")
|
|
||||||
add_url("P2397", url_id="youtube_channel")
|
|
||||||
add_url("P1651", url_id="youtube_video")
|
|
||||||
add_url("P2002", url_id="twitter_profile")
|
|
||||||
add_url("P2013", url_id="facebook_profile")
|
|
||||||
add_url("P2003", url_id="instagram_profile")
|
|
||||||
|
|
||||||
# Fediverse
|
|
||||||
add_url("P4033", url_path_prefix="/@") # Mastodon user
|
|
||||||
add_url("P11947", url_path_prefix="/c/") # Lemmy community
|
|
||||||
add_url("P12622", url_path_prefix="/c/") # PeerTube channel
|
|
||||||
|
|
||||||
# Map
|
|
||||||
attributes.append(WDGeoAttribute("P625"))
|
|
||||||
|
|
||||||
# Image
|
|
||||||
add_image("P15", priority=1, url_id="wikimedia_image") # route map
|
|
||||||
add_image("P242", priority=2, url_id="wikimedia_image") # locator map
|
|
||||||
add_image("P154", priority=3, url_id="wikimedia_image") # logo
|
|
||||||
add_image("P18", priority=4, url_id="wikimedia_image") # image
|
|
||||||
add_image("P41", priority=5, url_id="wikimedia_image") # flag
|
|
||||||
add_image("P2716", priority=6, url_id="wikimedia_image") # collage
|
|
||||||
add_image("P2910", priority=7, url_id="wikimedia_image") # icon
|
|
||||||
|
|
||||||
return attributes
|
|
||||||
|
|
||||||
|
|
||||||
def debug_explain_wikidata_query(query: str, method: str = "GET"):
|
def debug_explain_wikidata_query(query: str, method: str = "GET"):
|
||||||
if method == "GET":
|
if method == "GET":
|
||||||
http_response = get(SPARQL_EXPLAIN_URL + "&" + urlencode({"query": query}), headers=get_headers())
|
http_response = get(SPARQL_EXPLAIN_URL + "&" + urlencode({"query": query}), headers=get_wikidata_headers())
|
||||||
else:
|
else:
|
||||||
http_response = post(SPARQL_EXPLAIN_URL, data={"query": query}, headers=get_headers())
|
http_response = post(SPARQL_EXPLAIN_URL, data={"query": query}, headers=get_wikidata_headers())
|
||||||
http_response.raise_for_status()
|
http_response.raise_for_status()
|
||||||
return http_response.content
|
return http_response.content
|
||||||
|
|
||||||
|
|
||||||
def init(_):
|
|
||||||
global CACHE # pylint: disable=global-statement
|
|
||||||
CACHE = EngineCache("wikidata")
|
|
||||||
|
|
||||||
# In an environment with competing processes, the initial loading of the
|
|
||||||
# cache is required only once.
|
|
||||||
eng_state: str | None = CACHE.get("eng_state")
|
|
||||||
if not eng_state or not eng_state.startswith("STATE:"):
|
|
||||||
CACHE.set("eng_state", f"STATE: being initialized by PID {os.getpid()}")
|
|
||||||
try:
|
|
||||||
init_wikidata_properties()
|
|
||||||
except Exception:
|
|
||||||
CACHE.set("eng_state", f"ERROR: initialization by PID {os.getpid()} failed.")
|
|
||||||
raise
|
|
||||||
else:
|
|
||||||
logger.debug(eng_state)
|
|
||||||
|
|
||||||
|
|
||||||
def init_wikidata_properties():
|
|
||||||
global WIKIDATA_PROPERTIES # pylint: disable=global-statement
|
|
||||||
p: WDPType = CACHE.get(key="WIKIDATA_PROPERTIES")
|
|
||||||
if p:
|
|
||||||
WIKIDATA_PROPERTIES = p
|
|
||||||
return
|
|
||||||
|
|
||||||
# WIKIDATA_PROPERTIES : add unit symbols
|
|
||||||
for k, v in WIKIDATA_UNITS.items():
|
|
||||||
WIKIDATA_PROPERTIES[k] = v["symbol"]
|
|
||||||
|
|
||||||
# WIKIDATA_PROPERTIES : add property labels
|
|
||||||
wikidata_property_names: list[str] = []
|
|
||||||
for attribute in get_attributes("en"):
|
|
||||||
if type(attribute) in (WDAttribute, WDAmountAttribute, WDURLAttribute, WDDateAttribute, WDLabelAttribute):
|
|
||||||
if attribute.name not in WIKIDATA_PROPERTIES:
|
|
||||||
wikidata_property_names.append("wd:" + attribute.name)
|
|
||||||
query = QUERY_PROPERTY_NAMES.replace("%ATTRIBUTES%", " ".join(wikidata_property_names))
|
|
||||||
kwargs: dict[str, t.Any] = {"timeout": 20}
|
|
||||||
jsonresponse = send_wikidata_query(query, **kwargs)
|
|
||||||
for result in jsonresponse.get("results", {}).get("bindings", {}):
|
|
||||||
name_field = result.get("name")
|
|
||||||
if not name_field:
|
|
||||||
continue
|
|
||||||
name = name_field["value"]
|
|
||||||
lang = name_field["xml:lang"]
|
|
||||||
entity_id = result["item"]["value"].replace("http://www.wikidata.org/entity/", "")
|
|
||||||
WIKIDATA_PROPERTIES[(entity_id, lang)] = name.capitalize()
|
|
||||||
|
|
||||||
CACHE.set(key="WIKIDATA_PROPERTIES", value=WIKIDATA_PROPERTIES)
|
|
||||||
|
|
||||||
|
|
||||||
def fetch_traits(engine_traits: EngineTraits):
|
def fetch_traits(engine_traits: EngineTraits):
|
||||||
"""Uses languages evaluated from :py:obj:`wikipedia.fetch_wikimedia_traits
|
"""Uses languages evaluated from :py:obj:`wikipedia.fetch_wikimedia_traits
|
||||||
<searx.engines.wikipedia.fetch_wikimedia_traits>` and removes
|
<searx.engines.wikipedia.fetch_wikimedia_traits>` and removes
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
Wolfram|Alpha (Science)
|
Wolfram|Alpha (Science)
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
from json import loads
|
from json import loads
|
||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
|
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ the engine).
|
|||||||
Implementations
|
Implementations
|
||||||
===============
|
===============
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=fixme
|
# pylint: disable=fixme
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ from lxml import html
|
|||||||
from searx.exceptions import SearxEngineCaptchaException
|
from searx.exceptions import SearxEngineCaptchaException
|
||||||
from searx.utils import humanize_bytes, eval_xpath, eval_xpath_list, extract_text, extr
|
from searx.utils import humanize_bytes, eval_xpath, eval_xpath_list, extract_text, extr
|
||||||
|
|
||||||
|
|
||||||
# Engine metadata
|
# Engine metadata
|
||||||
about = {
|
about = {
|
||||||
"website": 'https://yandex.com/',
|
"website": 'https://yandex.com/',
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
:members:
|
:members:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=invalid-name
|
# pylint: disable=invalid-name
|
||||||
|
|
||||||
__all__ = ["SXNG_Request", "sxng_request", "SXNG_Response"]
|
__all__ = ["SXNG_Request", "sxng_request", "SXNG_Response"]
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import math
|
|||||||
|
|
||||||
from searx.data import EXTERNAL_URLS
|
from searx.data import EXTERNAL_URLS
|
||||||
|
|
||||||
|
|
||||||
IMDB_PREFIX_TO_URL_ID = {
|
IMDB_PREFIX_TO_URL_ID = {
|
||||||
'tt': 'imdb_title',
|
'tt': 'imdb_title',
|
||||||
'mn': 'imdb_name',
|
'mn': 'imdb_name',
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ an example in which the command line is called in the development environment::
|
|||||||
(py3) python -m searx.favicons --help
|
(py3) python -m searx.favicons --help
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["init", "favicon_url", "favicon_proxy"]
|
__all__ = ["init", "favicon_url", "favicon_proxy"]
|
||||||
|
|
||||||
import pathlib
|
import pathlib
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""Implementations for a favicon proxy"""
|
"""Implementations for a favicon proxy"""
|
||||||
|
|
||||||
|
|
||||||
from typing import Callable
|
from typing import Callable
|
||||||
|
|
||||||
import importlib
|
import importlib
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ timeout``) and returns a tuple ``(data, mime)``.
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["DEFAULT_RESOLVER_MAP", "allesedv", "duckduckgo", "google", "kagi", "yandex"]
|
__all__ = ["DEFAULT_RESOLVER_MAP", "allesedv", "duckduckgo", "google", "kagi", "yandex"]
|
||||||
|
|
||||||
from typing import Callable
|
from typing import Callable
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ from .. import get_setting
|
|||||||
from ..version import GIT_URL
|
from ..version import GIT_URL
|
||||||
from ..locales import LOCALE_NAMES
|
from ..locales import LOCALE_NAMES
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger('searx.infopage')
|
logger = logging.getLogger('searx.infopage')
|
||||||
_INFO_FOLDER = os.path.abspath(os.path.dirname(__file__))
|
_INFO_FOLDER = os.path.abspath(os.path.dirname(__file__))
|
||||||
INFO_PAGES: 'InfoPageSet'
|
INFO_PAGES: 'InfoPageSet'
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ SearXNG’s locale implementations
|
|||||||
================================
|
================================
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ from searx.exceptions import (
|
|||||||
from searx import searx_parent_dir, settings
|
from searx import searx_parent_dir, settings
|
||||||
from searx.engines import engines
|
from searx.engines import engines
|
||||||
|
|
||||||
|
|
||||||
errors_per_engines: dict[str, t.Any] = {}
|
errors_per_engines: dict[str, t.Any] = {}
|
||||||
|
|
||||||
LogParametersType = tuple[str, ...]
|
LogParametersType = tuple[str, ...]
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import threading
|
|||||||
|
|
||||||
from searx import logger
|
from searx import logger
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["Histogram", "HistogramStorage", "CounterStorage"]
|
__all__ = ["Histogram", "HistogramStorage", "CounterStorage"]
|
||||||
|
|
||||||
logger = logger.getChild('searx.metrics')
|
logger = logger.getChild('searx.metrics')
|
||||||
|
|||||||
@@ -133,7 +133,6 @@ def get_transport_for_socks_proxy(
|
|||||||
username=proxy_username,
|
username=proxy_username,
|
||||||
password=proxy_password,
|
password=proxy_password,
|
||||||
rdns=rdns,
|
rdns=rdns,
|
||||||
loop=get_loop(),
|
|
||||||
verify=_verify, # pyright: ignore[reportArgumentType]
|
verify=_verify, # pyright: ignore[reportArgumentType]
|
||||||
http2=http2,
|
http2=http2,
|
||||||
local_address=local_address,
|
local_address=local_address,
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ from searx.extended_types import SXNG_Response
|
|||||||
from .client import new_client, get_loop, AsyncHTTPTransportNoHttp
|
from .client import new_client, get_loop, AsyncHTTPTransportNoHttp
|
||||||
from .raise_for_httperror import raise_for_httperror
|
from .raise_for_httperror import raise_for_httperror
|
||||||
|
|
||||||
|
|
||||||
logger = logger.getChild('network')
|
logger = logger.getChild('network')
|
||||||
DEFAULT_NAME = '__DEFAULT__'
|
DEFAULT_NAME = '__DEFAULT__'
|
||||||
NETWORKS: dict[str, "Network"] = {}
|
NETWORKS: dict[str, "Network"] = {}
|
||||||
|
|||||||
@@ -94,7 +94,6 @@ Implementation
|
|||||||
:members:
|
:members:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
__all__ = ["PluginInfo", "Plugin", "PluginStorage", "PluginCfg"]
|
__all__ = ["PluginInfo", "Plugin", "PluginStorage", "PluginCfg"]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ user searches for ``tor-check``. It fetches the tor exit node list from
|
|||||||
:py:obj:`url_exit_list` and parses all the IPs into a list, then checks if the
|
:py:obj:`url_exit_list` and parses all the IPs into a list, then checks if the
|
||||||
user's IP address is in it.
|
user's IP address is in it.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from ipaddress import ip_address
|
from ipaddress import ip_address
|
||||||
import typing
|
import typing
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ converters, each converter is one item in the list (compare
|
|||||||
of measurement are evaluated. The weighting in the evaluation results from the
|
of measurement are evaluated. The weighting in the evaluation results from the
|
||||||
sorting of the :py:obj:`list of unit converters<symbol_to_si>`.
|
sorting of the :py:obj:`list of unit converters<symbol_to_si>`.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import typing
|
import typing
|
||||||
import re
|
import re
|
||||||
import babel.numbers
|
import babel.numbers
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
import typing as t
|
import typing as t
|
||||||
|
|
||||||
from base64 import urlsafe_b64encode, urlsafe_b64decode
|
from base64 import urlsafe_b64encode, urlsafe_b64decode
|
||||||
from zlib import compress, decompress
|
from zlib import compress, decompressobj
|
||||||
from urllib.parse import parse_qs, urlencode
|
from urllib.parse import parse_qs, urlencode
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
from collections.abc import Iterable
|
from collections.abc import Iterable
|
||||||
@@ -517,7 +517,7 @@ class Preferences:
|
|||||||
|
|
||||||
def parse_encoded_data(self, input_data: str):
|
def parse_encoded_data(self, input_data: str):
|
||||||
"""parse (base64) preferences from request (``flask.request.form['preferences']``)"""
|
"""parse (base64) preferences from request (``flask.request.form['preferences']``)"""
|
||||||
bin_data = decompress(urlsafe_b64decode(input_data))
|
bin_data = decompressobj().decompress(urlsafe_b64decode(input_data), 16 * 1024)
|
||||||
dict_data = {}
|
dict_data = {}
|
||||||
for x, y in parse_qs(bin_data.decode('ascii'), keep_blank_values=True).items():
|
for x, y in parse_qs(bin_data.decode('ascii'), keep_blank_values=True).items():
|
||||||
dict_data[x] = y[0]
|
dict_data[x] = y[0]
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
gradually. For more, please read :ref:`result types`.
|
gradually. For more, please read :ref:`result types`.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=too-few-public-methods
|
# pylint: disable=too-few-public-methods
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ template.
|
|||||||
:members:
|
:members:
|
||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=too-few-public-methods
|
# pylint: disable=too-few-public-methods
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ template. For highlighting the code passages, Pygments_ is used.
|
|||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=too-few-public-methods, disable=invalid-name
|
# pylint: disable=too-few-public-methods, disable=invalid-name
|
||||||
|
|
||||||
__all__ = ["Code"]
|
__all__ = ["Code"]
|
||||||
@@ -26,7 +27,6 @@ from pygments.formatters import HtmlFormatter # pylint: disable=no-name-in-modu
|
|||||||
|
|
||||||
from ._base import MainResult
|
from ._base import MainResult
|
||||||
|
|
||||||
|
|
||||||
_pygments_languages: list[str] = []
|
_pygments_languages: list[str] = []
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ template.
|
|||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=too-few-public-methods
|
# pylint: disable=too-few-public-methods
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ template.
|
|||||||
:members:
|
:members:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=too-few-public-methods
|
# pylint: disable=too-few-public-methods
|
||||||
__all__ = ["Image", "ImageRef"]
|
__all__ = ["Image", "ImageRef"]
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ template.
|
|||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=too-few-public-methods
|
# pylint: disable=too-few-public-methods
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ Related topics:
|
|||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# pylint: disable=too-few-public-methods, disable=invalid-name
|
# pylint: disable=too-few-public-methods, disable=invalid-name
|
||||||
|
|
||||||
__all__ = ["Paper"]
|
__all__ = ["Paper"]
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ from searx import webutils
|
|||||||
from searx import engines
|
from searx import engines
|
||||||
from searx.weather import WeatherConditionType
|
from searx.weather import WeatherConditionType
|
||||||
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'CONSTANT_NAMES',
|
'CONSTANT_NAMES',
|
||||||
'CATEGORY_NAMES',
|
'CATEGORY_NAMES',
|
||||||
|
|||||||
@@ -761,6 +761,7 @@ engines:
|
|||||||
engine: deviantart
|
engine: deviantart
|
||||||
shortcut: da
|
shortcut: da
|
||||||
timeout: 3.0
|
timeout: 3.0
|
||||||
|
inactive: true
|
||||||
|
|
||||||
- name: devicons
|
- name: devicons
|
||||||
engine: devicons
|
engine: devicons
|
||||||
@@ -1216,12 +1217,12 @@ engines:
|
|||||||
- name: google
|
- name: google
|
||||||
engine: google
|
engine: google
|
||||||
shortcut: go
|
shortcut: go
|
||||||
inactive: true
|
disabled: true
|
||||||
|
|
||||||
- name: google images
|
- name: google images
|
||||||
engine: google_images
|
engine: google_images
|
||||||
shortcut: goi
|
shortcut: goi
|
||||||
inactive: true
|
disabled: true
|
||||||
|
|
||||||
- name: google news
|
- name: google news
|
||||||
engine: google_news
|
engine: google_news
|
||||||
@@ -1230,7 +1231,6 @@ engines:
|
|||||||
- name: google videos
|
- name: google videos
|
||||||
engine: google_videos
|
engine: google_videos
|
||||||
shortcut: gov
|
shortcut: gov
|
||||||
inactive: true
|
|
||||||
|
|
||||||
- name: google cse
|
- name: google cse
|
||||||
engine: google_cse
|
engine: google_cse
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
"""Implementation of the default settings."""
|
"""Implementation of the default settings."""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import typing as t
|
import typing as t
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user