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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openrewrite-remote
-Version: 0.13.4
+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.4.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/__init__.py

@@ -6,7 +6,5 @@ from .sender import *
 from .remoting import *
 
 __all__ = [
-    name
-    for name in dir()
-    if not name.startswith("_") and not isinstance(globals()[name], TypeVar)
+    name for name in dir() if not name.startswith("_") and not isinstance(globals()[name], TypeVar)
 ]

rewrite_remote/handlers/handler_helpers.py

@@ -3,7 +3,7 @@ import socket
 import cbor2
 
 from rewrite_remote.remote_utils import COMMAND_END
-from rewrite_remote import RemotingMessageType, OK, ERROR
+from rewrite_remote import RemotingMessageType, ERROR
 
 
 def respond_with_error(message: str, sock: socket.socket) -> None:

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
 
@@ -54,9 +61,7 @@ def is_uv_project(tomlData: dict[str, Any]) -> bool:
     return "tool" in tomlData and "uv" in tomlData["tool"]
 
 
-def find_sub_projects_in_poetry(
-    tomlData: dict[str, Any], toml_path: str
-) -> list[Project]:
+def find_sub_projects_in_poetry(tomlData: dict[str, Any], toml_path: str) -> list[Project]:
     """
     Finds sub projects in a poetry project by looking for dependencies with a "path" key:
         [tool.poetry.dependencies]
@@ -78,9 +83,7 @@ def find_sub_projects_in_poetry(
     return subProjects
 
 
-def find_sub_projects_in_hatch(
-    tomlData: dict[str, Any], toml_path: str
-) -> list[Project]:
+def find_sub_projects_in_hatch(tomlData: dict[str, Any], toml_path: str) -> list[Project]:
     """
     Finds sub projects in a hatch project by looking for dependencies with a "path" key:
         [tool.hatch.envs.default.dependencies]
@@ -98,18 +101,14 @@ def find_sub_projects_in_hatch(
                         subProjects.append(
                             Project(
                                 project_name=dep_name,
-                                project_root=get_absolute_path(
-                                    toml_path, dep_value["path"]
-                                ),
+                                project_root=get_absolute_path(toml_path, dep_value["path"]),
                                 project_tool=f"hatch:{env_name}",
                             )
                         )
     return subProjects
 
 
-def find_sub_projects_in_uv_sources(
-    tomlData: dict[str, Any], toml_path: str
-) -> list[Project]:
+def find_sub_projects_in_uv_sources(tomlData: dict[str, Any], toml_path: str) -> list[Project]:
     """
     Finds sub projects in a uv project by looking at sources and workspace:
     [tool.uv.sources]
@@ -146,7 +145,8 @@ def find_sub_projects_in_uv_sources(
         for glob_pattern in uv_workspace["members"]:
             # Every directory included by the members globs (and not excluded by the exclude globs) must contain a pyproject.toml file
             directories = glob.glob(
-                os.path.join(os.path.dirname(toml_path), glob_pattern), recursive=True
+                os.path.join(os.path.dirname(toml_path), glob_pattern),
+                recursive=True,
             )
 
             for directory in directories:
@@ -194,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

@@ -4,6 +4,8 @@ import subprocess
 import importlib
 import inspect
 import pkgutil
+import site
+
 from dataclasses import dataclass
 
 from pypi_simple import PyPISimple
@@ -51,7 +53,11 @@ class InstalledRecipe:
 
 class InstalledPackage:
     def __init__(
-        self, name: str, version: str, source: str, recipes: List[InstalledRecipe]
+        self,
+        name: str,
+        version: str,
+        source: str,
+        recipes: List[InstalledRecipe],
     ):
         self.name = name
         self.version = version
@@ -87,14 +93,10 @@ class PyPiManager:
                     requestedVersion,
                 )
                 if result:
-                    print(
-                        f"Package {package_identifier} found in source: {source.source}"
-                    )
+                    print(f"Package {package_identifier} found in source: {source.source}")
                     return source
                 else:
-                    print(
-                        f"Package {package_identifier} not found in source: {source.source}"
-                    )
+                    print(f"Package {package_identifier} not found in source: {source.source}")
             except Exception as e:
                 print(f"Error checking source {source.source}: {e}")
 
@@ -161,9 +163,7 @@ class PyPiManager:
             raise RuntimeError(f"Failed to uninstall package {package_name}: {e}")
 
     @staticmethod
-    def load_recipe(
-        recipe_name: str, module_name: str, recipe_options: List[Option]
-    ) -> Recipe:
+    def load_recipe(recipe_name: str, module_name: str, recipe_options: List[Option]) -> Recipe:
         """
         Loads a recipe from the specified source.
         """
@@ -191,9 +191,7 @@ class PyPiManager:
                 raise RuntimeError(f"Package {package_name} is not installed.")
             return metadata
         except Exception as e:
-            raise RuntimeError(
-                f"Failed to load package details for {package_name}: {e}"
-            )
+            raise RuntimeError(f"Failed to load package details for {package_name}: {e}")
 
     @staticmethod
     def _get_package_metadata(package_name: str) -> Dict[str, Any]:
@@ -210,9 +208,7 @@ class PyPiManager:
             metadata_dict = {key.lower(): value for key, value in dist.metadata.items()}
             return metadata_dict
         except importlib.metadata.PackageNotFoundError:
-            print(
-                f"Package {package_name} not found in {DEFAULT_RECIPE_INSTALL_LOCATION}"
-            )
+            print(f"Package {package_name} not found in {DEFAULT_RECIPE_INSTALL_LOCATION}")
             return {}
 
     @staticmethod
@@ -225,6 +221,7 @@ class PyPiManager:
         module_name = module_name.replace("-", "_")
 
         try:
+            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/handlers/recipe_install_handler.py

@@ -111,9 +111,7 @@ def recipe_install_handler(
 
     # 4. Install the recipe
     try:
-        installable_recipes = PyPiManager.install_package(
-            package_id, package_version, valid_source
-        )
+        installable_recipes = PyPiManager.install_package(package_id, package_version, valid_source)
     except Exception as e:  # pylint: disable=broad-except
         respond_with_error(f"Failed to install package: {e}", sock)
         return

rewrite_remote/handlers/run_recipe_load_and_visitor_handler.py

@@ -13,7 +13,7 @@ from rewrite_remote.remoting import (
 )
 
 from rewrite_remote.remote_utils import COMMAND_END
-from rewrite_remote.remoting import OK, RemotingContext, RemotingMessageType
+from rewrite_remote.remoting import RemotingContext
 from rewrite_remote.handlers.handler_helpers import respond_with_error
 
 from rewrite import InMemoryExecutionContext
@@ -98,9 +98,7 @@ def run_recipe_load_and_visitor_handler(
     RemotingExecutionContextView.view(ctx).remoting_context = remoting_ctx
 
     try:
-        recipe_instance = PyPiManager.load_recipe(
-            recipe_name, recipe_source, recipe_options
-        )
+        recipe_instance = PyPiManager.load_recipe(recipe_name, recipe_source, recipe_options)
     except Exception as e:
         respond_with_error(f"Failed to load recipe: {e}", sock)
         return
@@ -122,9 +120,7 @@ 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(remoting_ctx, response_encoder, RemotingMessenger._state, received)
 
     encoded_response = b""
     encoded_response += dumps(RemotingMessageType.Response)

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
 
@@ -86,7 +87,10 @@ class ReceiverFactory(Protocol):
 
 class DetailsReceiver(Protocol[T]):
     def receive_details(
-        self, before: Optional[T], type: Optional[Type[T]], ctx: "ReceiverContext"
+        self,
+        before: Optional[T],
+        type: Optional[Type[T]],
+        ctx: "ReceiverContext",
     ) -> T:
         pass
 
@@ -111,7 +115,10 @@ class ReceiverContext:
         return cast(Optional[T], OmniReceiver().receive(before, self))
 
     def receive_tree(
-        self, before: Optional[Tree], tree_type: Optional[str], ctx: "ReceiverContext"
+        self,
+        before: Optional[Tree],
+        tree_type: Optional[str],
+        ctx: "ReceiverContext",
     ) -> Tree:
         if before:
             return before.accept(self.visitor, ctx)
@@ -123,9 +130,7 @@ class ReceiverContext:
     def polymorphic_receive_tree(self, before: Optional[Tree]) -> Optional[Tree]:
         diff_event = self.receiver.receive_node()
         if diff_event.event_type in (EventType.Add, EventType.Update):
-            tree_receiver = self.new_receiver(
-                diff_event.concrete_type or type(before).__name__
-            )
+            tree_receiver = self.new_receiver(diff_event.concrete_type or type(before).__name__)
             forked = tree_receiver.fork(self)
             return forked.receive_tree(
                 None if diff_event.event_type == EventType.Add else before,
@@ -159,7 +164,10 @@ class ReceiverContext:
         return before
 
     def receive_markers(
-        self, before: Optional[Markers], type: Optional[str], ctx: "ReceiverContext"
+        self,
+        before: Optional[Markers],
+        type: Optional[str],
+        ctx: "ReceiverContext",
     ) -> Markers:
         id_ = self.receive_value(getattr(before, "id", None), UUID)
         after_markers: Optional[List[Marker]] = self.receive_values(
@@ -177,9 +185,7 @@ class ReceiverContext:
     ) -> Optional[List[A]]:
         return remote_utils.receive_nodes(before, details, self)
 
-    def receive_values(
-        self, before: Optional[List[V]], type: Type[Any]
-    ) -> Optional[List[V]]:
+    def receive_values(self, before: Optional[List[V]], type: Type[Any]) -> Optional[List[V]]:
         return remote_utils.receive_values(before, type, self)
 
     def receive_value(self, before: Optional[V], type: Type[Any]) -> Optional[V]:
@@ -198,7 +204,7 @@ class ReceiverContext:
         ReceiverContext.Registry[type_] = receiver_factory
 
 
-ValueDeserializer = Callable[[Type[Any], CBORDecoder, "DeserializationContext"], Optional[Any]]
+ValueDeserializer = Callable[[str, CBORDecoder, "DeserializationContext"], Optional[Any]]
 
 
 class DefaultValueDeserializer(ValueDeserializer):
@@ -256,7 +262,7 @@ class DeserializationContext:
         initial_byte = decoder.read(1)[0]
         major_type = initial_byte >> 5
         subtype = initial_byte & 31
-        concrete_type = None
+        concrete_type: Optional[str] = None
 
         # Object ID for Marker, JavaType, etc.
         if major_type == 0:
@@ -271,11 +277,15 @@ 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:
+                    while (
+                        not (value := self.deserialize(expected_elem_type, decoder)) == break_marker
+                    ):
                         array.append(value)
                 return array
             else:
@@ -301,7 +311,7 @@ class DeserializationContext:
                     id_ = UUID(bytes=decoder.decode())
                 return SearchResult(id_, desc)
 
-            if (deser := self.value_deserializers.get(concrete_type)):
+            if deser := self.value_deserializers.get(concrete_type):
                 return deser(concrete_type, decoder, self)
 
             for type_, value_deserializer in self.value_deserializers.items():
@@ -323,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)
 
@@ -378,9 +390,7 @@ class DeserializationContext:
             if concrete_type == "java.math.BigDecimal":
                 return decoder.decode()
 
-            raise NotImplementedError(
-                f"No deserialization implemented for: {concrete_type}"
-            )
+            raise NotImplementedError(f"No deserialization implemented for: {concrete_type}")
 
         if state == cbor2.CborReaderState.ARRAY:
             decoder.read_array_start()
@@ -425,9 +435,7 @@ class DeserializationContext:
             for type_, deserializer in self.value_deserializers.items():
                 if issubclass(actual_type, type_):
                     return deserializer.deserialize(actual_type, decoder, self)
-        raise NotImplementedError(
-            f"No deserialization implemented for: {expected_type}"
-        )
+        raise NotImplementedError(f"No deserialization implemented for: {expected_type}")
 
 
 class JsonReceiver(TreeReceiver):
@@ -448,11 +456,7 @@ class JsonReceiver(TreeReceiver):
             concrete_type = None
 
             if event_type in {EventType.Add, EventType.Update}:
-                if (
-                    event_type == EventType.Add
-                    and len(array) > 1
-                    and isinstance(array[1], str)
-                ):
+                if event_type == EventType.Add and len(array) > 1 and isinstance(array[1], str):
                     concrete_type = array[1]
 
             elif event_type not in {
@@ -502,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())
@@ -522,21 +544,15 @@ class ParseErrorReceiver(Receiver):
             parse_error = parse_error.with_markers(
                 ctx.receive_node(parse_error.markers, ctx.receive_markers)
             )
-            parse_error = parse_error.with_source_path(
-                ctx.receive_value(parse_error.source_path)
-            )
+            parse_error = parse_error.with_source_path(ctx.receive_value(parse_error.source_path))
             parse_error = parse_error.with_file_attributes(
                 ctx.receive_value(parse_error.file_attributes)
             )
-            parse_error = parse_error.with_charset_name(
-                ctx.receive_value(parse_error.charset_name)
-            )
+            parse_error = parse_error.with_charset_name(ctx.receive_value(parse_error.charset_name))
             parse_error = parse_error.with_charset_bom_marked(
                 ctx.receive_value(parse_error.charset_bom_marked)
             )
-            parse_error = parse_error.with_checksum(
-                ctx.receive_value(parse_error.checksum)
-            )
+            parse_error = parse_error.with_checksum(ctx.receive_value(parse_error.checksum))
             parse_error = parse_error.with_text(ctx.receive_value(parse_error.text))
             # parse_error = parse_error.with_erroneous(ctx.receive_tree(parse_error.erroneous))
             return parse_error