Skip to content

Build AI methods with your coding agent, then run them anywhere: as an MCP for chatbots, as a webapp for people, or via API for your software.

Fix ConceptSpec imports

Louis Choquel65859cacb89a
diff --git a/pipelex/cogt/model_backends/backend_library.py b/pipelex/cogt/model_backends/backend_library.py
index d9d27249c..ba43fe88c 100644
--- a/pipelex/cogt/model_backends/backend_library.py
+++ b/pipelex/cogt/model_backends/backend_library.py
@@ -65,7 +65,7 @@ class InferenceBackendLibrary(RootModel[InferenceBackendLibraryRoot]):
except VarNotFoundError as var_not_found_exc:
msg = (
f"Variable substitution failed due to a variable not found error in file '{backends_library_path}':"
- "\n{var_not_found_exc}\nRun mode: '{runtime_manager.run_mode}'"
+ f"\n{var_not_found_exc}\nRun mode: '{runtime_manager.run_mode}'"
)
raise InferenceBackendCredentialsError(
error_type=InferenceBackendCredentialsErrorType.VAR_NOT_FOUND,
diff --git a/pipelex/libraries/pipelines/builder/pipe/pipe_ocr_spec.py b/pipelex/libraries/pipelines/builder/pipe/pipe_ocr_spec.py
index e9598e673..5beac7584 100644
--- a/pipelex/libraries/pipelines/builder/pipe/pipe_ocr_spec.py
+++ b/pipelex/libraries/pipelines/builder/pipe/pipe_ocr_spec.py
@@ -5,6 +5,12 @@ from typing_extensions import override
from pipelex.libraries.pipelines.builder.pipe.pipe_signature import PipeSpec
from pipelex.pipe_operators.ocr.pipe_ocr_blueprint import PipeOcrBlueprint
+from pipelex.types import StrEnum
+
+
+class RecommendedOcrPresets(StrEnum):
+ BASE_OCR_MISTRAL = "base_ocr_mistral"
+ BASE_OCR_PYPDFIUM2 = "base_ocr_pypdfium2"
class PipeOcrSpec(PipeSpec):
@@ -34,7 +40,7 @@ class PipeOcrSpec(PipeSpec):
type: Literal["PipeOcr"] = "PipeOcr"
category: Literal["PipeOperator"] = "PipeOperator"
the_pipe_code: str = Field(description="Pipe code. Must be snake_case.")
- ocr: str
+ ocr: RecommendedOcrPresets = Field(strict=False, description="Use one of the recommended OCR presets")
page_images: bool | None = None
page_image_captions: bool | None = None
page_views: bool | None = None
diff --git a/pipelex/libraries/pipelines/builder/pipe/pipe_parallel_spec.py b/pipelex/libraries/pipelines/builder/pipe/pipe_parallel_spec.py
index f3e481410..42e63175f 100644
--- a/pipelex/libraries/pipelines/builder/pipe/pipe_parallel_spec.py
+++ b/pipelex/libraries/pipelines/builder/pipe/pipe_parallel_spec.py
@@ -4,7 +4,7 @@ from pydantic import Field, field_validator, model_validator
from typing_extensions import override
from pipelex.exceptions import PipeDefinitionError
-from pipelex.libraries.pipelines.builder.concept.concept_spec import ConceptBlueprint
+from pipelex.libraries.pipelines.builder.concept.concept_spec import ConceptSpec
from pipelex.libraries.pipelines.builder.pipe.pipe_signature import PipeSpec
from pipelex.libraries.pipelines.builder.pipe.sub_pipe_spec import SubPipeSpec
from pipelex.pipe_controllers.parallel.pipe_parallel_blueprint import PipeParallelBlueprint
@@ -47,7 +47,7 @@ class PipeParallelSpec(PipeSpec):
@staticmethod
def validate_combined_output(combined_output: str) -> str:
if combined_output:
- ConceptBlueprint.validate_concept_string_or_code(concept_string_or_code=combined_output)
+ ConceptSpec.validate_concept_string_or_code(concept_string_or_code=combined_output)
return combined_output
@model_validator(mode="after")
diff --git a/pipelex/libraries/pipelines/builder/pipe/pipe_signature.py b/pipelex/libraries/pipelines/builder/pipe/pipe_signature.py
index 8c9f667a5..e100ac393 100644
--- a/pipelex/libraries/pipelines/builder/pipe/pipe_signature.py
+++ b/pipelex/libraries/pipelines/builder/pipe/pipe_signature.py
@@ -6,7 +6,7 @@ from pipelex.core.pipes.exceptions import PipeBlueprintError
from pipelex.core.pipes.pipe_blueprint import AllowedPipeCategories, AllowedPipeTypes, PipeBlueprint
from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint
from pipelex.core.stuffs.stuff_content import StructuredContent
-from pipelex.libraries.pipelines.builder.concept.concept_spec import ConceptBlueprint, ConceptSpecDraft
+from pipelex.libraries.pipelines.builder.concept.concept_spec import ConceptSpec, ConceptSpecDraft
from pipelex.libraries.pipelines.builder.pipe.inputs_spec import InputRequirementSpec
from pipelex.tools.misc.string_utils import is_snake_case
@@ -77,7 +77,7 @@ class PipeSpec(StructuredContent):
@field_validator("output", mode="before")
@staticmethod
def validate_concept_string_or_code(output: str) -> str:
- ConceptBlueprint.validate_concept_string_or_code(concept_string_or_code=output)
+ ConceptSpec.validate_concept_string_or_code(concept_string_or_code=output)
return output
@classmethod
diff --git a/tests/unit/pipelex/tools/test_class_registry_utils.py b/tests/unit/pipelex/tools/test_class_registry_utils.py
index 59c9a873d..fb29f6405 100644
--- a/tests/unit/pipelex/tools/test_class_registry_utils.py
+++ b/tests/unit/pipelex/tools/test_class_registry_utils.py
@@ -1,10 +1,9 @@
from pathlib import Path
+from pipelex.tools.class_registry_utils import ClassRegistryUtils
from pydantic import BaseModel
from pytest_mock import MockerFixture
-from pipelex.tools.class_registry_utils import ClassRegistryUtils
-
class TestClassRegistryUtilsUnit:
"""Unit tests for ClassRegistryUtils using mocks."""
@@ -16,18 +15,31 @@ class TestClassRegistryUtilsUnit:
mock_module.__name__ = "test_module"
# Mock the functions at the location where they're imported in ClassRegistryUtils
- mock_import = mocker.patch("pipelex.tools.class_registry_utils.import_module_from_file", return_value=mock_module)
- mock_find = mocker.patch("pipelex.tools.class_registry_utils.find_classes_in_module", return_value=[str, int])
+ mock_import = mocker.patch(
+ "pipelex.tools.class_registry_utils.import_module_from_file",
+ return_value=mock_module,
+ )
+ mock_find = mocker.patch(
+ "pipelex.tools.class_registry_utils.find_classes_in_module",
+ return_value=[str, int],
+ )
# Mock the global class registry
mock_registry = mocker.MagicMock()
- mocker.patch("pipelex.tools.class_registry_utils.KajsonManager.get_class_registry", return_value=mock_registry)
+ mocker.patch(
+ "pipelex.tools.class_registry_utils.KajsonManager.get_class_registry",
+ return_value=mock_registry,
+ )
- ClassRegistryUtils.register_classes_in_file(file_path="/fake/path.py", base_class=None, is_include_imported=False)
+ ClassRegistryUtils.register_classes_in_file(
+ file_path="/fake/path.py", base_class=None, is_include_imported=False
+ )
# Verify the mocked functions were called correctly
mock_import.assert_called_once_with("/fake/path.py")
- mock_find.assert_called_once_with(module=mock_module, base_class=None, include_imported=False)
+ mock_find.assert_called_once_with(
+ module=mock_module, base_class=None, include_imported=False
+ )
# Verify classes were registered with the global registry
mock_registry.register_classes.assert_called_once_with(classes=[str, int])
@@ -36,15 +48,30 @@ class TestClassRegistryUtilsUnit:
"""Unit test for registering classes from a folder using mocks."""
# Mock the file finding and registration
mock_files = [Path("/fake/file1.py"), Path("/fake/file2.py")]
- mock_find_files = mocker.patch.object(ClassRegistryUtils, "find_files_in_dir", return_value=mock_files)
- mock_register_file = mocker.patch.object(ClassRegistryUtils, "register_classes_in_file")
+ mock_find_files = mocker.patch.object(
+ ClassRegistryUtils, "find_files_in_dir", return_value=mock_files
+ )
+ mock_register_file = mocker.patch.object(
+ ClassRegistryUtils, "register_classes_in_file"
+ )
- ClassRegistryUtils.register_classes_in_folder(folder_path="/fake/folder", base_class=BaseModel, is_recursive=True, is_include_imported=False)
+ ClassRegistryUtils.register_classes_in_folder(
+ folder_path="/fake/folder",
+ base_class=BaseModel,
+ is_recursive=True,
+ is_include_imported=False,
+ )
# Verify find_files_in_dir was called correctly
- mock_find_files.assert_called_once_with(dir_path="/fake/folder", pattern="*.py", is_recursive=True)
+ mock_find_files.assert_called_once_with(
+ dir_path="/fake/folder", pattern="*.py", is_recursive=True
+ )
# Verify register_classes_in_file was called for each file
assert mock_register_file.call_count == 2
- mock_register_file.assert_any_call(file_path="/fake/file1.py", base_class=BaseModel, is_include_imported=False)
- mock_register_file.assert_any_call(file_path="/fake/file2.py", base_class=BaseModel, is_include_imported=False)
+ mock_register_file.assert_any_call(
+ file_path="/fake/file1.py", base_class=BaseModel, is_include_imported=False
+ )
+ mock_register_file.assert_any_call(
+ file_path="/fake/file2.py", base_class=BaseModel, is_include_imported=False
+ )