PyPI - soia-client - Versions diffs - 1.1.1__tar.gz → 1.1.3__tar.gz - Mend

soia-client 1.1.1tar.gz → 1.1.3tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of soia-client might be problematic. Click here for more details.

Files changed (34) hide show

{soia_client-1.1.1 → soia_client-1.1.3}/PKG-INFO RENAMED Viewed

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

{soia_client-1.1.1 → soia_client-1.1.3}/pyproject.toml RENAMED Viewed

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

{soia_client-1.1.1 → soia_client-1.1.3}/soia/_impl/enums.py RENAMED Viewed

@@ -3,12 +3,11 @@ from collections.abc import Callable, Sequence
 from dataclasses import FrozenInstanceError, dataclass
 from typing import Any, Final, Union
+from soia import _spec, reflection
 from soia._impl.function_maker import BodyBuilder, Expr, ExprLike, Line, make_function
 from soia._impl.repr import repr_impl
 from soia._impl.type_adapter import TypeAdapter
-from soia import _spec, reflection
 class EnumAdapter(TypeAdapter):
     __slots__ = (
@@ -139,6 +138,13 @@ class EnumAdapter(TypeAdapter):
             kind="enum",
             id=record_id,
             fields=tuple(
+                reflection.Field(
+                    name=field.name,
+                    number=field.number,
+                    type=None,
+                )
+                for field in self.all_constant_fields if field.number != 0
+            ) + tuple(
                 reflection.Field(
                     name=field.spec.name,
                     number=field.spec.number,

{soia_client-1.1.1 → soia_client-1.1.3}/soia/_impl/service.py RENAMED Viewed

@@ -26,29 +26,50 @@ class _MethodImpl(Generic[Request, Response, RequestHeaders, ResponseHeaders]):
 @dataclass(frozen=True)
 class RawServiceResponse:
     data: str
-    type: Literal["ok-json", "bad-request", "server-error"]
+    type: Literal["ok-json", "ok-html", "bad-request", "server-error"]
     @property
     def status_code(self):
-        if self.type == "ok-json":
+        if self.type == "ok-json" or self.type == "ok-html":
             return 200
         elif self.type == "bad-request":
             return 400
         elif self.type == "server-error":
             return 500
         else:
+            _: Never = self.type
             raise TypeError(f"Unknown response type: {self.type}")
     @property
     def content_type(self):
         if self.type == "ok-json":
             return "application/json"
+        if self.type == "ok-html":
+            return "text/html; charset=utf-8"
         elif self.type == "bad-request" or self.type == "server-error":
             return "text/plain; charset=utf-8"
         else:
+            _: Never = self.type
             raise TypeError(f"Unknown response type: {self.type}")
+# Copied from
+#   https://github.com/gepheum/restudio/blob/main/index.jsdeliver.html
+_RESTUDIO_HTML = """<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>RESTudio</title>
+    <script src="dist/restudio-standalone.js"></script>
+  </head>
+  <body style="margin: 0; padding: 0;">
+    <restudio-app></restudio-app>
+  </body>
+</html>
+"""
 @dataclass()
 class _HandleRequestFlow(Generic[Request, Response, RequestHeaders, ResponseHeaders]):
     req_body: str
@@ -94,6 +115,9 @@ class _HandleRequestFlow(Generic[Request, Response, RequestHeaders, ResponseHead
         if self.req_body in ["", "list"]:
             return self._handle_list()
+        if self.req_body == "restudio":
+            return self._handle_restudio()
         # Method invokation
         method_name: str
         method_number: int | None
@@ -211,6 +235,9 @@ class _HandleRequestFlow(Generic[Request, Response, RequestHeaders, ResponseHead
         )
         return RawServiceResponse(json_code, "ok-json")
+    def _handle_restudio(self) -> RawServiceResponse:
+        return RawServiceResponse(_RESTUDIO_HTML, "ok-html")
     def _response_to_json(
         self,
         res: Response,

{soia_client-1.1.1 → soia_client-1.1.3}/soia/reflection.py RENAMED Viewed

@@ -109,11 +109,19 @@ class _Serializer(Generic[_T]):
     from_json: Callable[[Any], _T]
+@dataclass(frozen=True, eq=True)
+class _NoDefault:
+    pass
+_NO_DEFAULT: Final = _NoDefault()
 @dataclass(frozen=True)
 class _FieldSerializer(Generic[_T]):
     name: str
     serializer: _Serializer[_T]
-    default: Optional[_T] = None
+    default: _T | _NoDefault = _NO_DEFAULT
 def _primitive_serializer(check_type_fn: Callable[[Any], _T]) -> _Serializer[_T]:
@@ -144,7 +152,7 @@ def _dataclass_serializer(
         def field_from_json(field: _FieldSerializer) -> Any:
             value_json = json.get(field.name)
             if value_json is None:
-                if field.default is not None:
+                if field.default != _NO_DEFAULT:
                     return field.default
                 else:
                     # Will raise an exception.
@@ -196,6 +204,22 @@ def _forwarding_serializer(
     return _Serializer(to_json, from_json)
+def _optional_serializer(
+    other_serializer: _Serializer[_T],
+) -> _Serializer[Optional[_T]]:
+    def to_json(input: Optional[_T]) -> Any:
+        if input is None:
+            return None
+        return other_serializer.to_json(input)
+    def from_json(json: Any) -> Optional[_T]:
+        if json is None:
+            return None
+        return other_serializer.from_json(json)
+    return _Serializer(to_json, from_json)
 # ==============================================================================
 # INTERNAL: JSON serialization of TypeDescriptor
 # ==============================================================================
@@ -292,9 +316,10 @@ _FIELD_SERIALIZER: Final = _dataclass_serializer(
             "name",
             _primitive_serializer(str),
         ),
-        _FieldSerializer(
+        _FieldSerializer[Optional[Type]](
             "type",
-            _forwarding_serializer(_type_serializer),
+            _optional_serializer(_forwarding_serializer(_type_serializer)),
+            default=None,
         ),
         _FieldSerializer(
             "number",

{soia_client-1.1.1 → soia_client-1.1.3}/soia_client.egg-info/PKG-INFO RENAMED Viewed

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

{soia_client-1.1.1 → soia_client-1.1.3}/tests/test_module_initializer.py RENAMED Viewed

@@ -2,11 +2,10 @@ import dataclasses
 import unittest
 from typing import Any
+from soia import KeyedItems, Method, Timestamp, _spec
 from soia._module_initializer import init_module
 from soia.reflection import TypeDescriptor
-from soia import KeyedItems, Method, Timestamp, _spec
 class ModuleInitializerTestCase(unittest.TestCase):
     def init_test_module(self) -> dict[str, Any]:
@@ -1201,6 +1200,10 @@ class ModuleInitializerTestCase(unittest.TestCase):
                         "kind": "enum",
                         "id": "my/module.soia:JsonValue",
                         "fields": [
+                            {
+                                "name": "NULL",
+                                "number": 1,
+                            },
                             {
                                 "name": "bool",
                                 "type": {"kind": "primitive", "value": "bool"},