Include fixes from #16

Author: aborgna-q

.pre-commit-config.yaml

@@ -40,14 +40,14 @@ repos:
       - id: ruff-format
         name: ruff format
         description: Format python code with `ruff`.
-        entry: uv run ruff format
+        entry: uv run ruff format impl/py
         language: system
         files: \.py$
         pass_filenames: false
       - id: ruff-check
         name: ruff
         description: Check python code with `ruff`.
-        entry: uv run ruff check --fix --exit-non-zero-on-fix
+        entry: uv run ruff check --fix --exit-non-zero-on-fix impl/py
         language: system
         files: \.py$
         pass_filenames: false

impl/py/pyproject.toml

@@ -27,13 +27,15 @@ classifiers = [
 ]
 
 dependencies = [
-    # TODO: Temporarily disabled
-    # "pycapnp ~= 2.0.0"
+    "pycapnp~=2.0.0",
 ]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/jeff"]
 
+[tool.uv.sources]
+pycapnp = { git = "https://github.com/mlxd/pycapnp", branch = "mlxd/update_gh_actions" }
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"

impl/py/src/jeff/__init__.py

@@ -55,7 +55,7 @@ def load_module(path: str) -> Module:
     """Load a jeff module from file."""
 
     with open(path, "rb") as f:
-        return Module._read_from_buffer(schema.Module.read(f))  # type: ignore
+        return Module._read_from_buffer(schema.Module.read(f))
 
 
 #################

impl/py/src/jeff/capnp/__init__.py

@@ -11,7 +11,7 @@
 
 
 def load_schema() -> Any:
-    import capnp  # type: ignore[unused-ignore, import-not-found]
+    import capnp  # type: ignore[import-untyped]
 
     capnp.remove_import_hook()
 
@@ -95,6 +95,4 @@ def is_dirty(self) -> bool:
         return self._is_dirty
 
 
-# TODO: Temporarily disabled
-# schema = load_schema()
-schema = None
+schema = load_schema()

impl/py/src/jeff/module.py

@@ -87,7 +87,7 @@ def refresh(self) -> None:
 
         # Reusing an existing message is a bad idea as any new allocations will leave the old ones
         # in the message, bloating its size.
-        new_data = schema.Module.new_message()  # type: ignore
+        new_data = schema.Module.new_message()
         string_table = self._string_table
         self._write_to_buffer(new_data, string_table)
 
@@ -98,7 +98,7 @@ def write_out(self, path: str) -> None:
         self.refresh()
 
         with open(path, "wb") as f:
-            self._raw_data.write(f)
+            self._raw_data.as_builder().write(f)
 
     @staticmethod
     def _read_from_buffer(module: schema.Module) -> Module:  # type: ignore

justfile

@@ -27,7 +27,7 @@ fix-rs:
     cargo clippy --all-targets --all-features --workspace --fix --allow-staged --allow-dirty
 # Auto-fix all the lints in the python code.
 fix-py:
-    uv run ruff check --fix
+    uv run ruff check --fix impl/py
 
 # Format all the code in the repository.
 format: format-rs format-py