soia-client 1.0.17__tar.gz → 1.0.19__tar.gz

{soia_client-1.0.17 → soia_client-1.0.19}/PKG-INFO

@@ -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 → soia_client-1.0.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "soia-client"
-version = "1.0.17"
+version = "1.0.19"
 description = ""
 readme = "README.md"
 authors = [{ name = "Tyler Fibonacci", email = "gepheum@gmail.com" }]

{soia_client-1.0.17 → soia_client-1.0.19}/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_client-1.0.17 → soia_client-1.0.19}/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 → soia_client-1.0.19}/soia_client.egg-info/PKG-INFO

@@ -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