nosible 0.2.10__tar.gz → 0.3.2__tar.gz

{nosible-0.2.10/src/nosible.egg-info → nosible-0.3.2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: nosible
-Version: 0.2.10
+Version: 0.3.2
 Summary: Python client for the NOSIBLE Search API
-Home-page: https://github.com/NosibleAI/nosible
+Home-page: https://github.com/NosibleAI/nosible-py
 Author: Stuart Reid, Matthew Dicks, Richard Taylor, Gareth Warburton
 Author-email: Stuart Reid <stuart@nosible.com>, Matthew Dicks <matthew@nosible.com>, Richard Taylor <richard@nosible.com>, Gareth Warburton <gareth@nosible.com>
 License-Expression: MIT
-Project-URL: Homepage, https://github.com/NosibleAI/nosible
+Project-URL: Homepage, https://github.com/NosibleAI/nosible-py
 Project-URL: Documentation, https://nosible-py.readthedocs.io/en/latest/
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -56,7 +56,7 @@ Dynamic: requires-python
 
 # NOSIBLE Search Client
 
-A high-level Python client for the [NOSIBLE Search API](https://www.nosible.ai/search/v1/docs/swagger#/).
+A high-level Python client for the [NOSIBLE Search API](https://www.nosible.ai/search/v2/docs/#/).
 Easily integrate the Nosible Search API into your Python projects.
 
 ### 📄 Documentation
@@ -154,7 +154,7 @@ You can find the full NOSIBLE Search Client documentation
 ### 📡 Swagger Docs
 
 You can find online endpoints to the NOSIBLE Search API Swagger Docs
-[here](https://www.nosible.ai/search/v1/docs/swagger#/).
+[here](https://www.nosible.ai/search/v2/docs/#/).
 
 
 ---

{nosible-0.2.10 → nosible-0.3.2}/README.md

@@ -13,7 +13,7 @@
 
 # NOSIBLE Search Client
 
-A high-level Python client for the [NOSIBLE Search API](https://www.nosible.ai/search/v1/docs/swagger#/).
+A high-level Python client for the [NOSIBLE Search API](https://www.nosible.ai/search/v2/docs/#/).
 Easily integrate the Nosible Search API into your Python projects.
 
 ### 📄 Documentation
@@ -111,7 +111,7 @@ You can find the full NOSIBLE Search Client documentation
 ### 📡 Swagger Docs
 
 You can find online endpoints to the NOSIBLE Search API Swagger Docs
-[here](https://www.nosible.ai/search/v1/docs/swagger#/).
+[here](https://www.nosible.ai/search/v2/docs/#/).
 
 
 ---

{nosible-0.2.10 → nosible-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nosible"
-version = "0.2.10"
+version = "0.3.2"
 description = "Python client for the NOSIBLE Search API"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.9"
@@ -45,7 +45,7 @@ classifiers = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/NosibleAI/nosible"
+Homepage = "https://github.com/NosibleAI/nosible-py"
 Documentation = "https://nosible-py.readthedocs.io/en/latest/"
 
 [build-system]

{nosible-0.2.10 → nosible-0.3.2}/setup.py

@@ -12,7 +12,7 @@ setup(
     description="Python client for the NOSIBLE Search API",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/NosibleAI/nosible",
+    url="https://github.com/NosibleAI/nosible-py",
     classifiers=[
         # Development
         "Development Status :: 4 - Beta",

{nosible-0.2.10 → nosible-0.3.2}/src/nosible/classes/result.py

@@ -236,9 +236,9 @@ class Result:
 
         return ResultSet([self, other])
 
-    def visit(self, client) -> WebPageData:
+    def scrape_url(self, client) -> WebPageData:
         """
-        Visit the URL associated with this Result and retrieve its content.
+        Scrape the URL associated with this Result and retrieve its content.
 
         This method uses the provided Nosible client to fetch the web page content for the given URL.
         The result is returned as a WebPageData object containing the page's content and metadata.
@@ -265,16 +265,16 @@ class Result:
         >>> from nosible import Nosible, Result
         >>> with Nosible() as nos:
         ...     result = Result(url="https://www.dailynewsegypt.com/2023/09/08/g20-and-its-summits/")
-        ...     page = result.visit(client=nos)
+        ...     page = result.scrape_url(client=nos)
         ...     isinstance(page, WebPageData)
         True
         """
         if not self.url:
-            raise ValueError("Cannot visit Result without a URL.")
+            raise ValueError("Cannot scrape Result without a URL.")
         try:
-            return client.visit(url=self.url)
+            return client.scrape_url(url=self.url)
         except Exception as e:
-            raise RuntimeError(f"Failed to visit URL '{self.url}': {e}") from e
+            raise RuntimeError(f"Failed to scrape URL '{self.url}': {e}") from e
 
     def sentiment(self, client) -> float:
         """
@@ -303,7 +303,7 @@ class Result:
         >>> class DummyClient:
         ...     llm_api_key = "dummy"
         ...
-        ...     def visit(self, url):
+        ...     def scrape_url(self, url):
         ...         return "web page"
         >>> result = Result(url="https://example.com", content="This is great!")
         >>> import types
@@ -519,7 +519,6 @@ class Result:
         try:
             from nosible import Search
 
-            exclude_companies = [self.url_hash] if not exclude_companies else exclude_companies.append(self.url_hash)
             s = Search(
                 question=self.title,
                 expansions=[],
@@ -554,7 +553,8 @@ class Result:
                 iab_tier_4=iab_tier_4,
                 instruction=instruction,
             )
-            return client.fast_search(search=s)
+            results = client.fast_search(search=s)
+            return results
         except Exception as e:
             raise RuntimeError(f"Failed to find similar results for title '{self.title}': {e}") from e
 

{nosible-0.2.10 → nosible-0.3.2}/src/nosible/nosible_client.py

@@ -211,7 +211,7 @@ class Nosible:
         self._post = retry(
             reraise=True,
             stop=stop_after_attempt(self.retries) | stop_after_delay(self.timeout),
-            wait=wait_exponential(multiplier=1, min=1, max=10),
+            wait=wait_exponential(multiplier=1, min=1, max=20),
             retry=retry_if_exception_type(httpx.RequestError),
             before_sleep=before_sleep_log(self.logger, logging.WARNING),
         )(self._post)
@@ -220,7 +220,7 @@ class Nosible:
         self._generate_expansions = retry(
             reraise=True,
             stop=stop_after_attempt(self.retries) | stop_after_delay(self.timeout),
-            wait=wait_exponential(multiplier=1, min=1, max=10),
+            wait=wait_exponential(multiplier=1, min=1, max=20),
             retry=retry_if_exception_type(httpx.RequestError),
             before_sleep=before_sleep_log(self.logger, logging.WARNING),
         )(self._generate_expansions)
@@ -261,6 +261,67 @@ class Nosible:
         self.iab_tier_4 = iab_tier_4
         self.instruction = instruction
 
+    @_rate_limited("fast")
+    def search(
+        self,
+        prompt: str = None,
+        recursions: int = 3,
+        agent: str = "cybernaut-1",
+    ) -> ResultSet:
+        """
+        Gives you access to Cybernaut-1, an AI agent with unrestricted access to everything in
+        NOSIBLE including every shard, algorithm, selector, reranker, and signal.
+        It knows what these things are and can tune them on the fly to find better results.
+
+        Parameters
+        ----------
+        prompt: str
+            The information you are looking for.
+        recursions: int
+            Maximum chain-of-search length.
+        agent: str
+            The search agent you want to use.
+
+        Returns
+        -------
+        ResultSet
+            The results of the search.
+
+        Raises
+        ------
+        ValueError
+            If `recursions` is not [3,10].
+
+        Examples
+        --------
+        >>> from nosible import Nosible
+        >>> with Nosible() as nos:
+        ...     results = nos.search("Interesting news from AI startups last week.")
+        ...     print(isinstance(results, ResultSet))
+        True
+        >>> with Nosible() as nos:
+        ...     results = nos.search(
+        ...         prompt="Interesting news from AI startups last week.",
+        ...         recursions=20
+        ...     )  # doctest: +ELLIPSIS
+        Traceback (most recent call last):
+        ...
+        ValueError: Recursions must be [3,10].
+        """
+        if recursions < 3 or recursions > 10:
+            raise ValueError("Recursions must be [3,10].")
+
+        payload = {
+            "prompt": prompt,
+            "recursions": recursions,
+            "agent": agent,
+        }
+
+        resp = self._post(url="https://www.nosible.ai/search/v2/search", payload=payload)
+        resp.raise_for_status()
+        items = resp.json().get("response", [])
+        return ResultSet.from_dicts(items)
+
     def fast_search(
         self,
         search: Search = None,
@@ -892,7 +953,7 @@ class Nosible:
             if val is not None:
                 payload[key] = val
 
-        resp = self._post(url="https://www.nosible.ai/search/v1/fast-search", payload=payload)
+        resp = self._post(url="https://www.nosible.ai/search/v2/fast-search", payload=payload)
         resp.raise_for_status()
         items = resp.json().get("response", [])[:filter_responses]
         return ResultSet.from_dicts(items)
@@ -938,7 +999,7 @@ class Nosible:
 
         raise TypeError("`question` must be str, Search, SearchSet, or a list thereof")
 
-    @_rate_limited("slow")
+    @_rate_limited("bulk")
     def bulk_search(
         self,
         *,
@@ -1233,7 +1294,7 @@ class Nosible:
 
         # Enforce Minimums
         filter_responses = n_results
-        # Slow search must ask for at least 1 000
+        # Bulk search must ask for at least 1 000
         n_results = max(n_results, 1000)
 
         self.logger.info(f"Performing bulk search for {question!r}...")
@@ -1271,7 +1332,7 @@ class Nosible:
                 if val is not None:
                     payload[key] = val
 
-            resp = self._post(url="https://www.nosible.ai/search/v1/slow-search", payload=payload)
+            resp = self._post(url="https://www.nosible.ai/search/v2/bulk-search", payload=payload)
             try:
                 resp.raise_for_status()
             except httpx.HTTPStatusError as e:
@@ -1279,7 +1340,7 @@ class Nosible:
 
             data = resp.json()
 
-            # Slow search: download & decrypt
+            # Bulk search: download & decrypt
             download_from = data.get("download_from")
             if ".zstd." in download_from:
                 download_from = download_from.replace(".zstd.", ".gzip.", 1)
@@ -1408,10 +1469,10 @@ class Nosible:
         # Return the generated text
         return "Answer:\n" + response.choices[0].message.content.strip()
 
-    @_rate_limited("visit")
-    def visit(self, html: str = "", recrawl: bool = False, render: bool = False, url: str = None) -> WebPageData:
+    @_rate_limited("scrape-url")
+    def scrape_url(self, html: str = "", recrawl: bool = False, render: bool = False, url: str = None) -> WebPageData:
         """
-        Visit a given URL and return a structured WebPageData object for the page.
+        Scrape a given URL and return a structured WebPageData object for the page.
 
         Parameters
         ----------
@@ -1444,7 +1505,7 @@ class Nosible:
         --------
         >>> from nosible import Nosible
         >>> with Nosible() as nos:
-        ...     out = nos.visit(url="https://www.dailynewsegypt.com/2023/09/08/g20-and-its-summits/")
+        ...     out = nos.scrape_url(url="https://www.dailynewsegypt.com/2023/09/08/g20-and-its-summits/")
         ...     print(isinstance(out, WebPageData))
         ...     print(hasattr(out, "languages"))
         ...     print(hasattr(out, "page"))
@@ -1452,7 +1513,7 @@ class Nosible:
         True
         True
         >>> with Nosible() as nos:
-        ...     out = nos.visit()
+        ...     out = nos.scrape_url()
         ...     print(isinstance(out, type(WebPageData)))
         ...     print(hasattr(out, "languages"))
         ...     print(hasattr(out, "page"))  # doctest: +ELLIPSIS
@@ -1463,7 +1524,7 @@ class Nosible:
         if url is None:
             raise TypeError("URL must be provided")
         response = self._post(
-            url="https://www.nosible.ai/search/v1/visit",
+            url="https://www.nosible.ai/search/v2/scrape-url",
             payload={"html": html, "recrawl": recrawl, "render": render, "url": url},
         )
         try:
@@ -1494,7 +1555,7 @@ class Nosible:
         )
 
     @_rate_limited("fast")
-    def trend(
+    def topic_trend(
         self,
         query: str,
         start_date: Optional[str] = None,
@@ -1502,7 +1563,7 @@ class Nosible:
         sql_filter: Optional[str] = None,
     ) -> dict:
         """
-        Extract a trend showing the volume of news surrounding your query.
+        Extract a topic's trend showing the volume of news surrounding your query.
 
         Parameters
         ----------
@@ -1518,14 +1579,14 @@ class Nosible:
         Returns
         -------
         dict
-            The JSON-decoded trend data returned by the server.
+            The JSON-decoded topic trend data returned by the server.
 
         Examples
         --------
         >>> from nosible import Nosible
         >>> with Nosible() as nos:
-        ...     trends_data = nos.trend("Christmas Shopping", start_date="2005-01-01", end_date="2020-12-31")
-        ...     print(trends_data)  # doctest: +ELLIPSIS
+        ...     topic_trends_data = nos.topic_trend("Christmas Shopping", start_date="2005-01-01", end_date="2020-12-31")
+        ...     print(topic_trends_data)  # doctest: +ELLIPSIS
         {'2005-01-31': ...'2020-12-31': ...}
         """
         # Validate dates
@@ -1541,8 +1602,8 @@ class Nosible:
         else:
             payload["sql_filter"] = "SELECT loc, published FROM engine"
 
-        # Send the POST to the /trend endpoint
-        response = self._post(url="https://www.nosible.ai/search/v1/trend", payload=payload)
+        # Send the POST to the /topic-trend endpoint
+        response = self._post(url="https://www.nosible.ai/search/v2/topic-trend", payload=payload)
         # Will raise ValueError on rate-limit or auth errors
         response.raise_for_status()
         payload = response.json().get("response", {})
@@ -1562,212 +1623,6 @@ class Nosible:
 
         return filtered
 
-    def version(self) -> str:
-        """
-        Retrieve the current version information for the Nosible API.
-
-        Returns
-        -------
-        str
-            JSON-formatted string containing API version details.
-
-        Examples
-        --------
-        >>> import json
-        >>> from nosible import Nosible
-        >>> with Nosible() as nos:
-        ...     v = nos.version()
-        ...     data = json.loads(v)
-        ...     # top‐level object must be a dict
-        ...     print(isinstance(data, dict))
-        ...     # must have a "response" key mapping to another dict
-        ...     print("response" in data and isinstance(data["response"], dict))
-        ...     # that inner dict must have exactly the expected sub-keys
-        ...     expected = {
-        ...         "database",
-        ...         "date",
-        ...         "documents",
-        ...         "runtime",
-        ...         "snippets",
-        ...         "time",
-        ...         "tokens",
-        ...         "version",
-        ...         "words",
-        ...     }
-        ...     print(set(data["response"].keys()) == expected)
-        True
-        True
-        True
-        """
-        response = self._post(url="https://www.nosible.ai/search/v1/version", payload={})
-
-        return json.dumps(response.json(), indent=2, sort_keys=True)
-
-    def indexed(self, url: str = None) -> bool:
-        """
-        This function checks if a URL has been indexed by Nosible.
-
-        Parameters
-        ----------
-        url : str, optional
-            The full URL to verify.
-
-        Returns
-        -------
-        bool
-            True if the URL is in the index.
-            False if the URL is not in the index.
-
-        Raises
-        ------
-
-        Examples
-        --------
-        >>> from nosible import Nosible
-        >>> with Nosible() as nos:
-        ...     print(nos.indexed(url="https://www.dailynewsegypt.com/2023/09/08/g20-and-its-summits/"))
-        True
-        """
-        response = self._post(url="https://www.nosible.ai/search/v1/indexed", payload={"url": url})
-
-        try:
-            response.raise_for_status()
-            data = response.json()
-            msg = data.get("message")
-            if msg == "The URL is in the system.":
-                return True
-            if msg == "The URL is nowhere to be found.":
-                return False
-            if msg == "The URL could not be retrieved.":
-                return False
-            # If we reach here, the response is unexpected
-            return False
-        except httpx.HTTPError:
-            return False
-        except:
-            return False
-
-    def preflight(self, url: str = None) -> str:
-        """
-        Run a preflight check for crawling/preprocessing on a URL.
-
-        Parameters
-        ----------
-        url : str, optional
-            The URL to validate or prepare for indexing.
-
-        Returns
-        -------
-        str
-            JSON-formatted string with errors, warnings, or recommendations.
-
-        Examples
-        --------
-        >>> from nosible import Nosible
-        >>> with Nosible() as nos:
-        ...     pf = nos.preflight(url="https://www.dailynewsegypt.com/2023/09/08/g20-and-its-summits/")
-        ...     print(pf)
-        {
-          "response": {
-            "domain": "dailynewsegypt",
-            "fragment": "",
-            "geo": "US",
-            "hash": "ENNmqkF1mGNhVhvhmbUEs4U2",
-            "netloc": "www.dailynewsegypt.com",
-            "path": "/2023/09/08/g20-and-its-summits/",
-            "prefix": "www",
-            "proxy": "US",
-            "query": "",
-            "query_allowed": {},
-            "query_blocked": {},
-            "raw_url": "https://www.dailynewsegypt.com/2023/09/08/g20-and-its-summits/",
-            "scheme": "https",
-            "suffix": "com",
-            "url": "https://www.dailynewsegypt.com/2023/09/08/g20-and-its-summits"
-          }
-        }
-        """
-        response = self._post(url="https://www.nosible.ai/search/v1/preflight", payload={"url": url})
-
-        return json.dumps(response.json(), indent=2, sort_keys=True)
-
-    def get_rate_limits(self) -> str:
-        """
-        Generate a plaintext summary of rate limits for every subscription plan.
-
-        Returns
-        -------
-        str
-            A multi-line string containing rate limits for each plan.
-
-        Examples
-        --------
-        >>> nos = Nosible(nosible_api_key="test|xyz")
-        >>> print(nos.get_rate_limits())  # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
-        Below are the rate limits for all NOSIBLE plans.
-        To upgrade your package, visit https://www.nosible.ai/products.
-        <BLANKLINE>
-        Unless otherwise indicated, bulk searches are limited to one-at-a-time per API key.
-        <BLANKLINE>
-        Free: (Your current plan)
-        | Endpoint    | Per Month | Per Minute | Effective CPM |
-        | ----------- | --------- | ---------- | ------------- |
-        | Search      |      3000 |         60 |         $4.00 |
-        | URL Visits  |       300 |         60 |         $4.00 |
-        | Bulk Search |       300 |         60 |         $4.00 |
-        <BLANKLINE>
-        Basic ($49p/m):
-        | Endpoint    | Per Month | Per Minute | Effective CPM |
-        ...
-        """
-        # Human-friendly plan names
-        display = {
-            "test": "Free",
-            "basic": "Basic ($49p/m)",
-            "pro": "Pro ($199p/m)",
-            "pro+": "Pro+ ($799p/m)",
-            "bus": "Business ($3999p/m)",
-            "bus+": "Business+ ($7499p/m)",
-            "ent": "Enterprise ($14999p/m)",
-        }
-
-        # Human-friendly endpoint names
-        endpoint_name = {"fast": "Search", "visit": "URL Visits", "slow": "Bulk Search"}
-
-        out = [
-            "Below are the rate limits for all NOSIBLE plans.",
-            "To upgrade your package, visit https://www.nosible.ai/products.\n",
-            "Unless otherwise indicated, bulk searches are limited to one-at-a-time per API key.\n",
-        ]
-
-        user_plan = self._get_user_plan()
-        current_plan = ""
-        cpm_counter = 4.0
-
-        # Preserve the order you care about:
-        for plan in ["test", "basic", "pro", "pro+", "bus", "bus+", "ent", "cons", "stup", "busn"]:
-            name = display.get(plan, plan)
-            if plan == user_plan:
-                current_plan = " (Your current plan)"
-
-            out.append(f"{name}:{current_plan}")
-            out.append("| Endpoint    | Per Month | Per Minute | Effective CPM |")
-            out.append("| ----------- | --------- | ---------- | ------------- |")
-
-            for ep in ["fast", "visit", "slow"]:
-                buckets = PLAN_RATE_LIMITS[plan][ep]
-                # Find minute & day
-                minute = next(limit for limit, i in buckets if i == 60)
-                month = next(limit for limit, i in buckets if i == 24 * 3600 * 30)
-                cpm = f"${cpm_counter:.2f}"
-
-                out.append(f"| {endpoint_name[ep]:<11} | {month:>9} | {minute:>10} | {cpm:>13} |")
-
-            cpm_counter = cpm_counter - 0.5
-            out.append("")  # Blank line
-            current_plan = ""
-
-        return "\n".join(out)
 
     def close(self):
         """
@@ -2192,14 +2047,14 @@ class Nosible:
 
         # Include / exclude companies
         if include_companies:
-            company_list = ", ".join(f"'{c}'" for c in include_companies)
+            company_list = " OR ".join(f"ARRAY_CONTAINS(companies, '{c}')" for c in include_companies)
             clauses.append(
-                f"(company_1 IN ({company_list}) OR company_2 IN ({company_list}) OR company_3 IN ({company_list}))"
+                f"(companies IS NOT NULL AND ({company_list}))"
             )
         if exclude_companies:
-            company_list = ", ".join(f"'{c}'" for c in exclude_companies)
+            company_list = " OR ".join(f"ARRAY_CONTAINS(companies, '{c}')" for c in exclude_companies)
             clauses.append(
-                f"(company_1 NOT IN ({company_list}) AND company_2 NOT IN ({company_list}) AND company_3 NOT IN ({company_list}))"
+                f"(companies IS NULL OR NOT ({company_list}))"
             )
 
         if include_docs:
@@ -2256,9 +2111,7 @@ class Nosible:
             "certain",
             "netloc",
             "language",
-            "company_1",
-            "company_2",
-            "company_3",
+            "companies"
             "doc_hash",
         ]
         import polars as pl  # Lazy import

{nosible-0.2.10 → nosible-0.3.2}/src/nosible/utils/rate_limiter.py

@@ -11,60 +11,60 @@ log = logging.getLogger(__name__)
 PLAN_RATE_LIMITS = {
     "test": {
         # Per minute limit, then per month.
-        "visit": [(60, 60), (300, 24 * 3600 * 30)],
-        "slow": [(60, 60), (300, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (300, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (300, 24 * 3600 * 30)],
         "fast": [(60, 60), (3000, 24 * 3600 * 30)],
     },
     "basic": {
-        "visit": [(60, 60), (1400, 24 * 3600 * 30)],
-        "slow": [(60, 60), (1400, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (1400, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (1400, 24 * 3600 * 30)],
         "fast": [(60, 60), (14_000, 24 * 3600 * 30)],
     },
     "pro": {
-        "visit": [(60, 60), (6700, 24 * 3600 * 30)],
-        "slow": [(60, 60), (6700, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (6700, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (6700, 24 * 3600 * 30)],
         "fast": [(60, 60), (67_000, 24 * 3600 * 30)],
     },
     "pro+": {
-        "visit": [(60, 60), (32_000, 24 * 3600 * 30)],
-        "slow": [(60, 60), (32_000, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (32_000, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (32_000, 24 * 3600 * 30)],
         "fast": [(60, 60), (320_000, 24 * 3600 * 30)],
     },
     "bus": {
-        "visit": [(60, 60), (200_000, 24 * 3600 * 30)],
-        "slow": [(60, 60), (200_000, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (200_000, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (200_000, 24 * 3600 * 30)],
         "fast": [(60, 60), (2_000_000, 24 * 3600 * 30)],
     },
     "bus+": {
-        "visit": [(60, 60), (500_000, 24 * 3600 * 30)],
-        "slow": [(60, 60), (500_000, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (500_000, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (500_000, 24 * 3600 * 30)],
         "fast": [(120, 60), (5_000_000, 24 * 3600 * 30)],
     },
     "ent": {
-        "visit": [(60, 60), (1_500_000, 24 * 3600 * 30)],
-        "slow": [(60, 60), (1_500_000, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (1_500_000, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (1_500_000, 24 * 3600 * 30)],
         "fast": [(360, 60), (15_000_000, 24 * 3600 * 30)],
     },
     # This plan is used for testing in the package
     "chat": {
-        "visit": [(60, 60), (1_500_000, 24 * 3600 * 30)],
-        "slow": [(60, 60), (1_500_000, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (1_500_000, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (1_500_000, 24 * 3600 * 30)],
         "fast": [(360, 60), (15_000_000, 24 * 3600 * 30)],
     },
     "cons": {
-        "visit": [(60, 60), (3000, 24 * 3600 * 30)],
-        "slow": [(60, 60), (3000, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (3000, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (3000, 24 * 3600 * 30)],
         "fast": [(120, 60), (30_000, 24 * 3600 * 30)],
     },
     "stup": {
-        "visit": [(60, 60), (30_000, 24 * 3600 * 30)],
-        "slow": [(60, 60), (30_000, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (30_000, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (30_000, 24 * 3600 * 30)],
         "fast": [(360, 60), (300_000, 24 * 3600 * 30)],
     },
     # This plan is used for testing in the package
     "busn": {
-        "visit": [(60, 60), (300_000, 24 * 3600 * 30)],
-        "slow": [(60, 60), (300_000, 24 * 3600 * 30)],
+        "scrape-url": [(60, 60), (300_000, 24 * 3600 * 30)],
+        "bulk": [(60, 60), (300_000, 24 * 3600 * 30)],
         "fast": [(360, 60), (3_000_000, 24 * 3600 * 30)],
     },
 }

{nosible-0.2.10 → nosible-0.3.2/src/nosible.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: nosible
-Version: 0.2.10
+Version: 0.3.2
 Summary: Python client for the NOSIBLE Search API
-Home-page: https://github.com/NosibleAI/nosible
+Home-page: https://github.com/NosibleAI/nosible-py
 Author: Stuart Reid, Matthew Dicks, Richard Taylor, Gareth Warburton
 Author-email: Stuart Reid <stuart@nosible.com>, Matthew Dicks <matthew@nosible.com>, Richard Taylor <richard@nosible.com>, Gareth Warburton <gareth@nosible.com>
 License-Expression: MIT
-Project-URL: Homepage, https://github.com/NosibleAI/nosible
+Project-URL: Homepage, https://github.com/NosibleAI/nosible-py
 Project-URL: Documentation, https://nosible-py.readthedocs.io/en/latest/
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
@@ -56,7 +56,7 @@ Dynamic: requires-python
 
 # NOSIBLE Search Client
 
-A high-level Python client for the [NOSIBLE Search API](https://www.nosible.ai/search/v1/docs/swagger#/).
+A high-level Python client for the [NOSIBLE Search API](https://www.nosible.ai/search/v2/docs/#/).
 Easily integrate the Nosible Search API into your Python projects.
 
 ### 📄 Documentation
@@ -154,7 +154,7 @@ You can find the full NOSIBLE Search Client documentation
 ### 📡 Swagger Docs
 
 You can find online endpoints to the NOSIBLE Search API Swagger Docs
-[here](https://www.nosible.ai/search/v1/docs/swagger#/).
+[here](https://www.nosible.ai/search/v2/docs/#/).
 
 
 ---

{nosible-0.2.10 → nosible-0.3.2}/tests/test_01_nosible.py

@@ -59,44 +59,13 @@ def test_bulk_search_errors_and_success(bulk_search_data):
     assert len(bulk_search_data) == 1000
 
 
-def test_visit_success_and_error(visit_data):
-    assert isinstance(visit_data, WebPageData)
-    assert hasattr(visit_data, "languages")
-    assert hasattr(visit_data, "page")
+def test_scrape_url_success_and_error(scrape_url_data):
+    assert isinstance(scrape_url_data, WebPageData)
+    assert hasattr(scrape_url_data, "languages")
+    assert hasattr(scrape_url_data, "page")
     nos = Nosible()
     with pytest.raises(TypeError):
-        nos.visit()
-
-
-def test_version_structure():
-    nos = Nosible()
-    v = nos.version()
-    data = json.loads(v)
-    assert isinstance(data, dict)
-    assert "response" in data and isinstance(data["response"], dict)
-    expected = {"database", "date", "documents", "runtime", "snippets", "time", "tokens", "version", "words"}
-    assert set(data["response"].keys()) == expected
-
-
-def test_indexed_fixture(indexed_data):
-    assert indexed_data is True
-
-
-def test_preflight_output():
-    nos = Nosible()
-    pf = nos.preflight(url="https://www.dailynewsegypt.com/2023/09/08/g20-and-its-summits/")
-    # Turn pf str into a dict
-    pf = json.loads(pf)
-    assert isinstance(pf, dict)
-    assert "response" in pf and isinstance(pf["response"], dict)
-    for key in ("domain", "netloc", "raw_url", "scheme", "path", "suffix", "hash"):
-        assert key in pf["response"]
-
-
-def test_get_rate_limits_contains_plans():
-    nos = Nosible(nosible_api_key="test|xyz")
-    rl = nos.get_rate_limits()
-    assert "Free:" in rl and "Basic ($49p/m):" in rl
+        nos.scrape_url()
 
 
 def test_close_idempotent():
@@ -131,70 +100,70 @@ def test_search_minimal(search_data):
     assert isinstance(search_data, ResultSet)
 
 
-def test_visit_full_attributes(visit_data):
+def test_scrape_url_full_attributes(scrape_url_data):
     # all the extra attributes you wanted
-    assert isinstance(visit_data.full_text, str)
-    assert isinstance(visit_data.languages, dict)
-    assert isinstance(visit_data.metadata, dict)
-    assert isinstance(visit_data.page, dict)
-    assert isinstance(visit_data.request, dict)
-    assert isinstance(visit_data.snippets, SnippetSet)
-    assert isinstance(visit_data.statistics, dict)
-    assert isinstance(visit_data.structured, list)
-    assert isinstance(visit_data.url_tree, dict)
-
-
-def test_visit_save_load(tmp_path, visit_data):
+    assert isinstance(scrape_url_data.full_text, str)
+    assert isinstance(scrape_url_data.languages, dict)
+    assert isinstance(scrape_url_data.metadata, dict)
+    assert isinstance(scrape_url_data.page, dict)
+    assert isinstance(scrape_url_data.request, dict)
+    assert isinstance(scrape_url_data.snippets, SnippetSet)
+    assert isinstance(scrape_url_data.statistics, dict)
+    assert isinstance(scrape_url_data.structured, list)
+    assert isinstance(scrape_url_data.url_tree, dict)
+
+
+def test_scrape_url_save_load(tmp_path, scrape_url_data):
     # save to JSON and reload
-    path = tmp_path / "visit_data.json"
-    visit_data.write_json(path)
+    path = tmp_path / "scrape_url_data.json"
+    scrape_url_data.write_json(path)
     loaded = WebPageData.read_json(path)
     assert isinstance(loaded, WebPageData)
-    assert loaded == visit_data
+    assert loaded == scrape_url_data
     assert isinstance(loaded.snippets, SnippetSet)
 
 
-def test_visit_write_json_roundtrip(tmp_path, visit_data):
+def test_scrape_url_write_json_roundtrip(tmp_path, scrape_url_data):
     # write_json / read_json
-    s = visit_data.write_json(tmp_path / "visit_data.json")
+    s = scrape_url_data.write_json(tmp_path / "scrape_url_data.json")
     assert isinstance(s, str)
-    rehydrated = WebPageData.read_json(tmp_path / "visit_data.json")
+    rehydrated = WebPageData.read_json(tmp_path / "scrape_url_data.json")
     assert isinstance(rehydrated, WebPageData)
     assert isinstance(rehydrated.snippets, SnippetSet)
 
 
-def test_trend_success(trend_data):
-    # trend_data fixture should give the full payload as a dict
-    assert isinstance(trend_data, dict)
-    assert trend_data  # non‐empty
+def test_topic_trend_success(topic_trend_data):
+    # topic_trend_data fixture should give the full payload as a dict
+    assert isinstance(topic_trend_data, dict)
+    assert topic_trend_data  # non‐empty
     # keys should look like ISO dates, values numeric
-    for date_str, count in trend_data.items():
+    for date_str, count in topic_trend_data.items():
         assert re.match(r"^\d{4}-\d{2}-\d{2}$", date_str)
         assert isinstance(count, (int, float))
 
 
-def test_trend_date_window(trend_data):
+def test_topic_trend_date_window(topic_trend_data):
     """
     When start_date/end_date exactly cover the full range,
-    trend() should return the same set of dates (keys), regardless of values.
+    topic_trend() should return the same set of dates (keys), regardless of values.
     """
-    dates = sorted(trend_data.keys())
+    dates = sorted(topic_trend_data.keys())
     start, end = dates[0], dates[-1]
 
     with Nosible() as nos:
-        windowed = nos.trend(query="any query", start_date=start, end_date=end)
+        windowed = nos.topic_trend(query="any query", start_date=start, end_date=end)
         # Compare only the dates (keys), not the counts
-        assert set(windowed.keys()) == set(trend_data.keys())
+        assert set(windowed.keys()) == set(topic_trend_data.keys())
         # And in the same order if you care about ordering
         assert sorted(windowed.keys()) == dates
 
 
-def test_trend_invalid_date_format():
+def test_topic_trend_invalid_date_format():
     with Nosible() as nos:
         with pytest.raises(ValueError):
-            nos.trend(query="q", start_date="20210101")    # Missing hyphens
+            nos.topic_trend(query="q", start_date="20210101")    # Missing hyphens
         with pytest.raises(ValueError):
-            nos.trend(query="q", end_date="2021/01/01")    # Wrong separator
+            nos.topic_trend(query="q", end_date="2021/01/01")    # Wrong separator
 
 
 def test_search_min_similarity(search_data):