openrewrite-remote 0.21.0__tar.gz → 0.21.1__tar.gz

{openrewrite_remote-0.21.0 → openrewrite_remote-0.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: openrewrite-remote
-Version: 0.21.0
+Version: 0.21.1
 Summary: Remoting functionality for the OpenRewrite library.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne, Inc. Commercial License

{openrewrite_remote-0.21.0 → openrewrite_remote-0.21.1}/openrewrite_remote.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: openrewrite-remote
-Version: 0.21.0
+Version: 0.21.1
 Summary: Remoting functionality for the OpenRewrite library.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne, Inc. Commercial License

{openrewrite_remote-0.21.0 → openrewrite_remote-0.21.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "openrewrite-remote"
 description = "Remoting functionality for the OpenRewrite library."
-version = "0.21.0" # Updated dynamically during release
+version = "0.21.1" # Updated dynamically during release
 authors = [{ name = "Moderne Inc.", email = "support@moderne.io" }]
 license = { text = "Moderne, Inc. Commercial License" }
 dependencies = [

{openrewrite_remote-0.21.0 → openrewrite_remote-0.21.1}/rewrite_remote/handlers/run_recipe_load_and_visitor_handler.py

@@ -1,5 +1,6 @@
 import logging
 import socket
+import traceback
 from io import BytesIO
 from typing import List, TypedDict, Any
 from cbor2 import dumps, CBORDecoder
@@ -91,7 +92,8 @@ def run_recipe_load_and_visitor_handler(
             RemotingMessenger, decoder, RemotingMessenger._state
         )
     except Exception as e:
-        # logging.error(f"Failed to receive tree: {e}")
+        logging.error(f"Failed to receive tree: {e}")
+        logging.error(traceback.format_exc())
         respond_with_error(f"Failed to receive tree: {e}", sock)
         return
 
@@ -117,6 +119,8 @@ def run_recipe_load_and_visitor_handler(
         if RemotingMessenger._state is None:
             raise ValueError("RemotingMessenger.state cannot be None")
     except Exception as e:
+        logging.error(f"Failed to process input data with recipe: {e}")
+        logging.error(traceback.format_exc())
         respond_with_error(f"Failed to process input data with recipe: {e}", sock)
         return
 

{openrewrite_remote-0.21.0 → openrewrite_remote-0.21.1}/rewrite_remote/receiver.py

@@ -297,6 +297,10 @@ class DeserializationContext:
             assert field_name == "@c"
             concrete_type = decoder.decode()
 
+        # values
+        elif major_type == 3:
+            concrete_type = decoder.decode_string(subtype)
+
         if concrete_type:
             if concrete_type == "org.openrewrite.marker.SearchResult":
                 field_name = decoder.decode()
@@ -310,6 +314,27 @@ class DeserializationContext:
                 elif field_name == "id":
                     id_ = UUID(bytes=decoder.decode())
                 return SearchResult(id_, desc)
+            elif concrete_type == "org.openrewrite.FileAttributes":
+                map = decoder.read_cbor_map()
+                return FileAttributes(None, None, None, False, False, False, 0)
+            elif concrete_type == "java.lang.String":
+                return decoder.decode()
+            elif concrete_type == "java.lang.Boolean":
+                return decoder.decode()
+            elif concrete_type == "java.lang.Integer":
+                return decoder.decode()
+            elif concrete_type == "java.lang.Character":
+                return decoder.decode()[0]  # type: ignore
+            elif concrete_type == "java.lang.Long":
+                return decoder.decode()
+            elif concrete_type == "java.lang.Double":
+                return decoder.decode()
+            elif concrete_type == "java.lang.Float":
+                return decoder.decode()
+            elif concrete_type == "java.math.BigInteger":
+                return decoder.decode()
+            elif concrete_type == "java.math.BigDecimal":
+                return decoder.decode()
 
             if deser := self.value_deserializers.get(concrete_type):
                 return deser(concrete_type, decoder, self)
@@ -367,29 +392,6 @@ class DeserializationContext:
                 else expected_type.__name__
             )
 
-            if concrete_type == "org.openrewrite.FileAttributes":
-                map = decoder.read_cbor_map()
-                return FileAttributes(None, None, None, False, False, False, 0)
-
-            if concrete_type == "java.lang.String":
-                return decoder.decode()
-            if concrete_type == "java.lang.Boolean":
-                return decoder.decode()
-            if concrete_type == "java.lang.Integer":
-                return decoder.decode()
-            if concrete_type == "java.lang.Character":
-                return decoder.decode()[0]  # type: ignore
-            if concrete_type == "java.lang.Long":
-                return decoder.decode()
-            if concrete_type == "java.lang.Double":
-                return decoder.decode()
-            if concrete_type == "java.lang.Float":
-                return decoder.decode()
-            if concrete_type == "java.math.BigInteger":
-                return decoder.decode()
-            if concrete_type == "java.math.BigDecimal":
-                return decoder.decode()
-
             raise NotImplementedError(f"No deserialization implemented for: {concrete_type}")
 
         if state == cbor2.CborReaderState.ARRAY:

{openrewrite_remote-0.21.0 → openrewrite_remote-0.21.1}/rewrite_remote/remote_utils.py

@@ -283,7 +283,7 @@ def _decode_length(
 def decode_array_start(decoder: CBORDecoder) -> Optional[int]:
     initial_byte = decoder.read(1)[0]
     major_type = initial_byte >> 5
-    assert major_type == 4
+    assert major_type == 4, f"Expected major type 4, but got {major_type}"
     subtype = initial_byte & 31
     return _decode_length(decoder, subtype, allow_indefinite=True)
 

{openrewrite_remote-0.21.0 → openrewrite_remote-0.21.1}/rewrite_remote/sender.py

@@ -128,7 +128,7 @@ class SenderContext(Generic[T]):
         self.send_typed_value_internal(after_value, before_value)
 
     def send_list_event(self, after: Optional[List[V]], before: Optional[List[V]]) -> bool:
-        if after == before:
+        if after is before:
             evt = DiffEvent(EventType.NoChange, None, None)
         elif before is None:
             evt = DiffEvent(EventType.Add, None, len(after) if after is not None else 0)
@@ -241,10 +241,7 @@ class SenderContext(Generic[T]):
 
     @staticmethod
     def are_equal(after: Optional[V], before: Optional[V]) -> bool:
-        if after is None or before is None:
-            return after == before
-
-        return isinstance(after, (Tree, Markers)) or isinstance(before, (Tree, Markers))
+        return after is before
 
     def send_node_internal(
         self,
@@ -305,10 +302,11 @@ class SerializationContext:
             encoder.encode_none(None)
             return
 
-        for type_cls, serializer in self.value_serializers.items():
-            if isinstance(value, type_cls):
-                serializer(value, type_name, encoder, self)
-                return
+        if not isinstance(value, (UUID, int, float, bool, str, bytes)):
+            for type_cls, serializer in self.value_serializers.items():
+                if isinstance(value, type_cls):
+                    serializer(value, type_name, encoder, self)
+                    return
 
         DefaultValueSerializer().serialize(value, type_name, encoder, self)
 

{openrewrite_remote-0.21.0 → openrewrite_remote-0.21.1}/rewrite_remote/type_utils.py

@@ -50,6 +50,8 @@ def to_java_type_name(t: typing.Type[Any]) -> Optional[str]:
             return "org.openrewrite.java.tree.JRightPadded"
         if t.__name__ == "JContainer":
             return "org.openrewrite.java.tree.JContainer"
+        if t.__qualname__.startswith("JavaType"):
+            return "org.openrewrite.java.tree.JavaType$" + t.__name__
     if t.__module__.startswith("rewrite.java.markers"):
         return "org.openrewrite.java.marker." + t.__qualname__
     if t.__module__.startswith("rewrite.java.tree"):