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

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

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

{soia_client-1.0.16 → soia_client-1.0.17}/pyproject.toml

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

{soia_client-1.0.16 → soia_client-1.0.17}/soia/_impl/service.py

@@ -14,6 +14,34 @@ ResponseHeaders: TypeAlias = dict[str, str]
 
 
 class Service:
+    """Wraps around the implementation of a soia service on the server side.
+
+    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.
+
+    Example with Flask:
+
+        from flask import Response, request
+
+        soia_service = soia.Service()
+        soia_service.add_method(...)
+        soia_service.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, {})
+            return Response(
+                raw_response.data,
+                status=raw_response.status_code,
+                content_type=raw_response.content_type,
+            )
+    """
+
     _number_to_method_impl: dict[int, "_MethodImpl"]
 
     def __init__(self):

{soia_client-1.0.16 → soia_client-1.0.17}/soia/_impl/service_client.py

@@ -1,5 +1,5 @@
 import http.client
-from typing import Final, Mapping
+from typing import Any, Final, Mapping
 from urllib.parse import urlparse
 
 from soia._impl.method import Method, Request, Response
@@ -10,8 +10,8 @@ class ServiceClient:
     _host: Final[str]  # May include the port
     _path: Final[str]
 
-    def __init__(self, service_url: str):
-        parsed_url = urlparse(service_url)
+    def __init__(self, url: str):
+        parsed_url = urlparse(url)
         if parsed_url.query:
             raise ValueError("Service URL must not contain a query string")
         scheme = parsed_url.scheme
@@ -26,7 +26,12 @@ class ServiceClient:
         method: Method[Request, Response],
         request: Request,
         headers: Mapping[str, str] = {},
+        *,
+        res_headers: list[tuple[str, str]] | None = None,
+        timeout_secs: float | None = None,
     ) -> Response:
+        """Invokes the given method on the remote server through an RPC."""
+
         request_json = method.request_serializer.to_json_code(request)
         body = ":".join(
             [
@@ -41,10 +46,13 @@ class ServiceClient:
             "Content-Type": "text/plain; charset=utf-8",
             "Content-Length": str(len(body)),
         }
+        connection_options: dict[str, Any] = {}
+        if timeout_secs is not None:
+            connection_options["timeout"] = timeout_secs
         if self._scheme == "https":
-            conn = http.client.HTTPSConnection(self._host)
+            conn = http.client.HTTPSConnection(self._host, **connection_options)
         else:
-            conn = http.client.HTTPConnection(self._host)
+            conn = http.client.HTTPConnection(self._host, **connection_options)
         try:
             conn.request(
                 "POST",
@@ -53,6 +61,9 @@ class ServiceClient:
                 headers=headers,
             )
             response = conn.getresponse()
+            if res_headers is not None:
+                res_headers.clear()
+                res_headers.extend(response.getheaders())
             status_code = response.status
             content_type = response.getheader("Content-Type")
             response_data = response.read().decode("utf-8", errors="ignore")

{soia_client-1.0.16 → soia_client-1.0.17}/soia_client.egg-info/PKG-INFO

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