hypern 0.2.1__cp310-cp310-macosx_10_12_x86_64.whl → 0.3.0__cp310-cp310-macosx_10_12_x86_64.whl

hypern/application.py

@@ -8,8 +8,7 @@ import orjson
 from typing_extensions import Annotated, Doc
 
 from hypern.datastructures import Contact, HTTPMethod, Info, License
-from hypern.hypern import FunctionInfo, Router
-from hypern.hypern import Route as InternalRoute
+from hypern.hypern import FunctionInfo, Router, Route as InternalRoute, WebsocketRouter
 from hypern.openapi import SchemaGenerator, SwaggerUI
 from hypern.processpool import run_processes
 from hypern.response import HTMLResponse, JSONResponse
@@ -17,6 +16,7 @@ from hypern.routing import Route
 from hypern.scheduler import Scheduler
 from hypern.middleware import Middleware
 from hypern.args_parser import ArgsConfig
+from hypern.ws import WebsocketRoute
 
 AppType = TypeVar("AppType", bound="Hypern")
 
@@ -47,6 +47,15 @@ class Hypern:
                 """
             ),
         ] = None,
+        websockets: Annotated[
+            List[WebsocketRoute] | None,
+            Doc(
+                """
+                A list of routes to serve incoming WebSocket requests.
+                You can define routes using the `WebsocketRoute` class from `Hypern
+                """
+            ),
+        ] = None,
         title: Annotated[
             str,
             Doc(
@@ -186,6 +195,7 @@ class Hypern:
     ) -> None:
         super().__init__(*args, **kwargs)
         self.router = Router(path="/")
+        self.websocket_router = WebsocketRouter(path="/")
         self.scheduler = scheduler
         self.injectables = default_injectables or {}
         self.middleware_before_request = []
@@ -193,9 +203,12 @@ class Hypern:
         self.response_headers = {}
         self.args = ArgsConfig()
 
-        for route in routes:
+        for route in routes or []:
             self.router.extend_route(route(app=self).routes)
 
+        for websocket_route in websockets or []:
+            self.websocket_router.add_route(websocket_route)
+
         if openapi_url and docs_url:
             self.__add_openapi(
                 info=Info(
@@ -358,6 +371,7 @@ class Hypern:
             processes=self.args.processes,
             max_blocking_threads=self.args.max_blocking_threads,
             router=self.router,
+            websocket_router=self.websocket_router,
             injectables=self.injectables,
             before_request=self.middleware_before_request,
             after_request=self.middleware_after_request,
@@ -379,3 +393,13 @@ class Hypern:
         func_info = FunctionInfo(handler=handler, is_async=is_async)
         route = InternalRoute(path=endpoint, function=func_info, method=method.name)
         self.router.add_route(route=route)
+
+    def add_websocket(self, ws_route: WebsocketRoute):
+        """
+        Adds a WebSocket route to the WebSocket router.
+
+        Args:
+            ws_route (WebsocketRoute): The WebSocket route to be added to the router.
+        """
+        for route in ws_route.routes:
+            self.websocket_router.add_route(route=route)

hypern/hypern.pyi

@@ -183,9 +183,6 @@ class FunctionInfo:
     handler: Callable
     is_async: bool
 
-class SocketHeld:
-    socket: Any
-
 @dataclass
 class Server:
     router: Router
@@ -195,6 +192,7 @@ class Server:
 
     def add_route(self, route: Route) -> None: ...
     def set_router(self, router: Router) -> None: ...
+    def set_websocket_router(self, websocket_router: WebsocketRouter) -> None: ...
     def start(self, socket: SocketHeld, worker: int, max_blocking_threads: int) -> None: ...
     def inject(self, key: str, value: Any) -> None: ...
     def set_injected(self, injected: Dict[str, Any]) -> None: ...
@@ -227,6 +225,34 @@ class Router:
     def get_routes_by_method(self, method: str) -> List[Route]: ...
     def extend_route(self, routes: List[Route]) -> None: ...
 
+@dataclass
+class SocketHeld:
+    socket: Any
+
+@dataclass
+class WebSocketSession:
+    sender: Callable[[str], None]
+    receiver: Callable[[], str]
+    is_closed: bool
+
+    def send(self, message: str) -> None: ...
+
+@dataclass
+class WebsocketRoute:
+    path: str
+    handler: Callable[[WebSocketSession], None]
+
+@dataclass
+class WebsocketRouter:
+    path: str
+    routes: List[WebsocketRoute]
+
+    def add_route(self, route: WebsocketRoute) -> None: ...
+    def remove_route(self, path: str) -> None: ...
+    def extend_route(self, route: WebsocketRoute) -> None: ...
+    def clear_routes(self) -> None: ...
+    def route_count(self) -> int: ...
+
 @dataclass
 class Header:
     headers: Dict[str, str]
@@ -264,3 +290,6 @@ class Request:
     path_params: Dict[str, str]
     body: BodyData
     method: str
+    remote_addr: str
+    timestamp: float
+    context_id: str

hypern/middleware/limit.py

@@ -147,7 +147,7 @@ class ConcurrentRequestMiddleware(Middleware):
         self.lock = Lock()
 
     def get_request_identifier(self, request):
-        return request.ip_addr
+        return request.remote_addr
 
     def before_request(self, request):
         """

hypern/processpool.py

@@ -7,7 +7,7 @@ from typing import Any, Dict, List
 from multiprocess import Process
 from watchdog.observers import Observer
 
-from .hypern import FunctionInfo, Router, Server, SocketHeld
+from .hypern import FunctionInfo, Router, Server, SocketHeld, WebsocketRouter
 from .logging import logger
 from .reload import EventHandler
 
@@ -19,6 +19,7 @@ def run_processes(
     processes: int,
     max_blocking_threads: int,
     router: Router,
+    websocket_router: WebsocketRouter,
     injectables: Dict[str, Any],
     before_request: List[FunctionInfo],
     after_request: List[FunctionInfo],
@@ -27,7 +28,9 @@ def run_processes(
 ) -> List[Process]:
     socket = SocketHeld(host, port)
 
-    process_pool = init_processpool(router, socket, workers, processes, max_blocking_threads, injectables, before_request, after_request, response_headers)
+    process_pool = init_processpool(
+        router, websocket_router, socket, workers, processes, max_blocking_threads, injectables, before_request, after_request, response_headers
+    )
 
     def terminating_signal_handler(_sig, _frame):
         logger.info("Terminating server!!")
@@ -67,6 +70,7 @@ def run_processes(
 
 def init_processpool(
     router: Router,
+    websocket_router: WebsocketRouter,
     socket: SocketHeld,
     workers: int,
     processes: int,
@@ -82,7 +86,7 @@ def init_processpool(
         copied_socket = socket.try_clone()
         process = Process(
             target=spawn_process,
-            args=(router, copied_socket, workers, max_blocking_threads, injectables, before_request, after_request, response_headers),
+            args=(router, websocket_router, copied_socket, workers, max_blocking_threads, injectables, before_request, after_request, response_headers),
         )
         process.start()
         process_pool.append(process)
@@ -106,6 +110,7 @@ def initialize_event_loop():
 
 def spawn_process(
     router: Router,
+    websocket_router: WebsocketRouter,
     socket: SocketHeld,
     workers: int,
     max_blocking_threads: int,
@@ -118,6 +123,7 @@ def spawn_process(
 
     server = Server()
     server.set_router(router=router)
+    server.set_websocket_router(websocket_router=websocket_router)
     server.set_injected(injected=injectables)
     server.set_before_hooks(hooks=before_request)
     server.set_after_hooks(hooks=after_request)

hypern/routing/route.py

@@ -188,7 +188,7 @@ class Route:
             docs["responses"] = {
                 "200": {
                     "description": "Successful response",
-                    "content": {"application/json": {"schema": response_type.model_json_schema()}},
+                    "content": {"application/json": {"schema": pydantic_to_swagger(response_type).get(response_type.__name__)}},
                 }
             }
 

hypern/ws.py

@@ -0,0 +1,16 @@
+from .hypern import WebsocketRoute as WebsocketRouteInternal, WebSocketSession
+
+
+class WebsocketRoute:
+    def __init__(self) -> None:
+        self.routes = []
+
+    def on(self, path):
+        def wrapper(func):
+            self.routes.append(WebsocketRouteInternal(path, func))
+            return func
+
+        return wrapper
+
+
+__all__ = ["WebsocketRoute", "WebSocketSession"]

{hypern-0.2.1.dist-info → hypern-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: hypern
-Version: 0.2.1
+Version: 0.3.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{hypern-0.2.1.dist-info → hypern-0.3.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-hypern-0.2.1.dist-info/METADATA,sha256=XnBEky_cZRe5MMTijuguzD2xMsbXI8Jc0mLvXmlO1Zo,3658
-hypern-0.2.1.dist-info/WHEEL,sha256=LVI1AVbYRTYC5adM2lSivmcJtOl9s941xFznjYMT5P8,106
-hypern-0.2.1.dist-info/licenses/LICENSE,sha256=VdbaK2hSaaD-LUjtDIlEbeZVmvLGK7BEQvltP3mv-cY,1304
+hypern-0.3.0.dist-info/METADATA,sha256=SINnZRpXUXjLnonzyUZ-STXzjY1JRGPl_nu0vqF0Qkg,3658
+hypern-0.3.0.dist-info/WHEEL,sha256=O32IZb5kJ6AxRW6nAcwAPHOSGL43bSvKBHNU0JKSSaQ,106
+hypern-0.3.0.dist-info/licenses/LICENSE,sha256=VdbaK2hSaaD-LUjtDIlEbeZVmvLGK7BEQvltP3mv-cY,1304
 hypern/worker.py,sha256=kN93QGx4bst0inHRO_fsTzMmhDA0N3pdzaqNXwyu3N0,894
 hypern/middleware/cors.py,sha256=SfG-3vAS-4MPXqsIsegNwDx9mqC9lvgUc3RuYzN6HNg,1643
 hypern/middleware/__init__.py,sha256=YpgxL7GQkzZM91VCNxHT2xmTa1R1b_BUS8n3tZ2b1Ys,268
-hypern/middleware/limit.py,sha256=JNlZ2S5xlr3svt_rvr92ofh_zsVpe1uNuGc2jO5y3GY,7972
+hypern/middleware/limit.py,sha256=9EA79q2GgyZkRynMJj8rfgumEhJKbAvyi3jII6A_BX8,7976
 hypern/middleware/i18n.py,sha256=s82nQo6kKClZ0s3G3jsy87VRfwxpBDbASB_ErjRL3O0,15
 hypern/middleware/base.py,sha256=Llcg9wglcumvY4BqaTfrX1OOZDqns4wb34wGF55EXcI,523
 hypern/config.py,sha256=v9KLL6snReAETKiVb8x3KOFrXpYd8-Io5tM7eruR85U,4781
@@ -21,9 +21,10 @@ hypern/cli/commands.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hypern/openapi/swagger.py,sha256=E5fHYUfFa77zQsCyQGf_vnqJVpl4_KI5qsKFHdgJEdw,61
 hypern/openapi/__init__.py,sha256=oJ0HM9yAgSN00mBC_fRgV2irlGugrhvIpiveuDMv8PM,136
 hypern/openapi/schemas.py,sha256=nmcmNYvKmjNkwFqi_3qpXVi1ukanNxMVay68bOLTrx8,1624
-hypern/application.py,sha256=DE9tQjkB4Pa6YQmmKJ7QwdaHDnhW3iw99zsyLJ0uFLI,13018
-hypern/hypern.pyi,sha256=eSqxlY7q6KboRjP3bpRlGSn2sEjxrIHFpxXh1o-qQJ4,6649
-hypern/processpool.py,sha256=Wrh_l87-3w4Z9znc6P22hi8kZfBA8cQ1C0Oaq8ysLVs,3657
+hypern/ws.py,sha256=XImBSYW2SM9s8wprnis8c2uRPhYxIXuDhwgRLLLDU38,378
+hypern/application.py,sha256=yXrKhVKwCQDweHoZPFyWr0ws7nmCOPp6H3aLZLbD7sw,13923
+hypern/hypern.pyi,sha256=WlE2tNIY3FnJaUorHKfJ7tY-DZf83XK7bRvzrxauyr4,7405
+hypern/processpool.py,sha256=mtP6qYSKTUgHOQEqtw6yhBvZ4JMAPw6uLxuyd-96CYI,3908
 hypern/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hypern/db/nosql/addons/color.py,sha256=8zUBFjR19J1zy_WaOCXlS14GjgdOaHAcuSb__zFp_II,430
 hypern/db/nosql/addons/unicode.py,sha256=vKyqfzrS9SKFo4eKlvu6klST0FrjM0wTx5N3ocvSSO8,258
@@ -47,7 +48,7 @@ hypern/exceptions.py,sha256=wpTSTzw32Sb6bY9YxCDM7W_-Ww6u6pB1GKNbFf-1oj0,2331
 hypern/scheduler.py,sha256=nQoWIYMRmKd30g4XwdB072hWTNHvJlLd9S6rLlTFKS0,62
 hypern/args_parser.py,sha256=kJQtzw2xZrumDBzLQaZyEejAT02rUetPYCrmOpjzxWY,1731
 hypern/routing/dispatcher.py,sha256=aujogCVTz2mYtZRkEtmpdlxXA9l6X4D072qOiIg-a_Q,2301
-hypern/routing/route.py,sha256=ribSMOo0eZ2WUZ1P8PdiXIsyVA3dHrI1gEYDikRDn4o,10090
+hypern/routing/route.py,sha256=AZc4Qo5iy74q0_U8E5X6RIsudznHZYEZR8MdHRoCmB4,10119
 hypern/routing/__init__.py,sha256=MtyPYRHYMWIiCReZsUjJH93PvluotCbPU3RnWFQQmrA,97
 hypern/routing/parser.py,sha256=4BFn8MAmSX1QplwBXEEgbabYiNUAllYf2svPZoPPD5k,3454
 hypern/routing/endpoint.py,sha256=AWLHLQNlSGR8IGU6xM0RP-1kP06OJQzqpbXKSiZEzEo,996
@@ -64,5 +65,5 @@ hypern/caching/base/key_maker.py,sha256=FPW9L-N8NSPPgRngqMUCOdLurm1qmqe-KTe4Ucto
 hypern/caching/redis_backend.py,sha256=3FYzKCW0_OvoIMl-e9pARRGOUvRYGG7hGlaXEB18vnY,67
 hypern/logging/__init__.py,sha256=lzYSz0382eIM3CvP0sZ6RbEEwYZwfeJEJh9cxQA6Rws,49
 hypern/logging/logger.py,sha256=62Qg4YAi_JDGV72Rd6R58jixqZk7anRqHbtnuBlkrwA,3174
-hypern/hypern.cpython-310-darwin.so,sha256=1zAixAEVaZryZP5wgZ1jfK7VihvPeKZmCkDbGjtoTC4,6077672
-hypern-0.2.1.dist-info/RECORD,,
+hypern/hypern.cpython-310-darwin.so,sha256=2W8Aco4VpPEnqvswUUiVmOSNbYZ1mO43q8CKEB0G3kI,6288880
+hypern-0.3.0.dist-info/RECORD,,

{hypern-0.2.1.dist-info → hypern-0.3.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.7.4)
+Generator: maturin (1.7.7)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_10_12_x86_64