openrewrite-remote 0.15.0__py3-none-any.whl → 0.17.0__py3-none-any.whl

{openrewrite_remote-0.15.0.dist-info → openrewrite_remote-0.17.0.dist-info}/METADATA

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

{openrewrite_remote-0.15.0.dist-info → openrewrite_remote-0.17.0.dist-info}/RECORD

@@ -1,24 +1,24 @@
 rewrite_remote/__init__.py,sha256=gl4Dpp7mYIrfNgeyh2IeW2fsj9ep9pveAK_eeoDLu7c,278
 rewrite_remote/client.py,sha256=95ZCAtVOngF0ZqqKnOsrweUeGKruf3UKGPXNGTrNyy0,1853
 rewrite_remote/event.py,sha256=texLJD1mcFkpBpiXAa-Rmip0Tgqm2OlBpRPHFZyWcBs,359
-rewrite_remote/receiver.py,sha256=b2jMNwTfnWM0oDNjJQSWV1z_ahJ0kDZEXYdwNc4riIw,20743
+rewrite_remote/receiver.py,sha256=XgRhhOBW_77lV34nHkWbrdojajLfWfX38NdzuKJDj8A,20744
 rewrite_remote/remote_utils.py,sha256=gU9hN-aHxy9NF4uRqjd4OhvgPrNfDyCt3y1PtrWMCgA,10677
 rewrite_remote/remoting.py,sha256=yS2sYMPPBq0gt1xalmCTLbH4VXbBqNl-EXj8ZfgA5UM,13525
 rewrite_remote/sender.py,sha256=PXX0hrmeHKEge_7qWEMqNn4KYleDrFUQqhBDWTq1pus,18993
-rewrite_remote/server.py,sha256=0-Y0e2eoXZctVELWK0M1VfsV8pPGFxwmzAL35dWb47E,9576
-rewrite_remote/type_utils.py,sha256=qzQ2X97U8yRskjOo3F5qcFVebW2bPYFU32EpCKL-KNU,4400
+rewrite_remote/server.py,sha256=gzouNamoxR_RHh8uxAPZ-q07Wfv4h3yhygH2U9BDp7M,9623
+rewrite_remote/type_utils.py,sha256=MHfEhbtpvN1jXNG_l2X4jTBVJZsbkmbaJIZEOHpeMTA,4400
 rewrite_remote/handlers/__init__.py,sha256=ED6jHcYiuYpr_0vjGz0zx2lrrmJT9sDJCzIljoDfmlM,65
 rewrite_remote/handlers/handler_helpers.py,sha256=xvAKAVGH56Hrjp9sbilp4v1a2_ra0L63YjXurF5K5o0,512
 rewrite_remote/handlers/hello_world_handler.py,sha256=HLVukS16-PRRidlnfABT6ETXURhQYIJnTSb09PJnDek,1284
-rewrite_remote/handlers/list_projects_handler.py,sha256=ukkCST7whpCxQ0omCWWw9W27Su3rFSnnEIhAS6T4iOU,2007
-rewrite_remote/handlers/parse_project_sources_handler.py,sha256=mn7LVW7yu3SFFDdZlTU4i65wFhQxhkA7ttSqSs3s7Vk,2997
-rewrite_remote/handlers/project_helper.py,sha256=wEohTWukfcDCNlSran1cuedg9CGeVdbhiHRD2wwpAwk,8445
+rewrite_remote/handlers/list_projects_handler.py,sha256=MBCCWc6h8FX8fVxtMHbPo4bNxU2TVgcPRzfLZJrVC3k,2024
+rewrite_remote/handlers/parse_project_sources_handler.py,sha256=VeRmBrQKtWuOLdDT1CDku9xa998nl-c1RDQCAAJPipM,3153
+rewrite_remote/handlers/project_helper.py,sha256=La2lQnS158PevXE1z2Jnx_RNQwQtioelthzdNEJnIew,8711
 rewrite_remote/handlers/pypi_manager.py,sha256=XulTdZUm5aTme7Qn-jaUvlgO6N9bKS03UUQtbxv9kYE,10247
-rewrite_remote/handlers/recipe_install_handler.py,sha256=SsY7oXEJqE3mKUM_msnV0i-aUXmeUWpYjq_121ui3Z8,4920
-rewrite_remote/handlers/run_recipe_load_and_visitor_handler.py,sha256=BmsKjV38LenewWvun8cknGk_oR3GoinmmsXtWKUWUak,4085
+rewrite_remote/handlers/recipe_install_handler.py,sha256=dUS50wzSUGbeET4VMOwjPyfB883MfF7QsN5Lhf71ylk,4974
+rewrite_remote/handlers/run_recipe_load_and_visitor_handler.py,sha256=uF08S7ug1ZeXde6RjPlitjEUFKj7ijN9Agnsv0tZ8u4,4163
 rewrite_remote/handlers/types.py,sha256=5TK_oFp-7iy1iACWisuQJsa_WHTsqcPrV9nQTZ-_xgo,518
-openrewrite_remote-0.15.0.dist-info/METADATA,sha256=N19AOSrTQ4rSurzMUOfn4YBg0caA-a5fNMRPzy9H0VI,386
-openrewrite_remote-0.15.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-openrewrite_remote-0.15.0.dist-info/entry_points.txt,sha256=SMukuF7TPjQr3IZIcH8f98-_QBCqYSbYXYrVv-5UzRI,69
-openrewrite_remote-0.15.0.dist-info/top_level.txt,sha256=ansTioSZ-62aH3F2L3d1Bua0pJF4GOtgQ1PpG-CzcP0,15
-openrewrite_remote-0.15.0.dist-info/RECORD,,
+openrewrite_remote-0.17.0.dist-info/METADATA,sha256=_qD0swgTb_KGT-FthuTEz7fMA7Blsli1aGXhxDa8sN0,386
+openrewrite_remote-0.17.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+openrewrite_remote-0.17.0.dist-info/entry_points.txt,sha256=SMukuF7TPjQr3IZIcH8f98-_QBCqYSbYXYrVv-5UzRI,69
+openrewrite_remote-0.17.0.dist-info/top_level.txt,sha256=ansTioSZ-62aH3F2L3d1Bua0pJF4GOtgQ1PpG-CzcP0,15
+openrewrite_remote-0.17.0.dist-info/RECORD,,

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.")

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,15 @@ def parse_project_sources_handler(
     source_files = parse_python_sources(python_files)
 
     # Write the response
+    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.")

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(

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.")

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.")

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())

rewrite_remote/server.py

@@ -54,11 +54,12 @@ _ERROR: int = 1
 # Configure logging
 logging.basicConfig(
     level=logging.DEBUG,
-    format='%(asctime)s - %(levelname)s - %(message)s',
+    format="%(asctime)s - %(levelname)s - %(message)s",
 )
-logger = logging.getLogger('server')
+logger = logging.getLogger("server")
 logger.setLevel(logging.DEBUG)
 
+
 def register_remoting_factories() -> None:
     SenderContext.register(ParseError, ParseErrorSender)
     SenderContext.register(Py, PythonSender)
@@ -172,7 +173,9 @@ class Server:
                     logger.error("Failed to send error response, socket was closed")
                     return
                 except Exception as inner_exception:
-                    logger.error(f"An error occurred while sending error response: {inner_exception}")
+                    logger.error(
+                        f"An error occurred while sending error response: {inner_exception}"
+                    )
 
     def parse_python_source(
         self,

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])