aspyx-service 0.10.5__tar.gz → 0.10.7__tar.gz

{aspyx_service-0.10.5 → aspyx_service-0.10.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aspyx_service
-Version: 0.10.5
+Version: 0.10.7
 Summary: Aspyx Service framework
 Author-email: Andreas Ernst <andreas.ernst7@gmail.com>
 License: MIT License

{aspyx_service-0.10.5 → aspyx_service-0.10.7}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [project]
 name = "aspyx_service"
-version = "0.10.5"
+version = "0.10.7"
 description = "Aspyx Service framework"
 authors = [{ name = "Andreas Ernst", email = "andreas.ernst7@gmail.com" }]
 readme = "README.md"

{aspyx_service-0.10.5 → aspyx_service-0.10.7}/src/aspyx_service/server.py

@@ -6,6 +6,8 @@ import atexit
 import functools
 import inspect
 import threading
+import typing
+from datetime import datetime
 from typing import Type, Optional, Callable, Any
 import contextvars
 import msgpack
@@ -35,12 +37,47 @@ class ResponseContext:
     class Response:
         def __init__(self):
             self.cookies = {}
-
-        def set_cookie(self, key, value):
-            self.cookies[key] = value
+            self.delete_cookies = {}
+
+        def delete_cookie(self,
+                           key: str,
+                           path: str = "/",
+                           domain: str | None = None,
+                           secure: bool = False,
+                           httponly: bool = False,
+                           samesite: typing.Literal["lax", "strict", "none"] | None = "lax",
+                           ):
+            self.delete_cookies[key] = {
+                "path": path,
+                "domain": domain,
+                "secure": secure,
+                "httponly": httponly,
+                "samesite": samesite
+            }
+
+        def set_cookie(self,
+                key: str,
+                value: str = "",
+                max_age: int | None = None,
+                expires: datetime | str | int | None = None,
+                path: str | None = "/",
+                domain: str | None = None,
+                secure: bool = False,
+                httponly: bool = False,
+                samesite: typing.Literal["lax", "strict", "none"] | None = "lax"):
+            self.cookies[key] = {
+                "value": value,
+                "max_age": max_age,
+                "expires": expires,
+                "path": path,
+                "domain": domain,
+                "secure": secure,
+                "httponly": httponly,
+                "samesite": samesite
+            }
 
     @classmethod
-    def get(cls) -> ResponseContext.Response:
+    def create(cls) -> ResponseContext.Response:
         response = ResponseContext.Response()
 
         cls.response_var.set(response)
@@ -48,7 +85,7 @@ class ResponseContext:
         return response
 
     @classmethod
-    def is_set(cls) -> Optional[ResponseContext.Response]:
+    def get(cls) -> Optional[ResponseContext.Response]:
         return cls.response_var.get()
 
     @classmethod
@@ -216,10 +253,32 @@ class FastAPIServer(Server):
 
                 json_response = JSONResponse(get_serializer(return_type)(result))
 
-                local_response = ResponseContext.is_set()
+                local_response = ResponseContext.get()
                 if local_response is not None:
+                    # delete
+
+                    for key, value in  local_response.delete_cookies.items():
+                        json_response.delete_cookie(
+                            key,
+                            path=value["path"],
+                            domain=value["domain"],
+                            secure=value["secure"],
+                            httponly=value["httponly"]
+                            )
+
+                    # create
+
                     for key, value in  local_response.cookies.items():
-                        json_response.set_cookie(key, value)
+                        json_response.set_cookie(
+                            key,
+                            value=value["value"],
+                            max_age=value["max_age"],
+                            expires=value["expires"],
+                            path=value["path"],
+                            domain=value["domain"],
+                            secure=value["secure"],
+                            httponly=value["httponly"]
+                            )
 
                     ResponseContext.reset()
 

{aspyx_service-0.10.5 → aspyx_service-0.10.7}/tests/test_service.py

@@ -59,7 +59,7 @@ class TestSyncRemoteService:
         result_pydantic = test_service.pydantic(pydantic)
         assert result_pydantic == pydantic
 
-    def test_dispatch_rest(self, service_manager):
+    def xtest_dispatch_rest(self, service_manager):
         test_service = service_manager.get_service(TestRestService, preferred_channel="rest")
 
         result = test_service.get("hello")