nosible 0.3.9__tar.gz → 0.3.10__tar.gz

{nosible-0.3.9/src/nosible.egg-info → nosible-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nosible
-Version: 0.3.9
+Version: 0.3.10
 Summary: Python client for the NOSIBLE Search API
 Home-page: https://github.com/NosibleAI/nosible-py
 Author: Stuart Reid, Matthew Dicks, Richard Taylor, Gareth Warburton
@@ -31,7 +31,7 @@ Requires-Dist: polars
 Requires-Dist: duckdb
 Requires-Dist: openai
 Requires-Dist: tantivy
-Requires-Dist: pyrate-limiter
+Requires-Dist: pyrate-limiter<4
 Requires-Dist: tenacity
 Requires-Dist: cryptography
 Requires-Dist: pyarrow

{nosible-0.3.9 → nosible-0.3.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nosible"
-version = "0.3.9"
+version = "0.3.10"
 description = "Python client for the NOSIBLE Search API"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.9"
@@ -16,7 +16,7 @@ dependencies = [
   "duckdb",
   "openai",
   "tantivy",
-  "pyrate-limiter",
+  "pyrate-limiter<4",
   "tenacity",
   "cryptography",
   "pyarrow",

{nosible-0.3.9 → nosible-0.3.10}/src/nosible/nosible_client.py

@@ -29,7 +29,7 @@ from nosible.classes.search_set import SearchSet
 from nosible.classes.snippet_set import SnippetSet
 from nosible.classes.web_page import WebPageData
 from nosible.utils.json_tools import json_loads
-from nosible.utils.rate_limiter import PLAN_RATE_LIMITS, RateLimiter, _rate_limited
+from nosible.utils.rate_limiter import RateLimiter, _rate_limited
 
 # Set up a module‐level logger.
 logger = logging.getLogger(__name__)
@@ -202,11 +202,6 @@ class Nosible:
         logging.getLogger("httpx").setLevel(logging.WARNING)
         logging.getLogger("httpcore").setLevel(logging.WARNING)
 
-        self._limiters = {
-            endpoint: [RateLimiter(calls, period) for calls, period in buckets]
-            for endpoint, buckets in PLAN_RATE_LIMITS[self._get_user_plan()].items()
-        }
-
         # Define retry decorator
         self._post = retry(
             reraise=True,
@@ -230,7 +225,34 @@ class Nosible:
         self._executor = ThreadPoolExecutor(max_workers=self.concurrency)
 
         # Headers
-        self.headers = {"Accept-Encoding": "gzip", "Content-Type": "application/json", "api-key": self.nosible_api_key}
+        self.headers = {
+            "Accept-Encoding": "gzip",
+            "Content-Type": "application/json",
+            "api-key": self.nosible_api_key
+        }
+
+        # Wrap _get_limits with retry.
+        self._get_limits = retry(
+            reraise=True,
+            stop=stop_after_attempt(self.retries) | stop_after_delay(self.timeout),
+            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._get_limits)
+
+        raw_limits = self._get_limits()
+
+        # Map API query_type -> your decorator endpoint keys
+        mapped_limits = {
+            "fast": raw_limits.get("fast", []),
+            "bulk": raw_limits.get("slow", []),
+            "scrape-url": raw_limits.get("visit", []),
+        }
+
+        self._limiters = {
+            endpoint: [RateLimiter(calls, period) for calls, period in buckets]
+            for endpoint, buckets in mapped_limits.items()
+        }
 
         # Filters
         self.publish_start = publish_start
@@ -1602,7 +1624,6 @@ class Nosible:
 
         return filtered
 
-
     def close(self):
         """
         Close the Nosible client, shutting down the HTTP session
@@ -1702,41 +1723,52 @@ class Nosible:
 
         return response
 
-    def _get_user_plan(self) -> str:
+    def _get_limits(self) -> dict[str, list[tuple[int, float]]]:
+        """
+        TODO
         """
-        Determine the user's subscription plan from the API key.
+        url = "https://www.nosible.ai/search/v2/limits"
+        resp = self._session.get(
+            url=url,
+            headers=self.headers,
+            timeout=self.timeout,
+            follow_redirects=True,
+        )
 
-        The `nosible_api_key` is expected to start with a plan prefix followed by
-        a pipe (`|`) and any additional data. This method splits on the first
-        pipe character, validates the prefix against supported plans, and returns it.
+        if resp.status_code == 401:
+            raise ValueError("Your API key is not valid.")
+        if resp.status_code == 429:
+            raise ValueError("You have hit your rate limit.")
+        if resp.status_code == 409:
+            raise ValueError("Too many concurrent searches.")
+        if resp.status_code == 502:
+            raise ValueError("NOSIBLE is currently restarting.")
+        if resp.status_code == 504:
+            raise ValueError("NOSIBLE is currently overloaded.")
 
-        Returns
-        -------
-        str
-            The plan you are currently on.
+        resp.raise_for_status()
 
-        Raises
-        ------
-        ValueError
-            If the extracted prefix is not one of the recognized plan names.
+        try:
+            data = resp.json()
+        except Exception as e:
+            raise ValueError("Invalid JSON response from /limits") from e
 
-        Examples
-        --------
-        >>> nos = Nosible(nosible_api_key="test+|xyz")  # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
-        Traceback (most recent call last):
-        ...
-        ValueError: Your API key is not valid: test+ is not a valid plan prefix.
-        """
-        # Split off anything after the first '|'
-        prefix = (self.nosible_api_key or "").split("|", 1)[0]
+        limits_list = data.get("limits")
+        if not isinstance(limits_list, list):
+            raise ValueError(f"Invalid /limits response shape: {data!r}")
+
+        grouped: dict[str, list[tuple[int, float]]] = {}
+        for item in limits_list:
+            query_type = item.get("query_type")
+            duration = item.get("duration_seconds")
+            limit = item.get("limit")
 
-        # Map prefixes -> plan names
-        plans = {"test", "self", "basic", "pro", "pro+", "bus", "bus+", "ent", "chat", "cons", "stup", "busn", "prod"}
+            if query_type is None or duration is None or limit is None:
+                raise ValueError(f"Invalid limit entry: {item!r}")
 
-        if prefix not in plans:
-            raise ValueError(f"Your API key is not valid: {prefix} is not a valid plan prefix.")
+            grouped.setdefault(str(query_type), []).append((int(limit), float(duration)))
 
-        return prefix
+        return grouped
 
     def _generate_expansions(self, question: Union[str, Search]) -> list:
         """

{nosible-0.3.9 → nosible-0.3.10}/src/nosible/utils/rate_limiter.py

@@ -8,77 +8,6 @@ from pyrate_limiter.exceptions import BucketFullException, LimiterDelayException
 
 log = logging.getLogger(__name__)
 
-PLAN_RATE_LIMITS = {
-    "test": {
-        # Per minute limit, then per month.
-        "scrape-url": [(60, 60), (300, 24 * 3600 * 30)],
-        "bulk": [(60, 60), (300, 24 * 3600 * 30)],
-        "fast": [(60, 60), (3000, 24 * 3600 * 30)],
-    },
-    "basic": {
-        "scrape-url": [(60, 60), (1400, 24 * 3600 * 30)],
-        "bulk": [(60, 60), (1400, 24 * 3600 * 30)],
-        "fast": [(60, 60), (14_000, 24 * 3600 * 30)],
-    },
-    "pro": {
-        "scrape-url": [(60, 60), (6700, 24 * 3600 * 30)],
-        "bulk": [(60, 60), (6700, 24 * 3600 * 30)],
-        "fast": [(60, 60), (67_000, 24 * 3600 * 30)],
-    },
-    "pro+": {
-        "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": {
-        "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+": {
-        "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": {
-        "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)],
-    },
-    "prod": {
-        "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": {
-        "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)],
-    },
-    "self": {
-        "scrape-url": [(6000, 60), (1_500_000, 24 * 3600 * 30)],
-        "bulk": [(6000, 60), (1_500_000, 24 * 3600 * 30)],
-        "fast": [(36_000, 60), (15_000_000, 24 * 3600 * 30)],
-    },
-    "cons": {
-        "scrape-url": [(60, 60), (3000, 24 * 3600 * 30)],
-        "bulk": [(60, 60), (3000, 24 * 3600 * 30)],
-        "fast": [(120, 60), (30_000, 24 * 3600 * 30)],
-    },
-    "stup": {
-        "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": {
-        "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)],
-    },
-}
-
 
 def _rate_limited(endpoint):
     """

{nosible-0.3.9 → nosible-0.3.10/src/nosible.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nosible
-Version: 0.3.9
+Version: 0.3.10
 Summary: Python client for the NOSIBLE Search API
 Home-page: https://github.com/NosibleAI/nosible-py
 Author: Stuart Reid, Matthew Dicks, Richard Taylor, Gareth Warburton
@@ -31,7 +31,7 @@ Requires-Dist: polars
 Requires-Dist: duckdb
 Requires-Dist: openai
 Requires-Dist: tantivy
-Requires-Dist: pyrate-limiter
+Requires-Dist: pyrate-limiter<4
 Requires-Dist: tenacity
 Requires-Dist: cryptography
 Requires-Dist: pyarrow

{nosible-0.3.9 → nosible-0.3.10}/src/nosible.egg-info/requires.txt

@@ -2,7 +2,7 @@ polars
 duckdb
 openai
 tantivy
-pyrate-limiter
+pyrate-limiter<4
 tenacity
 cryptography
 pyarrow

{nosible-0.3.9 → nosible-0.3.10}/tests/test_01_nosible.py

@@ -72,11 +72,6 @@ def test_close_idempotent():
     nos.close()
 
 
-def test_invalid_api_key():
-    with pytest.raises(ValueError):
-        Nosible(nosible_api_key="test+|xyz")
-
-
 def test_llm_key_required_for_expansions():
     nos = Nosible(llm_api_key=None)
     nos.llm_api_key = None