update formatting to ruff

Author: Maxwell Crouse [email protected]

.pre-commit-config.yaml

@@ -13,14 +13,14 @@ repos:
         args: [--exit-non-zero-on-fix, --fix, --config=pyproject.toml]
         files: '^(mellea|tests).*\.(py|ipynb)$'
 
-  # - repo: local
-  #   hooks:
-  #     - id: mypy
-  #       name: MyPy
-  #       entry: uv run --no-sync mypy mellea
-  #       pass_filenames: false
-  #       language: system
-  #       files: '\.py$'
+  - repo: local
+    hooks:
+      - id: mypy
+        name: MyPy
+        entry: uv run --no-sync mypy mellea --no-namespace-packages
+        pass_filenames: false
+        language: system
+        files: '\.py$'
 
   - repo: https://github.com/astral-sh/uv-pre-commit
     rev: 0.7.8

mellea/backends/openai.py

@@ -323,9 +323,8 @@ def generate_from_chat_context(
         action: Component | CBlock | None,
         ctx: Context,
         *,
-        _format: (
-            type[BaseModelSubclass] | None
-        ) = None,  # Type[BaseModelSubclass] is a class object of a subclass of BaseModel
+        _format: type[BaseModelSubclass]
+        | None = None,  # Type[BaseModelSubclass] is a class object of a subclass of BaseModel
         model_options: dict | None = None,
         tool_calls: bool = False,
         labels: Sequence[str] | None = None,
@@ -360,9 +359,8 @@ def _generate_from_chat_context_alora(
         action: Component | CBlock,
         ctx: Context,
         *,
-        _format: (
-            type[BaseModelSubclass] | None
-        ) = None,  # Type[BaseModelSubclass] is a class object of a subclass of BaseModel
+        _format: type[BaseModelSubclass]
+        | None = None,  # Type[BaseModelSubclass] is a class object of a subclass of BaseModel
         model_options: dict | None = None,
     ) -> ModelOutputThunk:
         match action:
@@ -447,9 +445,8 @@ def _generate_from_chat_context_standard(
         action: Component | CBlock | None,
         ctx: Context,
         *,
-        _format: (
-            type[BaseModelSubclass] | None
-        ) = None,  # Type[BaseModelSubclass] is a class object of a subclass of BaseModel
+        _format: type[BaseModelSubclass]
+        | None = None,  # Type[BaseModelSubclass] is a class object of a subclass of BaseModel
         model_options: dict | None = None,
         tool_calls: bool = False,
         labels: Sequence[str] | None = None,
@@ -719,11 +716,9 @@ def generate_from_raw(
             output._model_options = model_opts
             output._meta = {
                 "oai_completion_response": response.model_dump(),
-                "usage": (
-                    completion_response.usage.model_dump()
-                    if completion_response.usage
-                    else None
-                ),
+                "usage": completion_response.usage.model_dump()
+                if completion_response.usage
+                else None,
             }
 
             self.formatter.parse(action, output)

mellea/stdlib/base.py

@@ -407,7 +407,7 @@ class Context(abc.ABC):
     _data: Component | CBlock | None
     _is_root: bool
     _is_chat_context: bool = True
-    _labels: set[str] = None
+    _labels: set[str] | None = None
 
     def __init__(self):
         """Constructs a new root context with no content."""

mellea/stdlib/functional.py

@@ -269,9 +269,8 @@ def validate(
     output: CBlock | None = None,
     format: type[BaseModelSubclass] | None = None,
     model_options: dict | None = None,
-    generate_logs: (
-        list[GenerateLog] | None
-    ) = None,  # TODO: Can we get rid of gen logs here and in act?
+    generate_logs: list[GenerateLog]
+    | None = None,  # TODO: Can we get rid of gen logs here and in act?
     input: CBlock | None = None,
 ) -> list[ValidationResult]:
     """Validates a set of requirements over the output (if provided) or the current context (if the output is not provided)."""

mellea/stdlib/sampling/best_of_n.py

@@ -1,5 +1,6 @@
 """Best of N Sampling Strategy."""
 
+from collections.abc import Sequence
 from copy import deepcopy
 
 import tqdm
@@ -29,6 +30,7 @@ async def sample(
         model_options: dict | None = None,
         tool_calls: bool = False,
         show_progress: bool = True,
+        labels: Sequence[str] | None = None,
     ) -> SamplingResult:
         """This method performs a sampling operation based on the given instruction.
 
@@ -42,6 +44,7 @@ async def sample(
             model_options: model options to pass to the backend during generation / validation.
             tool_calls: True if tool calls should be used during this sampling strategy.
             show_progress: if true, a tqdm progress bar is used. Otherwise, messages will still be sent to flog.
+            labels: if provided, restrict generation to context nodes with matching types.
 
         Returns:
             SamplingResult: A result object indicating the success or failure of the sampling process.
@@ -114,6 +117,7 @@ async def sample(
                 format=format,
                 model_options=model_options,
                 tool_calls=tool_calls,
+                labels=labels,
             )
             sampled_results.append(result)
             sampled_actions.append(next_action)

mellea/stdlib/sampling/budget_forcing.py

@@ -1,13 +1,14 @@
 """Sampling Strategies for budget forcing generation."""
 
+from collections.abc import Sequence
 from copy import deepcopy
 
 import tqdm
 
 from mellea.backends import Backend, BaseModelSubclass
 from mellea.backends.ollama import OllamaModelBackend
 from mellea.helpers.fancy_logger import FancyLogger
-from mellea.stdlib import funcs as mfuncs
+from mellea.stdlib import functional as mfuncs
 from mellea.stdlib.base import ModelOutputThunk
 from mellea.stdlib.requirement import Requirement, ValidationResult
 from mellea.stdlib.sampling import RejectionSamplingStrategy, SamplingResult
@@ -82,6 +83,7 @@ async def sample(
         model_options: dict | None = None,
         tool_calls: bool = False,
         show_progress: bool = True,
+        labels: Sequence[str] | None = None,
     ) -> SamplingResult:
         """This method performs a sampling operation based on the given instruction.
 
@@ -95,6 +97,7 @@ async def sample(
             model_options: model options to pass to the backend during generation / validation.
             tool_calls: True if tool calls should be used during this sampling strategy.
             show_progress: if true, a tqdm progress bar is used. Otherwise, messages will still be sent to flog.
+            labels: if provided, restrict generation to context nodes with matching types.
 
         Returns:
             SamplingResult: A result object indicating the success or failure of the sampling process.

mellea/stdlib/sampling/majority_voting.py

@@ -2,6 +2,7 @@
 
 import abc
 import asyncio
+from collections.abc import Sequence
 
 import numpy as np
 from math_verify import ExprExtractionConfig, LatexExtractionConfig, parse, verify
@@ -74,6 +75,7 @@ async def sample(
         model_options: dict | None = None,
         tool_calls: bool = False,
         show_progress: bool = True,
+        labels: Sequence[str] | None = None,
     ) -> SamplingResult:
         """Samples using majority voting.
 
@@ -87,6 +89,7 @@ async def sample(
             model_options: model options to pass to the backend during generation / validation.
             tool_calls: True if tool calls should be used during this sampling strategy.
             show_progress: if true, a tqdm progress bar is used. Otherwise, messages will still be sent to flog.
+            labels: if provided, restrict generation to context nodes with matching types.
 
         Returns:
             SamplingResult: A result object indicating the success or failure of the sampling process.
@@ -104,6 +107,7 @@ async def sample(
                     model_options=model_options,
                     tool_calls=tool_calls,
                     show_progress=show_progress,
+                    labels=labels,
                 )
             )
             tasks.append(task)

mellea/stdlib/sampling/types.py

@@ -1,6 +1,7 @@
 """Base types for sampling."""
 
 import abc
+from collections.abc import Sequence
 
 from mellea.backends import Backend, BaseModelSubclass
 from mellea.stdlib.base import CBlock, Component, Context, ModelOutputThunk
@@ -95,6 +96,7 @@ async def sample(
         format: type[BaseModelSubclass] | None = None,
         model_options: dict | None = None,
         tool_calls: bool = False,
+        labels: Sequence[str] | None = None,
     ) -> SamplingResult:
         """This method is the abstract method for sampling a given component.
 
@@ -109,6 +111,7 @@ async def sample(
             format: output format for structured outputs.
             model_options: model options to pass to the backend during generation / validation.
             tool_calls: True if tool calls should be used during this sampling strategy.
+            labels: if provided, restrict generation to context nodes with matching types.
 
         Returns:
             SamplingResult: A result object indicating the success or failure of the sampling process.