soia-client 1.0.9__tar.gz → 1.0.11__tar.gz

{soia_client-1.0.9 → soia_client-1.0.11}/PKG-INFO

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

{soia_client-1.0.9 → soia_client-1.0.11}/pyproject.toml

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

{soia_client-1.0.9 → soia_client-1.0.11}/soia_client.egg-info/PKG-INFO

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

{soia_client-1.0.9 → soia_client-1.0.11}/soia_client.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ soia_client.egg-info/PKG-INFO
 soia_client.egg-info/SOURCES.txt
 soia_client.egg-info/dependency_links.txt
 soia_client.egg-info/top_level.txt
+soialib/_.py
 soialib/__init__.py
 soialib/keyed_items.py
 soialib/method.py
@@ -12,6 +13,7 @@ soialib/module_initializer.py
 soialib/never.py
 soialib/serializer.py
 soialib/serializers.py
+soialib/service_client.py
 soialib/spec.py
 soialib/timestamp.py
 soialib/impl/__init__.py

soia_client-1.0.11/soialib/_.py

@@ -0,0 +1,3 @@
+from typing import Any, Final
+
+_: Final[Any] = None

{soia_client-1.0.9 → soia_client-1.0.11}/soialib/__init__.py

@@ -6,12 +6,14 @@ from soialib.serializers import (
     optional_serializer,
     primitive_serializer,
 )
+from soialib.service_client import ServiceClient
 from soialib.timestamp import Timestamp
 
 __all__ = [
     "KeyedItems",
     "Method",
     "Serializer",
+    "ServiceClient",
     "Timestamp",
     "array_serializer",
     "optional_serializer",

{soia_client-1.0.9 → soia_client-1.0.11}/soialib/impl/arrays.py

@@ -118,14 +118,14 @@ def _new_listuple_class() -> type:
     return Listuple
 
 
-def _new_keyed_items_class(attributes: tuple[str, ...], default_expr: ExprLike):
+def _new_keyed_items_class(key_attributes: tuple[str, ...], default_expr: ExprLike):
     key_items = make_function(
         name="key_items",
         params=["items"],
         body=[
             "ret = {}",
             "for item in items:",
-            f"  ret[item.{'.'.join(attributes)}] = item",
+            f"  ret[item.{'.'.join(key_attributes)}] = item",
             "return ret",
         ],
     )

{soia_client-1.0.9 → soia_client-1.0.11}/soialib/impl/structs.py

@@ -457,6 +457,8 @@ def _make_eq_fn(
     """
 
     builder = BodyBuilder()
+    builder.append_ln("if other is self:")
+    builder.append_ln("  return True")
     builder.append_ln("if other.__class__ is self.__class__:")
     operands: list[ExprLike]
     if fields:

soia_client-1.0.11/soialib/service_client.py

@@ -0,0 +1,70 @@
+import http.client
+from typing import Final, Mapping, TypeVar
+from urllib.parse import urlparse
+
+from soialib import Method
+
+Request = TypeVar("Request")
+Response = TypeVar("Response")
+
+
+class ServiceClient:
+    _scheme: Final[str]
+    _host: Final[str]  # May include the port
+    _path: Final[str]
+
+    def __init__(self, service_url: str, use_https: bool = False):
+        parsed_url = urlparse(service_url)
+        if parsed_url.query:
+            raise ValueError("Service URL must not contain a query string")
+        scheme = parsed_url.scheme
+        if scheme not in ["http", "https"]:
+            raise ValueError("Service URL must start with http:// or https://")
+        self._scheme = scheme
+        self._host = parsed_url.netloc
+        self._path = parsed_url.path
+
+    def invoke_remote(
+        self,
+        method: Method[Request, Response],
+        request: Request,
+        headers: Mapping[str, str] = {},
+    ) -> Response:
+        request_json = method.request_serializer.to_json_code(request)
+        body = ":".join(
+            [
+                method.name,
+                str(method.number),
+                "",
+                request_json,
+            ]
+        )
+        headers = {
+            **headers,
+            "Content-Type": "text/plain; charset=utf-8",
+            "Content-Length": str(len(body)),
+        }
+        if self._scheme == "https":
+            conn = http.client.HTTPSConnection(self._host)
+        else:
+            conn = http.client.HTTPConnection(self._host)
+        try:
+            conn.request(
+                "POST",
+                self._path,
+                body=body,
+                headers=headers,
+            )
+            response = conn.getresponse()
+            status_code = response.status
+            content_type = response.getheader("Content-Type")
+            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"{message}: {response_data}"
+            raise RuntimeError(message)

{soia_client-1.0.9 → soia_client-1.0.11}/tests/test_module_initializer.py

@@ -294,6 +294,21 @@ class ModuleInitializerTestCase(unittest.TestCase):
                         ),
                     ),
                 ),
+                spec.Struct(
+                    id="my/module.soia:Rec",
+                    fields=(
+                        spec.Field(
+                            name="r",
+                            number=0,
+                            type="my/module.soia:Rec",
+                        ),
+                        spec.Field(
+                            name="x",
+                            number=1,
+                            type=spec.PrimitiveType.INT32,
+                        ),
+                    ),
+                ),
                 spec.Struct(
                     id="my/module.soia:Foobar",
                     fields=(
@@ -426,7 +441,6 @@ class ModuleInitializerTestCase(unittest.TestCase):
 
     def test_primitives_repr(self):
         primitives_cls = self.init_test_module()["Primitives"]
-        serializer = primitives_cls.SERIALIZER
         p = primitives_cls(
             bool=True,
             bytes=b"a",
@@ -454,7 +468,6 @@ class ModuleInitializerTestCase(unittest.TestCase):
 
     def test_cannot_mutate_frozen_class(self):
         point_cls = self.init_test_module()["Point"]
-        serializer = point_cls.SERIALIZER
         point = point_cls(x=1.5, y=2.5)
         try:
             point.x = 3.5
@@ -530,6 +543,14 @@ class ModuleInitializerTestCase(unittest.TestCase):
         self.assertEqual(serializer.to_json_code(foobar), "[0,0,0,0,[2.0]]")
         self.assertEqual(serializer.from_json_code("[0,0,0,0,[2.0]]"), foobar)
 
+    def test_recursive_struct(self):
+        rec_cls = self.init_test_module()["Rec"]
+        r = rec_cls(r=rec_cls(r=rec_cls.DEFAULT, x=1))
+        serializer = rec_cls.SERIALIZER
+        self.assertEqual(serializer.to_json_code(r), "[[[],1]]")
+        self.assertEqual(serializer.from_json_code("[[[],1]]"), r)
+        self.assertEqual(str(r), "Rec(\n  r=Rec(x=1),\n)")
+
     def test_struct_ctor_accepts_mutable_struct(self):
         module = self.init_test_module()
         segment_cls = module["Segment"]
@@ -562,6 +583,11 @@ class ModuleInitializerTestCase(unittest.TestCase):
     def test_struct_ctor_raises_error_if_unknown_arg(self):
         module = self.init_test_module()
         segment_cls = module["Segment"]
+        try:
+            segment_cls(foo=4)
+            self.fail("Expected to fail")
+        except Exception:
+            pass
 
     def test_to_frozen_checks_type_of_struct_field(self):
         module = self.init_test_module()

{soia_client-1.0.9 → soia_client-1.0.11}/tests/test_serializers.py

@@ -97,6 +97,18 @@ class TimestampTestCase(unittest.TestCase):
         self.assertEqual(
             primitive_serializer("float32").to_json_code(float("nan")), "NaN"
         )
+        self.assertEqual(primitive_serializer("float32").from_json_code("3.14"), 3.14)
+        self.assertEqual(
+            primitive_serializer("float32").from_json_code("Infinity"), float("inf")
+        )
+        self.assertEqual(
+            primitive_serializer("float32").from_json_code("-Infinity"), -float("inf")
+        )
+        self.assertNotEqual(
+            primitive_serializer("float32").from_json_code("NaN"),
+            primitive_serializer("float32").from_json_code("NaN"),
+        )
+
         self.assertEqual(primitive_serializer("float64").to_json_code(3.14), "3.14")
         self.assertEqual(
             primitive_serializer("float64").to_json_code(3.14, readable=True),