soia-client 1.0.17__py3-none-any.whl → 1.0.19__py3-none-any.whl

soia/_impl/service.py

@@ -1,13 +1,12 @@
 import inspect
 import json
+from collections.abc import Mapping
 from dataclasses import dataclass
-from typing import Any, Callable, Generic, Literal, Protocol, TypeAlias, Union, cast
+from typing import Any, Callable, Generic, Literal, TypeAlias, Union, cast
 
 from soia._impl.method import Method, Request, Response
 
-
-class RequestHeaders(Protocol):
-    def __getitem__(self, key: str, /) -> str | None: ...
+RequestHeaders: TypeAlias = Mapping[str, str]
 
 
 ResponseHeaders: TypeAlias = dict[str, str]
@@ -18,27 +17,31 @@ class Service:
 
     Usage: call '.add_method()' to register method implementations, then call
     '.handle_request()' from the function called by your web framework when an
-    HTTP request is sent to your service's URL.
+    HTTP request is received at your service's endpoint.
 
     Example with Flask:
 
         from flask import Response, request
 
-        soia_service = soia.Service()
-        soia_service.add_method(...)
-        soia_service.add_method(...)
+        s = soia.Service()
+        s.add_method(...)
+        s.add_method(...)
 
         @app.route("/myapi", methods=["GET", "POST"])
         def myapi():
             if request.method == "POST":
                 req_body = request.get_data(as_text=True)
             else:
-                req_body = urllib.parse.unquote(request.query_string.decode("utf-8"))
-            raw_response = soia_service.handle_request(req_body, request.headers, {})
+                query_string = request.query_string.decode("utf-8")
+                req_body = urllib.parse.unquote(query_string)
+            req_headers = dict(request.headers)
+            res_headers: dict[str, str] = {}
+            raw_response = s.handle_request(req_body, req_headers, res_headers)
             return Response(
                 raw_response.data,
                 status=raw_response.status_code,
                 content_type=raw_response.content_type,
+                headers=res_headers,
             )
     """
 
@@ -125,7 +128,7 @@ class Service:
         self,
         req_body: str,
         req_headers: RequestHeaders,
-        res_headers: ResponseHeaders | None,
+        res_headers: ResponseHeaders,
     ) -> RawResponse:
         if req_body == "list":
 
@@ -179,8 +182,9 @@ class Service:
                 f"bad request: can't parse JSON: {e}", "bad-request"
             )
 
+        res_headers.clear()
         try:
-            res: Any = method_impl.impl(req, req_headers, res_headers or {})
+            res: Any = method_impl.impl(req, req_headers, res_headers)
         except Exception as e:
             return self.RawResponse(f"server error: {e}", "server-error")
 

soia/_impl/service_client.py

@@ -1,4 +1,5 @@
 import http.client
+import re
 from typing import Any, Final, Mapping
 from urllib.parse import urlparse
 
@@ -65,14 +66,14 @@ class ServiceClient:
                 res_headers.clear()
                 res_headers.extend(response.getheaders())
             status_code = response.status
-            content_type = response.getheader("Content-Type")
+            content_type = response.getheader("Content-Type") or ""
             response_data = response.read().decode("utf-8", errors="ignore")
         finally:
             conn.close()
         if status_code in range(200, 300):
             return method.response_serializer.from_json_code(response_data)
         else:
-            message = f"HTTP response status {status_code}"
-            if content_type == "text/plain":
+            message = f"HTTP status {status_code}"
+            if re.match(r"text/plain\b", content_type):
                 message = f"{message}: {response_data}"
             raise RuntimeError(message)

{soia_client-1.0.17.dist-info → soia_client-1.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soia-client
-Version: 1.0.17
+Version: 1.0.19
 Author-email: Tyler Fibonacci <gepheum@gmail.com>
 License: MIT License
         

{soia_client-1.0.17.dist-info → soia_client-1.0.19.dist-info}/RECORD

@@ -14,13 +14,13 @@ soia/_impl/primitives.py,sha256=Xk26Fv4oQG2oXd3tS_2sAnJYQdXYX9nva09713AcJvs,8940
 soia/_impl/repr.py,sha256=7WX0bEAVENTjlyZIcbT8TcJylS7IRIyafGCmqaIMxFM,1413
 soia/_impl/serializer.py,sha256=28IwkjtUnLpbnPQfVNfJXkApCK4JhXHwLkC5MVhF8xo,3529
 soia/_impl/serializers.py,sha256=IL9jHHMo11pgrL1-crarOEElvTyV5YM6FTcgumjW6IU,2564
-soia/_impl/service.py,sha256=rYS-vAjt9CQlxW_pRd_ezVdl9ErRkplogGGrGBl0FG8,7027
-soia/_impl/service_client.py,sha256=1K-U8KAS4VOLvbfbNgcv12wfHj0PnshqIYm-h2o8r9w,2716
+soia/_impl/service.py,sha256=U9sZGJIc2cnVedRnPmneVrGwxll6hFUn9s-RA6bjoDs,7167
+soia/_impl/service_client.py,sha256=qDntwRyXfLsmXl4ELfOkh-fgv553nrGy72K0JghLM80,2734
 soia/_impl/structs.py,sha256=YTc3Ykj2TxPquar2XsP2DhFfkfIoELXOveyd8yTqN90,26545
 soia/_impl/timestamp.py,sha256=lXBNH8mPmzflkNjSKZSBl2XS-ot9N8N92B_zGO2SMtU,4078
 soia/_impl/type_adapter.py,sha256=RyIyh4Fnt9rMy0HRzC-a2v2JAdZsV9FBzoGEUVygVRE,2101
-soia_client-1.0.17.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
-soia_client-1.0.17.dist-info/METADATA,sha256=UOkgWyXR4rU2G-lBD1WbtFTH0QC08rvXSBrPLoW0rUQ,1667
-soia_client-1.0.17.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-soia_client-1.0.17.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
-soia_client-1.0.17.dist-info/RECORD,,
+soia_client-1.0.19.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
+soia_client-1.0.19.dist-info/METADATA,sha256=m0ufOfdKiNFEFbINu3oTina-9nafNUtugdhXzzFkIMk,1667
+soia_client-1.0.19.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+soia_client-1.0.19.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
+soia_client-1.0.19.dist-info/RECORD,,