smdb-web-server 2.0.2__tar.gz → 2.0.4__tar.gz

{smdb_web_server-2.0.2/smdb_web_server.egg-info → smdb_web_server-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smdb_web_server
-Version: 2.0.2
+Version: 2.0.4
 Summary: A really basic, not so safe web server.
 Home-page: https://github.com/NightKey/smdb-server
 Author: Janthó Dávid
@@ -93,7 +93,7 @@ To do this with the whole application, set the same flag to true, when instantia
 
 ## GET handler
 
-This handler can return any string, but it's useful, if it returns an HTML file as string. This can be a hardcoded HTML code, or a static or dynamic file. For rendering HTML template files, the server has a helper function called `render_template_file`. This can render an HTML file from a pre setup dictionary.
+This handler can return any string, but it's useful, if it returns an HTML file as string. This can be a hardcoded HTML code, or a static or dynamic file. For rendering HTML template files, the server has a helper function called `render_template_file`. This can render an HTML file from a pre-setup dictionary.
 
 ```python
 def index_handler(url_data: UrlData) -> str:
@@ -123,7 +123,7 @@ This list will be sent as a `plaintext` response.
 
 ## Put Handler
 
-This handler can return a simple string. The incoming data will be a bytearray of the body of the request.
+This handler can return a simple string or None. The incoming data will be the [UrlData](#urldata) of the request.
 ```python
 from smdb_web_server import Protocol
 
@@ -137,7 +137,7 @@ server.add_url_rule("/put", put_handler, Protocol.Put)
 
 ## Post Handler
 
-This handler can return a simple string. The incoming data will be a bytearray of the body of the request.
+This handler can return a simple string or None. The incoming data will be the [UrlData](#urldata) of the request.
 ```python
 rom smdb_web_server import Protocol
 

{smdb_web_server-2.0.2 → smdb_web_server-2.0.4}/README.md

@@ -76,7 +76,7 @@ To do this with the whole application, set the same flag to true, when instantia
 
 ## GET handler
 
-This handler can return any string, but it's useful, if it returns an HTML file as string. This can be a hardcoded HTML code, or a static or dynamic file. For rendering HTML template files, the server has a helper function called `render_template_file`. This can render an HTML file from a pre setup dictionary.
+This handler can return any string, but it's useful, if it returns an HTML file as string. This can be a hardcoded HTML code, or a static or dynamic file. For rendering HTML template files, the server has a helper function called `render_template_file`. This can render an HTML file from a pre-setup dictionary.
 
 ```python
 def index_handler(url_data: UrlData) -> str:
@@ -106,7 +106,7 @@ This list will be sent as a `plaintext` response.
 
 ## Put Handler
 
-This handler can return a simple string. The incoming data will be a bytearray of the body of the request.
+This handler can return a simple string or None. The incoming data will be the [UrlData](#urldata) of the request.
 ```python
 from smdb_web_server import Protocol
 
@@ -120,7 +120,7 @@ server.add_url_rule("/put", put_handler, Protocol.Put)
 
 ## Post Handler
 
-This handler can return a simple string. The incoming data will be a bytearray of the body of the request.
+This handler can return a simple string or None. The incoming data will be the [UrlData](#urldata) of the request.
 ```python
 rom smdb_web_server import Protocol
 

{smdb_web_server-2.0.2 → smdb_web_server-2.0.4}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = smdb_web_server
-version = 2.0.2
+version = 2.0.4
 author = Janthó Dávid
 author_email = davidjantho@gmail.com
 description = A really basic, not so safe web server.

{smdb_web_server-2.0.2 → smdb_web_server-2.0.4}/smdb_web_server/HTMLServer.py

@@ -1,6 +1,6 @@
 import asyncio
 from threading import Event, Thread
-from typing import Callable, Dict, Optional, Any, List, Coroutine, Union
+from typing import Callable, Dict, Optional, Any, List, Coroutine, Union, Literal, overload
 from os import path
 
 from smdb_logger import Logger, LEVEL
@@ -8,6 +8,8 @@ from smdb_logger import Logger, LEVEL
 from smdb_web_server import HTTPRequestHandler, Protocol, UrlData, TEMPLATES, get_rules, put_rules, post_rules, STATIC, \
     async_wrapped, Base, wrapped, show_open_calls
 
+CallbackHandler = Union[Callable[[UrlData], Union[str, None]], Callable[[UrlData], Coroutine[Any, Any, Union[str, None]]]]
+GetCallbackHandler = Union[Callable[[UrlData], str], Callable[[UrlData], Coroutine[Any, Any, str]]]
 
 class HTMLServer(Base):
     def __init__(
@@ -68,8 +70,17 @@ class HTMLServer(Base):
     def render_static_file(self, name: str) -> Union[str, bytes, None]:
         return self._render_static_file(name=name, STATIC=STATIC)
 
+    @overload
     @staticmethod
-    def add_url_rule(rule: str, callback: Union[Callable[[UrlData], str], Callable[[UrlData], Coroutine[Any, Any, str]]], protocol: Protocol = Protocol.Get, disable_cache: bool = False) -> None:
+    def add_url_rule(rule: str, callback: GetCallbackHandler, protocol: Literal[Protocol.Get] = Protocol.Get, disable_cache: bool = False) -> None:...
+    @overload
+    @staticmethod
+    def add_url_rule(rule: str, callback: CallbackHandler, protocol: Literal[Protocol.Put, Protocol.Post], disable_cache: bool = False) -> None:...
+    @overload
+    @staticmethod
+    def add_url_rule(rule: str, callback: CallbackHandler, protocol: Protocol = Protocol.Get, disable_cache: bool = False) -> None:...
+    @staticmethod
+    def add_url_rule(rule: str, callback: CallbackHandler, protocol: Protocol = Protocol.Get, disable_cache: bool = False) -> None:
         if protocol == Protocol.Get:
             get_rules[rule] = (callback, disable_cache)
         elif protocol == Protocol.Put:
@@ -79,7 +90,7 @@ class HTMLServer(Base):
 
     @classmethod
     def as_url_rule(cls, rule: Optional[str] = None, protocol: Protocol = Protocol.Get, disable_cache: bool = False) -> Any:
-        def decorator(callback: Union[Callable[[...], str], Callable[[...], Coroutine[Any, Any, str]]]):
+        def decorator(callback: CallbackHandler):
             cls.add_url_rule(rule or callback.__name__, callback, protocol, disable_cache)
         return decorator
 

{smdb_web_server-2.0.2 → smdb_web_server-2.0.4}/smdb_web_server/HTTPRequestHandler.py

@@ -224,6 +224,9 @@ class HTTPRequestHandler(Base):
                 result = await callback(self.data)
             else:
                 result = callback(self.data)
+            if result is None:
+                message_return = Constants.OkNoResponse
+                result = ""
             self.disable_cache = put_rules[self.path][1] or self.disable_cache
         except KnownError as ke:
             message_return = ke.response
@@ -259,6 +262,9 @@ class HTTPRequestHandler(Base):
                 result = await callback(self.data)
             else:
                 result = callback(self.data)
+            if result is None:
+                message_return = Constants.OkNoResponse
+                result = ""
             message_return = Constants.Ok
             self.disable_cache = post_rules[self.path][1] or self.disable_cache
         except KnownError as ke:

{smdb_web_server-2.0.2 → smdb_web_server-2.0.4}/smdb_web_server/__init__.py

@@ -4,8 +4,8 @@ from .data import *
 from .errors import *
 
 get_rules: Dict[str, Tuple[Union[Callable[[UrlData], str], Callable[[UrlData], Coroutine[Any, Any, str]]], bool]] = {}
-put_rules: Dict[str, Tuple[Union[Callable[[UrlData], str], Callable[[UrlData], Coroutine[Any, Any, str]]], bool]] = {}
-post_rules: Dict[str, Tuple[Union[Callable[[UrlData], str], Callable[[UrlData], Coroutine[Any, Any, str]]], bool]] = {}
+put_rules: Dict[str, Tuple[Union[Callable[[UrlData], Union[str, None]], Callable[[UrlData], Coroutine[Any, Any, Union[str, None]]]], bool]] = {}
+post_rules: Dict[str, Tuple[Union[Callable[[UrlData], Union[str, None]], Callable[[UrlData], Coroutine[Any, Any, Union[str, None]]]], bool]] = {}
 TEMPLATES: Dict[str, str] = {}
 STATIC: Dict[str, str] = {}
 

{smdb_web_server-2.0.2 → smdb_web_server-2.0.4}/smdb_web_server/data/Constants.py

@@ -1,9 +1,10 @@
 from smdb_web_server.data.ResponseCode import ResponseCode
 
 class Constants:
+    Ok = ResponseCode(200, "Ok")
+    OkNoResponse = ResponseCode(204, "No Content")
     NotFound = ResponseCode(404, "Not Found")
     Forbidden = ResponseCode(403, "Forbidden")
-    Ok = ResponseCode(200, "Ok")
-    InternalServerError = ResponseCode(500, "Internal Server Error")
     BadRequest = ResponseCode(400, "Bad Request")
     TPot = ResponseCode(418, "I'm a teapot")
+    InternalServerError = ResponseCode(500, "Internal Server Error")

{smdb_web_server-2.0.2 → smdb_web_server-2.0.4/smdb_web_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smdb_web_server
-Version: 2.0.2
+Version: 2.0.4
 Summary: A really basic, not so safe web server.
 Home-page: https://github.com/NightKey/smdb-server
 Author: Janthó Dávid
@@ -93,7 +93,7 @@ To do this with the whole application, set the same flag to true, when instantia
 
 ## GET handler
 
-This handler can return any string, but it's useful, if it returns an HTML file as string. This can be a hardcoded HTML code, or a static or dynamic file. For rendering HTML template files, the server has a helper function called `render_template_file`. This can render an HTML file from a pre setup dictionary.
+This handler can return any string, but it's useful, if it returns an HTML file as string. This can be a hardcoded HTML code, or a static or dynamic file. For rendering HTML template files, the server has a helper function called `render_template_file`. This can render an HTML file from a pre-setup dictionary.
 
 ```python
 def index_handler(url_data: UrlData) -> str:
@@ -123,7 +123,7 @@ This list will be sent as a `plaintext` response.
 
 ## Put Handler
 
-This handler can return a simple string. The incoming data will be a bytearray of the body of the request.
+This handler can return a simple string or None. The incoming data will be the [UrlData](#urldata) of the request.
 ```python
 from smdb_web_server import Protocol
 
@@ -137,7 +137,7 @@ server.add_url_rule("/put", put_handler, Protocol.Put)
 
 ## Post Handler
 
-This handler can return a simple string. The incoming data will be a bytearray of the body of the request.
+This handler can return a simple string or None. The incoming data will be the [UrlData](#urldata) of the request.
 ```python
 rom smdb_web_server import Protocol