soia-client 1.0.22__py3-none-any.whl → 1.0.24__py3-none-any.whl

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/_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.dist-info → soia_client-1.0.24.dist-info}/METADATA

@@ -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.dist-info → soia_client-1.0.24.dist-info}/RECORD

@@ -15,12 +15,12 @@ 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=PsV286BYMoJpXIjeBc__MHHakcqof0Pbb3B_Zha1PZI,11928
-soia/_impl/service_client.py,sha256=qDntwRyXfLsmXl4ELfOkh-fgv553nrGy72K0JghLM80,2734
-soia/_impl/structs.py,sha256=iEO6Mu2I0--oNqvPWxFxXEzZ_0RXNIKndhdzWU5Zqw8,26781
+soia/_impl/service_client.py,sha256=NtaJmkk7DShLKZm_QOzQtboXqmfKvdLRym1EZ-EbJQI,5319
+soia/_impl/structs.py,sha256=KrqucOqSxXda4-3gKyCmx_Oj4osTFBLk9ORyRkV_7dk,26785
 soia/_impl/timestamp.py,sha256=lXBNH8mPmzflkNjSKZSBl2XS-ot9N8N92B_zGO2SMtU,4078
 soia/_impl/type_adapter.py,sha256=RyIyh4Fnt9rMy0HRzC-a2v2JAdZsV9FBzoGEUVygVRE,2101
-soia_client-1.0.22.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
-soia_client-1.0.22.dist-info/METADATA,sha256=_UdID63xls10TbxWJdrcdwBELHLP1N_6OwdiMtxC_6M,2122
-soia_client-1.0.22.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-soia_client-1.0.22.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
-soia_client-1.0.22.dist-info/RECORD,,
+soia_client-1.0.24.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
+soia_client-1.0.24.dist-info/METADATA,sha256=3-LeEFfA48rzfg5WOWINfM2baIXo3Saq7SzaFAOwZmk,2122
+soia_client-1.0.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+soia_client-1.0.24.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
+soia_client-1.0.24.dist-info/RECORD,,

{soia_client-1.0.22.dist-info → soia_client-1.0.24.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any