fastapi-interactions 0.0.1__tar.gz → 0.1.0__tar.gz

{fastapi_interactions-0.0.1 → fastapi_interactions-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-interactions
-Version: 0.0.1
+Version: 0.1.0
 Summary: A lightweight framework for discord interactions over http built on FastAPI
 Author-email: Haider Ali <haideralidevnull@gmail.com>
 Requires-Python: >=3.13

{fastapi_interactions-0.0.1 → fastapi_interactions-0.1.0}/fastapi_interactions/bot.py

@@ -1,24 +1,26 @@
+import importlib
+import inspect
+import json
+import pkgutil
+import types
+from typing import Any
+
+import httpx
 from fastapi import FastAPI, Request
-from .middleware import VerifySignatureMiddleware
-from .responses import InteractionResponse, PongResponse, MessageResponse
+from fastapi.responses import JSONResponse
+from loguru import logger
+from pydantic import ValidationError
+
+from .commands import Command, CommandRouter
 from .context import Context
+from .middleware import VerifySignatureMiddleware
 from .models import (
-    InteractionType,
     ApplicationCommandData,
     Interaction,
+    InteractionType,
     Snowflake,
 )
-from typing import Any
-from .commands import Command
-from pydantic import ValidationError
-from .commands import CommandRouter
-import json
-import httpx
-import importlib
-import pkgutil
-from loguru import logger
-import inspect
-import types
+from .responses import InteractionResponse, MessageResponse, PongResponse
 
 
 async def call_with_options(callback: callable, ctx: Context) -> Any:
@@ -107,6 +109,7 @@ class Bot:
                 # print(e.errors())
                 return await MessageResponse("Unexpected error", ephemeral=True)
 
+            raise Exception("Unexpected error occurred")
             context = Context(
                 interaction=interaction, options=application_command, http=self.http
             )
@@ -117,6 +120,12 @@ class Bot:
 
         return await MessageResponse("Unsupported interaction received", ephemeral=True)
 
+    async def add_error_handler(self, exc: Exception, func: callable):
+        pass
+
+    async def _handle_exception(self, request: Request, exc: Exception):
+        return JSONResponse(await MessageResponse(str(exc), ephemeral=True))
+
     def _register_routes(self) -> None:
         """Set up middleware and the interactions endpoint.
 
@@ -124,6 +133,7 @@ class Bot:
         for the interactions endpoint. Called during initialization.
         """
         self.app.add_middleware(VerifySignatureMiddleware, public_key=self.public_key)
+        self.app.add_exception_handler(Exception, self._handle_exception)
         self.app.add_api_route(
             self.interactions_path, endpoint=self.process_interactions, methods=["POST"]
         )

{fastapi_interactions-0.0.1 → fastapi_interactions-0.1.0}/fastapi_interactions/commands.py

@@ -1,7 +1,12 @@
-from dataclasses import dataclass, field
-from .models import Snowflake, ApplicationCommandOptionType
-from typing import Optional
 import sys
+from dataclasses import dataclass, field
+
+from .models import (
+    ApplicationCommandOptionType,
+    IntegrationType,
+    InteractionContext,
+    Snowflake,
+)
 
 OptionType = ApplicationCommandOptionType
 
@@ -28,27 +33,57 @@ class CommandMeta:
     description: str
     options: list[CommandOption] = field(default_factory=list)
     type: int = 1
+    integration_types: IntegrationType | None = None
+    contexts: InteractionContext | None = None
 
     def as_payload(self):
-        return {
+        payload = {
             "name": self.name,
             "description": self.description,
             "type": self.type,
             "options": [option.as_payload() for option in self.options],
         }
+        if self.integration_types is not None:
+            payload["integration_types"] = self.integration_types.to_api()
+        if self.contexts is not None:
+            payload["contexts"] = self.contexts.to_api()
+        return payload
 
 
 @dataclass(slots=True)
 class Command:
     callback: callable
     meta: CommandMeta
-    guild_id: Optional[Snowflake] = None
+    guild_id: Snowflake | None = None
 
 
 class CommandRouter:
-    def __init__(self, name: str = None, guild_id: Optional[Snowflake] = None):
+    def __init__(
+        self,
+        name: str | None = None,
+        guild_id: Snowflake | None = None,
+        *,
+        integration_types: IntegrationType | None = None,
+        contexts: InteractionContext | None = None,
+    ):
         self.name = name or self.__infer_name()
-        self.guild_id: Optional[Snowflake] = guild_id
+        self.guild_id = guild_id
+
+        if guild_id is not None and (
+            integration_types is not None or contexts is not None
+        ):
+            raise ValueError(
+                f"Router {self.name} is guild scoped. Cannt bind integration/interaction types"
+            )
+
+        if integration_types is not None and not integration_types:
+            raise ValueError("integration types cannot be empty;")
+
+        if contexts is not None and not contexts:
+            raise ValueError("contexts cannot be empty")
+
+        self.integration_types = integration_types
+        self.contexts = contexts
         self.commands: dict[str, Command] = {}
 
     def __infer_name(self) -> str:
@@ -86,6 +121,8 @@ class CommandRouter:
             )
             meta.name = name
             meta.description = description
+            meta.integration_types = self.integration_types
+            meta.contexts = self.contexts
             self.commands[name] = Command(
                 callback=func, meta=meta, guild_id=self.guild_id
             )
@@ -97,10 +134,12 @@ class CommandRouter:
 
 class Option:
     @staticmethod
-    def __create_operation_decorator(name: str, description: str, option_type: OptionType, required: bool = True):
+    def __create_operation_decorator(
+        name: str, description: str, option_type: OptionType, required: bool = True
+    ):
         def decorator(func):
             meta = getattr(
-                func, '_command_meta', CommandMeta(name='', description='', type=1)
+                func, "_command_meta", CommandMeta(name="", description="", type=1)
             )
 
             meta.options.insert(
@@ -109,11 +148,12 @@ class Option:
                     name=name,
                     description=description,
                     type=option_type,
-                    required=required
-                )
+                    required=required,
+                ),
             )
             func._command_meta = meta
             return func
+
         return decorator
 
     @staticmethod
@@ -143,7 +183,7 @@ class Option:
             name=name,
             description=description,
             option_type=OptionType.STRING,
-            required=required
+            required=required,
         )
 
     @staticmethod
@@ -173,7 +213,7 @@ class Option:
             name=name,
             description=description,
             option_type=OptionType.INTEGER,
-            required=required
+            required=required,
         )
 
     @staticmethod
@@ -204,7 +244,7 @@ class Option:
             name=name,
             description=description,
             option_type=OptionType.USER,
-            required=required
+            required=required,
         )
 
     @staticmethod
@@ -235,7 +275,7 @@ class Option:
             name=name,
             description=description,
             option_type=OptionType.CHANNEL,
-            required=required
+            required=required,
         )
 
     @staticmethod
@@ -266,7 +306,7 @@ class Option:
             name=name,
             description=description,
             option_type=OptionType.ROLE,
-            required=required
+            required=required,
         )
 
     @staticmethod
@@ -296,7 +336,7 @@ class Option:
             name=name,
             description=description,
             option_type=OptionType.MENTIONABLE,
-            required=required
+            required=required,
         )
 
     @staticmethod
@@ -331,7 +371,7 @@ class Option:
             name=name,
             description=description,
             option_type=OptionType.BOOLEAN,
-            required=required
+            required=required,
         )
 
     @staticmethod
@@ -362,5 +402,5 @@ class Option:
             name=name,
             description=description,
             option_type=OptionType.NUMBER,
-            required=required
-        )
+            required=required,
+        )

{fastapi_interactions-0.0.1 → fastapi_interactions-0.1.0}/fastapi_interactions/models.py

@@ -1,10 +1,30 @@
-from pydantic import BaseModel, ConfigDict, Field
-from typing import Optional, Any
 from enum import IntEnum, IntFlag
+from typing import Any, Optional
+
+from pydantic import BaseModel, ConfigDict, Field
 
 Snowflake = str
 
 
+class _ApiFlag(IntFlag):
+    def to_api(self) -> list[int]:
+        """Bit positions set in this flag, e.g. GUILD|PRIVATE_CHANNEL -> [0, 2]."""
+        return [i for i in range(self.bit_length()) if self & (1 << i)]
+
+
+class IntegrationType(_ApiFlag):
+    GUILD_INSTALL = 1 << 0  # API VALUE 0
+    USER_INSTALL = 1 << 1  # API VALUE 1
+    ALL = GUILD_INSTALL | USER_INSTALL
+
+
+class InteractionContext(_ApiFlag):
+    GUILD = 1 << 0  # API VALUE 0
+    BOT_DM = 1 << 1  # API VALUE 1
+    PRIVATE_CHANNEL = 1 << 2  # VALUE VALUE 2
+    ALL = GUILD | BOT_DM | PRIVATE_CHANNEL
+
+
 class InteractionType(IntEnum):
     PING = 1
     APPLICATION_COMMAND = 2

{fastapi_interactions-0.0.1 → fastapi_interactions-0.1.0}/fastapi_interactions.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-interactions
-Version: 0.0.1
+Version: 0.1.0
 Summary: A lightweight framework for discord interactions over http built on FastAPI
 Author-email: Haider Ali <haideralidevnull@gmail.com>
 Requires-Python: >=3.13

{fastapi_interactions-0.0.1 → fastapi_interactions-0.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'fastapi-interactions'
-version = '0.0.1'
+version = '0.1.0'
 description='A lightweight framework for discord interactions over http built on FastAPI'
 readme = "README.md"
 requires-python = ">=3.13"