pyyapper 1.3.0__tar.gz → 1.3.2__tar.gz

{pyyapper-1.3.0/src/pyyapper.egg-info → pyyapper-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyyapper
-Version: 1.3.0
+Version: 1.3.2
 Summary: An intuitive, async Python library for the Yapper bot API.
 Author: PyYapper contributors
 License-Expression: MIT
@@ -31,6 +31,8 @@ Requires-Dist: twine; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
 Requires-Dist: mkdocs-material; extra == "docs"
+Provides-Extra: speed
+Requires-Dist: orjson; extra == "speed"
 Dynamic: license-file
 
 # PyYapper

{pyyapper-1.3.0 → pyyapper-1.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyyapper"
-version = "1.3.0"
+version = "1.3.2"
 description = "An intuitive, async Python library for the Yapper bot API."
 readme = "README.md"
 license = "MIT"
@@ -33,6 +33,7 @@ dependencies = [
 [project.optional-dependencies]
 dev = ["pytest", "pytest-asyncio", "build", "twine"]
 docs = ["mkdocs", "mkdocs-material"]
+speed = ["orjson"]
 
 [project.urls]
 Homepage = "https://github.com/pyyapper/pyyapper"

pyyapper-1.3.2/src/pyyapper/_version.py

@@ -0,0 +1 @@
+__version__ = "1.3.2"

{pyyapper-1.3.0 → pyyapper-1.3.2}/src/pyyapper/bot.py

@@ -17,7 +17,10 @@ from .models import (
     Role,
     Server,
     User,
+    VoiceChannel,
 )
+from .cache import TTLCache, MISSING as _CACHE_MISSING
+from .presence import Activity, Presence
 from .embeds import Embed
 from .buttons import Button, Row
 
@@ -177,6 +180,7 @@ class Bot:
         log: bool = True,
         ignore_bots: bool = True,
         max_age: Optional[int] = None,
+        cache_ttl: float = 0.0,
     ) -> None:
         if token is None:
             import os
@@ -186,6 +190,8 @@ class Bot:
         self.ignore_bots = bool(ignore_bots)
         self.max_age = max_age
         self._presence = None
+        self._cache = TTLCache(default_ttl=cache_ttl)
+        self.cache_ttl = cache_ttl
         self.prefixes = prefixes if prefixes is not None else ["/", "!"]
         self.log = log
 
@@ -438,27 +444,71 @@ class Bot:
     # ------------------------------------------------------------------ #
     # Servers / channels / members
     # ------------------------------------------------------------------ #
-    async def servers(self) -> list[Server]:
+    async def servers(self, *, cache_ttl: Optional[float] = None, force: bool = False) -> list[Server]:
+        key = ("servers",)
+        _eff_ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+        if not force and _eff_ttl and _eff_ttl > 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            cached = self._cache.get(key)
+            if cached is not _CACHE_MISSING:
+                return cached
         out = await self.api("GET", "/servers")
-        return [Server.from_dict(s) for s in (out.get("servers") or [])]
-
-    async def channels(self, server_id: Any = None, *, type: Optional[str] = None) -> list[Channel]:
+        res = [Server.from_dict(s) for s in (out.get("servers") or [])]
+        if cache_ttl != 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            self._cache.set(key, res, ttl)
+        return res
+
+    async def channels(self, server_id: Any = None, *, type: Optional[str] = None, cache_ttl: Optional[float] = None, force: bool = False) -> list[Channel]:
+        key = ("channels", server_id, type)
+        _eff_ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+        if not force and _eff_ttl and _eff_ttl > 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            cached = self._cache.get(key)
+            if cached is not _CACHE_MISSING:
+                return cached
         q = f"?type={type}" if type else ""
         path = f"/servers/{server_id}/channels{q}" if server_id else f"/channels{q}"
         out = await self.api("GET", path)
-        return [Channel.from_dict(c) for c in (out.get("channels") or [])]
-
-    async def categories(self, server_id: Any) -> list[Category]:
+        res = [Channel.from_dict(c) for c in (out.get("channels") or [])]
+        if cache_ttl != 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            self._cache.set(key, res, ttl)
+        return res
+
+    async def categories(self, server_id: Any, *, cache_ttl: Optional[float] = None, force: bool = False) -> list[Category]:
+        key = ("categories", server_id)
+        _eff_ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+        if not force and _eff_ttl and _eff_ttl > 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            cached = self._cache.get(key)
+            if cached is not _CACHE_MISSING:
+                return cached
         out = await self.api("GET", f"/servers/{server_id}/channels")
-        return [Category.from_dict(c) for c in (out.get("categories") or [])]
-
-    async def channel(self, channel_id: Any) -> Optional[Channel]:
+        res = [Category.from_dict(c) for c in (out.get("categories") or [])]
+        if cache_ttl != 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            self._cache.set(key, res, ttl)
+        return res
+
+    async def channel(self, channel_id: Any, *, cache_ttl: Optional[float] = None, force: bool = False) -> Optional[Channel]:
+        key = ("channel", channel_id)
+        _eff_ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+        if not force and _eff_ttl and _eff_ttl > 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            cached = self._cache.get(key)
+            if cached is not _CACHE_MISSING:
+                return cached
         try:
             out = await self.api("GET", f"/channels/{channel_id}")
         except Exception:
             return None
         c = out.get("channel") if isinstance(out, dict) else None
-        return Channel.from_dict(c) if c else None
+        res = Channel.from_dict(c) if c else None
+        if cache_ttl != 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            self._cache.set(key, res, ttl)
+        return res
 
     async def members(self, server_id: Any, after: Any = None) -> list[Member]:
         path = f"/servers/{server_id}/members?limit=200"
@@ -471,10 +521,21 @@ class Bot:
         out = await self.api("GET", f"/channels/{channel_id}/messages?limit={limit}")
         return [Message.from_dict(m) for m in (out.get("messages") or [])]
 
-    async def user(self, user_id: Any) -> User:
+    async def user(self, user_id: Any, *, cache_ttl: Optional[float] = None, force: bool = False) -> User:
+        key = ("user", user_id)
+        _eff_ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+        if not force and _eff_ttl and _eff_ttl > 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            cached = self._cache.get(key)
+            if cached is not _CACHE_MISSING:
+                return cached
         out = await self.api("GET", f"/users/{user_id}")
         u = out.get("user") if isinstance(out, dict) else out
-        return User.from_dict(u)
+        res = User.from_dict(u)
+        if cache_ttl != 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            self._cache.set(key, res, ttl)
+        return res
 
     # ------------------------------------------------------------------ #
     # Profile
@@ -494,7 +555,6 @@ class Bot:
         return await self.http.upload("PUT", "/me/banner", image, type)
 
     async def set_status(self, status: str = "online", activity: Any = None) -> Any:
-        from .presence import Presence, Activity
         if isinstance(activity, Activity):
             activity = activity.to_text()
         elif isinstance(activity, Presence):
@@ -503,7 +563,6 @@ class Bot:
         return await self.api("PUT", "/me/status", {"status": status, "activity": activity})
 
     async def set_presence(self, *, status: str = "online", activity: Any = None) -> Any:
-        from .presence import Presence
         self._presence = Presence(status=status, activity=activity)
         return await self.set_status(status=status, activity=activity)
 
@@ -567,13 +626,35 @@ class Bot:
     # ------------------------------------------------------------------ #
     # Moderation
     # ------------------------------------------------------------------ #
-    async def server(self, server_id: Any) -> Any:
+    async def server(self, server_id: Any, *, cache_ttl: Optional[float] = None, force: bool = False) -> Any:
+        key = ("server", server_id)
+        _eff_ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+        if not force and _eff_ttl and _eff_ttl > 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            cached = self._cache.get(key)
+            if cached is not _CACHE_MISSING:
+                return cached
         out = await self.api("GET", f"/servers/{server_id}")
-        return out.get("server") if isinstance(out, dict) else out
-
-    async def roles(self, server_id: Any) -> list[Role]:
+        res = out.get("server") if isinstance(out, dict) else out
+        if cache_ttl != 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            self._cache.set(key, res, ttl)
+        return res
+
+    async def roles(self, server_id: Any, *, cache_ttl: Optional[float] = None, force: bool = False) -> list[Role]:
+        key = ("roles", server_id)
+        _eff_ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+        if not force and _eff_ttl and _eff_ttl > 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            cached = self._cache.get(key)
+            if cached is not _CACHE_MISSING:
+                return cached
         out = await self.api("GET", f"/servers/{server_id}/roles")
-        return [Role.from_dict(r) for r in (out.get("roles") or [])]
+        res = [Role.from_dict(r) for r in (out.get("roles") or [])]
+        if cache_ttl != 0:
+            ttl = self._cache.default_ttl if cache_ttl is None else cache_ttl
+            self._cache.set(key, res, ttl)
+        return res
 
     async def member(self, server_id: Any, user_id: Any) -> Member:
         out = await self.api("GET", f"/servers/{server_id}/members/{user_id}")
@@ -611,7 +692,6 @@ class Bot:
     # Voice
     # ------------------------------------------------------------------ #
     async def voice(self, server_id: Any) -> list:
-        from .models import VoiceChannel
         out = await self.api("GET", f"/servers/{server_id}/voice")
         voice = out.get("voice", []) if isinstance(out, dict) else []
         return [VoiceChannel.from_dict(v) for v in (voice or [])]
@@ -798,6 +878,19 @@ class Bot:
     def stop(self) -> None:
         self.running = False
 
+    def invalidate_cache(self, key: Any = None) -> None:
+        """Drop cached read results. ``key=None`` clears everything."""
+        self._cache.invalidate(key)
+
+    async def send_many(self, channel_id: Any, contents: Any, *, concurrency: int = 5, **opts: Any) -> list:
+        sem = asyncio.Semaphore(max(1, int(concurrency)))
+
+        async def _one(c: Any) -> Any:
+            async with sem:
+                return await self.send(channel_id, c, **opts)
+
+        return list(await asyncio.gather(*(_one(c) for c in (contents or [])), return_exceptions=True))
+
     # ------------------------------------------------------------------ #
     # Internals
     # ------------------------------------------------------------------ #
@@ -818,6 +911,9 @@ class Bot:
                 except Exception:
                     pass
 
+        if len(fns) == 1:
+            await _run(fns[0])
+            return
         # Dispatch handlers concurrently to reduce latency when several
         # listeners are registered for the same event. Order is not guaranteed.
         await asyncio.gather(*(_run(fn) for fn in fns), return_exceptions=True)

pyyapper-1.3.2/src/pyyapper/cache.py

@@ -0,0 +1,52 @@
+"""Tiny TTL cache used by PyYapper for read-heavy API calls."""
+
+from __future__ import annotations
+
+import time
+from typing import Any, Optional
+
+_MISSING = object()
+
+
+class TTLCache:
+    """A simple in-memory TTL cache.
+
+    Keys may be any hashable value. ``get`` returns the sentinel
+    :data:`MISSING` when a key is absent or expired.
+    """
+
+    def __init__(self, default_ttl: float = 15.0) -> None:
+        self._store: dict[Any, tuple[Any, float]] = {}
+        self.default_ttl = float(default_ttl)
+
+    def get(self, key: Any) -> Any:
+        entry = self._store.get(key)
+        if entry is None:
+            return _MISSING
+        value, expiry = entry
+        if time.monotonic() >= expiry:
+            self._store.pop(key, None)
+            return _MISSING
+        return value
+
+    def set(self, key: Any, value: Any, ttl: Optional[float] = None) -> None:
+        if ttl is None:
+            ttl = self.default_ttl
+        if ttl and ttl > 0:
+            self._store[key] = (value, time.monotonic() + float(ttl))
+
+    def invalidate(self, key: Any = None) -> None:
+        if key is None:
+            self._store.clear()
+        else:
+            self._store.pop(key, None)
+
+    def invalidate_prefix(self, prefix: Any) -> None:
+        for k in [k for k in list(self._store.keys()) if isinstance(k, tuple) and k and k[0] == prefix]:
+            self._store.pop(k, None)
+
+    def size(self) -> int:
+        return len(self._store)
+
+
+MISSING = _MISSING

{pyyapper-1.3.0 → pyyapper-1.3.2}/src/pyyapper/ext/commands/core.py

@@ -376,10 +376,13 @@ def remove_cog(bot, name):
             import asyncio
             # best-effort: if event loop running, schedule; else run
             try:
-                loop = asyncio.get_event_loop()
-                if loop.is_running():
-                    loop.create_task(res)
-                else:
+                try:
+                    loop = asyncio.get_running_loop()
+                    if loop.is_running():
+                        loop.create_task(res)
+                except RuntimeError:
+                    loop = asyncio.new_event_loop()
+                    asyncio.set_event_loop(loop)
                     loop.run_until_complete(res)
             except Exception:
                 pass

{pyyapper-1.3.0 → pyyapper-1.3.2}/src/pyyapper/ext/tasks.py

@@ -132,9 +132,10 @@ class Loop:
         try:
             loop = asyncio.get_running_loop()
         except RuntimeError:
-            # Fallback: try to get/create an event loop.
+            # Fallback: create a new event loop (cross-platform).
             try:
-                loop = asyncio.get_event_loop()
+                loop = asyncio.new_event_loop()
+                asyncio.set_event_loop(loop)
             except RuntimeError:
                 return None
         try:

{pyyapper-1.3.0 → pyyapper-1.3.2}/src/pyyapper/http.py

@@ -15,6 +15,25 @@ from __future__ import annotations
 import asyncio
 import json
 import random
+
+try:
+    import orjson as _orjson
+
+    def _json_loads(data):
+        return _orjson.loads(data)
+
+    def _json_dumps(obj):
+        return _orjson.dumps(obj)
+
+    _HAS_ORJSON = True
+except ImportError:  # pragma: no cover
+    _HAS_ORJSON = False
+
+    def _json_loads(data):
+        return json.loads(data)
+
+    def _json_dumps(obj):
+        return json.dumps(obj).encode()
 from typing import Any, Optional
 
 import aiohttp
@@ -93,7 +112,8 @@ class HTTPClient:
             # JSON body unless caller already provided bytes
             if content_type is None:
                 content_type = "application/json"
-            data = json.dumps(body)
+            dumped = _json_dumps(body)
+            data = dumped if isinstance(dumped, (bytes, bytearray)) else dumped.encode()
         elif body is not None:
             data = body
         if content_type:
@@ -111,8 +131,8 @@ class HTTPClient:
                     raw = await res.read()
                     text = raw.decode("utf-8", errors="replace") if raw else ""
                     try:
-                        payload = json.loads(text) if text else {}
-                    except json.JSONDecodeError:
+                        payload = _json_loads(text) if text else {}
+                    except Exception:
                         payload = {}
                     if res.status < 400:
                         return payload

{pyyapper-1.3.0 → pyyapper-1.3.2}/src/pyyapper/pagination.py

@@ -62,7 +62,11 @@ class Paginator:
         return [Row(*btns)]
 
     async def _wait(self) -> Any:
-        loop = asyncio.get_event_loop()
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
         self._future = loop.create_future()
         try:
             return await asyncio.wait_for(self._future, timeout=self.timeout)

{pyyapper-1.3.0 → pyyapper-1.3.2}/src/pyyapper/wait_for.py

@@ -104,7 +104,8 @@ class WaiterRegistry:
         try:
             loop = asyncio.get_running_loop()
         except RuntimeError:
-            loop = asyncio.get_event_loop()
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
         future = loop.create_future()
         waiter = self.add(event, check, future)
         try:

{pyyapper-1.3.0 → pyyapper-1.3.2}/src/pyyapper/webhooks.py

@@ -10,6 +10,25 @@ from __future__ import annotations
 import asyncio
 import json
 from typing import Any, Optional
+
+try:
+    import orjson as _orjson
+
+    def _json_loads(data):
+        return _orjson.loads(data)
+
+    def _json_dumps(obj):
+        return _orjson.dumps(obj)
+
+    _HAS_ORJSON = True
+except ImportError:  # pragma: no cover
+    _HAS_ORJSON = False
+
+    def _json_loads(data):
+        return json.loads(data)
+
+    def _json_dumps(obj):
+        return json.dumps(obj).encode()
 from urllib.parse import urlparse
 
 import aiohttp
@@ -134,11 +153,16 @@ class Webhook:
         session = await self._get_session()
         for attempt in range(retries + 1):
             try:
+                if json_body is None:
+                    data_body = None
+                else:
+                    dumped = _json_dumps(json_body)
+                    data_body = dumped if isinstance(dumped, (bytes, bytearray)) else dumped.encode()
                 kwargs = dict(
                     params=params,
-                    json=json_body,
+                    data=data_body,
                     timeout=aiohttp.ClientTimeout(total=timeout),
-                    headers={"User-Agent": USER_AGENT},
+                    headers={"User-Agent": USER_AGENT, "Content-Type": "application/json"} if data_body is not None else {"User-Agent": USER_AGENT},
                 )
                 if hasattr(session, "request"):
                     cm = session.request(method, url, **kwargs)
@@ -151,8 +175,8 @@ class Webhook:
                     raw = await res.read()
                     text = raw.decode("utf-8", errors="replace") if raw else ""
                     try:
-                        payload = json.loads(text) if text else None
-                    except json.JSONDecodeError:
+                        payload = _json_loads(text) if text else None
+                    except Exception:
                         payload = None
                     if res.status < 400:
                         return payload

{pyyapper-1.3.0 → pyyapper-1.3.2/src/pyyapper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyyapper
-Version: 1.3.0
+Version: 1.3.2
 Summary: An intuitive, async Python library for the Yapper bot API.
 Author: PyYapper contributors
 License-Expression: MIT
@@ -31,6 +31,8 @@ Requires-Dist: twine; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
 Requires-Dist: mkdocs-material; extra == "docs"
+Provides-Extra: speed
+Requires-Dist: orjson; extra == "speed"
 Dynamic: license-file
 
 # PyYapper

{pyyapper-1.3.0 → pyyapper-1.3.2}/src/pyyapper.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ src/pyyapper/__init__.py
 src/pyyapper/_version.py
 src/pyyapper/bot.py
 src/pyyapper/buttons.py
+src/pyyapper/cache.py
 src/pyyapper/commands.py
 src/pyyapper/embeds.py
 src/pyyapper/errors.py

{pyyapper-1.3.0 → pyyapper-1.3.2}/src/pyyapper.egg-info/requires.txt

@@ -9,3 +9,6 @@ twine
 [docs]
 mkdocs
 mkdocs-material
+
+[speed]
+orjson

pyyapper-1.3.0/src/pyyapper/_version.py

@@ -1 +0,0 @@
-__version__ = "1.3.0"