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

{smdb_web_server-2.0.3/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.3
+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

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

@@ -1,6 +1,6 @@
 [metadata]
 name = smdb_web_server
-version = 2.0.3
+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.3 → 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.3 → 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.3
+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