openrewrite-remote 0.13.5__py3-none-any.whl → 0.14.0__py3-none-any.whl

{openrewrite_remote-0.13.5.dist-info → openrewrite_remote-0.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openrewrite-remote
-Version: 0.13.5
+Version: 0.14.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.dist-info/RECORD

@@ -0,0 +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/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=TQ1cK6eAiJgY0ZAGl4huu5urI2Cm9DJpl-k8Is-IM1M,9466
+rewrite_remote/type_utils.py,sha256=qzQ2X97U8yRskjOo3F5qcFVebW2bPYFU32EpCKL-KNU,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/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/types.py,sha256=5TK_oFp-7iy1iACWisuQJsa_WHTsqcPrV9nQTZ-_xgo,518
+openrewrite_remote-0.14.0.dist-info/METADATA,sha256=ydjRf-SRkjLYHaWICk1zDeKw8gKDhL11Y_hm_kB29AM,386
+openrewrite_remote-0.14.0.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+openrewrite_remote-0.14.0.dist-info/entry_points.txt,sha256=SMukuF7TPjQr3IZIcH8f98-_QBCqYSbYXYrVv-5UzRI,69
+openrewrite_remote-0.14.0.dist-info/top_level.txt,sha256=ansTioSZ-62aH3F2L3d1Bua0pJF4GOtgQ1PpG-CzcP0,15
+openrewrite_remote-0.14.0.dist-info/RECORD,,

{openrewrite_remote-0.13.5.dist-info → openrewrite_remote-0.14.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.7.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

rewrite_remote/handlers/hello_world_handler.py

@@ -18,9 +18,8 @@ def hello_world_handler(
         request = cbor2.load(stream)
 
         if request != "hello":
-            raise ValueError(f"Unexpected request: {request}")
-        else:
             print("Did not receive 'hello' ")
+            raise ValueError(f"Unexpected request: {request}")
 
         # Prepare a response
         response_stream = BytesIO()

rewrite_remote/handlers/parse_project_sources_handler.py

@@ -0,0 +1,95 @@
+import logging
+import os
+import socket
+from io import BytesIO
+from typing import TypedDict
+
+import cbor2
+
+from cbor2 import dumps, CBORDecoder
+
+from rewrite_remote.handlers.project_helper import (
+    find_python_files,
+    parse_python_sources,
+)
+
+from rewrite_remote.remoting import (
+    OK,
+    RemotingMessageType,
+)
+
+from rewrite_remote.remote_utils import COMMAND_END
+from rewrite_remote.remoting import RemotingContext
+from rewrite_remote.handlers.handler_helpers import respond_with_error
+from rewrite_remote.remoting import RemotingMessenger
+
+
+class ParseProjectSourcesArgs(TypedDict):
+    project_file_path: str  # The path to the individual pyproject.toml
+    root_project_file_path: str  #  The path to the root pyproject.toml
+    repository_dir: str  # The path to the root repository directory
+
+
+def decode_parse_project_sources_args(
+    decoder: CBORDecoder,
+) -> ParseProjectSourcesArgs:
+    """
+    Decodes the arguments (order matters and must match the order encoded)
+    """
+    project_file_path = str(decoder.decode())
+    root_project_file_path = str(decoder.decode())
+    repository_dir = str(decoder.decode())
+
+    return {
+        "project_file_path": project_file_path,
+        "root_project_file_path": root_project_file_path,
+        "repository_dir": repository_dir,
+    }
+
+
+def parse_project_sources_handler(
+    stream: BytesIO, sock: socket.socket, remoting_ctx: RemotingContext
+) -> None:
+    remoting_ctx.reset()
+
+    # Read input from stream
+    try:
+        data = stream.read()
+        decoder = CBORDecoder(BytesIO(data))
+        args = decode_parse_project_sources_args(decoder)
+        project_file_path = args.get("project_file_path")
+        root_project_file_path = args.get("root_project_file_path")
+        repository_dir = args.get("repository_dir")
+    except Exception as e:  # pylint: disable=broad-except
+        respond_with_error(f"Failed to decode arguments: {e}", sock)
+        return
+
+    if project_file_path is None:
+        respond_with_error("recipe_name is required", sock)
+        return
+
+    # Log the request
+    logging.info(
+        "[Server] Handling parse-project-sources request: {"
+        "project_file_path: %s, root_project_file_path: %s, repository_dir: %s}",
+        project_file_path,
+        root_project_file_path,
+        repository_dir,
+    )
+
+    # Find all python files in the project
+    base_dir = os.path.dirname(project_file_path)
+    python_files = find_python_files(base_dir)
+    source_files = parse_python_sources(python_files)
+
+    # Write the response
+    response_stream = BytesIO()
+    cbor2.dump(RemotingMessageType.Response, response_stream)
+    cbor2.dump(OK, 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)
+    cbor2.dump(COMMAND_END, response_stream)
+    sock.sendall(response_stream.getvalue())
+
+    logging.info("[Server] Request completed.")

rewrite_remote/handlers/project_helper.py

@@ -1,7 +1,14 @@
 import os
 import glob
 import toml
-from typing import Any
+from typing import Any, List, Iterable
+from pathlib import Path
+from io import StringIO
+
+from rewrite.tree import SourceFile
+from rewrite.python.parser import PythonParserBuilder
+
+from rewrite import ParserInput, InMemoryExecutionContext
 
 from dataclasses import dataclass
 
@@ -187,3 +194,47 @@ def find_sub_projects_in_project_dependencies(
 def get_absolute_path(path_to_root_toml: str, path_to_sub_project: str) -> str:
     path_to_root = os.path.dirname(path_to_root_toml)
     return os.path.abspath(os.path.join(path_to_root, path_to_sub_project))
+
+
+def find_python_files(base_dir: str) -> List[str]:
+    """
+    Find all python files in the given directory and its subdirectories
+    """
+    python_files = []
+    for root, dirs, files in os.walk(base_dir):
+        for file in files:
+            if file.endswith(".py"):
+                python_files.append(os.path.join(root, file))
+    return python_files
+
+
+def read_file_contents(path: str) -> StringIO:
+    """
+    Read the contents of the file at the given path
+    """
+    with open(path, "r", newline="", encoding="utf-8") as file:
+        return StringIO(file.read())
+
+
+def parse_python_sources(paths: List[str]) -> List[SourceFile]:
+    """
+    Parse the given python files and return a list of SourceFile objects
+    """
+    parser = PythonParserBuilder().build()
+    ctx = InMemoryExecutionContext()
+
+    iterable_source_files: Iterable[SourceFile] = parser.parse_inputs(
+        [
+            ParserInput(
+                Path(path),
+                None,
+                True,
+                lambda: read_file_contents(path),
+            )
+            for path in paths
+        ],
+        None,
+        ctx,
+    )
+
+    return list(iterable_source_files)

rewrite_remote/handlers/pypi_manager.py

@@ -221,7 +221,7 @@ class PyPiManager:
         module_name = module_name.replace("-", "_")
 
         try:
-            site.main(); # We want the recently installed module to be available to introspection
+            site.main()  # We want the recently installed module to be available to introspection
             module = importlib.import_module(module_name)
             submodules = [name for _, name, _ in pkgutil.iter_modules(module.__path__)]
 

rewrite_remote/receiver.py

@@ -1,6 +1,7 @@
 # type: ignore
 # Ignoring type checking for this file because there is too many errors for now
 
+import struct
 from collections import OrderedDict
 from enum import Enum
 from pathlib import Path
@@ -22,8 +23,9 @@ from typing import (
 from uuid import UUID
 
 from _cbor2 import break_marker
-from cbor2 import CBORDecoder
+from cbor2 import CBORDecoder, CBORDecodeValueError
 from cbor2._decoder import major_decoders
+
 from rewrite import (
     Markers,
     Marker,
@@ -33,7 +35,6 @@ from rewrite import (
     UnknownJavaMarker,
 )
 from rewrite import Tree, TreeVisitor, Cursor, FileAttributes
-
 from . import remote_utils, type_utils
 from .event import DiffEvent, EventType
 
@@ -276,9 +277,11 @@ class DeserializationContext:
             if get_origin(expected_type) in (List, list):
                 expected_elem_type = get_args(expected_type)[0]
                 array = []
-                if subtype != 31:
-                    for _ in range(subtype):
-                        array.append(self.deserialize(expected_elem_type, decoder))
+                length = _decode_length(decoder, subtype, allow_indefinite=True)
+                if length:
+                    for _ in range(length):
+                        elem = self.deserialize(expected_elem_type, decoder)
+                        array.append(elem)
                 else:
                     while (
                         not (value := self.deserialize(expected_elem_type, decoder)) == break_marker
@@ -330,6 +333,8 @@ class DeserializationContext:
             return decoder.decode_string(subtype)
         elif major_type == 2:
             return decoder.decode_bytestring(subtype)
+        elif major_type == 7:
+            return decoder.decode_special(subtype)
         else:
             return major_decoders[major_type](decoder, subtype)
 
@@ -501,6 +506,24 @@ class JsonReceiver(TreeReceiver):
         return DiffEvent(event_type, concrete_type, msg)
 
 
+def _decode_length(
+    decoder: CBORDecoder, subtype: int, allow_indefinite: bool = False
+) -> Optional[int]:
+    if subtype < 24:
+        return subtype
+    elif subtype == 24:
+        return decoder.read(1)[0]
+    elif subtype == 25:
+        return cast(int, struct.unpack(">H", decoder.read(2))[0])
+    elif subtype == 26:
+        return cast(int, struct.unpack(">L", decoder.read(4))[0])
+    elif subtype == 27:
+        return cast(int, struct.unpack(">Q", decoder.read(8))[0])
+    elif subtype == 31 and allow_indefinite:
+        return None
+    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/remoting.py

@@ -292,13 +292,17 @@ class RemotingMessenger:
 
     def send_tree(
         self,
-        sock: Union[BinaryIO, socket.socket],
+        dest: Union[BinaryIO, socket.socket],
         after: Tree,
         before: Optional[Tree] = None,
     ):
         b = BytesIO()
         self._context.new_sender_context(b).send_any_tree(after, before)
-        sock.sendall(dumps(b.getvalue()))
+        if isinstance(dest, socket.socket):
+            dest.sendall(dumps(b.getvalue()))
+        else:
+            b.seek(0)
+            dest.write(dumps(b.getvalue()))
 
     def receive_tree(
         self,

rewrite_remote/sender.py

@@ -21,7 +21,6 @@ import cbor2
 from cbor2 import CBOREncoder
 from rewrite import Tree, Markers, Marker, ParseErrorVisitor, Cursor, Style
 from rewrite.visitor import TreeVisitor
-from rewrite.java import JavaType
 
 from rewrite_remote import remote_utils
 from rewrite_remote.event import *
@@ -419,16 +418,7 @@ class DefaultValueSerializer(ValueSerializer):
         elif isinstance(value, UUID):
             encoder.encode(value.bytes)
         elif isinstance(value, Enum):
-            if isinstance(value, JavaType.Primitive):
-                # FIXME implement type attribution support
-                encoder.encode(
-                    [
-                        "org.openrewrite.java.tree.JavaType$Primitive",
-                        value.value,
-                    ]
-                )
-            else:
-                encoder.encode(value.value)
+            encoder.encode(value.value)
         elif isinstance(value, Path):
             encoder.encode(str(value))
         elif isinstance(value, (list, set, tuple)):

rewrite_remote/server.py

@@ -2,18 +2,15 @@
 import importlib
 import importlib.resources
 import os
-import select
 import socket
 import sys
 import time
 import traceback
 import zipfile
 from io import BytesIO, StringIO
-from pathlib import Path
-from typing import Any
-from typing import Optional
 
 import cbor2
+import select
 from cbor2 import dumps
 from rewrite import (
     ParserInput,
@@ -22,7 +19,6 @@ from rewrite import (
     ParseError,
     Recipe,
 )
-from rewrite.java import J
 from rewrite.java.remote import *
 from rewrite.python import Py
 from rewrite.python.parser import PythonParserBuilder
@@ -30,14 +26,17 @@ 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 (
+    parse_project_sources_handler,
+)
+from rewrite_remote.handlers.project_helper import read_file_contents
 from rewrite_remote.handlers.recipe_install_handler import (
     recipe_install_handler,
 )
 from rewrite_remote.handlers.run_recipe_load_and_visitor_handler import (
     run_recipe_load_and_visitor_handler,
 )
-from rewrite_remote.handlers.list_projects_handler import list_projects_handler
-
 from rewrite_remote.receiver import ReceiverContext
 from rewrite_remote.remoting import (
     RemotePrinterFactory,
@@ -98,6 +97,7 @@ class Server:
                 "recipe-install": recipe_install_handler,
                 "run-recipe-load-and-visitor": run_recipe_load_and_visitor_handler,
                 "list-projects": list_projects_handler,
+                "parse-project-sources": parse_project_sources_handler,
             },
         )
 
@@ -234,11 +234,6 @@ class Server:
             sock.sendall(response_stream.getvalue())
 
 
-def read_file_contents(path: str) -> StringIO:
-    with open(path, "r", newline="", encoding="utf-8") as file:
-        return StringIO(file.read())
-
-
 def read_data_from_zip() -> None:
     # Access the resource within the 'your_package.resources' package
     # 'data.zip' is the name of the file included

rewrite_remote/type_utils.py

@@ -1,8 +1,9 @@
+import importlib
 import typing
-from typing import Optional
 from dataclasses import Field
 from functools import lru_cache
 from typing import Any, Type
+from typing import Optional
 
 
 def to_java_type_name_from_value(v: Any) -> Optional[str]:
@@ -106,4 +107,7 @@ def __convert_snake_to_camel(field_name: str) -> str:
 
 
 def get_type(type_name: str) -> Type[Any]:
-    raise NotImplementedError("get_type for: " + type_name)
+    # `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])

openrewrite_remote-0.13.5.dist-info/RECORD

@@ -1,23 +0,0 @@
-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=64AQVCMGF7TQKA--n5bDMn1ZUalBrpOmfWBrAA_vA2k,19872
-rewrite_remote/remote_utils.py,sha256=gU9hN-aHxy9NF4uRqjd4OhvgPrNfDyCt3y1PtrWMCgA,10677
-rewrite_remote/remoting.py,sha256=bjZbikbOy7xAZGvWuPr0ceZA8qP5Hbr67JRp-3_6Jx0,13397
-rewrite_remote/sender.py,sha256=ezVUrDr3ZTwa-tZ-1jS2pRRQcPVcqMFigmoC69Omduw,19365
-rewrite_remote/server.py,sha256=g_-6_n7Y1hsVlTRbXZyl9Ywiabje12a0eT0X8hBc0xg,9473
-rewrite_remote/type_utils.py,sha256=oVrB0olWFSCqhmg2nTU2wrwiAU7kBCUscjwdHK7gf3Y,4219
-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=NQScHfCJKofdImBgELL8tXtG_KnVyXj683C3Ae7xcKU,1298
-rewrite_remote/handlers/list_projects_handler.py,sha256=ukkCST7whpCxQ0omCWWw9W27Su3rFSnnEIhAS6T4iOU,2007
-rewrite_remote/handlers/project_helper.py,sha256=ldH47al5KDWb974uXcXF6WLZeZqAghKkcwjGAWBXrHs,7059
-rewrite_remote/handlers/pypi_manager.py,sha256=PwYIEocA9YNGgB7ZzzyzZFAb5GKJ1xPSZdSFvz1oZvg,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/types.py,sha256=5TK_oFp-7iy1iACWisuQJsa_WHTsqcPrV9nQTZ-_xgo,518
-openrewrite_remote-0.13.5.dist-info/METADATA,sha256=Y43JgSirWSgWYfwvGTg9gbSPohfAfyyeuYHlCehRtkk,386
-openrewrite_remote-0.13.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-openrewrite_remote-0.13.5.dist-info/entry_points.txt,sha256=SMukuF7TPjQr3IZIcH8f98-_QBCqYSbYXYrVv-5UzRI,69
-openrewrite_remote-0.13.5.dist-info/top_level.txt,sha256=ansTioSZ-62aH3F2L3d1Bua0pJF4GOtgQ1PpG-CzcP0,15
-openrewrite_remote-0.13.5.dist-info/RECORD,,