soia-client 1.0.22__tar.gz → 1.0.24__tar.gz

{soia_client-1.0.22 → soia_client-1.0.24}/PKG-INFO

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

{soia_client-1.0.22 → soia_client-1.0.24}/pyproject.toml

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

{soia_client-1.0.22 → soia_client-1.0.24}/soia/_impl/service_client.py

@@ -1,6 +1,6 @@
 import http.client
 import re
-from typing import Any, Final, Mapping
+from typing import Any, Final, Mapping, Protocol
 from urllib.parse import urlparse
 
 from soia._impl.method import Method, Request, Response
@@ -77,3 +77,88 @@ class ServiceClient:
             if re.match(r"text/plain\b", content_type):
                 message = f"{message}: {response_data}"
             raise RuntimeError(message)
+
+    async def invoke_remote_async(
+        self,
+        aiohttp_client_session: "_AiohttpClientSession",
+        method: Method[Request, Response],
+        request: Request,
+        headers: Mapping[str, str] = {},
+        *,
+        res_headers: list[tuple[str, str]] | None = None,
+    ) -> Response:
+        """
+        Asynchronously invokes the given method on the remote server through an RPC.
+
+        Usage:
+            import aiohttp
+
+            async with aiohttp.ClientSession() as session:
+                response = await service_client.invoke_remote_async(
+                    session,
+                    method,
+                    request,
+                    headers,
+                )
+
+        With timeout:
+            timeout = aiohttp.ClientTimeout(total=30)
+            async with aiohttp.ClientSession(timeout=timeout) as session:
+                response = await service_client.invoke_remote_async(
+                    session,
+                    method,
+                    request,
+                    headers,
+                )
+        """
+
+        request_json = method.request_serializer.to_json_code(request)
+        body = ":".join(
+            [
+                method.name,
+                str(method.number),
+                "",
+                request_json,
+            ]
+        )
+        
+        request_headers = {
+            **headers,
+            "Content-Type": "text/plain; charset=utf-8",
+            "Content-Length": str(len(body)),
+        }
+
+        # Build the URL
+        url = f"{self._scheme}://{self._host}{self._path}"
+
+        async with aiohttp_client_session.post(
+            url,
+            data=body,
+            headers=request_headers,
+        ) as response:
+            if res_headers is not None:
+                res_headers.clear()
+                res_headers.extend(response.headers.items())
+
+            status_code = response.status
+            content_type = response.headers.get("Content-Type", "")
+            response_data = await response.text(encoding="utf-8", errors="ignore")
+
+        if status_code in range(200, 300):
+            return method.response_serializer.from_json_code(response_data)
+        else:
+            message = f"HTTP status {status_code}"
+            if re.match(r"text/plain\b", content_type):
+                message = f"{message}: {response_data}"
+            raise RuntimeError(message)
+
+
+class _AiohttpClientSession(Protocol):
+    def post(
+        self,
+        url: str,
+        *,
+        data: str,
+        headers: Mapping[str, str],
+    ) -> Any:
+        ...

{soia_client-1.0.22 → soia_client-1.0.24}/soia/_impl/structs.py

@@ -676,7 +676,7 @@ def _make_from_json_fn(
         name = field.field.name
         lvalue = f"ret.{field.field.attribute}"
         builder.append_ln(f'  if "{name}" in json:')
-        builder.append_ln(f"    array_len = {field.field.number}")
+        builder.append_ln(f"    array_len = {field.field.number + 1}")
         builder.append_ln(
             f"    {lvalue} = ",
             field.type.from_json_expr(f'json["{name}"]'),

{soia_client-1.0.22 → soia_client-1.0.24}/soia_client.egg-info/PKG-INFO

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

{soia_client-1.0.22 → soia_client-1.0.24}/tests/test_module_initializer.py

@@ -518,6 +518,7 @@ class ModuleInitializerTestCase(unittest.TestCase):
         point = point_cls.SERIALIZER.from_json_code('{"x":1,"y":2}')
         self.assertEqual(point.x, 1.0)
         self.assertIsInstance(point.x, float)
+        self.assertEqual(point._array_len, 3)
 
     def test_point_with_unrecognized_and_removed_fields(self):
         point_cls = self.init_test_module()["Point"]