Update & Pin versions

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ default_language_version:
 repos:
   # check some basic stuff
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       # Check for files that would conflict in case-insensitive filesystems
       - id: check-case-conflict
@@ -22,12 +22,12 @@ repos:
         args: [--filter-files, --profile, black]
   # Format the python code with black
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.8.0
     hooks:
       - id: black
   # Lint the python code with flake
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
       - id: flake8
   # Type check the Python code with pylint
@@ -38,7 +38,7 @@ repos:
         entry: pylint
         language: python
         types: [python]
-        additional_dependencies: ['pylint==3.0.3']
+        additional_dependencies: ['pylint==3.3.0']
         args:
           [
             "-rn", # Only display messages
@@ -47,7 +47,7 @@ repos:
           ]
   # Type check the Python code with MyPy
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.8.0'
+    rev: 'v1.11.2'
     hooks:
       - id: mypy
         verbose: true
@@ -61,4 +61,4 @@ repos:
         language: node
         pass_filenames: false
         types: [python]
-        additional_dependencies: ['[email protected].345']
+        additional_dependencies: ['[email protected].381']

pdl/benchmark.py

@@ -121,7 +121,7 @@ def accumulator(self, q):
                 )
 
 
-def write_log(  # pylint: disable=too-many-arguments
+def write_log(  # pylint: disable=too-many-arguments,too-many-positional-arguments
     log, index, question, truth, answer, solution, document, exc
 ):
     log.write("\n\n------------------------\n")

pdl/pdl_ast.py

@@ -1,7 +1,6 @@
 """PDL programs are represented by the Pydantic data structure defined in this file.
 """
 
-
 from enum import StrEnum
 from typing import Any, Literal, Optional, TypeAlias, TypedDict, Union
 
@@ -353,7 +352,7 @@ class MessageBlock(Block):
     """Create a message."""
 
     kind: Literal[BlockKind.MESSAGE] = BlockKind.MESSAGE
-    role: RoleType
+    role: RoleType  # type: ignore
     """Role of associated to the message."""
     content: "BlocksType"
     """Content of the message."""
@@ -602,32 +601,32 @@ def set_default_granite_model_parameters(
     if parameters is None:
         parameters = {}
     if "decoding_method" not in parameters:
-        parameters[
-            "decoding_method"
-        ] = DECODING_METHOD  # pylint: disable=attribute-defined-outside-init
+        parameters["decoding_method"] = (
+            DECODING_METHOD  # pylint: disable=attribute-defined-outside-init
+        )
     if "max_tokens" in parameters and parameters["max_tokens"] is None:
-        parameters[
-            "max_tokens"
-        ] = MAX_NEW_TOKENS  # pylint: disable=attribute-defined-outside-init
+        parameters["max_tokens"] = (
+            MAX_NEW_TOKENS  # pylint: disable=attribute-defined-outside-init
+        )
     if "min_new_tokens" not in parameters:
-        parameters[
-            "min_new_tokens"
-        ] = MIN_NEW_TOKENS  # pylint: disable=attribute-defined-outside-init
+        parameters["min_new_tokens"] = (
+            MIN_NEW_TOKENS  # pylint: disable=attribute-defined-outside-init
+        )
     if "repetition_penalty" not in parameters:
-        parameters[
-            "repetition_penalty"
-        ] = REPETITION_PENATLY  # pylint: disable=attribute-defined-outside-init
+        parameters["repetition_penalty"] = (
+            REPETITION_PENATLY  # pylint: disable=attribute-defined-outside-init
+        )
     if parameters["decoding_method"] == "sample":
         if "temperature" not in parameters:
-            parameters[
-                "temperature"
-            ] = TEMPERATURE_SAMPLING  # pylint: disable=attribute-defined-outside-init
+            parameters["temperature"] = (
+                TEMPERATURE_SAMPLING  # pylint: disable=attribute-defined-outside-init
+            )
         if "top_k" not in parameters:
-            parameters[
-                "top_k"
-            ] = TOP_K_SAMPLING  # pylint: disable=attribute-defined-outside-init
+            parameters["top_k"] = (
+                TOP_K_SAMPLING  # pylint: disable=attribute-defined-outside-init
+            )
         if "top_p" not in parameters:
-            parameters[
-                "top_p"
-            ] = TOP_P_SAMPLING  # pylint: disable=attribute-defined-outside-init
+            parameters["top_p"] = (
+                TOP_P_SAMPLING  # pylint: disable=attribute-defined-outside-init
+            )
     return parameters

pdl/pdl_compilers/to_regex.py

@@ -30,8 +30,7 @@
 
 class Re(ABC):
     @abstractmethod
-    def to_re(self) -> str:
-        ...
+    def to_re(self) -> str: ...
 
 
 class ReEmpty(Re):

pdl/pdl_dumper.py

@@ -203,9 +203,9 @@ def block_to_dict(block: pdl_ast.BlockType) -> int | float | str | dict[str, Any
 def blocks_to_dict(
     blocks: BlocksType,
 ) -> int | float | str | dict[str, Any] | list[int | float | str | dict[str, Any]]:
-    result: int | float | str | dict[str, Any] | list[
-        int | float | str | dict[str, Any]
-    ]
+    result: (
+        int | float | str | dict[str, Any] | list[int | float | str | dict[str, Any]]
+    )
     if not isinstance(blocks, str) and isinstance(blocks, Sequence):
         result = [block_to_dict(block) for block in blocks]
     else:

pdl/pdl_llms.py

@@ -43,7 +43,7 @@ def get_model() -> BamClient:
         return BamModel.bam_client
 
     @staticmethod
-    def generate_text(  # pylint: disable=too-many-arguments
+    def generate_text(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         model_id: str,
         prompt_id: Optional[str],
         model_input: Optional[str],
@@ -69,7 +69,7 @@ def generate_text(  # pylint: disable=too-many-arguments
         return {"role": None, "content": text}
 
     @staticmethod
-    def generate_text_stream(  # pylint: disable=too-many-arguments
+    def generate_text_stream(  # pylint: disable=too-many-arguments,too-many-positional-arguments
         model_id: str,
         prompt_id: Optional[str],
         model_input: Optional[str],

pdl/pdl_scheduler.py

@@ -95,9 +95,9 @@ def schedule(
 ) -> list[GeneratorReturnT]:
     global _LAST_ROLE  # pylint: disable= global-statement
     todo: list[tuple[int, Generator[YieldMessage, Any, GeneratorReturnT], Any]]
-    todo_next: list[
-        tuple[int, Generator[YieldMessage, Any, GeneratorReturnT], Any]
-    ] = []
+    todo_next: list[tuple[int, Generator[YieldMessage, Any, GeneratorReturnT], Any]] = (
+        []
+    )
     done: list[Optional[GeneratorReturnT]]
     todo = [(i, gen, None) for i, gen in enumerate(generators)]
     done = [None for _ in generators]
@@ -106,10 +106,10 @@ def schedule(
             try:
                 msg = gen.send(v)
                 match msg:
-                    case ModelYieldResultMessage(
-                        result=result
-                    ) | CodeYieldResultMessage(result=result) | YieldResultMessage(
-                        result=result
+                    case (
+                        ModelYieldResultMessage(result=result)
+                        | CodeYieldResultMessage(result=result)
+                        | YieldResultMessage(result=result)
                     ):
                         if msg.color is None:
                             text = stringify(result)

pdl/pdl_utils.py

@@ -36,9 +36,11 @@ def messages_to_str(messages: Messages) -> str:
     # TODO
     return "".join(
         [
-            msg["content"]
-            if msg["role"] is None
-            else f"<|{msg['role']}|>{msg['content']}"
+            (
+                msg["content"]
+                if msg["role"] is None
+                else f"<|{msg['role']}|>{msg['content']}"
+            )
             for msg in messages
         ]
     )

pyproject.toml

@@ -6,21 +6,21 @@ build-backend = "setuptools.build_meta"
 name = "pdl"
 version = "0.0.1"
 dependencies = [
-  "pydantic",
-  "ibm-generative-ai",
-  "requests",
-  "python-dotenv",
-  "jinja2",
-  "PyYAML",
-  "jsonschema",
-  "litellm",
-  "termcolor",
-  "ipython"
+  "pydantic~=2.0",
+  "ibm-generative-ai~=3.0",
+  "requests~=2.0",
+  "python-dotenv~=1.0",
+  "jinja2~=3.0",
+  "PyYAML~=6.0",
+  "jsonschema~=4.0",
+  "litellm~=1.47",
+  "termcolor~=2.0",
+  "ipython~=8.0"
 ]
 authors = [
   { name="Mandana Vaziri", email="[email protected]" },
   { name="Louis Mandel", email="[email protected]"},
-  { name="Claudio Spiess" },
+  { name="Claudio Spiess", email="[email protected]" },
   { name="Martin Hirzel", email="[email protected]" }
 ]
 description = "Prompt Declaration Language"
@@ -34,22 +34,22 @@ classifiers = [
 
 [project.optional-dependencies]
 dev = [
-  "black",
-  "pre-commit",
-  "pytest"
+  "pre-commit~=3.0",
+  "pytest~=8.0",
+  "pydantic~=2.9"
 ]
 examples = [
-  "wikipedia",
-  "textdistance",
-  "faiss-cpu",
-  "datasets",
-  "sympy"
+  "wikipedia~=1.0",
+  "textdistance~=4.0",
+  "faiss-cpu~=1.0",
+  "datasets>2,<4",
+  "sympy~=1.0"
 ]
 docs = [
-  "mkdocs",
-  "mkdocstrings[python]",
-  "mkdocs-material",
-  "pymdown-extensions"
+  "mkdocs~=1.0",
+  "mkdocstrings[python]~=0.0",
+  "mkdocs-material~=9.0",
+  "pymdown-extensions~=10.0"
 ]
 all = [ "pdl[dev,examples,docs]" ]