openrewrite-remote 0.18.1__tar.gz → 0.18.2__tar.gz

{openrewrite_remote-0.18.1 → openrewrite_remote-0.18.2}/PKG-INFO

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

{openrewrite_remote-0.18.1 → openrewrite_remote-0.18.2}/openrewrite_remote.egg-info/PKG-INFO

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

{openrewrite_remote-0.18.1 → openrewrite_remote-0.18.2}/openrewrite_remote.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ rewrite_remote/handlers/handler_helpers.py
 rewrite_remote/handlers/hello_world_handler.py
 rewrite_remote/handlers/list_projects_handler.py
 rewrite_remote/handlers/parse_project_sources_handler.py
+rewrite_remote/handlers/parse_source_handler.py
 rewrite_remote/handlers/project_helper.py
 rewrite_remote/handlers/pypi_manager.py
 rewrite_remote/handlers/recipe_install_handler.py

{openrewrite_remote-0.18.1 → openrewrite_remote-0.18.2}/pyproject.toml

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

{openrewrite_remote-0.18.1 → openrewrite_remote-0.18.2}/rewrite_remote/handlers/list_projects_handler.py

@@ -54,11 +54,11 @@ def list_projects_handler(
         )
 
     # 5. Write response to stream
-    encoded_response = b""
-    encoded_response += dumps(RemotingMessageType.Response)
-    encoded_response += dumps(OK)
-    encoded_response += dumps(project_config_files)
-    encoded_response += COMMAND_END
-    sock.sendall(encoded_response)
+    response_data = BytesIO()
+    response_data.write(dumps(RemotingMessageType.Response))
+    response_data.write(dumps(OK))
+    response_data.write(dumps(project_config_files))
+    response_data.write(COMMAND_END)
+    sock.sendall(response_data.getvalue())
 
     logger.info("Request completed.")

openrewrite_remote-0.18.2/rewrite_remote/handlers/parse_source_handler.py

@@ -0,0 +1,49 @@
+import logging
+import socket
+from io import BytesIO, StringIO
+from pathlib import Path
+
+import cbor2
+from rewrite import (
+    ExecutionContext,
+    InMemoryExecutionContext,
+    ParserInput,
+)
+from rewrite.python.parser import PythonParserBuilder
+
+from rewrite_remote.remote_utils import COMMAND_END
+from rewrite_remote.remoting import (
+    OK,
+    RemotingContext,
+    RemotingMessageType,
+)
+
+logger = logging.getLogger("parse_source_handler")
+logger.setLevel(logging.DEBUG)
+
+
+def parse_source_handler(
+    stream: BytesIO, sock: socket.socket, remoting_ctx: RemotingContext
+) -> None:
+    remoting_ctx.reset()
+
+    # Read input from stream
+    parser = PythonParserBuilder().build()
+    source = cbor2.load(stream)
+    ctx = InMemoryExecutionContext()
+    ctx.put_message(ExecutionContext.REQUIRE_PRINT_EQUALS_INPUT, False)
+    for cu in parser.parse_inputs(
+        [ParserInput(Path("source.py"), None, True, lambda: StringIO(source))],
+        None,
+        ctx,
+    ):
+        response_stream = BytesIO()
+        cbor2.dump(RemotingMessageType.Response, response_stream)
+        cbor2.dump(OK, response_stream)
+        source_stream = BytesIO()
+        remoting_ctx.new_sender_context(source_stream).send_any_tree(cu, None)
+        cbor2.dump(source_stream.getvalue(), response_stream)
+        cbor2.dump(COMMAND_END, response_stream)
+        sock.sendall(response_stream.getvalue())
+
+    logger.info("Request completed.")

{openrewrite_remote-0.18.1 → openrewrite_remote-0.18.2}/rewrite_remote/handlers/recipe_install_handler.py

@@ -84,14 +84,12 @@ def recipe_install_handler(
         return
 
     # 2. Log the request
-    logger.info(
-        f"""Handling install-recipe request: {{
+    logger.info(f"""Handling install-recipe request: {{
         packageId: {package_id},
         packageVersion: {package_version},
         packageSources: {package_sources},
         includeDefaultRepository: {include_default_repository},
-    }}"""
-    )
+    }}""")
 
     # 3. Validate sources
     sources: List[Source] = [
@@ -143,11 +141,12 @@ def recipe_install_handler(
     }
 
     # Encode the response using CBOR
-    encoded_response = b""
-    encoded_response += dumps(RemotingMessageType.Response)
-    encoded_response += dumps(OK)
-    encoded_response += dumps(response)
-    encoded_response += COMMAND_END
-    sock.sendall(encoded_response)
+    response_data = BytesIO()
+    response_data.write(dumps(RemotingMessageType.Response))
+    response_data.write(dumps(OK))
+    response_data.write(dumps(response))
+    response_data.write(COMMAND_END)
+
+    sock.sendall(response_data.getvalue())
 
     logger.info("Request completed.")

{openrewrite_remote-0.18.1 → openrewrite_remote-0.18.2}/rewrite_remote/handlers/run_recipe_load_and_visitor_handler.py

@@ -18,6 +18,7 @@ from rewrite_remote.handlers.handler_helpers import respond_with_error
 
 from rewrite import InMemoryExecutionContext
 
+
 logger = logging.getLogger("run_recipe_load_and_visitor_handler")
 logger.setLevel(logging.DEBUG)
 
@@ -71,13 +72,11 @@ def run_recipe_load_and_visitor_handler(
         return
 
     # Log the request
-    logger.info(
-        f"""Handling run-recipe-load-and-visitor request: {{
+    logger.info(f"""Handling run-recipe-load-and-visitor request: {{
         recipe_name: {recipe_name},
         recipe_source: {recipe_source},
         recipe_options: {recipe_options},
-    }}"""
-    )
+    }}""")
 
     # Receive the tree
     if not hasattr(RemotingMessenger, "_state"):
@@ -89,7 +88,7 @@ def run_recipe_load_and_visitor_handler(
     received = None
     try:
         received = RemotingMessenger.receive_tree(
-            RemotingMessenger, stream, RemotingMessenger._state
+            RemotingMessenger, decoder, RemotingMessenger._state
         )
     except Exception as e:
         # logging.error(f"Failed to receive tree: {e}")
@@ -123,12 +122,17 @@ def run_recipe_load_and_visitor_handler(
 
     # 5. Write the response
     response_encoder = BytesIO()
-    RemotingMessenger.send_tree(remoting_ctx, response_encoder, RemotingMessenger._state, received)
+    RemotingMessenger.send_tree(
+        RemotingMessenger, response_encoder, RemotingMessenger._state, received
+    )
+
+    response_data = BytesIO()
+    response_data.write(dumps(RemotingMessageType.Response))
+    response_data.write(dumps(OK))
+
+    response_data.write(response_encoder.getvalue())
 
-    encoded_response = b""
-    encoded_response += dumps(RemotingMessageType.Response)
-    encoded_response += dumps(OK)
-    encoded_response += COMMAND_END
-    sock.sendall(encoded_response)
+    response_data.write(COMMAND_END)
 
+    sock.sendall(response_data.getvalue())
     logger.info("Request completed.")

{openrewrite_remote-0.18.1 → openrewrite_remote-0.18.2}/rewrite_remote/server.py

@@ -3,7 +3,6 @@ import importlib
 import importlib.resources
 import logging
 import os
-import select
 import socket
 import sys
 import time
@@ -25,6 +24,12 @@ from rewrite_remote.handlers.recipe_install_handler import (
 from rewrite_remote.handlers.run_recipe_load_and_visitor_handler import (
     run_recipe_load_and_visitor_handler,
 )
+
+from rewrite_remote.handlers.parse_source_handler import (
+    parse_source_handler,
+)
+
+from rewrite_remote.remote_utils import COMMAND_END
 from rewrite_remote.remoting import (
     RemotePrinterFactory,
     RemotingContext,
@@ -102,6 +107,8 @@ class Server:
             {
                 "parse-python-source": self.parse_python_source,
                 "parse-python-file": self.parse_python_file,
+                "parse-source": parse_source_handler,
+                "parse-file": self.parse_python_file,
                 "hello-world": hello_world_handler,
                 "recipe-install": recipe_install_handler,
                 "run-recipe-load-and-visitor": run_recipe_load_and_visitor_handler,
@@ -202,6 +209,7 @@ class Server:
             source_stream = BytesIO()
             remoting_ctx.new_sender_context(source_stream).send_any_tree(cu, None)
             cbor2.dump(source_stream.getvalue(), response_stream)
+            cbor2.dump(COMMAND_END, response_stream)
             sock.sendall(response_stream.getvalue())
 
     def parse_python_file(
@@ -236,6 +244,7 @@ class Server:
             source_stream = BytesIO()
             remoting_ctx.new_sender_context(source_stream).send_any_tree(cu, None)
             cbor2.dump(source_stream.getvalue(), response_stream)
+            cbor2.dump(COMMAND_END, response_stream)
             sock.sendall(response_stream.getvalue())