[chore] data.traits: update traits for neosearch

searx/data/currencies.json

@@ -773,7 +773,7 @@
             "nl": "Boliviaanse boliviano",
             "oc": "Boliviano",
             "pa": "ਬੋਲੀਵੀਆਨੋ",
-            "pl": "boliviano",
+            "pl": "boliwiano",
             "pt": "Boliviano",
             "ro": "boliviano",
             "ru": "боливиано",
@@ -1107,7 +1107,7 @@
             "fi": "Kongon frangi",
             "fr": "franc congolais",
             "ga": "franc an Chongó",
-            "gl": "Franco congolés",
+            "gl": "franco congolés",
             "he": "פרנק קונגולזי",
             "hr": "Kongoanski franak",
             "hu": "kongói frank",
@@ -1636,7 +1636,7 @@
             "fi": "Algerian dinaari",
             "fr": "dinar algérien",
             "ga": "dinar na hAilgéire",
-            "gl": "Dinar alxeriano",
+            "gl": "dinar alxeriano",
             "he": "דינר אלג'ירי",
             "hr": "Alžirski dinar",
             "hu": "algériai dinár",
@@ -1651,7 +1651,7 @@
             "pap": "dinar argelino",
             "pl": "dinar algierski",
             "pt": "dinar argelino",
-            "ro": "Dinar algerian",
+            "ro": "dinar algerian",
             "ru": "алжирский динар",
             "sk": "Alžírský dinár",
             "sl": "alžirski dinar",
@@ -1786,7 +1786,7 @@
             "cy": "Ewro",
             "da": "Euro",
             "de": "Euro",
-            "en": "Euro",
+            "en": "euro",
             "eo": "eŭro",
             "es": "Euro",
             "et": "Euro",
@@ -1803,7 +1803,7 @@
             "it": "Euro",
             "ja": "ユーロ",
             "ko": "유로",
-            "lt": "Euras",
+            "lt": "euras",
             "lv": "eiro",
             "ml": "യൂറോ",
             "ms": "Euro",
@@ -2759,7 +2759,7 @@
             "pa": "ਜਪਾਨੀ ਯੈੱਨ",
             "pl": "jen",
             "pt": "iene",
-            "ro": "yeni",
+            "ro": "yen",
             "ru": "японская иена",
             "sk": "jen",
             "sl": "japonski jen",
@@ -3337,6 +3337,7 @@
             "fi": "Libyan dinaari",
             "fr": "dinar libyen",
             "ga": "dinar na Libia",
+            "gl": "dinar libio",
             "he": "דינר לובי ",
             "hr": "Libijski dinar",
             "hu": "líbiai dinár",
@@ -3539,6 +3540,7 @@
             "ja": "チャット",
             "ko": "미얀마 짯",
             "lt": "Kijatas",
+            "lv": "Kjats",
             "ml": "ബർമ്മീസ് ക്യാറ്റ്",
             "nl": "Myanmarese kyat",
             "oc": "Kyat",
@@ -4310,7 +4312,7 @@
             "ar": "بيسو فلبيني",
             "bg": "Филипинско песо",
             "ca": "peso filipí",
-            "cs": "Filipínské peso",
+            "cs": "filipínské peso",
             "de": "philippinischer Peso",
             "en": "Philippine peso",
             "eo": "filipina peso",
@@ -4614,7 +4616,7 @@
             "fi": "Serbian dinaari",
             "fr": "dinar serbe",
             "ga": "Dinar na Seirbia",
-            "gl": "Dinar serbio",
+            "gl": "dinar serbio",
             "he": "דינר סרבי",
             "hr": "srpski dinar",
             "hu": "szerb dinár",
@@ -5331,7 +5333,7 @@
             "pa": "ਤਾਜਿਕਿਸਤਾਨੀ ਸੋਮੋਨੀ",
             "pl": "Somoni",
             "pt": "Somoni",
-            "ro": "Somoni tadjic",
+            "ro": "somoni tadjic",
             "ru": "таджикский сомони",
             "sk": "tadžický som",
             "sl": "tadžikistanski somoni",
@@ -5394,6 +5396,7 @@
             "fi": "Tunisian dinaari",
             "fr": "dinar tunisien",
             "ga": "dinar na Túinéise",
+            "gl": "dinar tunisiano",
             "he": "דינר תוניסאי",
             "hr": "tuniski dinar",
             "hu": "tunéziai dinár",
@@ -5766,7 +5769,7 @@
             "fi": "Uruguayn peso",
             "fr": "peso uruguayen",
             "ga": "peso Uragua",
-            "gl": "Peso uruguaio",
+            "gl": "peso uruguaio",
             "he": "פסו של אורוגוואי",
             "hr": "Urugvajski pezo",
             "hu": "uruguayi peso",
@@ -6147,7 +6150,7 @@
             "oc": "Drechs de tiratge Especials",
             "pl": "specjalne prawa ciągnienia",
             "pt": "direitos especiais de saque",
-            "ro": "Drepturi speciale de tragere",
+            "ro": "drepturi speciale de tragere",
             "ru": "специальные права заимствования",
             "sk": "Zvláštne práva čerpania",
             "sl": "posebne pravice črpanja",
@@ -6225,6 +6228,7 @@
             "ja": "CFPフラン",
             "ko": "CFP 프랑",
             "lt": "CFP frankas",
+            "lv": "Klusā okeāna franks",
             "ms": "Franc CFP",
             "nl": "CFP-frank",
             "oc": "Franc CFP",
@@ -7055,6 +7059,7 @@
         "bolivjano": "BOB",
         "bolivya bolivianosu": "BOB",
         "bolivya bolivyanosu": "BOB",
+        "boliwiano": "BOB",
         "bolívar digital": "VED",
         "bolívar soberano": "VES",
         "bolívar sobirà": "VES",
@@ -8425,6 +8430,7 @@
         "drame arménio": "AMD",
         "dramm": "AMD",
         "drechs de tiratge especials": "XDR",
+        "drept special de tragere": "XDR",
         "drepturi speciale de tragere": "XDR",
         "drets especials de gir": "XDR",
         "droits de tirage speciaux": "XDR",
@@ -9518,6 +9524,8 @@
         "kíp lào": "LAK",
         "kīp": "LAK",
         "kjat": "MMK",
+        "kjats": "MMK",
+        "klusā okeāna franks": "XPF",
         "km": "BAM",
         "kmf": "KMF",
         "koeweitse dinar": "KWD",
@@ -10023,6 +10031,7 @@
         "lire sterline": "GBP",
         "lire turque": "TRY",
         "lisente": "LSL",
+        "list of syrian coins": "SYP",
         "liura de gibartar": "GIP",
         "liura egipciana": "EGP",
         "liura esterlina": "GBP",
@@ -11313,7 +11322,6 @@
         "riel camboxano": "KHR",
         "riel camboyano": "KHR",
         "riel campuchia": "KHR",
-        "riel kambodżański": "KHR",
         "riel kamboja": "KHR",
         "riel na cambóide": "KHR",
         "rietumāfrikas franks": "XOF",
@@ -12257,6 +12265,7 @@
         "thaise baht": "THB",
         "thajský baht": "THB",
         "thb": "THB",
+        "the australian dollar": "AUD",
         "thebe": "BWP",
         "third belarusian ruble": "BYN",
         "tical": "THB",
@@ -12740,6 +12749,7 @@
         "yen": "JPY",
         "yen giapponese": "JPY",
         "yen japones": "JPY",
+        "yen japonez": "JPY",
         "yen japonés": "JPY",
         "yeni": "JPY",
         "yeni i̇srail şekeli": "ILS",
@@ -12806,7 +12816,6 @@
         "zimbabwe zig": "ZWG",
         "zimbabwean dollar": "ZWL",
         "zimbabwean gold": "ZWG",
-        "zimbabwean zig": "ZWG",
         "zimbabwen kulta": "ZWG",
         "zimbabwiansky zlatý": "ZWG",
         "zimbabwský dolar": "ZWL",
@@ -12965,6 +12974,7 @@
             "FKP",
             "EGP"
         ],
+        "£S": "SYP",
         "£e": "EGP",
         "£s": "SYP",
         "¥": [
@@ -14959,6 +14969,8 @@
         "فورنت مجري": "HUF",
         "فورينت مجري": "HUF",
         "فِرَنْكٌ رُوَنْدِيٌّ": "RWF",
+        "قائمة النقود المعدنية السورية": "SYP",
+        "قائمة عملات سوريا المعدنية": "SYP",
         "ك": "KWD",
         "كتزال غواتيمالي": "GTQ",
         "كرونة آيسلندية": "ISK",

searx/data/engine_traits.json

@@ -6544,6 +6544,103 @@
       "to-TO": "to"
     }
   },
+  "neosearch": {
+    "all_locale": null,
+    "custom": {
+      "countrycodes": [
+        "AE",
+        "AM",
+        "AR",
+        "AT",
+        "AU",
+        "AZ",
+        "BE",
+        "BG",
+        "BH",
+        "BO",
+        "BR",
+        "BY",
+        "CA",
+        "CH",
+        "CL",
+        "CN",
+        "CO",
+        "CY",
+        "CZ",
+        "DE",
+        "DK",
+        "DZ",
+        "EC",
+        "EE",
+        "EG",
+        "ES",
+        "FI",
+        "FR",
+        "GB",
+        "GE",
+        "GH",
+        "GR",
+        "HK",
+        "HR",
+        "HU",
+        "ID",
+        "IE",
+        "IL",
+        "IN",
+        "IT",
+        "JO",
+        "JP",
+        "KE",
+        "KG",
+        "KR",
+        "KW",
+        "KZ",
+        "LB",
+        "LT",
+        "LU",
+        "LV",
+        "MA",
+        "MD",
+        "MT",
+        "MX",
+        "MY",
+        "NG",
+        "NL",
+        "NO",
+        "NZ",
+        "OM",
+        "PE",
+        "PH",
+        "PL",
+        "PT",
+        "PY",
+        "QA",
+        "RO",
+        "RU",
+        "SA",
+        "SE",
+        "SG",
+        "SI",
+        "SK",
+        "TH",
+        "TJ",
+        "TM",
+        "TN",
+        "TR",
+        "TW",
+        "UA",
+        "US",
+        "UY",
+        "UZ",
+        "VE",
+        "VN",
+        "ZA"
+      ]
+    },
+    "data_type": "traits_v1",
+    "languages": {},
+    "regions": {}
+  },
   "odysee": {
     "all_locale": null,
     "custom": {},
@@ -9585,4 +9682,4 @@
     },
     "regions": {}
   }
-}
+}

searx/data/useragents.json

@@ -5,7 +5,7 @@
     ],
     "ua": "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}",
     "versions": [
-        "151.0",
-        "150.0"
+        "152.0",
+        "151.0"
     ]
 }

searx/data/wikidata_units.json

@@ -3272,7 +3272,7 @@
     "Q128822": {
         "si_name": "Q182429",
         "symbol": "kn",
-        "to_si_factor": 0.5144444444444445
+        "to_si_factor": 0.514
     },
     "Q12912288": {
         "si_name": null,

searx/engines/magnific.py

@@ -0,0 +1,62 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+"""Magnific_ is a database for images.
+
+.. _Magnific: https://www.magnific.com
+"""
+
+from urllib.parse import urlencode
+
+import typing as t
+
+from searx.result_types import EngineResults
+
+if t.TYPE_CHECKING:
+    from searx.extended_types import SXNG_Response
+    from searx.search.processors import OnlineParams
+
+
+about = {
+    "website": "https://www.magnific.com",
+    "wikidata_id": "Q104211654",
+    "official_api_documentation": None,
+    "use_official_api": False,
+    "require_api_key": False,
+    "results": "JSON",
+}
+
+base_url = "https://www.magnific.com"
+
+categories = ["images"]
+paging = True
+
+free_images_only = True
+"""
+Whether to only load images that may be used for free, without a Magnific account.
+"""
+
+
+def request(query: str, params: "OnlineParams") -> None:
+    args = {"term": query, "filters[ai-generated][excluded]": 1, "page": params["pageno"], "locale": "en"}
+    if free_images_only:
+        args["filters[license]"] = "free"
+
+    params["headers"]["Referer"] = f"{base_url}/search"
+    params["url"] = f"{base_url}/api/regular/search?{urlencode(args)}"
+
+
+def response(resp: "SXNG_Response"):
+    res = EngineResults()
+
+    result: dict[str, t.Any]  # TBH: dict[str, t.Any]
+    for result in resp.json()["items"]:
+        res.add(
+            res.types.Image(
+                title=result["name"],
+                url=result["url"],
+                thumbnail_src=result["preview"]["url"],
+                img_src=result["preview"]["url"],
+                resolution=f"{result['preview']['width']}x{result['preview']['height']}",
+            )
+        )
+
+    return res

searx/engines/neosearch.py

@@ -0,0 +1,89 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+"""Neosearch_ aims to be a privacy-first alternative to Google.
+
+.. _Neosearch: https://neosearch.org/About
+"""
+
+from json import loads
+import typing as t
+from urllib.parse import urlencode
+
+from searx.extended_types import SXNG_Response
+from searx.result_types import EngineResults
+
+if t.TYPE_CHECKING:
+    from searx.enginelib.traits import EngineTraits
+    from searx.search.processors import OnlineParams
+
+    traits: EngineTraits
+
+about = {
+    "website": "https://neosearch.org",
+    "official_api_documentation": None,
+    "use_official_api": False,
+    "require_api_key": False,
+    "results": "JSON",
+}
+
+base_url = "https://neosearch.org"
+categories = ["general"]
+
+paging = False
+
+
+def request(query: str, params: "OnlineParams"):
+    args = {"q": query, "generate": "auto"}
+    countrycode = params["searxng_locale"].split("-")[-1].upper()
+    if countrycode in traits.custom["countrycodes"]:
+        args["loc"] = countrycode
+    params["url"] = f"{base_url}/search?{urlencode(args)}"
+
+
+def response(resp: "SXNG_Response") -> EngineResults:
+    res = EngineResults()
+
+    # first line contains something like `{"location": "de"}`
+    # second line contains the actual results
+    json_resp = loads(resp.text.splitlines()[-1])
+    for lens in json_resp["lenses"]:
+        for category in lens["categories"]:
+            for result in category["links"]:
+                res.add(
+                    res.types.MainResult(
+                        url=result["url"],
+                        title=result["title"],
+                        content=result["snippet"] or result["description"],
+                    )
+                )
+
+    for suggestion in json_resp.get("suggestions", []):
+        res.add(res.types.LegacyResult(suggestion=suggestion))
+
+    return res
+
+
+def fetch_traits(engine_traits: "EngineTraits") -> None:
+    # pylint: disable=import-outside-toplevel
+    from searx.network import get
+    from searx.utils import extr, js_obj_str_to_python
+    from babel.core import get_global
+
+    resp = get(base_url)
+
+    locations_js_raw = extr(resp.text, "const LOCATIONS = ", ";")
+    if not locations_js_raw:
+        raise RuntimeError("failed to find locations in neosearch HTML response")
+    locations: list[dict[str, str]] = js_obj_str_to_python(locations_js_raw)
+
+    babel_reg_list = get_global("territory_languages").keys()
+
+    countrycodes: list[str] = []
+    for loc in locations:
+        _reg = loc["code"].upper()
+        if _reg not in babel_reg_list:
+            print(f"ERROR: region tag {_reg} is unknown by babel")
+            continue
+        countrycodes.append(_reg)
+
+    countrycodes.sort()
+    engine_traits.custom["countrycodes"] = countrycodes

searx/engines/picjumbo.py

@@ -0,0 +1,63 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+"""Picjumbo_ provides free stock photos.
+
+.. _Picjumbo: https://picjumbo.com
+"""
+
+from urllib.parse import urlparse, urlunparse
+import typing as t
+
+from lxml import html
+
+from searx.result_types import EngineResults
+from searx.utils import eval_xpath, eval_xpath_list, extract_text
+
+if t.TYPE_CHECKING:
+    from searx.extended_types import SXNG_Response
+    from searx.search.processors import OnlineParams
+
+
+about = {
+    "website": "https://picjumbo.com",
+    "wikidata_id": None,
+    "official_api_documentation": None,
+    "use_official_api": False,
+    "require_api_key": False,
+    "results": "HTML",
+}
+
+base_url = "https://picjumbo.com"
+
+categories = ["images"]
+paging = True
+
+
+def request(query: str, params: "OnlineParams") -> None:
+    params["url"] = f"{base_url}/search/{query}/page/{params['pageno']}"
+
+
+def _get_max_res_url(url: str) -> str:
+    """Get the maximum resolution of the image based on the thumbnail URL."""
+    parsed_url = urlparse(url)
+    max_res_url = parsed_url._replace(query="w=10000&quality=100")
+    return urlunparse(max_res_url)
+
+
+def response(resp: "SXNG_Response"):
+    res = EngineResults()
+
+    doc = html.fromstring(resp.text)
+
+    for result in eval_xpath_list(doc, "//div[contains(@class, 'photo_query')]/div[contains(@class, 'photo_item')]"):
+        thumbnail = extract_text(eval_xpath(result, ".//img[contains(@class, 'image')]/@src")) or ""
+        res.add(
+            res.types.Image(
+                url=extract_text(eval_xpath(result, ".//a[contains(@class, 'image')]/@href")) or "",
+                title=extract_text(eval_xpath(result, ".//h3")) or "",
+                content=extract_text(eval_xpath(result, ".//meta[@itemprop='keywords']/@content")) or "",
+                thumbnail_src=thumbnail,
+                img_src=_get_max_res_url(thumbnail),
+            )
+        )
+
+    return res

searx/engines/shopify_stock.py

@@ -0,0 +1,62 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+"""Shopify stock photos provides royalty-free images, intended for use with
+Shopify.
+"""
+
+import typing as t
+from urllib.parse import urlencode
+
+from lxml import html
+
+from searx.result_types import EngineResults
+from searx.utils import eval_xpath, eval_xpath_list, extract_text
+
+if t.TYPE_CHECKING:
+    from searx.extended_types import SXNG_Response
+    from searx.search.processors import OnlineParams
+
+
+about = {
+    "website": "https://www.shopify.com/stock-photos",
+    "wikidata_id": None,
+    "official_api_documentation": None,
+    "use_official_api": False,
+    "require_api_key": False,
+    "results": "HTML",
+}
+
+base_url = "https://www.shopify.com"
+
+categories = ["images"]
+paging = True
+
+
+def request(query: str, params: "OnlineParams") -> None:
+    args = {"q": query, "page": params["pageno"]}
+    params["url"] = f"{base_url}/stock-photos/photos/search?{urlencode(args)}"
+
+
+def _get_download_url(url: str) -> str:
+    """Get the link to the full quality image."""
+    query_start = url.find("?")
+    return url[:query_start] + "/download?quality=premium"
+
+
+def response(resp: "SXNG_Response"):
+    res = EngineResults()
+
+    doc = html.fromstring(resp.text)
+
+    for result in eval_xpath_list(doc, "//div[contains(@class, 'js-masonry-grid')]/div"):
+        url = base_url + (extract_text(eval_xpath(result, ".//a[contains(@class, 'photo-tile')]/@href")) or "")
+        res.add(
+            res.types.Image(
+                url=url,
+                title=extract_text(eval_xpath(result, ".//p[contains(@class, 'photo-tile__title')]")) or "",
+                thumbnail_src=extract_text(eval_xpath(result, ".//img[contains(@class, 'photo-card__image')]/@src"))
+                or "",
+                img_src=_get_download_url(url),
+            )
+        )
+
+    return res

searx/engines/stocksnap.py

@@ -0,0 +1,55 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+"""Stocksnap_ is a search engine for CC0-licensed images.
+
+.. _Stocksnap: https://stocksnap.io
+"""
+
+import typing as t
+
+from searx.result_types import EngineResults
+
+if t.TYPE_CHECKING:
+    from searx.extended_types import SXNG_Response
+    from searx.search.processors import OnlineParams
+
+
+about = {
+    "website": "https://stocksnap.io",
+    "wikidata_id": None,
+    "official_api_documentation": None,
+    "use_official_api": False,
+    "require_api_key": False,
+    "results": "JSON",
+}
+# otherwise all requests get blocked, probably HTTP2 fingerprinting
+enable_http2 = False
+
+base_url = "https://stocksnap.io"
+cdn_url = "https://cdn.stocksnap.io"
+
+categories = ["images"]
+paging = True
+
+
+def request(query: str, params: "OnlineParams") -> None:
+    params["url"] = f"{base_url}/api/search-photos/{query}/relevance/desc/{params['pageno']}"
+
+
+def response(resp: "SXNG_Response"):
+    res = EngineResults()
+
+    result: dict[str, str]  # TBH: dict[str, t.Any]
+    for result in resp.json()["results"]:
+        slug = "-".join(result['keywords'][:1]) + "-" + result["img_id"]
+        res.add(
+            res.types.Image(
+                title=result["tags"],
+                url=f"{base_url}/photo/{slug}",
+                thumbnail_src=f"{cdn_url}/img-thumbs/280h/{result['img_id']}.jpg",
+                img_src=f"{cdn_url}/img-thumbs/960w/{result['img_id']}.jpg",
+                img_format="JPEG",
+                resolution=f"{result['img_width']}x{result['img_height']}",
+            )
+        )
+
+    return res

searx/settings.yml

@@ -1585,6 +1585,11 @@ engines:
     disabled: true
     inactive: true
 
+  - name: magnific
+    engine: magnific
+    shortcut: mag
+    disabled: true
+
   - name: marginalia
     engine: marginalia
     shortcut: mar
@@ -1857,6 +1862,11 @@ engines:
     engine: photon
     shortcut: ph
 
+  - name: picjumbo
+    engine: picjumbo
+    shortcut: pj
+    disabled: true
+
   - name: pinterest
     engine: pinterest
     shortcut: pin
@@ -2165,6 +2175,11 @@ engines:
     engine: sepiasearch
     shortcut: sep
 
+  - name: shopify stock
+    engine: shopify_stock
+    shortcut: shs
+    disabled: true
+
   - name: sogou
     engine: sogou
     shortcut: sogou
@@ -2195,6 +2210,11 @@ engines:
     api_site: 'stackoverflow'
     categories: [it, q&a]
 
+  - name: stocksnap
+    engine: stocksnap
+    shortcut: sto
+    disabled: true
+
   - name: askubuntu
     engine: stackexchange
     shortcut: ubuntu
@@ -2834,6 +2854,12 @@ engines:
     shortcut: nvrv
     disabled: true
 
+  - name: neosearch
+    engine: neosearch
+    shortcut: neo
+    disabled: true
+    inactive: true
+
   - name: rubygems
     shortcut: rbg
     engine: xpath

searx/sxng_locales.py

@@ -74,6 +74,8 @@ sxng_locales = (
     ('ja-JP', '日本語', '日本', 'Japanese', '\U0001f1ef\U0001f1f5'),
     ('ko', '한국어', '', 'Korean', '\U0001f310'),
     ('ko-KR', '한국어', '대한민국', 'Korean', '\U0001f1f0\U0001f1f7'),
+    ('mi', 'Māori', '', 'Māori', '\U0001f310'),
+    ('mi-NZ', 'Māori', 'Aotearoa', 'Māori', '\U0001f1f3\U0001f1ff'),
     ('nb', 'Norsk Bokmål', '', 'Norwegian Bokmål', '\U0001f310'),
     ('nb-NO', 'Norsk Bokmål', 'Norge', 'Norwegian Bokmål', '\U0001f1f3\U0001f1f4'),
     ('nl', 'Nederlands', '', 'Dutch', '\U0001f310'),