openrewrite-remote 0.14.0__tar.gz → 0.16.0__tar.gz

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/PKG-INFO

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

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/openrewrite_remote.egg-info/PKG-INFO

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

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/pyproject.toml

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

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/rewrite_remote/handlers/list_projects_handler.py

@@ -4,11 +4,14 @@ from io import BytesIO
 from typing import List
 from cbor2 import dumps, CBORDecoder
 
-from rewrite_remote.handlers.project_helper import list_projects
+from rewrite_remote.handlers.project_helper import list_sub_projects
 from rewrite_remote.remote_utils import COMMAND_END
 from rewrite_remote.remoting import OK, RemotingContext, RemotingMessageType
 from rewrite_remote.handlers.handler_helpers import respond_with_error
 
+logger = logging.getLogger("list_projects_handler")
+logger.setLevel(logging.DEBUG)
+
 
 # Main command handler with the specified signature
 def list_projects_handler(
@@ -30,37 +33,32 @@ def list_projects_handler(
         return
 
     # 2. Log the request
-    logging.info(
-        f"""[Server] Handling install-recipe request: {{
+    logger.info(f"""Handling list-recipe request: {{
         root_project_file: {root_project_file},
-    }}"""
-    )
+    }}""")
 
     # 3. Find projects
-    projects = list_projects(root_project_file)
+    projects = list_sub_projects(root_project_file)
+
+    project_config_files: List[str] = [root_project_file]
 
-    # 4. Log the result
-    logging.info("[Server] Found %d project(s)", len(projects))
     for project in projects:
-        logging.info(
-            " %s root at %s using %s",
-            project.project_name,
-            project.project_root,
-            project.project_tool,
+        project_config_files.append(project.project_root + "/pyproject.toml")
+
+    # 4. Log the result
+    logger.info("Found %d project(s)", len(project_config_files))
+    for project in project_config_files:
+        logger.info(
+            "Found project: %s",
+            project,
         )
 
     # 5. Write response to stream
-    response: List[str] = []
-
-    for project in projects:
-        response.append(project.project_root)
-
-    # Encode the response using CBOR
     encoded_response = b""
     encoded_response += dumps(RemotingMessageType.Response)
     encoded_response += dumps(OK)
-    encoded_response += dumps(response)
+    encoded_response += dumps(project_config_files)
     encoded_response += COMMAND_END
     sock.sendall(encoded_response)
 
-    logging.info("[Server] Request completed.")
+    logger.info("Request completed.")

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/rewrite_remote/handlers/parse_project_sources_handler.py

@@ -6,7 +6,7 @@ from typing import TypedDict
 
 import cbor2
 
-from cbor2 import dumps, CBORDecoder
+from cbor2 import CBORDecoder
 
 from rewrite_remote.handlers.project_helper import (
     find_python_files,
@@ -23,6 +23,9 @@ from rewrite_remote.remoting import RemotingContext
 from rewrite_remote.handlers.handler_helpers import respond_with_error
 from rewrite_remote.remoting import RemotingMessenger
 
+logger = logging.getLogger("parse_project_sources_handler")
+logger.setLevel(logging.DEBUG)
+
 
 class ParseProjectSourcesArgs(TypedDict):
     project_file_path: str  # The path to the individual pyproject.toml
@@ -69,9 +72,9 @@ def parse_project_sources_handler(
         return
 
     # Log the request
-    logging.info(
-        "[Server] Handling parse-project-sources request: {"
-        "project_file_path: %s, root_project_file_path: %s, repository_dir: %s}",
+    logger.info(
+        "Handling parse-project-sources request: {\n"
+        "\tproject_file_path: %s,\n\t root_project_file_path: %s,\n\t repository_dir: %s\n}",
         project_file_path,
         root_project_file_path,
         repository_dir,
@@ -83,13 +86,16 @@ def parse_project_sources_handler(
     source_files = parse_python_sources(python_files)
 
     # Write the response
+    remoting_ctx.reset()
+    messenger = RemotingMessenger(remoting_ctx)
     response_stream = BytesIO()
     cbor2.dump(RemotingMessageType.Response, response_stream)
     cbor2.dump(OK, response_stream)
+    cbor2.dump(len(source_files), response_stream)
     for source_file in source_files:
-        logging.info("Sending ${source_file.source_path}")
-        RemotingMessenger.send_tree(remoting_ctx, response_stream, source_file, None)
+        logger.info("Sending %s", source_file.source_path)
+        messenger.send_tree(response_stream, source_file, None)
     cbor2.dump(COMMAND_END, response_stream)
     sock.sendall(response_stream.getvalue())
 
-    logging.info("[Server] Request completed.")
+    logger.info("Request completed.")

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/rewrite_remote/handlers/project_helper.py

@@ -8,7 +8,7 @@ from io import StringIO
 from rewrite.tree import SourceFile
 from rewrite.python.parser import PythonParserBuilder
 
-from rewrite import ParserInput, InMemoryExecutionContext
+from rewrite import ParserInput, InMemoryExecutionContext, ExecutionContext
 
 from dataclasses import dataclass
 
@@ -20,7 +20,7 @@ class Project:
     project_tool: str
 
 
-def list_projects(pyproject_path: str) -> list[Project]:
+def list_sub_projects(pyproject_path: str) -> list[Project]:
     """
     Parses the pyproject.toml file to identify sub projects in a monorepo and returns a list of Projects.
     """
@@ -35,10 +35,13 @@ def list_projects(pyproject_path: str) -> list[Project]:
 
     if is_poetry_project(data):
         sub_projects = find_sub_projects_in_poetry(data, pyproject_path)
+
     elif is_hatch_project(data):
         sub_projects = find_sub_projects_in_hatch(data, pyproject_path)
+
     elif is_uv_project(data):
         sub_projects = find_sub_projects_in_uv_sources(data, pyproject_path)
+
     else:
         sub_projects = find_sub_projects_in_project_dependencies(data, pyproject_path)
 
@@ -169,7 +172,7 @@ def find_sub_projects_in_project_dependencies(
     tomlData: dict[str, Any], toml_path: str
 ) -> list[Project]:
     """
-    Finds sub projects in a project dependencies by looking for dependencies with
+    Finds sub-projects in project dependencies by looking for dependencies with
     the @ file:///${PROJECT_ROOT}//${SUBPROJECT_PATH} format:
         [project]
         dependencies = [
@@ -178,16 +181,19 @@ def find_sub_projects_in_project_dependencies(
         ]
     """
     subProjects: list[Project] = []
-    for dep in tomlData["project"]["dependencies"]:
-        if isinstance(dep, str) and dep.find("@ file:///${PROJECT_ROOT}//"):
-            rel_path = dep.split("@ file:///${PROJECT_ROOT}//")[1]
-            subProjects.append(
-                Project(
-                    project_name=os.path.basename(dep),
-                    project_root=get_absolute_path(toml_path, rel_path),
-                    project_tool="project.dependencies",
+    for dep in tomlData.get("project", {}).get("dependencies", []):
+        if isinstance(dep, str) and "@ file:///${PROJECT_ROOT}//" in dep:
+            try:
+                rel_path = dep.split("@ file:///${PROJECT_ROOT}//", 1)[1]
+                subProjects.append(
+                    Project(
+                        project_name=os.path.basename(rel_path),
+                        project_root=get_absolute_path(toml_path, rel_path),
+                        project_tool="project.dependencies",
+                    )
                 )
-            )
+            except IndexError:
+                print(f"Warning: Unexpected dependency format: {dep}")
     return subProjects
 
 
@@ -222,7 +228,7 @@ def parse_python_sources(paths: List[str]) -> List[SourceFile]:
     """
     parser = PythonParserBuilder().build()
     ctx = InMemoryExecutionContext()
-
+    ctx.put_message(ExecutionContext.REQUIRE_PRINT_EQUALS_INPUT, False)
     iterable_source_files: Iterable[SourceFile] = parser.parse_inputs(
         [
             ParserInput(

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/rewrite_remote/handlers/recipe_install_handler.py

@@ -10,6 +10,9 @@ from rewrite_remote.handlers.handler_helpers import respond_with_error
 from rewrite_remote.handlers.pypi_manager import PyPiManager, Source
 from rewrite_remote.handlers.types import PackageSource
 
+logger = logging.getLogger("recipe_install_handler")
+logger.setLevel(logging.DEBUG)
+
 
 class RecipeInstallArgs(TypedDict):
     package_id: str
@@ -81,8 +84,8 @@ def recipe_install_handler(
         return
 
     # 2. Log the request
-    logging.info(
-        f"""[Server] Handling install-recipe request: {{
+    logger.info(
+        f"""Handling install-recipe request: {{
         packageId: {package_id},
         packageVersion: {package_version},
         packageSources: {package_sources},
@@ -117,13 +120,13 @@ def recipe_install_handler(
         return
 
     # 5. Log the result
-    logging.info(
-        "[Server] Found %d recipe(s) for package %s",
+    logger.info(
+        "Found %d recipe(s) for package %s",
         len(installable_recipes.recipes),
         package_id,
     )
     for recipe in installable_recipes.recipes:
-        logging.info("  Resolved recipe %s from %s", recipe, valid_source.source)
+        logger.info("  Resolved recipe %s from %s", recipe, valid_source.source)
 
     # 6. Write response to stream
     response = {
@@ -147,4 +150,4 @@ def recipe_install_handler(
     encoded_response += COMMAND_END
     sock.sendall(encoded_response)
 
-    logging.info("[Server] Request completed.")
+    logger.info("Request completed.")

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/rewrite_remote/handlers/run_recipe_load_and_visitor_handler.py

@@ -18,6 +18,9 @@ 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)
+
 
 class RunRecipeLoadAndVisitorArgs(TypedDict):
     recipe_name: str
@@ -68,8 +71,8 @@ def run_recipe_load_and_visitor_handler(
         return
 
     # Log the request
-    logging.info(
-        f"""[Server] 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},
@@ -128,4 +131,4 @@ def run_recipe_load_and_visitor_handler(
     encoded_response += COMMAND_END
     sock.sendall(encoded_response)
 
-    logging.info("[Server] Request completed.")
+    logger.info("Request completed.")

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/rewrite_remote/receiver.py

@@ -524,6 +524,7 @@ def _decode_length(
     else:
         raise CBORDecodeValueError(f"unknown unsigned integer subtype 0x{subtype:x}")
 
+
 class ParseErrorReceiver(Receiver):
     def fork(self, ctx):
         return ctx.fork(self.Visitor(), self.Factory())

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/rewrite_remote/server.py

@@ -1,7 +1,9 @@
 # type: ignore
 import importlib
 import importlib.resources
+import logging
 import os
+import select
 import socket
 import sys
 import time
@@ -10,21 +12,7 @@ import zipfile
 from io import BytesIO, StringIO
 
 import cbor2
-import select
 from cbor2 import dumps
-from rewrite import (
-    ParserInput,
-    InMemoryExecutionContext,
-    ExecutionContext,
-    ParseError,
-    Recipe,
-)
-from rewrite.java.remote import *
-from rewrite.python import Py
-from rewrite.python.parser import PythonParserBuilder
-from rewrite.python.remote.receiver import PythonReceiver
-from rewrite.python.remote.sender import PythonSender
-
 from rewrite_remote.handlers.hello_world_handler import hello_world_handler
 from rewrite_remote.handlers.list_projects_handler import list_projects_handler
 from rewrite_remote.handlers.parse_project_sources_handler import (
@@ -37,20 +25,41 @@ 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.receiver import ReceiverContext
 from rewrite_remote.remoting import (
     RemotePrinterFactory,
     RemotingContext,
     RemotingMessageType,
     RemotingMessenger,
 )
-from rewrite_remote.sender import ParseErrorSender, SenderContext
+from rewrite_remote.sender import ParseErrorSender
+
+from rewrite import (
+    ParserInput,
+    InMemoryExecutionContext,
+    ExecutionContext,
+    ParseError,
+    Recipe,
+)
+from rewrite.java.remote import *
+from rewrite.python import Py
+from rewrite.python.parser import PythonParserBuilder
+from rewrite.python.remote.receiver import PythonReceiver
+from rewrite.python.remote.sender import PythonSender
 
 INACTIVITY_TIMEOUT = 300  # 5 minutes
 _OK: int = 0
 _ERROR: int = 1
 
 
+# Configure logging
+logging.basicConfig(
+    level=logging.DEBUG,
+    format="%(asctime)s - %(levelname)s - %(message)s",
+)
+logger = logging.getLogger("server")
+logger.setLevel(logging.DEBUG)
+
+
 def register_remoting_factories() -> None:
     SenderContext.register(ParseError, ParseErrorSender)
     SenderContext.register(Py, PythonSender)
@@ -109,7 +118,7 @@ class Server:
             with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s:
                 s.bind(self._path)
                 s.listen()
-                print(f"Server listening on Unix domain socket: {self._path}")
+                logger.info(f"Server listening on Unix domain socket: {self._path}")
                 while True:
                     conn, _ = s.accept()
                     with conn:
@@ -119,7 +128,7 @@ class Server:
                 s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
                 s.bind(("localhost", self._port))
                 s.listen(5)
-                print(f"Server listening on port {self._port}")
+                logger.info(f"Server listening on port {self._port}")
                 last_activity_time = time.time()
                 while True:
                     s.settimeout(5)
@@ -132,7 +141,7 @@ class Server:
                     except socket.timeout:
                         current_time = time.time()
                         if current_time - last_activity_time >= self.timeout:
-                            print("No new connections for 5 minutes, shutting down server.")
+                            logger.info("No new connections for 5 minutes, shutting down server.")
                             break
 
     def handle_client(self, sock: socket.socket) -> None:
@@ -148,15 +157,11 @@ class Server:
                 assert cbor2.load(BytesIO(message_type)) == RemotingMessageType.Request
                 self._messenger.process_request(sock)
 
-                readable, _, _ = select.select([sock], [], [], 0.01)
-                if sock not in readable:
-                    return
-
         except (OSError, IOError):
-            # the socket was closed
+            logger.error("Socket was closed unexpectedly")
             return
         except Exception as e:
-            print(f"An error occurred while handling client: {e}")
+            logger.error(f"An error occurred while handling client: {e}")
             traceback.print_exc()
             if sock.fileno() != -1:
                 try:
@@ -165,12 +170,12 @@ class Server:
                     sock.send(dumps(_ERROR))
                     sock.send(dumps(traceback.format_exc()))
                 except (OSError, IOError):
-                    # the socket was closed
+                    logger.error("Failed to send error response, socket was closed")
                     return
                 except Exception as inner_exception:
-                    print(inner_exception)
-        finally:
-            sock.close()
+                    logger.error(
+                        f"An error occurred while sending error response: {inner_exception}"
+                    )
 
     def parse_python_source(
         self,

{openrewrite_remote-0.14.0 → openrewrite_remote-0.16.0}/rewrite_remote/type_utils.py

@@ -108,6 +108,6 @@ def __convert_snake_to_camel(field_name: str) -> str:
 
 def get_type(type_name: str) -> Type[Any]:
     # `type_name` will look like `org.openrewrite.java.tree.J$CompilationUnit`
-    parts = type_name.split('.')
-    module = importlib.import_module('rewrite.' + parts[2])
-    return getattr(module, parts[-1].split('$')[1])
+    parts = type_name.split(".")
+    module = importlib.import_module("rewrite." + parts[2])
+    return getattr(module, parts[-1].split("$")[1])