openrewrite-remote 0.4.8__tar.gz → 0.5.1__tar.gz

{openrewrite_remote-0.4.8 → openrewrite_remote-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openrewrite-remote
-Version: 0.4.8
+Version: 0.5.1
 Summary: Remoting functionality for the OpenRewrite library.
 License: Apache-2.0
 Author: Moderne Inc.

{openrewrite_remote-0.4.8 → openrewrite_remote-0.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openrewrite-remote"
-version = "0.4.8"  # This will be replaced by the GitHub Actions workflow
+version = "0.5.1"  # This will be replaced by the GitHub Actions workflow
 description = "Remoting functionality for the OpenRewrite library."
 authors = ["Moderne Inc. <support@moderne.io>"]
 license = "Apache-2.0"

{openrewrite_remote-0.4.8 → openrewrite_remote-0.5.1}/rewrite/remote/remoting.py

@@ -2,20 +2,20 @@ from __future__ import absolute_import
 
 import socket
 import threading
+import traceback
 from dataclasses import dataclass
 from io import BytesIO
 from threading import Lock
-from typing import Any, Dict, Optional, Type, List, Tuple, Callable, cast
+from typing import Any, Dict, Optional, Type, List, Tuple, Callable, cast, Union, BinaryIO
 
 import cbor2
 from cbor2 import dumps, loads, load
-from rewrite.execution import DelegatingExecutionContext
-from rewrite.tree import PrintOutputCapture, P
-from rewrite.visitor import T
-
 from rewrite import Recipe, InMemoryExecutionContext, Cursor, PrinterFactory, TreeVisitor, Tree
+from rewrite.execution import DelegatingExecutionContext
 from rewrite.remote import ValueSerializer, ValueDeserializer, SenderContext, ReceiverContext, JsonSender, JsonReceiver, \
     SerializationContext, DeserializationContext, remote_utils
+from rewrite.tree import PrintOutputCapture, P
+from rewrite.visitor import T
 
 
 class RemotingContext:
@@ -135,21 +135,26 @@ class RemotingMessenger:
         stream = remote_utils.read_to_command_end(sock)
         command = cbor2.load(stream)
 
-        if command == "hello":
-            self.handle_hello_command(stream, sock)
-        elif command == "reset":
-            self.handle_reset_command(stream, sock)
-        elif command == "load-recipe":
-            self.handle_load_recipe_command(stream, sock)
-        elif command == "run-recipe-visitor":
-            self.handle_run_recipe_visitor_command(stream, sock)
-        elif command == "print":
-            self.handle_print_command(stream, sock)
-        else:
-            if command in self._additional_handlers:
-                self._additional_handlers[command](stream, sock, self._context)
+        try:
+            if command == "hello":
+                self.handle_hello_command(stream, sock)
+            elif command == "reset":
+                self.handle_reset_command(stream, sock)
+            elif command == "load-recipe":
+                self.handle_load_recipe_command(stream, sock)
+            elif command == "run-recipe-visitor":
+                self.handle_run_recipe_visitor_command(stream, sock)
+            elif command == "print":
+                self.handle_print_command(stream, sock)
             else:
-                raise NotImplementedError(f"Unsupported command: {command}")
+                if command in self._additional_handlers:
+                    self._additional_handlers[command](stream, sock, self._context)
+                else:
+                    raise NotImplementedError(f"Unsupported command: {command}")
+        except:
+            traceback.print_exc()
+        finally:
+            self.send_end_message(sock)
 
         return True
 
@@ -185,26 +190,20 @@ class RemotingMessenger:
     def handle_run_recipe_visitor_command(self, stream: BytesIO, sock: socket.socket):
         recipe_index = cbor2.load(stream)
         recipe = self._recipes[recipe_index]
+        received = self.receive_tree(sock, self._state)
 
-        output_stream = BytesIO()
-
-        receiver_context = self._context.new_receiver_context(stream)
-        received = receiver_context.receive_tree(self._state)
         ctx = InMemoryExecutionContext()
         RemotingExecutionContextView.view(ctx).remoting_context = self._context
         self._state = recipe.get_visitor().visit(received, ctx)
-        sender_context = self._context.new_sender_context(output_stream)
-        sender_context.send_any_tree(self._state, received)
 
         response_stream = BytesIO()
         cbor2.dump(RemotingMessageType.Response, response_stream)
         cbor2.dump(OK, response_stream)
-        response_stream.write(output_stream.getvalue())
+        self.send_tree(response_stream, self._state, received)
         sock.sendall(response_stream.getvalue())
 
     def handle_print_command(self, stream: BytesIO, sock: socket.socket):
-        receiver_context = self._context.new_receiver_context(stream)
-        received = receiver_context.receive_any_tree(None)
+        received = self.receive_tree(sock, None)
         root_cursor = Cursor(None, Cursor.ROOT_VALUE)
         ctx = InMemoryExecutionContext()
         RemotingExecutionContextView.view(ctx).remoting_context = self._context
@@ -224,7 +223,7 @@ class RemotingMessenger:
             sock.sendall(dumps(arg))
         self.send_end_message(sock)
 
-    def send_request_stream(self, sock: socket.socket, command: str, *args):
+    def __send_request_stream(self, sock: socket.socket, command: str, *args):
         sock.sendall(dumps(RemotingMessageType.Request))
         sock.sendall(dumps(command))
         for arg in args:
@@ -236,8 +235,8 @@ class RemotingMessenger:
         sock.sendall(b'\x81\x17')
 
     def send_print_request(self, sock: socket.socket, cursor: Cursor):
-        self.send_request_stream(sock, "print",
-                                 lambda s: self.send_tree(s, cast(Tree, cursor.value)))
+        self.__send_request_stream(sock, "print",
+                                   lambda s: self.send_tree(s, cast(Tree, cursor.value)))
         if self.recv_byte(sock) != RemotingMessageType.Response:
             raise ValueError("Unexpected message type.")
         if self.recv_byte(sock) != 0:
@@ -247,17 +246,21 @@ class RemotingMessenger:
         # end = load(data)  # end
         return print_msg
 
-    def send_tree(self, sock: socket.socket, tree: Tree):
+    def send_tree(self, sock: Union[BinaryIO, socket.socket], after: Tree, before: Optional[Tree] = None):
         b = BytesIO()
-        self._context.new_sender_context(b).send_any_tree(tree, None)
-        sock.sendall(b.getvalue())
+        self._context.new_sender_context(b).send_any_tree(after, before)
+        sock.sendall(dumps(b.getvalue()))
+
+    def receive_tree(self, data: Union[BinaryIO, socket.socket], before: Optional[Tree] = None):
+        receiver_context = self._context.new_receiver_context(cbor2.load(data))
+        return receiver_context.receive_any_tree(before)
 
     def send_run_recipe_request(self, sock: socket.socket, recipe, options: dict, source_files: list):
-        self.send_request_stream(sock, "run-recipe", lambda s: (
+        self.__send_request_stream(sock, "run-recipe", lambda s: (
             sock.sendall(dumps(recipe)),
             sock.sendall(dumps(options)),
             sock.sendall(dumps(len(source_files))),
-            *[self._context.new_sender_context(s).send_any_tree(sf, None) for sf in source_files]
+            *[self.send_tree(sock, sf, None) for sf in source_files]
         ))
         while self.recv_byte(sock) == RemotingMessageType.Request:
             self.process_request(sock)
@@ -266,8 +269,7 @@ class RemotingMessenger:
         if self.recv_byte(sock) != 0:
             raise ValueError(f"Remote recipe run failed: {loads(self.recv_all(sock))}")
         input_stream = remote_utils.read_to_command_end(sock)
-        receiver_context = self._context.new_receiver_context(input_stream)
-        updated = [receiver_context.receive_any_tree(sf) for sf in source_files]
+        updated = [self.receive_tree(input_stream, sf) for sf in source_files]
         loads(input_stream)  # end
         return updated
 

{openrewrite_remote-0.4.8 → openrewrite_remote-0.5.1}/rewrite/remote/sender.py

@@ -390,6 +390,8 @@ class DefaultValueSerializer(ValueSerializer):
         elif isinstance(value, bytes):
             # FIXME verify that this can be deserialized
             encoder.encode(value)
+        elif isinstance(value, complex):
+            encoder.encode(str(value))
         else:
             ValueSerializer.write_object_using_reflection(value, type_name, False, encoder, context)
 

{openrewrite_remote-0.4.8 → openrewrite_remote-0.5.1}/rewrite/remote/server.py

@@ -141,7 +141,9 @@ class Server:
             response_stream = BytesIO()
             cbor2.dump(RemotingMessageType.Response, response_stream)
             cbor2.dump(OK, response_stream)
-            remoting_ctx.new_sender_context(response_stream).send_any_tree(cu, None)
+            source_stream = BytesIO()
+            remoting_ctx.new_sender_context(source_stream).send_any_tree(cu, None)
+            cbor2.dump(source_stream.getvalue(), response_stream)
             sock.sendall(response_stream.getvalue())
 
     def parse_python_file(self, stream: BytesIO, sock: socket.socket, remoting_ctx: RemotingContext):
@@ -155,7 +157,9 @@ class Server:
             response_stream = BytesIO()
             cbor2.dump(RemotingMessageType.Response, response_stream)
             cbor2.dump(OK, response_stream)
-            remoting_ctx.new_sender_context(response_stream).send_any_tree(cu, None)
+            source_stream = BytesIO()
+            remoting_ctx.new_sender_context(source_stream).send_any_tree(cu, None)
+            cbor2.dump(source_stream.getvalue(), response_stream)
             sock.sendall(response_stream.getvalue())
 
 

{openrewrite_remote-0.4.8 → openrewrite_remote-0.5.1}/rewrite/remote/type_utils.py

@@ -9,12 +9,14 @@ def to_java_type_name_from_value(v: Any) -> str:
         return 'java.lang.Boolean'
     elif isinstance(v, int):
         bit_length = v.bit_length()
-        if  -2_147_483_648 <= v <= 2_147_483_647:
+        if  bit_length < 32:
             return 'java.lang.Integer'
-        elif -9223372036854775808 <= v <= 9223372036854775807:
+        elif bit_length < 64:
             return 'java.lang.Long'
         else:
-            return 'java.lang.BigInteger'
+            return 'java.math.BigInteger'
+    elif isinstance(v, complex):
+        return 'java.lang.String'
     return to_java_type_name(type(v))