pyyapper 1.1.0__tar.gz → 1.3.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyyapper
-Version: 1.1.0
+Version: 1.3.0
 Summary: An intuitive, async Python library for the Yapper bot API.
 Author: PyYapper contributors
 License-Expression: MIT

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyyapper"
-version = "1.1.0"
+version = "1.3.0"
 description = "An intuitive, async Python library for the Yapper bot API."
 readme = "README.md"
 license = "MIT"

{pyyapper-1.1.0 → pyyapper-1.3.0}/src/pyyapper/__init__.py

@@ -14,10 +14,12 @@ from .errors import (
     NotFound,
     RateLimited,
     ServerError,
+    ServiceUnavailable,
 )
 from .models import (
-    User, Server, Channel, Category, Member, Message, Role,
+    User, Server, Channel, Category, Member, Message, Role, VoiceChannel, picture_url,
 )
+from .presence import Activity, Presence
 from .pagination import Paginator
 from .webhooks import Webhook
 from .wait_for import WaiterRegistry, wait_for
@@ -29,8 +31,9 @@ __all__ = [
     "Bot", "Context", "InteractionContext",
     "Embed", "Button", "Row",
     "YapperError", "ConfigurationError", "HTTPException",
-    "BadRequest", "Unauthorized", "Forbidden", "NotFound", "RateLimited", "ServerError",
-    "User", "Server", "Channel", "Category", "Member", "Message", "Role",
+    "BadRequest", "Unauthorized", "Forbidden", "NotFound", "RateLimited", "ServerError", "ServiceUnavailable",
+    "User", "Server", "Channel", "Category", "Member", "Message", "Role", "VoiceChannel", "picture_url",
+    "Activity", "Presence",
     "Paginator", "Webhook", "WaiterRegistry", "wait_for",
     "commands", "tasks",
     "Cog", "Command", "Group",

pyyapper-1.3.0/src/pyyapper/_version.py

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

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

@@ -24,8 +24,8 @@ from .buttons import Button, Row
 # Event names that are valid.
 EVENTS = {
     "message", "command", "command_error", "member_join", "member_leave",
-    "reaction_add", "reaction_remove", "interaction", "test",
-    "ready", "error",
+    "reaction_add", "reaction_remove", "voice_join", "voice_leave",
+    "interaction", "test", "ready", "error",
 }
 
 # Helper to coerce embeds/buttons to dicts.
@@ -170,14 +170,22 @@ class Bot:
 
     def __init__(
         self,
-        token: str,
+        token: Optional[str] = None,
         *,
         base_url: str = "https://www.yapper.website/api/bot/v1",
         prefixes: Optional[list[str]] = None,
         log: bool = True,
+        ignore_bots: bool = True,
+        max_age: Optional[int] = None,
     ) -> None:
+        if token is None:
+            import os
+            token = os.environ.get("YAPPER_BOT_TOKEN")
         self.token = str(token).strip() if token else ""
         self.base_url = base_url
+        self.ignore_bots = bool(ignore_bots)
+        self.max_age = max_age
+        self._presence = None
         self.prefixes = prefixes if prefixes is not None else ["/", "!"]
         self.log = log
 
@@ -485,9 +493,20 @@ class Bot:
     async def set_banner(self, image: Any, type: Optional[str] = None) -> Any:
         return await self.http.upload("PUT", "/me/banner", image, type)
 
-    async def set_status(self, status: str = "online", activity: Optional[str] = None) -> Any:
+    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):
+            status = activity.to_status()
+            activity = activity.to_activity()
         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)
+
     # ------------------------------------------------------------------ #
     # Messages advanced
     # ------------------------------------------------------------------ #
@@ -588,6 +607,25 @@ class Bot:
             "user_id": user_id, "minutes": minutes, "reason": reason,
         })
 
+    # ------------------------------------------------------------------ #
+    # 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 [])]
+
+    async def move_member(self, server_id: Any, user_id: Any, channel_id: Any) -> Any:
+        return await self.api("POST", f"/servers/{server_id}/voice/move", {
+            "user_id": user_id, "channel_id": channel_id,
+        })
+
+    async def disconnect_member(self, server_id: Any, user_id: Any) -> Any:
+        return await self.api("POST", f"/servers/{server_id}/voice/disconnect", {
+            "user_id": user_id,
+        })
+
     # ------------------------------------------------------------------ #
     # Channels management
     # ------------------------------------------------------------------ #
@@ -664,7 +702,10 @@ class Bot:
             try:
                 self.me = User.from_dict(await self.api("GET", "/me"))
                 await self.api("PUT", "/commands", {"commands": cmd_list})
-                first = await self.api("GET", "/events?after=0&wait=0")
+                q = "/events?after=0&wait=0"
+                if self.max_age is not None:
+                    q += f"&max_age={int(self.max_age)}"
+                first = await self.api("GET", q)
                 break
             except Exception as e:
                 status = getattr(e, "status", None)
@@ -684,6 +725,12 @@ class Bot:
             print(f"[pyyapper] {self.me.username} is online"
                   + (f" with {len(cmd_list)} command{'s' if len(cmd_list) != 1 else ''}" if cmd_list else ""))
         await self._emit("ready", self.me)
+        # re-apply saved presence
+        if getattr(self, "_presence", None) is not None:
+            try:
+                await self.set_presence(status=self._presence.status, activity=self._presence.activity)
+            except Exception:
+                pass
         # start registered tasks
         try:
             from .ext.tasks import register_task, cancel_all_tasks
@@ -700,7 +747,10 @@ class Bot:
         failures = 0
         while self.running:
             try:
-                out = await self.api("GET", f"/events?after={self.last}&wait=25", timeout=45.0)
+                q = f"/events?after={self.last}&wait=25"
+                if self.max_age is not None:
+                    q += f"&max_age={int(self.max_age)}"
+                out = await self.api("GET", q, timeout=45.0)
                 failures = 0
             except Exception as e:
                 failures += 1
@@ -752,14 +802,25 @@ class Bot:
     # Internals
     # ------------------------------------------------------------------ #
     async def _emit(self, event: str, payload: Any) -> None:
-        for fn in list(self.handlers.get(event, [])):
+        fns = list(self.handlers.get(event, []))
+        if not fns:
+            return
+
+        async def _run(fn: Callable) -> None:
             try:
                 if asyncio.iscoroutinefunction(fn):
                     await fn(payload)
                 else:
                     fn(payload)
             except Exception as e:  # noqa: BLE001
-                await self._fail(e)
+                try:
+                    await self._fail(e)
+                except Exception:
+                    pass
+
+        # 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)
 
     async def _fail(self, e: Exception) -> None:
         if self.handlers.get("error"):
@@ -771,6 +832,15 @@ class Bot:
         etype = ev.get("type")
         data = ev.get("data") or {}
         if etype == "message":
+            if self.ignore_bots and data.get("author_bot"):
+                # skip messages from other bots/webhooks
+                if self._waiters is not None:
+                    try:
+                        ctx = Context(self, data)
+                        self._waiters.dispatch("message", ctx)
+                    except Exception:
+                        pass
+                return
             ctx = Context(self, data)
             # resolve command
             name = data.get("command")

{pyyapper-1.1.0 → pyyapper-1.3.0}/src/pyyapper/errors.py

@@ -72,6 +72,10 @@ class ServerError(HTTPException):
     """5xx - something went wrong on Yapper's side."""
 
 
+class ServiceUnavailable(ServerError):
+    """503 - Yapper is busy; retry after Retry-After."""
+
+
 # Status code -> exception class mapping used by the HTTP layer.
 STATUS_TO_EXC: dict[int, type[HTTPException]] = {
     400: BadRequest,
@@ -79,6 +83,7 @@ STATUS_TO_EXC: dict[int, type[HTTPException]] = {
     403: Forbidden,
     404: NotFound,
     429: RateLimited,
+    503: ServiceUnavailable,
 }
 
 

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

@@ -53,7 +53,14 @@ class HTTPClient:
 
     async def _get_session(self) -> aiohttp.ClientSession:
         if self._session is None or self._session.closed:
-            self._session = aiohttp.ClientSession()
+            connector = aiohttp.TCPConnector(
+                limit=100,
+                limit_per_host=30,
+                ttl_dns_cache=300,
+                enable_cleanup_closed=True,
+                keepalive_timeout=30,
+            )
+            self._session = aiohttp.ClientSession(connector=connector)
             self._owns_session = True
         return self._session
 
@@ -120,12 +127,14 @@ class HTTPClient:
                             retry_after = float(ra)
                         except ValueError:
                             retry_after = None
-                    # retry on 429 with Retry-After
-                    if res.status == 429 and retry_after and retry_after > 0 and retry_after <= 60 and attempt < retries:
-                        if self.log:
-                            print(f"[pyyapper] rate limited, retrying {method} {path} in {retry_after}s")
-                        await asyncio.sleep(retry_after)
-                        continue
+                    # retry on 429 / 503 with Retry-After
+                    if res.status in (429, 503) and retry_after and retry_after > 0 and attempt < retries:
+                        cap = 60 if res.status == 429 else 30
+                        if retry_after <= cap:
+                            if self.log:
+                                print(f"[pyyapper] {res.status} retrying {method} {path} in {retry_after}s")
+                            await asyncio.sleep(retry_after)
+                            continue
                     exc_cls = exception_for_status(res.status)
                     raise exc_cls(
                         res.status,

{pyyapper-1.1.0 → pyyapper-1.3.0}/src/pyyapper/models.py

@@ -43,6 +43,16 @@ class _Model:
         return out
 
 
+def picture_url(bucket: str, path: Any) -> Optional[str]:
+    """Build a full picture URL from a path returned by the API."""
+    if not path:
+        return None
+    p = str(path)
+    if p.startswith("/"):
+        return "https://www.yapper.website" + p
+    return f"https://files.yapper.website/{bucket}/{p}"
+
+
 @dataclass
 class User(_Model):
     id: str = ""
@@ -51,10 +61,21 @@ class User(_Model):
     bio: str = ""
     avatar_url: Optional[str] = None
     banner_url: Optional[str] = None
+    avatar_path: Optional[str] = None
+    banner_path: Optional[str] = None
+    badges: list[Any] = field(default_factory=list)
     created_at: Optional[str] = None
     bot: Optional[dict[str, Any]] = None
     raw: dict[str, Any] = field(default_factory=dict, repr=False)
 
+    @property
+    def avatar(self) -> Optional[str]:
+        return self.avatar_url or picture_url("avatars", self.avatar_path)
+
+    @property
+    def banner(self) -> Optional[str]:
+        return self.banner_url or picture_url("banners", self.banner_path)
+
     @classmethod
     def from_dict(cls, data: dict[str, Any] | None) -> "User":
         data = data or {}
@@ -65,6 +86,9 @@ class User(_Model):
             bio=data.get("bio", "") or "",
             avatar_url=data.get("avatar_url"),
             banner_url=data.get("banner_url"),
+            avatar_path=data.get("avatar_path"),
+            banner_path=data.get("banner_path"),
+            badges=list(data.get("badges") or []),
             created_at=data.get("created_at"),
             bot=data.get("bot"),
             raw=dict(data),
@@ -75,12 +99,26 @@ class User(_Model):
 class Server(_Model):
     id: str = ""
     name: str = ""
+    icon_path: Optional[str] = None
+    owner_id: Optional[str] = None
+    member_count: Optional[int] = None
     raw: dict[str, Any] = field(default_factory=dict, repr=False)
 
+    @property
+    def icon(self) -> Optional[str]:
+        return picture_url("icons", self.icon_path)
+
     @classmethod
     def from_dict(cls, data: dict[str, Any] | None) -> "Server":
         data = data or {}
-        return cls(id=data.get("id", "") or "", name=data.get("name", "") or "", raw=dict(data))
+        return cls(
+            id=data.get("id", "") or "",
+            name=data.get("name", "") or "",
+            icon_path=data.get("icon_path"),
+            owner_id=data.get("owner_id"),
+            member_count=data.get("member_count"),
+            raw=dict(data),
+        )
 
 
 @dataclass
@@ -166,13 +204,25 @@ class Message(_Model):
     author: Optional[str] = None
     content: str = ""
     attachment: Optional[str] = None
+    attachment_path: Optional[str] = None
     reply_to_id: Optional[str] = None
     created_at: Optional[str] = None
+    edited_at: Optional[str] = None
+    pinned_at: Optional[str] = None
     mentioned: bool = False
+    author_bot: bool = False
+    embeds: list[Any] = field(default_factory=list)
+    components: list[Any] = field(default_factory=list)
     command: Optional[str] = None
     args: Optional[str] = None
     raw: dict[str, Any] = field(default_factory=dict, repr=False)
 
+    @property
+    def attachment_url(self) -> Optional[str]:
+        if self.attachment:
+            return self.attachment
+        return picture_url("attachments", self.attachment_path)
+
     @classmethod
     def from_dict(cls, data: dict[str, Any] | None) -> "Message":
         data = data or {}
@@ -185,9 +235,15 @@ class Message(_Model):
             author=data.get("author"),
             content=data.get("content", "") or "",
             attachment=data.get("attachment"),
+            attachment_path=data.get("attachment_path"),
             reply_to_id=data.get("reply_to_id"),
             created_at=data.get("created_at"),
+            edited_at=data.get("edited_at"),
+            pinned_at=data.get("pinned_at"),
             mentioned=bool(data.get("mentioned", False)),
+            author_bot=bool(data.get("author_bot", False)),
+            embeds=list(data.get("embeds") or []),
+            components=list(data.get("components") or []),
             command=data.get("command"),
             args=data.get("args"),
             raw=dict(data),
@@ -203,4 +259,20 @@ class Role(_Model):
     @classmethod
     def from_dict(cls, data: dict[str, Any] | None) -> "Role":
         data = data or {}
-        return cls(id=data.get("id", "") or "", name=data.get("name", "") or "", raw=dict(data))
+        return cls(id=data.get("id", "") or "", name=data.get("name", "") or "", raw=dict(data))
+
+
+@dataclass
+class VoiceChannel(_Model):
+    channel_id: str = ""
+    user_ids: list[str] = field(default_factory=list)
+    raw: dict[str, Any] = field(default_factory=dict, repr=False)
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any] | None) -> "VoiceChannel":
+        data = data or {}
+        return cls(
+            channel_id=data.get("channel_id", "") or "",
+            user_ids=list(data.get("user_ids") or []),
+            raw=dict(data),
+        )

pyyapper-1.3.0/src/pyyapper/presence.py

@@ -0,0 +1,139 @@
+"""Presence / activity helpers for PyYapper bots.
+
+Yapper's API accepts a status (``online``/``idle``/``dnd``) and a single
+activity line (up to 60 characters). This module adds a small, discord.py-style
+``Activity`` builder on top of that, including an activity *type* (playing,
+listening, watching, ...) that is rendered into the activity line. Extra
+"rich" fields (details, state, timestamps, assets) are stored locally so they
+are available when Yapper supports them, and are serialized into the activity
+string in the meantime.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+from datetime import datetime, timezone
+from typing import Any, Optional
+
+ACTIVITY_TYPES = ("playing", "streaming", "listening", "watching", "competing", "custom")
+
+_PREFIX = {
+    "playing": "Playing",
+    "streaming": "Streaming",
+    "listening": "Listening to",
+    "watching": "Watching",
+    "competing": "Competing in",
+    "custom": "",
+}
+
+
+@dataclass
+class Activity:
+    """A rich activity descriptor.
+
+    Example::
+
+        act = Activity.playing("chess")
+        act = Activity.listening("lofi beats")
+        act = Activity.custom("Moderating")
+    """
+
+    name: str = ""
+    type: str = "playing"
+    state: Optional[str] = None
+    details: Optional[str] = None
+    url: Optional[str] = None
+    start: Optional[datetime] = None
+    end: Optional[datetime] = None
+    large_image: Optional[str] = None
+    small_image: Optional[str] = None
+    large_text: Optional[str] = None
+    small_text: Optional[str] = None
+    extra: dict[str, Any] = field(default_factory=dict)
+
+    # -- factories --------------------------------------------------------
+    @classmethod
+    def playing(cls, name: str, **kw: Any) -> "Activity":
+        return cls(name=name, type="playing", **kw)
+
+    @classmethod
+    def streaming(cls, name: str, url: Optional[str] = None, **kw: Any) -> "Activity":
+        return cls(name=name, type="streaming", url=url, **kw)
+
+    @classmethod
+    def listening(cls, name: str, **kw: Any) -> "Activity":
+        return cls(name=name, type="listening", **kw)
+
+    @classmethod
+    def watching(cls, name: str, **kw: Any) -> "Activity":
+        return cls(name=name, type="watching", **kw)
+
+    @classmethod
+    def competing(cls, name: str, **kw: Any) -> "Activity":
+        return cls(name=name, type="competing", **kw)
+
+    @classmethod
+    def custom(cls, text: str, **kw: Any) -> "Activity":
+        return cls(name=text, type="custom", **kw)
+
+    # -- serialization ----------------------------------------------------
+    def to_text(self) -> str:
+        """Render to the 60-char activity line Yapper accepts."""
+        prefix = _PREFIX.get(self.type, "")
+        base = self.name.strip() if self.name else ""
+        if self.type == "custom":
+            text = base
+        elif prefix and base:
+            text = f"{prefix} {base}"
+        else:
+            text = base
+        # Append state/details if room (Yapper caps at 60).
+        if self.state and len(text) + len(self.state) + 3 <= 60:
+            text = f"{text} — {self.state}"
+        return text[:60]
+
+    def to_dict(self) -> dict[str, Any]:
+        out: dict[str, Any] = {"type": self.type, "name": self.name}
+        if self.state is not None:
+            out["state"] = self.state
+        if self.details is not None:
+            out["details"] = self.details
+        if self.url is not None:
+            out["url"] = self.url
+        if self.start is not None:
+            out["start"] = self.start.isoformat()
+        if self.end is not None:
+            out["end"] = self.end.isoformat()
+        if self.large_image is not None:
+            out["large_image"] = self.large_image
+        if self.small_image is not None:
+            out["small_image"] = self.small_image
+        if self.large_text is not None:
+            out["large_text"] = self.large_text
+        if self.small_text is not None:
+            out["small_text"] = self.small_text
+        out.update(self.extra)
+        return out
+
+    def to_api(self) -> str:
+        return self.to_text()
+
+    def __str__(self) -> str:
+        return self.to_text()
+
+
+@dataclass
+class Presence:
+    """Status + activity pair."""
+    status: str = "online"
+    activity: Optional[Any] = None
+
+    def to_status(self) -> str:
+        return self.status
+
+    def to_activity(self) -> Optional[str]:
+        if self.activity is None:
+            return None
+        if isinstance(self.activity, Activity):
+            return self.activity.to_text()
+        return str(self.activity)[:60] if self.activity is not None else None

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

@@ -96,7 +96,14 @@ class Webhook:
     # ------------------------------------------------------------------ #
     async def _get_session(self) -> aiohttp.ClientSession:
         if self._session is None or getattr(self._session, "closed", False):
-            self._session = aiohttp.ClientSession()
+            connector = aiohttp.TCPConnector(
+                limit=100,
+                limit_per_host=30,
+                ttl_dns_cache=300,
+                enable_cleanup_closed=True,
+                keepalive_timeout=30,
+            )
+            self._session = aiohttp.ClientSession(connector=connector)
             self._owns_session = True
         return self._session
 
@@ -160,12 +167,13 @@ class Webhook:
                         except (TypeError, ValueError):
                             retry_after = None
                     if (
-                        res.status == 429
+                        res.status in (429, 503)
                         and retry_after is not None
                         and retry_after > 0
                         and attempt < retries
                     ):
-                        await asyncio.sleep(min(retry_after, 60.0))
+                        cap = 60.0 if res.status == 429 else 30.0
+                        await asyncio.sleep(min(retry_after, cap))
                         continue
                     exc_cls = exception_for_status(res.status)
                     # RateLimited subclass expected for 429

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyyapper
-Version: 1.1.0
+Version: 1.3.0
 Summary: An intuitive, async Python library for the Yapper bot API.
 Author: PyYapper contributors
 License-Expression: MIT

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

@@ -11,6 +11,7 @@ src/pyyapper/errors.py
 src/pyyapper/http.py
 src/pyyapper/models.py
 src/pyyapper/pagination.py
+src/pyyapper/presence.py
 src/pyyapper/py.typed
 src/pyyapper/wait_for.py
 src/pyyapper/webhooks.py

pyyapper-1.1.0/src/pyyapper/_version.py

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