django-bolt 0.1.0__cp310-abi3-win_amd64.whl → 0.1.1__cp310-abi3-win_amd64.whl

django_bolt/dependencies.py

@@ -1,9 +1,12 @@
 """Dependency injection utilities."""
 import inspect
-from typing import Any, Callable, Dict, List
+from typing import Any, Callable, Dict, List, TYPE_CHECKING
 from .params import Depends as DependsMarker
 from .binding import convert_primitive
 
+if TYPE_CHECKING:
+    from .typing import FieldDefinition
+
 
 async def resolve_dependency(
     dep_fn: Callable,
@@ -77,52 +80,55 @@ async def call_dependency(
     dep_args: List[Any] = []
     dep_kwargs: Dict[str, Any] = {}
 
-    for dp in dep_meta["params"]:
-        dname = dp["name"]
-        dan = dp["annotation"]
-        dsrc = dp["source"]
-        dalias = dp.get("alias")
-
-        if dsrc == "request":
+    # Use FieldDefinition objects directly
+    for field in dep_meta["fields"]:
+        if field.source == "request":
             dval = request
         else:
-            dval = extract_dependency_value(dp, params_map, query_map, headers_map, cookies_map)
+            dval = extract_dependency_value(field, params_map, query_map, headers_map, cookies_map)
 
-        if dp["kind"] in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD):
+        if field.kind in (inspect.Parameter.POSITIONAL_ONLY, inspect.Parameter.POSITIONAL_OR_KEYWORD):
             dep_args.append(dval)
         else:
-            dep_kwargs[dname] = dval
+            dep_kwargs[field.name] = dval
 
     return await dep_fn(*dep_args, **dep_kwargs)
 
 
 def extract_dependency_value(
-    param: Dict[str, Any],
+    field: "FieldDefinition",
     params_map: Dict[str, Any],
     query_map: Dict[str, Any],
     headers_map: Dict[str, str],
     cookies_map: Dict[str, str]
 ) -> Any:
-    """Extract value for a dependency parameter."""
-    dname = param["name"]
-    dan = param["annotation"]
-    dsrc = param["source"]
-    dalias = param.get("alias")
-    key = dalias or dname
+    """Extract value for a dependency parameter using FieldDefinition.
+
+    Args:
+        field: FieldDefinition object describing the parameter
+        params_map: Path parameters
+        query_map: Query parameters
+        headers_map: Request headers
+        cookies_map: Request cookies
+
+    Returns:
+        Extracted and converted parameter value
+    """
+    key = field.alias or field.name
 
     if key in params_map:
-        return convert_primitive(str(params_map[key]), dan)
+        return convert_primitive(str(params_map[key]), field.annotation)
     elif key in query_map:
-        return convert_primitive(str(query_map[key]), dan)
-    elif dsrc == "header":
+        return convert_primitive(str(query_map[key]), field.annotation)
+    elif field.source == "header":
         raw = headers_map.get(key.lower())
         if raw is None:
             raise ValueError(f"Missing required header: {key}")
-        return convert_primitive(str(raw), dan)
-    elif dsrc == "cookie":
+        return convert_primitive(str(raw), field.annotation)
+    elif field.source == "cookie":
         raw = cookies_map.get(key)
         if raw is None:
             raise ValueError(f"Missing required cookie: {key}")
-        return convert_primitive(str(raw), dan)
+        return convert_primitive(str(raw), field.annotation)
     else:
         return None

django_bolt/error_handlers.py

@@ -7,6 +7,7 @@ structured HTTP error responses.
 import msgspec
 import traceback
 from typing import Any, Dict, List, Tuple, Optional
+from . import _json
 from .exceptions import (
     HTTPException,
     RequestValidationError,
@@ -38,7 +39,7 @@ def format_error_response(
     if extra is not None:
         error_body["extra"] = extra
 
-    body_bytes = msgspec.json.encode(error_body)
+    body_bytes = _json.encode(error_body)
 
     response_headers = [("content-type", "application/json")]
     if headers:

django_bolt/openapi/plugins.py

@@ -57,7 +57,8 @@ class OpenAPIRenderPlugin(ABC):
         Returns:
             The rendered JSON as string.
         """
-        return msgspec.json.encode(openapi_schema).decode('utf-8')
+        from .. import _json
+        return _json.encode(openapi_schema).decode('utf-8')
 
     @abstractmethod
     def render(self, openapi_schema: Dict[str, Any], schema_url: str) -> str:
@@ -294,7 +295,7 @@ class ScalarRenderPlugin(OpenAPIRenderPlugin):
         if self.options:
             options_script = f"""
                 <script>
-                  document.getElementById('api-reference').dataset.configuration = '{msgspec.json.encode(self.options).decode()}'
+                  document.getElementById('api-reference').dataset.configuration = '{__import__("django_bolt")._json.encode(self.options).decode()}'
                 </script>
                 """
 

django_bolt/openapi/schema_generator.py

@@ -17,6 +17,7 @@ from .spec import (
     Schema,
     Reference,
     SecurityRequirement,
+    Tag,
 )
 
 if TYPE_CHECKING:
@@ -48,8 +49,10 @@ class SchemaGenerator:
         """
         openapi = self.config.to_openapi_schema()
 
-        # Generate path items from routes
+        # Generate path items from routes and collect tags
         paths: Dict[str, PathItem] = {}
+        collected_tags: set[str] = set()
+
         for method, path, handler_id, handler in self.api._routes:
             # Skip OpenAPI docs routes (always excluded)
             if path.startswith(self.config.path):
@@ -80,6 +83,10 @@ class SchemaGenerator:
                 handler_id=handler_id,
             )
 
+            # Collect tags from operation
+            if operation.tags:
+                collected_tags.update(operation.tags)
+
             # Add operation to path item
             method_lower = method.lower()
             setattr(paths[path], method_lower, operation)
@@ -90,6 +97,9 @@ class SchemaGenerator:
         if self.schemas:
             openapi.components.schemas = self.schemas
 
+        # Collect and merge tags
+        openapi.tags = self._collect_tags(collected_tags)
+
         return openapi
 
     def _create_operation(
@@ -112,14 +122,17 @@ class SchemaGenerator:
         Returns:
             Operation object.
         """
-        # Get description from docstring
-        description = None
-        summary = None
-        if self.config.use_handler_docstrings and handler.__doc__:
+        # Prefer explicit metadata over docstring extraction
+        summary = meta.get("openapi_summary")
+        description = meta.get("openapi_description")
+
+        # Fallback to docstring if not explicitly set
+        if (summary is None or description is None) and self.config.use_handler_docstrings and handler.__doc__:
             doc = inspect.cleandoc(handler.__doc__)
             lines = doc.split("\n", 1)
-            summary = lines[0]
-            if len(lines) > 1:
+            if summary is None:
+                summary = lines[0]
+            if description is None and len(lines) > 1:
                 description = lines[1].strip()
 
         # Extract parameters
@@ -134,8 +147,11 @@ class SchemaGenerator:
         # Extract security requirements
         security = self._extract_security(handler_id)
 
-        # Extract tags (use handler module or class name)
-        tags = self._extract_tags(handler)
+        # Prefer explicit tags over auto-extracted tags
+        tags = meta.get("openapi_tags")
+        if tags is None:
+            # Fallback to auto-extraction from handler module or class name
+            tags = self._extract_tags(handler)
 
         operation = Operation(
             summary=summary,
@@ -166,11 +182,12 @@ class SchemaGenerator:
         fields = meta.get("fields", [])
 
         for field in fields:
-            source = field.get("source")
-            name = field.get("name")
-            alias = field.get("alias") or name
-            annotation = field.get("annotation")
-            default = field.get("default")
+            # Access FieldDefinition attributes directly
+            source = field.source
+            name = field.name
+            alias = field.alias or name
+            annotation = field.annotation
+            default = field.default
 
             # Skip request, body, form, file, and dependency parameters
             if source in ("request", "body", "form", "file", "dependency"):
@@ -222,17 +239,18 @@ class SchemaGenerator:
         if not body_param or not body_type:
             # Check for form/file fields
             fields = meta.get("fields", [])
-            form_fields = [f for f in fields if f.get("source") in ("form", "file")]
+            form_fields = [f for f in fields if f.source in ("form", "file")]
 
             if form_fields:
                 # Multipart form data
                 properties = {}
                 required = []
                 for field in form_fields:
-                    name = field.get("alias") or field.get("name")
-                    annotation = field.get("annotation")
-                    default = field.get("default")
-                    source = field.get("source")
+                    # Access FieldDefinition attributes directly
+                    name = field.alias or field.name
+                    annotation = field.annotation
+                    default = field.default
+                    source = field.source
 
                     if source == "file":
                         # File upload
@@ -316,7 +334,7 @@ class SchemaGenerator:
         if self.config.include_error_responses:
             # Check if request body is present (for 422 validation errors)
             has_request_body = meta.get("body_struct_param") or any(
-                f.get("source") in ("body", "form", "file")
+                f.source in ("body", "form", "file")
                 for f in meta.get("fields", [])
             )
 
@@ -435,6 +453,33 @@ class SchemaGenerator:
 
         return None
 
+    def _collect_tags(self, collected_tag_names: set[str]) -> Optional[List[Tag]]:
+        """Collect and merge tags from operations with config tags.
+
+        Args:
+            collected_tag_names: Set of tag names collected from operations.
+
+        Returns:
+            List of Tag objects or None if no tags.
+        """
+        if not collected_tag_names and not self.config.tags:
+            return None
+
+        # Start with existing tags from config
+        tag_objects: Dict[str, Tag] = {}
+        if self.config.tags:
+            for tag in self.config.tags:
+                tag_objects[tag.name] = tag
+
+        # Add tags from operations (if not already defined in config)
+        for tag_name in sorted(collected_tag_names):
+            if tag_name not in tag_objects:
+                # Create Tag object with just the name (no description)
+                tag_objects[tag_name] = Tag(name=tag_name)
+
+        # Return sorted list of Tag objects
+        return list(tag_objects.values()) if tag_objects else None
+
     def _type_to_schema(
         self, type_annotation: Any, register_component: bool = False
     ) -> Schema | Reference:

django_bolt/pagination.py

@@ -31,6 +31,7 @@ from asgiref.sync import sync_to_async
 
 from .params import Query
 from .typing import is_optional
+from . import _json
 
 __all__ = [
     "PaginationBase",
@@ -455,7 +456,7 @@ class CursorPagination(PaginationBase):
         Returns:
             Base64-encoded cursor string
         """
-        cursor_data = msgspec.json.encode({"v": value})
+        cursor_data = _json.encode({"v": value})
         return base64.b64encode(cursor_data).decode('utf-8')
 
     def _decode_cursor(self, cursor: str) -> Any:

django_bolt/responses.py

@@ -1,6 +1,7 @@
 import msgspec
 from typing import Any, Dict, Optional, List
 from pathlib import Path
+from . import _json
 
 # Cache for BOLT_ALLOWED_FILE_PATHS - loaded once at server startup
 _ALLOWED_FILE_PATHS_CACHE: Optional[List[Path]] = None
@@ -70,7 +71,7 @@ class Response:
 
     def to_bytes(self) -> bytes:
         if self.media_type == "application/json":
-            return msgspec.json.encode(self.content)
+            return _json.encode(self.content)
         elif isinstance(self.content, str):
             return self.content.encode()
         elif isinstance(self.content, bytes):
@@ -86,7 +87,7 @@ class JSON:
         self.headers = headers or {}
 
     def to_bytes(self) -> bytes:
-        return msgspec.json.encode(self.data)
+        return _json.encode(self.data)
 
 
 

django_bolt/serialization.py

@@ -4,6 +4,7 @@ import msgspec
 from typing import Any, Dict, List, Optional, Tuple
 from .responses import Response as ResponseClass, JSON, PlainText, HTML, Redirect, File, FileResponse, StreamingResponse
 from .binding import coerce_to_response_type_async
+from . import _json
 
 ResponseTuple = Tuple[int, List[Tuple[str, str]], bytes]
 
@@ -71,7 +72,7 @@ async def serialize_generic_response(result: ResponseClass, response_tp: Optiona
     if response_tp is not None:
         try:
             validated = await coerce_to_response_type_async(result.content, response_tp)
-            data_bytes = msgspec.json.encode(validated) if result.media_type == "application/json" else result.to_bytes()
+            data_bytes = _json.encode(validated) if result.media_type == "application/json" else result.to_bytes()
         except Exception as e:
             err = f"Response validation error: {e}"
             return 500, [("content-type", "text/plain; charset=utf-8")], err.encode()
@@ -98,7 +99,7 @@ async def serialize_json_response(result: JSON, response_tp: Optional[Any]) -> R
     if response_tp is not None:
         try:
             validated = await coerce_to_response_type_async(result.data, response_tp)
-            data_bytes = msgspec.json.encode(validated)
+            data_bytes = _json.encode(validated)
         except Exception as e:
             err = f"Response validation error: {e}"
             return 500, [("content-type", "text/plain; charset=utf-8")], err.encode()
@@ -182,12 +183,12 @@ async def serialize_json_data(result: Any, response_tp: Optional[Any], meta: Dic
     if response_tp is not None:
         try:
             validated = await coerce_to_response_type_async(result, response_tp)
-            data = msgspec.json.encode(validated)
+            data = _json.encode(validated)
         except Exception as e:
             err = f"Response validation error: {e}"
             return 500, [("content-type", "text/plain; charset=utf-8")], err.encode()
     else:
-        data = msgspec.json.encode(result)
+        data = _json.encode(result)
 
     status = int(meta.get("default_status_code", 200))
     return status, [("content-type", "application/json")], data