soia-client 1.0.27__py3-none-any.whl → 1.0.29__py3-none-any.whl

soia/_impl/enums.py

@@ -41,6 +41,9 @@ class EnumAdapter(TypeAdapter):
             constant = constant_class()
             setattr(base_class, constant_field.attribute, constant)
 
+        # Add the Kind type alias.
+        setattr(base_class, "Kind", str)
+
     def finalize(
         self,
         resolve_type_fn: Callable[[_spec.Type], TypeAdapter],

soia/_impl/service.py

@@ -5,6 +5,7 @@ from dataclasses import dataclass
 from typing import Any, Generic, Literal, TypeVar, Union, cast
 
 from soia._impl.method import Method, Request, Response
+from soia._impl.never import Never
 
 RequestHeaders = TypeVar("RequestHeaders")
 
@@ -90,42 +91,84 @@ class _HandleRequestFlow(Generic[Request, Response, RequestHeaders, ResponseHead
         tuple[Any, _MethodImpl[Request, Response, RequestHeaders, ResponseHeaders]],
         RawServiceResponse,
     ]:
-        if self.req_body == "list":
-
-            def method_to_json(method: Method) -> Any:
-                return {
-                    "method": method.name,
-                    "number": method.number,
-                    "request": method.request_serializer.type_descriptor.as_json(),
-                    "response": method.response_serializer.type_descriptor.as_json(),
-                }
-
-            json_code = json.dumps(
-                {
-                    "methods": [
-                        method_to_json(method_impl.method)
-                        for method_impl in self.number_to_method_impl.values()
-                    ]
-                },
-                indent=2,
-            )
-            return RawServiceResponse(json_code, "ok-json")
-
-        parts = self.req_body.split(":", 3)
-        if len(parts) != 4:
-            return RawServiceResponse(
-                "bad request: invalid request format", "bad-request"
-            )
-        method_name = parts[0]
-        method_number_str = parts[1]
-        self.format = parts[2]
-        request_data = parts[3]
-        try:
-            method_number = int(method_number_str)
-        except Exception:
-            return RawServiceResponse(
-                "bad request: can't parse method number", "bad-request"
-            )
+        if self.req_body in ["", "list"]:
+            return self._handle_list()
+
+        # Method invokation
+        method_name: str
+        method_number: int | None
+        format: str
+        request_data: tuple[Literal["json-code"], str] | tuple[Literal["json"], Any]
+
+        first_char = self.req_body[0]
+        if first_char.isspace() or first_char == "{":
+            # A JSON object
+            try:
+                req_body_json = json.loads(self.req_body)
+            except json.JSONDecodeError:
+                return RawServiceResponse(
+                    "bad request: invalid JSON", "bad-request"
+                )
+            method = req_body_json.get("method", ())
+            if method == ():
+                return RawServiceResponse(
+                    "bad request: missing 'method' field in JSON", "bad-request"
+                )
+            if isinstance(method, str):
+                method_name = method
+                method_number = None
+            elif isinstance(method, int):
+                method_name = "?"
+                method_number = method
+            else:
+                return RawServiceResponse(
+                    "bad request: 'method' field must be a string or an integer",
+                    "bad-request",
+                )
+            format = "readable"
+            data = req_body_json.get("request", ())
+            if data == ():
+                return RawServiceResponse(
+                    "bad request: missing 'request' field in JSON", "bad-request"
+                )
+            request_data = ("json", data)
+        else:
+            # A colon-separated string
+            parts = self.req_body.split(":", 3)
+            if len(parts) != 4:
+                return RawServiceResponse(
+                    "bad request: invalid request format", "bad-request"
+                )
+            method_name = parts[0]
+            method_number_str = parts[1]
+            format = parts[2]
+            request_data = ("json-code", parts[3])
+            if method_number_str:
+                try:
+                    method_number = int(method_number_str)
+                except Exception:
+                    return RawServiceResponse(
+                        "bad request: can't parse method number", "bad-request"
+                    )
+            else:
+                method_number = None
+        self.format = format
+        if method_number is None:
+            # Try to get the method number by name
+            all_methods = self.number_to_method_impl.values()
+            name_matches = [m for m in all_methods if m.method.name == method_name]
+            if not name_matches:
+                return RawServiceResponse(
+                    f"bad request: method not found: {method_name}",
+                    "bad-request",
+                )
+            elif len(name_matches) != 1:
+                return RawServiceResponse(
+                    f"bad request: method name '{method_name}' is ambiguous; "
+                    "use method number instead",
+                    "bad-request",
+                )
+            method_number = name_matches[0].method.number
         method_impl = self.number_to_method_impl.get(method_number)
         if not method_impl:
             return RawServiceResponse(
@@ -133,15 +176,41 @@ class _HandleRequestFlow(Generic[Request, Response, RequestHeaders, ResponseHead
                 "bad-request",
             )
         try:
-            req: Any = method_impl.method.request_serializer.from_json_code(
-                request_data
-            )
+            req: Any
+            request_serializer = method_impl.method.request_serializer
+            if request_data[0] == "json-code":
+                req = request_serializer.from_json_code(request_data[1])
+            elif request_data[0] == "json":
+                req = request_serializer.from_json(request_data[1])
+            else:
+                _: Never = request_data[0]
+                del _
         except Exception as e:
             return RawServiceResponse(
                 f"bad request: can't parse JSON: {e}", "bad-request"
             )
         return (req, method_impl)
 
+    def _handle_list(self) -> RawServiceResponse:
+        def method_to_json(method: Method) -> Any:
+            return {
+                "method": method.name,
+                "number": method.number,
+                "request": method.request_serializer.type_descriptor.as_json(),
+                "response": method.response_serializer.type_descriptor.as_json(),
+            }
+
+        json_code = json.dumps(
+            {
+                "methods": [
+                    method_to_json(method_impl.method)
+                    for method_impl in self.number_to_method_impl.values()
+                ]
+            },
+            indent=2,
+        )
+        return RawServiceResponse(json_code, "ok-json")
+
     def _response_to_json(
         self,
         res: Response,

soia/_impl/service_client.py

@@ -121,7 +121,7 @@ class ServiceClient:
                 request_json,
             ]
         )
-        
+
         request_headers = {
             **headers,
             "Content-Type": "text/plain; charset=utf-8",

{soia_client-1.0.27.dist-info → soia_client-1.0.29.dist-info}/METADATA

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

{soia_client-1.0.27.dist-info → soia_client-1.0.29.dist-info}/RECORD

@@ -4,7 +4,7 @@ soia/_spec.py,sha256=Y5EHHQa6qNeJc29aaqGrFPnPFXxlL7TED9_AXUGBjf0,3663
 soia/reflection.py,sha256=U5knJGmawARCdcEhNxek4dvx48WLPETLqIqKBPWwT4Q,8771
 soia/_impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 soia/_impl/arrays.py,sha256=C3j3RZdSvqmogbGAi3EprLkUYMFfO-IJhoCOte5blAw,5477
-soia/_impl/enums.py,sha256=Pc9ngDPNfDtUKl0tXRTti6hfqMW1-6SA3SogkOa389A,16962
+soia/_impl/enums.py,sha256=jlg2YYGgMg6BMmSy0v0MBgZmZYzLvVS0j68TxOCiSm8,17039
 soia/_impl/function_maker.py,sha256=MvCDv1WwzKGJzZbNCnJ_8-MP3m1xTIabumXA-9Ydd9M,5639
 soia/_impl/keyed_items.py,sha256=EoPrdeLJ8i7zCH-oW-7qOcyadyrzykB6lkrf3xRVmyk,337
 soia/_impl/method.py,sha256=C6ygh-Li4zADxFR_gfeBTuPUzLjZ1XHCp0ZI4-uiRYs,455
@@ -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=PsV286BYMoJpXIjeBc__MHHakcqof0Pbb3B_Zha1PZI,11928
-soia/_impl/service_client.py,sha256=NtaJmkk7DShLKZm_QOzQtboXqmfKvdLRym1EZ-EbJQI,5319
+soia/_impl/service.py,sha256=3dpcH4XEBTEShyjzxMA_zDGg9_amTFF5A49U6hivAdQ,14792
+soia/_impl/service_client.py,sha256=0WgiN6Stg548FAdZQMuezZoooe4MYw2frEQ5KUE7xag,5311
 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.27.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
-soia_client-1.0.27.dist-info/METADATA,sha256=maRPm_nhxT7Yt6BFcXVNXNntja8B_4_F7bMinQrczZI,2122
-soia_client-1.0.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-soia_client-1.0.27.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
-soia_client-1.0.27.dist-info/RECORD,,
+soia_client-1.0.29.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
+soia_client-1.0.29.dist-info/METADATA,sha256=Ku2iQYq_A0BOH0B4uW5H_8DoZdIXSbSwIUX3jTnP6iA,2122
+soia_client-1.0.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+soia_client-1.0.29.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
+soia_client-1.0.29.dist-info/RECORD,,