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.
Refactor/epic cleanups and renames 4 (#342)
Louis Choquel3de5df87dda9
diff --git a/.badges/tests.json b/.badges/tests.jsonindex 38adf4c62..04f36c790 100644--- a/.badges/tests.json+++ b/.badges/tests.json@@ -1,7 +1,7 @@{"schemaVersion": 1,"label": "tests",- "message": "1112",+ "message": "1095","color": "blue","cacheSeconds": 300}\ No newline at end of filediff --git a/.cursor/rules/llms.mdc b/.cursor/rules/llms.mdcindex e783f5553..9ed153b28 100644--- a/.cursor/rules/llms.mdc+++ b/.cursor/rules/llms.mdc@@ -21,7 +21,7 @@ An llm_handle can be either:```toml[aliases]-base-claude = "claude-4-sonnet"+base-claude = "claude-4.5-sonnet"base-gpt = "gpt-5"base-gemini = "gemini-2.5-flash"base-mistral = "mistral-medium"diff --git a/.cursor/rules/pipelex.mdc b/.cursor/rules/pipelex.mdcindex ccbe7e05d..5dcea3bff 100644--- a/.cursor/rules/pipelex.mdc+++ b/.cursor/rules/pipelex.mdc@@ -123,7 +123,7 @@ from datetime import datetimefrom typing import List, Optionalfrom pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContent# IMPORTANT: THE CLASS MUST BE A SUBCLASS OF StructuredContentclass YourModel(StructuredContent): # Always be a subclass of StructuredContent@@ -927,7 +927,7 @@ An llm_handle can be either:```toml[aliases]-base-claude = "claude-4-sonnet"+base-claude = "claude-4.5-sonnet"base-gpt = "gpt-5"base-gemini = "gemini-2.5-flash"base-mistral = "mistral-medium"diff --git a/.env.example b/.env.exampleindex a82594c92..65770cace 100644--- a/.env.example+++ b/.env.example@@ -1,37 +1,45 @@-PIPELEX_API_TOKEN=-PIPELEX_API_BASE_URL=http://localhost:8081/api+# [OPTIONAL] Free Pipelex Inference API key - Get yours on Discord: https://go.pipelex.com/discord+# No credit card required, limited time offer+PIPELEX_INFERENCE_API_KEY=+# OpenAI: to use models like GPT-4o and GPT-5OPENAI_API_KEY=-AWS_ACCESS_KEY_ID=-AWS_SECRET_ACCESS_KEY=-AWS_REGION=-+# Azure: to use models like GPT-4o and GPT-5 from OpenAI but on Azure cloudAZURE_API_BASE=AZURE_API_VERSION=AZURE_API_KEY=+# AWS Bedrock - To use models via Amazon Bedrock: supports Claude models and many open-source models+AWS_ACCESS_KEY_ID=+AWS_SECRET_ACCESS_KEY=+AWS_REGION=++# To use Claude models directly from their creator, AnthropicANTHROPIC_API_KEY=+# To use Mistral modelsMISTRAL_API_KEY=+# To use perplexity, including results from web searchPERPLEXITY_API_KEY=PERPLEXITY_API_ENDPOINT=https://api.perplexity.ai+# To generate images from fal.ai, the service of Forest LabsFAL_API_KEY=+# Google AI Studio - Use GOOGLE_API_KEY for direct API access (simpler, rate-limited)+GOOGLE_API_KEY=++# Google Cloud Platform (GCP) - Use these for production Vertex AI access (requires GCP project setup)+# We recomment to use GOOGLE_API_KEY OR GCP credentials, not bothGCP_PROJECT_ID=GCP_LOCATION=GCP_CREDENTIALS_FILE_PATH=gcp_credentials.json-CUSTOM_ENDPOINT_BASE_URL=http://localhost:11434/v1-CUSTOM_ENDPOINT_API_KEY=-+# To use Grok from x.aiXAI_API_KEY=XAI_API_ENDPOINT=https://api.x.ai/v1/-PIPELEX_INFERENCE_API_KEY=-+# To get access to many models with one key from blackbox.aiBLACKBOX_API_KEY=--GOOGLE_API_KEY=\ No newline at end of filediff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.mdindex 38231fed6..91824da96 100644--- a/.github/copilot-instructions.md+++ b/.github/copilot-instructions.md@@ -245,7 +245,7 @@ from datetime import datetimefrom typing import List, Optionalfrom pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContent# IMPORTANT: THE CLASS MUST BE A SUBCLASS OF StructuredContentclass YourModel(StructuredContent): # Always be a subclass of StructuredContent@@ -798,7 +798,7 @@ An llm_handle can be either:```toml[aliases]-base-claude = "claude-4-sonnet"+base-claude = "claude-4.5-sonnet"base-gpt = "gpt-5"base-gemini = "gemini-2.5-flash"base-mistral = "mistral-medium"diff --git a/.github/workflows/check-test-count-badge.yml b/.github/workflows/check-test-count-badge.ymlindex bc4ddb7c7..8657f9cc6 100644--- a/.github/workflows/check-test-count-badge.yml+++ b/.github/workflows/check-test-count-badge.yml@@ -2,6 +2,8 @@ name: Check test count matches badgeon:pull_request:+ branches:+ - mainjobs:check:diff --git a/.pipelex/inference/deck/base_deck.toml b/.pipelex/inference/deck/base_deck.tomlindex 73653e70c..808f9de31 100644--- a/.pipelex/inference/deck/base_deck.toml+++ b/.pipelex/inference/deck/base_deck.toml@@ -6,7 +6,7 @@####################################################################################################[aliases]-base-claude = "claude-4-sonnet"+base-claude = "claude-4.5-sonnet"base-gpt = "gpt-5"base-gemini = "gemini-2.5-flash"base-mistral = "mistral-medium"@@ -17,8 +17,10 @@ best-gemini = "gemini-2.5-pro"best-mistral = "mistral-medium"best-grok = "grok-3"+cheap-gpt = "gpt-4o-mini"cheap_llm_for_text = "gpt-4o-mini"cheap_llm_for_object = "gpt-4o-mini"+cheap_llm_for_vision = "gemini-2.5-flash-lite"base_llm_for_text = "gpt-4o-mini"base_llm_for_object = "gpt-4o-mini"@@ -30,7 +32,7 @@ smart_llm = ["gpt-5","gemini-2.5-pro",]-llm_for_large_codebase = ["gemini-2.5-pro", "claude-4-sonnet", "gpt-5"]+llm_for_large_codebase = ["gemini-2.5-pro", "claude-4.5-sonnet", "gpt-5"]# Image generation aliasesbase-img-gen = "flux-pro/v1.1"@@ -53,6 +55,8 @@ cheap_llm_to_structure = { llm_handle = "cheap_llm_for_object", temperature = 0.llm_for_testing_gen_text = { llm_handle = "base_llm_for_text", temperature = 0.5 }llm_for_testing_gen_object = { llm_handle = "base_llm_for_object", temperature = 0.5 }+llm_for_testing_vision = { llm_handle = "cheap_llm_for_vision", temperature = 0.5 }+llm_for_testing_vision_structured = { llm_handle = "cheap-gpt", temperature = 0.5 }##################################################################################################### LLM Presets — Specific skills@@ -62,7 +66,7 @@ llm_cheap = { llm_handle = "base-gemini", temperature = 0.1 }# Generation skillsllm_for_factual_writing = { llm_handle = "base-gpt", temperature = 0.1 }-llm_for_creative_writing = { llm_handle = "claude-4-sonnet", temperature = 0.9 }+llm_for_creative_writing = { llm_handle = "claude-4.5-sonnet", temperature = 0.9 }# Reasoning skillsllm_to_reason_short = { llm_handle = "base-claude", temperature = 0.5, max_tokens = 500 }@@ -89,7 +93,7 @@ llm_for_img_to_text = { llm_handle = "base-claude", temperature = 0.1 }# Extraction skillsllm_to_extract_diagram = { llm_handle = "base-claude", temperature = 0.5 }-llm_to_extract_invoice = { llm_handle = "claude-4-sonnet", temperature = 0.1 }+llm_to_extract_invoice = { llm_handle = "claude-4.5-sonnet", temperature = 0.1 }llm_to_extract_invoice_from_scan = { llm_handle = "base-claude", temperature = 0.5 }llm_to_extract_legal_terms = { llm_handle = "base-claude", temperature = 0.1 }llm_to_extract_tables = { llm_handle = "base-claude", temperature = 0.1 }diff --git a/AGENTS.md b/AGENTS.mdindex 38231fed6..91824da96 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -245,7 +245,7 @@ from datetime import datetimefrom typing import List, Optionalfrom pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContent# IMPORTANT: THE CLASS MUST BE A SUBCLASS OF StructuredContentclass YourModel(StructuredContent): # Always be a subclass of StructuredContent@@ -798,7 +798,7 @@ An llm_handle can be either:```toml[aliases]-base-claude = "claude-4-sonnet"+base-claude = "claude-4.5-sonnet"base-gpt = "gpt-5"base-gemini = "gemini-2.5-flash"base-mistral = "mistral-medium"diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 7c71e77d4..d22ec5c4b 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -2,27 +2,69 @@## [Unreleased]-### Fixed+### Highlights-- Fix Makefile target `pyright`-- Fix a bug with the inputs of the `PipeLLM`.+- In the `PipeLLM`, the image inputs can now be used and tagged in the prompt like all other concepts.+- Use claude-4.5-sonnet instead of claude-4-sonnet in the base deck.### Added--- The `pipe-builder` will now sort pipes by dependencies.-- Added the class `Flow` that represents the flow of pipe signatures.+ - Added `Flow` class that represents the flow of pipe signatures+ - Added `pipe-builder` command `flow` to generate flow view from pipeline brief+ - Added `FlowFactory` class to create Flow from PipelexBundleSpec or PLX files+ - Added `sort_pipes_by_dependencies()` function for topological sorting of pipes+ - Added `pipe_sorter.py` module for pipe dependency sorting utilities+ - Added `search_for_nested_image_fields_in_structure_class()` method to Concept class+ - Added `image_field_search.py` module with utilities to search for image fields in structure classes+ - Added `pipe_dependencies` property to PipeBlueprint and controller blueprints+ - Added `ordered_pipe_dependencies` property to PipeBlueprint for ordered dependencies+ - Added `get_native_concept()` function to hub+ - Added `get_pipes()` function to hub+ - Added `remove_concepts_by_codes()` method to ConceptLibraryAbstract+ - Added `remove_pipes_by_codes()` method to PipeLibraryAbstract+ - Added template preprocessing with `preprocess_template()` function+ - Added better dependency checking for optional SDK packages (anthropic, mistralai, boto3, aioboto3)+ - Added `MissingDependencyError` exception for missing optional dependencies### Changed+ - Cleanup env example and better explain how to set up keys in README and docs+ - Changed Gemini model configuration from `gemini-2.0-flash-exp` (free tier) to `gemini-2.0-flash` with pricing ($0.10 input, $0.40 output per million tokens)+ - Removed Gemini 1.5 series models (gemini-1.5-pro, gemini-1.5-flash, gemini-1.5-flash-8b) from configuration+ - Changed Gemini routing from `google` backend to `pipelex_inference` backend+ - Renamed `ConceptProviderAbstract` to `ConceptLibraryAbstract`+ - Renamed `DomainProviderAbstract` to `DomainLibraryAbstract`+ - Renamed `PipeProviderAbstract` to `PipeLibraryAbstract`+ - Renamed `PipeInputSpec` to `InputRequirements`+ - Renamed `PipeInputSpecFactory` to `InputRequirementsFactory`+ - Renamed `pipe_input.py` to `input_requirements.py`+ - Renamed `pipe_input_factory.py` to `input_requirements_factory.py`+ - Renamed `pipe_input_blueprint.py` to `input_requirement_blueprint.py`+ - Changed hub methods from `get_*_provider()` to `get_*_library()` pattern+ - Changed hub methods from `set_*_provider()` to `set_*_library()` pattern+ - Changed `PipeLLM` validation to check all inputs are in required variables+ - Updated `LLMPromptSpec` to handle image collections (lists/tuples) in addition to single images+ - Changed Mermaid diagram URL generation from `/img/` to `/svg/` endpoint+ - Updated kajson dependency from 0.3.0 to 0.3.1+ - Changed `PipeLLMPromptTemplate.make_llm_prompt()` to private method `_make_llm_prompt()`+ - Updated pipe-builder prompts to include concept specs for better context+ - Updated `PipelexBundleSpec.to_blueprint()` to sort pipes by dependencies before creating bundle+ - Changed exception base class from `PipelexError` to `PipelexException` throughout codebase+ - Updated Makefile pyright target to use `--pythonpath` flag correctly-- In the `PipeLLM`, the image inputs can now be used and tagged in the prompt like all other concepts.--### Removed--- Removed `gpt-5-mini` from the possible models in the `pipe-builder`.+### Fixed+ - Fixed Makefile target `pyright` to use correct pythonpath flag+ - Fixed bug with inputs of the `PipeLLM` where image inputs couldn't be used and tagged in prompts+ - Fixed image input handling in `LLMPromptSpec` to support both single images and image collections+ - Fixed template preprocessing to handle jinja2 templates correctly+ - Fixed hard dependencies by moving imports to function scope in model_lists.py+ - Updated README badge URL to point to main branch instead of feature/pipe-builder branch### Removed--- Removed useless functions in `LLMJobFactory`.+ - Removed `gpt-5-mini` from possible models in pipe-builder+ - Removed useless functions in `LLMJobFactory`: `make_llm_job_from_prompt_factory()`, `make_llm_job_from_prompt_template()`, `make_llm_job_from_prompt_contents()`+ - Removed `add_or_update_pipe()` method from PipeLibrary+ - Removed `get_optional_library_manager()` method from PipelexHub+ - Removed `get_optional_domain_provider()` and `get_optional_concept_provider()` methods from hub+ - Removed unused test fixtures (apple, cherry, blueberry, concept_provider, pretty) from conftest.py## [v0.11.0] - 2025-10-01diff --git a/CLAUDE.md b/CLAUDE.mdindex d65280668..ed646a5fb 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -245,7 +245,7 @@ from datetime import datetimefrom typing import List, Optionalfrom pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContent# IMPORTANT: THE CLASS MUST BE A SUBCLASS OF StructuredContentclass YourModel(StructuredContent): # Always be a subclass of StructuredContent@@ -798,7 +798,7 @@ An llm_handle can be either:```toml[aliases]-base-claude = "claude-4-sonnet"+base-claude = "claude-4.5-sonnet"base-gpt = "gpt-5"base-gemini = "gemini-2.5-flash"base-mistral = "mistral-medium"diff --git a/README.md b/README.mdindex 0cd6d0098..c55fc842a 100644--- a/README.md+++ b/README.md@@ -53,6 +53,7 @@ Stop reinventing AI workflows from scratch. With Pipelex, your proven methods be- [Quick start](#-quick-start)- [Prerequisites](#prerequisites)- [Installation](#installation)+ - [API Key Configuration](#api-key-configuration)- [Optional features](#optional-features)- [Contributing](#-contributing)- [Support](#-support)@@ -121,6 +122,79 @@ poetry add pipelexuv pip install pipelex```+### API Key Configuration++Pipelex supports two approaches for accessing AI models:++#### Option A: Pipelex Inference (Optional & Free)++Get a single API key that works with all providers (OpenAI, Anthropic, Google, Mistral, FAL, and more):++1. **Get your API key:**+ - Join our Discord community: [https://go.pipelex.com/discord](https://go.pipelex.com/discord)+ - Request your free API key (no credit card required, limited time offer) in the [🔑・free-api-key](https://discord.com/channels/1369447918955921449/1418228010431025233) channel++2. **Configure environment variables:**+ ```bash+ # Copy the example file+ cp .env.example .env++ # Edit .env and add your Pipelex Inference API key+ # PIPELEX_INFERENCE_API_KEY="your-api-key"+ ```++ > **Note:** Pipelex automatically loads environment variables from `.env` files. No need to manually source or export them.++3. **Verify backend configuration:**+ - The `pipelex_inference` backend is already enabled in `.pipelex/inference/backends.toml`+ - The default routing profile `pipelex_first` is configured to use Pipelex Inference++#### Option B: Bring Your Own Keys++Use your own API keys from individual providers (OpenAI, Anthropic, Google, Mistral, AWS Bedrock, Azure OpenAI, FAL):++1. **Configure environment variables:**+ ```bash+ # Copy the example file+ cp .env.example .env++ # Edit .env and add your provider API keys+ # OPENAI_API_KEY="your-openai-key"+ # ANTHROPIC_API_KEY="your-anthropic-key"+ # GOOGLE_API_KEY="your-google-key"+ # ... (add the keys you need)+ ```++2. **Configure backends:**+ - Edit `.pipelex/inference/backends.toml` to enable/disable backends+ - Set `enabled = true` for the backends you want to use+ - Set `enabled = false` for backends you don't need++3. **Select routing profile:**+ - Edit `.pipelex/inference/routing_profiles.toml`+ - Set `active = "custom_routing"` or create your own profile+ - Configure which backend handles which models++#### Option C: Mix & Match (Custom Routing)++Combine Pipelex Inference with your own keys for maximum flexibility:++1. **Configure environment variables:**+ ```bash+ # Copy and edit .env with both Pipelex and provider keys+ cp .env.example .env+ ```++2. **Enable multiple backends:**+ - Keep `pipelex_inference` enabled in `.pipelex/inference/backends.toml`+ - Enable specific provider backends (e.g., `openai`, `fal`)++3. **Create custom routing:**+ - Edit `.pipelex/inference/routing_profiles.toml`+ - Set up a hybrid profile routing some models to Pipelex, others to your backends++See the [configuration documentation](https://docs.pipelex.com/pages/configuration/config-technical/inference-backend-config/) for detailed setup instructions.+### Optional FeaturesThe package supports the following additional features:@@ -135,17 +209,17 @@ Install all extras:Using `pip`:```bash-pip install "pipelex[anthropic,google,mistralai,bedrock,fal]"+pip install "pipelex[anthropic,google,google-genai,mistralai,bedrock,fal]"```Using `poetry`:```bash-poetry add "pipelex[anthropic,google,mistralai,bedrock,fal,pypdfium2]"+poetry add "pipelex[anthropic,google,google-genai,mistralai,bedrock,fal]"```Using `uv`:```bash-uv pip install "pipelex[anthropic,google,mistralai,bedrock,fal]"+uv pip install "pipelex[anthropic,google,google-genai,mistralai,bedrock,fal]"```---diff --git a/docs/pages/build-reliable-ai-workflows-with-pipelex/configure-ai-llm-to-optimize-workflows.md b/docs/pages/build-reliable-ai-workflows-with-pipelex/configure-ai-llm-to-optimize-workflows.mdindex 57571ba42..33277a888 100644--- a/docs/pages/build-reliable-ai-workflows-with-pipelex/configure-ai-llm-to-optimize-workflows.md+++ b/docs/pages/build-reliable-ai-workflows-with-pipelex/configure-ai-llm-to-optimize-workflows.md@@ -51,7 +51,7 @@ llm_to_reason = {}llm_to_extract = {- llm_handle = "claude-4-sonnet",+ llm_handle = "claude-4.5-sonnet",temperature = 0.1,max_tokens = "auto"}diff --git a/docs/pages/build-reliable-ai-workflows-with-pipelex/define_your_concepts.md b/docs/pages/build-reliable-ai-workflows-with-pipelex/define_your_concepts.mdindex 00117026a..73408ce72 100644--- a/docs/pages/build-reliable-ai-workflows-with-pipelex/define_your_concepts.md+++ b/docs/pages/build-reliable-ai-workflows-with-pipelex/define_your_concepts.md@@ -80,7 +80,7 @@ For each concept that needs structured output, create a corresponding Python clafrom datetime import datetimefrom typing import List, Optionalfrom pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass Invoice(StructuredContent):invoice_number: str@@ -101,7 +101,7 @@ Use Pydantic's validation features to ensure data quality:```pythonfrom pydantic import field_validator-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass Employee(StructuredContent):name: str@@ -131,7 +131,7 @@ Not all data is always available. Use Optional fields with sensible defaults:```pythonfrom typing import Optionalfrom datetime import datetime-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass Meeting(StructuredContent):title: str@@ -160,7 +160,7 @@ Department = "An organizational unit within a company" # No Python model => tex```python# pipelex_libraries/pipelines/hr.py-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom datetime import datetimefrom typing import List, Optionaldiff --git a/docs/pages/build-reliable-ai-workflows-with-pipelex/kick-off-a-knowledge-pipeline-project.md b/docs/pages/build-reliable-ai-workflows-with-pipelex/kick-off-a-knowledge-pipeline-project.mdindex 981804e5c..26a39347f 100644--- a/docs/pages/build-reliable-ai-workflows-with-pipelex/kick-off-a-knowledge-pipeline-project.md+++ b/docs/pages/build-reliable-ai-workflows-with-pipelex/kick-off-a-knowledge-pipeline-project.md@@ -71,7 +71,7 @@ A domain consists of:2. **Python Models** (`.py`)```python- from pipelex.core.stuffs.stuff_content import StructuredContent+ from pipelex.core.stuffs.structured_content import StructuredContentfrom pydantic import Fieldfrom typing import Listfrom datetime import datediff --git a/docs/pages/configuration/config-technical/inference-backend-config.md b/docs/pages/configuration/config-technical/inference-backend-config.mdindex 9baf86ad6..b87dca5a4 100644--- a/docs/pages/configuration/config-technical/inference-backend-config.md+++ b/docs/pages/configuration/config-technical/inference-backend-config.md@@ -2,6 +2,43 @@The Inference Backend Configuration System manages how Pipelex handles AI model providers, model routing, and inference settings across LLMs, OCR, and image generation. This unified system provides a flexible and scalable way to configure multiple inference backends and route different types of AI models to the appropriate providers.+## Configuration Approaches++Pipelex supports three flexible approaches for accessing AI models:++### Option A: Pipelex Inference (Optional & Free)++Get a single API key that works with all major providers (OpenAI, Anthropic, Google, Mistral, FAL, and more). This is the **recommended approach for getting started quickly**.++- ✅ Single API key for all providers+- ✅ Simplified configuration+- ✅ Automatic model routing+- ✅ Free on Discord (limited time offer)++See [Pipelex Inference](#pipelex-inference) section below for setup details.++### Option B: Bring Your Own Keys++Use your own API keys from individual providers for full control and direct billing. Ideal for production deployments with existing provider relationships.++- ✅ Direct provider relationships+- ✅ Full control over billing+- ✅ No intermediary+- ✅ Support for all provider-specific features++See [Inference Backends](#inference-backends) section below for configuration.++### Option C: Mix & Match (Custom Routing)++Configure custom routing profiles to use your own keys for some models and Pipelex Inference for others. This gives you full flexibility to optimize for cost, performance, or rate limits.++- ✅ Hybrid approach+- ✅ Cost optimization+- ✅ Performance tuning+- ✅ Gradual migration between approaches++See [Routing Profiles](#routing-profiles) section below for setup.+## OverviewThe inference backend system is built around four key concepts:@@ -34,32 +71,58 @@ All inference backend configurations are stored in the `.pipelex/inference/` dir└── overrides.toml # Custom overrides```-## Pipelex Inference+## Pipelex Inference (Optional & Free)-Pipelex Inference is a unified inference backend that provides access to all major LLM providers through a single API key. This is the recommended approach for getting started quickly with Pipelex.+Pipelex Inference is a unified inference backend that provides access to all major AI providers through a single API key. This is the **recommended approach for getting started quickly** with Pipelex, and it's **completely optional**.### Benefits- **Single API Key**: Access OpenAI, Anthropic, Google, Mistral, FAL, and more with one key+- **Free to Get Started**: Available free on Discord (no credit card required, limited time offer)- **Simplified Configuration**: No need to manage multiple provider credentials- **Automatic Routing**: All AI models (LLMs, OCR, image generation) are automatically routed to their respective providers- **Unified Interface**: Same configuration system for text generation, OCR, and image generation### Setup-1. Join our Discord community to get your free Pipelex Inference API key (no credit card required, limited time offer):- - Visit [https://go.pipelex.com/discord](https://go.pipelex.com/discord) to join- - Request your API key in the appropriate channel once you're in-2. Set the environment variable:+1. **Get your API key:**+ - Visit [https://go.pipelex.com/discord](https://go.pipelex.com/discord) to join our Discord+ - Request your free API key in the appropriate channel+ - No credit card required (limited time offer)++2. **Configure environment variables:**```bash- export PIPELEX_INFERENCE_API_KEY="your-api-key"+ # Copy the example environment file+ cp .env.example .env++ # Edit .env and add your Pipelex Inference API key+ # PIPELEX_INFERENCE_API_KEY="your-api-key"```-3. Configure in `.pipelex/inference/backends.toml`:++3. **Verify backend configuration:**++ The `pipelex_inference` backend should already be enabled in `.pipelex/inference/backends.toml`:+```toml[pipelex_inference]enabled = true+ endpoint = "https://inference.pipelex.com/v1"api_key = "${PIPELEX_INFERENCE_API_KEY}"```++ The environment variable `${PIPELEX_INFERENCE_API_KEY}` will be automatically loaded from your `.env` file.++4. **Verify routing configuration:**++ The default routing profile in `.pipelex/inference/routing_profiles.toml` should be set to `pipelex_first`:++ ```toml+ active = "pipelex_first"++ [profiles.pipelex_first]+ description = "Use Pipelex Inference backend for all its supported models"+ default = "pipelex_inference"+ ```### Usage@@ -68,7 +131,7 @@ Once configured, all models are available through the unified backend. Use stand```plx[pipe.example]type = "PipeLLM"-llm = { llm_handle = "claude-4-sonnet", temperature = 0.7 }+llm = { llm_handle = "claude-4.5-sonnet", temperature = 0.7 }# Model automatically routed through Pipelex Inference```@@ -88,11 +151,55 @@ Backends represent AI service providers that can offer LLMs, OCR models, or imag### Backend Configuration-Configure backends in `.pipelex/inference/backends.toml`:+#### Step 1: Configure Environment Variables++First, set up your API keys in the `.env` file:++```bash+# Copy the example file+cp .env.example .env++# Edit .env and add your provider API keys+```++> **Note:** Pipelex automatically loads environment variables from `.env` files using python-dotenv. No need to manually source or export them.++The `.env.example` file contains all available providers with helpful comments:++```bash+# [OPTIONAL] Free Pipelex Inference API key - Get yours on Discord: https://go.pipelex.com/discord+PIPELEX_INFERENCE_API_KEY=++OPENAI_API_KEY=++# AWS Bedrock - For accessing models via Amazon Bedrock+AWS_ACCESS_KEY_ID=+AWS_SECRET_ACCESS_KEY=+AWS_REGION=++ANTHROPIC_API_KEY=+MISTRAL_API_KEY=++# Google AI Studio - Use GOOGLE_API_KEY for direct API access (simpler, rate-limited)+GOOGLE_API_KEY=++# Google Cloud Platform (GCP) - Use these for production Vertex AI access+# Choose GOOGLE_API_KEY OR GCP credentials, not both+GCP_PROJECT_ID=+GCP_LOCATION=+GCP_CREDENTIALS_FILE_PATH=gcp_credentials.json++FAL_API_KEY=+# ... (see .env.example for full list)+```++#### Step 2: Enable/Disable Backends++Configure which backends to use in `.pipelex/inference/backends.toml`:```toml[openai]-enabled = true+enabled = true # Set to false to disableapi_key = "${OPENAI_API_KEY}"[anthropic]@@ -105,14 +212,14 @@ api_key = "${MISTRAL_API_KEY}"[fal]enabled = true-api_key = "${FAL_KEY}"+api_key = "${FAL_API_KEY}"[internal]enabled = true# No API key needed for internal/local processing```-Set `enabled` to `true` to activate a backend, or `false` to disable it. When a backend is enabled, you must set its corresponding API key as an environment variable.+The `${VARIABLE_NAME}` syntax automatically loads values from your `.env` file. Set `enabled = true` to activate a backend, or `false` to disable it.### Model Specifications@@ -144,33 +251,101 @@ costs = { input = 0.04, output = 0.0 }## Routing Profiles-Routing profiles determine which backend handles specific models. Configure them in `.pipelex/inference/routing_profiles.toml`:+Routing profiles determine which backend handles specific models. This is where you configure the **Mix & Match approach** (Option C) to optimize your setup. Configure them in `.pipelex/inference/routing_profiles.toml`:++### Profile Examples++**All Pipelex Inference (Option A):**+Setup:+```bash+# In .env+PIPELEX_INFERENCE_API_KEY="your-pipelex-key"+```++In `.pipelex/inference/routing_profiles.toml`:```toml# Which profile to use-active = "all_pipelex"+active = "pipelex_first"-[profiles.all_pipelex]-description = "Use Pipelex Inference backend for all models"+[profiles.pipelex_first]+description = "Use Pipelex Inference backend for all its supported models"default = "pipelex_inference"+```-[profiles.mixed]+**Native Providers Only (Option B):**++Setup:+```bash+# In .env - add all provider keys you need+OPENAI_API_KEY="your-openai-key"+ANTHROPIC_API_KEY="your-anthropic-key"+GOOGLE_API_KEY="your-google-key"+FAL_API_KEY="your-fal-key"+```++In `.pipelex/inference/routing_profiles.toml`:+```toml+active = "custom_routing"++[profiles.custom_routing]description = "Route models to their native providers"default = "openai"-[profiles.mixed.routes]+[profiles.custom_routing.routes]"claude-*" = "anthropic"-"gemini-*" = "vertexai"+"gemini-*" = "google""mistral-*" = "mistral""gpt-*" = "openai""gpt-image-*" = "openai""flux-*" = "fal"```+**Mix & Match (Option C):**++Setup:+```bash+# In .env - combine Pipelex with specific provider keys+PIPELEX_INFERENCE_API_KEY="your-pipelex-key"+OPENAI_API_KEY="your-openai-key" # For GPT models+FAL_API_KEY="your-fal-key" # For image generation+```++In `.pipelex/inference/routing_profiles.toml`:+```toml+active = "hybrid"++[profiles.hybrid]+description = "Use Pipelex for most models, native providers for specific ones"+default = "pipelex_inference"++[profiles.hybrid.routes]+# Use your own OpenAI key for GPT models (better rate limits)+"gpt-*" = "openai"+# Use your own FAL key for image generation (direct billing)+"flux-*" = "fal"+# All other models use Pipelex Inference (claude, gemini, mistral, etc.)+```++### Routing System Features+The routing system supports:-- Exact matches-- Wildcard patterns (prefix: `pattern*`, suffix: `*pattern`, contains: `*pattern*`)-- Default fallback++- **Exact matches**: `"gpt-4o-mini" = "openai"`+- **Wildcard patterns**:+ - Prefix: `"gpt-*" = "openai"`+ - Suffix: `"*-turbo" = "openai"`+ - Contains: `"*-vision-*" = "openai"`+- **Default fallback**: `default = "pipelex_inference"`++### Use Cases for Mix & Match++Common scenarios for hybrid routing:++1. **Cost Optimization**: Use Pipelex Inference for expensive models, your own keys for cheaper ones+2. **Rate Limits**: Use your own keys for high-volume models to avoid shared rate limits+3. **Gradual Migration**: Start with Pipelex Inference, gradually move to your own keys as usage grows+4. **Provider Features**: Use native providers for models requiring specific features not proxied through Pipelex Inference## Model Deck@@ -183,14 +358,14 @@ Define user-friendly names that map to model names in `.pipelex/inference/deck/b```toml[aliases]# LLM aliases-base-claude = "claude-4-sonnet"+base-claude = "claude-4.5-sonnet"base-gpt = "gpt-5"base-gemini = "gemini-2.5-flash"base-mistral = "mistral-medium"smart_llm = ["claude-4.5-sonnet","claude-4.1-opus",- "claude-4-sonnet",+ "claude-4.5-sonnet","gpt-5","gemini-2.5-pro",]@@ -219,8 +394,8 @@ cheap_llm_for_text = { llm_handle = "cheap_llm_for_text", temperature = 0.5 }cheap_llm_for_object = { llm_handle = "cheap_llm_for_object", temperature = 0.5 }# Task-specific presets-llm_for_creative_writing = { llm_handle = "claude-4-sonnet", temperature = 0.9 }-llm_to_extract_invoice = { llm_handle = "claude-4-sonnet", temperature = 0.1 }+llm_for_creative_writing = { llm_handle = "claude-4.5-sonnet", temperature = 0.9 }+llm_to_extract_invoice = { llm_handle = "claude-4.5-sonnet", temperature = 0.1 }llm_to_reason = { llm_handle = "base-claude", temperature = 1 }### OCR Presets@@ -318,25 +493,33 @@ Common error types:## Best Practices-1. **Backend Management**:- - Keep API keys in environment variables- - Enable only the backends you need- - Document custom backend configurations+1. **Choosing Your Configuration Approach**:+ - **Starting out?** Use Pipelex Inference (Option A) to get running quickly+ - **Production deployment?** Consider bringing your own keys (Option B) for direct billing control+ - **Optimizing costs/performance?** Use Mix & Match (Option C) for maximum flexibility+ - You can switch between approaches at any time by changing your routing profile++2. **Backend Management**:+ - Keep API keys in environment variables (never commit them)+ - Enable only the backends you need to reduce configuration complexity+ - Document custom backend configurations for your team-2. **Model Routing**:- - Use specific routing profiles for different environments+3. **Model Routing**:+ - Use specific routing profiles for different environments (dev, staging, prod)- Test routing rules before production deployment- - Consider cost implications when routing models+ - Consider cost implications when routing models (some providers are cheaper for certain models)+ - Monitor usage patterns to optimize your routing strategy-3. **Presets and Aliases**:- - Create task-specific presets for consistency- - Use meaningful alias names- - Document custom presets and their use cases+4. **Presets and Aliases**:+ - Create task-specific presets for consistency across your pipelines+ - Use meaningful alias names that describe the use case (e.g., `llm_to_extract_invoice`)+ - Document custom presets and their use cases in your team documentation-4. **Customization**:+5. **Customization**:- Use `overrides.toml` for project-specific settings- - Keep base configurations unchanged+ - Keep base configurations unchanged to make upgrades easier- Version control your custom configurations+ - Share routing profiles and presets across your team## Validationdiff --git a/docs/pages/quick-start/index.md b/docs/pages/quick-start/index.mdindex 451303cef..c2a3680cd 100644--- a/docs/pages/quick-start/index.md+++ b/docs/pages/quick-start/index.md@@ -166,7 +166,7 @@ Using the [Pydantic BaseModel](https://docs.pydantic.dev/latest/) syntax, define`pipelex_libraries/pipelines/characters.py````python-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContent# Define the structure of your output here# This class must inherit from StructuredContent@@ -221,7 +221,7 @@ We want to extract structured information from the description field. Thus we ha```python# pipelex_libraries/pipelines/character_model.py-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContent# input classclass Character(StructuredContent):diff --git a/pipelex/cli/commands/build_cmd.py b/pipelex/cli/commands/build_cmd.pyindex 7036f43dd..f6e4db3e7 100644--- a/pipelex/cli/commands/build_cmd.py+++ b/pipelex/cli/commands/build_cmd.py@@ -25,6 +25,7 @@ pipelex build partial "Given an expense report, apply company rules" -o results/pipelex build flow "Given an expense report, apply company rules" -o results/flow.jsonOther ideas:+pipelex build pipe "Take a photo as input, and render the opposite of the photo, don't structure anything, use only text content, be super concise"pipelex build pipe "Take a photo as input, and render the opposite of the photo"pipelex build pipe "Given an RDFP PDF, build a compliance matrix""""diff --git a/pipelex/cli/commands/show_cmd.py b/pipelex/cli/commands/show_cmd.pyindex 51743d67c..f7068cb11 100644--- a/pipelex/cli/commands/show_cmd.py+++ b/pipelex/cli/commands/show_cmd.py@@ -8,7 +8,7 @@ import typerfrom pipelex import pretty_printfrom pipelex.cogt.model_backends.model_lists import ModelListerfrom pipelex.exceptions import PipelexCLIError, PipelexConfigError-from pipelex.hub import get_pipe_provider, get_required_pipe+from pipelex.hub import get_pipe_library, get_required_pipefrom pipelex.pipelex import Pipelexfrom pipelex.tools.config.manager import config_manager@@ -31,7 +31,7 @@ def do_list_pipes(relative_config_folder_path: str = "pipelex_libraries") -> NonPipelex.make(relative_config_folder_path=relative_config_folder_path, from_file=False)try:- get_pipe_provider().pretty_list_pipes()+ get_pipe_library().pretty_list_pipes()except Exception as exc:msg = f"Failed to list pipes: {exc}"raise PipelexCLIError(msg) from excdiff --git a/pipelex/cli/commands/validate_cmd.py b/pipelex/cli/commands/validate_cmd.pyindex fcab31d02..01c05af4d 100644--- a/pipelex/cli/commands/validate_cmd.py+++ b/pipelex/cli/commands/validate_cmd.py@@ -7,8 +7,8 @@ import typerfrom pipelex import logfrom pipelex.cli.commands.common import is_pipelex_libraries_folder-from pipelex.hub import get_pipe_provider, get_pipeline_tracker-from pipelex.pipe_works.pipe_dry import dry_run_pipe, dry_run_pipes+from pipelex.hub import get_pipeline_tracker, get_pipes, get_required_pipe+from pipelex.pipe_run.dry_run import dry_run_pipe, dry_run_pipesfrom pipelex.pipelex import Pipelex@@ -21,7 +21,7 @@ def do_validate_all_libraries_and_dry_run(relative_config_folder_path: str = "./pipelex_instance = Pipelex.make(relative_config_folder_path=relative_config_folder_path, from_file=False)pipelex_instance.validate_libraries()- asyncio.run(dry_run_pipes(pipes=get_pipe_provider().get_pipes(), raise_on_failure=True))+ asyncio.run(dry_run_pipes(pipes=get_pipes(), raise_on_failure=True))log.info("Setup sequence passed OK, config and pipelines are validated.")@@ -37,7 +37,7 @@ def do_dry_run_pipe(pipe_code: str, relative_config_folder_path: str = "./pipeleasyncio.run(dry_run_pipe(- get_pipe_provider().get_required_pipe(pipe_code=pipe_code),+ get_required_pipe(pipe_code=pipe_code),raise_on_failure=True,),)diff --git a/pipelex/client/api_serializer.py b/pipelex/client/api_serializer.pyindex 9cec0aa91..7dabee824 100644--- a/pipelex/client/api_serializer.py+++ b/pipelex/client/api_serializer.py@@ -10,7 +10,7 @@ from pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.pipes.pipe_output import PipeOutputif TYPE_CHECKING:- from pipelex.core.stuffs.stuff_content import TextContent+ from pipelex.core.stuffs.text_content import TextContentclass ApiSerializer:diff --git a/pipelex/client/client.py b/pipelex/client/client.pyindex 99f133027..a199776b6 100644--- a/pipelex/client/client.py+++ b/pipelex/client/client.py@@ -8,8 +8,8 @@ from pipelex.client.pipeline_response_factory import PipelineResponseFactoryfrom pipelex.client.protocol import CompactMemory, PipelexProtocol, PipelineResponsefrom pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeOutputMultiplicityfrom pipelex.exceptions import ClientAuthenticationError+from pipelex.pipe_run.pipe_run_params import PipeOutputMultiplicityfrom pipelex.tools.environment import get_required_envdiff --git a/pipelex/client/pipeline_request_factory.py b/pipelex/client/pipeline_request_factory.pyindex 9cc57c2a2..ae2112553 100644--- a/pipelex/client/pipeline_request_factory.py+++ b/pipelex/client/pipeline_request_factory.py@@ -3,7 +3,7 @@ from typing import Anyfrom pipelex.client.api_serializer import ApiSerializerfrom pipelex.client.protocol import COMPACT_MEMORY_KEY, PipelineRequestfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_run_params import PipeOutputMultiplicity+from pipelex.pipe_run.pipe_run_params import PipeOutputMultiplicityclass PipelineRequestFactory:diff --git a/pipelex/client/protocol.py b/pipelex/client/protocol.pyindex f47172cf5..8d91b6d98 100644--- a/pipelex/client/protocol.py+++ b/pipelex/client/protocol.py@@ -5,8 +5,8 @@ from pydantic import BaseModelfrom typing_extensions import runtime_checkablefrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_run_params import PipeOutputMultiplicityfrom pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.pipe_run.pipe_run_params import PipeOutputMultiplicityfrom pipelex.types import StrEnumStuffContentOrData = dict[str, Any] | StuffContent | list[Any] | strdiff --git a/pipelex/cogt/content_generation/content_generator.py b/pipelex/cogt/content_generation/content_generator.pyindex 575f3636e..e8248a7f7 100644--- a/pipelex/cogt/content_generation/content_generator.py+++ b/pipelex/cogt/content_generation/content_generator.py@@ -250,6 +250,7 @@ class ContentGenerator(ContentGeneratorProtocol):prompting_style: PromptingStyle | None = None,template_category: Jinja2TemplateCategory = Jinja2TemplateCategory.LLM_PROMPT,) -> str:+ log.debug(f"context: {context}")jinja2_assignment = Jinja2Assignment(context=context,jinja2_name=jinja2_name,diff --git a/pipelex/cogt/llm/llm_prompt_spec.py b/pipelex/cogt/llm/llm_prompt_spec.pyindex 08e09c96f..a4198d7ef 100644--- a/pipelex/cogt/llm/llm_prompt_spec.py+++ b/pipelex/cogt/llm/llm_prompt_spec.py@@ -6,7 +6,7 @@ from pipelex import logfrom pipelex.cogt.exceptions import LLMPromptSpecErrorfrom pipelex.cogt.image.prompt_image_factory import PromptImageFactoryfrom pipelex.cogt.llm.llm_prompt import LLMPrompt-from pipelex.core.stuffs.stuff_content import ImageContent+from pipelex.core.stuffs.image_content import ImageContentfrom pipelex.hub import get_content_generator, get_template, get_template_providerfrom pipelex.tools.misc.context_provider_abstract import ContextProviderAbstract, ContextProviderExceptionfrom pipelex.tools.templating.jinja2_blueprint import Jinja2Blueprint@@ -20,6 +20,7 @@ if TYPE_CHECKING:from pipelex.cogt.image.prompt_image import PromptImage+# TODO: move this to pipe operatorsclass LLMPromptSpec(BaseModel):prompting_style: PromptingStyle | None = None@@ -101,27 +102,54 @@ class LLMPromptSpec(BaseModel):############################################################# User images############################################################- prompt_user_images: list[PromptImage] = []+ prompt_user_images: dict[str, PromptImage] = {}if self.user_images:for user_image_name in self.user_images:log.debug(f"Getting user image '{user_image_name}' from context")+ # Try to get as a single ImageContent firsttry:prompt_image_content = context_provider.get_typed_object_or_attribute(name=user_image_name, wanted_type=ImageContent)- except ContextProviderException as exc:- msg = f"Could not find a valid user image named '{user_image_name}' from the provided context_provider: {exc}"- raise LLMPromptSpecError(msg) from exc-- if prompt_image_content is not None: # An ImageContent can be optional..- if base_64 := prompt_image_content.base_64:- user_image = PromptImageFactory.make_prompt_image(base_64=base_64)- else:- image_uri = prompt_image_content.url- user_image = PromptImageFactory.make_prompt_image_from_uri(uri=image_uri)- prompt_user_images.append(user_image)+ if prompt_image_content is not None: # An ImageContent can be optional+ if base_64 := prompt_image_content.base_64:+ user_image = PromptImageFactory.make_prompt_image(base_64=base_64)+ else:+ image_uri = prompt_image_content.url+ user_image = PromptImageFactory.make_prompt_image_from_uri(uri=image_uri)+ prompt_user_images[user_image_name] = user_image+ except ContextProviderException:+ # If single image failed, try to get as a collection (list or tuple)+ try:+ image_collection = context_provider.get_typed_object_or_attribute(name=user_image_name, wanted_type=None)+ # Check if it's a list or tuple+ if isinstance(image_collection, (list, tuple)):+ for image_item in image_collection: # type: ignore[assignment]+ if isinstance(image_item, ImageContent):+ item_base_64 = image_item.base_64+ if item_base_64:+ user_image = PromptImageFactory.make_prompt_image(base_64=item_base_64) # type: ignore[arg-type]+ else:+ image_uri = image_item.url+ user_image = PromptImageFactory.make_prompt_image_from_uri(uri=image_uri)+ prompt_user_images[user_image_name] = user_image+ else:+ msg = (+ f"Could not find a valid user image or image collection named '{user_image_name}' from the provided context_provider"+ )+ raise LLMPromptSpecError(msg)+ except ContextProviderException as exc:+ msg = f"Could not find a valid user image named '{user_image_name}' from the provided context_provider: {exc}"+ raise LLMPromptSpecError(msg) from exc############################################################# User text############################################################+ # replace the image variables with numbered tags+ if prompt_user_images:+ if not extra_params:+ extra_params = {}+ for image_index, image_name in enumerate(prompt_user_images.keys()):+ extra_params[image_name] = f"[Image {image_index + 1}]"+ log.warning(f"Replacing image variable '{image_name}' with numbered tag '[Image {image_index + 1}]'")user_text = await self._unravel_text(context_provider=context_provider,jinja2_blueprint=self.user_text_jinja2_blueprint,@@ -156,7 +184,7 @@ class LLMPromptSpec(BaseModel):return LLMPrompt(system_text=system_text,user_text=user_text,- user_images=prompt_user_images,+ user_images=list(prompt_user_images.values()),)async def _unravel_text(@@ -174,6 +202,9 @@ class LLMPromptSpec(BaseModel):jinja2_blueprint.prompting_style = prompting_stylelog.verbose(f"Setting prompting style to {prompting_style}")+ log.info(f"extra_params: {extra_params}")+ log.info(f"jinja2_blueprint.extra_context: {jinja2_blueprint.extra_context}")+context: dict[str, Any] = context_provider.generate_jinja2_context()if extra_params:context.update(**extra_params)diff --git a/pipelex/cogt/model_backends/backend_library.py b/pipelex/cogt/model_backends/backend_library.pyindex ba43fe88c..085dd599d 100644--- a/pipelex/cogt/model_backends/backend_library.py+++ b/pipelex/cogt/model_backends/backend_library.py@@ -2,7 +2,6 @@ from typing import TYPE_CHECKING, Any, castfrom pydantic import Field, RootModel, ValidationError-from pipelex import logfrom pipelex.cogt.exceptions import (InferenceBackendCredentialsError,InferenceBackendCredentialsErrorType,@@ -133,7 +132,6 @@ class InferenceBackendLibrary(RootModel[InferenceBackendLibraryRoot]):model_specs=backend_model_specs,)self.root[backend_name] = backend- log.debug(f"Loaded inference backend '{backend_name}'")def list_backend_names(self) -> list[str]:return list(self.root.keys())diff --git a/pipelex/cogt/model_backends/model_lists.py b/pipelex/cogt/model_backends/model_lists.pyindex 3fd243bfd..b7f7aec82 100644--- a/pipelex/cogt/model_backends/model_lists.py+++ b/pipelex/cogt/model_backends/model_lists.py@@ -1,13 +1,14 @@from __future__ import annotations+import importlib.utilfrom datetime import datetimefrom typing import TYPE_CHECKING, Any-from anthropic import AuthenticationErrorfrom rich import boxfrom rich.console import Consolefrom rich.table import Table+from pipelex.cogt.exceptions import MissingDependencyErrorfrom pipelex.config import get_configif TYPE_CHECKING:@@ -18,10 +19,6 @@ if TYPE_CHECKING:from pipelex.exceptions import PipelexCLIErrorfrom pipelex.hub import get_models_managerfrom pipelex.pipelex import Pipelex-from pipelex.plugins.anthropic.anthropic_exceptions import AnthropicSDKUnsupportedError-from pipelex.plugins.anthropic.anthropic_llms import anthropic_list_available_models-from pipelex.plugins.bedrock.bedrock_llms import bedrock_list_available_models-from pipelex.plugins.mistral.mistral_llms import mistral_list_available_modelsfrom pipelex.plugins.openai.openai_llms import openai_list_available_modelsfrom pipelex.plugins.plugin_sdk_registry import Pluginfrom pipelex.tools.aws.aws_config import AwsCredentialsError@@ -86,6 +83,22 @@ class ModelLister:any_listed = Truecase "anthropic" | "bedrock_anthropic":+ if importlib.util.find_spec("anthropic") is None:+ lib_name = "anthropic"+ lib_extra_name = "anthropic"+ msg = (+ "The anthropic SDK is required to use Anthropic models via the anthropic client. "+ "However, you can use Anthropic models through bedrock directly "+ "by using the 'bedrock-anthropic-claude' llm family. (eg: bedrock-anthropic-claude)"+ )+ raise MissingDependencyError(+ lib_name,+ lib_extra_name,+ msg,+ )++ from pipelex.plugins.anthropic.anthropic_exceptions import AnthropicSDKUnsupportedError # noqa: PLC0415+try:await cls._list_anthropic_models(sdk=sdk,@@ -101,6 +114,20 @@ class ModelLister:continuecase "mistral":+ if importlib.util.find_spec("mistralai") is None:+ lib_name = "mistralai"+ lib_extra_name = "mistral"+ msg = (+ "The mistralai SDK is required to use Mistral models through the mistralai client. "+ "However, you can use Mistral models through bedrock directly "+ "by using the 'bedrock-mistral' llm family. (eg: bedrock-mistral-large)"+ )+ raise MissingDependencyError(+ lib_name,+ lib_extra_name,+ msg,+ )+cls._list_mistral_models(sdk=sdk,backend_name=backend_name,@@ -111,6 +138,16 @@ class ModelLister:any_listed = Truecase "bedrock" | "bedrock_aioboto3":+ if importlib.util.find_spec("boto3") is None or importlib.util.find_spec("aioboto3") is None:+ lib_name = "boto3,aioboto3"+ lib_extra_name = "bedrock"+ msg = "The boto3 and aioboto3 SDKs are required to use Bedrock models."+ raise MissingDependencyError(+ lib_name,+ lib_extra_name,+ msg,+ )+await cls._list_bedrock_models(sdk=sdk,backend_name=backend_name,@@ -186,6 +223,24 @@ class ModelLister:any_listed: bool,) -> None:"""List Anthropic models."""+ if importlib.util.find_spec("anthropic") is None:+ lib_name = "anthropic"+ lib_extra_name = "anthropic"+ msg = (+ "The anthropic SDK is required to use Anthropic models via the anthropic client. "+ "However, you can use Anthropic models through bedrock directly "+ "by using the 'bedrock-anthropic-claude' llm family. (eg: bedrock-anthropic-claude)"+ )+ raise MissingDependencyError(+ lib_name,+ lib_extra_name,+ msg,+ )++ from anthropic import AuthenticationError # noqa: PLC0415++ from pipelex.plugins.anthropic.anthropic_llms import anthropic_list_available_models # noqa: PLC0415+plugin = Plugin(sdk=sdk, backend=backend_name)try:anthropic_models = await anthropic_list_available_models(@@ -222,6 +277,22 @@ class ModelLister:any_listed: bool,) -> None:"""List Mistral models."""+ if importlib.util.find_spec("mistralai") is None:+ lib_name = "mistralai"+ lib_extra_name = "mistral"+ msg = (+ "The mistralai SDK is required to use Mistral models through the mistralai client. "+ "However, you can use Mistral models through bedrock directly "+ "by using the 'bedrock-mistral' llm family. (eg: bedrock-mistral-large)"+ )+ raise MissingDependencyError(+ lib_name,+ lib_extra_name,+ msg,+ )++ from pipelex.plugins.mistral.mistral_llms import mistral_list_available_models # noqa: PLC0415+mistral_models = mistral_list_available_models()if flat:@@ -251,6 +322,18 @@ class ModelLister:any_listed: bool,) -> None:"""List Bedrock models."""+ if importlib.util.find_spec("boto3") is None or importlib.util.find_spec("aioboto3") is None:+ lib_name = "boto3,aioboto3"+ lib_extra_name = "bedrock"+ msg = "The boto3 and aioboto3 SDKs are required to use Bedrock models."+ raise MissingDependencyError(+ lib_name,+ lib_extra_name,+ msg,+ )++ from pipelex.plugins.bedrock.bedrock_llms import bedrock_list_available_models # noqa: PLC0415+plugin = Plugin(sdk=sdk, backend=backend_name)try:diff --git a/pipelex/config_template/inference/deck/base_deck.toml b/pipelex/config_template/inference/deck/base_deck.tomlindex 73653e70c..c262d6cfb 100644--- a/pipelex/config_template/inference/deck/base_deck.toml+++ b/pipelex/config_template/inference/deck/base_deck.toml@@ -6,7 +6,7 @@####################################################################################################[aliases]-base-claude = "claude-4-sonnet"+base-claude = "claude-4.5-sonnet"base-gpt = "gpt-5"base-gemini = "gemini-2.5-flash"base-mistral = "mistral-medium"@@ -30,7 +30,7 @@ smart_llm = ["gpt-5","gemini-2.5-pro",]-llm_for_large_codebase = ["gemini-2.5-pro", "claude-4-sonnet", "gpt-5"]+llm_for_large_codebase = ["gemini-2.5-pro", "claude-4.5-sonnet", "gpt-5"]# Image generation aliasesbase-img-gen = "flux-pro/v1.1"@@ -62,7 +62,7 @@ llm_cheap = { llm_handle = "base-gemini", temperature = 0.1 }# Generation skillsllm_for_factual_writing = { llm_handle = "base-gpt", temperature = 0.1 }-llm_for_creative_writing = { llm_handle = "claude-4-sonnet", temperature = 0.9 }+llm_for_creative_writing = { llm_handle = "claude-4.5-sonnet", temperature = 0.9 }# Reasoning skillsllm_to_reason_short = { llm_handle = "base-claude", temperature = 0.5, max_tokens = 500 }@@ -89,7 +89,7 @@ llm_for_img_to_text = { llm_handle = "base-claude", temperature = 0.1 }# Extraction skillsllm_to_extract_diagram = { llm_handle = "base-claude", temperature = 0.5 }-llm_to_extract_invoice = { llm_handle = "claude-4-sonnet", temperature = 0.1 }+llm_to_extract_invoice = { llm_handle = "claude-4.5-sonnet", temperature = 0.1 }llm_to_extract_invoice_from_scan = { llm_handle = "base-claude", temperature = 0.5 }llm_to_extract_legal_terms = { llm_handle = "base-claude", temperature = 0.1 }llm_to_extract_tables = { llm_handle = "base-claude", temperature = 0.1 }diff --git a/pipelex/config_template/inference/deck/overrides.toml b/pipelex/config_template/inference/deck/overrides.tomlindex d341ec7d2..a6e8a49c6 100644--- a/pipelex/config_template/inference/deck/overrides.toml+++ b/pipelex/config_template/inference/deck/overrides.toml@@ -7,4 +7,3 @@[llm.choice_overrides]for_text = "disabled"for_object = "disabled"-diff --git a/pipelex/core/concepts/concept.py b/pipelex/core/concepts/concept.pyindex 707738df5..fb1a6a81c 100644--- a/pipelex/core/concepts/concept.py+++ b/pipelex/core/concepts/concept.py@@ -6,7 +6,9 @@ from pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.concepts.concept_native import NativeConceptManagerfrom pipelex.core.domains.domain import SpecialDomainfrom pipelex.core.domains.domain_blueprint import DomainBlueprint+from pipelex.core.stuffs.image_field_search import search_for_nested_image_fieldsfrom pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.exceptions import PipelexUnexpectedErrorfrom pipelex.tools.class_registry_utils import ClassRegistryUtilsfrom pipelex.tools.misc.string_utils import pascal_case_to_sentence@@ -93,3 +95,11 @@ class Concept(BaseModel):if KajsonManager.get_class_registry().has_class(name=structure_class_name):log.warning(f"Concept class '{structure_class_name}' is registered but it's not a subclass of StuffContent")return False++ def search_for_nested_image_fields_in_structure_class(self) -> list[str]:+ """Recursively search for image fields in a structure class."""+ structure_class = KajsonManager.get_class_registry().get_required_subclass(name=self.structure_class_name, base_class=StuffContent)+ if not issubclass(structure_class, StuffContent):+ msg = f"Concept class '{self.structure_class_name}' is not a subclass of StuffContent"+ raise PipelexUnexpectedError(msg)+ return search_for_nested_image_fields(content_class=structure_class)diff --git a/pipelex/core/concepts/concept_factory.py b/pipelex/core/concepts/concept_factory.pyindex ec386d1dc..57c033b4d 100644--- a/pipelex/core/concepts/concept_factory.py+++ b/pipelex/core/concepts/concept_factory.py@@ -10,7 +10,7 @@ from pipelex.core.concepts.concept_blueprint import (from pipelex.core.concepts.concept_native import NativeConceptEnumData, NativeConceptManagerfrom pipelex.core.concepts.structure_generator import StructureGeneratorfrom pipelex.core.domains.domain import SpecialDomain-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import ConceptCodeError, ConceptDefinitionError, ConceptRefineError, ConceptStructureGeneratorError, StructureClassErrordiff --git a/pipelex/core/concepts/concept_library.py b/pipelex/core/concepts/concept_library.pyindex f564f2309..c44230b63 100644--- a/pipelex/core/concepts/concept_library.py+++ b/pipelex/core/concepts/concept_library.py@@ -1,18 +1,15 @@-import types-import typingfrom typing import Any-from kajson.kajson_manager import KajsonManagerfrom pydantic import Field, RootModelfrom typing_extensions import overridefrom pipelex.core.concepts.concept import Conceptfrom pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.concepts.concept_factory import ConceptFactory+from pipelex.core.concepts.concept_library_abstract import ConceptLibraryAbstractfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum-from pipelex.core.concepts.concept_provider_abstract import ConceptProviderAbstractfrom pipelex.core.domains.domain import SpecialDomain-from pipelex.core.stuffs.stuff_content import ImageContent, ListContent, StuffContent+from pipelex.core.stuffs.image_content import ImageContentfrom pipelex.exceptions import ConceptLibraryConceptNotFoundError, ConceptLibraryErrorfrom pipelex.hub import get_class_registryfrom pipelex.types import Self@@ -20,7 +17,7 @@ from pipelex.types import SelfConceptLibraryRoot = dict[str, Concept]-class ConceptLibrary(RootModel[ConceptLibraryRoot], ConceptProviderAbstract):+class ConceptLibrary(RootModel[ConceptLibraryRoot], ConceptLibraryAbstract):root: ConceptLibraryRoot = Field(default_factory=dict)def validate_with_libraries(self):@@ -71,6 +68,7 @@ class ConceptLibrary(RootModel[ConceptLibraryRoot], ConceptProviderAbstract):for concept in concepts:self.add_new_concept(concept=concept)+ @overridedef remove_concepts_by_codes(self, concept_codes: list[str]) -> None:for concept_code in concept_codes:if concept_code in self.root:@@ -128,112 +126,6 @@ class ConceptLibrary(RootModel[ConceptLibraryRoot], ConceptProviderAbstract):)return is_image_class or refines_image- @override- # TODO: Refactor this function. Codesmell, it is not a proper way to do this.- def find_image_field_paths(self, concept: Concept) -> list[str]:- """Find all field paths in the concept's structure that are strictly compatible with Image concept.-- Args:- concept: The concept to analyze for image field paths-- Returns:- List of dotted field paths (e.g., ["field1", "field2.subfield"]) that contain Image content.- """- # Get the structure class- structure_class = KajsonManager.get_class_registry().get_class(name=concept.structure_class_name)- if structure_class is None or not hasattr(structure_class, "model_fields"):- return []-- image_concept = self.get_native_concept(NativeConceptEnum.IMAGE)- paths: list[str] = []-- def find_image_fields_in_class(cls: type[StuffContent], current_path: str = "") -> None:- """Recursively find image fields in a structure class."""- # Check if the class has model_fields (is a Pydantic model)- if not hasattr(cls, "model_fields"):- return-- # Iterate through all fields- for field_name, field_info in cls.model_fields.items():- # Build the path for this field- field_path = f"{current_path}.{field_name}" if current_path else field_name-- # Get the field type annotation- field_type = field_info.annotation-- # Handle Optional types (Union with None)- is_union = False- union_args = None-- # Check for typing.Union (typing.Optional)- is_typing_union = hasattr(field_type, "__origin__") and field_type.__origin__ is typing.Union # type: ignore[union-attr] # pyright: ignore[reportOptionalMemberAccess]- is_types_union = hasattr(types, "UnionType") and isinstance(field_type, types.UnionType) # pyright: ignore[reportUnnecessaryIsInstance]- if is_typing_union or is_types_union:- is_union = True- union_args = field_type.__args__ # type: ignore[union-attr]-- if is_union and union_args:- # Get non-None types from the Union- args = [arg for arg in union_args if arg is not type(None)]- if len(args) == 1:- field_type = args[0]- elif len(args) == 0:- continue # All args were None, skip this field-- # Skip if field type is not a class- if not isinstance(field_type, type):- continue-- # Check if it's a ListContent - skip it- try:- if issubclass(field_type, ListContent):- continue- except (TypeError, AttributeError):- pass-- # Get the class name- field_class_name = field_type.__name__-- # Check if it's a direct ImageContent first- try:- if issubclass(field_type, ImageContent):- paths.append(field_path)- continue- except TypeError:- pass-- # Try to find a concept for this field type- try:- # Look for a concept with this structure class- matching_concept = None- for existing_concept in self.list_concepts():- if existing_concept.structure_class_name == field_class_name:- matching_concept = existing_concept- break-- if matching_concept:- # Check if this concept is strictly compatible with Image- if Concept.are_concept_compatible(- concept_1=matching_concept,- concept_2=image_concept,- strict=True,- ):- paths.append(field_path)- continue # Found an image field, no need to recurse deeper-- except Exception: # noqa: S110- pass # If we can't find a concept, continue with recursive search-- # If it's a StuffContent subclass, recurse into it- try:- if issubclass(field_type, StuffContent):- find_image_fields_in_class(field_type, field_path) # pyright: ignore[reportUnknownArgumentType]- except TypeError:- pass-- find_image_fields_in_class(structure_class)- return paths-@overridedef search_for_concept_in_domains(self, concept_code: str, search_domains: list[str]) -> Concept | None:ConceptBlueprint.validate_concept_code(concept_code=concept_code)diff --git a/pipelex/core/concepts/concept_provider_abstract.py b/pipelex/core/concepts/concept_library_abstract.pysimilarity index 90%rename from pipelex/core/concepts/concept_provider_abstract.pyrename to pipelex/core/concepts/concept_library_abstract.pyindex aa973b456..9ecc03542 100644--- a/pipelex/core/concepts/concept_provider_abstract.py+++ b/pipelex/core/concepts/concept_library_abstract.py@@ -4,10 +4,8 @@ from typing import Anyfrom pipelex.core.concepts.concept import Conceptfrom pipelex.core.concepts.concept_native import NativeConceptEnum-ConceptLibraryRoot = dict[str, Concept]--class ConceptProviderAbstract(ABC):+class ConceptLibraryAbstract(ABC):@abstractmethoddef add_new_concept(self, concept: Concept) -> None:pass@@ -16,6 +14,10 @@ class ConceptProviderAbstract(ABC):def add_concepts(self, concepts: list[Concept]) -> None:pass+ @abstractmethod+ def remove_concepts_by_codes(self, concept_codes: list[str]) -> None:+ pass+@abstractmethoddef list_concepts_by_domain(self, domain: str) -> list[Concept]:pass@@ -59,7 +61,3 @@ class ConceptProviderAbstract(ABC):@abstractmethoddef get_native_concept(self, native_concept: NativeConceptEnum) -> Concept:pass-- @abstractmethod- def find_image_field_paths(self, concept: Concept) -> list[str]:- passdiff --git a/pipelex/core/concepts/structure_generator.py b/pipelex/core/concepts/structure_generator.pyindex 12dd2f01f..39277b842 100644--- a/pipelex/core/concepts/structure_generator.py+++ b/pipelex/core/concepts/structure_generator.py@@ -6,22 +6,23 @@ from typing import Any, Literal, Optionalfrom pydantic import Fieldfrom pipelex.core.concepts.concept_blueprint import ConceptStructureBlueprint, ConceptStructureBlueprintFieldType-from pipelex.core.stuffs.stuff_content import StructuredContent-from pipelex.exceptions import ConceptStructureGeneratorError, PipelexError+from pipelex.core.stuffs.structured_content import StructuredContent+from pipelex.exceptions import ConceptStructureGeneratorError, PipelexException-class ConceptStructureValidationError(PipelexError):+class ConceptStructureValidationError(PipelexException):passclass StructureGenerator:"""Generate Pydantic BaseModel classes from concept structure blueprints."""+ # TODO: use StrEnum instead of Enumdef __init__(self):self.imports = {"from typing import Optional, List, Dict, Any, Literal","from enum import Enum",- "from pipelex.core.stuffs.stuff_content import StructuredContent",+ "from pipelex.core.stuffs.structured_content import StructuredContent","from pydantic import Field",}self.enum_definitions: dict[str, dict[str, Any]] = {} # Store enum definitionsdiff --git a/pipelex/core/domains/domain_library.py b/pipelex/core/domains/domain_library.pyindex 9574d0026..7a757160b 100644--- a/pipelex/core/domains/domain_library.py+++ b/pipelex/core/domains/domain_library.py@@ -2,14 +2,14 @@ from pydantic import RootModelfrom typing_extensions import overridefrom pipelex.core.domains.domain import Domain-from pipelex.core.domains.domain_provider_abstract import DomainProviderAbstract+from pipelex.core.domains.domain_library_abstract import DomainLibraryAbstractfrom pipelex.exceptions import DomainLibraryErrorfrom pipelex.types import SelfDomainLibraryRoot = dict[str, Domain]-class DomainLibrary(RootModel[DomainLibraryRoot], DomainProviderAbstract):+class DomainLibrary(RootModel[DomainLibraryRoot], DomainLibraryAbstract):def validate_with_libraries(self):passdiff --git a/pipelex/core/domains/domain_provider_abstract.py b/pipelex/core/domains/domain_library_abstract.pysimilarity index 90%rename from pipelex/core/domains/domain_provider_abstract.pyrename to pipelex/core/domains/domain_library_abstract.pyindex 0a9cc769c..5de1b5726 100644--- a/pipelex/core/domains/domain_provider_abstract.py+++ b/pipelex/core/domains/domain_library_abstract.py@@ -3,7 +3,7 @@ from abc import ABC, abstractmethodfrom pipelex.core.domains.domain import Domain-class DomainProviderAbstract(ABC):+class DomainLibraryAbstract(ABC):@abstractmethoddef get_domain(self, domain: str) -> Domain | None:passdiff --git a/pipelex/core/memory/working_memory.py b/pipelex/core/memory/working_memory.pyindex 347ce733b..2cf9faa8e 100644--- a/pipelex/core/memory/working_memory.py+++ b/pipelex/core/memory/working_memory.py@@ -5,19 +5,17 @@ from pydantic import BaseModel, Field, model_validatorfrom typing_extensions import overridefrom pipelex import log, pretty_print+from pipelex.core.stuffs.html_content import HtmlContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.mermaid_content import MermaidContent+from pipelex.core.stuffs.number_content import NumberContent+from pipelex.core.stuffs.pdf_content import PDFContentfrom pipelex.core.stuffs.stuff import Stufffrom pipelex.core.stuffs.stuff_artefact import StuffArtefact-from pipelex.core.stuffs.stuff_content import (- HtmlContent,- ImageContent,- ListContent,- MermaidContent,- NumberContent,- PDFContent,- StuffContentType,- TextAndImagesContent,- TextContent,-)+from pipelex.core.stuffs.stuff_content import StuffContentType+from pipelex.core.stuffs.text_and_images_content import TextAndImagesContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import (WorkingMemoryConsistencyError,WorkingMemoryStuffAttributeNotFoundError,@@ -122,7 +120,6 @@ class WorkingMemory(BaseModel, ContextProviderAbstract):def add_new_stuff(self, name: str, stuff: Stuff, aliases: list[str] | None = None):# TODO: Add unit tests for this method- log.debug(f"Adding new stuff '{name}' to WorkingMemory with aliases: {aliases}")if self.is_stuff_code_used(stuff_code=stuff.stuff_code):msg = f"Stuff code '{stuff.stuff_code}' is already used by another stuff"raise WorkingMemoryConsistencyError(msg)diff --git a/pipelex/core/memory/working_memory_factory.py b/pipelex/core/memory/working_memory_factory.pyindex 67f93973e..0d58c7c84 100644--- a/pipelex/core/memory/working_memory_factory.py+++ b/pipelex/core/memory/working_memory_factory.py@@ -9,10 +9,14 @@ from pipelex.client.protocol import CompactMemory, ImplicitMemoryfrom pipelex.core.concepts.concept import ConceptBlueprint, SpecialDomainfrom pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.core.memory.working_memory import MAIN_STUFF_NAME, StuffDict, WorkingMemory-from pipelex.core.pipes.pipe_input import TypedNamedInputRequirement+from pipelex.core.pipes.input_requirements import TypedNamedInputRequirement+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.pdf_content import PDFContentfrom pipelex.core.stuffs.stuff import Stuff-from pipelex.core.stuffs.stuff_content import ImageContent, ListContent, PDFContent, StuffContent, TextContent+from pipelex.core.stuffs.stuff_content import StuffContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import WorkingMemoryFactoryErrorfrom pipelex.hub import get_required_conceptdiff --git a/pipelex/core/pipes/pipe_input_blueprint.py b/pipelex/core/pipes/input_requirement_blueprint.pysimilarity index 87%rename from pipelex/core/pipes/pipe_input_blueprint.pyrename to pipelex/core/pipes/input_requirement_blueprint.pyindex 4af759768..7fbf1e237 100644--- a/pipelex/core/pipes/pipe_input_blueprint.py+++ b/pipelex/core/pipes/input_requirement_blueprint.py@@ -1,7 +1,7 @@from pydantic import BaseModel, field_validatorfrom pipelex.core.concepts.concept_blueprint import ConceptBlueprint-from pipelex.core.pipes.pipe_run_params import PipeOutputMultiplicity+from pipelex.pipe_run.pipe_run_params import PipeOutputMultiplicityclass InputRequirementBlueprint(BaseModel):diff --git a/pipelex/core/pipes/pipe_input.py b/pipelex/core/pipes/input_requirements.pysimilarity index 95%rename from pipelex/core/pipes/pipe_input.pyrename to pipelex/core/pipes/input_requirements.pyindex e0726dce0..b3a813bff 100644--- a/pipelex/core/pipes/pipe_input.py+++ b/pipelex/core/pipes/input_requirements.py@@ -4,9 +4,9 @@ from pydantic import BaseModel, Field, RootModel, field_validatorfrom pipelex import logfrom pipelex.core.concepts.concept import Concept-from pipelex.core.pipes.pipe_run_params import PipeOutputMultiplicityfrom pipelex.core.stuffs.stuff_content import StuffContentfrom pipelex.exceptions import PipeInputNotFoundError+from pipelex.pipe_run.pipe_run_params import PipeOutputMultiplicityclass InputRequirement(BaseModel):@@ -31,11 +31,11 @@ class TypedNamedInputRequirement(NamedInputRequirement):return cls(**named.model_dump(), structure_class=structure_class)-PipeInputRoot = dict[str, InputRequirement]+InputRequirementsRoot = dict[str, InputRequirement]-class PipeInput(RootModel[PipeInputRoot]):- root: PipeInputRoot = Field(default_factory=dict)+class InputRequirements(RootModel[InputRequirementsRoot]):+ root: InputRequirementsRoot = Field(default_factory=dict)@field_validator("root", mode="wrap")@classmethoddiff --git a/pipelex/core/pipes/pipe_input_factory.py b/pipelex/core/pipes/input_requirements_factory.pysimilarity index 71%rename from pipelex/core/pipes/pipe_input_factory.pyrename to pipelex/core/pipes/input_requirements_factory.pyindex 6546a51a2..1d275e60b 100644--- a/pipelex/core/pipes/pipe_input_factory.py+++ b/pipelex/core/pipes/input_requirements_factory.py@@ -1,14 +1,14 @@from pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.concepts.concept_factory import ConceptFactory-from pipelex.core.pipes.pipe_input import InputRequirement, PipeInput-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirements import InputRequirement, InputRequirementsfrom pipelex.hub import get_required_concept-class PipeInputFactory:+class InputRequirementsFactory:@classmethod- def make_empty(cls) -> PipeInput:- return PipeInput(root={})+ def make_empty(cls) -> InputRequirements:+ return InputRequirements(root={})@classmethoddef make_from_blueprint(@@ -16,8 +16,8 @@ class PipeInputFactory:domain: str,blueprint: dict[str, str | InputRequirementBlueprint],concept_codes_from_the_same_domain: list[str] | None = None,- ) -> PipeInput:- inputs: dict[str, InputRequirement] = {}+ ) -> InputRequirements:+ input_requirements_dict: dict[str, InputRequirement] = {}for var_name, input_requirement_blueprint in blueprint.items():if isinstance(input_requirement_blueprint, str):input_requirement_blueprint = InputRequirementBlueprint(concept=input_requirement_blueprint)@@ -30,8 +30,8 @@ class PipeInputFactory:concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,)- inputs[var_name] = InputRequirement(+ input_requirements_dict[var_name] = InputRequirement(concept=get_required_concept(concept_string=concept_string_with_domain),multiplicity=input_requirement_blueprint.multiplicity,)- return PipeInput(root=inputs)+ return InputRequirements(root=input_requirements_dict)diff --git a/pipelex/core/pipes/pipe_abstract.py b/pipelex/core/pipes/pipe_abstract.pyindex 22d0b6987..f062d4499 100644--- a/pipelex/core/pipes/pipe_abstract.py+++ b/pipelex/core/pipes/pipe_abstract.py@@ -5,11 +5,11 @@ from pydantic import BaseModel, ConfigDict, Field, field_validatorfrom pipelex.core.concepts.concept import Conceptfrom pipelex.core.memory.working_memory import WorkingMemory+from pipelex.core.pipes.input_requirements import InputRequirementsfrom pipelex.core.pipes.pipe_blueprint import PipeBlueprint-from pipelex.core.pipes.pipe_input import PipeInputfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeRunParamsfrom pipelex.exceptions import PipeStackOverflowError+from pipelex.pipe_run.pipe_run_params import PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadata@@ -21,7 +21,7 @@ class PipeAbstract(ABC, BaseModel):code: strdomain: strdescription: str | None = None- inputs: PipeInput = Field(default_factory=PipeInput)+ inputs: InputRequirements = Field(default_factory=InputRequirements)output: Concept@field_validator("code", mode="before")@@ -44,12 +44,12 @@ class PipeAbstract(ABC, BaseModel):# 1 - The inputs of dependency pipes# 2 - The variables in the pipe definition- PipeConditon : Variables in the expression- - PipeBatch : Variables in the batch_params+ - PipeBatch: Variables in the batch_params- PipeLLM : Variables in the prompt"""@abstractmethod- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:"""Return the inputs that are needed for the pipe to run.Args:@@ -63,9 +63,9 @@ class PipeAbstract(ABC, BaseModel):def pipe_dependencies(self) -> set[str]:"""Return the pipes that are dependencies of the pipe.- - PipeBatch : The pipe that is being batched- - PipeCondition : The pipes in the pipe_map- - PipeSequence : The pipes in the steps+ - PipeBatch: The pipe that is being batched+ - PipeCondition: The pipes in the outcome_map+ - PipeSequence: The pipes in the steps"""return set()diff --git a/pipelex/core/pipes/pipe_blueprint.py b/pipelex/core/pipes/pipe_blueprint.pyindex f4f5d72e8..1f71639b3 100644--- a/pipelex/core/pipes/pipe_blueprint.py+++ b/pipelex/core/pipes/pipe_blueprint.py@@ -4,7 +4,7 @@ from pydantic import BaseModel, ConfigDict, field_validatorfrom pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.pipes.exceptions import PipeBlueprintError-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.tools.misc.string_utils import is_snake_casefrom pipelex.types import StrEnumdiff --git a/pipelex/core/pipes/pipe_library.py b/pipelex/core/pipes/pipe_library.pyindex f9a9f617b..47128d78d 100644--- a/pipelex/core/pipes/pipe_library.py+++ b/pipelex/core/pipes/pipe_library.py@@ -7,24 +7,24 @@ from typing_extensions import overridefrom pipelex import pretty_printfrom pipelex.core.pipes.pipe_abstract import PipeAbstract-from pipelex.core.pipes.pipe_provider_abstract import PipeProviderAbstract+from pipelex.core.pipes.pipe_library_abstract import PipeLibraryAbstractfrom pipelex.exceptions import ConceptError, ConceptLibraryConceptNotFoundError, PipeLibraryError, PipeLibraryPipeNotFoundError-from pipelex.hub import get_concept_provider+from pipelex.hub import get_concept_libraryfrom pipelex.types import SelfPipeLibraryRoot = dict[str, PipeAbstract]-class PipeLibrary(RootModel[PipeLibraryRoot], PipeProviderAbstract):+class PipeLibrary(RootModel[PipeLibraryRoot], PipeLibraryAbstract):@overridedef validate_with_libraries(self):- concept_provider = get_concept_provider()+ concept_library = get_concept_library()for pipe in self.root.values():pipe.validate_output()try:for concept in pipe.concept_dependencies():try:- concept_provider.get_required_concept(concept_string=concept.concept_string)+ concept_library.get_required_concept(concept_string=concept.concept_string)except ConceptError as concept_error:msg = f"Error validating pipe '{pipe.code}' dependency concept '{concept.concept_string}' because of: {concept_error}"raise PipeLibraryError(msg) from concept_error@@ -51,13 +51,6 @@ class PipeLibrary(RootModel[PipeLibraryRoot], PipeProviderAbstract):for pipe in pipes:self.add_new_pipe(pipe=pipe)- def add_or_update_pipe(self, pipe: PipeAbstract):- name = pipe.code- pipe.inputs.set_default_domain(domain=pipe.domain)- if pipe.output.code and "." not in pipe.output.code:- pipe.output.code = f"{pipe.domain}.{pipe.output.code}"- self.root[name] = pipe-@overridedef get_optional_pipe(self, pipe_code: str) -> PipeAbstract | None:return self.root.get(pipe_code)@@ -78,6 +71,7 @@ class PipeLibrary(RootModel[PipeLibraryRoot], PipeProviderAbstract):def get_pipes_dict(self) -> dict[str, PipeAbstract]:return self.root+ @overridedef remove_pipes_by_codes(self, pipe_codes: list[str]) -> None:# TODO: We should create a separate library, that copies the original one, and then removes the pipes from it# Then run the dry run + validation to see if removing those pipe has not broken any other pipe.diff --git a/pipelex/core/pipes/pipe_provider_abstract.py b/pipelex/core/pipes/pipe_library_abstract.pysimilarity index 88%rename from pipelex/core/pipes/pipe_provider_abstract.pyrename to pipelex/core/pipes/pipe_library_abstract.pyindex 89456a6f8..434fae582 100644--- a/pipelex/core/pipes/pipe_provider_abstract.py+++ b/pipelex/core/pipes/pipe_library_abstract.py@@ -2,10 +2,8 @@ from abc import ABC, abstractmethodfrom pipelex.core.pipes.pipe_abstract import PipeAbstract-PipeLibraryRoot = dict[str, PipeAbstract]--class PipeProviderAbstract(ABC):+class PipeLibraryAbstract(ABC):@abstractmethoddef validate_with_libraries(self) -> None:pass@@ -26,6 +24,9 @@ class PipeProviderAbstract(ABC):def get_pipes_dict(self) -> dict[str, PipeAbstract]:pass+ def remove_pipes_by_codes(self, pipe_codes: list[str]) -> None:+ pass+@abstractmethoddef teardown(self) -> None:passdiff --git a/pipelex/core/pipes/pipe_output.py b/pipelex/core/pipes/pipe_output.pyindex 73e8669bb..c20667efe 100644--- a/pipelex/core/pipes/pipe_output.py+++ b/pipelex/core/pipes/pipe_output.py@@ -3,17 +3,15 @@ from typing import TypeVarfrom pydantic import BaseModel, Fieldfrom pipelex.core.memory.working_memory import WorkingMemory+from pipelex.core.stuffs.html_content import HtmlContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.mermaid_content import MermaidContent+from pipelex.core.stuffs.number_content import NumberContentfrom pipelex.core.stuffs.stuff import Stuff-from pipelex.core.stuffs.stuff_content import (- HtmlContent,- ImageContent,- ListContent,- MermaidContent,- NumberContent,- StuffContentType,- TextAndImagesContent,- TextContent,-)+from pipelex.core.stuffs.stuff_content import StuffContentType+from pipelex.core.stuffs.text_and_images_content import TextAndImagesContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.pipeline.pipeline_models import SpecialPipelineIddiff --git a/pipelex/core/registry_models.py b/pipelex/core/registry_models.pyindex 69cecba2e..f3aeba5cf 100644--- a/pipelex/core/registry_models.py+++ b/pipelex/core/registry_models.py@@ -2,20 +2,18 @@ from typing import Any, ClassVarfrom pipelex.core.pipes.pipe_abstract import PipeAbstractTypefrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol+from pipelex.core.stuffs.dynamic_content import DynamicContent+from pipelex.core.stuffs.html_content import HtmlContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.number_content import NumberContent+from pipelex.core.stuffs.page_content import PageContent+from pipelex.core.stuffs.pdf_content import PDFContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.core.stuffs.stuff import Stuff-from pipelex.core.stuffs.stuff_content import (- DynamicContent,- HtmlContent,- ImageContent,- ListContent,- NumberContent,- PageContent,- PDFContent,- StructuredContent,- StuffContent,- TextAndImagesContent,- TextContent,-)+from pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.core.stuffs.text_and_images_content import TextAndImagesContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.pipe_controllers.batch.pipe_batch import PipeBatchfrom pipelex.pipe_controllers.batch.pipe_batch_factory import PipeBatchFactoryfrom pipelex.pipe_controllers.condition.pipe_condition import PipeConditiondiff --git a/pipelex/core/stuffs/dynamic_content.py b/pipelex/core/stuffs/dynamic_content.pynew file mode 100644index 000000000..b138398be--- /dev/null+++ b/pipelex/core/stuffs/dynamic_content.py@@ -0,0 +1,18 @@+from typing_extensions import override++from pipelex.core.stuffs.stuff_content import StuffContent+++class DynamicContent(StuffContent):+ @property+ @override+ def short_desc(self) -> str:+ return "some dynamic concept"++ @override+ def rendered_html(self) -> str:+ return str(self.smart_dump())++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ return str(self.smart_dump())diff --git a/pipelex/core/stuffs/html_content.py b/pipelex/core/stuffs/html_content.pynew file mode 100644index 000000000..1349573eb--- /dev/null+++ b/pipelex/core/stuffs/html_content.py@@ -0,0 +1,39 @@+import json++from typing_extensions import override+from yattag import Doc++from pipelex.core.stuffs.stuff_content import StuffContent+++class HtmlContent(StuffContent):+ inner_html: str+ css_class: str++ @property+ @override+ def short_desc(self) -> str:+ return f"some html ({len(self.inner_html)} chars)"++ @override+ def __str__(self) -> str:+ return self.rendered_html()++ @override+ def rendered_plain(self) -> str:+ return self.inner_html++ @override+ def rendered_html(self) -> str:+ doc, tag, text = Doc().tagtext()+ with tag("div", klass=self.css_class):+ text(self.inner_html)+ return doc.getvalue()++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ return self.inner_html++ @override+ def rendered_json(self) -> str:+ return json.dumps({"html": self.inner_html, "css_class": self.css_class})diff --git a/pipelex/core/stuffs/image_content.py b/pipelex/core/stuffs/image_content.pynew file mode 100644index 000000000..4c67919c0--- /dev/null+++ b/pipelex/core/stuffs/image_content.py@@ -0,0 +1,129 @@+import base64+import json+from io import BytesIO++from PIL import Image+from typing_extensions import override+from yattag import Doc++from pipelex.cogt.ocr.ocr_output import ExtractedImage+from pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.tools.misc.base_64_utils import save_base64_to_binary_file+from pipelex.tools.misc.file_utils import ensure_directory_exists, get_incremental_file_path, save_text_to_path+from pipelex.tools.misc.filetype_utils import detect_file_type_from_base64+from pipelex.tools.misc.path_utils import InterpretedPathOrUrl, interpret_path_or_url+from pipelex.types import Self+++class ImageContent(StuffContent):+ url: str+ source_prompt: str | None = None+ caption: str | None = None+ base_64: str | None = None++ @property+ @override+ def short_desc(self) -> str:+ url_desc = interpret_path_or_url(path_or_uri=self.url).desc+ return f"{url_desc} or an image"++ @override+ def rendered_plain(self) -> str:+ return self.url++ @override+ def rendered_html(self) -> str:+ doc = Doc()+ doc.stag("img", src=self.url, klass="msg-img")++ return doc.getvalue()++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ return f""++ @override+ def rendered_json(self) -> str:+ return json.dumps({"image_url": self.url, "source_prompt": self.source_prompt})++ @classmethod+ def make_from_extracted_image(cls, extracted_image: ExtractedImage) -> Self:+ return cls(+ url=extracted_image.image_id,+ base_64=extracted_image.base_64,+ caption=extracted_image.caption,+ )++ @classmethod+ def make_from_image(cls, image: Image.Image) -> Self:+ buffer = BytesIO()+ image.save(buffer, format="PNG")+ base_64 = base64.b64encode(buffer.getvalue()).decode("utf-8")+ return cls(+ url=f"data:image/png;base64,{base_64}",+ base_64=base_64,+ )++ def save_to_directory(self, directory: str, base_name: str | None = None, extension: str | None = None):+ ensure_directory_exists(directory)+ base_name = base_name or "img"+ if (base_64 := self.base_64) and not extension:+ match interpret_path_or_url(path_or_uri=self.url):+ case InterpretedPathOrUrl.FILE_NAME:+ parts = self.url.rsplit(".", 1)+ base_name = parts[0]+ extension = parts[1]+ case InterpretedPathOrUrl.FILE_PATH | InterpretedPathOrUrl.FILE_URI | InterpretedPathOrUrl.URL | InterpretedPathOrUrl.BASE_64:+ file_type = detect_file_type_from_base64(b64=base_64)+ base_name = base_name or "img"+ extension = file_type.extension+ file_path = get_incremental_file_path(+ base_path=directory,+ base_name=base_name,+ extension=extension,+ avoid_suffix_if_possible=True,+ )+ save_base64_to_binary_file(b64=base_64, file_path=file_path)++ if caption := self.caption:+ caption_file_path = get_incremental_file_path(+ base_path=directory,+ base_name=f"{base_name}_caption",+ extension="txt",+ avoid_suffix_if_possible=True,+ )+ save_text_to_path(text=caption, path=caption_file_path)+ if source_prompt := self.source_prompt:+ source_prompt_file_path = get_incremental_file_path(+ base_path=directory,+ base_name=f"{base_name}_source_prompt",+ extension="txt",+ avoid_suffix_if_possible=True,+ )+ save_text_to_path(text=source_prompt, path=source_prompt_file_path)+++class PDFContent(StuffContent):+ url: str++ @property+ @override+ def short_desc(self) -> str:+ url_desc = interpret_path_or_url(path_or_uri=self.url).desc+ return f"{url_desc} of a PDF document"++ @override+ def rendered_plain(self) -> str:+ return self.url++ @override+ def rendered_html(self) -> str:+ doc = Doc()+ doc.stag("a", href=self.url, klass="msg-pdf")+ doc.text(self.url)++ return doc.getvalue()++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ return f"[{self.url}]({self.url})"diff --git a/pipelex/core/stuffs/image_field_search.py b/pipelex/core/stuffs/image_field_search.pynew file mode 100644index 000000000..8823c2f05--- /dev/null+++ b/pipelex/core/stuffs/image_field_search.py@@ -0,0 +1,168 @@+import types+import typing+from typing import Any++from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.stuff_content import StuffContent+++def search_for_nested_image_fields(+ content_class: type[StuffContent],+ current_path: str = "",+) -> list[str]:+ """Recursively search for image fields in a structure class.++ Args:+ content_class: The StuffContent class to search+ current_path: Current field path being explored++ Returns:+ List of field paths that contain images+ """+ paths: list[str] = []++ # Iterate through all fields+ for field_name, field_info in content_class.model_fields.items():+ # Build the path for this field+ field_path = f"{current_path}.{field_name}" if current_path else field_name++ # Get the field type annotation+ field_type = field_info.annotation++ # Handle Optional types (Union with None)+ is_union = False+ union_args = None++ # Check for typing.Union (typing.Optional)+ is_typing_union = hasattr(field_type, "__origin__") and field_type.__origin__ is typing.Union # type: ignore[union-attr] # pyright: ignore[reportOptionalMemberAccess]+ is_types_union = hasattr(types, "UnionType") and isinstance(field_type, types.UnionType) # pyright: ignore[reportUnnecessaryIsInstance]+ if is_typing_union or is_types_union:+ is_union = True+ union_args = field_type.__args__ # type: ignore[union-attr]++ potential_types: list[Any] = []+ potential_field_types: list[Any] = [] # Keep track of the full type with generics+ if is_union and union_args:+ potential_types = list(union_args)+ potential_field_types = list(union_args) # In union case, each arg is a complete type+ else:+ potential_types = [field_type]+ potential_field_types = [field_type]++ for idx, field_specific_type in enumerate(potential_types):+ # Get the corresponding field type with full generic info+ current_field_type = potential_field_types[idx]++ # Check if it's a list or tuple generic type (e.g., list[ImageContent], tuple[ImageContent, ...])+ if hasattr(field_specific_type, "__origin__") and field_specific_type.__origin__ in (list, tuple): # type: ignore[union-attr]+ # Check if this container or its nested contents have images+ if check_generic_container_for_images(field_specific_type):+ paths.append(field_path)+ continue # Move to next field after handling list/tuple++ # Skip if field type is not a class+ if not isinstance(field_specific_type, type):+ continue+ if field_specific_type is type(None):+ continue++ # Try-except to handle Python 3.10 compatibility with generic types+ try:+ # Check if it's a direct ImageContent first+ if issubclass(field_specific_type, ImageContent):+ paths.append(field_path)+ continue++ # Check if it's a ListContent subclass (Pydantic creates actual classes, not generic aliases)+ if issubclass(field_specific_type, ListContent):+ # For ListContent, check if the items have images+ # Get the generic argument from Pydantic v2's __pydantic_generic_metadata__+ list_item_types = None+ if hasattr(field_specific_type, "__pydantic_generic_metadata__"): # pyright: ignore[reportUnknownArgumentType]+ # Pydantic v2 stores generic info as a dict+ generic_metadata = field_specific_type.__pydantic_generic_metadata__ # type: ignore[attr-defined]+ # generic_metadata is PydanticGenericMetadata which inherits from dict+ if "args" in generic_metadata: # pyright: ignore[reportUnnecessaryIsInstance]+ list_item_types = generic_metadata["args"]+ elif hasattr(current_field_type, "__args__"):+ list_item_types = current_field_type.__args__ # type: ignore[union-attr]++ if list_item_types:+ has_images_in_list = False+ for list_item_type in list_item_types:+ if isinstance(list_item_type, type):+ try:+ # Check if the item type is ImageContent+ if issubclass(list_item_type, ImageContent):+ has_images_in_list = True+ break+ # Check if the item type has nested images+ if issubclass(list_item_type, StuffContent) and not issubclass(list_item_type, ListContent):+ nested_paths = search_for_nested_image_fields(+ content_class=list_item_type,+ current_path="",+ )+ if nested_paths:+ has_images_in_list = True+ break+ except TypeError:+ continue+ if has_images_in_list:+ paths.append(field_path)+ continue++ # If it's a StuffContent subclass (excluding ListContent which we just handled), recurse into it+ if issubclass(field_specific_type, StuffContent):+ nested_paths = search_for_nested_image_fields(+ content_class=field_specific_type,+ current_path=field_path,+ )+ paths.extend(nested_paths)+ except TypeError:+ # In Python 3.10, some generic types may pass isinstance(type) but fail issubclass()+ continue++ return paths+++def check_generic_container_for_images(container_type: Any) -> bool:+ """Recursively check if a generic container type contains images at any depth.++ Handles nested generics like list[tuple[list[MediaCollection]]] with arbitrary depth.++ Args:+ container_type: A generic type like list[...], tuple[...]++ Returns:+ True if the container or its nested contents contain ImageContent+ """+ if not hasattr(container_type, "__origin__"):+ return False++ # Get the args (item types) from the generic+ container_args = getattr(container_type, "__args__", ())+ for arg_type in container_args:+ # Check if arg_type is itself a generic (nested list/tuple) - recurse!+ if hasattr(arg_type, "__origin__") and arg_type.__origin__ in (list, tuple): # type: ignore[union-attr]+ if check_generic_container_for_images(arg_type):+ return True+ # Check if it's a regular type+ elif isinstance(arg_type, type):+ try:+ # Check if it's directly ImageContent+ if issubclass(arg_type, ImageContent):+ return True+ # Check if it's a StuffContent that might have nested images+ if issubclass(arg_type, StuffContent) and not issubclass(arg_type, ListContent):+ # Check if this type has nested image fields+ nested_paths = search_for_nested_image_fields(+ content_class=arg_type,+ current_path="",+ )+ if nested_paths:+ return True+ except TypeError:+ # Handle edge cases where issubclass fails+ continue+ return Falsediff --git a/pipelex/core/stuffs/list_content.py b/pipelex/core/stuffs/list_content.pynew file mode 100644index 000000000..a067a8522--- /dev/null+++ b/pipelex/core/stuffs/list_content.py@@ -0,0 +1,80 @@+from typing import Any, Generic++from json2html import json2html+from typing_extensions import override++from pipelex.core.stuffs.stuff_content import StuffContent, StuffContentType+from pipelex.tools.templating.templating_models import TextFormat+++class ListContent(StuffContent, Generic[StuffContentType]):+ items: list[StuffContentType]++ @property+ def nb_items(self) -> int:+ return len(self.items)++ def get_items(self, item_type: type[StuffContent]) -> list[StuffContent]:+ return [item for item in self.items if isinstance(item, item_type)]++ @property+ @override+ def short_desc(self) -> str:+ nb_items = len(self.items)+ if nb_items == 0:+ return "empty list"+ if nb_items == 1:+ return f"list of 1 {self.items[0].__class__.__name__}"+ item_classes: list[str] = [item.__class__.__name__ for item in self.items]+ item_classes_set = set(item_classes)+ nb_classes = len(item_classes_set)+ if nb_classes == 1:+ return f"list of {len(self.items)} {item_classes[0]}s"+ elif nb_items == nb_classes:+ return f"list of {len(self.items)} items of different types"+ else:+ return f"list of {len(self.items)} items of {nb_classes} different types"++ @property+ def _single_class_name(self) -> str | None:+ item_classes: list[str] = [item.__class__.__name__ for item in self.items]+ item_classes_set = set(item_classes)+ nb_classes = len(item_classes_set)+ if nb_classes == 1:+ return item_classes[0]+ else:+ return None++ @override+ def model_dump(self, *args: Any, **kwargs: Any):+ obj_dict = super().model_dump(*args, **kwargs)+ obj_dict["items"] = [item.model_dump(*args, **kwargs) for item in self.items]+ return obj_dict++ @override+ def rendered_plain(self) -> str:+ return self.rendered_markdown()++ @override+ def rendered_html(self) -> str:+ list_dump = [item.smart_dump() for item in self.items]++ html: str = json2html.convert( # pyright: ignore[reportAssignmentType, reportUnknownVariableType]+ json=list_dump, # pyright: ignore[reportArgumentType]+ clubbing=True,+ table_attributes="",+ )+ return html++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ rendered = ""+ if self._single_class_name == "TextContent":+ for item in self.items:+ rendered += f" • {item}\n"+ else:+ for item_index, item in enumerate(self.items):+ rendered += f"\n • item #{item_index + 1}:\n\n"+ rendered += item.rendered_str(text_format=TextFormat.MARKDOWN)+ rendered += "\n"+ return rendereddiff --git a/pipelex/core/stuffs/mermaid_content.py b/pipelex/core/stuffs/mermaid_content.pynew file mode 100644index 000000000..1c1f1a63b--- /dev/null+++ b/pipelex/core/stuffs/mermaid_content.py@@ -0,0 +1,39 @@+import json++from typing_extensions import override+from yattag import Doc++from pipelex.core.stuffs.stuff_content import StuffContent+++class MermaidContent(StuffContent):+ mermaid_code: str+ mermaid_url: str++ @property+ @override+ def short_desc(self) -> str:+ return f"some mermaid code ({len(self.mermaid_code)} chars)"++ @override+ def __str__(self) -> str:+ return self.mermaid_code++ @override+ def rendered_plain(self) -> str:+ return self.mermaid_code++ @override+ def rendered_html(self) -> str:+ doc, tag, text = Doc().tagtext()+ with tag("div", klass="mermaid"):+ text(self.mermaid_code)+ return doc.getvalue()++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ return self.mermaid_code++ @override+ def rendered_json(self) -> str:+ return json.dumps({"mermaid": self.mermaid_code})diff --git a/pipelex/core/stuffs/number_content.py b/pipelex/core/stuffs/number_content.pynew file mode 100644index 000000000..d1a48e180--- /dev/null+++ b/pipelex/core/stuffs/number_content.py@@ -0,0 +1,39 @@+import json+from typing import Any++from typing_extensions import override++from pipelex.core.stuffs.stuff_content import StuffContent+++class NumberContent(StuffContent):+ number: int | float++ @override+ def smart_dump(self) -> str | dict[str, Any] | list[str] | list[dict[str, Any]]:+ return str(self.number)++ @property+ @override+ def short_desc(self) -> str:+ return f"some number ({self.number})"++ @override+ def __str__(self) -> str:+ return str(self.number)++ @override+ def rendered_plain(self) -> str:+ return str(self.number)++ @override+ def rendered_html(self) -> str:+ return str(self.number)++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ return str(self.number)++ @override+ def rendered_json(self) -> str:+ return json.dumps({"number": self.number})diff --git a/pipelex/core/stuffs/page_content.py b/pipelex/core/stuffs/page_content.pynew file mode 100644index 000000000..c8957007d--- /dev/null+++ b/pipelex/core/stuffs/page_content.py@@ -0,0 +1,15 @@+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.structured_content import StructuredContent+from pipelex.core.stuffs.text_and_images_content import TextAndImagesContent+from pipelex.tools.misc.file_utils import ensure_directory_exists+++class PageContent(StructuredContent):+ text_and_images: TextAndImagesContent+ page_view: ImageContent | None = None++ def save_to_directory(self, directory: str):+ ensure_directory_exists(directory)+ self.text_and_images.save_to_directory(directory=directory)+ if page_view := self.page_view:+ page_view.save_to_directory(directory=directory, base_name="page_view")diff --git a/pipelex/core/stuffs/pdf_content.py b/pipelex/core/stuffs/pdf_content.pynew file mode 100644index 000000000..3e7ca4f8a--- /dev/null+++ b/pipelex/core/stuffs/pdf_content.py@@ -0,0 +1,31 @@+from typing_extensions import override+from yattag import Doc++from pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.tools.misc.path_utils import interpret_path_or_url+++class PDFContent(StuffContent):+ url: str++ @property+ @override+ def short_desc(self) -> str:+ url_desc = interpret_path_or_url(path_or_uri=self.url).desc+ return f"{url_desc} of a PDF document"++ @override+ def rendered_plain(self) -> str:+ return self.url++ @override+ def rendered_html(self) -> str:+ doc = Doc()+ doc.stag("a", href=self.url, klass="msg-pdf")+ doc.text(self.url)++ return doc.getvalue()++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ return f"[{self.url}]({self.url})"diff --git a/pipelex/core/stuffs/structured_content.py b/pipelex/core/stuffs/structured_content.pynew file mode 100644index 000000000..16a4b9978--- /dev/null+++ b/pipelex/core/stuffs/structured_content.py@@ -0,0 +1,33 @@+from json2html import json2html+from typing_extensions import override++from pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.tools.misc.markdown_utils import convert_to_markdown+from pipelex.tools.typing.pydantic_utils import clean_model_to_dict+++class StructuredContent(StuffContent):+ @property+ @override+ def short_desc(self) -> str:+ return f"some structured content of class {self.__class__.__name__}"++ @override+ def smart_dump(self):+ return self.model_dump(serialize_as_any=True)++ @override+ def rendered_html(self) -> str:+ dict_dump = clean_model_to_dict(obj=self)++ html: str = json2html.convert( # pyright: ignore[reportAssignmentType, reportUnknownVariableType]+ json=dict_dump, # pyright: ignore[reportArgumentType]+ clubbing=True,+ table_attributes="",+ )+ return html++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ dict_dump = clean_model_to_dict(obj=self)+ return convert_to_markdown(data=dict_dump, level=level, is_pretty=is_pretty)diff --git a/pipelex/core/stuffs/stuff.py b/pipelex/core/stuffs/stuff.pyindex 29abdce1c..35a097fd5 100644--- a/pipelex/core/stuffs/stuff.py+++ b/pipelex/core/stuffs/stuff.py@@ -5,19 +5,16 @@ from typing_extensions import overridefrom pipelex import logfrom pipelex.core.concepts.concept import Concept+from pipelex.core.stuffs.html_content import HtmlContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.mermaid_content import MermaidContent+from pipelex.core.stuffs.number_content import NumberContent+from pipelex.core.stuffs.pdf_content import PDFContentfrom pipelex.core.stuffs.stuff_artefact import StuffArtefact-from pipelex.core.stuffs.stuff_content import (- HtmlContent,- ImageContent,- ListContent,- MermaidContent,- NumberContent,- PDFContent,- StuffContent,- StuffContentType,- TextAndImagesContent,- TextContent,-)+from pipelex.core.stuffs.stuff_content import StuffContent, StuffContentType+from pipelex.core.stuffs.text_and_images_content import TextAndImagesContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import StuffContentValidationError, StuffErrorfrom pipelex.tools.misc.string_utils import pascal_case_to_snake_casefrom pipelex.tools.typing.pydantic_utils import CustomBaseModel, format_pydantic_validation_errordiff --git a/pipelex/core/stuffs/stuff_content.py b/pipelex/core/stuffs/stuff_content.pyindex 0da0eea6a..fabdbdf75 100644--- a/pipelex/core/stuffs/stuff_content.py+++ b/pipelex/core/stuffs/stuff_content.py@@ -1,32 +1,14 @@-import base64-import jsonfrom abc import ABC, abstractmethod-from io import BytesIO-from typing import Any, Generic, TypeVar+from typing import Any, TypeVar-import markdown-from json2html import json2htmlfrom kajson import kajson-from PIL import Image-from pydantic import BaseModelfrom typing_extensions import override-from yattag import Doc-from pipelex.cogt.ocr.ocr_output import ExtractedImage-from pipelex.tools.misc.base_64_utils import save_base64_to_binary_file-from pipelex.tools.misc.file_utils import ensure_directory_exists, get_incremental_file_path, save_text_to_path-from pipelex.tools.misc.filetype_utils import detect_file_type_from_base64-from pipelex.tools.misc.markdown_utils import convert_to_markdown-from pipelex.tools.misc.path_utils import InterpretedPathOrUrl, interpret_path_or_urlfrom pipelex.tools.templating.templating_models import TextFormat-from pipelex.tools.typing.pydantic_utils import CustomBaseModel, clean_model_to_dict-from pipelex.types import Self+from pipelex.tools.typing.pydantic_utils import CustomBaseModel-ObjectContentType = TypeVar("ObjectContentType", bound=BaseModel)StuffContentType = TypeVar("StuffContentType", bound="StuffContent")-# TODO: split in separate files-class StuffContent(ABC, CustomBaseModel):@property@@ -69,449 +51,3 @@ class StuffContent(ABC, CustomBaseModel):def rendered_json(self) -> str:return kajson.dumps(self.smart_dump(), indent=4)---class StuffContentInitableFromStr(StuffContent):- @classmethod- @abstractmethod- def make_from_str(cls, str_value: str) -> "StuffContentInitableFromStr":- pass---class TextContent(StuffContentInitableFromStr):- text: str-- @override- def smart_dump(self) -> str | dict[str, Any] | list[str] | list[dict[str, Any]]:- return self.text-- @property- @override- def short_desc(self) -> str:- return f"some text ({len(self.text)} chars)"-- @classmethod- @override- def make_from_str(cls, str_value: str) -> "TextContent":- return TextContent(text=str_value)-- @override- def __str__(self) -> str:- return self.text-- @override- def rendered_plain(self) -> str:- return self.text-- @override- def rendered_html(self) -> str:- # Convert a markdown string to HTML and return HTML as a Unicode string.- return markdown.markdown(self.text)-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- return self.text-- @override- def rendered_json(self) -> str:- return json.dumps({"text": self.text})-- def save_to_directory(self, directory: str):- ensure_directory_exists(directory)- filename = "text_content.txt"- save_text_to_path(text=self.text, path=f"{directory}/{filename}")---class DynamicContent(StuffContent):- @property- @override- def short_desc(self) -> str:- return "some dynamic concept"-- @override- def rendered_html(self) -> str:- return str(self.smart_dump())-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- return str(self.smart_dump())---class NumberContent(StuffContentInitableFromStr):- number: int | float-- @override- def smart_dump(self) -> str | dict[str, Any] | list[str] | list[dict[str, Any]]:- return str(self.number)-- @property- @override- def short_desc(self) -> str:- return f"some number ({self.number})"-- @classmethod- @override- def make_from_str(cls, str_value: str) -> "NumberContent":- try:- int_value = int(str_value)- return NumberContent(number=int_value)- except ValueError:- float_value = float(str_value)- return NumberContent(number=float_value)-- @override- def __str__(self) -> str:- return str(self.number)-- @override- def rendered_plain(self) -> str:- return str(self.number)-- @override- def rendered_html(self) -> str:- return str(self.number)-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- return str(self.number)-- @override- def rendered_json(self) -> str:- return json.dumps({"number": self.number})---class ImageContent(StuffContentInitableFromStr):- url: str- source_prompt: str | None = None- caption: str | None = None- base_64: str | None = None-- @property- @override- def short_desc(self) -> str:- url_desc = interpret_path_or_url(path_or_uri=self.url).desc- return f"{url_desc} or an image"-- @classmethod- @override- def make_from_str(cls, str_value: str) -> "ImageContent":- return ImageContent(url=str_value)-- @override- def rendered_plain(self) -> str:- return self.url-- @override- def rendered_html(self) -> str:- doc = Doc()- doc.stag("img", src=self.url, klass="msg-img")-- return doc.getvalue()-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- return f""-- @override- def rendered_json(self) -> str:- return json.dumps({"image_url": self.url, "source_prompt": self.source_prompt})-- @classmethod- def make_from_extracted_image(cls, extracted_image: ExtractedImage) -> Self:- return cls(- url=extracted_image.image_id,- base_64=extracted_image.base_64,- caption=extracted_image.caption,- )-- @classmethod- def make_from_image(cls, image: Image.Image) -> Self:- buffer = BytesIO()- image.save(buffer, format="PNG")- base_64 = base64.b64encode(buffer.getvalue()).decode("utf-8")- return cls(- url=f"data:image/png;base64,{base_64}",- base_64=base_64,- )-- def save_to_directory(self, directory: str, base_name: str | None = None, extension: str | None = None):- ensure_directory_exists(directory)- base_name = base_name or "img"- if (base_64 := self.base_64) and not extension:- match interpret_path_or_url(path_or_uri=self.url):- case InterpretedPathOrUrl.FILE_NAME:- parts = self.url.rsplit(".", 1)- base_name = parts[0]- extension = parts[1]- case InterpretedPathOrUrl.FILE_PATH | InterpretedPathOrUrl.FILE_URI | InterpretedPathOrUrl.URL | InterpretedPathOrUrl.BASE_64:- file_type = detect_file_type_from_base64(b64=base_64)- base_name = base_name or "img"- extension = file_type.extension- file_path = get_incremental_file_path(- base_path=directory,- base_name=base_name,- extension=extension,- avoid_suffix_if_possible=True,- )- save_base64_to_binary_file(b64=base_64, file_path=file_path)-- if caption := self.caption:- caption_file_path = get_incremental_file_path(- base_path=directory,- base_name=f"{base_name}_caption",- extension="txt",- avoid_suffix_if_possible=True,- )- save_text_to_path(text=caption, path=caption_file_path)- if source_prompt := self.source_prompt:- source_prompt_file_path = get_incremental_file_path(- base_path=directory,- base_name=f"{base_name}_source_prompt",- extension="txt",- avoid_suffix_if_possible=True,- )- save_text_to_path(text=source_prompt, path=source_prompt_file_path)---class PDFContent(StuffContentInitableFromStr):- url: str-- @property- @override- def short_desc(self) -> str:- url_desc = interpret_path_or_url(path_or_uri=self.url).desc- return f"{url_desc} of a PDF document"-- @classmethod- @override- def make_from_str(cls, str_value: str) -> "PDFContent":- return PDFContent(url=str_value)-- @override- def rendered_plain(self) -> str:- return self.url-- @override- def rendered_html(self) -> str:- doc = Doc()- doc.stag("a", href=self.url, klass="msg-pdf")- doc.text(self.url)-- return doc.getvalue()-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- return f"[{self.url}]({self.url})"---class HtmlContent(StuffContent):- inner_html: str- css_class: str-- @property- @override- def short_desc(self) -> str:- return f"some html ({len(self.inner_html)} chars)"-- @override- def __str__(self) -> str:- return self.rendered_html()-- @override- def rendered_plain(self) -> str:- return self.inner_html-- @override- def rendered_html(self) -> str:- doc, tag, text = Doc().tagtext()- with tag("div", klass=self.css_class):- text(self.inner_html)- return doc.getvalue()-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- return self.inner_html-- @override- def rendered_json(self) -> str:- return json.dumps({"html": self.inner_html, "css_class": self.css_class})---class MermaidContent(StuffContent):- mermaid_code: str- mermaid_url: str-- @property- @override- def short_desc(self) -> str:- return f"some mermaid code ({len(self.mermaid_code)} chars)"-- @override- def __str__(self) -> str:- return self.mermaid_code-- @override- def rendered_plain(self) -> str:- return self.mermaid_code-- @override- def rendered_html(self) -> str:- doc, tag, text = Doc().tagtext()- with tag("div", klass="mermaid"):- text(self.mermaid_code)- return doc.getvalue()-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- return self.mermaid_code-- @override- def rendered_json(self) -> str:- return json.dumps({"mermaid": self.mermaid_code})---class StructuredContent(StuffContent):- @property- @override- def short_desc(self) -> str:- return f"some structured content of class {self.__class__.__name__}"-- @override- def smart_dump(self):- return self.model_dump(serialize_as_any=True)-- @override- def rendered_html(self) -> str:- dict_dump = clean_model_to_dict(obj=self)-- html: str = json2html.convert( # pyright: ignore[reportAssignmentType, reportUnknownVariableType]- json=dict_dump, # pyright: ignore[reportArgumentType]- clubbing=True,- table_attributes="",- )- return html-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- dict_dump = clean_model_to_dict(obj=self)- return convert_to_markdown(data=dict_dump, level=level, is_pretty=is_pretty)---class ListContent(StuffContent, Generic[StuffContentType]):- items: list[StuffContentType]-- @property- def nb_items(self) -> int:- return len(self.items)-- def get_items(self, item_type: type[StuffContent]) -> list[StuffContent]:- return [item for item in self.items if isinstance(item, item_type)]-- @property- @override- def short_desc(self) -> str:- nb_items = len(self.items)- if nb_items == 0:- return "empty list"- if nb_items == 1:- return f"list of 1 {self.items[0].__class__.__name__}"- item_classes: list[str] = [item.__class__.__name__ for item in self.items]- item_classes_set = set(item_classes)- nb_classes = len(item_classes_set)- if nb_classes == 1:- return f"list of {len(self.items)} {item_classes[0]}s"- elif nb_items == nb_classes:- return f"list of {len(self.items)} items of different types"- else:- return f"list of {len(self.items)} items of {nb_classes} different types"-- @property- def _single_class_name(self) -> str | None:- item_classes: list[str] = [item.__class__.__name__ for item in self.items]- item_classes_set = set(item_classes)- nb_classes = len(item_classes_set)- if nb_classes == 1:- return item_classes[0]- else:- return None-- @override- def model_dump(self, *args: Any, **kwargs: Any):- obj_dict = super().model_dump(*args, **kwargs)- obj_dict["items"] = [item.model_dump(*args, **kwargs) for item in self.items]- return obj_dict-- @override- def rendered_plain(self) -> str:- return self.rendered_markdown()-- @override- def rendered_html(self) -> str:- list_dump = [item.smart_dump() for item in self.items]-- html: str = json2html.convert( # pyright: ignore[reportAssignmentType, reportUnknownVariableType]- json=list_dump, # pyright: ignore[reportArgumentType]- clubbing=True,- table_attributes="",- )- return html-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- rendered = ""- if self._single_class_name == "TextContent":- for item in self.items:- rendered += f" • {item}\n"- else:- for item_index, item in enumerate(self.items):- rendered += f"\n • item #{item_index + 1}:\n\n"- rendered += item.rendered_str(text_format=TextFormat.MARKDOWN)- rendered += "\n"- return rendered---class TextAndImagesContent(StuffContent):- text: TextContent | None- images: list[ImageContent] | None-- @property- @override- def short_desc(self) -> str:- text_count = 1 if self.text else 0- image_count = len(self.images) if self.images else 0- return f"text and image content ({text_count} text, {image_count} images)"-- @override- def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:- if self.text:- rendered = self.text.rendered_markdown(level=level, is_pretty=is_pretty)- else:- rendered = ""- return rendered-- @override- def rendered_html(self) -> str:- if self.text:- rendered = self.text.rendered_html()- else:- rendered = ""- return rendered-- def save_to_directory(self, directory: str):- ensure_directory_exists(directory)- if text_content := self.text:- text_content.save_to_directory(directory=directory)- if images := self.images:- for image_content in images:- image_content.save_to_directory(directory=directory)---class PageContent(StructuredContent):- text_and_images: TextAndImagesContent- page_view: ImageContent | None = None-- def save_to_directory(self, directory: str):- ensure_directory_exists(directory)- self.text_and_images.save_to_directory(directory=directory)- if page_view := self.page_view:- page_view.save_to_directory(directory=directory, base_name="page_view")diff --git a/pipelex/core/stuffs/stuff_factory.py b/pipelex/core/stuffs/stuff_factory.pyindex eec0a1fd2..2ae305068 100644--- a/pipelex/core/stuffs/stuff_factory.py+++ b/pipelex/core/stuffs/stuff_factory.py@@ -8,18 +8,16 @@ from pipelex.core.concepts.concept import Conceptfrom pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum, NativeConceptManager+from pipelex.core.stuffs.list_content import ListContentfrom pipelex.core.stuffs.stuff import Stuff-from pipelex.core.stuffs.stuff_content import (- ListContent,- StuffContent,- TextContent,-)-from pipelex.exceptions import PipelexError-from pipelex.hub import get_class_registry, get_concept_provider, get_native_concept+from pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.core.stuffs.text_content import TextContent+from pipelex.exceptions import PipelexException+from pipelex.hub import get_class_registry, get_concept_library, get_native_concept, get_required_conceptfrom pipelex.tools.typing.pydantic_utils import format_pydantic_validation_error-class StuffFactoryError(PipelexError):+class StuffFactoryError(PipelexException):pass@@ -29,8 +27,8 @@ class StuffBlueprint(BaseModel):content: dict[str, Any] | str@field_validator("concept_string")- @staticmethod- def validate_concept_string(concept_string: str) -> str:+ @classmethod+ def validate_concept_string(cls, concept_string: str) -> str:ConceptBlueprint.validate_concept_string(concept_string)return concept_string@@ -40,18 +38,10 @@ class StuffFactory:def make_stuff_name(cls, concept: Concept) -> str:return Stuff.make_stuff_name(concept=concept)- @classmethod- def make_from_str(cls, str_value: str, name: str) -> Stuff:- return cls.make_stuff(- concept=ConceptFactory.make_native_concept(native_concept_data=NativeConceptManager.get_native_concept_data(NativeConceptEnum.TEXT)),- content=TextContent(text=str_value),- name=name,- )-@classmethoddef make_from_concept_string(cls, concept_string: str, name: str, content: StuffContent) -> Stuff:ConceptBlueprint.validate_concept_string(concept_string)- concept = get_concept_provider().get_required_concept(concept_string=concept_string)+ concept = get_required_concept(concept_string=concept_string)return cls.make_stuff(concept=concept,content=content,@@ -85,8 +75,8 @@ class StuffFactory:code: str | None = None,) -> Stuff:# TODO: Add unit tests for this method- concept_provider = get_concept_provider()- concept = concept_provider.search_for_concept_in_domains(+ concept_library = get_concept_library()+ concept = concept_library.search_for_concept_in_domains(concept_code=concept_name,search_domains=search_domains,)@@ -97,7 +87,7 @@ class StuffFactory:@classmethoddef make_from_blueprint(cls, blueprint: StuffBlueprint) -> "Stuff":- concept_library = get_concept_provider()+ concept_library = get_concept_library()if isinstance(blueprint.content, str) and concept_library.is_compatible(tested_concept=concept_library.get_required_concept(concept_string=blueprint.concept_string),wanted_concept=get_native_concept(native_concept=NativeConceptEnum.TEXT),@@ -244,26 +234,29 @@ class StuffFactory:msg = f"Stuff content data dict is badly formed: {exc}"raise StuffFactoryError(msg) from exc+ concept_library = get_concept_library()+ concept = concept_library.get_required_concept(concept_string=concept_code)+if isinstance(content_value, StuffContent):return StuffFactory.make_stuff(- concept=get_concept_provider().get_required_concept(concept_string=concept_code),+ concept=concept,name=name,content=content_value,code=stuff_code,)content = StuffContentFactory.make_stuff_content_from_concept_with_fallback(- concept=get_concept_provider().get_required_concept(concept_string=concept_code),+ concept=concept,value=content_value,)return StuffFactory.make_stuff(- concept=get_concept_provider().get_required_concept(concept_string=concept_code),+ concept=concept,name=name,content=content,code=stuff_code,)-class StuffContentFactoryError(PipelexError):+class StuffContentFactoryError(PipelexException):passdiff --git a/pipelex/core/stuffs/text_and_images_content.py b/pipelex/core/stuffs/text_and_images_content.pynew file mode 100644index 000000000..03eab91a1--- /dev/null+++ b/pipelex/core/stuffs/text_and_images_content.py@@ -0,0 +1,42 @@+from typing_extensions import override++from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.core.stuffs.text_content import TextContent+from pipelex.tools.misc.file_utils import ensure_directory_exists+++class TextAndImagesContent(StuffContent):+ text: TextContent | None+ images: list[ImageContent] | None++ @property+ @override+ def short_desc(self) -> str:+ text_count = 1 if self.text else 0+ image_count = len(self.images) if self.images else 0+ return f"text and image content ({text_count} text, {image_count} images)"++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ if self.text:+ rendered = self.text.rendered_markdown(level=level, is_pretty=is_pretty)+ else:+ rendered = ""+ return rendered++ @override+ def rendered_html(self) -> str:+ if self.text:+ rendered = self.text.rendered_html()+ else:+ rendered = ""+ return rendered++ def save_to_directory(self, directory: str):+ ensure_directory_exists(directory)+ if text_content := self.text:+ text_content.save_to_directory(directory=directory)+ if images := self.images:+ for image_content in images:+ image_content.save_to_directory(directory=directory)diff --git a/pipelex/core/stuffs/text_content.py b/pipelex/core/stuffs/text_content.pynew file mode 100644index 000000000..9140de146--- /dev/null+++ b/pipelex/core/stuffs/text_content.py@@ -0,0 +1,47 @@+import json+from typing import Any++import markdown+from typing_extensions import override++from pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.tools.misc.file_utils import ensure_directory_exists, save_text_to_path+++class TextContent(StuffContent):+ text: str++ @override+ def smart_dump(self) -> str | dict[str, Any] | list[str] | list[dict[str, Any]]:+ return self.text++ @property+ @override+ def short_desc(self) -> str:+ return f"some text ({len(self.text)} chars)"++ @override+ def __str__(self) -> str:+ return self.text++ @override+ def rendered_plain(self) -> str:+ return self.text++ @override+ def rendered_html(self) -> str:+ # Convert a markdown string to HTML and return HTML as a Unicode string.+ return markdown.markdown(self.text)++ @override+ def rendered_markdown(self, level: int = 1, is_pretty: bool = False) -> str:+ return self.text++ @override+ def rendered_json(self) -> str:+ return json.dumps({"text": self.text})++ def save_to_directory(self, directory: str):+ ensure_directory_exists(directory)+ filename = "text_content.txt"+ save_text_to_path(text=self.text, path=f"{directory}/{filename}")diff --git a/pipelex/exceptions.py b/pipelex/exceptions.pyindex 9f4e064be..6e2972921 100644--- a/pipelex/exceptions.py+++ b/pipelex/exceptions.py@@ -6,7 +6,11 @@ from pipelex.tools.misc.context_provider_abstract import ContextProviderExceptiofrom pipelex.types import StrEnum-class PipelexError(RootException):+class PipelexException(RootException):+ pass+++class PipelexUnexpectedError(PipelexException):pass@@ -60,11 +64,11 @@ class StaticValidationError(Exception):return self.desc()-class WorkingMemoryFactoryError(PipelexError):+class WorkingMemoryFactoryError(PipelexException):pass-class WorkingMemoryError(PipelexError):+class WorkingMemoryError(PipelexException):pass@@ -88,27 +92,27 @@ class WorkingMemoryStuffNotFoundError(WorkingMemoryVariableError):pass-class PipelexCLIError(PipelexError, ClickException):+class PipelexCLIError(PipelexException, ClickException):"""Raised when there's an error in CLI usage or operation."""-class PipelexConfigError(PipelexError):+class PipelexConfigError(PipelexException):pass-class PipelexSetupError(PipelexError):+class PipelexSetupError(PipelexException):pass-class ClientAuthenticationError(PipelexError):+class ClientAuthenticationError(PipelexException):pass-class ConceptLibraryConceptNotFoundError(PipelexError):+class ConceptLibraryConceptNotFoundError(PipelexException):pass-class LibraryError(PipelexError):+class LibraryError(PipelexException):pass@@ -132,7 +136,7 @@ class PipeLibraryPipeNotFoundError(PipeLibraryError):pass-class PipeFactoryError(PipelexError):+class PipeFactoryError(PipelexException):pass@@ -140,7 +144,7 @@ class LibraryParsingError(LibraryError):pass-class DomainDefinitionError(PipelexError):+class DomainDefinitionError(PipelexException):def __init__(self, message: str, domain_code: str, description: str, source: str | None = None):self.domain_code = domain_codeself.description = description@@ -148,7 +152,7 @@ class DomainDefinitionError(PipelexError):super().__init__(message)-class ConceptDefinitionError(PipelexError):+class ConceptDefinitionError(PipelexException):def __init__(self,message: str,@@ -166,14 +170,14 @@ class ConceptDefinitionError(PipelexError):super().__init__(message)-class ConceptStructureGeneratorError(PipelexError):+class ConceptStructureGeneratorError(PipelexException):def __init__(self, message: str, structure_class_python_code: str | None = None):self.structure_class_python_code = structure_class_python_codesuper().__init__(message)# TODO: add details from all cases raising this error-class PipeDefinitionError(PipelexError):+class PipeDefinitionError(PipelexException):def __init__(self,message: str,@@ -236,7 +240,7 @@ class UnexpectedPipeDefinitionError(PipeDefinitionError):pass-class StuffError(PipelexError):+class StuffError(PipelexException):pass@@ -250,7 +254,7 @@ class StuffContentValidationError(StuffError):super().__init__(f"Failed to validate content from {original_type} to {target_type}: {validation_error}")-class PipeExecutionError(PipelexError):+class PipeExecutionError(PipelexException):pass@@ -271,23 +275,23 @@ class DryRunError(PipeExecutionError):super().__init__(message)-class BatchParamsError(PipelexError):+class BatchParamsError(PipelexException):pass-class PipeConditionError(PipelexError):+class PipeConditionError(PipelexException):pass-class StructureClassError(PipelexError):+class StructureClassError(PipelexException):pass-class PipeRunParamsError(PipelexError):+class PipeRunParamsError(PipelexException):pass-class PipeBatchError(PipelexError):+class PipeBatchError(PipelexException):"""Base class for all PipeBatch-related errors."""@@ -307,15 +311,15 @@ class PipeBatchBranchError(PipeBatchError):"""Raised when there's an error with a branch pipe execution in PipeBatch."""-class JobHistoryError(PipelexError):+class JobHistoryError(PipelexException):pass-class PipeInputError(PipelexError):+class PipeInputError(PipelexException):pass-class StuffArtefactError(PipelexError):+class StuffArtefactError(PipelexException):pass@@ -331,19 +335,19 @@ class ConceptRefineError(ConceptError):pass-class PipelineManagerNotFoundError(PipelexError):+class PipelineManagerNotFoundError(PipelexException):pass-class PipeInputSpecError(PipelexError):+class PipeInputSpecError(PipelexException):pass-class PipeInputNotFoundError(PipelexError):+class PipeInputNotFoundError(PipelexException):pass-class PipeInputDetailsError(PipelexError):+class PipeInputDetailsError(PipelexException):passdiff --git a/pipelex/hub.py b/pipelex/hub.pyindex 9272c6914..59866a182 100644--- a/pipelex/hub.py+++ b/pipelex/hub.py@@ -13,15 +13,15 @@ from pipelex.cogt.models.model_deck import ModelDeckfrom pipelex.cogt.models.model_manager_abstract import ModelManagerAbstractfrom pipelex.cogt.ocr.ocr_worker_abstract import OcrWorkerAbstractfrom pipelex.core.concepts.concept import Concept+from pipelex.core.concepts.concept_library_abstract import ConceptLibraryAbstractfrom pipelex.core.concepts.concept_native import NativeConceptEnum-from pipelex.core.concepts.concept_provider_abstract import ConceptProviderAbstractfrom pipelex.core.domains.domain import Domain-from pipelex.core.domains.domain_provider_abstract import DomainProviderAbstract+from pipelex.core.domains.domain_library_abstract import DomainLibraryAbstractfrom pipelex.core.pipes.pipe_abstract import PipeAbstract-from pipelex.core.pipes.pipe_provider_abstract import PipeProviderAbstract+from pipelex.core.pipes.pipe_library_abstract import PipeLibraryAbstractfrom pipelex.libraries.library_manager_abstract import LibraryManagerAbstractfrom pipelex.observer.observer_protocol import ObserverProtocol-from pipelex.pipe_works.pipe_router_protocol import PipeRouterProtocol+from pipelex.pipe_run.pipe_router_protocol import PipeRouterProtocolfrom pipelex.pipeline.activity.activity_manager_protocol import ActivityManagerProtocolfrom pipelex.pipeline.pipeline import Pipelinefrom pipelex.pipeline.pipeline_manager_abstract import PipelineManagerAbstract@@ -58,9 +58,9 @@ class PipelexHub:self._content_generator: ContentGeneratorProtocol | None = None# pipelex- self._domain_provider: DomainProviderAbstract | None = None- self._concept_provider: ConceptProviderAbstract | None = None- self._pipe_provider: PipeProviderAbstract | None = None+ self._domain_library: DomainLibraryAbstract | None = None+ self._concept_library: ConceptLibraryAbstract | None = None+ self._pipe_library: PipeLibraryAbstract | None = Noneself._pipe_router: PipeRouterProtocol | None = Noneself._library_manager: LibraryManagerAbstract | None = None@@ -143,14 +143,14 @@ class PipelexHub:# pipelex- def set_domain_provider(self, domain_provider: DomainProviderAbstract):- self._domain_provider = domain_provider+ def set_domain_library(self, domain_library: DomainLibraryAbstract):+ self._domain_library = domain_library- def set_concept_provider(self, concept_provider: ConceptProviderAbstract):- self._concept_provider = concept_provider+ def set_concept_library(self, concept_library: ConceptLibraryAbstract):+ self._concept_library = concept_library- def set_pipe_provider(self, pipe_provider: PipeProviderAbstract):- self._pipe_provider = pipe_provider+ def set_pipe_library(self, pipe_library: PipeLibraryAbstract):+ self._pipe_library = pipe_librarydef set_pipe_router(self, pipe_router: PipeRouterProtocol):self._pipe_router = pipe_router@@ -245,29 +245,23 @@ class PipelexHub:# pipelex- def get_required_domain_provider(self) -> DomainProviderAbstract:- if self._domain_provider is None:- msg = "DomainProvider is not initialized"+ def get_required_domain_library(self) -> DomainLibraryAbstract:+ if self._domain_library is None:+ msg = "DomainLibrary is not initialized"raise RuntimeError(msg)- return self._domain_provider+ return self._domain_library- def get_optional_domain_provider(self) -> DomainProviderAbstract | None:- return self._domain_provider-- def get_required_concept_provider(self) -> ConceptProviderAbstract:- if self._concept_provider is None:- msg = "ConceptProvider is not initialized"+ def get_required_concept_library(self) -> ConceptLibraryAbstract:+ if self._concept_library is None:+ msg = "ConceptLibrary is not initialized"raise RuntimeError(msg)- return self._concept_provider-- def get_optional_concept_provider(self) -> ConceptProviderAbstract | None:- return self._concept_provider+ return self._concept_library- def get_required_pipe_provider(self) -> PipeProviderAbstract:- if self._pipe_provider is None:- msg = "PipeProvider is not initialized"+ def get_required_pipe_library(self) -> PipeLibraryAbstract:+ if self._pipe_library is None:+ msg = "PipeLibrary is not initialized"raise RuntimeError(msg)- return self._pipe_provider+ return self._pipe_librarydef get_required_pipe_router(self) -> PipeRouterProtocol:if self._pipe_router is None:@@ -299,9 +293,6 @@ class PipelexHub:raise RuntimeError(msg)return self._library_manager- def get_optional_library_manager(self) -> LibraryManagerAbstract | None:- return self._library_manager-def get_observer_provider(self) -> ObserverProtocol:if self._observer_provider is None:msg = "Observer is not set. You must initialize Pipelex first."@@ -402,37 +393,35 @@ def get_secret(secret_id: str) -> str:def get_required_domain(domain: str) -> Domain:- return get_pipelex_hub().get_required_domain_provider().get_required_domain(domain=domain)+ return get_pipelex_hub().get_required_domain_library().get_required_domain(domain=domain)def get_optional_domain(domain: str) -> Domain | None:- if domain_provider := get_pipelex_hub().get_optional_domain_provider():- return domain_provider.get_domain(domain=domain)- return None+ return get_pipelex_hub().get_required_domain_library().get_domain(domain=domain)-def get_pipe_provider() -> PipeProviderAbstract:- return get_pipelex_hub().get_required_pipe_provider()+def get_pipe_library() -> PipeLibraryAbstract:+ return get_pipelex_hub().get_required_pipe_library()-def get_required_pipe(pipe_code: str) -> PipeAbstract:- return get_pipelex_hub().get_required_pipe_provider().get_required_pipe(pipe_code=pipe_code)+def get_pipes() -> list[PipeAbstract]:+ return get_pipelex_hub().get_required_pipe_library().get_pipes()-def get_optional_pipe(pipe_code: str) -> PipeAbstract | None:- return get_pipelex_hub().get_required_pipe_provider().get_optional_pipe(pipe_code=pipe_code)+def get_required_pipe(pipe_code: str) -> PipeAbstract:+ return get_pipelex_hub().get_required_pipe_library().get_required_pipe(pipe_code=pipe_code)-def get_concept_provider() -> ConceptProviderAbstract:- return get_pipelex_hub().get_required_concept_provider()+def get_optional_pipe(pipe_code: str) -> PipeAbstract | None:+ return get_pipelex_hub().get_required_pipe_library().get_optional_pipe(pipe_code=pipe_code)-def get_optional_concept_provider() -> ConceptProviderAbstract | None:- return get_pipelex_hub().get_optional_concept_provider()+def get_concept_library() -> ConceptLibraryAbstract:+ return get_pipelex_hub().get_required_concept_library()def get_required_concept(concept_string: str) -> Concept:- return get_pipelex_hub().get_required_concept_provider().get_required_concept(concept_string=concept_string)+ return get_pipelex_hub().get_required_concept_library().get_required_concept(concept_string=concept_string)def get_pipe_router() -> PipeRouterProtocol:@@ -464,4 +453,4 @@ def get_observer_provider() -> ObserverProtocol:def get_native_concept(native_concept: NativeConceptEnum) -> Concept:- return get_pipelex_hub().get_required_concept_provider().get_native_concept(native_concept=native_concept)+ return get_pipelex_hub().get_required_concept_library().get_native_concept(native_concept=native_concept)diff --git a/pipelex/libraries/pipelines/builder/builder.py b/pipelex/libraries/pipelines/builder/builder.pyindex 957df1c67..91872c516 100644--- a/pipelex/libraries/pipelines/builder/builder.py+++ b/pipelex/libraries/pipelines/builder/builder.py@@ -1,4 +1,4 @@-from typing import Annotated, cast+from typing import TYPE_CHECKING, Annotated, castfrom pydantic import ConfigDict, Field, ValidationError, field_validator@@ -7,7 +7,8 @@ from pipelex.core.bundles.pipelex_bundle_blueprint import PipeBlueprintUnion, Pifrom pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.domains.domain_blueprint import DomainBlueprintfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.stuffs.stuff_content import ListContent, StructuredContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.exceptions import (ConceptLoadingError,DomainLoadingError,@@ -39,9 +40,13 @@ from pipelex.libraries.pipelines.builder.pipe.pipe_llm_spec import PipeLLMSpecfrom pipelex.libraries.pipelines.builder.pipe.pipe_ocr_spec import PipeOcrSpecfrom pipelex.libraries.pipelines.builder.pipe.pipe_parallel_spec import PipeParallelSpecfrom pipelex.libraries.pipelines.builder.pipe.pipe_sequence_spec import PipeSequenceSpec-from pipelex.pipe_works.pipe_dry import dry_run_pipes+from pipelex.libraries.pipelines.builder.pipe.pipe_signature import PipeSpec+from pipelex.pipe_run.dry_run import dry_run_pipesfrom pipelex.tools.typing.pydantic_utils import format_pydantic_validation_error+if TYPE_CHECKING:+ from pipelex.core.stuffs.list_content import ListContent+class DomainInformation(StructuredContent):domain: str = Field(description="Name of the domain of the knowledge work.")@@ -160,7 +165,7 @@ class PipelexBundleSpec(StructuredContent):)-# TODO: Put this in a factory. Investigate why it is necessary.+# # TODO: Put this in a factory. Investigate why it is necessary.def _convert_pipe_spec(pipe_spec: PipeSpecUnion) -> PipeSpecUnion:pipe_type_to_class: dict[str, type] = {"PipeFunc": PipeFuncSpec,@@ -178,7 +183,10 @@ def _convert_pipe_spec(pipe_spec: PipeSpecUnion) -> PipeSpecUnion:if pipe_class is None:msg = f"Unknown pipe type: {pipe_spec.type}"raise PipeBuilderError(msg)- return cast("PipeSpecUnion", pipe_class(**pipe_spec.model_dump(serialize_as_any=True)))+ if not issubclass(pipe_class, PipeSpec):+ msg = f"Pipe class {pipe_class} is not a subclass of PipeSpec"+ raise PipeBuilderError(msg)+ return cast("PipeSpecUnion", pipe_class.model_validate(pipe_spec.model_dump(serialize_as_any=True)))async def assemble_pipelex_bundle_spec(working_memory: WorkingMemory) -> PipelexBundleSpec:@@ -198,7 +206,7 @@ async def assemble_pipelex_bundle_spec(working_memory: WorkingMemory) -> Pipelexitem_type=ConceptSpec,)- pipe_specs = cast("ListContent[PipeSpecUnion]", working_memory.get_stuff(name="pipe_specs").content)+ pipe_specs: list[PipeSpecUnion] = cast("ListContent[PipeSpecUnion]", working_memory.get_stuff(name="pipe_specs").content).itemsdomain_information = working_memory.get_stuff_as(name="domain_information", content_type=DomainInformation)# Properly validate and reconstruct concept specs to ensure proper Pydantic validation@@ -217,7 +225,7 @@ async def assemble_pipelex_bundle_spec(working_memory: WorkingMemory) -> Pipelexdomain=domain_information.domain,description=domain_information.description,concept=validated_concepts,- pipe={pipe_spec.pipe_code: _convert_pipe_spec(pipe_spec) for pipe_spec in pipe_specs.items},+ pipe={pipe_spec.pipe_code: _convert_pipe_spec(pipe_spec) for pipe_spec in pipe_specs},)diff --git a/pipelex/libraries/pipelines/builder/builder_errors.py b/pipelex/libraries/pipelines/builder/builder_errors.pyindex 1e8437249..3c45746f8 100644--- a/pipelex/libraries/pipelines/builder/builder_errors.py+++ b/pipelex/libraries/pipelines/builder/builder_errors.py@@ -2,9 +2,9 @@from pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.exceptions import (- PipelexError,+ PipelexException,StaticValidationErrorType,)from pipelex.libraries.pipelines.builder.concept.concept_spec import ConceptSpec@@ -124,7 +124,7 @@ class PipeBuilderError(Exception):"""Base exception for pipe builder errors."""-class ConceptSpecError(PipelexError):+class ConceptSpecError(PipelexException):"""Details of a single concept failure during dry run."""def __init__(self: Self, message: str, concept_failure: ConceptFailure) -> None:@@ -136,7 +136,7 @@ class ConceptSpecError(PipelexError):return self.concept_failure-class PipeSpecError(PipelexError):+class PipeSpecError(PipelexException):"""Details of a single pipe failure during dry run."""def __init__(self: Self, message: str, pipe_failure: PipeFailure) -> None:@@ -152,7 +152,7 @@ class ValidateDryRunError(Exception):"""Raised when validating the dry run of a pipe."""-class PipelexBundleError(PipelexError):+class PipelexBundleError(PipelexException):"""Main bundle error that aggregates multiple types of errors."""def __init__(@@ -186,9 +186,9 @@ class PipelexBundleError(PipelexError):)-class PipelexBundleNoFixForError(PipelexError):+class PipelexBundleNoFixForError(PipelexException):"""Raised when no fix is found for a static validation error."""-class PipelexBundleUnexpectedError(PipelexError):+class PipelexBundleUnexpectedError(PipelexException):"""Raised when an unexpected error occurs during validation."""diff --git a/pipelex/libraries/pipelines/builder/builder_loop.py b/pipelex/libraries/pipelines/builder/builder_loop.pyindex 4d197f4f9..0ccca249b 100644--- a/pipelex/libraries/pipelines/builder/builder_loop.py+++ b/pipelex/libraries/pipelines/builder/builder_loop.py@@ -61,9 +61,10 @@ class BuilderLoop:case StaticValidationErrorType.MISSING_INPUT_VARIABLE | StaticValidationErrorType.EXTRANEOUS_INPUT_VARIABLE:if not AllowedPipeCategories.is_controller_by_str(category_str=pipe_spec.category):msg = (- f"Static validation error pipelex_bundle_spec had a pipe spec for "- f"considered pipe code: '{static_error.pipe_code}' but it was not a PipeController. "- "We don't support fixing this error yet."+ f"Static validation error: pipelex_bundle_spec had an input requirement error for a pipe spec of type "+ f"{pipe_spec.type} for considered pipe code: '{static_error.pipe_code}' but it was not a PipeController. "+ "We don't support fixing this error yet. Dump of the pipelex_bundle_spec:\n\n"+ f"{pipelex_bundle_spec.model_dump_json(serialize_as_any=True, indent=2)}")raise PipelexBundleNoFixForError(message=msg) from bundle_errordiff --git a/pipelex/libraries/pipelines/builder/concept/concept_spec.py b/pipelex/libraries/pipelines/builder/concept/concept_spec.pyindex 6bb2370e8..fe2a7ecf5 100644--- a/pipelex/libraries/pipelines/builder/concept/concept_spec.py+++ b/pipelex/libraries/pipelines/builder/concept/concept_spec.py@@ -15,7 +15,7 @@ from pipelex.core.concepts.concept_native import NativeConceptManagerfrom pipelex.core.concepts.exceptions import ConceptCodeError, ConceptStringOrConceptCodeErrorfrom pipelex.core.domains.domain_blueprint import DomainBlueprintfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.tools.misc.string_utils import is_pascal_case, normalize_to_ascii, snake_to_pascal_casefrom pipelex.types import Self, StrEnumdiff --git a/pipelex/libraries/pipelines/builder/flow.py b/pipelex/libraries/pipelines/builder/flow.pyindex d59e3e8da..ce54c296c 100644--- a/pipelex/libraries/pipelines/builder/flow.py+++ b/pipelex/libraries/pipelines/builder/flow.py@@ -1,6 +1,6 @@from pydantic import ConfigDict, Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.libraries.pipelines.builder.pipe.pipe_signature import PipeSignaturefrom pipelex.pipe_controllers.batch.pipe_batch_blueprint import PipeBatchBlueprintfrom pipelex.pipe_controllers.condition.pipe_condition_blueprint import PipeConditionBlueprintdiff --git a/pipelex/libraries/pipelines/builder/pipe/pipe_condition_spec.py b/pipelex/libraries/pipelines/builder/pipe/pipe_condition_spec.pyindex 062562d80..44d6dd7c9 100644--- a/pipelex/libraries/pipelines/builder/pipe/pipe_condition_spec.py+++ b/pipelex/libraries/pipelines/builder/pipe/pipe_condition_spec.py@@ -6,6 +6,7 @@ from typing_extensions import overridefrom pipelex.libraries.pipelines.builder.pipe.pipe_signature import PipeSpecfrom pipelex.pipe_controllers.condition.pipe_condition_blueprint import PipeConditionBlueprint+from pipelex.pipe_controllers.condition.special_outcome import SpecialOutcomeclass PipeConditionSpec(PipeSpec):@@ -14,18 +15,16 @@ class PipeConditionSpec(PipeSpec):Validation Rules:1. Either expression or expression_template should be provided, not both.- 2. pipe_map keys must be strings representing possible condition outcomes.- 3. All pipe codes in pipe_map and default_pipe_code must be valid pipe references.+ 2. outcomes map keys, must be strings representing possible valmes from expression.+ 3. All values in outcomes map and default_outcome must be either valid pipe_code references or special outcomes "fail" or "continue"."""type: SkipJsonSchema[Literal["PipeCondition"]] = "PipeCondition"category: SkipJsonSchema[Literal["PipeController"]] = "PipeController"jinja2_expression_template: str = Field(description="Jinja2 expression to evaluate.")- pipe_map: dict[str, str] = Field(..., description="Mapping `dict[str, str]` of condition results to pipe codes.")- default_pipe_code: str | None = Field(- default=None, description="The fallback pipe code to execute if the expression result does not match any key in pipe_map."- )+ outcomes: dict[str, str] = Field(..., description="Mapping `dict[str, str]` of condition to outcomes.")+ default_outcome: str | SpecialOutcome = Field(description="The fallback outcome if the expression result does not match any key in outcome map.")@overridedef to_blueprint(self) -> PipeConditionBlueprint:@@ -38,7 +37,7 @@ class PipeConditionSpec(PipeSpec):category=self.category,expression_template=self.jinja2_expression_template,expression=None,- pipe_map=self.pipe_map,- default_pipe_code=self.default_pipe_code,+ outcomes=self.outcomes,+ default_outcome=self.default_outcome,add_alias_from_expression_to=None,)diff --git a/pipelex/libraries/pipelines/builder/pipe/pipe_design.plx b/pipelex/libraries/pipelines/builder/pipe/pipe_design.plxindex 17cda1433..231ace7a9 100644--- a/pipelex/libraries/pipelines/builder/pipe/pipe_design.plx+++ b/pipelex/libraries/pipelines/builder/pipe/pipe_design.plx@@ -25,9 +25,9 @@ description = "Route by signature.type to the correct spec emitter."inputs = { plan_draft = "PlanDraft", pipe_signature = "PipeSignature", concept_specs = "ConceptSpec" }output = "Dynamic"expression = "pipe_signature.type"-default_pipe_code = "continue"+default_outcome = "continue"-[pipe.detail_pipe_spec.pipe_map]+[pipe.detail_pipe_spec.outcomes]PipeSequence = "detail_pipe_sequence"PipeParallel = "detail_pipe_parallel"PipeCondition = "detail_pipe_condition"@@ -79,7 +79,7 @@ Here are the concepts you can use for inputs/outputs:[pipe.detail_pipe_condition]type = "PipeLLM"-description = "Build a PipeConditionSpec from the signature (provide expression/pipe_map consistent with children)."+description = "Build a PipeConditionSpec from the signature (provide expression/outcome consistent with children)."inputs = { plan_draft = "PlanDraft", pipe_signature = "PipeSignature", concept_specs = "concept.ConceptSpec" }output = "PipeConditionSpec"llm = "llm_to_engineer"diff --git a/pipelex/libraries/pipelines/builder/pipe/pipe_llm_spec.py b/pipelex/libraries/pipelines/builder/pipe/pipe_llm_spec.pyindex 9412afce8..29b14aedd 100644--- a/pipelex/libraries/pipelines/builder/pipe/pipe_llm_spec.py+++ b/pipelex/libraries/pipelines/builder/pipe/pipe_llm_spec.py@@ -16,17 +16,19 @@ if TYPE_CHECKING:class AvailableLLM(StrEnum):- CLAUDE_4_SONNET = "claude-4-sonnet"+ CLAUDE_4_SONNET = "claude-4.5-sonnet"CLAUDE_4_1_OPUS = "claude-4.1-opus"GPT_5 = "gpt-5"GEMINI_2_5_PRO = "gemini-2.5-pro"GEMINI_2_5_FLASH = "gemini-2.5-flash"+ GEMINI_2_5_FLASH_LITE = "gemini-2.5-flash-lite"class LLMSkill(StrEnum):LLM_TO_RETRIEVE = "llm_to_retrieve"LLM_CHEAP_FOR_EASY_QUESTIONS = "llm_cheap_for_easy_questions"LLM_TO_ANSWER_HARD_QUESTIONS = "llm_to_answer_hard_questions"+ LLM_CHEAP_FOR_VISION = "llm_cheap_for_vision"LLM_FOR_VISUAL_ANALYSIS = "llm_for_visual_analysis"LLM_FOR_VISUAL_DESIGN = "llm_for_visual_design"LLM_FOR_CREATIVE_WRITING = "llm_for_creative_writing"@@ -45,6 +47,8 @@ class LLMSkill(StrEnum):return AvailableLLM.CLAUDE_4_SONNETcase LLMSkill.LLM_TO_ANSWER_HARD_QUESTIONS:return AvailableLLM.GPT_5+ case LLMSkill.LLM_CHEAP_FOR_VISION:+ return AvailableLLM.GEMINI_2_5_FLASH_LITEcase LLMSkill.LLM_FOR_VISUAL_ANALYSIS:return AvailableLLM.GEMINI_2_5_FLASHcase LLMSkill.LLM_FOR_VISUAL_DESIGN:@@ -85,9 +89,10 @@ class PipeLLMSpec(PipeSpec):prompt_template: str | None = Field(description=("A template for the user prompt. Use `$` prefix for inline variables (e.g., `$topic`) and `@` prefix "- "to insert the content of an entire input (e.g., `@extracted_text`). "- "**Notes**: • Do not use `@` or `$` for image variables, declaring them as inputs is enough."- "• You can also use jinja2 syntax for conditional logic and for loops, but prefer `$` and `@` for simple variable insertions."+ "to insert content as a block with delimiters (e.g., `@extracted_text` --> extracted_text: ```\n[the extracted_text goes here]\n```). "+ "**Notes**: • Image variables must be inserted too. They can be simply added with the `$` prefix on a line, e.g. `$image_1`."+ "Or you can mention them by their number in order in the inputs section, starting from 1. Example: "+ "`Only analyze the colors from $image_1 and the shapes from $image_2."))diff --git a/pipelex/libraries/pipelines/builder/pipe/pipe_signature.py b/pipelex/libraries/pipelines/builder/pipe/pipe_signature.pyindex 8c7867d5b..2ad9c9bbb 100644--- a/pipelex/libraries/pipelines/builder/pipe/pipe_signature.py+++ b/pipelex/libraries/pipelines/builder/pipe/pipe_signature.py@@ -4,9 +4,9 @@ from pydantic import Field, field_validatorfrom pipelex import logfrom pipelex.core.pipes.exceptions import PipeBlueprintError+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom 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.core.stuffs.structured_content import StructuredContentfrom pipelex.libraries.pipelines.builder.concept.concept_spec import ConceptSpecfrom pipelex.tools.misc.string_utils import is_snake_case, normalize_to_ascii@@ -54,22 +54,22 @@ class PipeSpec(StructuredContent):return cls.validate_pipe_code_syntax(value)@field_validator("type", mode="after")- @staticmethod- def validate_pipe_type(value: Any) -> Any:+ @classmethod+ def validate_pipe_type(cls, value: Any) -> Any:if value not in AllowedPipeTypes.value_list():msg = f"Invalid pipe type '{value}'. Must be one of: {AllowedPipeTypes.value_list()}"raise PipeBlueprintError(msg)return value@field_validator("output", mode="after")- @staticmethod- def validate_concept_string_or_code(output: str) -> str:+ @classmethod+ def validate_concept_string_or_code(cls, output: str) -> str:ConceptSpec.validate_concept_string_or_code(concept_string_or_code=output)return output@field_validator("inputs", mode="after")- @staticmethod- def validate_inputs(inputs: dict[str, str] | None) -> dict[str, str] | None:+ @classmethod+ def validate_inputs(cls, inputs: dict[str, str] | None) -> dict[str, str] | None:if inputs is None:return Nonefor input_name, concept_code in inputs.items():diff --git a/pipelex/libraries/pipelines/builder/pipe/sub_pipe_spec.py b/pipelex/libraries/pipelines/builder/pipe/sub_pipe_spec.pyindex 722061d37..978983a34 100644--- a/pipelex/libraries/pipelines/builder/pipe/sub_pipe_spec.py+++ b/pipelex/libraries/pipelines/builder/pipe/sub_pipe_spec.py@@ -1,6 +1,6 @@from pydantic import ConfigDict, model_validator-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.exceptions import PipeDefinitionErrorfrom pipelex.pipe_controllers.sub_pipe_blueprint import SubPipeBlueprintfrom pipelex.tools.typing.validation_utils import has_more_than_one_among_attributes_from_listdiff --git a/pipelex/migration/migrate_v0_1_0_to_v0_2_0.py b/pipelex/migration/migrate_v0_1_0_to_v0_2_0.pydeleted file mode 100644index a57e53239..000000000--- a/pipelex/migration/migrate_v0_1_0_to_v0_2_0.py+++ /dev/null@@ -1,311 +0,0 @@-"""Migration from version 0.1.0 to 0.2.0 - Concept = to description = syntax change."""--import re-import shutil-from pathlib import Path-from re import Match-from typing import Any, ClassVar--from pipelex.migration.migration_result import MigrationResult---class TOMLMigrator:- """Handles migration from Concept = to description = and PipeClassName = to type/definition syntax in TOML files."""-- # Known pipe class names based on the factory classes in the codebase- PIPE_CLASS_NAMES: ClassVar[set[str]] = {- "PipeLLM",- "PipeOcr",- "PipeImgGen",- "PipeFunc",- "PipeCompose",- "PipeLLMPrompt",- "PipeSequence",- "PipeBatch",- "PipeCondition",- "PipeParallel",- }-- def __init__(self):- # Pattern to match "Concept = " within concept sections- self.concept_pattern = re.compile(r"^(\s*)(Concept)(\s*=\s*)(.*)$", re.MULTILINE)-- # Pattern to match pipe class name assignments: PipeClassName = "description"- pipe_classes = "|".join(self.PIPE_CLASS_NAMES)- self.pipe_pattern = re.compile(- rf"^(\s*)({pipe_classes})(\s*=\s*)(\"[^\"]*\"|'[^']*')(\s*)$",- re.MULTILINE,- )-- def find_toml_files(self, directory: Path) -> list[Path]:- """Find all TOML files in directory and subdirectories."""- if not directory.exists():- msg = f"Directory not found: {directory}"- raise FileNotFoundError(msg)-- return list(directory.glob("**/*.toml"))-- def _is_line_inside_multiline_string(self, content: str, line_start_pos: int) -> bool:- """Check if a line position is inside a multiline string (triple quotes)."""- # Count triple quotes before this position- content_before = content[:line_start_pos]-- # Count both """ and ''' (TOML supports both)- triple_double_quotes = content_before.count('"""')- triple_single_quotes = content_before.count("'''")-- # If odd number of triple quotes before this line, we're inside a multiline string- return (triple_double_quotes % 2 == 1) or (triple_single_quotes % 2 == 1)-- def needs_migration(self, content: str) -> bool:- """Check if content contains old Concept = or PipeClassName = syntax that should be migrated."""- # Check concept patterns- concept_matches = list(self.concept_pattern.finditer(content))- for match in concept_matches:- if not self._is_line_inside_multiline_string(content, match.start()):- return True-- # Check pipe patterns- pipe_matches = list(self.pipe_pattern.finditer(content))- return any(not self._is_line_inside_multiline_string(content, match.start()) for match in pipe_matches)-- def get_migration_preview(self, content: str) -> list[dict[str, Any]]:- """Get preview of changes that would be made."""- changes: list[dict[str, Any]] = []-- # Handle concept migrations- concept_matches = list(self.concept_pattern.finditer(content))- for match in concept_matches:- # Skip if this match is inside a multiline string- if self._is_line_inside_multiline_string(content, match.start()):- continue-- line_num = content[: match.start()].count("\n") + 1- old_line = match.group(0)- new_line = self.concept_pattern.sub(r"\1description\3\4", old_line)-- changes.append({"line_number": line_num, "old_line": old_line.strip(), "new_line": new_line.strip()})-- # Handle pipe migrations- pipe_matches = list(self.pipe_pattern.finditer(content))- for match in pipe_matches:- # Skip if this match is inside a multiline string- if self._is_line_inside_multiline_string(content, match.start()):- continue-- line_num = content[: match.start()].count("\n") + 1- leading_whitespace = match.group(1)- pipe_class_name = match.group(2)- definition_value = match.group(4)-- old_line = match.group(0)- type_line = f'{leading_whitespace}type = "{pipe_class_name}"'- definition_line = f"{leading_whitespace}description = {definition_value}"- new_line = f"{type_line}\\n{definition_line}"-- changes.append({"line_number": line_num, "old_line": old_line.strip(), "new_line": new_line})-- return changes-- def migrate_content(self, content: str) -> str:- """Migrate content from old to new syntax."""-- def concept_replacement_function(match: Match[str]) -> str:- # Check if this match is inside a multiline string- if self._is_line_inside_multiline_string(content, match.start()):- # Return the original text unchanged- return match.group(0)- # Apply the normal replacement: Concept = -> definition =- return f"{match.group(1)}description{match.group(3)}{match.group(4)}"-- def pipe_replacement_function(match: Match[str]) -> str:- # Check if this match is inside a multiline string- if self._is_line_inside_multiline_string(content, match.start()):- # Return the original text unchanged- return match.group(0)- # Apply pipe replacement: PipeClassName = "desc" -> type = "PipeClassName"\ndefinition = "desc"- leading_whitespace = match.group(1)- pipe_class_name = match.group(2)- definition_value = match.group(4)- trailing_whitespace = match.group(5)-- type_line = f'{leading_whitespace}type = "{pipe_class_name}"'- definition_line = f"{leading_whitespace}description = {definition_value}"-- return f"{type_line}\n{definition_line}{trailing_whitespace}"-- # Apply concept migrations first- migrated_content = self.concept_pattern.sub(concept_replacement_function, content)- # Then apply pipe migrations- return self.pipe_pattern.sub(pipe_replacement_function, migrated_content)-- def migrate_file(self, file_path: Path, create_backup: bool = True) -> int:- """Migrate a single file from old to new syntax.-- Returns:- Number of changes made in the file-- """- try:- with open(file_path, encoding="utf-8") as f:- original_content = f.read()- except Exception as e:- msg = f"Failed to read file {file_path}: {e}"- raise OSError(msg) from e-- if not self.needs_migration(original_content):- return 0-- migrated_content = self.migrate_content(original_content)-- # Count only the changes that are NOT inside multiline strings- matches = list(self.concept_pattern.finditer(original_content))- changes_count = 0- for match in matches:- if not self._is_line_inside_multiline_string(original_content, match.start()):- changes_count += 1-- if create_backup:- backup_path = file_path.with_suffix(".toml.backup")- try:- shutil.copy2(file_path, backup_path)- except Exception as e:- msg = f"Failed to create backup for {file_path}: {e}"- raise OSError(msg) from e-- try:- with open(file_path, "w", encoding="utf-8") as f:- f.write(migrated_content)- except Exception as e:- msg = f"Failed to write migrated content to {file_path}: {e}"- raise OSError(msg) from e-- return changes_count-- def migrate_directory(self, directory: Path, create_backups: bool = True, dry_run: bool = False) -> MigrationResult:- """Migrate all TOML files in a directory.-- Args:- directory: Directory containing TOML files- create_backups: Whether to create backup files- dry_run: If True, only preview changes without applying them-- Returns:- MigrationResult with statistics and details-- """- toml_files = self.find_toml_files(directory)- files_processed = len(toml_files)- files_modified = 0- total_changes = 0- modified_files: list[Path] = []- errors: list[str] = []-- for toml_file in toml_files:- try:- with open(toml_file, encoding="utf-8") as f:- content = f.read()-- if not self.needs_migration(content):- continue-- # Count only changes that are NOT inside multiline strings- matches = list(self.concept_pattern.finditer(content))- changes_count = 0- for match in matches:- if not self._is_line_inside_multiline_string(content, match.start()):- changes_count += 1-- if dry_run:- # Just count the changes for dry run- files_modified += 1- total_changes += changes_count- modified_files.append(toml_file)- else:- # Actually perform the migration- actual_changes = self.migrate_file(toml_file, create_backup=create_backups)- files_modified += 1- total_changes += actual_changes- modified_files.append(toml_file)-- except Exception as e:- errors.append(f"Error processing {toml_file}: {e}")-- result = MigrationResult()- result.files_processed = files_processed- result.files_modified = files_modified- result.total_changes = total_changes- result.modified_files = modified_files- result.errors = errors- return result---def migrate_concept_syntax(directory: Path, create_backups: bool = True, dry_run: bool = False) -> MigrationResult:- """Convenience function to migrate TOML files from Concept = to description = syntax.-- This function accepts either a directory (the historical behavior) or a path to a single TOML file.-- Args:- directory: Path to a directory containing TOML files to migrate, or a single TOML file- create_backups: Whether to create backup files before migration (ignored in dry-run)- dry_run: If True, only preview changes without applying them-- Returns:- MigrationResult with migration statistics-- """- migrator = TOMLMigrator()-- # Support passing a single TOML file path in addition to a directory- input_path = directory- if input_path.is_file():- result = MigrationResult()- result.files_processed = 1-- if input_path.suffix.lower() != ".toml":- result.errors.append(f"Provided file is not a .toml file: {input_path}")- return result-- try:- with open(input_path, encoding="utf-8") as f:- content = f.read()- except Exception as e:- result.errors.append(f"Failed to read file {input_path}: {e}")- return result-- if not migrator.needs_migration(content):- return result-- # Count only concept changes for consistency with directory migration statistics- def _is_inside_multiline_string(text: str, position: int) -> bool:- """Local helper to check if a position is inside a TOML multiline string."""- text_before = text[:position]- triple_double_quotes = text_before.count('"""')- triple_single_quotes = text_before.count("'''")- return (triple_double_quotes % 2 == 1) or (triple_single_quotes % 2 == 1)-- matches = list(migrator.concept_pattern.finditer(content))- changes_count = 0- for match in matches:- if not _is_inside_multiline_string(content, match.start()):- changes_count += 1-- if dry_run:- result.files_modified = 1- result.total_changes = changes_count- result.modified_files.append(input_path)- return result-- # Perform actual migration- try:- actual_changes = migrator.migrate_file(input_path, create_backup=create_backups)- result.files_modified = 1- result.total_changes = actual_changes- result.modified_files.append(input_path)- except Exception as e:- result.errors.append(f"Error processing {input_path}: {e}")-- return result-- # Default: treat as directory (existing behavior)- return migrator.migrate_directory(input_path, create_backups, dry_run)diff --git a/pipelex/migration/migration_result.py b/pipelex/migration/migration_result.pydeleted file mode 100644index 184000741..000000000--- a/pipelex/migration/migration_result.py+++ /dev/null@@ -1,17 +0,0 @@-"""Shared migration result types."""--from pathlib import Path--from pydantic import BaseModel, Field--from pipelex.tools.typing.pydantic_utils import empty_list_factory_of---class MigrationResult(BaseModel):- """Result of migration operation."""-- files_processed: int = 0- files_modified: int = 0- total_changes: int = 0- modified_files: list[Path] = Field(default_factory=empty_list_factory_of(Path))- errors: list[str] = Field(default_factory=list)diff --git a/pipelex/pipe_controllers/batch/pipe_batch.py b/pipelex/pipe_controllers/batch/pipe_batch.pyindex 2f2dba520..04830ab14 100644--- a/pipelex/pipe_controllers/batch/pipe_batch.py+++ b/pipelex/pipe_controllers/batch/pipe_batch.py@@ -8,10 +8,9 @@ from typing_extensions import overridefrom pipelex import logfrom pipelex.config import get_configfrom pipelex.core.memory.working_memory import MAIN_STUFF_NAME, WorkingMemory-from pipelex.core.pipes.pipe_input import PipeInput+from pipelex.core.pipes.input_requirements import InputRequirementsfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import BatchParams, PipeRunMode, PipeRunParams-from pipelex.core.stuffs.stuff_content import ListContent, StuffContent+from pipelex.core.stuffs.list_content import ListContentfrom pipelex.core.stuffs.stuff_factory import StuffFactoryfrom pipelex.exceptions import (PipeInputError,@@ -20,6 +19,7 @@ from pipelex.exceptions import ()from pipelex.hub import get_pipeline_tracker, get_required_pipefrom pipelex.pipe_controllers.pipe_controller import PipeController+from pipelex.pipe_run.pipe_run_params import BatchParams, PipeRunMode, PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.types import Self@@ -27,6 +27,7 @@ if TYPE_CHECKING:from collections.abc import Coroutinefrom pipelex.core.stuffs.stuff import Stuff+ from pipelex.core.stuffs.stuff_content import StuffContentclass PipeBatch(PipeController):@@ -74,7 +75,7 @@ class PipeBatch(PipeController):return required_variables@override- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:return self.inputsasync def _run_batch_pipe(diff --git a/pipelex/pipe_controllers/batch/pipe_batch_factory.py b/pipelex/pipe_controllers/batch/pipe_batch_factory.pyindex d6f4c6b3c..93c0347df 100644--- a/pipelex/pipe_controllers/batch/pipe_batch_factory.py+++ b/pipelex/pipe_controllers/batch/pipe_batch_factory.py@@ -1,12 +1,12 @@from typing_extensions import overridefrom pipelex.core.concepts.concept_factory import ConceptFactory+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory-from pipelex.core.pipes.pipe_run_params import BatchParams-from pipelex.hub import get_concept_provider+from pipelex.hub import get_required_conceptfrom pipelex.pipe_controllers.batch.pipe_batch import PipeBatchfrom pipelex.pipe_controllers.batch.pipe_batch_blueprint import PipeBatchBlueprint+from pipelex.pipe_run.pipe_run_params import BatchParamsclass PipeBatchFactory(PipeFactoryProtocol[PipeBatchBlueprint, PipeBatch]):@@ -28,12 +28,12 @@ class PipeBatchFactory(PipeFactoryProtocol[PipeBatchBlueprint, PipeBatch]):domain=domain,code=pipe_code,description=blueprint.description,- inputs=PipeInputFactory.make_from_blueprint(+ inputs=InputRequirementsFactory.make_from_blueprint(domain=domain,blueprint=blueprint.inputs or {},concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,),- output=get_concept_provider().get_required_concept(+ output=get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=output_domain_and_code.domain,concept_code=output_domain_and_code.concept_code,diff --git a/pipelex/pipe_controllers/condition/pipe_condition.py b/pipelex/pipe_controllers/condition/pipe_condition.pyindex ab35e288b..84ac1a5ef 100644--- a/pipelex/pipe_controllers/condition/pipe_condition.py+++ b/pipelex/pipe_controllers/condition/pipe_condition.py@@ -9,12 +9,10 @@ from pipelex.config import StaticValidationReaction, get_configfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum, NativeConceptManagerfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_input import PipeInput-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirements import InputRequirements+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeRunParams-from pipelex.core.pipes.specific_pipe import SpecificPipe, SpecificPipeCodesEnumfrom pipelex.exceptions import (DryRunError,PipeConditionError,@@ -26,30 +24,34 @@ from pipelex.exceptions import (WorkingMemoryStuffNotFoundError,)from pipelex.hub import get_content_generator, get_optional_pipe, get_pipe_router, get_pipeline_tracker, get_required_pipe, get_template_provider-from pipelex.pipe_controllers.condition.pipe_condition_details import PipeConditionDetails, PipeConditionPipeMap+from pipelex.pipe_controllers.condition.pipe_condition_details import PipeConditionDetails+from pipelex.pipe_controllers.condition.special_outcome import SpecialOutcomefrom pipelex.pipe_controllers.pipe_controller import PipeController-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.tools.templating.jinja2_required_variables import detect_jinja2_required_variablesfrom pipelex.tools.templating.jinja2_template_category import Jinja2TemplateCategoryfrom pipelex.tools.typing.validation_utils import has_exactly_one_among_attributes_from_listfrom pipelex.types import Self+ConditionOutcomeMap = dict[str, str | SpecialOutcome]+class PipeCondition(PipeController):type: Literal["PipeCondition"] = "PipeCondition"expression_template: str | None = Noneexpression: str | None = None- pipe_map: PipeConditionPipeMap- default_pipe_code: str | None = None+ outcome_map: ConditionOutcomeMap+ default_outcome: str | SpecialOutcomeadd_alias_from_expression_to: str | None = None@propertydef mapped_pipe_codes(self) -> set[str]:- codes = set(self.pipe_map.values())- if self.default_pipe_code:- codes.add(self.default_pipe_code)- return codes - set(SpecificPipeCodesEnum.value_list())+ codes = set(self.outcome_map.values())+ if self.default_outcome:+ codes.add(self.default_outcome)+ return codes - set(SpecialOutcome.value_list())########################################################################################## Validation@@ -82,8 +84,8 @@ class PipeCondition(PipeController):return PipeConditionDetails(code=shortuuid.uuid()[:5],test_expression=self.expression or self.applied_expression_template,- pipe_map=self.pipe_map,- default_pipe_code=self.default_pipe_code,+ outcomes=self.outcome_map,+ default_pipe_code=self.default_outcome,evaluated_expression=evaluated_expression,chosen_pipe_code=chosen_pipe_code,)@@ -114,7 +116,7 @@ class PipeCondition(PipeController):)required_variables.update(expression_required_variables)- # Variables from the pipe_map+ # Variables from the outcomes map and default_outcomefor pipe_code in self.pipe_dependencies():required_variables.update(get_required_pipe(pipe_code=pipe_code).required_variables())return required_variables@@ -127,18 +129,18 @@ class PipeCondition(PipeController):return self@override- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:if visited_pipes is None:visited_pipes = set()# If we've already visited this pipe, stop recursionif self.code in visited_pipes:- return PipeInputFactory.make_empty()+ return InputRequirementsFactory.make_empty()# Add this pipe to visited set for recursive callsvisited_pipes_with_current = visited_pipes | {self.code}- needed_inputs = PipeInputFactory.make_empty()+ needed_inputs = InputRequirementsFactory.make_empty()# 1. Add the variables from the expression/expression_templaterequired_variables = detect_jinja2_required_variables(@@ -172,8 +174,8 @@ class PipeCondition(PipeController):@model_validator(mode="after")def validate_inputs(self) -> Self:- if not self.pipe_map:- msg = f"Pipe'{self.code}'(PipeCondition) must have at least one mapping in pipe_map"+ if not self.outcome_map:+ msg = f"Pipe'{self.code}'(PipeCondition) must have at least one mapping in outcomes"raise PipeDefinitionError(message=msg, domain_code=self.domain, pipe_code=self.code, description=self.description)# Skip validation during model creation - it will be done in validate_with_libraries()@@ -298,21 +300,14 @@ class PipeCondition(PipeController):evaluated_expression = await self._evaluate_expression(working_memory=working_memory)- # Select the pipe based on the evaluated expression- chosen_pipe_code = self.pipe_map.get(evaluated_expression, self.default_pipe_code)-- # Validate that a pipe code was found- if not chosen_pipe_code:- error_msg = f"No pipe code found for evaluated expression '{evaluated_expression}' in pipe {self.code}:"- error_msg += f"\n\nExpression: {self.applied_expression_template}"- error_msg += f"\n\nPipe map: {self.pipe_map}"- raise PipeConditionError(error_msg)+ # Select the outcome based on the evaluated expression+ outcome = self.outcome_map.get(evaluated_expression, self.default_outcome)# Handle continue case- if SpecificPipe.is_continue(chosen_pipe_code):+ if SpecialOutcome.is_continue(outcome):return PipeOutput(working_memory=working_memory)- chosen_pipe = get_required_pipe(pipe_code=chosen_pipe_code)+ chosen_pipe = get_required_pipe(pipe_code=outcome)# Create condition details for trackingcondition_details = self._make_pipe_condition_details(@@ -413,22 +408,22 @@ class PipeCondition(PipeController):pipe_code=self.code,) from exc- # 3. Validate that all pipes in the pipe_map exist- all_pipe_codes = set(self.pipe_map.values())- if self.default_pipe_code:- all_pipe_codes.add(self.default_pipe_code)- all_pipe_codes -= set(SpecificPipeCodesEnum.value_list())+ # 3. Validate that all values in the outcomes map (appart from special outcomes) do exist as pipe codes+ all_pipe_codes = set(self.outcome_map.values())+ if self.default_outcome:+ all_pipe_codes.add(self.default_outcome)+ all_pipe_codes -= set(SpecialOutcome.value_list())missing_pipes = [pipe_code for pipe_code in all_pipe_codes if not get_optional_pipe(pipe_code=pipe_code)]if missing_pipes:error_msg = (f"Dry run failed for PipeCondition '{self.code}': missing pipes: {', '.join(missing_pipes)}. "- f"Pipe map: {self.pipe_map}, default: {self.default_pipe_code}"+ f"Pipe map: {self.outcome_map}, default: {self.default_outcome}")raise DryRunError(message=error_msg, pipe_code=self.code)- # Here, it should launch the dry run of all the pipes in the pipe_map+ # Here, it should launch the dry run of all the pipes in the outcomes mapfor pipe_code in self.mapped_pipe_codes:pipe = get_required_pipe(pipe_code=pipe_code)await pipe.run_pipe(diff --git a/pipelex/pipe_controllers/condition/pipe_condition_blueprint.py b/pipelex/pipe_controllers/condition/pipe_condition_blueprint.pyindex f8bf90b64..e03136cc8 100644--- a/pipelex/pipe_controllers/condition/pipe_condition_blueprint.py+++ b/pipelex/pipe_controllers/condition/pipe_condition_blueprint.py@@ -4,7 +4,9 @@ from pydantic import Fieldfrom typing_extensions import overridefrom pipelex.core.pipes.pipe_blueprint import PipeBlueprint-from pipelex.core.pipes.specific_pipe import SpecificPipeCodesEnum+from pipelex.pipe_controllers.condition.special_outcome import SpecialOutcome++OutcomeMap = dict[str, str]class PipeConditionBlueprint(PipeBlueprint):@@ -12,18 +14,18 @@ class PipeConditionBlueprint(PipeBlueprint):category: Literal["PipeController"] = "PipeController"expression_template: str | None = Noneexpression: str | None = None- pipe_map: dict[str, str] = Field(default_factory=dict)- default_pipe_code: str | None = None+ outcomes: OutcomeMap = Field(default_factory=OutcomeMap)+ default_outcome: str | SpecialOutcomeadd_alias_from_expression_to: str | None = None@property@overridedef pipe_dependencies(self) -> set[str]:- """Return the set of pipe codes from pipe_map and default_pipe_code.+ """Return the set of pipe codes from outcomes and default_pipe_code.Excludes special pipe codes like 'continue'."""- codes = set(self.pipe_map.values())- if self.default_pipe_code:- codes.add(self.default_pipe_code)- return codes - set(SpecificPipeCodesEnum.value_list())+ pipe_codes = set(self.outcomes.values())+ if self.default_outcome:+ pipe_codes.add(self.default_outcome)+ return pipe_codes - set(SpecialOutcome.value_list())diff --git a/pipelex/pipe_controllers/condition/pipe_condition_details.py b/pipelex/pipe_controllers/condition/pipe_condition_details.pyindex 7b9de0632..0f77a6e75 100644--- a/pipelex/pipe_controllers/condition/pipe_condition_details.py+++ b/pipelex/pipe_controllers/condition/pipe_condition_details.py@@ -1,12 +1,12 @@-from pydantic import BaseModel+from pydantic import BaseModel, Field-PipeConditionPipeMap = dict[str, str]+from pipelex.pipe_controllers.condition.pipe_condition_blueprint import OutcomeMapclass PipeConditionDetails(BaseModel):code: strtest_expression: str- pipe_map: dict[str, str]+ outcomes: OutcomeMap = Field(default_factory=OutcomeMap)default_pipe_code: str | None = Noneevaluated_expression: strchosen_pipe_code: strdiff --git a/pipelex/pipe_controllers/condition/pipe_condition_factory.py b/pipelex/pipe_controllers/condition/pipe_condition_factory.pyindex 025251b3c..f3be562e1 100644--- a/pipelex/pipe_controllers/condition/pipe_condition_factory.py+++ b/pipelex/pipe_controllers/condition/pipe_condition_factory.py@@ -1,9 +1,9 @@from typing_extensions import overridefrom pipelex.core.concepts.concept_factory import ConceptFactory+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory-from pipelex.hub import get_concept_provider+from pipelex.hub import get_required_conceptfrom pipelex.pipe_controllers.condition.pipe_condition import PipeConditionfrom pipelex.pipe_controllers.condition.pipe_condition_blueprint import PipeConditionBlueprint@@ -27,12 +27,12 @@ class PipeConditionFactory(PipeFactoryProtocol[PipeConditionBlueprint, PipeCondidomain=domain,code=pipe_code,description=blueprint.description,- inputs=PipeInputFactory.make_from_blueprint(+ inputs=InputRequirementsFactory.make_from_blueprint(domain=domain,blueprint=blueprint.inputs or {},concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,),- output=get_concept_provider().get_required_concept(+ output=get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=output_domain_and_code.domain,concept_code=output_domain_and_code.concept_code,@@ -40,7 +40,7 @@ class PipeConditionFactory(PipeFactoryProtocol[PipeConditionBlueprint, PipeCondi),expression_template=blueprint.expression_template,expression=blueprint.expression,- pipe_map=blueprint.pipe_map,- default_pipe_code=blueprint.default_pipe_code,+ outcome_map=blueprint.outcomes,+ default_outcome=blueprint.default_outcome,add_alias_from_expression_to=blueprint.add_alias_from_expression_to,)diff --git a/pipelex/core/pipes/specific_pipe.py b/pipelex/pipe_controllers/condition/special_outcome.pysimilarity index 63%rename from pipelex/core/pipes/specific_pipe.pyrename to pipelex/pipe_controllers/condition/special_outcome.pyindex 036360c8a..8660e464b 100644--- a/pipelex/core/pipes/specific_pipe.py+++ b/pipelex/pipe_controllers/condition/special_outcome.py@@ -1,7 +1,8 @@from pipelex.types import StrEnum-class SpecificPipeCodesEnum(StrEnum):+class SpecialOutcome(StrEnum):+ FAIL = "fail"CONTINUE = "continue"# TODO: Implement the break pipe: It should enable to leave the current sequence.# BREAK = "break"@@ -10,18 +11,17 @@ class SpecificPipeCodesEnum(StrEnum):def value_list(cls) -> set[str]:return set(cls)--# TODO: Rethink this class. They are not pipes really.-class SpecificPipe:- @staticmethod- def is_continue(pipe_code: str) -> bool:+ @classmethod+ def is_continue(cls, outcome: str) -> bool:try:- enum_value = SpecificPipeCodesEnum(pipe_code)+ enum_value = SpecialOutcome(outcome)except ValueError:return Falsematch enum_value:- case SpecificPipeCodesEnum.CONTINUE:+ case SpecialOutcome.FAIL:+ return False+ case SpecialOutcome.CONTINUE:return True# case SpecificPipeCodesEnum.BREAK: # Uncomment when BREAK is implemented# return Falsediff --git a/pipelex/pipe_controllers/parallel/pipe_parallel.py b/pipelex/pipe_controllers/parallel/pipe_parallel.pyindex 1a0b518c6..013504459 100644--- a/pipelex/pipe_controllers/parallel/pipe_parallel.py+++ b/pipelex/pipe_controllers/parallel/pipe_parallel.py@@ -8,15 +8,15 @@ from pipelex import logfrom pipelex.config import StaticValidationReaction, get_configfrom pipelex.core.concepts.concept import Conceptfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_input import PipeInput-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory+from pipelex.core.pipes.input_requirements import InputRequirements+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeRunMode, PipeRunParamsfrom pipelex.core.stuffs.stuff_factory import StuffFactoryfrom pipelex.exceptions import DryRunError, PipeDefinitionError, PipeRunParamsError, StaticValidationError, StaticValidationErrorTypefrom pipelex.hub import get_pipeline_tracker, get_required_pipefrom pipelex.pipe_controllers.pipe_controller import PipeControllerfrom pipelex.pipe_controllers.sub_pipe import SubPipe+from pipelex.pipe_run.pipe_run_params import PipeRunMode, PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.types import Self@@ -39,18 +39,18 @@ class PipeParallel(PipeController):return set()@override- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:if visited_pipes is None:visited_pipes = set()# If we've already visited this pipe, stop recursionif self.code in visited_pipes:- return PipeInputFactory.make_empty()+ return InputRequirementsFactory.make_empty()# Add this pipe to visited set for recursive callsvisited_pipes_with_current = visited_pipes | {self.code}- needed_inputs = PipeInputFactory.make_empty()+ needed_inputs = InputRequirementsFactory.make_empty()for sub_pipe in self.parallel_sub_pipes:pipe = get_required_pipe(pipe_code=sub_pipe.pipe_code)diff --git a/pipelex/pipe_controllers/parallel/pipe_parallel_factory.py b/pipelex/pipe_controllers/parallel/pipe_parallel_factory.pyindex ec07f8da4..bad2ac441 100644--- a/pipelex/pipe_controllers/parallel/pipe_parallel_factory.py+++ b/pipelex/pipe_controllers/parallel/pipe_parallel_factory.py@@ -3,8 +3,8 @@ from typing import TYPE_CHECKINGfrom typing_extensions import overridefrom pipelex.core.concepts.concept_factory import ConceptFactory+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol-from pipelex.core.pipes.pipe_input_factory import PipeInputFactoryfrom pipelex.exceptions import PipeDefinitionErrorfrom pipelex.hub import get_required_conceptfrom pipelex.pipe_controllers.parallel.pipe_parallel import PipeParallel@@ -67,7 +67,7 @@ class PipeParallelFactory(PipeFactoryProtocol[PipeParallelBlueprint, PipeParalledomain=domain,code=pipe_code,description=blueprint.description,- inputs=PipeInputFactory.make_from_blueprint(+ inputs=InputRequirementsFactory.make_from_blueprint(domain=domain,blueprint=blueprint.inputs or {},concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,diff --git a/pipelex/pipe_controllers/pipe_controller.py b/pipelex/pipe_controllers/pipe_controller.pyindex bab1babb7..e186eeef6 100644--- a/pipelex/pipe_controllers/pipe_controller.py+++ b/pipelex/pipe_controllers/pipe_controller.py@@ -7,7 +7,7 @@ from pipelex import logfrom pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.pipes.pipe_abstract import PipeAbstractfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeRunMode, PipeRunParams+from pipelex.pipe_run.pipe_run_params import PipeRunMode, PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadatadiff --git a/pipelex/pipe_controllers/sequence/pipe_sequence.py b/pipelex/pipe_controllers/sequence/pipe_sequence.pyindex d297d23c2..2b0b3c64b 100644--- a/pipelex/pipe_controllers/sequence/pipe_sequence.py+++ b/pipelex/pipe_controllers/sequence/pipe_sequence.py@@ -6,10 +6,9 @@ from typing_extensions import overridefrom pipelex import logfrom pipelex.config import StaticValidationReaction, get_configfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_input import PipeInput-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory+from pipelex.core.pipes.input_requirements import InputRequirements+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeRunMode, PipeRunParamsfrom pipelex.exceptions import (PipeRunParamsError,StaticValidationError,@@ -20,6 +19,7 @@ from pipelex.pipe_controllers.parallel.pipe_parallel import PipeParallelfrom pipelex.pipe_controllers.pipe_controller import PipeControllerfrom pipelex.pipe_controllers.sequence.exceptions import PipeSequenceErrorfrom pipelex.pipe_controllers.sub_pipe import SubPipe+from pipelex.pipe_run.pipe_run_params import PipeRunMode, PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.types import Self@@ -29,18 +29,18 @@ class PipeSequence(PipeController):sequential_sub_pipes: list[SubPipe]@override- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:if visited_pipes is None:visited_pipes = set()# If we've already visited this pipe, stop recursionif self.code in visited_pipes:- return PipeInputFactory.make_empty()+ return InputRequirementsFactory.make_empty()# Add this pipe to visited set for recursive callsvisited_pipes_with_current = visited_pipes | {self.code}- needed_inputs = PipeInputFactory.make_empty()+ needed_inputs = InputRequirementsFactory.make_empty()generated_outputs: set[str] = set()for sequential_sub_pipe in self.sequential_sub_pipes:diff --git a/pipelex/pipe_controllers/sequence/pipe_sequence_factory.py b/pipelex/pipe_controllers/sequence/pipe_sequence_factory.pyindex 59af06785..a56a4225c 100644--- a/pipelex/pipe_controllers/sequence/pipe_sequence_factory.py+++ b/pipelex/pipe_controllers/sequence/pipe_sequence_factory.py@@ -1,9 +1,9 @@from typing_extensions import overridefrom pipelex.core.concepts.concept_factory import ConceptFactory+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory-from pipelex.hub import get_concept_provider+from pipelex.hub import get_required_conceptfrom pipelex.pipe_controllers.sequence.pipe_sequence import PipeSequencefrom pipelex.pipe_controllers.sequence.pipe_sequence_blueprint import PipeSequenceBlueprintfrom pipelex.pipe_controllers.sub_pipe_factory import SubPipeFactory@@ -28,12 +28,12 @@ class PipeSequenceFactory(PipeFactoryProtocol[PipeSequenceBlueprint, PipeSequencdomain=domain,code=pipe_code,description=blueprint.description,- inputs=PipeInputFactory.make_from_blueprint(+ inputs=InputRequirementsFactory.make_from_blueprint(domain=domain,blueprint=blueprint.inputs or {},concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,),- output=get_concept_provider().get_required_concept(+ output=get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=output_domain_and_code.domain,concept_code=output_domain_and_code.concept_code,diff --git a/pipelex/pipe_controllers/sub_pipe.py b/pipelex/pipe_controllers/sub_pipe.pyindex 78029404f..31d28fd90 100644--- a/pipelex/pipe_controllers/sub_pipe.py+++ b/pipelex/pipe_controllers/sub_pipe.py@@ -2,16 +2,16 @@ from pydantic import BaseModelfrom pipelex import logfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import BatchParams, PipeOutputMultiplicity, PipeRunMode, PipeRunParams-from pipelex.core.stuffs.stuff_content import ListContent+from pipelex.core.stuffs.list_content import ListContentfrom pipelex.exceptions import PipeInputError, WorkingMemoryStuffNotFoundErrorfrom pipelex.hub import get_pipe_router, get_pipeline_tracker, get_required_pipefrom pipelex.pipe_controllers.batch.pipe_batch_blueprint import PipeBatchBlueprintfrom pipelex.pipe_controllers.batch.pipe_batch_factory import PipeBatchFactoryfrom pipelex.pipe_controllers.condition.pipe_condition import PipeCondition-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import BatchParams, PipeOutputMultiplicity, PipeRunMode, PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadata@@ -48,6 +48,7 @@ class SubPipe(BaseModel):)raise PipeInputError(msg) from exc+ item_stuff_requirement = sub_pipe.inputs.get_required_input_requirement(variable_name=batch_params.input_item_stuff_name)pipe_batch_blueprint = PipeBatchBlueprint(description=f"Batch processing for {self.pipe_code}",branch_pipe_code=self.pipe_code,@@ -56,7 +57,7 @@ class SubPipe(BaseModel):input_item_name=batch_params.input_item_stuff_name,inputs={batch_params.input_item_stuff_name: InputRequirementBlueprint(- concept=sub_pipe.inputs.root[batch_params.input_item_stuff_name].concept.concept_string,+ concept=item_stuff_requirement.concept.concept_string,),},)diff --git a/pipelex/pipe_controllers/sub_pipe_factory.py b/pipelex/pipe_controllers/sub_pipe_factory.pyindex aa7a33e84..f465a3815 100644--- a/pipelex/pipe_controllers/sub_pipe_factory.py+++ b/pipelex/pipe_controllers/sub_pipe_factory.py@@ -1,6 +1,6 @@-from pipelex.core.pipes.pipe_run_params import BatchParams, make_output_multiplicityfrom pipelex.pipe_controllers.sub_pipe import SubPipefrom pipelex.pipe_controllers.sub_pipe_blueprint import SubPipeBlueprint+from pipelex.pipe_run.pipe_run_params import BatchParams, make_output_multiplicityclass SubPipeFactory:diff --git a/pipelex/pipe_operators/compose/pipe_compose.py b/pipelex/pipe_operators/compose/pipe_compose.pyindex 73b764dc8..5519094c6 100644--- a/pipelex/pipe_operators/compose/pipe_compose.py+++ b/pipelex/pipe_operators/compose/pipe_compose.py@@ -12,16 +12,16 @@ from pipelex.core.concepts.concept import Conceptfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_input import PipeInput-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory+from pipelex.core.pipes.input_requirements import InputRequirements+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeRunMode, PipeRunParams-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import TextContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import PipeDefinitionError, PipeRunParamsErrorfrom pipelex.hub import get_content_generator, get_template, get_template_providerfrom pipelex.pipe_operators.pipe_operator import PipeOperator+from pipelex.pipe_run.pipe_run_params import PipeRunMode, PipeRunParams+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.tools.templating.jinja2_errors import Jinja2TemplateErrorfrom pipelex.tools.templating.jinja2_parsing import check_jinja2_parsing@@ -89,8 +89,8 @@ class PipeCompose(PipeOperator[PipeComposeOutput]):log.debug(f"Validated jinja2 template '{self.jinja2_name}':\n{the_template}")@override- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:- needed_inputs = PipeInputFactory.make_empty()+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:+ needed_inputs = InputRequirementsFactory.make_empty()for input_name, requirement in self.inputs.root.items():needed_inputs.add_requirement(variable_name=input_name, concept=requirement.concept)return needed_inputsdiff --git a/pipelex/pipe_operators/compose/pipe_compose_factory.py b/pipelex/pipe_operators/compose/pipe_compose_factory.pyindex cd6b10999..ee5b7b30e 100644--- a/pipelex/pipe_operators/compose/pipe_compose_factory.py+++ b/pipelex/pipe_operators/compose/pipe_compose_factory.py@@ -1,11 +1,11 @@from typing_extensions import overridefrom pipelex.core.concepts.concept_factory import ConceptFactory+from pipelex.core.pipes.input_requirements import InputRequirements+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol-from pipelex.core.pipes.pipe_input import PipeInput-from pipelex.core.pipes.pipe_input_factory import PipeInputFactoryfrom pipelex.exceptions import PipeDefinitionError-from pipelex.hub import get_concept_provider+from pipelex.hub import get_required_conceptfrom pipelex.pipe_operators.compose.pipe_compose import PipeComposefrom pipelex.pipe_operators.compose.pipe_compose_blueprint import PipeComposeBlueprintfrom pipelex.tools.templating.jinja2_parsing import check_jinja2_parsing@@ -42,12 +42,12 @@ class PipeComposeFactory(PipeFactoryProtocol[PipeComposeBlueprint, PipeCompose])domain=domain,code=pipe_code,description=blueprint.description,- inputs=PipeInputFactory.make_from_blueprint(+ inputs=InputRequirementsFactory.make_from_blueprint(domain=domain,blueprint=blueprint.inputs or {},concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,),- output=get_concept_provider().get_required_concept(+ output=get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=output_domain_and_code.domain,concept_code=output_domain_and_code.concept_code,@@ -64,7 +64,7 @@ class PipeComposeFactory(PipeFactoryProtocol[PipeComposeBlueprint, PipeCompose])def make_pipe_compose_from_template_str(cls,domain: str,- inputs: PipeInput | None = None,+ inputs: InputRequirements | None = None,template_str: str | None = None,template_name: str | None = None,) -> PipeCompose:@@ -78,14 +78,14 @@ class PipeComposeFactory(PipeFactoryProtocol[PipeComposeBlueprint, PipeCompose])domain=domain,code="adhoc_pipe_compose_from_template_str",jinja2=preprocessed_template,- inputs=inputs or PipeInputFactory.make_empty(),+ inputs=inputs or InputRequirementsFactory.make_empty(),)elif template_name:return PipeCompose(domain=domain,code="adhoc_pipe_compose_from_template_name",jinja2_name=template_name,- inputs=inputs or PipeInputFactory.make_empty(),+ inputs=inputs or InputRequirementsFactory.make_empty(),)else:msg = "Could not make a PipeCompose because neither template_str nor template_name were provided"diff --git a/pipelex/pipe_operators/func/pipe_func.py b/pipelex/pipe_operators/func/pipe_func.pyindex 4f58533fd..31aec4b5d 100644--- a/pipelex/pipe_operators/func/pipe_func.py+++ b/pipelex/pipe_operators/func/pipe_func.py@@ -7,13 +7,15 @@ from pipelex import logfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input import PipeInput, TypedNamedInputRequirement+from pipelex.core.pipes.input_requirements import InputRequirements, TypedNamedInputRequirementfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeRunParams-from pipelex.core.stuffs.stuff_content import ListContent, StuffContent, TextContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.stuff_content import StuffContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import DryRunErrorfrom pipelex.pipe_operators.pipe_operator import PipeOperator+from pipelex.pipe_run.pipe_run_params import PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.tools.func_registry import func_registry@@ -31,7 +33,7 @@ class PipeFunc(PipeOperator[PipeFuncOutput]):return set()@override- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:return self.inputs@overridediff --git a/pipelex/pipe_operators/func/pipe_func_factory.py b/pipelex/pipe_operators/func/pipe_func_factory.pyindex e47322791..1b8e90a6d 100644--- a/pipelex/pipe_operators/func/pipe_func_factory.py+++ b/pipelex/pipe_operators/func/pipe_func_factory.py@@ -1,9 +1,9 @@from typing_extensions import overridefrom pipelex.core.concepts.concept_factory import ConceptFactory+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory-from pipelex.hub import get_concept_provider+from pipelex.hub import get_required_conceptfrom pipelex.pipe_operators.func.pipe_func import PipeFuncfrom pipelex.pipe_operators.func.pipe_func_blueprint import PipeFuncBlueprint@@ -27,12 +27,12 @@ class PipeFuncFactory(PipeFactoryProtocol[PipeFuncBlueprint, PipeFunc]):domain=domain,code=pipe_code,description=blueprint.description,- inputs=PipeInputFactory.make_from_blueprint(+ inputs=InputRequirementsFactory.make_from_blueprint(domain=domain,blueprint=blueprint.inputs or {},concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,),- output=get_concept_provider().get_required_concept(+ output=get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=output_domain_and_code.domain,concept_code=output_domain_and_code.concept_code,diff --git a/pipelex/pipe_operators/img_gen/pipe_img_gen.py b/pipelex/pipe_operators/img_gen/pipe_img_gen.pyindex 0424b79b7..e8250350a 100644--- a/pipelex/pipe_operators/img_gen/pipe_img_gen.py+++ b/pipelex/pipe_operators/img_gen/pipe_img_gen.py@@ -1,4 +1,4 @@-from typing import Literal+from typing import TYPE_CHECKING, Literalfrom pydantic import Field, field_validator, model_validatorfrom typing_extensions import override@@ -14,12 +14,11 @@ from pipelex.config import StaticValidationReaction, get_configfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_input import PipeInput-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory+from pipelex.core.pipes.input_requirements import InputRequirements+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeOutputMultiplicity, PipeRunMode, PipeRunParams, output_multiplicity_to_apply-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import ImageContent, ListContent, StuffContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContentfrom pipelex.core.stuffs.stuff_factory import StuffFactoryfrom pipelex.exceptions import (PipeDefinitionError,@@ -30,11 +29,16 @@ from pipelex.exceptions import (UnexpectedPipeDefinitionError,WorkingMemoryStuffNotFoundError,)-from pipelex.hub import get_concept_provider, get_content_generator, get_model_deck, get_native_concept+from pipelex.hub import get_concept_library, get_content_generator, get_model_deck, get_native_conceptfrom pipelex.pipe_operators.pipe_operator import PipeOperator+from pipelex.pipe_run.pipe_run_params import PipeOutputMultiplicity, PipeRunMode, PipeRunParams, output_multiplicity_to_apply+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.types import Self+if TYPE_CHECKING:+ from pipelex.core.stuffs.stuff_content import StuffContent+class PipeImgGenOutput(PipeOutput):@property@@ -100,7 +104,7 @@ class PipeImgGen(PipeOperator[PipeImgGenOutput]):@overridedef validate_output(self):- if not get_concept_provider().is_compatible(+ if not get_concept_library().is_compatible(tested_concept=self.output,wanted_concept=get_native_concept(native_concept=NativeConceptEnum.IMAGE),strict=True,@@ -112,8 +116,8 @@ class PipeImgGen(PipeOperator[PipeImgGenOutput]):raise PipeDefinitionError(msg)@override- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:- needed_inputs = PipeInputFactory.make_empty()+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:+ needed_inputs = InputRequirementsFactory.make_empty()if self.img_gen_prompt:needed_inputs.add_requirement(variable_name="img_gen_prompt",@@ -133,7 +137,7 @@ class PipeImgGen(PipeOperator[PipeImgGenOutput]):return {DEFAULT_PROMPT_VAR_NAME}def _validate_inputs(self):- concept_provider = get_concept_provider()+ concept_library = get_concept_library()static_validation_config = get_config().pipelex.static_validation_configdefault_reaction = static_validation_config.default_reactionreactions = static_validation_config.reactions@@ -179,8 +183,7 @@ class PipeImgGen(PipeOperator[PipeImgGenOutput]):# We have confirmed right above that we have exactly one input# get input_name, requirement from single item in inputsinput_name, requirement = self.inputs.items[0]- log.debug(f"Validating input '{input_name}' with concept code '{requirement.concept.code}'")- if concept_provider.is_compatible(+ if concept_library.is_compatible(tested_concept=requirement.concept,wanted_concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),):diff --git a/pipelex/pipe_operators/img_gen/pipe_img_gen_factory.py b/pipelex/pipe_operators/img_gen/pipe_img_gen_factory.pyindex 1896b1a0f..8a9f3138b 100644--- a/pipelex/pipe_operators/img_gen/pipe_img_gen_factory.py+++ b/pipelex/pipe_operators/img_gen/pipe_img_gen_factory.py@@ -1,9 +1,9 @@from typing_extensions import overridefrom pipelex.core.concepts.concept_factory import ConceptFactory+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory-from pipelex.hub import get_concept_provider+from pipelex.hub import get_required_conceptfrom pipelex.pipe_operators.img_gen.pipe_img_gen import PipeImgGenfrom pipelex.pipe_operators.img_gen.pipe_img_gen_blueprint import PipeImgGenBlueprint@@ -27,12 +27,12 @@ class PipeImgGenFactory(PipeFactoryProtocol[PipeImgGenBlueprint, PipeImgGen]):domain=domain,code=pipe_code,description=blueprint.description,- inputs=PipeInputFactory.make_from_blueprint(+ inputs=InputRequirementsFactory.make_from_blueprint(domain=domain,blueprint=blueprint.inputs or {},concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,),- output=get_concept_provider().get_required_concept(+ output=get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=output_domain_and_code.domain,concept_code=output_domain_and_code.concept_code,diff --git a/pipelex/pipe_operators/llm/pipe_llm.py b/pipelex/pipe_operators/llm/pipe_llm.pyindex 8bffea50d..6bfc2cb0b 100644--- a/pipelex/pipe_operators/llm/pipe_llm.py+++ b/pipelex/pipe_operators/llm/pipe_llm.py@@ -17,17 +17,13 @@ from pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.core.domains.domain import Domain, SpecialDomainfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_input import PipeInput-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory+from pipelex.core.pipes.input_requirements import InputRequirements+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import (- PipeOutputMultiplicity,- PipeRunParamKey,- PipeRunParams,- output_multiplicity_to_apply,-)-from pipelex.core.stuffs.stuff_content import ListContent, StuffContent, TextContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.stuff_content import StuffContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import (PipeDefinitionError,StaticValidationError,@@ -35,7 +31,7 @@ from pipelex.exceptions import ()from pipelex.hub import (get_class_registry,- get_concept_provider,+ get_concept_library,get_content_generator,get_model_deck,get_native_concept,@@ -47,6 +43,12 @@ from pipelex.hub import ()from pipelex.pipe_operators.llm.pipe_llm_blueprint import StructuringMethodfrom pipelex.pipe_operators.pipe_operator import PipeOperator+from pipelex.pipe_run.pipe_run_params import (+ PipeOutputMultiplicity,+ PipeRunParamKey,+ PipeRunParams,+ output_multiplicity_to_apply,+)from pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.tools.templating.jinja2_template_category import Jinja2TemplateCategoryfrom pipelex.tools.typing.structure_printer import StructurePrinter@@ -95,7 +97,7 @@ class PipeLLM(PipeOperator[PipeLLMOutput]):@overridedef validate_output(self):- if get_concept_provider().is_compatible(+ if get_concept_library().is_compatible(tested_concept=self.output,wanted_concept=get_native_concept(native_concept=NativeConceptEnum.IMAGE),):@@ -106,9 +108,9 @@ class PipeLLM(PipeOperator[PipeLLMOutput]):raise PipeDefinitionError(msg)@override- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:"""Needed inputs are the inputs needed to run the pipe, specified in the inputs attribute of the pipe"""- needed_inputs = PipeInputFactory.make_empty()+ needed_inputs = InputRequirementsFactory.make_empty()for input_name, requirement in self.inputs.items:needed_inputs.add_requirement(variable_name=input_name, concept=requirement.concept)@@ -144,13 +146,22 @@ class PipeLLM(PipeOperator[PipeLLMOutput]):raise missing_input_var_error# 2: Check that all inputs are in the required variables- for input_name in self.needed_inputs().variables:+ for input_name, requirement in self.needed_inputs().items:if input_name not in required_variables:+ explanation: str | None = None+ if get_concept_library().is_image_concept(concept=requirement.concept):+ # We have an exraneous image input, the user probably forgot to add it into the prompt template+ explanation = (+ f"You have provided an image input named '{input_name}', but it is not referenced in the prompt template. "+ "Please add it to the prompt template."+ )+extraneous_input_var_error = StaticValidationError(error_type=StaticValidationErrorType.EXTRANEOUS_INPUT_VARIABLE,domain=self.domain,pipe_code=self.code,variable_names=[input_name],+ explanation=explanation,)match reactions.get(StaticValidationErrorType.EXTRANEOUS_INPUT_VARIABLE, default_reaction):case StaticValidationReaction.IGNORE:@@ -181,7 +192,7 @@ class PipeLLM(PipeOperator[PipeLLMOutput]):if not output_concept_code:output_concept_code = SpecialDomain.NATIVE + "." + NativeConceptEnum.TEXTelse:- output_concept = get_concept_provider().get_required_concept(+ output_concept = get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=self.domain, concept_code=output_concept_code),)@@ -189,7 +200,6 @@ class PipeLLM(PipeOperator[PipeLLMOutput]):base_multiplicity=self.output_multiplicity,override_multiplicity=pipe_run_params.output_multiplicity,)- log.debug(f"multiplicity_resolution: {multiplicity_resolution}")applied_output_multiplicity = multiplicity_resolution.resolved_multiplicityis_multiple_output = multiplicity_resolution.is_multiple_outputs_enabledfixed_nb_output = multiplicity_resolution.specific_output_count@@ -249,7 +259,7 @@ class PipeLLM(PipeOperator[PipeLLMOutput]):log.debug(f"TextContent.__class__.__name__: {TextContent.__class__.__name__}")log.debug(f"is_multiple_output: {is_multiple_output}")if output_concept.structure_class_name == "TextContent" and not is_multiple_output:- log.debug(f"PipeLLM generating a single text output: {self.__class__.__name__}_gen_text")+ log.info(f"PipeLLM generating a single text output: {self.__class__.__name__}_gen_text")llm_prompt_1_for_text = await self.llm_prompt_spec.make_llm_prompt(output_concept_string=output_concept.concept_string,context_provider=working_memory,diff --git a/pipelex/pipe_operators/llm/pipe_llm_factory.py b/pipelex/pipe_operators/llm/pipe_llm_factory.pyindex 6d0d9c012..fd9663f76 100644--- a/pipelex/pipe_operators/llm/pipe_llm_factory.py+++ b/pipelex/pipe_operators/llm/pipe_llm_factory.py@@ -5,17 +5,16 @@ from pipelex.cogt.llm.llm_setting import LLMSettingChoicesfrom pipelex.core.concepts.concept import Conceptfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NativeConceptEnum+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory-from pipelex.core.pipes.pipe_run_params import make_output_multiplicityfrom pipelex.exceptions import PipeDefinitionError-from pipelex.hub import get_concept_provider, get_native_concept, get_optional_domain+from pipelex.hub import get_native_concept, get_optional_domain, get_required_conceptfrom pipelex.pipe_operators.llm.pipe_llm import PipeLLMfrom pipelex.pipe_operators.llm.pipe_llm_blueprint import PipeLLMBlueprint+from pipelex.pipe_run.pipe_run_params import make_output_multiplicityfrom pipelex.tools.templating.jinja2_blueprint import Jinja2Blueprintfrom pipelex.tools.templating.jinja2_errors import Jinja2TemplateError-from pipelex.tools.templating.template_provider_abstract import TemplateNotFoundErrorclass PipeLLMFactory(PipeFactoryProtocol[PipeLLMBlueprint, PipeLLM]):@@ -62,20 +61,12 @@ class PipeLLMFactory(PipeFactoryProtocol[PipeLLMBlueprint, PipeLLM]):else:error_msg += "The prompt template is not provided."raise PipeDefinitionError(error_msg) from exc- elif blueprint.prompt is None and blueprint.prompt_name is None:- # no jinja2 provided, no verbatim name, no fixed text, let's try and use the pipe code as jinja2 name- try:- user_text_jinja2_blueprint = Jinja2Blueprint(- jinja2_name=pipe_code,- )- except TemplateNotFoundError as exc:- error_msg = f"Jinja2 template not found for pipe '{pipe_code}' in domain '{domain}': {exc}."- raise PipeDefinitionError(error_msg) from excuser_images: list[str] = []if blueprint.inputs:for stuff_name, requirement in blueprint.inputs.items():if isinstance(requirement, str):+ # if it's just a concept string, it's a concept, we make a basic input requirement from itinput_requirement_blueprint = InputRequirementBlueprint(concept=requirement)else:input_requirement_blueprint = requirement@@ -86,7 +77,7 @@ class PipeLLMFactory(PipeFactoryProtocol[PipeLLMBlueprint, PipeLLM]):concept_string_or_code=concept_string,concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,)- concept = get_concept_provider().get_required_concept(+ concept = get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=domain_and_code.domain,concept_code=domain_and_code.concept_code,@@ -97,7 +88,7 @@ class PipeLLMFactory(PipeFactoryProtocol[PipeLLMBlueprint, PipeLLM]):user_images.append(stuff_name)elif Concept.are_concept_compatible(concept_1=concept, concept_2=get_native_concept(NativeConceptEnum.IMAGE), strict=False):# Get image field paths relative to the concept- image_field_paths = get_concept_provider().find_image_field_paths(concept=concept)+ image_field_paths = concept.search_for_nested_image_fields_in_structure_class()# Prefix each path with the stuff_name to make them absolutefor field_path in image_field_paths:user_images.append(f"{stuff_name}.{field_path}")@@ -134,12 +125,12 @@ class PipeLLMFactory(PipeFactoryProtocol[PipeLLMBlueprint, PipeLLM]):domain=domain,code=pipe_code,description=blueprint.description,- inputs=PipeInputFactory.make_from_blueprint(+ inputs=InputRequirementsFactory.make_from_blueprint(domain=domain,blueprint=blueprint.inputs or {},concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,),- output=get_concept_provider().get_required_concept(+ output=get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=output_concept_domain, concept_code=output_concept_code),),llm_prompt_spec=llm_prompt_spec,diff --git a/pipelex/pipe_operators/ocr/pipe_ocr.py b/pipelex/pipe_operators/ocr/pipe_ocr.pyindex 14175c028..4c39b0606 100644--- a/pipelex/pipe_operators/ocr/pipe_ocr.py+++ b/pipelex/pipe_operators/ocr/pipe_ocr.py@@ -13,23 +13,27 @@ from pipelex.cogt.ocr.ocr_setting import OcrChoice, OcrSettingfrom pipelex.config import StaticValidationReaction, get_configfrom pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.pipes.pipe_input import PipeInput+from pipelex.core.pipes.input_requirements import InputRequirementsfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeRunMode, PipeRunParams-from pipelex.core.stuffs.stuff_content import ImageContent, ListContent, PageContent, TextAndImagesContent, TextContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.page_content import PageContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_and_images_content import TextAndImagesContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import (PipeDefinitionError,StaticValidationError,StaticValidationErrorType,)from pipelex.hub import (- get_concept_provider,+ get_concept_library,get_content_generator,get_model_deck,get_native_concept,)from pipelex.pipe_operators.pipe_operator import PipeOperator+from pipelex.pipe_run.pipe_run_params import PipeRunMode, PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.tools.pdf.pypdfium2_renderer import pypdfium2_rendererfrom pipelex.types import Self@@ -72,7 +76,7 @@ class PipeOcr(PipeOperator[PipeOcrOutput]):raise PipeDefinitionError(msg)def _validate_inputs(self):- concept_provider = get_concept_provider()+ concept_library = get_concept_library()static_validation_config = get_config().pipelex.static_validation_configdefault_reaction = static_validation_config.default_reactionreactions = static_validation_config.reactions@@ -113,13 +117,13 @@ class PipeOcr(PipeOperator[PipeOcrOutput]):# get input_name, requirement from single item in inputsinput_name, requirement = self.inputs.items[0]log.debug(f"Validating input '{input_name}' with concept code '{requirement.concept.code}'")- if concept_provider.is_compatible(+ if concept_library.is_compatible(tested_concept=requirement.concept,wanted_concept=get_native_concept(native_concept=NativeConceptEnum.IMAGE),strict=True,):self.image_stuff_name = input_name- elif concept_provider.is_compatible(+ elif concept_library.is_compatible(tested_concept=requirement.concept,wanted_concept=get_native_concept(native_concept=NativeConceptEnum.PDF),strict=True,@@ -143,7 +147,7 @@ class PipeOcr(PipeOperator[PipeOcrOutput]):raise inadequate_input_concept_error@override- def needed_inputs(self, visited_pipes: set[str] | None = None) -> PipeInput:+ def needed_inputs(self, visited_pipes: set[str] | None = None) -> InputRequirements:return self.inputs@override@@ -216,7 +220,7 @@ class PipeOcr(PipeOperator[PipeOcrOutput]):page_views = await pypdfium2_renderer.render_pdf_pages_from_uri(pdf_uri=pdf_uri, dpi=self.page_views_dpi)page_view_contents = [ImageContent.make_from_image(image=img) for img in page_views]elif image_uri:- page_view_contents = [ImageContent.make_from_str(str_value=image_uri)]+ page_view_contents = [ImageContent(url=image_uri)]page_contents: list[PageContent] = []for page_index, page in ocr_output.pages.items():diff --git a/pipelex/pipe_operators/ocr/pipe_ocr_factory.py b/pipelex/pipe_operators/ocr/pipe_ocr_factory.pyindex 3531f9d4d..93fd66bb6 100644--- a/pipelex/pipe_operators/ocr/pipe_ocr_factory.py+++ b/pipelex/pipe_operators/ocr/pipe_ocr_factory.py@@ -2,9 +2,9 @@ from typing_extensions import overridefrom pipelex.config import get_configfrom pipelex.core.concepts.concept_factory import ConceptFactory+from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactoryfrom pipelex.core.pipes.pipe_factory import PipeFactoryProtocol-from pipelex.core.pipes.pipe_input_factory import PipeInputFactory-from pipelex.hub import get_concept_provider+from pipelex.hub import get_required_conceptfrom pipelex.pipe_operators.ocr.pipe_ocr import PipeOcrfrom pipelex.pipe_operators.ocr.pipe_ocr_blueprint import PipeOcrBlueprint@@ -29,13 +29,13 @@ class PipeOcrFactory(PipeFactoryProtocol[PipeOcrBlueprint, PipeOcr]):domain=domain,code=pipe_code,description=blueprint.description,- output=get_concept_provider().get_required_concept(+ output=get_required_concept(concept_string=ConceptFactory.make_concept_string_with_domain(domain=output_domain_and_code.domain,concept_code=output_domain_and_code.concept_code,),),- inputs=PipeInputFactory.make_from_blueprint(+ inputs=InputRequirementsFactory.make_from_blueprint(domain=domain,blueprint=blueprint.inputs or {},concept_codes_from_the_same_domain=concept_codes_from_the_same_domain,diff --git a/pipelex/pipe_operators/pipe_operator.py b/pipelex/pipe_operators/pipe_operator.pyindex 569cacb29..e4f1629be 100644--- a/pipelex/pipe_operators/pipe_operator.py+++ b/pipelex/pipe_operators/pipe_operator.py@@ -7,9 +7,9 @@ from pipelex import log, pretty_print, pretty_print_mdfrom pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.pipes.pipe_abstract import PipeAbstractfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeRunMode, PipeRunParams-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.hub import get_activity_manager+from pipelex.pipe_run.pipe_run_params import PipeRunMode, PipeRunParamsfrom pipelex.pipeline.activity.activity_models import ActivityReportfrom pipelex.pipeline.job_metadata import JobMetadatadiff --git a/pipelex/migration/__init__.py b/pipelex/pipe_run/__init__.pysimilarity index 100%rename from pipelex/migration/__init__.pyrename to pipelex/pipe_run/__init__.pydiff --git a/pipelex/pipe_works/pipe_dry.py b/pipelex/pipe_run/dry_run.pysimilarity index 94%rename from pipelex/pipe_works/pipe_dry.pyrename to pipelex/pipe_run/dry_run.pyindex 9ce536a24..fa9d4e5c1 100644--- a/pipelex/pipe_works/pipe_dry.py+++ b/pipelex/pipe_run/dry_run.py@@ -8,12 +8,13 @@ from pydantic import BaseModelfrom pipelex import logfrom pipelex.config import get_configfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory+from pipelex.core.pipes.input_requirements import InputRequirements, TypedNamedInputRequirementfrom pipelex.core.pipes.pipe_abstract import PipeAbstract-from pipelex.core.pipes.pipe_input import PipeInput, TypedNamedInputRequirement-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import StuffContent, TextContent+from pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.hub import get_class_registry+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.types import StrEnum@@ -136,7 +137,7 @@ async def dry_run_pipes(pipes: list[PipeAbstract], run_in_parallel: bool = True,return results-def _convert_to_working_memory_format(needed_inputs_spec: PipeInput) -> list[TypedNamedInputRequirement]:+def _convert_to_working_memory_format(needed_inputs_spec: InputRequirements) -> list[TypedNamedInputRequirement]:"""Convert PipeInput to the format needed by WorkingMemoryFactory.make_for_dry_run.Args:diff --git a/pipelex/pipe_works/pipe_job.py b/pipelex/pipe_run/pipe_job.pysimilarity index 87%rename from pipelex/pipe_works/pipe_job.pyrename to pipelex/pipe_run/pipe_job.pyindex 172b44ce9..0809850d4 100644--- a/pipelex/pipe_works/pipe_job.py+++ b/pipelex/pipe_run/pipe_job.py@@ -2,7 +2,7 @@ from pydantic import BaseModel, Fieldfrom pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.pipes.pipe_abstract import PipeAbstract-from pipelex.core.pipes.pipe_run_params import PipeRunParams+from pipelex.pipe_run.pipe_run_params import PipeRunParamsfrom pipelex.pipeline.job_metadata import JobMetadatadiff --git a/pipelex/pipe_works/pipe_job_factory.py b/pipelex/pipe_run/pipe_job_factory.pysimilarity index 84%rename from pipelex/pipe_works/pipe_job_factory.pyrename to pipelex/pipe_run/pipe_job_factory.pyindex 8f6f2f185..9ce085ef4 100644--- a/pipelex/pipe_works/pipe_job_factory.py+++ b/pipelex/pipe_run/pipe_job_factory.py@@ -1,9 +1,9 @@from pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactoryfrom pipelex.core.pipes.pipe_abstract import PipeAbstract-from pipelex.core.pipes.pipe_run_params import PipeRunParams-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.pipe_works.pipe_job import PipeJob+from pipelex.pipe_run.pipe_job import PipeJob+from pipelex.pipe_run.pipe_run_params import PipeRunParams+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatadiff --git a/pipelex/pipe_works/pipe_router.py b/pipelex/pipe_run/pipe_router.pysimilarity index 84%rename from pipelex/pipe_works/pipe_router.pyrename to pipelex/pipe_run/pipe_router.pyindex c2c08ba40..20b6dc92a 100644--- a/pipelex/pipe_works/pipe_router.py+++ b/pipelex/pipe_run/pipe_router.py@@ -2,8 +2,8 @@ from typing_extensions import overridefrom pipelex.core.pipes.pipe_output import PipeOutputfrom pipelex.observer.observer_protocol import ObserverProtocol-from pipelex.pipe_works.pipe_job import PipeJob-from pipelex.pipe_works.pipe_router_protocol import PipeRouterProtocol+from pipelex.pipe_run.pipe_job import PipeJob+from pipelex.pipe_run.pipe_router_protocol import PipeRouterProtocolclass PipeRouter(PipeRouterProtocol):diff --git a/pipelex/pipe_works/pipe_router_protocol.py b/pipelex/pipe_run/pipe_router_protocol.pysimilarity index 97%rename from pipelex/pipe_works/pipe_router_protocol.pyrename to pipelex/pipe_run/pipe_router_protocol.pyindex 2977bd4f6..9cf72eeac 100644--- a/pipelex/pipe_works/pipe_router_protocol.py+++ b/pipelex/pipe_run/pipe_router_protocol.py@@ -2,7 +2,7 @@ from typing import Protocolfrom pipelex.core.pipes.pipe_output import PipeOutputfrom pipelex.observer.observer_protocol import ObserverProtocol, PayloadType-from pipelex.pipe_works.pipe_job import PipeJob+from pipelex.pipe_run.pipe_job import PipeJobclass PipeRouterProtocol(Protocol):diff --git a/pipelex/core/pipes/pipe_run_params.py b/pipelex/pipe_run/pipe_run_params.pysimilarity index 93%rename from pipelex/core/pipes/pipe_run_params.pyrename to pipelex/pipe_run/pipe_run_params.pyindex 741ca076a..d14a14a83 100644--- a/pipelex/core/pipes/pipe_run_params.py+++ b/pipelex/pipe_run/pipe_run_params.py@@ -115,57 +115,41 @@ def output_multiplicity_to_apply((3, True, 3)"""- log.debug(f"base_multiplicity = {base_multiplicity}")- log.debug(f"override_multiplicity = {override_multiplicity}")-# Case 1: No override provided - use base value as-isif override_multiplicity is None:- log.debug("override_multiplicity is None - using base value")-if isinstance(base_multiplicity, bool):- log.debug("base_multiplicity is bool")return OutputMultiplicityResolution(resolved_multiplicity=base_multiplicity,is_multiple_outputs_enabled=base_multiplicity,specific_output_count=None,)elif isinstance(base_multiplicity, int):- log.debug("base_multiplicity is int")return OutputMultiplicityResolution(resolved_multiplicity=base_multiplicity,is_multiple_outputs_enabled=True,specific_output_count=base_multiplicity,)else:- log.debug("base_multiplicity is None")return OutputMultiplicityResolution(resolved_multiplicity=base_multiplicity, is_multiple_outputs_enabled=False, specific_output_count=None)# Case 2: Override is a booleanelif isinstance(override_multiplicity, bool):- log.debug("override_multiplicity is bool")-if override_multiplicity:- log.debug("override_multiplicity is True - enabling multiple outputs")-if isinstance(base_multiplicity, bool):- log.debug("base_multiplicity is bool - disregarding base, using True")return OutputMultiplicityResolution(resolved_multiplicity=True, is_multiple_outputs_enabled=True, specific_output_count=None)else:- log.debug("base_multiplicity is int or None - preserving base value")return OutputMultiplicityResolution(resolved_multiplicity=base_multiplicity,is_multiple_outputs_enabled=True,specific_output_count=base_multiplicity if isinstance(base_multiplicity, int) else None,)else:- log.debug("override_multiplicity is False - forcing single output")return OutputMultiplicityResolution(resolved_multiplicity=False, is_multiple_outputs_enabled=False, specific_output_count=None)else:# Case 3: Override is an integer- log.debug("override_multiplicity is int - using override value")return OutputMultiplicityResolution(resolved_multiplicity=override_multiplicity,is_multiple_outputs_enabled=True,diff --git a/pipelex/core/pipes/pipe_run_params_factory.py b/pipelex/pipe_run/pipe_run_params_factory.pysimilarity index 89%rename from pipelex/core/pipes/pipe_run_params_factory.pyrename to pipelex/pipe_run/pipe_run_params_factory.pyindex 75665c7ed..a1cfe4b03 100644--- a/pipelex/core/pipes/pipe_run_params_factory.py+++ b/pipelex/pipe_run/pipe_run_params_factory.py@@ -1,7 +1,7 @@from typing import Anyfrom pipelex.config import get_config-from pipelex.core.pipes.pipe_run_params import BatchParams, PipeOutputMultiplicity, PipeRunMode, PipeRunParams+from pipelex.pipe_run.pipe_run_params import BatchParams, PipeOutputMultiplicity, PipeRunMode, PipeRunParamsclass PipeRunParamsFactory:diff --git a/pipelex/pipelex.py b/pipelex/pipelex.pyindex 4a66d11f1..42d0415a5 100644--- a/pipelex/pipelex.py+++ b/pipelex/pipelex.py@@ -27,8 +27,8 @@ from pipelex.exceptions import PipelexConfigError, PipelexSetupErrorfrom pipelex.hub import PipelexHub, get_observer_provider, set_pipelex_hubfrom pipelex.libraries.library_manager_factory import LibraryManagerFactoryfrom pipelex.observer.local_observer import LocalObserver-from pipelex.pipe_works.pipe_router import PipeRouter-from pipelex.pipe_works.pipe_router_protocol import PipeRouterProtocol+from pipelex.pipe_run.pipe_router import PipeRouter+from pipelex.pipe_run.pipe_router_protocol import PipeRouterProtocolfrom pipelex.pipeline.activity.activity_manager import ActivityManagerfrom pipelex.pipeline.activity.activity_manager_protocol import (ActivityManagerNoOp,@@ -121,9 +121,9 @@ class Pipelex(metaclass=MetaSingleton):domain_library = DomainLibrary.make_empty()concept_library = ConceptLibrary.make_empty()pipe_library = PipeLibrary.make_empty()- self.pipelex_hub.set_domain_provider(domain_provider=domain_library)- self.pipelex_hub.set_concept_provider(concept_provider=concept_library)- self.pipelex_hub.set_pipe_provider(pipe_provider=pipe_library)+ self.pipelex_hub.set_domain_library(domain_library=domain_library)+ self.pipelex_hub.set_concept_library(concept_library=concept_library)+ self.pipelex_hub.set_pipe_library(pipe_library=pipe_library)self.library_manager = LibraryManagerFactory.make(domain_library=domain_library,diff --git a/pipelex/pipeline/activity/activity_handler.py b/pipelex/pipeline/activity/activity_handler.pyindex 68b74da7e..7b5fd002e 100644--- a/pipelex/pipeline/activity/activity_handler.py+++ b/pipelex/pipeline/activity/activity_handler.py@@ -3,17 +3,15 @@ from typing import castfrom pipelex import logfrom pipelex.config import get_config+from pipelex.core.stuffs.html_content import HtmlContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.mermaid_content import MermaidContent+from pipelex.core.stuffs.number_content import NumberContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.core.stuffs.stuff import Stuff-from pipelex.core.stuffs.stuff_content import (- HtmlContent,- ImageContent,- ListContent,- MermaidContent,- NumberContent,- StructuredContent,- StuffContent,- TextContent,-)+from pipelex.core.stuffs.stuff_content import StuffContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.pipeline.activity.activity_models import ActivityReportfrom pipelex.tools.misc.file_fetch_utils import fetch_file_from_url_httpxfrom pipelex.tools.misc.file_utils import ensure_path, save_text_to_pathdiff --git a/pipelex/pipeline/execute.py b/pipelex/pipeline/execute.pyindex 8cb52f1ba..f3e813849 100644--- a/pipelex/pipeline/execute.py+++ b/pipelex/pipeline/execute.py@@ -2,12 +2,6 @@ from pipelex.client.protocol import ImplicitMemoryfrom pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactoryfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import (- FORCE_DRY_RUN_MODE_ENV_KEY,- PipeOutputMultiplicity,- PipeRunMode,-)-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.exceptions import PipelineInputErrorfrom pipelex.hub import (get_pipe_router,@@ -15,7 +9,13 @@ from pipelex.hub import (get_report_delegate,get_required_pipe,)-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import (+ FORCE_DRY_RUN_MODE_ENV_KEY,+ PipeOutputMultiplicity,+ PipeRunMode,+)+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.tools.environment import get_optional_envdiff --git a/pipelex/pipeline/start.py b/pipelex/pipeline/start.pyindex 67b92b1dc..9ebd0ee15 100644--- a/pipelex/pipeline/start.py+++ b/pipelex/pipeline/start.py@@ -4,11 +4,11 @@ from pipelex.client.protocol import CompactMemoryfrom pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactoryfrom pipelex.core.pipes.pipe_output import PipeOutput-from pipelex.core.pipes.pipe_run_params import PipeOutputMultiplicity, PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.exceptions import StartPipelineErrorfrom pipelex.hub import get_pipe_router, get_pipeline_manager, get_report_delegate, get_required_pipe-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeOutputMultiplicity, PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatadiff --git a/pipelex/plugins/google/google_llm_worker.py b/pipelex/plugins/google/google_llm_worker.pyindex f49d8ddd0..9ccdd02bf 100644--- a/pipelex/plugins/google/google_llm_worker.py+++ b/pipelex/plugins/google/google_llm_worker.py@@ -15,8 +15,10 @@ from pipelex.cogt.llm.llm_worker_internal_abstract import LLMWorkerInternalAbstrfrom pipelex.cogt.llm.structured_output import StructureMethodfrom pipelex.cogt.model_backends.model_spec import InferenceModelSpecfrom pipelex.cogt.usage.token_category import NbTokensByCategoryDict, TokenCategory+from pipelex.config import get_configfrom pipelex.plugins.google.google_factory import GoogleFactoryfrom pipelex.reporting.reporting_protocol import ReportingProtocol+from pipelex.tools.misc.instructor_utils import dump_error, dump_kwargs, dump_responsefrom pipelex.tools.typing.pydantic_utils import BaseModelTypeVar@@ -46,6 +48,14 @@ class GoogleLLMWorker(LLMWorkerInternalAbstract):else:self.instructor_for_objects = instructor.from_genai(client=sdk_instance, use_async=True)+ instructor_config = get_config().cogt.llm_config.instructor_config+ if instructor_config.is_dump_kwargs_enabled:+ self.instructor_for_objects.on(hook_name="completion:kwargs", handler=dump_kwargs)+ if instructor_config.is_dump_response_enabled:+ self.instructor_for_objects.on(hook_name="completion:response", handler=dump_response)+ if instructor_config.is_dump_error_enabled:+ self.instructor_for_objects.on(hook_name="completion:error", handler=dump_error)+@overrideasync def _gen_text(self,diff --git a/pipelex/test_extras/registry_test_models.py b/pipelex/test_extras/registry_test_models.pyindex 33a7bf088..1071fea5d 100644--- a/pipelex/test_extras/registry_test_models.py+++ b/pipelex/test_extras/registry_test_models.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.tools.registry_models import ModelType, RegistryModelsdiff --git a/pipelex/test_extras/shared_pytest_plugins.py b/pipelex/test_extras/shared_pytest_plugins.pyindex 6c9ed48f8..086bc5ea9 100644--- a/pipelex/test_extras/shared_pytest_plugins.py+++ b/pipelex/test_extras/shared_pytest_plugins.py@@ -4,7 +4,7 @@ import pytestfrom pytest import FixtureRequest, Parserfrom rich import print # noqa: A004-from pipelex.core.pipes.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params import PipeRunModefrom pipelex.tools.environment import is_env_var_set, set_envfrom pipelex.tools.misc.placeholder import make_placeholder_value, value_is_placeholderfrom pipelex.tools.runtime_manager import RunMode, runtime_managerdiff --git a/pyproject.toml b/pyproject.tomlindex 8cd116905..d76f87d12 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -25,7 +25,7 @@ dependencies = ["instructor>=1.8.3,<1.11.0", # 1.11.x causes typing errors with mypy"jinja2>=3.1.4","json2html>=1.3.0",- "kajson==0.3.0",+ "kajson==0.3.1","markdown>=3.6","networkx>=3.4.2","openai>=1.60.1",@@ -212,6 +212,9 @@ typeCheckingMode = "strict"[tool.pytest.ini_options]addopts = "--import-mode=importlib -ra -m 'not (inference or llm or img_gen or ocr or needs_output or pipelex_api)'"asyncio_default_fixture_loop_scope = "session"+filterwarnings = [+ "ignore:Support for class-based `config` is deprecated:DeprecationWarning",+]markers = ["needs_output: tests that need output to be displayed","inference: slow and costly due to inference calls",diff --git a/tests/cases/source_code.py b/tests/cases/source_code.pyindex a5ccfd9ab..f25c318aa 100644--- a/tests/cases/source_code.py+++ b/tests/cases/source_code.py@@ -1,7 +1,7 @@"""Source code manipulation functions for testing."""from pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.stuffs.text_content import TextContentdef wrap_lines(working_memory: WorkingMemory) -> TextContent:diff --git a/tests/conftest.py b/tests/conftest.pyindex 7f5813fd0..e765fdfc5 100644--- a/tests/conftest.py+++ b/tests/conftest.py@@ -6,9 +6,7 @@ import pipelex.configimport pipelex.pipelexfrom pipelex import logfrom pipelex.config import get_config-from pipelex.core.concepts.concept_provider_abstract import ConceptProviderAbstract-from pipelex.hub import get_concept_provider, get_report_delegate-from tests.cases.registry import Fruit+from pipelex.hub import get_report_delegatepytest_plugins = ["pipelex.test_extras.shared_pytest_plugins",@@ -35,35 +33,3 @@ def reset_pipelex_config_fixture():get_report_delegate().generate_report()Console().print("[magenta]pipelex teardown[/magenta]")pipelex_instance.teardown()--[email protected](autouse=True)-def pretty():- # Code to run before each test- return- # Code to run after each test---# Test data fixtures[email protected](scope="session")-def apple() -> Fruit:- """Apple fruit fixture."""- return Fruit(name="apple", color="red")--[email protected](scope="session")-def cherry() -> Fruit:- """Cherry fruit fixture."""- return Fruit(name="cherry", color="red")--[email protected](scope="session")-def blueberry() -> Fruit:- """Blueberry fruit fixture."""- return Fruit(name="blueberry", color="blue")--[email protected](scope="module")-def concept_provider() -> ConceptProviderAbstract:- """Concept provider fixture for testing concept compatibility."""- return get_concept_provider()diff --git a/tests/data/images/gantt_tree_house.png b/tests/data/images/diagram.pngsimilarity index 100%rename from tests/data/images/gantt_tree_house.pngrename to tests/data/images/diagram.pngdiff --git a/tests/data/tools_data/mock_folder_with_classes/test_model_b.py b/tests/data/tools_data/mock_folder_with_classes/test_model_b.pyindex c7a3c1fdd..d6a1649f5 100644--- a/tests/data/tools_data/mock_folder_with_classes/test_model_b.py+++ b/tests/data/tools_data/mock_folder_with_classes/test_model_b.py@@ -1,4 +1,5 @@-from pipelex.core.stuffs.stuff_content import StructuredContent, StuffContent+from pipelex.core.stuffs.structured_content import StructuredContent+from pipelex.core.stuffs.stuff_content import StuffContentclass Class2(StuffContent):diff --git a/tests/e2e/pipelex/migration/test_migrate_v0_1_0_to_v0_2_0_e2e.py b/tests/e2e/pipelex/migration/test_migrate_v0_1_0_to_v0_2_0_e2e.pydeleted file mode 100644index 606a73a23..000000000--- a/tests/e2e/pipelex/migration/test_migrate_v0_1_0_to_v0_2_0_e2e.py+++ /dev/null@@ -1,403 +0,0 @@-import shutil-from pathlib import Path-from typing import Any--import pytest--from pipelex.migration.migrate_v0_1_0_to_v0_2_0 import migrate_concept_syntax---class TestMigrationE2E:- """End-to-end tests for migration functionality."""-- def test_real_world_migration_scenario(self, tmp_path: Path) -> None:- """Test a realistic migration scenario with multiple files and complex structures."""- # Create a realistic pipelex libraries structure- pipelines_dir = tmp_path / "pipelines"- pipelines_dir.mkdir()-- # Create main domain file with mixed syntax- main_toml = pipelines_dir / "content_analysis.toml"- main_toml.write_text("""domain = "content_analysis"-description = "AI-powered content analysis and processing"-system_prompt = "You are an expert content analyst"--[concept]-Text = "Written content in natural language"-Document = "A structured document with metadata"-Report = "An analytical report with findings"--[concept.Article]-Concept = "A written composition on a specific topic"-refines = "Text"-structure = "ArticleContent"--[concept.NewsArticle]-Concept = "An article reporting current events"-refines = "Article"--[concept.BlogPost]-description = "A blog post with metadata" # Already migrated-refines = "Article"-structure = "BlogPostContent"--[concept.ContentAnalysis]-Concept = "Analysis of content including sentiment, topics, and key insights"-refines = "Report"-structure = "ContentAnalysisReport"--[pipe.analyze_text]-PipeLLM = "Analyze text content for sentiment and topics"-inputs = { text_input = "Text" }-output = "ContentAnalysis"-prompt_template = "Analyze this text: @text_input"--[pipe.extract_article_info]-PipeLLM = "Extract structured information from articles"-inputs = { article = "Article" }-output = "ArticleMetadata"-system_prompt = "Extract key metadata from articles"-prompt_template = "Extract metadata from: @article"-""")-- # Create subdirectory with more files- subdomain_dir = pipelines_dir / "specialized"- subdomain_dir.mkdir()-- # File with only old syntax- old_syntax_file = subdomain_dir / "legacy_concepts.toml"- old_syntax_file.write_text("""domain = "legacy"-description = "Legacy concept definitions"--[concept.LegacyConcept]-Concept = "An old concept that needs migration"-refines = "Text"--[concept.AnotherLegacy]-Concept = "Another legacy concept with complex refines"-refines = ["Text", "Document"]-structure = "LegacyStructure"-""")-- # File with only new syntax (should remain unchanged)- new_syntax_file = subdomain_dir / "modern_concepts.toml"- new_syntax_file.write_text("""domain = "modern"-description = "Modern concept definitions"--[concept.ModernConcept]-description = "A modern concept with new syntax"-refines = "Text"--[concept.AdvancedConcept]-description = "An advanced concept with structure"-refines = ["Text", "Document"]-structure = "AdvancedStructure"-""")-- # File with no concepts (should remain unchanged)- pipes_only_file = pipelines_dir / "pipes_only.toml"- pipes_only_file.write_text("""domain = "pipes_only"-description = "File with only pipe definitions"--[pipe.simple_pipe]-PipeLLM = "A simple pipe"-inputs = { input_text = "Text" }-output = "Document"-prompt_template = "Process: @input_text"-""")-- # Run the migration- result = migrate_concept_syntax(directory=pipelines_dir, create_backups=True, dry_run=False)-- # Verify overall results- assert result.files_processed == 4 # All TOML files found- assert result.files_modified == 3 # main_toml, old_syntax_file, and pipes_only_file (for pipe migration)- assert result.total_changes == 5 # Debug: let's see what's actually being migrated- assert len(result.modified_files) == 3- assert len(result.errors) == 0-- # Verify main file was migrated correctly- main_content = main_toml.read_text()- # Concept migrations- assert 'description = "A written composition on a specific topic"' in main_content- assert 'description = "An article reporting current events"' in main_content- assert 'description = "Analysis of content including sentiment, topics, and key insights"' in main_content- # BlogPost should remain unchanged (already had definition =)- assert 'description = "A blog post with metadata"' in main_content- # Pipe migrations- assert 'type = "PipeLLM"' in main_content- assert 'description = "Analyze text content for sentiment and topics"' in main_content- assert 'description = "Extract structured information from articles"' in main_content- # Ensure no old syntax remains- assert "Concept =" not in main_content- assert "PipeLLM =" not in main_content-- # Verify legacy file was migrated correctly- legacy_content = old_syntax_file.read_text()- assert 'description = "An old concept that needs migration"' in legacy_content- assert 'description = "Another legacy concept with complex refines"' in legacy_content- assert "Concept =" not in legacy_content-- # Verify modern file was NOT changed- modern_content = new_syntax_file.read_text()- assert 'description = "A modern concept with new syntax"' in modern_content- assert 'description = "An advanced concept with structure"' in modern_content- assert "Concept =" not in modern_content-- # Verify pipes-only file was migrated (pipe syntax changed)- pipes_content = pipes_only_file.read_text()- assert 'domain = "pipes_only"' in pipes_content- assert "[pipe.simple_pipe]" in pipes_content- assert 'type = "PipeLLM"' in pipes_content- assert 'description = "A simple pipe"' in pipes_content- assert "Concept =" not in pipes_content- assert "PipeLLM =" not in pipes_content-- # Verify backups were created for modified files only- assert (pipelines_dir / "content_analysis.toml.backup").exists()- assert (subdomain_dir / "legacy_concepts.toml.backup").exists()- assert (pipelines_dir / "pipes_only.toml.backup").exists() # Now also modified due to pipe migration- assert not (subdomain_dir / "modern_concepts.toml.backup").exists() # This one should remain unchanged-- # Verify backup contents are correct (original content)- main_backup = (pipelines_dir / "content_analysis.toml.backup").read_text()- assert 'Concept = "A written composition on a specific topic"' in main_backup- assert 'Concept = "An article reporting current events"' in main_backup- assert 'PipeLLM = "Analyze text content for sentiment and topics"' in main_backup- assert 'PipeLLM = "Extract structured information from articles"' in main_backup-- legacy_backup = (subdomain_dir / "legacy_concepts.toml.backup").read_text()- assert 'Concept = "An old concept that needs migration"' in legacy_backup- assert 'Concept = "Another legacy concept with complex refines"' in legacy_backup-- pipes_backup = (pipelines_dir / "pipes_only.toml.backup").read_text()- assert 'PipeLLM = "A simple pipe"' in pipes_backup-- def test_migration_with_complex_formatting(self, tmp_path: Path) -> None:- """Test migration preserves complex formatting and edge cases."""- test_file = tmp_path / "complex_formatting.toml"- original_content = """# Complex formatting test file-domain = "formatting_test"-description = "Test various formatting scenarios"--# Simple concepts-[concept]-BasicConcept = "A basic concept"--# Complex concepts with various formatting-[concept.StandardConcept]-Concept = "Standard formatting concept"-refines = "Text"--[concept.IndentedConcept]- Concept = "Concept with indentation"- refines = "Text"- structure = "IndentedStructure"--[concept.TabIndentedConcept]-\tConcept = "Concept with tab indentation"-\trefines = "Text"--[concept.MixedIndentedConcept]- \tConcept = "Concept with mixed indentation"- \trefines = ["Text", "Document"]--[concept.VariousSpacingConcept]-Concept="No spaces around equals"-refines = "Text"--[concept.ExtraSpacingConcept]-Concept = "Extra spaces around equals"-refines = "Text"--[concept.AlreadyMigratedConcept]-description = "This should not change"-refines = "Text"--# Comment with Concept = in it (should not change)-[pipe.test_pipe]-PipeLLM = "A pipe that mentions Concept = in description"-inputs = { input_text = "Text" }-output = "Document"-prompt_template = \"\"\"-This template mentions Concept = something in the text.-Process this: @input_text-\"\"\"-"""- test_file.write_text(original_content)-- # Run migration- result = migrate_concept_syntax(directory=tmp_path, create_backups=True, dry_run=False)-- # Verify migration results- assert result.files_processed == 1- assert result.files_modified == 1- assert result.total_changes == 6 # Debug: actual count from migration- assert len(result.errors) == 0-- migrated_content = test_file.read_text()-- # Verify all Concept = lines were changed to definition =- expected_changes = [- 'description = "Standard formatting concept"',- ' description = "Concept with indentation"',- '\tdescription = "Concept with tab indentation"',- ' \tdescription = "Concept with mixed indentation"',- 'description="No spaces around equals"',- 'description = "Extra spaces around equals"',- ]-- for expected in expected_changes:- assert expected in migrated_content-- # Verify already migrated concept was not changed- assert 'description = "This should not change"' in migrated_content-- # Verify pipe was migrated to new format- assert 'type = "PipeLLM"' in migrated_content- assert 'description = "A pipe that mentions Concept = in description"' in migrated_content- # Verify content inside multiline strings was not changed- assert "This template mentions Concept = something in the text." in migrated_content-- # Verify no Concept = remains at start of lines- lines = migrated_content.split("\n")- for line in lines:- stripped = line.strip()- if stripped.startswith("Concept ="):- # This should not happen - all should be migrated- pytest.fail(f"Found unmigrated line: {line}")-- def test_dry_run_does_not_modify_files(self, tmp_path: Path) -> None:- """Test that dry run mode doesn't modify any files."""- test_file = tmp_path / "dry_run_test.toml"- original_content = """domain = "dry_run_test"--[concept.TestConcept]-Concept = "This should not be changed in dry run"-refines = "Text"--[concept.AnotherConcept]-Concept = "Neither should this"-refines = "Document"-"""- test_file.write_text(original_content)-- # Run migration in dry run mode- result = migrate_concept_syntax(- directory=tmp_path,- create_backups=False, # Should be ignored in dry run- dry_run=True,- )-- # Verify results show what would be changed- assert result.files_processed == 1- assert result.files_modified == 1- assert result.total_changes == 2- assert len(result.modified_files) == 1- assert len(result.errors) == 0-- # Verify file was NOT actually modified- current_content = test_file.read_text()- assert current_content == original_content-- # Verify no backup was created- backup_file = tmp_path / "dry_run_test.toml.backup"- assert not backup_file.exists()-- def test_error_handling_with_permission_issues(self, tmp_path: Path, mocker: Any) -> None:- """Test proper error handling when file operations fail."""- test_file = tmp_path / "permission_test.toml"- test_file.write_text("""[concept.Test]-Concept = "Test concept"-""")-- # Mock file operations to simulate permission errors- mock_open = mocker.patch("builtins.open")- mock_open.side_effect = PermissionError("Permission denied")-- # Run migration- result = migrate_concept_syntax(directory=tmp_path, create_backups=True, dry_run=False)-- # Should have errors but not crash- assert result.files_processed == 1- assert result.files_modified == 0- assert result.total_changes == 0- assert len(result.modified_files) == 0- assert len(result.errors) == 1- assert "Permission denied" in result.errors[0] or "Error processing" in result.errors[0]-- def test_migration_from_test_data_file(self, tmp_path: Path) -> None:- """Test migration using the official test data file with tricky edge cases."""- # Copy the test data file to our temp directory- test_data_path = Path(__file__).parent.parent.parent.parent / "data" / "test_migrate_v0_1_0_to_v0_2_0.toml"- test_file = tmp_path / "test_migrate.toml"- shutil.copy2(test_data_path, test_file)-- # Read original content to verify the challenge case- original_content = test_file.read_text()-- # Verify the challenge case is present in original file- assert 'Concept = "This is not a definition of concept' in original_content- assert "prompt_template" in original_content-- # Run migration- result = migrate_concept_syntax(directory=tmp_path, create_backups=True, dry_run=False)-- # Verify migration results- assert result.files_processed == 1- assert result.files_modified == 1- assert result.total_changes == 2 # Only the 2 actual concept definitions should change- assert len(result.modified_files) == 1- assert len(result.errors) == 0-- # Read migrated content- migrated_content = test_file.read_text()-- # Verify that actual concept definitions were migrated- assert 'description = "A complex concept with old syntax"' in migrated_content- assert 'description = "Another concept to test migration"' in migrated_content-- # Verify that already migrated concept remains unchanged- assert 'description = "This one is already migrated"' in migrated_content-- # THE CRITICAL CHALLENGE: Verify that the Concept = inside the prompt_template was NOT changed- assert (- 'Concept = "This is not a definition of concept, it\'s just text in the prompt template, so it should not be migrated"'- in migrated_content- )-- # Verify the challenge case is still there and unchanged- challenge_line_found = False- concept_lines_outside_multiline: list[tuple[int, str]] = []-- lines = migrated_content.split("\n")- for i, line in enumerate(lines, 1):- if 'Concept = "This is not a definition of concept' in line:- challenge_line_found = True- # This should be exactly the same as in the original file- assert 'Concept = "This is not a definition of concept, it\'s just text in the prompt template, so it should not be migrated"' in line-- # Check for any Concept = that appears to be a TOML key (not inside strings)- stripped = line.strip()- if stripped.startswith("Concept ="):- # This should only happen inside multiline strings, not as actual TOML keys- # We need to check if this is inside the prompt_template multiline string- if i < 26 or i > 31: # Outside the prompt_template multiline string boundaries- concept_lines_outside_multiline.append((i, line))-- # Should be empty - all Concept = at start of line outside multiline strings should be migrated- assert len(concept_lines_outside_multiline) == 0, (- f"Found unmigrated Concept = lines outside multiline strings: {concept_lines_outside_multiline}"- )-- assert challenge_line_found, "Challenge case (Concept = in prompt template) was not found in migrated file"-- # Verify backup was created and contains original content- backup_file = tmp_path / "test_migrate.toml.backup"- assert backup_file.exists()- backup_content = backup_file.read_text()- assert backup_content == original_content-- # Verify original had the unmigrated Concept = lines- assert 'Concept = "A complex concept with old syntax"' in backup_content- assert 'Concept = "Another concept to test migration"' in backup_contentdiff --git a/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_1.py b/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_1.pyindex 670c4bb01..0e33a3e4e 100644--- a/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_1.py+++ b/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_1.py@@ -4,11 +4,11 @@ from pytest import FixtureRequestfrom pipelex import pretty_printfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.core.stuffs.stuff_factory import StuffFactoryfrom pipelex.hub import get_pipe_router, get_required_pipe-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom tests.test_pipelines.pipe_controllers.pipe_condition.pipe_condition import CategoryInputdiff --git a/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_2.py b/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_2.pyindex b0e756a9d..97069a906 100644--- a/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_2.py+++ b/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_2.py@@ -4,11 +4,11 @@ from pytest import FixtureRequestfrom pipelex import pretty_printfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.core.stuffs.stuff_factory import StuffFactoryfrom pipelex.hub import get_pipe_router, get_required_pipe-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom tests.test_pipelines.pipe_controllers.pipe_condition.pipe_condition import CategoryInputdiff --git a/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_simple.py b/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_simple.pyindex d9312bae2..f47b8fe93 100644--- a/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_simple.py+++ b/tests/e2e/pipelex/pipes/pipe_controller/pipe_condition/test_pipe_condition_simple.py@@ -7,13 +7,13 @@ from pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.core.domains.domain import SpecialDomainfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input import TypedNamedInputRequirement-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirements import TypedNamedInputRequirementfrom pipelex.exceptions import DryRunErrorfrom pipelex.pipe_controllers.condition.pipe_condition_blueprint import PipeConditionBlueprintfrom pipelex.pipe_controllers.condition.pipe_condition_factory import PipeConditionFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom tests.test_pipelines.pipe_controllers.pipe_condition.pipe_condition import CategoryInput@@ -30,8 +30,8 @@ class TestPipeConditionSimple:inputs={"user_category": InputRequirementBlueprint(concept="test_pipe_condition.CategoryInput")},output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",expression_template="{{ user_category.category }}",- pipe_map={"small": "process_small", "medium": "process_medium", "large": "process_large"},- default_pipe_code="process_small",+ outcomes={"small": "process_small", "medium": "process_medium", "large": "process_large"},+ default_outcome="process_small",)pipe_condition = PipeConditionFactory.make_from_blueprint(@@ -64,8 +64,8 @@ class TestPipeConditionSimple:inputs={"user_status": InputRequirementBlueprint(concept="test_pipe_condition.CategoryInput")},output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",expression_template="{{ user_status.category }}",- pipe_map={"active": "process_small", "inactive": "process_medium", "pending": "process_large"},- default_pipe_code="process_small",+ outcomes={"active": "process_small", "inactive": "process_medium", "pending": "process_large"},+ default_outcome="process_small",)pipe_condition = PipeConditionFactory.make_from_blueprint(diff --git a/tests/e2e/pipelex/pipes/pipe_controller/pipe_parallel/test_pipe_parallel_1.py b/tests/e2e/pipelex/pipes/pipe_controller/pipe_parallel/test_pipe_parallel_1.pyindex 764a263ad..6d45035da 100644--- a/tests/e2e/pipelex/pipes/pipe_controller/pipe_parallel/test_pipe_parallel_1.py+++ b/tests/e2e/pipelex/pipes/pipe_controller/pipe_parallel/test_pipe_parallel_1.py@@ -6,11 +6,11 @@ from pytest import FixtureRequestfrom pipelex import pretty_printfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.core.stuffs.stuff_factory import StuffFactoryfrom pipelex.hub import get_pipe_router, get_required_pipe-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom tests.test_pipelines.pipe_controllers.pipe_parallel.pipe_parallel import ContentAnalysis, DocumentInput, LengthAnalysisdiff --git a/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_batching.py b/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_batching.pyindex af35b1782..125d8a7e4 100644--- a/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_batching.py+++ b/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_batching.py@@ -7,11 +7,11 @@ import pytestfrom pipelex import logfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input import TypedNamedInputRequirement-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory+from pipelex.core.pipes.input_requirements import TypedNamedInputRequirementfrom pipelex.core.stuffs.stuff_factory import StuffFactoryfrom pipelex.hub import get_required_pipe+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.execute import execute_pipelinefrom pipelex.pipeline.job_metadata import JobMetadatafrom tests.test_pipelines.pipe_controllers.pipe_sequence.pipe_sequence import Document, ProductRatingdiff --git a/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_multiplicity.py b/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_multiplicity.pyindex 4407dc1e0..3a3ca2caf 100644--- a/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_multiplicity.py+++ b/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_multiplicity.py@@ -4,9 +4,9 @@ import pytestfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.stuffs.stuff_content import TextContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContent+from pipelex.pipe_run.pipe_run_params import PipeRunModefrom pipelex.pipeline.execute import execute_pipelinediff --git a/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_simple.py b/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_simple.pyindex 166d6b28f..1c477f1c1 100644--- a/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_simple.py+++ b/tests/e2e/pipelex/pipes/pipe_controller/pipe_sequence/test_pipe_sequence_simple.py@@ -5,11 +5,11 @@ import pytestfrom pipelex import pretty_printfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import TextContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.hub import get_required_pipe+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatadiff --git a/pipelex/pipe_works/__init__.py b/tests/e2e/pipelex/pipes/pipe_operators/__init__.pysimilarity index 100%rename from pipelex/pipe_works/__init__.pyrename to tests/e2e/pipelex/pipes/pipe_operators/__init__.pydiff --git a/tests/e2e/pipelex/pipes/pipe_operators/test_pipe_llm_vision.py b/tests/e2e/pipelex/pipes/pipe_operators/test_pipe_llm_vision.pynew file mode 100644index 000000000..614108a0b--- /dev/null+++ b/tests/e2e/pipelex/pipes/pipe_operators/test_pipe_llm_vision.py@@ -0,0 +1,79 @@+"""E2E test for PipeLLM with vision capabilities."""++import pytest++from pipelex import pretty_print+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.pipeline.execute import execute_pipeline+from tests.integration.pipelex.cogt.test_data import LLMVisionTestCases+++class TestPipeLLMVision:+ """Test PipeLLM with vision capabilities."""++ async def test_describe_image(self):+ """Test the describe_image pipeline with a simple image."""+ # Execute the pipeline with an image+ pipe_output = await execute_pipeline(+ pipe_code="describe_image",+ input_memory={+ "image": ImageContent(url=LLMVisionTestCases.PATH_IMG_GANTT_1),+ },+ )++ # Get the result as text+ result_text = pipe_output.main_stuff_as_str++ # Basic assertions+ assert pipe_output is not None+ assert pipe_output.working_memory is not None+ assert pipe_output.main_stuff is not None+ assert result_text is not None+ assert len(result_text) > 0++ # Log output+ pretty_print(result_text, title="Image Description")++ # Verify the description is reasonable+ assert len(result_text.strip()) > 20++ @pytest.mark.parametrize(+ "pipe_code",+ [+ "describe_image_number_1_only",+ "describe_image_number_2_only",+ ],+ )+ async def test_describe_images_discriminate(self, pipe_code: str):+ """Test the describe_image pipeline with multiple images to discriminate."""+ # Execute the pipeline with an image+ pipe_output = await execute_pipeline(+ pipe_code=pipe_code,+ input_memory={+ "imageA": ImageContent(url=LLMVisionTestCases.PATH_IMG_GANTT_1),+ "imageB": ImageContent(url=LLMVisionTestCases.PATH_IMG_JPEG_3),+ },+ )++ result = pipe_output.main_stuff+ pretty_print(result, title=f"Image Description ({pipe_code})")++ async def test_structured_analysis_of_image_with_gantt_chart(self):+ """Test vision with a more complex image (Gantt chart)."""+ # Execute the pipeline with a complex image+ pipe_output = await execute_pipeline(+ pipe_code="vision_analysis",+ input_memory={+ "image": ImageContent(url=LLMVisionTestCases.PATH_IMG_GANTT_1),+ },+ )++ # Get the result as text+ # result = pipe_output.main_stuff_as(content_type=VisionAnalysis)+ result = pipe_output.main_stuff++ # Log output+ pretty_print(result, title="Gantt Chart Description")diff --git a/tests/integration/pipelex/client/test_client.py b/tests/integration/pipelex/client/test_client.pyindex 01dba9b05..23fedb8f2 100644--- a/tests/integration/pipelex/client/test_client.py+++ b/tests/integration/pipelex/client/test_client.py@@ -9,8 +9,8 @@ from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConfrom pipelex.core.domains.domain import SpecialDomainfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactoryfrom pipelex.core.stuffs.stuff import Stuff-from pipelex.core.stuffs.stuff_content import TextContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentclass Example(BaseModel):diff --git a/tests/integration/pipelex/cogt/test_data.py b/tests/integration/pipelex/cogt/test_data.pyindex 7c6aad8be..2af9d2e3d 100644--- a/tests/integration/pipelex/cogt/test_data.py+++ b/tests/integration/pipelex/cogt/test_data.py@@ -58,7 +58,7 @@ class LLMVisionTestCases:PATH_IMG_PNG_3 = f"{TEST_IMAGE_DIRECTORY}/eiffel_tower.png"PATH_IMG_JPEG_3 = f"{TEST_IMAGE_DIRECTORY}/eiffel_tower.jpg"- PATH_IMG_GANTT_1 = f"{TEST_IMAGE_DIRECTORY}/gantt_tree_house.png"+ PATH_IMG_GANTT_1 = f"{TEST_IMAGE_DIRECTORY}/diagram.png"IMAGE_PATHS: ClassVar[list[tuple[str, str]]] = [ # topic, image_path("AI Lympics PNG", PATH_IMG_PNG_1),diff --git a/tests/integration/pipelex/conftest.py b/tests/integration/pipelex/conftest.pyindex abb593b04..365655418 100644--- a/tests/integration/pipelex/conftest.py+++ b/tests/integration/pipelex/conftest.py@@ -47,7 +47,7 @@ def llm_preset_id(request: pytest.FixtureRequest) -> str:# "gpt-4o-mini",# "gpt-5-mini",# "gpt-5-chat",- # "claude-4-sonnet",+ # "claude-4.5-sonnet",# "claude-4.1-opus","claude-4.5-sonnet",# "grok-3",diff --git a/tests/integration/pipelex/core/memory/test_working_memory_factory.py b/tests/integration/pipelex/core/memory/test_working_memory_factory.pyindex 8aaf3ec37..84362d27e 100644--- a/tests/integration/pipelex/core/memory/test_working_memory_factory.py+++ b/tests/integration/pipelex/core/memory/test_working_memory_factory.py@@ -2,7 +2,10 @@ from typing import TYPE_CHECKINGfrom pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.stuffs.stuff_content import ImageContent, PageContent, TextAndImagesContent, TextContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.page_content import PageContent+from pipelex.core.stuffs.text_and_images_content import TextAndImagesContent+from pipelex.core.stuffs.text_content import TextContentif TYPE_CHECKING:from pipelex.client.protocol import CompactMemorydiff --git a/tests/integration/pipelex/pipes/controller/pipe_batch/test_pipe_batch_simple.py b/tests/integration/pipelex/pipes/controller/pipe_batch/test_pipe_batch_simple.pyindex 809eeff0e..6b46c2a28 100644--- a/tests/integration/pipelex/pipes/controller/pipe_batch/test_pipe_batch_simple.py+++ b/tests/integration/pipelex/pipes/controller/pipe_batch/test_pipe_batch_simple.py@@ -9,14 +9,16 @@ from pipelex import pretty_printfrom pipelex.core.concepts.concept_factory import ConceptBlueprint, ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import ListContent, StuffContent, TextContent+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.stuff_content import StuffContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory-from pipelex.hub import get_concept_provider+from pipelex.core.stuffs.text_content import TextContent+from pipelex.hub import get_concept_libraryfrom pipelex.pipe_controllers.batch.pipe_batch_blueprint import PipeBatchBlueprintfrom pipelex.pipe_controllers.batch.pipe_batch_factory import PipeBatchFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadata@@ -42,7 +44,7 @@ class TestPipeBatchSimple:blueprint=ConceptBlueprint(description="Lorem Ipsum"),concept_codes_from_the_same_domain=["TestConcept2"],)- concept_library = get_concept_provider()+ concept_library = get_concept_library()concept_library.add_concepts([concept_1, concept_2])pipe_batch_blueprint = PipeBatchBlueprint(diff --git a/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_complex.py b/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_complex.pyindex 783d8d9dd..584d5697c 100644--- a/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_complex.py+++ b/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_complex.py@@ -8,13 +8,13 @@ from pytest import FixtureRequestfrom pipelex import pretty_printfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import TextContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import DryRunErrorfrom pipelex.hub import get_pipe_router, get_required_pipe-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom tests.test_pipelines.pipe_controllers.pipe_condition.pipe_condition_complex import (DocumentRequest,diff --git a/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_simple.py b/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_simple.pyindex 2aa5461da..f5e1e30d8 100644--- a/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_simple.py+++ b/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_simple.py@@ -10,16 +10,17 @@ from pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.domains.domain import SpecialDomainfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import DryRunErrorfrom pipelex.hub import get_pipe_router, get_required_pipefrom pipelex.pipe_controllers.condition.pipe_condition_blueprint import PipeConditionBlueprintfrom pipelex.pipe_controllers.condition.pipe_condition_factory import PipeConditionFactory-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_controllers.condition.special_outcome import SpecialOutcome+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom tests.test_pipelines.pipe_controllers.pipe_condition.pipe_condition import CategoryInput@@ -35,7 +36,8 @@ class TestPipeConditionSimple:inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}")},output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",expression_template="{% if input_text.text|length > 5 %}long{% else %}short{% endif %}",- pipe_map={"long": "capitalize_long_text", "short": "add_prefix_short_text"},+ outcomes={"long": "capitalize_long_text", "short": "add_prefix_short_text"},+ default_outcome=SpecialOutcome.CONTINUE,)pipe_condition = PipeConditionFactory.make_from_blueprint(@@ -53,7 +55,7 @@ class TestPipeConditionSimple:assert pipe_condition.domain == "test_integration"assert pipe_condition.code == "text_length_condition"- assert pipe_condition.pipe_map == {"long": "capitalize_long_text", "short": "add_prefix_short_text"}+ assert pipe_condition.outcome_map == {"long": "capitalize_long_text", "short": "add_prefix_short_text"}input_text = working_memory.get_stuff("input_text")assert input_text is not None@@ -104,7 +106,8 @@ class TestPipeConditionSimple:inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}")},output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",expression_template="{% if input_text.text|length > 5 %}long{% else %}short{% endif %}",- pipe_map={"long": "capitalize_long_text", "short": "add_prefix_short_text"},+ outcomes={"long": "capitalize_long_text", "short": "add_prefix_short_text"},+ default_outcome=SpecialOutcome.CONTINUE,)pipe_condition = PipeConditionFactory.make_from_blueprint(diff --git a/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_validation.py b/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_validation.pyindex 88bd48627..d73e169ae 100644--- a/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_validation.py+++ b/tests/integration/pipelex/pipes/controller/pipe_condition/test_pipe_condition_validation.py@@ -1,8 +1,9 @@from pipelex.core.concepts.concept_factory import ConceptBlueprint, ConceptFactory-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.hub import get_concept_provider+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint+from pipelex.hub import get_concept_libraryfrom pipelex.pipe_controllers.condition.pipe_condition_blueprint import PipeConditionBlueprintfrom pipelex.pipe_controllers.condition.pipe_condition_factory import PipeConditionFactory+from pipelex.pipe_controllers.condition.special_outcome import SpecialOutcomeclass TestPipeConditionValidation:@@ -23,7 +24,7 @@ class TestPipeConditionValidation:blueprint=ConceptBlueprint(description="Lorem Ipsum"),concept_codes_from_the_same_domain=["Result"],)- concept_library = get_concept_provider()+ concept_library = get_concept_library()concept_library.add_concepts([concept_1, concept_2])pipe_condition_blueprint = PipeConditionBlueprint(@@ -31,8 +32,8 @@ class TestPipeConditionValidation:inputs={"input_var": InputRequirementBlueprint(concept=concept_1.concept_string)},output=concept_2.concept_string,expression="input_var",- pipe_map={"value1": "pipe_a", "value2": "pipe_b"},- default_pipe_code="default_pipe",+ outcomes={"value1": "pipe_a", "value2": "pipe_b"},+ default_outcome="default_pipe",)pipe_condition = PipeConditionFactory.make_from_blueprint(@@ -43,9 +44,9 @@ class TestPipeConditionValidation:assert pipe_condition.code == "test_condition"assert pipe_condition.domain == domain- assert len(pipe_condition.pipe_map) == 2+ assert len(pipe_condition.outcome_map) == 2assert pipe_condition.expression == "input_var"- assert pipe_condition.default_pipe_code == "default_pipe"+ assert pipe_condition.default_outcome == "default_pipe"concept_library.teardown()@@ -53,7 +54,7 @@ class TestPipeConditionValidation:"""Test that both expression_template and expression formats work"""# Test with expression_templatedomain = "test_domain"- concept_library = get_concept_provider()+ concept_library = get_concept_library()concept_1 = ConceptFactory.make_from_blueprint(concept_code="TestConcept",domain=domain,@@ -73,7 +74,8 @@ class TestPipeConditionValidation:inputs={"var": InputRequirementBlueprint(concept=concept_1.concept_string)},output=concept_2.concept_string,expression_template="{{ var }}",- pipe_map={"value": "target_pipe"},+ outcomes={"value": "target_pipe"},+ default_outcome=SpecialOutcome.CONTINUE,)pipe_condition_template = PipeConditionFactory.make_from_blueprint(@@ -88,7 +90,8 @@ class TestPipeConditionValidation:inputs={"var": InputRequirementBlueprint(concept=concept_1.concept_string)},output=concept_2.concept_string,expression="var",- pipe_map={"value": "target_pipe"},+ outcomes={"value": "target_pipe"},+ default_outcome=SpecialOutcome.CONTINUE,)pipe_condition_expr = PipeConditionFactory.make_from_blueprint(diff --git a/tests/integration/pipelex/pipes/controller/pipe_parallel/test_pipe_parallel_simple.py b/tests/integration/pipelex/pipes/controller/pipe_parallel/test_pipe_parallel_simple.pyindex c0fcb8f22..5c3d7ba82 100644--- a/tests/integration/pipelex/pipes/controller/pipe_parallel/test_pipe_parallel_simple.py+++ b/tests/integration/pipelex/pipes/controller/pipe_parallel/test_pipe_parallel_simple.py@@ -7,14 +7,14 @@ from pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.domains.domain import SpecialDomainfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.pipe_controllers.parallel.pipe_parallel_blueprint import PipeParallelBlueprintfrom pipelex.pipe_controllers.parallel.pipe_parallel_factory import PipeParallelFactoryfrom pipelex.pipe_controllers.sub_pipe_factory import SubPipeBlueprint+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatadiff --git a/tests/integration/pipelex/pipes/controller/pipe_parallel/test_pipe_parallel_validation.py b/tests/integration/pipelex/pipes/controller/pipe_parallel/test_pipe_parallel_validation.pyindex 1d06ef249..3940b1899 100644--- a/tests/integration/pipelex/pipes/controller/pipe_parallel/test_pipe_parallel_validation.py+++ b/tests/integration/pipelex/pipes/controller/pipe_parallel/test_pipe_parallel_validation.py@@ -1,8 +1,8 @@from pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.concepts.concept_factory import ConceptFactory-from pipelex.core.pipes.pipe_input import PipeInput-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.hub import get_concept_provider, get_pipe_provider+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirements import InputRequirements+from pipelex.hub import get_concept_library, get_pipe_libraryfrom pipelex.pipe_controllers.parallel.pipe_parallel_blueprint import PipeParallelBlueprintfrom pipelex.pipe_controllers.parallel.pipe_parallel_factory import PipeParallelFactoryfrom pipelex.pipe_controllers.sub_pipe_factory import SubPipeBlueprint@@ -17,7 +17,7 @@ class TestPipeParallelValidation:"""Test PipeParallel structure with a real pipe"""# Create a real PipeLLM that will infer inputs from the prompt templatedomain = "test_domain"- concept_library = get_concept_provider()+ concept_library = get_concept_library()concept_blueprint = ConceptBlueprint(description="A test document")concept_1 = ConceptFactory.make_from_blueprint(domain=domain,@@ -55,8 +55,8 @@ class TestPipeParallelValidation:blueprint=pipe_llm_blueprint,)- pipe_provider = get_pipe_provider()- pipe_provider.add_new_pipe(pipe=real_pipe)+ pipe_library = get_pipe_library()+ pipe_library.add_new_pipe(pipe=real_pipe)# Verify the real pipe was created successfullyassert real_pipe.domain == domain@@ -98,7 +98,7 @@ class TestPipeParallelValidation:"""Test basic PipeParallel creation and structure"""# Create a simple PipeParallel with proper inputsdomain = "test_domain"- concept_library = get_concept_provider()+ concept_library = get_concept_library()concept_blueprint = ConceptBlueprint(description="Lorem Ipsum")concept_1 = ConceptFactory.make_from_blueprint(domain=domain,@@ -150,7 +150,7 @@ class TestPipeParallelValidation:def test_pipe_parallel_needed_inputs_structure(self):"""Test that PipeParallel needed_inputs method can be called and returns expected structure"""domain = "test_domain"- concept_library = get_concept_provider()+ concept_library = get_concept_library()concept_blueprint = ConceptBlueprint(description="A test document")concept_1 = ConceptFactory.make_from_blueprint(domain=domain,@@ -195,7 +195,7 @@ class TestPipeParallelValidation:needed_inputs = pipe_parallel.needed_inputs()# Verify it returns a PipeInput object- assert isinstance(needed_inputs, PipeInput)+ assert isinstance(needed_inputs, InputRequirements)assert hasattr(needed_inputs, "root")assert isinstance(needed_inputs.root, dict)# With no sub-pipes, should return empty inputsdiff --git a/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_dry_run.py b/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_dry_run.pyindex 498a0a94f..332cf4848 100644--- a/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_dry_run.py+++ b/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_dry_run.py@@ -6,12 +6,12 @@ from pytest import FixtureRequestfrom pipelex import pretty_printfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import ListContent+from pipelex.core.stuffs.list_content import ListContentfrom pipelex.core.stuffs.stuff_factory import StuffFactoryfrom pipelex.hub import get_pipe_router, get_required_pipe-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom pipelex.tools.misc.json_utils import load_json_list_from_pathfrom tests.test_pipelines.discord_newsletter import ChannelSummary, DiscordChannelUpdatediff --git a/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_simple.py b/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_simple.pyindex 220706667..dd71b76fd 100644--- a/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_simple.py+++ b/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_simple.py@@ -10,15 +10,15 @@ from pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.core.stuffs.stuff_factory import StuffFactory-from pipelex.hub import get_concept_provider, get_native_concept+from pipelex.core.stuffs.text_content import TextContent+from pipelex.hub import get_concept_library, get_native_conceptfrom pipelex.pipe_controllers.sequence.pipe_sequence_blueprint import PipeSequenceBlueprintfrom pipelex.pipe_controllers.sequence.pipe_sequence_factory import PipeSequenceFactoryfrom pipelex.pipe_controllers.sub_pipe_blueprint import SubPipeBlueprint+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadata@@ -37,7 +37,7 @@ class TestPipeSequenceSimple:blueprint=ConceptBlueprint(description="Lorem Ipsum"),concept_codes_from_the_same_domain=["TestConcept1"],)- concept_library = get_concept_provider()+ concept_library = get_concept_library()concept_library.add_concepts([concept_1])concept_2 = get_native_concept(native_concept=NativeConceptEnum.TEXT)diff --git a/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_validation.py b/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_validation.pyindex 0a211ab48..cedb8af63 100644--- a/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_validation.py+++ b/tests/integration/pipelex/pipes/controller/pipe_sequence/test_pipe_sequence_validation.py@@ -1,6 +1,6 @@from pipelex.core.concepts.concept_factory import ConceptBlueprint, ConceptFactory-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.hub import get_concept_provider+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint+from pipelex.hub import get_concept_libraryfrom pipelex.pipe_controllers.sequence.pipe_sequence_blueprint import PipeSequenceBlueprintfrom pipelex.pipe_controllers.sequence.pipe_sequence_factory import PipeSequenceFactoryfrom pipelex.pipe_controllers.sub_pipe_factory import SubPipeBlueprint@@ -24,7 +24,7 @@ class TestPipeSequenceValidation:blueprint=ConceptBlueprint(description="Lorem Ipsum"),concept_codes_from_the_same_domain=["ProcessedText"],)- concept_library = get_concept_provider()+ concept_library = get_concept_library()concept_library.add_concepts([concept_1, concept_2])pipe_sequence_blueprint = PipeSequenceBlueprint(@@ -63,7 +63,7 @@ class TestPipeSequenceValidation:blueprint=ConceptBlueprint(description="Lorem Ipsum"),concept_codes_from_the_same_domain=["ProcessedText"],)- concept_library = get_concept_provider()+ concept_library = get_concept_library()concept_library.add_concepts([concept_1, concept_2])pipe_sequence_blueprint = PipeSequenceBlueprint(diff --git a/tests/integration/pipelex/pipes/operator/pipe_func/test_pipe_func.py b/tests/integration/pipelex/pipes/operator/pipe_func/test_pipe_func.pyindex a7c10fefa..062faec40 100644--- a/tests/integration/pipelex/pipes/operator/pipe_func/test_pipe_func.py+++ b/tests/integration/pipelex/pipes/operator/pipe_func/test_pipe_func.py@@ -4,14 +4,14 @@ from pipelex import log, pretty_printfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import TextContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.hub import get_pipe_routerfrom pipelex.pipe_operators.func.pipe_func_blueprint import PipeFuncBlueprintfrom pipelex.pipe_operators.func.pipe_func_factory import PipeFuncFactory-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.tools.func_registry import func_registryfrom tests.cases.source_code import wrap_linesdiff --git a/tests/integration/pipelex/pipes/operator/pipe_imgg/test_pipe_img_gen.py b/tests/integration/pipelex/pipes/operator/pipe_imgg/test_pipe_img_gen.pyindex eb2868441..2386b4b77 100644--- a/tests/integration/pipelex/pipes/operator/pipe_imgg/test_pipe_img_gen.py+++ b/tests/integration/pipelex/pipes/operator/pipe_imgg/test_pipe_img_gen.py@@ -4,12 +4,12 @@ import pytestfrom pipelex import pretty_printfrom pipelex.core.concepts.concept_native import NativeConceptEnum-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.hub import get_pipe_routerfrom pipelex.pipe_operators.img_gen.pipe_img_gen_blueprint import PipeImgGenBlueprintfrom pipelex.pipe_operators.img_gen.pipe_img_gen_factory import PipeImgGenFactory-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom tests.integration.pipelex.test_data import ImageGenTestCasesif TYPE_CHECKING:diff --git a/tests/integration/pipelex/pipes/operator/pipe_llm/test_pipe_llm.py b/tests/integration/pipelex/pipes/operator/pipe_llm/test_pipe_llm.pyindex 8cb7c7aac..170ad1847 100644--- a/tests/integration/pipelex/pipes/operator/pipe_llm/test_pipe_llm.py+++ b/tests/integration/pipelex/pipes/operator/pipe_llm/test_pipe_llm.py@@ -3,14 +3,14 @@ import pytestfrom pipelex import log, pretty_printfrom pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.core.stuffs.stuff import Stuff-from pipelex.hub import get_class_registry, get_pipe_provider, get_pipe_router+from pipelex.hub import get_class_registry, get_pipe_library, get_pipe_routerfrom pipelex.pipe_operators.llm.pipe_llm_blueprint import PipeLLMBlueprint, StructuringMethodfrom pipelex.pipe_operators.llm.pipe_llm_factory import PipeLLMFactory-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom tests.integration.pipelex.test_data import BasicStructuredDataTestCases, ComplexStructuredDataTestCases, PipeTestCases@@ -34,8 +34,8 @@ class TestPipeLLM:pipe_code="adhoc_for_test_pipe_llm",blueprint=pipe_llm_blueprint,)- pipe_provider = get_pipe_provider()- pipe_provider.add_new_pipe(pipe)+ pipe_library = get_pipe_library()+ pipe_library.add_new_pipe(pipe)pipe_job = PipeJobFactory.make_pipe_job(pipe=pipe,@@ -100,8 +100,8 @@ class TestPipeLLM:pipe_code=pipe_code,blueprint=pipe_llm_blueprint,)- pipe_provider = get_pipe_provider()- pipe_provider.add_new_pipe(pipe)+ pipe_library = get_pipe_library()+ pipe_library.add_new_pipe(pipe)pipe_job = PipeJobFactory.make_pipe_job(pipe=pipe,@@ -120,17 +120,6 @@ class TestPipeLLM:# Pretty print the structured outputpretty_print(main_stuff.content, title=f"{topic} - {concept} - {structuring_method}")- # If using PRELIMINARY_TEXT, also print the preliminary text- # if structuring_method == StructuringMethod.PRELIMINARY_TEXT:- # # Get preliminary text from working memory- # preliminary_stuff = pipe_llm_output.working_memory.get_optional_stuff("preliminary_text")- # if preliminary_stuff:- # content = preliminary_stuff.content- # if hasattr(content, "text"):- # pretty_print(content.text, title="Preliminary Text")- # else:- # pretty_print(str(content), title="Preliminary Text")-# Verify the output type matches expected structurestructure_class = get_class_registry().get_class(concept)assert structure_class is not None, f"Structure class {concept} not found in registry"diff --git a/tests/integration/pipelex/pipes/operator/pipe_ocr/test_pipe_ocr.py b/tests/integration/pipelex/pipes/operator/pipe_ocr/test_pipe_ocr.pyindex 8cfb6ca9e..6c852c1ce 100644--- a/tests/integration/pipelex/pipes/operator/pipe_ocr/test_pipe_ocr.py+++ b/tests/integration/pipelex/pipes/operator/pipe_ocr/test_pipe_ocr.py@@ -5,14 +5,14 @@ from pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import PageContent-from pipelex.hub import get_concept_provider, get_pipe_router+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint+from pipelex.core.stuffs.page_content import PageContent+from pipelex.hub import get_concept_library, get_pipe_routerfrom pipelex.pipe_operators.ocr.pipe_ocr_blueprint import PipeOcrBlueprintfrom pipelex.pipe_operators.ocr.pipe_ocr_factory import PipeOcrFactory-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom tests.integration.pipelex.test_data import PipeOcrTestCases@@ -23,18 +23,18 @@ from tests.integration.pipelex.test_data import PipeOcrTestCasesclass TestPipeOCR:@pytest.fixture(scope="class", autouse=True)def setup(self):- concept_provider = get_concept_provider()+ concept_library = get_concept_library()concept_1 = ConceptFactory.make_from_blueprint(concept_code="PageScan",domain="ocr",blueprint=ConceptBlueprint(description="Lorem Ipsum"),concept_codes_from_the_same_domain=["PageScan"],)- concept_provider.add_new_concept(concept=concept_1)+ concept_library.add_new_concept(concept=concept_1)yield- concept_provider.teardown()+ concept_library.teardown()@pytest.mark.usefixtures("setup")@pytest.mark.parametrize("image_url", PipeOcrTestCases.PIPE_OCR_IMAGE_TEST_CASES)diff --git a/tests/integration/pipelex/pipes/test_image_inputs.py b/tests/integration/pipelex/pipes/test_image_inputs.pyindex 741a84f39..2346ee517 100644--- a/tests/integration/pipelex/pipes/test_image_inputs.py+++ b/tests/integration/pipelex/pipes/test_image_inputs.py@@ -4,14 +4,17 @@ from pytest import FixtureRequestfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactory-from pipelex.core.stuffs.stuff_content import ImageContent, PageContent, TextAndImagesContent, TextContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.page_content import PageContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_and_images_content import TextAndImagesContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.hub import get_pipe_router, get_required_pipefrom pipelex.pipe_operators.llm.pipe_llm_blueprint import PipeLLMBlueprintfrom pipelex.pipe_operators.llm.pipe_llm_factory import PipeLLMFactory-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.job_metadata import JobMetadatafrom tests.cases import ImageTestCasesfrom tests.test_pipelines.misc_tests.test_structures import Article@@ -114,4 +117,5 @@ class TestImageInputs:blueprint=pipe_llm_blueprint,)- assert pipe_llm.llm_prompt_spec.user_images == ["page.page_view"]+ # Should find both the list of images in text_and_images and the single page_view image+ assert pipe_llm.llm_prompt_spec.user_images == ["page.text_and_images.images", "page.page_view"]diff --git a/tests/integration/pipelex/pipes/test_pipe_compose.py b/tests/integration/pipelex/pipes/test_pipe_compose.pyindex db6f42ec2..8a36942f1 100644--- a/tests/integration/pipelex/pipes/test_pipe_compose.py+++ b/tests/integration/pipelex/pipes/test_pipe_compose.py@@ -5,12 +5,12 @@ import pytestfrom pipelex import pretty_printfrom pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.hub import get_pipe_routerfrom pipelex.pipe_operators.compose.pipe_compose_blueprint import PipeComposeBlueprintfrom pipelex.pipe_operators.compose.pipe_compose_factory import PipeComposeFactory-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.tools.templating.templating_models import PromptingStyle, TagStyle, TextFormatfrom tests.cases import JINJA2TestCasesdiff --git a/tests/integration/pipelex/pipes/test_pipe_running_variants.py b/tests/integration/pipelex/pipes/test_pipe_running_variants.pyindex b0aff67a2..c649d934c 100644--- a/tests/integration/pipelex/pipes/test_pipe_running_variants.py+++ b/tests/integration/pipelex/pipes/test_pipe_running_variants.py@@ -7,11 +7,11 @@ from pytest import FixtureRequestfrom pipelex import log, pretty_printfrom pipelex.config import get_configfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_run_params import PipeOutputMultiplicity, PipeRunMode-from pipelex.core.pipes.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.core.stuffs.stuff import Stufffrom pipelex.hub import get_library_manager, get_pipe_router, get_required_pipe-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_run_params import PipeOutputMultiplicity, PipeRunMode+from pipelex.pipe_run.pipe_run_params_factory import PipeRunParamsFactoryfrom pipelex.pipeline.activity.activity_handler import ActivityHandlerForResultFilesfrom pipelex.pipeline.job_metadata import JobMetadatafrom tests.integration.pipelex.test_data import PipeTestCasesdiff --git a/tests/integration/pipelex/plugins/test_external_plugin.py b/tests/integration/pipelex/plugins/test_external_plugin.pyindex 72c909e31..a07d19145 100644--- a/tests/integration/pipelex/plugins/test_external_plugin.py+++ b/tests/integration/pipelex/plugins/test_external_plugin.py@@ -14,7 +14,7 @@ from pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.hub import get_inference_manager, get_pipe_router, get_report_delegatefrom pipelex.pipe_operators.llm.pipe_llm_blueprint import PipeLLMBlueprintfrom pipelex.pipe_operators.llm.pipe_llm_factory import PipeLLMFactory-from pipelex.pipe_works.pipe_job_factory import PipeJobFactory+from pipelex.pipe_run.pipe_job_factory import PipeJobFactoryfrom pipelex.tools.typing.pydantic_utils import BaseModelTypeVarfrom tests.integration.pipelex.cogt.test_data import LLMTestConstants, Personfrom tests.integration.pipelex.test_data import PipeTestCasesdiff --git a/tests/integration/pipelex/test_data.py b/tests/integration/pipelex/test_data.pyindex a979a0113..479d4b110 100644--- a/tests/integration/pipelex/test_data.py+++ b/tests/integration/pipelex/test_data.py@@ -2,17 +2,15 @@ from typing import ClassVarfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum-from pipelex.core.pipes.pipe_run_params import PipeOutputMultiplicity+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.pdf_content import PDFContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.core.stuffs.stuff import Stuff-from pipelex.core.stuffs.stuff_content import (- ImageContent,- ListContent,- PDFContent,- StructuredContent,- TextContent,-)from pipelex.core.stuffs.stuff_factory import StuffBlueprint, StuffFactory+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.exceptions import PipeStackOverflowError+from pipelex.pipe_run.pipe_run_params import PipeOutputMultiplicityfrom tests.cases import ImageTestCases, PDFTestCasesdiff --git a/tests/integration/pipelex/test_fundamentals.py b/tests/integration/pipelex/test_fundamentals.pyindex 5e53fc616..8933ccc52 100644--- a/tests/integration/pipelex/test_fundamentals.py+++ b/tests/integration/pipelex/test_fundamentals.py@@ -1,7 +1,7 @@import pytest-from pipelex.hub import get_pipe_provider-from pipelex.pipe_works.pipe_dry import DryRunStatus, dry_run_pipes+from pipelex.hub import get_pipes+from pipelex.pipe_run.dry_run import DryRunStatus, dry_run_pipesfrom pipelex.pipelex import Pipelex@@ -18,7 +18,7 @@ class TestFundamentals:@pytest.mark.asyncio(loop_scope="class")async def test_dry_run_all_pipes(self):- results = await dry_run_pipes(pipes=get_pipe_provider().get_pipes(), raise_on_failure=False)+ results = await dry_run_pipes(pipes=get_pipes(), raise_on_failure=False)# Check if there were any failuresdiff --git a/tests/integration/pipelex/test_inline_structure_concepts.py b/tests/integration/pipelex/test_inline_structure_concepts.pyindex 85b83c614..45fc6c8d0 100644--- a/tests/integration/pipelex/test_inline_structure_concepts.py+++ b/tests/integration/pipelex/test_inline_structure_concepts.py@@ -8,7 +8,7 @@ from pipelex.core.concepts.concept_blueprint import (ConceptStructureBlueprintFieldType,)from pipelex.core.concepts.concept_factory import ConceptFactory-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.exceptions import StructureClassErrorfrom pipelex.hub import get_class_registrydiff --git a/tests/e2e/pipelex/migration/__init__.py b/tests/test_pipelines/concepts/__init__.pysimilarity index 100%rename from tests/e2e/pipelex/migration/__init__.pyrename to tests/test_pipelines/concepts/__init__.pydiff --git a/tests/test_pipelines/datetime.plx b/tests/test_pipelines/concepts/datetime.plxsimilarity index 100%rename from tests/test_pipelines/datetime.plxrename to tests/test_pipelines/concepts/datetime.plxdiff --git a/tests/test_pipelines/datetime.py b/tests/test_pipelines/concepts/datetime.pysimilarity index 75%rename from tests/test_pipelines/datetime.pyrename to tests/test_pipelines/concepts/datetime.pyindex 1cbb94df8..0358fb0ba 100644--- a/tests/test_pipelines/datetime.py+++ b/tests/test_pipelines/concepts/datetime.py@@ -1,6 +1,6 @@from datetime import datetime-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass DateTimeEvent(StructuredContent):diff --git a/tests/test_pipelines/concept_library/is_compatible_concept_code.plx b/tests/test_pipelines/concepts/is_compatible_concept_code.plxsimilarity index 100%rename from tests/test_pipelines/concept_library/is_compatible_concept_code.plxrename to tests/test_pipelines/concepts/is_compatible_concept_code.plxdiff --git a/tests/test_pipelines/concept_library/is_compatible_concept_code.py b/tests/test_pipelines/concepts/is_compatible_concept_code.pysimilarity index 95%rename from tests/test_pipelines/concept_library/is_compatible_concept_code.pyrename to tests/test_pipelines/concepts/is_compatible_concept_code.pyindex 88b8b43c9..8db193a47 100644--- a/tests/test_pipelines/concept_library/is_compatible_concept_code.py+++ b/tests/test_pipelines/concepts/is_compatible_concept_code.py@@ -1,6 +1,6 @@from pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass FundamentalsDoc(StructuredContent):diff --git a/tests/test_pipelines/test_structures_basic.plx b/tests/test_pipelines/concepts/test_structures_basic.plxsimilarity index 100%rename from tests/test_pipelines/test_structures_basic.plxrename to tests/test_pipelines/concepts/test_structures_basic.plxdiff --git a/tests/test_pipelines/test_structures_basic.py b/tests/test_pipelines/concepts/test_structures_basic.pysimilarity index 96%rename from tests/test_pipelines/test_structures_basic.pyrename to tests/test_pipelines/concepts/test_structures_basic.pyindex ec96eb1f3..5b6959e0d 100644--- a/tests/test_pipelines/test_structures_basic.py+++ b/tests/test_pipelines/concepts/test_structures_basic.py@@ -4,7 +4,7 @@ from datetime import datetimefrom pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.tools.typing.pydantic_utils import empty_list_factory_ofdiff --git a/tests/test_pipelines/test_structures_complex.plx b/tests/test_pipelines/concepts/test_structures_complex.plxsimilarity index 100%rename from tests/test_pipelines/test_structures_complex.plxrename to tests/test_pipelines/concepts/test_structures_complex.plxdiff --git a/tests/test_pipelines/test_structures_complex.py b/tests/test_pipelines/concepts/test_structures_complex.pysimilarity index 91%rename from tests/test_pipelines/test_structures_complex.pyrename to tests/test_pipelines/concepts/test_structures_complex.pyindex 444b88661..fc5d60d68 100644--- a/tests/test_pipelines/test_structures_complex.py+++ b/tests/test_pipelines/concepts/test_structures_complex.py@@ -2,9 +2,9 @@ from __future__ import annotationsfrom pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.tools.typing.pydantic_utils import empty_list_factory_of-from tests.test_pipelines.test_structures_basic import ConceptWithOptionals, ConceptWithSimpleStructure+from tests.test_pipelines.concepts.test_structures_basic import ConceptWithOptionals, ConceptWithSimpleStructureclass ConceptWithDicts(StructuredContent):diff --git a/tests/test_pipelines/discord_newsletter.plx b/tests/test_pipelines/discord_newsletter.plxindex 96daac0eb..2a1fa937b 100644--- a/tests/test_pipelines/discord_newsletter.plx+++ b/tests/test_pipelines/discord_newsletter.plx@@ -24,8 +24,8 @@ description = "Select the appropriate summary pipe based on the channel name"inputs = { discord_channel_update = "DiscordChannelUpdate" }output = "ChannelSummary"expression = "discord_channel_update.name"-pipe_map = { "Introduce-Yourself" = "summarize_discord_channel_update_for_new_members" }-default_pipe_code = "summarize_discord_channel_update_general"+outcomes = { "Introduce-Yourself" = "summarize_discord_channel_update_for_new_members" }+default_outcome = "summarize_discord_channel_update_general"[pipe.summarize_discord_channel_update_for_new_members]type = "PipeLLM"diff --git a/tests/test_pipelines/discord_newsletter.py b/tests/test_pipelines/discord_newsletter.pyindex 5db051a2b..5bd123297 100644--- a/tests/test_pipelines/discord_newsletter.py+++ b/tests/test_pipelines/discord_newsletter.py@@ -1,6 +1,6 @@from pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.tools.typing.pydantic_utils import empty_list_factory_ofdiff --git a/tests/test_pipelines/misc_tests/test_structures.py b/tests/test_pipelines/misc_tests/test_structures.pyindex ea913265b..39ed957da 100644--- a/tests/test_pipelines/misc_tests/test_structures.py+++ b/tests/test_pipelines/misc_tests/test_structures.py@@ -1,4 +1,4 @@-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass Article(StructuredContent):diff --git a/tests/test_pipelines/pipe_controllers/pipe_batch/text_list.py b/tests/test_pipelines/pipe_controllers/pipe_batch/text_list.pyindex 242ee47a1..47672c1e5 100644--- a/tests/test_pipelines/pipe_controllers/pipe_batch/text_list.py+++ b/tests/test_pipelines/pipe_controllers/pipe_batch/text_list.py@@ -1,4 +1,5 @@-from pipelex.core.stuffs.stuff_content import ListContent, TextContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.text_content import TextContentclass TextList(ListContent[TextContent]):diff --git a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition.py b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition.pyindex ffc36a013..2cfd0c1e9 100644--- a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition.py+++ b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition.py@@ -1,6 +1,6 @@from pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass CategoryInput(StructuredContent):diff --git a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_1.plx b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_1.plxindex e45db4d88..749b655cd 100644--- a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_1.plx+++ b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_1.plx@@ -11,8 +11,9 @@ description = "Route based on category field"inputs = { input_data = "CategoryInput" }output = "native.Text"expression_template = "{{ input_data.category }}"+default_outcome = "continue"-[pipe.basic_condition_by_category.pipe_map]+[pipe.basic_condition_by_category.outcomes]small = "process_small"medium = "process_medium"large = "process_large"diff --git a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_2.plx b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_2.plxindex f43b025ef..b11255aa3 100644--- a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_2.plx+++ b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_2.plx@@ -11,8 +11,9 @@ description = "Route based on category field using expression"inputs = { input_data = "CategoryInput" }output = "native.Text"expression = "input_data.category"+default_outcome = "continue"-[pipe.basic_condition_by_category_2.pipe_map]+[pipe.basic_condition_by_category_2.outcomes]small = "process_small_2"medium = "process_medium_2"large = "process_large_2"diff --git a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_complex.plx b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_complex.plxindex 614601265..3a9893cc5 100644--- a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_complex.plx+++ b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_complex.plx@@ -14,8 +14,9 @@ description = "Primary routing by document type"inputs = { doc_request = "DocumentRequest", user_profile = "UserProfile" }output = "native.Text"expression_template = "{{ doc_request.document_type }}"+default_outcome = "continue"-[pipe.complex_document_processor.pipe_map]+[pipe.complex_document_processor.outcomes]technical = "technical_document_router"business = "business_document_router"legal = "legal_document_router"@@ -27,8 +28,9 @@ description = "Route technical documents by priority and user level"inputs = { doc_request = "DocumentRequest", user_profile = "UserProfile" }output = "native.Text"expression_template = "{% if doc_request.priority == 'urgent' %}urgent_tech{% elif user_profile.user_level == 'expert' and doc_request.complexity == 'high' %}expert_tech{% else %}standard_tech{% endif %}"+default_outcome = "continue"-[pipe.technical_document_router.pipe_map]+[pipe.technical_document_router.outcomes]urgent_tech = "urgent_technical_processor"expert_tech = "expert_technical_processor"standard_tech = "standard_technical_processor"@@ -40,8 +42,9 @@ description = "Route business documents by department and priority"inputs = { doc_request = "DocumentRequest", user_profile = "UserProfile" }output = "native.Text"expression_template = "{% if doc_request.priority == 'urgent' %}urgent_business{% elif user_profile.department == 'finance' %}finance_business{% elif user_profile.department == 'marketing' %}marketing_business{% else %}general_business{% endif %}"+default_outcome = "continue"-[pipe.business_document_router.pipe_map]+[pipe.business_document_router.outcomes]urgent_business = "urgent_business_processor"finance_business = "finance_business_processor"marketing_business = "marketing_business_processor"@@ -54,8 +57,9 @@ description = "Route legal documents by complexity and user level"inputs = { doc_request = "DocumentRequest", user_profile = "UserProfile" }output = "native.Text"expression_template = "{% if doc_request.complexity == 'high' and user_profile.user_level != 'beginner' %}complex_legal{% elif doc_request.language != 'english' %}international_legal{% else %}standard_legal{% endif %}"+default_outcome = "continue"-[pipe.legal_document_router.pipe_map]+[pipe.legal_document_router.outcomes]complex_legal = "complex_legal_processor"international_legal = "international_legal_processor"standard_legal = "standard_legal_processor"diff --git a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_complex.py b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_complex.pyindex 791c1ffe1..8c4959f77 100644--- a/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_complex.py+++ b/tests/test_pipelines/pipe_controllers/pipe_condition/pipe_condition_complex.py@@ -2,7 +2,7 @@ from typing import Literalfrom pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass DocumentRequest(StructuredContent):diff --git a/tests/test_pipelines/pipe_controllers/pipe_parallel/pipe_parallel.py b/tests/test_pipelines/pipe_controllers/pipe_parallel/pipe_parallel.pyindex fea75b4e8..bfa2496d6 100644--- a/tests/test_pipelines/pipe_controllers/pipe_parallel/pipe_parallel.py+++ b/tests/test_pipelines/pipe_controllers/pipe_parallel/pipe_parallel.py@@ -1,6 +1,6 @@from pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass DocumentInput(StructuredContent):diff --git a/tests/test_pipelines/pipe_controllers/pipe_sequence/pipe_sequence.py b/tests/test_pipelines/pipe_controllers/pipe_sequence/pipe_sequence.pyindex d1f6dcdaf..132088b46 100644--- a/tests/test_pipelines/pipe_controllers/pipe_sequence/pipe_sequence.py+++ b/tests/test_pipelines/pipe_controllers/pipe_sequence/pipe_sequence.py@@ -1,6 +1,6 @@from pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass Document(StructuredContent):diff --git a/tests/test_pipelines/pipe_llm_prompt.py b/tests/test_pipelines/pipe_llm_prompt.pydeleted file mode 100644index 3464df296..000000000--- a/tests/test_pipelines/pipe_llm_prompt.py+++ /dev/null@@ -1,64 +0,0 @@-from typing import Literal--from pydantic import Field--from pipelex.core.stuffs.stuff_content import StructuredContent-from pipelex.types import StrEnum---class MusicGenre(StrEnum):- """Available music genres."""-- CLASSICAL = "classical"- JAZZ = "jazz"- ROCK = "rock"- ELECTRONIC = "electronic"- WORLD = "world"---class MusicCategoryContent(StructuredContent):- """A content class with a Literal field for music genres."""-- category: Literal[- MusicGenre.CLASSICAL,- MusicGenre.JAZZ,- MusicGenre.ROCK,- MusicGenre.ELECTRONIC,- MusicGenre.WORLD,- ] = Field(description="The genre of music")---class SimpleTextContent(StructuredContent):- """A simple text content class for testing."""-- text: str = Field(description="The text content")---class SimpleStructuredContent(StructuredContent):- """A structured content class with primitive types."""-- name: str = Field(description="The name of the content")- value: int = Field(description="The numeric value")- is_active: bool = Field(description="Whether the content is active")---class DocumentTypeContent(StructuredContent):- """A content class with enum fields."""-- title: str = Field(description="The document title")- status: str = Field(description="The document status")---class PersonContent(StructuredContent):- """A complex nested content with various types."""-- name: str = Field(description="The person's name")- age: int = Field(description="The person's age")- address: str = Field(description="The person's address")---class ComplexListContent(StructuredContent):- """A content class with list fields."""-- items: list[str] = Field(description="List of items")- tags: list[str] = Field(description="List of tags")diff --git a/tests/test_pipelines/pipe_operators/__init__.py b/tests/test_pipelines/pipe_operators/__init__.pynew file mode 100644index 000000000..254dcf49c--- /dev/null+++ b/tests/test_pipelines/pipe_operators/__init__.py@@ -0,0 +1 @@+"""Test pipelines for pipe operators."""diff --git a/tests/test_pipelines/pipe_operators/pipe_llm_vision.plx b/tests/test_pipelines/pipe_operators/pipe_llm_vision.plxnew file mode 100644index 000000000..a1bf95eb1--- /dev/null+++ b/tests/test_pipelines/pipe_operators/pipe_llm_vision.plx@@ -0,0 +1,54 @@+domain = "pipe_llm_vision"+description = "Test PipeLLM with vision capabilities"++[concept]+VisionAnalysis = "Some analysis based on the image"+BasicDescription = "Basic description of the image"++[pipe.describe_image]+type = "PipeLLM"+description = "Describe what is in the image"+inputs = { image = "Image" }+output = "Text"+llm = "llm_for_testing_vision"+prompt_template = """+Describe what you see in this image in 1-2 sentences, be concise.+$image+"""++[pipe.describe_image_number_1_only]+type = "PipeLLM"+description = "Describe what is in the image"+inputs = { imageA = "Image", imageB = "Image" }+output = "BasicDescription"+llm = "llm_to_extract_diagram"+prompt_template = """+Describe what you see in $imageA only.+Completely ignore $imageB.+"""++[pipe.describe_image_number_2_only]+type = "PipeLLM"+description = "Describe what is in the image"+inputs = { imageA = "Image", imageB = "Image" }+output = "BasicDescription"+llm = "llm_to_extract_diagram"+prompt_template = """+Describe what you see in $imageB only.+Completely ignore $imageA.+"""+++[pipe.vision_analysis]+type = "PipeLLM"+description = "Provide detailed analysis of the image"+inputs = { image = "images.Photo" }+output = "VisionAnalysis"+llm = "llm_to_extract_diagram"+system_prompt = "You are an expert image analyst. Provide detailed, accurate descriptions."+prompt_template = """+Analyze this image and describe what's the main topic etc.+$image+--------------------------------+"""+diff --git a/tests/test_pipelines/pipe_operators/pipe_llm_vision.py b/tests/test_pipelines/pipe_operators/pipe_llm_vision.pynew file mode 100644index 000000000..4a813afcb--- /dev/null+++ b/tests/test_pipelines/pipe_operators/pipe_llm_vision.py@@ -0,0 +1,17 @@+from pydantic import Field++from pipelex.core.stuffs.structured_content import StructuredContent+++class BasicDescription(StructuredContent):+ """Basic description of the image."""++ description: str = Field(description="Concise description of the image")+++class VisionAnalysis(StructuredContent):+ """Structured analysis of visual content from an image."""++ main_subject: str = Field(description="The primary subject or focus of the image")+ category: str = Field(description="The category of the image")+ description: str = Field(description="Concise description of the image")diff --git a/tests/test_pipelines/test_content_factory.py b/tests/test_pipelines/test_content_factory.pyindex d40a2cb5e..91df7608f 100644--- a/tests/test_pipelines/test_content_factory.py+++ b/tests/test_pipelines/test_content_factory.py@@ -1,4 +1,4 @@-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass MockRegisteredContent(StructuredContent):diff --git a/tests/test_pipelines/test_file_func_registry.py b/tests/test_pipelines/test_file_func_registry.pyindex b4cdc6168..714678249 100644--- a/tests/test_pipelines/test_file_func_registry.py+++ b/tests/test_pipelines/test_file_func_registry.py@@ -1,7 +1,8 @@from pydantic import Fieldfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.stuffs.stuff_content import ListContent, StructuredContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.structured_content import StructuredContentclass FilePath(StructuredContent):diff --git a/tests/test_pipelines/test_tweet.py b/tests/test_pipelines/test_tweet.pyindex b96b842dd..51df37c10 100644--- a/tests/test_pipelines/test_tweet.py+++ b/tests/test_pipelines/test_tweet.py@@ -1,4 +1,4 @@-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.stuffs.text_content import TextContentclass OptimizedTweet(TextContent):diff --git a/tests/test_pipelines/tricky_questions.py b/tests/test_pipelines/tricky_questions.pyindex b591b8c21..20f52f5b1 100644--- a/tests/test_pipelines/tricky_questions.py+++ b/tests/test_pipelines/tricky_questions.py@@ -1,4 +1,4 @@-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass ThoughtfulAnswer(StructuredContent):diff --git a/tests/unit/pipelex/client/test_api_serialization.py b/tests/unit/pipelex/client/test_api_serialization.pyindex c2e3dab20..0703bd211 100644--- a/tests/unit/pipelex/client/test_api_serialization.py+++ b/tests/unit/pipelex/client/test_api_serialization.py@@ -12,9 +12,10 @@ from pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.memory.working_memory import WorkingMemoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.stuffs.stuff_content import NumberContent, TextContent+from pipelex.core.stuffs.number_content import NumberContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory-from tests.test_pipelines.datetime import DateTimeEvent+from pipelex.core.stuffs.text_content import TextContent+from tests.test_pipelines.concepts.datetime import DateTimeEvent# Test models for complex scenariosdiff --git a/tests/unit/pipelex/core/bundles/test_data_pipe_sorter.py b/tests/unit/pipelex/core/bundles/test_data_pipe_sorter.pyindex 7a45b885e..100f32552 100644--- a/tests/unit/pipelex/core/bundles/test_data_pipe_sorter.py+++ b/tests/unit/pipelex/core/bundles/test_data_pipe_sorter.py@@ -136,11 +136,11 @@ class PipeSorterTestCases:inputs={},output="Text",expression="category",- pipe_map={+ outcomes={"small": "process_small","large": "process_large",},- default_pipe_code="process_default",+ default_outcome="process_default",),"process_large": PipeLLMBlueprint(type="PipeLLM", category="PipeOperator", description="Large", inputs={}, output="Text"),"process_small": PipeLLMBlueprint(type="PipeLLM", category="PipeOperator", description="Small", inputs={}, output="Text"),@@ -282,11 +282,11 @@ class PipeSorterTestCases:inputs={"prepared": "Text"},output="Text",expression="size",- pipe_map={+ outcomes={"small": "process_small","large": "process_large",},- default_pipe_code="process_default",+ default_outcome="process_default",),# LLM operators"prepare_data": PipeLLMBlueprint(diff --git a/tests/unit/pipelex/core/concepts/concept_library/test_concept_library.py b/tests/unit/pipelex/core/concepts/concept_library/test_concept_library.pyindex c1c4432c5..519e97cee 100644--- a/tests/unit/pipelex/core/concepts/concept_library/test_concept_library.py+++ b/tests/unit/pipelex/core/concepts/concept_library/test_concept_library.py@@ -1,12 +1,12 @@from pipelex.core.concepts.concept_blueprint import ConceptBlueprintfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum-from pipelex.hub import get_concept_provider+from pipelex.hub import get_concept_libraryclass TestConceptLibrary:def test_is_image_concept(self):- concept_library = get_concept_provider()+ concept_library = get_concept_library()native_image_concept = ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.IMAGE])concept_1 = ConceptFactory.make_from_blueprint(diff --git a/tests/unit/pipelex/core/concepts/data.py b/tests/unit/pipelex/core/concepts/data.pyindex 22a0656ff..dbf524646 100644--- a/tests/unit/pipelex/core/concepts/data.py+++ b/tests/unit/pipelex/core/concepts/data.py@@ -2,7 +2,10 @@from typing import ClassVar-from pipelex.core.stuffs.stuff_content import ImageContent, StructuredContent, TextContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.structured_content import StructuredContent+from pipelex.core.stuffs.text_content import TextContent# Test structures@@ -53,8 +56,84 @@ class PersonWithOptionalImage(StructuredContent):photo: ImageContent | None = None+class GalleryWithImageList(StructuredContent):+ """A gallery with a list of images."""++ title: TextContent+ photos: list[ImageContent]+++class PersonWithImageTuple(StructuredContent):+ """A person with a tuple of images (before/after photos)."""++ name: TextContent+ before_after: tuple[ImageContent, ImageContent]+++class PhotoAlbumItem(StructuredContent):+ """An item in a photo album with nested image."""++ photo: ImageContent+ caption: TextContent+++class PhotoAlbumWithNestedImages(StructuredContent):+ """A photo album with a list of items that contain nested images."""++ title: TextContent+ album_items: list[PhotoAlbumItem]+++class MediaFrame(StructuredContent):+ """A frame containing an image."""++ frame_image: ImageContent+ border_style: TextContent+++class MediaSection(StructuredContent):+ """A section with multiple frames."""++ section_title: TextContent+ frames: list[MediaFrame]+++class MediaCollection(StructuredContent):+ """A collection with sections and thumbnails."""++ collection_name: TextContent+ thumbnail: ImageContent+ sections: list[MediaSection]+++class ComplexNestedGallery(StructuredContent):+ """A deeply nested gallery structure.++ Structure: list[tuple[MediaCollection, list[PhotoAlbumItem]]]+ This tests:+ - list containing tuples+ - tuples containing objects with nested images+ - objects containing lists of objects with images+ - multiple levels of nesting (4+ levels deep)+ """++ title: TextContent+ # Each gallery entry is a tuple of (collection, album_items)+ # collection has: thumbnail + sections -> frames -> frame_image+ # album_items are PhotoAlbumItem with photo field+ gallery_entries: list[tuple[MediaCollection, list[PhotoAlbumItem]]]+++class GalleryWithListContent(StructuredContent):+ """A gallery using ListContent to hold items with nested images."""++ title: TextContent+ # ListContent containing items with images+ album_list: ListContent[PhotoAlbumItem]++class TestData:- """Test data for find_image_field_paths tests."""+ """Test data for find_nested_image_fields_in_structure_class tests."""DOMAIN: ClassVar[str] = "test_images"@@ -65,3 +144,29 @@ class TestData:COMPANY_NAME: ClassVar[TextContent] = TextContent(text="Tech Corp")LOGO_IMAGE: ClassVar[ImageContent] = ImageContent(url="https://example.com/logo.png", base_64="logobase64")TITLE_TEXT: ClassVar[TextContent] = TextContent(text="Company Profile")++ # Test cases for image field search: (concept_code, expected_image_paths)+ IMAGE_FIELD_TEST_CASES: ClassVar[list[tuple[str, list[str]]]] = [+ # Direct image field+ ("PersonWithDirectImage", ["photo"]),+ # Refined image field (ProfilePhoto refines Image)+ ("PersonWithRefinedImage", ["profile_photo"]),+ # No image fields+ ("PersonWithText", []),+ # Nested image field+ ("CompanyInfo", ["ceo.photo"]),+ # Multiple levels with multiple images+ ("NestedComplex", ["company.ceo.photo", "logo"]),+ # Optional image field+ ("PersonWithOptionalImage", ["photo"]),+ # List of images+ ("GalleryWithImageList", ["photos"]),+ # Tuple of images+ ("PersonWithImageTuple", ["before_after"]),+ # List with nested images in items+ ("PhotoAlbumWithNestedImages", ["album_items"]),+ # Complex deeply nested structure+ ("ComplexNestedGallery", ["gallery_entries"]),+ # ListContent with nested images+ ("GalleryWithListContent", ["album_list"]),+ ]diff --git a/tests/unit/pipelex/core/concepts/test_concept_find_image_field_paths.py b/tests/unit/pipelex/core/concepts/test_concept_find_image_field_paths.pyindex b6e2804e3..f5ced9000 100644--- a/tests/unit/pipelex/core/concepts/test_concept_find_image_field_paths.py+++ b/tests/unit/pipelex/core/concepts/test_concept_find_image_field_paths.py@@ -1,19 +1,32 @@+from typing import TYPE_CHECKING+import pytest-from pipelex.core.concepts.concept import Concept # noqa: TC001from pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NativeConceptEnum-from pipelex.core.stuffs.stuff_content import StructuredContent-from pipelex.hub import get_concept_provider, get_native_concept+from pipelex.core.stuffs.structured_content import StructuredContent+from pipelex.hub import get_concept_library, get_native_concept, get_required_conceptfrom pipelex.tools.class_registry_utils import ClassRegistryUtilsfrom tests.unit.pipelex.core.concepts import datafrom tests.unit.pipelex.core.concepts.data import TestData+if TYPE_CHECKING:+ from pipelex.core.concepts.concept import Concept+@pytest.fixture(scope="module", autouse=True)def register_test_concepts():- """Register test concepts for the module."""- concept_provider = get_concept_provider()+ """Register test concepts for the module.++ This fixture:+ 1. Registers test structure classes in the class registry+ 2. Creates and registers test concepts in the concept library+ 3. Yields to run tests+ 4. Cleans up by removing test concepts from the library++ The cleanup ensures test isolation between modules.+ """+ concept_library = get_concept_library()# Register the test structure classesClassRegistryUtils.register_classes_in_file(@@ -22,178 +35,111 @@ def register_test_concepts():is_include_imported=False,)- # Create and register concepts- concepts_to_register: list[Concept] = []-- # ProfilePhoto concept that refines Image- profile_photo_concept = ConceptFactory.make(- domain=TestData.DOMAIN,- concept_code="ProfilePhoto",- description="A profile photo",- structure_class_name="ProfilePhoto",- refines=f"native.{NativeConceptEnum.IMAGE}",- )- concepts_to_register.append(profile_photo_concept)-- # PersonWithDirectImage concept- person_direct_concept = ConceptFactory.make(- domain=TestData.DOMAIN,- concept_code="PersonWithDirectImage",- description="A person with a direct image field",- structure_class_name="PersonWithDirectImage",- )- concepts_to_register.append(person_direct_concept)-- # PersonWithRefinedImage concept- person_refined_concept = ConceptFactory.make(- domain=TestData.DOMAIN,- concept_code="PersonWithRefinedImage",- description="A person with a refined image field",- structure_class_name="PersonWithRefinedImage",- )- concepts_to_register.append(person_refined_concept)-- # PersonWithText concept- person_text_concept = ConceptFactory.make(- domain=TestData.DOMAIN,- concept_code="PersonWithText",- description="A person with only text",- structure_class_name="PersonWithText",- )- concepts_to_register.append(person_text_concept)-- # CompanyInfo concept- company_concept = ConceptFactory.make(- domain=TestData.DOMAIN,- concept_code="CompanyInfo",- description="Company information",- structure_class_name="CompanyInfo",- )- concepts_to_register.append(company_concept)-- # NestedComplex concept- nested_concept = ConceptFactory.make(- domain=TestData.DOMAIN,- concept_code="NestedComplex",- description="Complex nested structure",- structure_class_name="NestedComplex",- )- concepts_to_register.append(nested_concept)-- # PersonWithOptionalImage concept- person_optional_concept = ConceptFactory.make(- domain=TestData.DOMAIN,- concept_code="PersonWithOptionalImage",- description="A person with optional image",- structure_class_name="PersonWithOptionalImage",- )- concepts_to_register.append(person_optional_concept)+ # Define concept specifications: (code, description, structure_class_name, refines)+ concept_specs: list[tuple[str, str, str, str | None]] = [+ ("ProfilePhoto", "A profile photo", "ProfilePhoto", f"native.{NativeConceptEnum.IMAGE}"),+ ("PersonWithDirectImage", "A person with a direct image field", "PersonWithDirectImage", None),+ ("PersonWithRefinedImage", "A person with a refined image field", "PersonWithRefinedImage", None),+ ("PersonWithText", "A person with only text", "PersonWithText", None),+ ("CompanyInfo", "Company information", "CompanyInfo", None),+ ("NestedComplex", "Complex nested structure", "NestedComplex", None),+ ("PersonWithOptionalImage", "A person with optional image", "PersonWithOptionalImage", None),+ ("GalleryWithImageList", "A gallery with a list of images", "GalleryWithImageList", None),+ ("PersonWithImageTuple", "A person with a tuple of images", "PersonWithImageTuple", None),+ ("PhotoAlbumItem", "An item in a photo album", "PhotoAlbumItem", None),+ ("PhotoAlbumWithNestedImages", "A photo album with nested images in list items", "PhotoAlbumWithNestedImages", None),+ ("MediaFrame", "A frame containing an image", "MediaFrame", None),+ ("MediaSection", "A section with multiple frames", "MediaSection", None),+ ("MediaCollection", "A collection with sections and thumbnails", "MediaCollection", None),+ ("ComplexNestedGallery", "A deeply nested gallery structure", "ComplexNestedGallery", None),+ ("GalleryWithListContent", "A gallery using ListContent", "GalleryWithListContent", None),+ ]- # Add all concepts to the provider- concept_provider.add_concepts(concepts_to_register)-- # Cleanup after tests (optional)---class TestConceptFindImageFieldPaths:- """Test ConceptLibrary.find_image_field_paths() method."""-- def test_direct_image_field(self):- """Test finding a direct image field."""- # Get concept- concept = get_concept_provider().get_required_concept(f"{TestData.DOMAIN}.PersonWithDirectImage")-- # Find image paths- image_paths = get_concept_provider().find_image_field_paths(concept=concept)-- # Assert- assert len(image_paths) == 1- assert "photo" in image_paths-- def test_refined_image_field(self):- """Test finding an image field that uses a concept refining Image."""- # Get concept- concept = get_concept_provider().get_required_concept(f"{TestData.DOMAIN}.PersonWithRefinedImage")+ # Create and register concepts+ concepts_to_register: list[Concept] = [+ ConceptFactory.make(+ domain=TestData.DOMAIN,+ concept_code=code,+ description=description,+ structure_class_name=structure_class_name,+ refines=refines,+ )+ for code, description, structure_class_name, refines in concept_specs+ ]- # Find image paths- image_paths = get_concept_provider().find_image_field_paths(concept=concept)+ # Add all concepts to the library+ concept_library.add_concepts(concepts_to_register)- # Assert- assert len(image_paths) == 1- assert "profile_photo" in image_paths+ # Yield to run tests+ yield- def test_no_image_fields(self):- """Test with content that has no image fields."""- # Get concept- concept = get_concept_provider().get_required_concept(f"{TestData.DOMAIN}.PersonWithText")+ # Cleanup: Remove test concepts from library+ concept_strings = [concept.concept_string for concept in concepts_to_register]+ concept_library.remove_concepts_by_codes(concept_strings)- # Find image paths- image_paths = get_concept_provider().find_image_field_paths(concept=concept)- # Assert- assert len(image_paths) == 0+class TestConceptFindImageFieldPaths:+ """Test Concept.search_for_nested_image_fields_in_structure_class() method."""- def test_nested_image_field(self):- """Test finding image fields in nested structures."""+ @pytest.mark.parametrize(+ ("concept_code", "expected_paths"),+ TestData.IMAGE_FIELD_TEST_CASES,+ ids=[case[0] for case in TestData.IMAGE_FIELD_TEST_CASES],+ )+ def test_find_image_fields(self, concept_code: str, expected_paths: list[str]):+ """Test finding image fields in various structure classes.++ This parametrized test covers:+ - Direct image fields+ - Refined image fields (concepts that refine Image)+ - No image fields+ - Nested image fields at various depths+ - Multiple image fields at different levels+ - Optional image fields+ - Lists of images+ - Tuples of images+ - Lists with nested structures containing images+ - Complex deeply nested structures+ - ListContent with nested images++ Args:+ concept_code: The code of the concept to test+ expected_paths: The expected list of image field paths+ """# Get concept- concept = get_concept_provider().get_required_concept(f"{TestData.DOMAIN}.CompanyInfo")+ concept = get_required_concept(f"{TestData.DOMAIN}.{concept_code}")# Find image paths- image_paths = get_concept_provider().find_image_field_paths(concept=concept)-- # Assert- assert len(image_paths) == 1- assert "ceo.photo" in image_paths+ image_paths = concept.search_for_nested_image_fields_in_structure_class()- def test_multiple_nested_levels_with_multiple_images(self):- """Test finding multiple image fields at different nesting levels."""- # Get concept- concept = get_concept_provider().get_required_concept(f"{TestData.DOMAIN}.NestedComplex")-- # Find image paths- image_paths = get_concept_provider().find_image_field_paths(concept=concept)+ # Assert exact match of paths (order-independent)+ assert sorted(image_paths) == sorted(expected_paths), f"Expected paths {sorted(expected_paths)}, but got {sorted(image_paths)}"- # Assert - should find both the logo and the nested CEO photo- assert len(image_paths) == 2- assert "logo" in image_paths- assert "company.ceo.photo" in image_paths+ def test_direct_image_concept(self):+ """Test with a concept that is directly an Image.- def test_optional_image_field_with_value(self):- """Test finding an optional image field that has a value."""+ The native Image concept itself should return empty paths because+ the concept is an image, not a structured type with image fields.+ """# Get concept- concept = get_concept_provider().get_required_concept(f"{TestData.DOMAIN}.PersonWithOptionalImage")+ concept = get_native_concept(NativeConceptEnum.IMAGE)# Find image paths- image_paths = get_concept_provider().find_image_field_paths(concept=concept)+ image_paths = concept.search_for_nested_image_fields_in_structure_class()- # Assert- assert len(image_paths) == 1- assert "photo" in image_paths+ # Assert - should return empty because the concept itself is an image+ assert image_paths == []- def test_optional_image_field_without_value(self):- """Test finding an optional image field that is None.+ def test_native_text_and_images_content(self):+ """Test the native TextAndImagesContent which has list[ImageContent] | None.- Note: Since find_image_field_paths() works at the concept/class level (not instance level),- it returns all fields typed as Images, regardless of whether they have values in a specific instance.+ This tests the native concept that combines text and images."""- # Get concept- concept = get_concept_provider().get_required_concept(f"{TestData.DOMAIN}.PersonWithOptionalImage")-- # Find image paths- image_paths = get_concept_provider().find_image_field_paths(concept=concept)-- # Assert - should find the photo field even though it's None in this instance- # because we're analyzing the class structure, not instance values- assert len(image_paths) == 1- assert "photo" in image_paths-- def test_direct_image_concept(self):- """Test with a concept that is directly an Image."""- # Get concept- concept = get_native_concept(NativeConceptEnum.IMAGE)+ # Get the native TextAndImages concept+ concept = get_native_concept(NativeConceptEnum.TEXT_AND_IMAGES)# Find image paths- image_paths = get_concept_provider().find_image_field_paths(concept=concept)+ image_paths = concept.search_for_nested_image_fields_in_structure_class()- # Assert - should return empty because the concept itself is an image, not a structured type with image fields- assert len(image_paths) == 0+ # Assert - should find the images field which is list[ImageContent] | None+ assert image_paths == ["images"]diff --git a/tests/unit/pipelex/core/concepts/test_structured_output_generator.py b/tests/unit/pipelex/core/concepts/test_structured_output_generator.pyindex 2d07b17c3..eb50395d3 100644--- a/tests/unit/pipelex/core/concepts/test_structured_output_generator.py+++ b/tests/unit/pipelex/core/concepts/test_structured_output_generator.py@@ -4,7 +4,7 @@ from pipelex import pretty_printfrom pipelex.core.concepts.concept_blueprint import ConceptStructureBlueprint, ConceptStructureBlueprintFieldTypefrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.structure_generator import ConceptStructureValidationError, StructureGenerator-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass TestStructureGenerator:@@ -29,7 +29,7 @@ class TestStructureGenerator:# Check the complete generated structureexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -74,7 +74,7 @@ class TestStructureGenerator:# Check the complete generated structureexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -105,7 +105,7 @@ class TestStructureGenerator:# Check the complete generated structure with Literal typesexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -130,7 +130,7 @@ class TestStructureGenerator:# Check the complete generated structure for empty modelexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -156,7 +156,7 @@ class TestStructureGenerator:# Check the complete generated structureexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -182,7 +182,7 @@ class TestStructureGenerator:# Check the complete generated structureexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -223,7 +223,7 @@ class TestStructureGenerator:# Check the complete generated structure with all field typesexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -254,7 +254,7 @@ class TestStructureGenerator:# Check the complete generated structure with required vs optional fieldsexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -297,7 +297,7 @@ class TestStructureGenerator:# Check the complete generated structure with default valuesexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -341,7 +341,7 @@ class TestStructureGenerator:# Check the complete generated structure with nested list typesexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -388,7 +388,7 @@ class TestStructureGenerator:# Check the complete generated structure with nested dict typesexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -441,7 +441,7 @@ class TestStructureGenerator:# Check the complete generated structure with mixed complexityexpected_result = ("from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -482,7 +482,7 @@ class TestStructureGenerator:expected_result = ("from datetime import datetime\n""from enum import Enum\n"- "from pipelex.core.stuffs.stuff_content import StructuredContent\n"+ "from pipelex.core.stuffs.structured_content import StructuredContent\n""from pydantic import Field\n""from typing import Optional, List, Dict, Any, Literal\n""\n\n"@@ -523,7 +523,7 @@ class TestStructureGenerator:generator = StructureGenerator()invalid_code = """from pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass InvalidModel(StructuredContent):name: str = Field(..., description="Name field" # Missing closing parenthesis@@ -537,7 +537,7 @@ class InvalidModel(StructuredContent):generator = StructureGenerator()code_without_expected_class = """from pydantic import Field-from pipelex.core.stuffs.stuff_content import StructuredContent+from pipelex.core.stuffs.structured_content import StructuredContentclass WrongClassName(StructuredContent):name: str = Field(..., description="Name field")diff --git a/tests/unit/pipelex/core/memory/test_dry_working_memory.py b/tests/unit/pipelex/core/memory/test_dry_working_memory.pyindex 620b70b64..0692d920b 100644--- a/tests/unit/pipelex/core/memory/test_dry_working_memory.py+++ b/tests/unit/pipelex/core/memory/test_dry_working_memory.py@@ -4,8 +4,9 @@ from pipelex import logfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NativeConceptEnumfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.pipes.pipe_input import TypedNamedInputRequirement-from pipelex.core.stuffs.stuff_content import PageContent, TextContent+from pipelex.core.pipes.input_requirements import TypedNamedInputRequirement+from pipelex.core.stuffs.page_content import PageContent+from pipelex.core.stuffs.text_content import TextContentfrom tests.test_pipelines.tricky_questions import ThoughtfulAnswerdiff --git a/tests/unit/pipelex/core/memory/test_working_memory.py b/tests/unit/pipelex/core/memory/test_working_memory.pyindex 4353754fc..f187b04c9 100644--- a/tests/unit/pipelex/core/memory/test_working_memory.py+++ b/tests/unit/pipelex/core/memory/test_working_memory.py@@ -7,8 +7,13 @@ from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConfrom pipelex.core.domains.domain import SpecialDomainfrom pipelex.core.memory.working_memory import MAIN_STUFF_NAME, WorkingMemoryfrom pipelex.core.memory.working_memory_factory import WorkingMemoryFactory-from pipelex.core.stuffs.stuff_content import HtmlContent, ImageContent, ListContent, NumberContent, TextAndImagesContent, TextContent+from pipelex.core.stuffs.html_content import HtmlContent+from pipelex.core.stuffs.image_content import ImageContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.number_content import NumberContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory+from pipelex.core.stuffs.text_and_images_content import TextAndImagesContent+from pipelex.core.stuffs.text_content import TextContentclass TestWorkingMemoryData:diff --git a/tests/unit/pipelex/core/pipes/data.py b/tests/unit/pipelex/core/pipes/data.pyindex 47ebe9c73..8c41ac690 100644--- a/tests/unit/pipelex/core/pipes/data.py+++ b/tests/unit/pipelex/core/pipes/data.py@@ -1,4 +1,4 @@-from pipelex.core.pipes.pipe_run_params import OutputMultiplicityResolution, PipeOutputMultiplicity+from pipelex.pipe_run.pipe_run_params import OutputMultiplicityResolution, PipeOutputMultiplicity# Test cases format: (nb_output, multiple_output, expected_result, test_description)MAKE_OUTPUT_MULTIPLICITY_TEST_CASES: list[tuple[int | None, bool | None, PipeOutputMultiplicity | None, str]] = [diff --git a/tests/unit/pipelex/core/pipes/test_pipe_run_params.py b/tests/unit/pipelex/core/pipes/test_pipe_run_params.pyindex 76bc00062..43e14a3ec 100644--- a/tests/unit/pipelex/core/pipes/test_pipe_run_params.py+++ b/tests/unit/pipelex/core/pipes/test_pipe_run_params.py@@ -1,6 +1,6 @@import pytest-from pipelex.core.pipes.pipe_run_params import (+from pipelex.pipe_run.pipe_run_params import (OutputMultiplicityResolution,PipeOutputMultiplicity,make_output_multiplicity,diff --git a/tests/unit/pipelex/core/stuffs/test_stuff_content_factory.py b/tests/unit/pipelex/core/stuffs/test_stuff_content_factory.pyindex 4a106ef07..61d9dbece 100644--- a/tests/unit/pipelex/core/stuffs/test_stuff_content_factory.py+++ b/tests/unit/pipelex/core/stuffs/test_stuff_content_factory.py@@ -6,8 +6,9 @@ from pipelex import logfrom pipelex.core.concepts.concept_factory import ConceptFactoryfrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnumfrom pipelex.core.domains.domain import SpecialDomain-from pipelex.core.stuffs.stuff_content import StructuredContent, TextContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.core.stuffs.stuff_factory import StuffContentFactory+from pipelex.core.stuffs.text_content import TextContentclass TestCases:diff --git a/tests/unit/pipelex/core/stuffs/test_stuff_factory_make_stuff_from_content.py b/tests/unit/pipelex/core/stuffs/test_stuff_factory_make_stuff_from_content.pyindex 95507fcb3..165bd73c2 100644--- a/tests/unit/pipelex/core/stuffs/test_stuff_factory_make_stuff_from_content.py+++ b/tests/unit/pipelex/core/stuffs/test_stuff_factory_make_stuff_from_content.py@@ -4,14 +4,12 @@ import pytestfrom pytest_mock import MockerFixturefrom pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.structured_content import StructuredContentfrom pipelex.core.stuffs.stuff import Stuff-from pipelex.core.stuffs.stuff_content import (- ListContent,- StructuredContent,- StuffContent,- TextContent,-)+from pipelex.core.stuffs.stuff_content import StuffContentfrom pipelex.core.stuffs.stuff_factory import StuffFactory, StuffFactoryError+from pipelex.core.stuffs.text_content import TextContentclass MockCustomContent(StructuredContent):@@ -229,7 +227,8 @@ class TestMakeStuffFromStuffContentUsingSearchDomains:def test_dict_with_custom_concept_and_stuffcontent_value(self, mocker: MockerFixture):"""Test dictionary with custom concept and StuffContent as content value."""- mock_provider = mocker.patch("pipelex.core.stuffs.stuff_factory.get_concept_provider").return_value+ # Patch where it's used (stuff_factory imports from hub), not where it's defined+ mock_provider = mocker.patch("pipelex.core.stuffs.stuff_factory.get_concept_library").return_valuemock_concept = mocker.Mock()mock_provider.get_required_concept.return_value = mock_concept@@ -251,7 +250,8 @@ class TestMakeStuffFromStuffContentUsingSearchDomains:def test_dict_with_custom_concept_and_dict_value(self, mocker: MockerFixture):"""Test dictionary with custom concept and dict as content value."""- mock_provider = mocker.patch("pipelex.core.stuffs.stuff_factory.get_concept_provider").return_value+ # Patch where it's used (stuff_factory imports from hub), not where it's defined+ mock_provider = mocker.patch("pipelex.core.stuffs.stuff_factory.get_concept_library").return_valuemock_concept = mocker.Mock()mock_provider.get_required_concept.return_value = mock_concept@@ -278,7 +278,8 @@ class TestMakeStuffFromStuffContentUsingSearchDomains:def test_dict_with_concept_code_field(self, mocker: MockerFixture):"""Test dictionary with concept_code field instead of concept."""- mock_provider = mocker.patch("pipelex.core.stuffs.stuff_factory.get_concept_provider").return_value+ # Patch where it's used (stuff_factory imports from hub), not where it's defined+ mock_provider = mocker.patch("pipelex.core.stuffs.stuff_factory.get_concept_library").return_valuemock_concept = mocker.Mock()mock_provider.get_required_concept.return_value = mock_conceptdiff --git a/tests/unit/pipelex/core/test_data/pipes/controllers/condition/pipe_condition.py b/tests/unit/pipelex/core/test_data/pipes/controllers/condition/pipe_condition.pyindex 9c8478218..0cc07de55 100644--- a/tests/unit/pipelex/core/test_data/pipes/controllers/condition/pipe_condition.py+++ b/tests/unit/pipelex/core/test_data/pipes/controllers/condition/pipe_condition.py@@ -1,5 +1,6 @@from pipelex.core.bundles.pipelex_bundle_blueprint import PipelexBundleBlueprintfrom pipelex.pipe_controllers.condition.pipe_condition_blueprint import PipeConditionBlueprint+from pipelex.pipe_controllers.condition.special_outcome import SpecialOutcomePIPE_CONDITION = ("pipe_condition",@@ -11,7 +12,8 @@ type = "PipeCondition"description = "Process based on condition"output = "ProcessedData"expression = "input_data.category"-pipe_map = { small = "process_small", large = "process_large" }+outcomes = { small = "process_small", large = "process_large" }+default_outcome = "continue"""",PipelexBundleBlueprint(domain="test_pipes",@@ -22,10 +24,11 @@ pipe_map = { small = "process_small", large = "process_large" }description="Process based on condition",output="ProcessedData",expression="input_data.category",- pipe_map={+ outcomes={"small": "process_small","large": "process_large",},+ default_outcome=SpecialOutcome.CONTINUE,),},),diff --git a/tests/unit/pipelex/core/test_data/pipes/operators/llm/pipe_llm.py b/tests/unit/pipelex/core/test_data/pipes/operators/llm/pipe_llm.pyindex 5e63c837b..f8b2ec2ef 100644--- a/tests/unit/pipelex/core/test_data/pipes/operators/llm/pipe_llm.py+++ b/tests/unit/pipelex/core/test_data/pipes/operators/llm/pipe_llm.py@@ -1,7 +1,7 @@# ruff: noqa: E501from pipelex.core.bundles.pipelex_bundle_blueprint import PipelexBundleBlueprintfrom pipelex.core.concepts.concept_native import NativeConceptEnum-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.pipe_operators.llm.pipe_llm_blueprint import PipeLLMBlueprint# Basic PipeLLM with prompt_templatediff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_batch/test_data.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_batch/test_data.pyindex 54369a289..05d8a9b64 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_batch/test_data.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_batch/test_data.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_batch_spec import PipeBatchSpecfrom pipelex.pipe_controllers.batch.pipe_batch_blueprint import PipeBatchBlueprintdiff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_condition/test_data.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_condition/test_data.pyindex 3381c874b..bfecba1d9 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_condition/test_data.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_condition/test_data.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_condition_spec import PipeConditionSpecfrom pipelex.pipe_controllers.condition.pipe_condition_blueprint import PipeConditionBlueprint@@ -14,12 +14,12 @@ class PipeConditionTestCases:inputs={"item": "Item"},output="ProcessedItem",jinja2_expression_template="{{ item.category }}",- pipe_map={+ outcomes={"A": "process_a","B": "process_b","C": "process_c",},- default_pipe_code="process_default",+ default_outcome="process_default",),PipeConditionBlueprint(description="Conditional with template",@@ -29,12 +29,12 @@ class PipeConditionTestCases:category="PipeController",expression=None,expression_template="{{ item.category }}",- pipe_map={+ outcomes={"A": "process_a","B": "process_b","C": "process_c",},- default_pipe_code="process_default",+ default_outcome="process_default",add_alias_from_expression_to=None,),)diff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_parallel/test_data.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_parallel/test_data.pyindex a5ada5a8a..287352b1d 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_parallel/test_data.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_parallel/test_data.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_parallel_spec import PipeParallelSpecfrom pipelex.libraries.pipelines.builder.pipe.sub_pipe_spec import SubPipeSpecfrom pipelex.pipe_controllers.parallel.pipe_parallel_blueprint import PipeParallelBlueprintdiff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_sequence/test_data.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_sequence/test_data.pyindex ba9139fb9..522994251 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_sequence/test_data.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_controller/pipe_sequence/test_data.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_sequence_spec import PipeSequenceSpecfrom pipelex.libraries.pipelines.builder.pipe.sub_pipe_spec import SubPipeSpecfrom pipelex.pipe_controllers.sequence.pipe_sequence_blueprint import PipeSequenceBlueprintdiff --git a/tests/test_pipelines/concept_library/__init__.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_compose/__init__.pysimilarity index 100%rename from tests/test_pipelines/concept_library/__init__.pyrename to tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_compose/__init__.pydiff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_jinja2/test_data.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_compose/test_data.pysimilarity index 89%rename from tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_jinja2/test_data.pyrename to tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_compose/test_data.pyindex ae960f894..828e21062 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_jinja2/test_data.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_compose/test_data.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_compose_spec import PipeComposeSpecfrom pipelex.pipe_operators.compose.pipe_compose_blueprint import PipeComposeBlueprintfrom pipelex.tools.templating.jinja2_template_category import Jinja2TemplateCategory@@ -8,8 +8,8 @@ from pipelex.tools.templating.templating_models import PromptingStyle, TagStyle,class PipeComposeTestCases:- SIMPLE_JINJA2 = (- "simple_jinja2",+ SIMPLE_COMPOSE = (+ "simple_compose",PipeComposeSpec(pipe_code="template_renderer",description="Render a template",@@ -36,5 +36,5 @@ class PipeComposeTestCases:)TEST_CASES: ClassVar[list[tuple[str, PipeComposeSpec, PipeComposeBlueprint]]] = [- SIMPLE_JINJA2,+ SIMPLE_COMPOSE,]diff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_jinja2/test_pipe_jinja2.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_compose/test_pipe_compose.pysimilarity index 79%rename from tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_jinja2/test_pipe_jinja2.pyrename to tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_compose/test_pipe_compose.pyindex bfb6552c7..0327a6aae 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_jinja2/test_pipe_jinja2.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_compose/test_pipe_compose.py@@ -2,17 +2,17 @@ import pytestfrom pipelex.libraries.pipelines.builder.pipe.pipe_compose_spec import PipeComposeSpecfrom pipelex.pipe_operators.compose.pipe_compose_blueprint import PipeComposeBlueprint-from tests.unit.pipelex.libraries.pipelines.builder.pipe.pipe_operator.pipe_jinja2.test_data import PipeComposeTestCases+from tests.unit.pipelex.libraries.pipelines.builder.pipe.pipe_operator.pipe_compose.test_data import PipeComposeTestCasesclass TestPipeComposeBlueprintConversion:@pytest.mark.parametrize(- ("test_name", "pipe_spec", "expected_blueprint"),+ ("_test_name", "pipe_spec", "expected_blueprint"),PipeComposeTestCases.TEST_CASES,)def test_pipe_compose_spec_to_blueprint(self,- test_name: str, # noqa: ARG002+ _test_name: str,pipe_spec: PipeComposeSpec,expected_blueprint: PipeComposeBlueprint,):diff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_func/test_data.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_func/test_data.pyindex 343edfebf..f6f796b26 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_func/test_data.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_func/test_data.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_func_spec import PipeFuncSpecfrom pipelex.pipe_operators.func.pipe_func_blueprint import PipeFuncBlueprintdiff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_img/test_data.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_img/test_data.pyindex e0cfb7800..49fac4933 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_img/test_data.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_img/test_data.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_img_spec import PipeImgGenSpec, RecommendedImgGenfrom pipelex.pipe_operators.img_gen.pipe_img_gen_blueprint import PipeImgGenBlueprintdiff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_jinja2/__init__.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_jinja2/__init__.pydeleted file mode 100644index e69de29bb..000000000diff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_llm/test_data.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_llm/test_data.pyindex b8bac296f..8468f56ee 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_llm/test_data.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_llm/test_data.py@@ -1,7 +1,7 @@from typing import ClassVarfrom pipelex.cogt.llm.llm_setting import LLMSetting-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_llm_spec import PipeLLMSpecfrom pipelex.pipe_operators.llm.pipe_llm_blueprint import PipeLLMBlueprint@@ -48,6 +48,27 @@ class PipeLLMTestCases:),)+ LLM_WITH_VISION_INPUT = (+ "llm_with_vision_input",+ PipeLLMSpec(+ pipe_code="analyze_image",+ description="Analyze image",+ inputs={"image": "Image"},+ output="Text",+ prompt_template="Analyze the image: $image",+ llm="llm_cheap_for_vision",+ ),+ PipeLLMBlueprint(+ source=None,+ type="PipeLLM",+ description="Analyze image",+ inputs={"image": InputRequirementBlueprint(concept="Image")},+ output="Text",+ prompt_template="Analyze the image: $image",+ llm="gemini-2.5-flash-lite",+ ),+ )+LLM_WITH_PRESET = ("llm_with_preset",PipeLLMSpec(@@ -62,7 +83,7 @@ class PipeLLMTestCases:source=None,type="PipeLLM",description="Generate with preset",- llm="claude-4-sonnet",+ llm="claude-4.5-sonnet",output="Text",prompt_template="Generate text",),@@ -84,7 +105,7 @@ class PipeLLMTestCases:type="PipeLLM",description="Generate with settings",llm=LLMSetting(- llm_handle="claude-4-sonnet",+ llm_handle="claude-4.5-sonnet",temperature=0.7,max_tokens=None, # "auto" is handled at conversion to core),@@ -112,7 +133,7 @@ class PipeLLMTestCases:system_prompt="You are a data analyst",prompt_template="Analyze: @data",output="Analysis",- llm="claude-4-sonnet",+ llm="claude-4.5-sonnet",),)@@ -135,7 +156,7 @@ class PipeLLMTestCases:nb_output=None,output="Item",prompt_template="Generate items",- llm="claude-4-sonnet",+ llm="claude-4.5-sonnet",),)@@ -158,13 +179,14 @@ class PipeLLMTestCases:multiple_output=None,output="Item",prompt_template="Generate items",- llm="claude-4-sonnet",+ llm="claude-4.5-sonnet",),)TEST_CASES: ClassVar[list[tuple[str, PipeLLMSpec, PipeLLMBlueprint]]] = [SIMPLE_LLM,LLM_NO_INPUTS,+ LLM_WITH_VISION_INPUT,LLM_WITH_PRESET,LLM_WITH_SETTINGS,LLM_WITH_SYSTEM_PROMPT,diff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_llm/test_pipe_llm.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_llm/test_pipe_llm.pyindex f19a7f583..6609fa589 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_llm/test_pipe_llm.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_llm/test_pipe_llm.py@@ -1,7 +1,9 @@import pytest+from pipelex import pretty_printfrom pipelex.libraries.pipelines.builder.pipe.pipe_llm_spec import PipeLLMSpecfrom pipelex.pipe_operators.llm.pipe_llm_blueprint import PipeLLMBlueprint+from pipelex.pipe_operators.llm.pipe_llm_factory import PipeLLMFactoryfrom tests.unit.pipelex.libraries.pipelines.builder.pipe.pipe_operator.pipe_llm.test_data import PipeLLMTestCases@@ -10,6 +12,14 @@ class TestPipeLLMBlueprintConversion:("test_name", "pipe_spec", "expected_blueprint"),PipeLLMTestCases.TEST_CASES,)- def test_pipe_llm_spec_to_blueprint(self, test_name: str, pipe_spec: PipeLLMSpec, expected_blueprint: PipeLLMBlueprint): # noqa: ARG002- result = pipe_spec.to_blueprint()- assert result == expected_blueprint+ def test_pipe_llm_spec_to_blueprint(self, test_name: str, pipe_spec: PipeLLMSpec, expected_blueprint: PipeLLMBlueprint):+ blueprint = pipe_spec.to_blueprint()+ assert blueprint == expected_blueprint++ pipe_llm_from_blueprint = PipeLLMFactory.make_from_blueprint(+ domain="test_domain",+ pipe_code=f"test_pipe_{test_name}",+ blueprint=blueprint,+ )++ pretty_print(pipe_llm_from_blueprint, title="PipeLLM from blueprint")diff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_ocr/test_data.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_ocr/test_data.pyindex c32d2185b..15e0ebafe 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_ocr/test_data.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/pipe_operator/pipe_ocr/test_data.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_ocr_spec import PipeOcrSpecfrom pipelex.pipe_operators.ocr.pipe_ocr_blueprint import PipeOcrBlueprintdiff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_data_inputs.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_data_inputs.pyindex 5c0a529a8..797be5c86 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_data_inputs.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_data_inputs.py@@ -1,6 +1,6 @@from typing import ClassVar-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintclass InputRequirementTestCases:diff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_data_pipe.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_data_pipe.pyindex c7408046e..62a199fe8 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_data_pipe.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_data_pipe.py@@ -1,7 +1,7 @@from typing import ClassVar+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom pipelex.core.pipes.pipe_blueprint import PipeBlueprint-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprintfrom pipelex.libraries.pipelines.builder.pipe.pipe_signature import PipeSpecdiff --git a/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_inputs_blueprint.py b/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_inputs_blueprint.pyindex 48849d101..524052bd6 100644--- a/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_inputs_blueprint.py+++ b/tests/unit/pipelex/libraries/pipelines/builder/pipe/test_inputs_blueprint.py@@ -1,6 +1,6 @@import pytest-from pipelex.core.pipes.pipe_input_blueprint import InputRequirementBlueprint+from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprintfrom .test_data_inputs import InputRequirementTestCasesdiff --git a/tests/unit/pipelex/migration/__init__.py b/tests/unit/pipelex/migration/__init__.pydeleted file mode 100644index e69de29bb..000000000diff --git a/tests/unit/pipelex/migration/test_migrate_v0_1_0_to_v0_2_0.py b/tests/unit/pipelex/migration/test_migrate_v0_1_0_to_v0_2_0.pydeleted file mode 100644index 895ecdb11..000000000--- a/tests/unit/pipelex/migration/test_migrate_v0_1_0_to_v0_2_0.py+++ /dev/null@@ -1,450 +0,0 @@-from pathlib import Path--import pytest--from pipelex.migration.migrate_v0_1_0_to_v0_2_0 import MigrationResult, TOMLMigrator, migrate_concept_syntax---class TestTomlMigrator:- """Unit tests for TomlMigrator class."""-- @pytest.fixture- def migrator(self) -> TOMLMigrator:- """Create a TomlMigrator instance."""- return TOMLMigrator()-- @pytest.fixture- def sample_old_syntax_content(self) -> str:- """Sample TOML content with old Concept = syntax."""- return """domain = "test"-description = "Test domain"--[concept]-SimpleText = "A simple text concept"-SimpleDoc = "A simple document concept"--[concept.ComplexConcept]-Concept = "A complex concept with old syntax"-refines = "Text"--[concept.AnotherConcept]-Concept = "Another concept to test migration"-structure = "CustomStructure"-refines = ["Text", "Document"]--[concept.AlreadyMigrated]-description = "This one is already migrated"-refines = "Text"-"""-- @pytest.fixture- def sample_new_syntax_content(self) -> str:- """Sample TOML content with new description = syntax."""- return """domain = "test"-description = "Test domain"--[concept]-SimpleText = "A simple text concept"-SimpleDoc = "A simple document concept"--[concept.ComplexConcept]-description = "A complex concept with old syntax"-refines = "Text"--[concept.AnotherConcept]-description = "Another concept to test migration"-structure = "CustomStructure"-refines = ["Text", "Document"]--[concept.AlreadyMigrated]-description = "This one is already migrated"-refines = "Text"-"""-- def test_pattern_matching(self, migrator: TOMLMigrator) -> None:- """Test that the regex pattern correctly identifies Concept = lines."""- test_content = """[concept.TestConcept]-Concept = "A test concept"-refines = "Text"--[concept.AnotherConcept]-description = "Already migrated"-Concept = "This should be caught"-"""-- matches = list(migrator.concept_pattern.finditer(test_content))- assert len(matches) == 2-- # Check first match- assert matches[0].group(2) == "Concept"- assert matches[0].group(4) == '"A test concept"'-- # Check second match- assert matches[1].group(2) == "Concept"- assert matches[1].group(4) == '"This should be caught"'-- def test_pattern_replacement(self, migrator: TOMLMigrator) -> None:- """Test that the regex pattern correctly replaces Concept = with description =."""- test_content = """[concept.TestConcept]-Concept = "A test concept"-refines = "Text"--[concept.IndentedConcept]- Concept = "Indented concept"- refines = "Text"-"""-- expected_content = """[concept.TestConcept]-description = "A test concept"-refines = "Text"--[concept.IndentedConcept]- description = "Indented concept"- refines = "Text"-"""-- result = migrator.migrate_content(test_content)- assert result == expected_content-- def test_preserves_formatting(self, migrator: TOMLMigrator) -> None:- """Test that migration preserves indentation and spacing."""- test_cases = [- # No indentation- ('Concept = "test"', 'description = "test"'),- # With spaces- (' Concept = "test"', ' description = "test"'),- # With tabs- ('\tConcept = "test"', '\tdescription = "test"'),- # Mixed indentation- (' \tConcept = "test"', ' \tdescription = "test"'),- # Various spacing around =- ('Concept ="test"', 'description ="test"'),- ('Concept= "test"', 'description= "test"'),- ('Concept = "test"', 'description = "test"'),- ]-- for original, expected in test_cases:- result = migrator.migrate_content(original)- assert result == expected, f"Failed for: {original}"-- def test_ignores_non_concept_lines(self, migrator: TOMLMigrator) -> None:- """Test that migration doesn't affect non-concept Concept = lines."""- # These should NOT be changed- test_content = """# This is a comment about Concept = something-description = "This pipe works with Concept = something"-prompt_template = "Define the Concept = whatever"-"""-- result = migrator.migrate_content(test_content)- # Should be unchanged since none start with Concept =- assert result == test_content-- def test_ignores_concept_inside_multiline_strings(self, migrator: TOMLMigrator) -> None:- """Test that migration ignores Concept = inside multiline strings."""- test_content = '''domain = "test"--[concept.ValidConcept]-Concept = "This should be migrated"-refines = "Text"--[pipe.test_pipe]-prompt_template = """-Transform this:-Concept = "This should NOT be migrated because it's inside a multiline string"-Do something with it.-"""--[concept.AnotherValidConcept]-Concept = "This should also be migrated"-refines = "Document"-'''-- result = migrator.migrate_content(test_content)-- # Valid concept definitions should be migrated- assert 'description = "This should be migrated"' in result- assert 'description = "This should also be migrated"' in result-- # Concept inside multiline string should NOT be migrated- assert 'Concept = "This should NOT be migrated because it\'s inside a multiline string"' in result-- # Should not have the old syntax for valid concepts- assert 'Concept = "This should be migrated"' not in result- assert 'Concept = "This should also be migrated"' not in result-- def test_multiline_string_detection_with_single_quotes(self, migrator: TOMLMigrator) -> None:- """Test that multiline string detection works with both double and single quotes."""- test_content = """domain = "test"--[concept.ValidConcept]-Concept = "Should be migrated"--[pipe.test_pipe]-prompt_template = '''-This is a single-quote multiline string:-Concept = "Should NOT be migrated"-'''--[concept.AnotherValidConcept]-Concept = "Should also be migrated"-"""-- result = migrator.migrate_content(test_content)-- # Valid concepts should be migrated- assert 'description = "Should be migrated"' in result- assert 'description = "Should also be migrated"' in result-- # Concept inside single-quote multiline string should NOT be migrated- assert 'Concept = "Should NOT be migrated"' in result-- def test_needs_migration_detection(self, migrator: TOMLMigrator, sample_old_syntax_content: str, sample_new_syntax_content: str) -> None:- """Test needs_migration correctly identifies files that need migration."""- assert migrator.needs_migration(sample_old_syntax_content) is True- assert migrator.needs_migration(sample_new_syntax_content) is False-- def test_get_migration_preview(self, migrator: TOMLMigrator) -> None:- """Test getting preview of migration changes."""- test_content = """[concept.TestConcept]-Concept = "A test concept"-refines = "Text"--[concept.AnotherConcept]- Concept = "Another concept"- refines = "Text"-"""-- changes = migrator.get_migration_preview(test_content)-- assert len(changes) == 2- assert changes[0]["line_number"] == 2- assert changes[0]["old_line"] == 'Concept = "A test concept"'- assert changes[0]["new_line"] == 'description = "A test concept"'-- assert changes[1]["line_number"] == 6- assert changes[1]["old_line"] == 'Concept = "Another concept"'- assert changes[1]["new_line"] == 'description = "Another concept"'-- def test_migrate_file_success(- self,- migrator: TOMLMigrator,- tmp_path: Path,- sample_old_syntax_content: str,- sample_new_syntax_content: str,- ) -> None:- """Test successful file migration."""- test_file = tmp_path / "test.toml"- test_file.write_text(sample_old_syntax_content)-- changes_count = migrator.migrate_file(test_file, create_backup=True)-- # Check that file was migrated correctly- migrated_content = test_file.read_text()- assert migrated_content == sample_new_syntax_content-- # Check that backup was created- backup_file = tmp_path / "test.toml.backup"- assert backup_file.exists()- backup_content = backup_file.read_text()- assert backup_content == sample_old_syntax_content-- # Check changes count- assert changes_count == 2 # Two "Concept =" lines in the sample-- def test_migrate_file_no_changes_needed(self, migrator: TOMLMigrator, tmp_path: Path, sample_new_syntax_content: str) -> None:- """Test file migration when no changes are needed."""- test_file = tmp_path / "test.toml"- test_file.write_text(sample_new_syntax_content)-- changes_count = migrator.migrate_file(test_file, create_backup=True)-- # File should be unchanged- content = test_file.read_text()- assert content == sample_new_syntax_content-- # No backup should be created- backup_file = tmp_path / "test.toml.backup"- assert not backup_file.exists()-- # No changes should be reported- assert changes_count == 0-- def test_migrate_file_without_backup(- self,- migrator: TOMLMigrator,- tmp_path: Path,- sample_old_syntax_content: str,- sample_new_syntax_content: str,- ) -> None:- """Test file migration without creating backup."""- test_file = tmp_path / "test.toml"- test_file.write_text(sample_old_syntax_content)-- changes_count = migrator.migrate_file(test_file, create_backup=False)-- # Check that file was migrated correctly- migrated_content = test_file.read_text()- assert migrated_content == sample_new_syntax_content-- # Check that no backup was created- backup_file = tmp_path / "test.toml.backup"- assert not backup_file.exists()-- # Check changes count- assert changes_count == 2-- def test_find_toml_files(self, migrator: TOMLMigrator, tmp_path: Path) -> None:- """Test finding TOML files in directory and subdirectories."""- # Create some TOML files- (tmp_path / "file1.toml").write_text("content1")- (tmp_path / "file2.toml").write_text("content2")-- # Create subdirectory with TOML file- subdir = tmp_path / "subdir"- subdir.mkdir()- (subdir / "file3.toml").write_text("content3")-- # Create non-TOML file (should be ignored)- (tmp_path / "file.txt").write_text("not toml")-- toml_files = migrator.find_toml_files(tmp_path)- toml_files.sort() # Sort for consistent testing-- expected_files = [- tmp_path / "file1.toml",- tmp_path / "file2.toml",- tmp_path / "subdir" / "file3.toml",- ]- expected_files.sort()-- assert toml_files == expected_files-- def test_find_toml_files_nonexistent_directory(self, migrator: TOMLMigrator, tmp_path: Path) -> None:- """Test finding TOML files in nonexistent directory."""- nonexistent_dir = tmp_path / "nonexistent"-- with pytest.raises(FileNotFoundError):- migrator.find_toml_files(nonexistent_dir)-- def test_migrate_directory_success(self, migrator: TOMLMigrator, tmp_path: Path) -> None:- """Test successful directory migration."""- # Create files with different states- file1 = tmp_path / "file1.toml"- file1.write_text("""[concept.Test1]-Concept = "Old syntax file 1"-""")-- file2 = tmp_path / "file2.toml"- file2.write_text("""[concept.Test2]-description = "Already migrated file 2"-""")-- file3 = tmp_path / "file3.toml"- file3.write_text("""[concept.Test3]-Concept = "Old syntax file 3"-[concept.Test4]-Concept = "Another old concept"-""")-- result = migrator.migrate_directory(tmp_path, create_backups=True, dry_run=False)-- # Check results- assert result.files_processed == 3- assert result.files_modified == 2 # file1 and file3 needed migration- assert result.total_changes == 3 # 1 change in file1, 2 changes in file3- assert len(result.modified_files) == 2- assert len(result.errors) == 0-- # Check that files were migrated correctly- assert 'description = "Old syntax file 1"' in file1.read_text()- assert 'description = "Already migrated file 2"' in file2.read_text() # Unchanged- assert 'description = "Old syntax file 3"' in file3.read_text()- assert 'description = "Another old concept"' in file3.read_text()-- # Check backups exist for modified files only- assert (tmp_path / "file1.toml.backup").exists()- assert not (tmp_path / "file2.toml.backup").exists() # No changes needed- assert (tmp_path / "file3.toml.backup").exists()-- def test_migrate_directory_dry_run(self, migrator: TOMLMigrator, tmp_path: Path) -> None:- """Test directory migration in dry-run mode."""- # Create file with old syntax- test_file = tmp_path / "test.toml"- original_content = """[concept.Test]-Concept = "Old syntax"-"""- test_file.write_text(original_content)-- result = migrator.migrate_directory(tmp_path, create_backups=False, dry_run=True)-- # Check results- assert result.files_processed == 1- assert result.files_modified == 1- assert result.total_changes == 1- assert len(result.modified_files) == 1- assert len(result.errors) == 0-- # Check that file was NOT actually modified- content = test_file.read_text()- assert content == original_content-- # Check that no backup was created- backup_file = tmp_path / "test.toml.backup"- assert not backup_file.exists()-- def test_migrate_directory_no_toml_files(self, migrator: TOMLMigrator, tmp_path: Path) -> None:- """Test directory migration with no TOML files."""- # Create non-TOML file- (tmp_path / "file.txt").write_text("not toml")-- result = migrator.migrate_directory(tmp_path, create_backups=True, dry_run=False)-- assert result.files_processed == 0- assert result.files_modified == 0- assert result.total_changes == 0- assert len(result.modified_files) == 0- assert len(result.errors) == 0---class TestMigrateConceptSyntax:- """Test the convenience function."""-- def test_migrate_concept_syntax_function(self, tmp_path: Path) -> None:- """Test the convenience function works correctly."""- # Create test file- test_file = tmp_path / "test.toml"- test_file.write_text("""[concept.Test]-Concept = "Test concept"-""")-- result = migrate_concept_syntax(tmp_path, create_backups=True, dry_run=False)-- assert result.files_processed == 1- assert result.files_modified == 1- assert result.total_changes == 1- assert len(result.modified_files) == 1- assert len(result.errors) == 0-- # Check migration worked- assert 'description = "Test concept"' in test_file.read_text()- assert (tmp_path / "test.toml.backup").exists()---class TestMigrationResult:- """Test the MigrationResult NamedTuple."""-- def test_migration_result_creation(self) -> None:- """Test creating MigrationResult."""- result = MigrationResult(- files_processed=5,- files_modified=3,- total_changes=7,- modified_files=[Path("file1.toml"), Path("file2.toml")],- errors=["Error 1", "Error 2"],- )-- assert result.files_processed == 5- assert result.files_modified == 3- assert result.total_changes == 7- assert len(result.modified_files) == 2- assert len(result.errors) == 2diff --git a/tests/unit/pipelex/tools/misc/test_toml_utils.py b/tests/unit/pipelex/tools/misc/test_toml_utils.pyindex de7e08624..cfb1a7b6a 100644--- a/tests/unit/pipelex/tools/misc/test_toml_utils.py+++ b/tests/unit/pipelex/tools/misc/test_toml_utils.py@@ -157,8 +157,9 @@ description = "Route based on category field using expression"inputs = { input_data = "CategoryInput" }output = "native.Text"expression = "input_data.category"+default_outcome = "continue"-[pipe.basic_condition_by_category_2.pipe_map]+[pipe.basic_condition_by_category_2.outcomes]small = "process_small_2"medium = "process_medium_2"large = "process_large_2"diff --git a/tests/unit/pipelex/tools/test_func_registry.py b/tests/unit/pipelex/tools/test_func_registry.pyindex 05b550035..1adabb6c2 100644--- a/tests/unit/pipelex/tools/test_func_registry.py+++ b/tests/unit/pipelex/tools/test_func_registry.py@@ -6,7 +6,7 @@ import pytestfrom pytest import LogCaptureFixturefrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.tools.func_registry import FuncRegistry, FuncRegistryError@@ -54,10 +54,10 @@ def no_type_hints(working_memory): # noqa: ARG001, ANN001 # pyright: ignore[rep# Type alias for test parameters-TestParams = tuple[str, Callable[..., Any], bool]+EligibilityTestCase = tuple[str, Callable[..., Any], bool]# Test data-TEST_CASES: list[TestParams] = [+TEST_CASES: list[EligibilityTestCase] = [# Valid cases("valid_function", valid_function, True),("valid_async_function", valid_async_function, True),diff --git a/tests/unit/pipelex/tools/test_func_registry_utils.py b/tests/unit/pipelex/tools/test_func_registry_utils.pyindex dbcadc28d..8b4880def 100644--- a/tests/unit/pipelex/tools/test_func_registry_utils.py+++ b/tests/unit/pipelex/tools/test_func_registry_utils.py@@ -6,7 +6,8 @@ import pytestfrom pydantic import Fieldfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.stuffs.stuff_content import StructuredContent, TextContent+from pipelex.core.stuffs.structured_content import StructuredContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.tools.func_registry import func_registryfrom pipelex.tools.func_registry_utils import FuncRegistryUtils@@ -122,7 +123,9 @@ from typing import Listfrom pydantic import Fieldfrom pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.stuffs.stuff_content import ListContent, StructuredContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.structured_content import StructuredContent+from pipelex.core.stuffs.text_content import TextContentclass FilePath(StructuredContent):@@ -168,7 +171,7 @@ class CodebaseFileContent(StructuredContent):root_file = Path(temp_dir) / "root_functions.py"root_file.write_text("""from pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.stuffs.text_content import TextContentasync def root_function(working_memory: WorkingMemory) -> TextContent:return TextContent(text="root")@@ -178,7 +181,7 @@ async def root_function(working_memory: WorkingMemory) -> TextContent:nested_file = nested_dir / "nested_functions.py"nested_file.write_text("""from pipelex.core.memory.working_memory import WorkingMemory-from pipelex.core.stuffs.stuff_content import TextContent+from pipelex.core.stuffs.text_content import TextContentasync def nested_function(working_memory: WorkingMemory) -> TextContent:return TextContent(text="nested")diff --git a/tests/unit/pipelex/tools/typing/test_module_inspector.py b/tests/unit/pipelex/tools/typing/test_module_inspector.pyindex 0cf7564d0..ab35c63ad 100644--- a/tests/unit/pipelex/tools/typing/test_module_inspector.py+++ b/tests/unit/pipelex/tools/typing/test_module_inspector.py@@ -1,5 +1,3 @@-import os-import shutilimport sysimport typesfrom pathlib import Path@@ -19,104 +17,86 @@ class TestModuleFileError:class TestImportModuleFromFile:@pytest.fixture(autouse=True)- def cleanup_test_files(self):- """Clean up test files and sys.modules after each test."""+ def cleanup_sys_modules(self):+ """Clean up sys.modules entries after each test."""yield- # Clean up test files- test_files = ["test_module.py", "test_file.txt", "syntax_error.py", "import_error.py", "nested/subdir/test_module.py"]- for file_path in test_files:- if os.path.exists(file_path):- os.remove(file_path)-- # Clean up nested directories and __pycache__ directories- directories_to_remove = ["nested/subdir", "nested", "__pycache__", "nested/__pycache__", "nested/subdir/__pycache__"]- for dir_path in directories_to_remove:- if Path(dir_path).exists():- shutil.rmtree(dir_path)-# Clean up sys.modules entries for test modules- modules_to_remove = [name for name in sys.modules if name.startswith("test_module")]+ modules_to_remove = [name for name in sys.modules if "test_module_" in name or name == "test_module"]for module_name in modules_to_remove:del sys.modules[module_name]- def test_import_valid_python_file(self):+ def test_import_valid_python_file(self, tmp_path: Path):"""Test importing a valid Python file."""- test_file_path = "test_module.py"- with open(test_file_path, "w") as test_file:- test_file.write("""+ test_file_path = tmp_path / "test_module_valid.py"+ test_file_path.write_text("""def test_function():return "test_value"class TestClass:pass""")- module = import_module_from_file(test_file_path)+ module = import_module_from_file(str(test_file_path))assert hasattr(module, "test_function")assert hasattr(module, "TestClass")assert module.test_function() == "test_value"- def test_import_non_python_file_raises_error(self):+ def test_import_non_python_file_raises_error(self, tmp_path: Path):"""Test that importing a non-Python file raises ModuleFileError."""- test_file_path = "test_file.txt"- with open(test_file_path, "w") as test_file:- test_file.write("This is not Python code")+ test_file_path = tmp_path / "test_file.txt"+ test_file_path.write_text("This is not Python code")with pytest.raises(ModuleFileError) as excinfo:- import_module_from_file(test_file_path)+ import_module_from_file(str(test_file_path))assert "is not a Python file" in str(excinfo.value)- def test_import_nonexistent_file_raises_error(self):+ def test_import_nonexistent_file_raises_error(self, tmp_path: Path):"""Test that importing a nonexistent file raises FileNotFoundError."""- nonexistent_file_path = "nonexistent.py"+ nonexistent_file_path = tmp_path / "nonexistent.py"with pytest.raises(FileNotFoundError):- import_module_from_file(nonexistent_file_path)+ import_module_from_file(str(nonexistent_file_path))- def test_import_file_with_syntax_error_raises_error(self):+ def test_import_file_with_syntax_error_raises_error(self, tmp_path: Path):"""Test that importing a file with syntax errors raises SyntaxError."""- test_file_path = "syntax_error.py"- with open(test_file_path, "w") as test_file:- test_file.write("""+ test_file_path = tmp_path / "syntax_error.py"+ test_file_path.write_text("""def test_function(return "missing closing parenthesis"""")with pytest.raises(SyntaxError):- import_module_from_file(test_file_path)+ import_module_from_file(str(test_file_path))- def test_import_file_with_import_error_raises_error(self):+ def test_import_file_with_import_error_raises_error(self, tmp_path: Path):"""Test that importing a file with import errors raises ImportError."""- test_file_path = "import_error.py"- with open(test_file_path, "w") as test_file:- test_file.write("""+ test_file_path = tmp_path / "import_error.py"+ test_file_path.write_text("""import nonexistent_module""")with pytest.raises(ImportError):- import_module_from_file(test_file_path)+ import_module_from_file(str(test_file_path))- def test_module_added_to_sys_modules(self):+ def test_module_added_to_sys_modules(self, tmp_path: Path):"""Test that imported module is added to sys.modules."""- test_file_path = "test_module.py"- with open(test_file_path, "w") as test_file:- test_file.write("""+ test_file_path = tmp_path / "test_module_sys.py"+ test_file_path.write_text("""def test_function():return "test_value"""")- module = import_module_from_file(test_file_path)- # The module name should be the actual module path derived from the file path- expected_module_name = "test_module"- assert module.__name__ == expected_module_name- assert expected_module_name in sys.modules- assert sys.modules[expected_module_name] is module-- def test_module_name_with_path_separators(self):+ module = import_module_from_file(str(test_file_path))+ # The module name is derived from the full file path+ module_name = module.__name__+ assert module_name.endswith("test_module_sys")+ assert module_name in sys.modules+ assert sys.modules[module_name] is module++ def test_module_name_with_path_separators(self, tmp_path: Path):"""Test that module name is correctly formatted with path separators (should use file basename)."""- test_file_path = "nested/subdir/test_module.py"- # Create nested directories- os.makedirs("nested/subdir", exist_ok=True)- with open(test_file_path, "w") as test_file:- test_file.write("""+ nested_dir = tmp_path / "nested" / "subdir"+ nested_dir.mkdir(parents=True)+ test_file_path = nested_dir / "test_module_nested.py"+ test_file_path.write_text("""def test_function():return "test_value"""")- module = import_module_from_file(test_file_path)+ module = import_module_from_file(str(test_file_path))assert hasattr(module, "test_function")assert module.test_function() == "test_value"diff --git a/tests/unit/pipelex/tools/typing/test_structure_printer.py b/tests/unit/pipelex/tools/typing/test_structure_printer.pyindex 3615a3958..aeee6bad2 100644--- a/tests/unit/pipelex/tools/typing/test_structure_printer.py+++ b/tests/unit/pipelex/tools/typing/test_structure_printer.py@@ -5,7 +5,9 @@ import pytestfrom pydantic import BaseModel, Field, field_validatorfrom pipelex import pretty_print-from pipelex.core.stuffs.stuff_content import ListContent, StructuredContent, TextContent+from pipelex.core.stuffs.list_content import ListContent+from pipelex.core.stuffs.structured_content import StructuredContent+from pipelex.core.stuffs.text_content import TextContentfrom pipelex.tools.typing.structure_printer import StructurePrinterfrom pipelex.types import StrEnumdiff --git a/uv.lock b/uv.lockindex 144f50e69..826234a19 100644--- a/uv.lock+++ b/uv.lock@@ -11,20 +11,20 @@ resolution-markers = [[[package]]name = "aioboto3"-version = "15.1.0"+version = "15.2.0"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "aiobotocore", extra = ["boto3"] },{ name = "aiofiles" },]-sdist = { url = "https://files.pythonhosted.org/packages/5c/b1/b0331786c50f6ef881f9a71c3441ccf7b64c7eed210297d882c37ce31713/aioboto3-15.1.0.tar.gz", hash = "sha256:37763bbc6321ceb479106dc63bc84c8fdb59dd02540034a12941aebef2057c5c", size = 234664, upload-time = "2025-08-14T19:49:15.35Z" }+sdist = { url = "https://files.pythonhosted.org/packages/7a/e5/04894a706e557641c2fcc3696696f8b5da4912e8e524c092e946e9d683d1/aioboto3-15.2.0.tar.gz", hash = "sha256:6a151ee0aa0f4b9af6031e6446f28460991fcc50a4ac54a1650d145319d5e2e5", size = 253108, upload-time = "2025-10-04T16:51:00.978Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/93/b0/28e3ac89e7119b1cb4e6830664060b96a2b5761291e92a10fb3044b5a11d/aioboto3-15.1.0-py3-none-any.whl", hash = "sha256:66006142a2ccc7d6d07aa260ba291c4922b6767d270ba42f95c59e85d8b3e645", size = 35791, upload-time = "2025-08-14T19:49:14.14Z" },+ { url = "https://files.pythonhosted.org/packages/f2/80/eddc9d43d9f4f9427c216403452f961f15386f11cda040231ac30b9e5a7c/aioboto3-15.2.0-py3-none-any.whl", hash = "sha256:3582f033543ee7671ae27b1df538f2095bcc91be4a3a78e7498b5ce6c654f26b", size = 35914, upload-time = "2025-10-04T16:50:59.336Z" },][[package]]name = "aiobotocore"-version = "2.24.0"+version = "2.24.2"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "aiohttp" },@@ -35,9 +35,9 @@ dependencies = [{ name = "python-dateutil" },{ name = "wrapt" },]-sdist = { url = "https://files.pythonhosted.org/packages/b2/ca/ac82c0c699815b6d5b4017f3d8fb2c2d49537f4937f4a0bdf58b4c75d321/aiobotocore-2.24.0.tar.gz", hash = "sha256:b32c0c45d38c22a18ce395a0b5448606c5260603296a152895b5bdb40ab3139d", size = 119597, upload-time = "2025-08-08T18:26:50.373Z" }+sdist = { url = "https://files.pythonhosted.org/packages/05/93/9f5243c2fd2fc22cff92f8d8a7e98d3080171be60778d49aeabb555a463d/aiobotocore-2.24.2.tar.gz", hash = "sha256:dfb21bdb2610e8de4d22f401e91a24d50f1330a302d03c62c485757becd439a9", size = 119837, upload-time = "2025-09-05T12:13:46.963Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/e2/68/b29577197aa2e54b50d6f214524790cc1cb27d289585ad7c7bdfe5125285/aiobotocore-2.24.0-py3-none-any.whl", hash = "sha256:72bb1f8eb1b962779a95e1bcc9cf35bc33196ad763b622a40ae7fa9d2e95c87c", size = 84971, upload-time = "2025-08-08T18:26:48.777Z" },+ { url = "https://files.pythonhosted.org/packages/87/03/2330062ac4ea9fa6447e02b0625f24efd6f05b6c44d61d86610b3555ee66/aiobotocore-2.24.2-py3-none-any.whl", hash = "sha256:808c63b2bd344b91e2f2acb874831118a9f53342d248acd16a68455a226e283a", size = 85441, upload-time = "2025-09-05T12:13:45.378Z" },][package.optional-dependencies]@@ -287,44 +287,44 @@ wheels = [[[package]]name = "boto3"-version = "1.39.11"+version = "1.40.18"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "botocore" },{ name = "jmespath" },{ name = "s3transfer" },]-sdist = { url = "https://files.pythonhosted.org/packages/b6/2e/ed75ea3ee0fd1afacc3379bc2b7457c67a6b0f0e554e1f7ccbdbaed2351b/boto3-1.39.11.tar.gz", hash = "sha256:3027edf20642fe1d5f9dc50a420d0fe2733073ed6a9f0f047b60fe08c3682132", size = 111869, upload-time = "2025-07-22T19:26:50.867Z" }+sdist = { url = "https://files.pythonhosted.org/packages/36/35/a30dc21ca6582358e0ce963f38e85d42ea619f12e7be4101a834c21d749d/boto3-1.40.18.tar.gz", hash = "sha256:64301d39adecc154e3e595eaf0d4f28998ef0a5551f1d033aeac51a9e1a688e5", size = 111994, upload-time = "2025-08-26T19:21:38.61Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/72/66/88566a6484e746c0b075f7c9bb248e8548eda0a486de4460d150a41e2d57/boto3-1.39.11-py3-none-any.whl", hash = "sha256:af8f1dad35eceff7658fab43b39b0f55892b6e3dd12308733521cc24dd2c9a02", size = 139900, upload-time = "2025-07-22T19:26:48.706Z" },+ { url = "https://files.pythonhosted.org/packages/ad/b5/3fc1802eb24aef135c3ba69fff2a9bfcc6a7a8258fb396706b1a6a44de36/boto3-1.40.18-py3-none-any.whl", hash = "sha256:daa776ba1251a7458c9d6c7627873d0c2460c8e8272d35759065580e9193700a", size = 140076, upload-time = "2025-08-26T19:21:36.484Z" },][[package]]name = "boto3-stubs"-version = "1.40.43"+version = "1.40.45"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "botocore-stubs" },{ name = "types-s3transfer" },{ name = "typing-extensions", marker = "python_full_version < '3.12'" },]-sdist = { url = "https://files.pythonhosted.org/packages/22/f8/6dd4bc9c1b14760f97a7543f213607063b08b8bca3a2e0dc7fd938beb740/boto3_stubs-1.40.43.tar.gz", hash = "sha256:01d68d7f07a859533edc0ae94073a3be9386050f99cd3181cc3e814a4110c7d9", size = 100856, upload-time = "2025-10-01T19:47:28.75Z" }+sdist = { url = "https://files.pythonhosted.org/packages/bb/d7/9183a45a8a2b42dc8fe8848475ca0307a52a046326d51d56bc5314816e68/boto3_stubs-1.40.45.tar.gz", hash = "sha256:54e7c60abad6bd74af961371bcf95c4b6b23d363bfc29552c44c9db1bac98969", size = 100808, upload-time = "2025-10-03T19:42:29.63Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/30/8e/25ce8fff3ddbda63db09ab23d8d7f8327d5de389fe126af3a54ee03da44f/boto3_stubs-1.40.43-py3-none-any.whl", hash = "sha256:e64243b440138be92dca5f2959e83aa26510cc1b7884d001989b5cbb803f790b", size = 69688, upload-time = "2025-10-01T19:47:19.639Z" },+ { url = "https://files.pythonhosted.org/packages/4c/b8/0bb26bba5c709733c642de2e7f733085d06b27c8f8dced2c4295f66feab3/boto3_stubs-1.40.45-py3-none-any.whl", hash = "sha256:ad1223afdcf59f0f8e8bbad68b963e0e1a6ac2c3d4eee29e66cfe7836c02994d", size = 69691, upload-time = "2025-10-03T19:42:24.475Z" },][[package]]name = "botocore"-version = "1.39.11"+version = "1.40.18"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "jmespath" },{ name = "python-dateutil" },{ name = "urllib3" },]-sdist = { url = "https://files.pythonhosted.org/packages/6d/d0/9d64261186cff650fe63168441edb4f4cd33f085a74c0c54455630a71f91/botocore-1.39.11.tar.gz", hash = "sha256:953b12909d6799350e346ab038e55b6efe622c616f80aef74d7a6683ffdd972c", size = 14217749, upload-time = "2025-07-22T19:26:40.723Z" }+sdist = { url = "https://files.pythonhosted.org/packages/6a/91/2e745382793fa7d30810a7d5ca3e05f6817b6db07601ca5aaab12720caf9/botocore-1.40.18.tar.gz", hash = "sha256:afd69bdadd8c55cc89d69de0799829e555193a352d87867f746e19020271cc0f", size = 14375007, upload-time = "2025-08-26T19:21:24.996Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/1c/2c/8a0b02d60a1dbbae7faa5af30484b016aa3023f9833dfc0d19b0b770dd6a/botocore-1.39.11-py3-none-any.whl", hash = "sha256:1545352931a8a186f3e977b1e1a4542d7d434796e274c3c62efd0210b5ea76dc", size = 13876276, upload-time = "2025-07-22T19:26:35.164Z" },+ { url = "https://files.pythonhosted.org/packages/1a/f5/bd57bf21fdcc4e500cc406ed2c296e626ddd160f0fee2a4932256e5d62d8/botocore-1.40.18-py3-none-any.whl", hash = "sha256:57025c46ca00cf8cec25de07a759521bfbfb3036a0f69b272654a354615dc45f", size = 14039935, upload-time = "2025-08-26T19:21:19.085Z" },][[package]]@@ -350,11 +350,11 @@ wheels = [[[package]]name = "certifi"-version = "2025.8.3"+version = "2025.10.5"source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/dc/67/960ebe6bf230a96cda2e0abcf73af550ec4f090005363542f0765df162e0/certifi-2025.8.3.tar.gz", hash = "sha256:e564105f78ded564e3ae7c923924435e1daa7463faeab5bb932bc53ffae63407", size = 162386, upload-time = "2025-08-03T03:07:47.08Z" }+sdist = { url = "https://files.pythonhosted.org/packages/4c/5b/b6ce21586237c77ce67d01dc5507039d444b630dd76611bbca2d8e5dcd91/certifi-2025.10.5.tar.gz", hash = "sha256:47c09d31ccf2acf0be3f701ea53595ee7e0b8fa08801c6624be771df09ae7b43", size = 164519, upload-time = "2025-10-05T04:12:15.808Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/e5/48/1549795ba7742c948d2ad169c1c8cdbae65bc450d6cd753d124b17c8cd32/certifi-2025.8.3-py3-none-any.whl", hash = "sha256:f6c12493cfb1b06ba2ff328595af9350c65d6644968e5d3a2ffd78699af217a5", size = 161216, upload-time = "2025-08-03T03:07:45.777Z" },+ { url = "https://files.pythonhosted.org/packages/e4/37/af0d2ef3967ac0d6113837b44a4f0bfe1328c2b9763bd5b1744520e5cfed/certifi-2025.10.5-py3-none-any.whl", hash = "sha256:0f212c2744a9bb6de0c56639a6f68afe01ecd92d91f14ae897c4fe7bbeeef0de", size = 163286, upload-time = "2025-10-05T04:12:14.03Z" },][[package]]@@ -962,7 +962,7 @@ wheels = [[[package]]name = "google-genai"-version = "1.40.0"+version = "1.41.0"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "anyio" },@@ -974,9 +974,9 @@ dependencies = [{ name = "typing-extensions" },{ name = "websockets" },]-sdist = { url = "https://files.pythonhosted.org/packages/1b/68/bbd94059cf56b1be06000ef52abc1981b0f6cd4160bf566680a7e04f8c8b/google_genai-1.40.0.tar.gz", hash = "sha256:7af5730c6f0166862309778fedb2d881ef34f3dc25e912eb891ca00c8481eb20", size = 245021, upload-time = "2025-10-01T23:39:02.304Z" }+sdist = { url = "https://files.pythonhosted.org/packages/72/8b/ee20bcf707769b3b0e1106c3b5c811507736af7e8a60f29a70af1750ba19/google_genai-1.41.0.tar.gz", hash = "sha256:134f861bb0ace4e34af0501ecb75ceee15f7662fd8120698cd185e8cb39f2800", size = 245812, upload-time = "2025-10-02T22:30:29.699Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/78/fb/404719f847a7a2339279c5aacb33575af6fbf8dc94e0c758d98bb2146e0c/google_genai-1.40.0-py3-none-any.whl", hash = "sha256:366806aac66751ed0698b51fd0fb81fe2e3fa68988458c53f90a2a887df8f656", size = 245087, upload-time = "2025-10-01T23:39:00.317Z" },+ { url = "https://files.pythonhosted.org/packages/15/14/e5e8fbca8863fee718208566c4e927b8e9f45fd46ec5cf89e24759da545b/google_genai-1.41.0-py3-none-any.whl", hash = "sha256:111a3ee64c1a0927d3879faddb368234594432479a40c311e5fe4db338ca8778", size = 245931, upload-time = "2025-10-02T22:30:27.885Z" },][[package]]@@ -1200,14 +1200,14 @@ wheels = [[[package]]name = "kajson"-version = "0.3.0"+version = "0.3.1"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "pydantic" },]-sdist = { url = "https://files.pythonhosted.org/packages/b3/51/83d17d4fc6db6b9d497f91c6cbdf7c5677116797a44d0ad65960f1b66c90/kajson-0.3.0.tar.gz", hash = "sha256:5ea8e164cd7fc96877bf4038cf64c286ac4606814146c24dc9ecc4a2c6ac047d", size = 20271, upload-time = "2025-07-09T09:52:33.851Z" }+sdist = { url = "https://files.pythonhosted.org/packages/b8/51/dc0529d2b678003e783cc9e79b0ca16db1ca1035935a5623deb822b33b8f/kajson-0.3.1.tar.gz", hash = "sha256:a170883f04a9c5e72a3831ce65720324b078483e0360e6f249400e1c4b8d9ffa", size = 20275, upload-time = "2025-07-11T08:26:13.243Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/f9/d5/4a7974d072c5eb6565e5abe3d52b13f662491934dac4b9ea15836fa2da69/kajson-0.3.0-py3-none-any.whl", hash = "sha256:d8cc72875ebef6ea44c06c96fe63accf5b0721ca24ea1e593814dd45fd25bf15", size = 26711, upload-time = "2025-07-09T09:52:32.639Z" },+ { url = "https://files.pythonhosted.org/packages/9d/3b/3529c470a4cc1051abe2e4cd6a8a714b14eea26a8486bb3e1cd19a5c60d9/kajson-0.3.1-py3-none-any.whl", hash = "sha256:c129b5dd66f757ed8077c49803ea290f91ba6f5699717eb97b65d960bcc83ac4", size = 26721, upload-time = "2025-07-11T08:26:11.622Z" },][[package]]@@ -2144,7 +2144,7 @@ requires-dist = [{ name = "instructor", extras = ["google-genai"], marker = "extra == 'google-genai'" },{ name = "jinja2", specifier = ">=3.1.4" },{ name = "json2html", specifier = ">=1.3.0" },- { name = "kajson", specifier = "==0.3.0" },+ { name = "kajson", specifier = "==0.3.1" },{ name = "markdown", specifier = ">=3.6" },{ name = "mistralai", marker = "extra == 'mistralai'", specifier = "==1.5.2" },{ name = "mkdocs", marker = "extra == 'docs'", specifier = "==1.6.1" },@@ -2224,91 +2224,116 @@ wheels = [[[package]]name = "propcache"-version = "0.3.2"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/a6/16/43264e4a779dd8588c21a70f0709665ee8f611211bdd2c87d952cfa7c776/propcache-0.3.2.tar.gz", hash = "sha256:20d7d62e4e7ef05f221e0db2856b979540686342e7dd9973b815599c7057e168", size = 44139, upload-time = "2025-06-09T22:56:06.081Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/ab/14/510deed325e262afeb8b360043c5d7c960da7d3ecd6d6f9496c9c56dc7f4/propcache-0.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:22d9962a358aedbb7a2e36187ff273adeaab9743373a272976d2e348d08c7770", size = 73178, upload-time = "2025-06-09T22:53:40.126Z" },- { url = "https://files.pythonhosted.org/packages/cd/4e/ad52a7925ff01c1325653a730c7ec3175a23f948f08626a534133427dcff/propcache-0.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0d0fda578d1dc3f77b6b5a5dce3b9ad69a8250a891760a548df850a5e8da87f3", size = 43133, upload-time = "2025-06-09T22:53:41.965Z" },- { url = "https://files.pythonhosted.org/packages/63/7c/e9399ba5da7780871db4eac178e9c2e204c23dd3e7d32df202092a1ed400/propcache-0.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3def3da3ac3ce41562d85db655d18ebac740cb3fa4367f11a52b3da9d03a5cc3", size = 43039, upload-time = "2025-06-09T22:53:43.268Z" },- { url = "https://files.pythonhosted.org/packages/22/e1/58da211eb8fdc6fc854002387d38f415a6ca5f5c67c1315b204a5d3e9d7a/propcache-0.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9bec58347a5a6cebf239daba9bda37dffec5b8d2ce004d9fe4edef3d2815137e", size = 201903, upload-time = "2025-06-09T22:53:44.872Z" },- { url = "https://files.pythonhosted.org/packages/c4/0a/550ea0f52aac455cb90111c8bab995208443e46d925e51e2f6ebdf869525/propcache-0.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:55ffda449a507e9fbd4aca1a7d9aa6753b07d6166140e5a18d2ac9bc49eac220", size = 213362, upload-time = "2025-06-09T22:53:46.707Z" },- { url = "https://files.pythonhosted.org/packages/5a/af/9893b7d878deda9bb69fcf54600b247fba7317761b7db11fede6e0f28bd0/propcache-0.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:64a67fb39229a8a8491dd42f864e5e263155e729c2e7ff723d6e25f596b1e8cb", size = 210525, upload-time = "2025-06-09T22:53:48.547Z" },- { url = "https://files.pythonhosted.org/packages/7c/bb/38fd08b278ca85cde36d848091ad2b45954bc5f15cce494bb300b9285831/propcache-0.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9da1cf97b92b51253d5b68cf5a2b9e0dafca095e36b7f2da335e27dc6172a614", size = 198283, upload-time = "2025-06-09T22:53:50.067Z" },- { url = "https://files.pythonhosted.org/packages/78/8c/9fe55bd01d362bafb413dfe508c48753111a1e269737fa143ba85693592c/propcache-0.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5f559e127134b07425134b4065be45b166183fdcb433cb6c24c8e4149056ad50", size = 191872, upload-time = "2025-06-09T22:53:51.438Z" },- { url = "https://files.pythonhosted.org/packages/54/14/4701c33852937a22584e08abb531d654c8bcf7948a8f87ad0a4822394147/propcache-0.3.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:aff2e4e06435d61f11a428360a932138d0ec288b0a31dd9bd78d200bd4a2b339", size = 199452, upload-time = "2025-06-09T22:53:53.229Z" },- { url = "https://files.pythonhosted.org/packages/16/44/447f2253d859602095356007657ee535e0093215ea0b3d1d6a41d16e5201/propcache-0.3.2-cp310-cp310-musllinux_1_2_armv7l.whl", hash = "sha256:4927842833830942a5d0a56e6f4839bc484785b8e1ce8d287359794818633ba0", size = 191567, upload-time = "2025-06-09T22:53:54.541Z" },- { url = "https://files.pythonhosted.org/packages/f2/b3/e4756258749bb2d3b46defcff606a2f47410bab82be5824a67e84015b267/propcache-0.3.2-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:6107ddd08b02654a30fb8ad7a132021759d750a82578b94cd55ee2772b6ebea2", size = 193015, upload-time = "2025-06-09T22:53:56.44Z" },- { url = "https://files.pythonhosted.org/packages/1e/df/e6d3c7574233164b6330b9fd697beeac402afd367280e6dc377bb99b43d9/propcache-0.3.2-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:70bd8b9cd6b519e12859c99f3fc9a93f375ebd22a50296c3a295028bea73b9e7", size = 204660, upload-time = "2025-06-09T22:53:57.839Z" },- { url = "https://files.pythonhosted.org/packages/b2/53/e4d31dd5170b4a0e2e6b730f2385a96410633b4833dc25fe5dffd1f73294/propcache-0.3.2-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:2183111651d710d3097338dd1893fcf09c9f54e27ff1a8795495a16a469cc90b", size = 206105, upload-time = "2025-06-09T22:53:59.638Z" },- { url = "https://files.pythonhosted.org/packages/7f/fe/74d54cf9fbe2a20ff786e5f7afcfde446588f0cf15fb2daacfbc267b866c/propcache-0.3.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:fb075ad271405dcad8e2a7ffc9a750a3bf70e533bd86e89f0603e607b93aa64c", size = 196980, upload-time = "2025-06-09T22:54:01.071Z" },- { url = "https://files.pythonhosted.org/packages/22/ec/c469c9d59dada8a7679625e0440b544fe72e99311a4679c279562051f6fc/propcache-0.3.2-cp310-cp310-win32.whl", hash = "sha256:404d70768080d3d3bdb41d0771037da19d8340d50b08e104ca0e7f9ce55fce70", size = 37679, upload-time = "2025-06-09T22:54:03.003Z" },- { url = "https://files.pythonhosted.org/packages/38/35/07a471371ac89d418f8d0b699c75ea6dca2041fbda360823de21f6a9ce0a/propcache-0.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:7435d766f978b4ede777002e6b3b6641dd229cd1da8d3d3106a45770365f9ad9", size = 41459, upload-time = "2025-06-09T22:54:04.134Z" },- { url = "https://files.pythonhosted.org/packages/80/8d/e8b436717ab9c2cfc23b116d2c297305aa4cd8339172a456d61ebf5669b8/propcache-0.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0b8d2f607bd8f80ddc04088bc2a037fdd17884a6fcadc47a96e334d72f3717be", size = 74207, upload-time = "2025-06-09T22:54:05.399Z" },- { url = "https://files.pythonhosted.org/packages/d6/29/1e34000e9766d112171764b9fa3226fa0153ab565d0c242c70e9945318a7/propcache-0.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:06766d8f34733416e2e34f46fea488ad5d60726bb9481d3cddf89a6fa2d9603f", size = 43648, upload-time = "2025-06-09T22:54:08.023Z" },- { url = "https://files.pythonhosted.org/packages/46/92/1ad5af0df781e76988897da39b5f086c2bf0f028b7f9bd1f409bb05b6874/propcache-0.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a2dc1f4a1df4fecf4e6f68013575ff4af84ef6f478fe5344317a65d38a8e6dc9", size = 43496, upload-time = "2025-06-09T22:54:09.228Z" },- { url = "https://files.pythonhosted.org/packages/b3/ce/e96392460f9fb68461fabab3e095cb00c8ddf901205be4eae5ce246e5b7e/propcache-0.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:be29c4f4810c5789cf10ddf6af80b041c724e629fa51e308a7a0fb19ed1ef7bf", size = 217288, upload-time = "2025-06-09T22:54:10.466Z" },- { url = "https://files.pythonhosted.org/packages/c5/2a/866726ea345299f7ceefc861a5e782b045545ae6940851930a6adaf1fca6/propcache-0.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:59d61f6970ecbd8ff2e9360304d5c8876a6abd4530cb752c06586849ac8a9dc9", size = 227456, upload-time = "2025-06-09T22:54:11.828Z" },- { url = "https://files.pythonhosted.org/packages/de/03/07d992ccb6d930398689187e1b3c718339a1c06b8b145a8d9650e4726166/propcache-0.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:62180e0b8dbb6b004baec00a7983e4cc52f5ada9cd11f48c3528d8cfa7b96a66", size = 225429, upload-time = "2025-06-09T22:54:13.823Z" },- { url = "https://files.pythonhosted.org/packages/5d/e6/116ba39448753b1330f48ab8ba927dcd6cf0baea8a0ccbc512dfb49ba670/propcache-0.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c144ca294a204c470f18cf4c9d78887810d04a3e2fbb30eea903575a779159df", size = 213472, upload-time = "2025-06-09T22:54:15.232Z" },- { url = "https://files.pythonhosted.org/packages/a6/85/f01f5d97e54e428885a5497ccf7f54404cbb4f906688a1690cd51bf597dc/propcache-0.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5c2a784234c28854878d68978265617aa6dc0780e53d44b4d67f3651a17a9a2", size = 204480, upload-time = "2025-06-09T22:54:17.104Z" },- { url = "https://files.pythonhosted.org/packages/e3/79/7bf5ab9033b8b8194cc3f7cf1aaa0e9c3256320726f64a3e1f113a812dce/propcache-0.3.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:5745bc7acdafa978ca1642891b82c19238eadc78ba2aaa293c6863b304e552d7", size = 214530, upload-time = "2025-06-09T22:54:18.512Z" },- { url = "https://files.pythonhosted.org/packages/31/0b/bd3e0c00509b609317df4a18e6b05a450ef2d9a963e1d8bc9c9415d86f30/propcache-0.3.2-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:c0075bf773d66fa8c9d41f66cc132ecc75e5bb9dd7cce3cfd14adc5ca184cb95", size = 205230, upload-time = "2025-06-09T22:54:19.947Z" },- { url = "https://files.pythonhosted.org/packages/7a/23/fae0ff9b54b0de4e819bbe559508da132d5683c32d84d0dc2ccce3563ed4/propcache-0.3.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:5f57aa0847730daceff0497f417c9de353c575d8da3579162cc74ac294c5369e", size = 206754, upload-time = "2025-06-09T22:54:21.716Z" },- { url = "https://files.pythonhosted.org/packages/b7/7f/ad6a3c22630aaa5f618b4dc3c3598974a72abb4c18e45a50b3cdd091eb2f/propcache-0.3.2-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:eef914c014bf72d18efb55619447e0aecd5fb7c2e3fa7441e2e5d6099bddff7e", size = 218430, upload-time = "2025-06-09T22:54:23.17Z" },- { url = "https://files.pythonhosted.org/packages/5b/2c/ba4f1c0e8a4b4c75910742f0d333759d441f65a1c7f34683b4a74c0ee015/propcache-0.3.2-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:2a4092e8549031e82facf3decdbc0883755d5bbcc62d3aea9d9e185549936dcf", size = 223884, upload-time = "2025-06-09T22:54:25.539Z" },- { url = "https://files.pythonhosted.org/packages/88/e4/ebe30fc399e98572019eee82ad0caf512401661985cbd3da5e3140ffa1b0/propcache-0.3.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:85871b050f174bc0bfb437efbdb68aaf860611953ed12418e4361bc9c392749e", size = 211480, upload-time = "2025-06-09T22:54:26.892Z" },- { url = "https://files.pythonhosted.org/packages/96/0a/7d5260b914e01d1d0906f7f38af101f8d8ed0dc47426219eeaf05e8ea7c2/propcache-0.3.2-cp311-cp311-win32.whl", hash = "sha256:36c8d9b673ec57900c3554264e630d45980fd302458e4ac801802a7fd2ef7897", size = 37757, upload-time = "2025-06-09T22:54:28.241Z" },- { url = "https://files.pythonhosted.org/packages/e1/2d/89fe4489a884bc0da0c3278c552bd4ffe06a1ace559db5ef02ef24ab446b/propcache-0.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:e53af8cb6a781b02d2ea079b5b853ba9430fcbe18a8e3ce647d5982a3ff69f39", size = 41500, upload-time = "2025-06-09T22:54:29.4Z" },- { url = "https://files.pythonhosted.org/packages/a8/42/9ca01b0a6f48e81615dca4765a8f1dd2c057e0540f6116a27dc5ee01dfb6/propcache-0.3.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:8de106b6c84506b31c27168582cd3cb3000a6412c16df14a8628e5871ff83c10", size = 73674, upload-time = "2025-06-09T22:54:30.551Z" },- { url = "https://files.pythonhosted.org/packages/af/6e/21293133beb550f9c901bbece755d582bfaf2176bee4774000bd4dd41884/propcache-0.3.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:28710b0d3975117239c76600ea351934ac7b5ff56e60953474342608dbbb6154", size = 43570, upload-time = "2025-06-09T22:54:32.296Z" },- { url = "https://files.pythonhosted.org/packages/0c/c8/0393a0a3a2b8760eb3bde3c147f62b20044f0ddac81e9d6ed7318ec0d852/propcache-0.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ce26862344bdf836650ed2487c3d724b00fbfec4233a1013f597b78c1cb73615", size = 43094, upload-time = "2025-06-09T22:54:33.929Z" },- { url = "https://files.pythonhosted.org/packages/37/2c/489afe311a690399d04a3e03b069225670c1d489eb7b044a566511c1c498/propcache-0.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bca54bd347a253af2cf4544bbec232ab982f4868de0dd684246b67a51bc6b1db", size = 226958, upload-time = "2025-06-09T22:54:35.186Z" },- { url = "https://files.pythonhosted.org/packages/9d/ca/63b520d2f3d418c968bf596839ae26cf7f87bead026b6192d4da6a08c467/propcache-0.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:55780d5e9a2ddc59711d727226bb1ba83a22dd32f64ee15594b9392b1f544eb1", size = 234894, upload-time = "2025-06-09T22:54:36.708Z" },- { url = "https://files.pythonhosted.org/packages/11/60/1d0ed6fff455a028d678df30cc28dcee7af77fa2b0e6962ce1df95c9a2a9/propcache-0.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:035e631be25d6975ed87ab23153db6a73426a48db688070d925aa27e996fe93c", size = 233672, upload-time = "2025-06-09T22:54:38.062Z" },- { url = "https://files.pythonhosted.org/packages/37/7c/54fd5301ef38505ab235d98827207176a5c9b2aa61939b10a460ca53e123/propcache-0.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ee6f22b6eaa39297c751d0e80c0d3a454f112f5c6481214fcf4c092074cecd67", size = 224395, upload-time = "2025-06-09T22:54:39.634Z" },- { url = "https://files.pythonhosted.org/packages/ee/1a/89a40e0846f5de05fdc6779883bf46ba980e6df4d2ff8fb02643de126592/propcache-0.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7ca3aee1aa955438c4dba34fc20a9f390e4c79967257d830f137bd5a8a32ed3b", size = 212510, upload-time = "2025-06-09T22:54:41.565Z" },- { url = "https://files.pythonhosted.org/packages/5e/33/ca98368586c9566a6b8d5ef66e30484f8da84c0aac3f2d9aec6d31a11bd5/propcache-0.3.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7a4f30862869fa2b68380d677cc1c5fcf1e0f2b9ea0cf665812895c75d0ca3b8", size = 222949, upload-time = "2025-06-09T22:54:43.038Z" },- { url = "https://files.pythonhosted.org/packages/ba/11/ace870d0aafe443b33b2f0b7efdb872b7c3abd505bfb4890716ad7865e9d/propcache-0.3.2-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:b77ec3c257d7816d9f3700013639db7491a434644c906a2578a11daf13176251", size = 217258, upload-time = "2025-06-09T22:54:44.376Z" },- { url = "https://files.pythonhosted.org/packages/5b/d2/86fd6f7adffcfc74b42c10a6b7db721d1d9ca1055c45d39a1a8f2a740a21/propcache-0.3.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:cab90ac9d3f14b2d5050928483d3d3b8fb6b4018893fc75710e6aa361ecb2474", size = 213036, upload-time = "2025-06-09T22:54:46.243Z" },- { url = "https://files.pythonhosted.org/packages/07/94/2d7d1e328f45ff34a0a284cf5a2847013701e24c2a53117e7c280a4316b3/propcache-0.3.2-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:0b504d29f3c47cf6b9e936c1852246c83d450e8e063d50562115a6be6d3a2535", size = 227684, upload-time = "2025-06-09T22:54:47.63Z" },- { url = "https://files.pythonhosted.org/packages/b7/05/37ae63a0087677e90b1d14710e532ff104d44bc1efa3b3970fff99b891dc/propcache-0.3.2-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:ce2ac2675a6aa41ddb2a0c9cbff53780a617ac3d43e620f8fd77ba1c84dcfc06", size = 234562, upload-time = "2025-06-09T22:54:48.982Z" },- { url = "https://files.pythonhosted.org/packages/a4/7c/3f539fcae630408d0bd8bf3208b9a647ccad10976eda62402a80adf8fc34/propcache-0.3.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:62b4239611205294cc433845b914131b2a1f03500ff3c1ed093ed216b82621e1", size = 222142, upload-time = "2025-06-09T22:54:50.424Z" },- { url = "https://files.pythonhosted.org/packages/7c/d2/34b9eac8c35f79f8a962546b3e97e9d4b990c420ee66ac8255d5d9611648/propcache-0.3.2-cp312-cp312-win32.whl", hash = "sha256:df4a81b9b53449ebc90cc4deefb052c1dd934ba85012aa912c7ea7b7e38b60c1", size = 37711, upload-time = "2025-06-09T22:54:52.072Z" },- { url = "https://files.pythonhosted.org/packages/19/61/d582be5d226cf79071681d1b46b848d6cb03d7b70af7063e33a2787eaa03/propcache-0.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:7046e79b989d7fe457bb755844019e10f693752d169076138abf17f31380800c", size = 41479, upload-time = "2025-06-09T22:54:53.234Z" },- { url = "https://files.pythonhosted.org/packages/dc/d1/8c747fafa558c603c4ca19d8e20b288aa0c7cda74e9402f50f31eb65267e/propcache-0.3.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:ca592ed634a73ca002967458187109265e980422116c0a107cf93d81f95af945", size = 71286, upload-time = "2025-06-09T22:54:54.369Z" },- { url = "https://files.pythonhosted.org/packages/61/99/d606cb7986b60d89c36de8a85d58764323b3a5ff07770a99d8e993b3fa73/propcache-0.3.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:9ecb0aad4020e275652ba3975740f241bd12a61f1a784df044cf7477a02bc252", size = 42425, upload-time = "2025-06-09T22:54:55.642Z" },- { url = "https://files.pythonhosted.org/packages/8c/96/ef98f91bbb42b79e9bb82bdd348b255eb9d65f14dbbe3b1594644c4073f7/propcache-0.3.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:7f08f1cc28bd2eade7a8a3d2954ccc673bb02062e3e7da09bc75d843386b342f", size = 41846, upload-time = "2025-06-09T22:54:57.246Z" },- { url = "https://files.pythonhosted.org/packages/5b/ad/3f0f9a705fb630d175146cd7b1d2bf5555c9beaed54e94132b21aac098a6/propcache-0.3.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d1a342c834734edb4be5ecb1e9fb48cb64b1e2320fccbd8c54bf8da8f2a84c33", size = 208871, upload-time = "2025-06-09T22:54:58.975Z" },- { url = "https://files.pythonhosted.org/packages/3a/38/2085cda93d2c8b6ec3e92af2c89489a36a5886b712a34ab25de9fbca7992/propcache-0.3.2-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8a544caaae1ac73f1fecfae70ded3e93728831affebd017d53449e3ac052ac1e", size = 215720, upload-time = "2025-06-09T22:55:00.471Z" },- { url = "https://files.pythonhosted.org/packages/61/c1/d72ea2dc83ac7f2c8e182786ab0fc2c7bd123a1ff9b7975bee671866fe5f/propcache-0.3.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:310d11aa44635298397db47a3ebce7db99a4cc4b9bbdfcf6c98a60c8d5261cf1", size = 215203, upload-time = "2025-06-09T22:55:01.834Z" },- { url = "https://files.pythonhosted.org/packages/af/81/b324c44ae60c56ef12007105f1460d5c304b0626ab0cc6b07c8f2a9aa0b8/propcache-0.3.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c1396592321ac83157ac03a2023aa6cc4a3cc3cfdecb71090054c09e5a7cce3", size = 206365, upload-time = "2025-06-09T22:55:03.199Z" },- { url = "https://files.pythonhosted.org/packages/09/73/88549128bb89e66d2aff242488f62869014ae092db63ccea53c1cc75a81d/propcache-0.3.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cabf5b5902272565e78197edb682017d21cf3b550ba0460ee473753f28d23c1", size = 196016, upload-time = "2025-06-09T22:55:04.518Z" },- { url = "https://files.pythonhosted.org/packages/b9/3f/3bdd14e737d145114a5eb83cb172903afba7242f67c5877f9909a20d948d/propcache-0.3.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0a2f2235ac46a7aa25bdeb03a9e7060f6ecbd213b1f9101c43b3090ffb971ef6", size = 205596, upload-time = "2025-06-09T22:55:05.942Z" },- { url = "https://files.pythonhosted.org/packages/0f/ca/2f4aa819c357d3107c3763d7ef42c03980f9ed5c48c82e01e25945d437c1/propcache-0.3.2-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:92b69e12e34869a6970fd2f3da91669899994b47c98f5d430b781c26f1d9f387", size = 200977, upload-time = "2025-06-09T22:55:07.792Z" },- { url = "https://files.pythonhosted.org/packages/cd/4a/e65276c7477533c59085251ae88505caf6831c0e85ff8b2e31ebcbb949b1/propcache-0.3.2-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:54e02207c79968ebbdffc169591009f4474dde3b4679e16634d34c9363ff56b4", size = 197220, upload-time = "2025-06-09T22:55:09.173Z" },- { url = "https://files.pythonhosted.org/packages/7c/54/fc7152e517cf5578278b242396ce4d4b36795423988ef39bb8cd5bf274c8/propcache-0.3.2-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:4adfb44cb588001f68c5466579d3f1157ca07f7504fc91ec87862e2b8e556b88", size = 210642, upload-time = "2025-06-09T22:55:10.62Z" },- { url = "https://files.pythonhosted.org/packages/b9/80/abeb4a896d2767bf5f1ea7b92eb7be6a5330645bd7fb844049c0e4045d9d/propcache-0.3.2-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:fd3e6019dc1261cd0291ee8919dd91fbab7b169bb76aeef6c716833a3f65d206", size = 212789, upload-time = "2025-06-09T22:55:12.029Z" },- { url = "https://files.pythonhosted.org/packages/b3/db/ea12a49aa7b2b6d68a5da8293dcf50068d48d088100ac016ad92a6a780e6/propcache-0.3.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4c181cad81158d71c41a2bce88edce078458e2dd5ffee7eddd6b05da85079f43", size = 205880, upload-time = "2025-06-09T22:55:13.45Z" },- { url = "https://files.pythonhosted.org/packages/d1/e5/9076a0bbbfb65d1198007059c65639dfd56266cf8e477a9707e4b1999ff4/propcache-0.3.2-cp313-cp313-win32.whl", hash = "sha256:8a08154613f2249519e549de2330cf8e2071c2887309a7b07fb56098f5170a02", size = 37220, upload-time = "2025-06-09T22:55:15.284Z" },- { url = "https://files.pythonhosted.org/packages/d3/f5/b369e026b09a26cd77aa88d8fffd69141d2ae00a2abaaf5380d2603f4b7f/propcache-0.3.2-cp313-cp313-win_amd64.whl", hash = "sha256:e41671f1594fc4ab0a6dec1351864713cb3a279910ae8b58f884a88a0a632c05", size = 40678, upload-time = "2025-06-09T22:55:16.445Z" },- { url = "https://files.pythonhosted.org/packages/a4/3a/6ece377b55544941a08d03581c7bc400a3c8cd3c2865900a68d5de79e21f/propcache-0.3.2-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:9a3cf035bbaf035f109987d9d55dc90e4b0e36e04bbbb95af3055ef17194057b", size = 76560, upload-time = "2025-06-09T22:55:17.598Z" },- { url = "https://files.pythonhosted.org/packages/0c/da/64a2bb16418740fa634b0e9c3d29edff1db07f56d3546ca2d86ddf0305e1/propcache-0.3.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:156c03d07dc1323d8dacaa221fbe028c5c70d16709cdd63502778e6c3ccca1b0", size = 44676, upload-time = "2025-06-09T22:55:18.922Z" },- { url = "https://files.pythonhosted.org/packages/36/7b/f025e06ea51cb72c52fb87e9b395cced02786610b60a3ed51da8af017170/propcache-0.3.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:74413c0ba02ba86f55cf60d18daab219f7e531620c15f1e23d95563f505efe7e", size = 44701, upload-time = "2025-06-09T22:55:20.106Z" },- { url = "https://files.pythonhosted.org/packages/a4/00/faa1b1b7c3b74fc277f8642f32a4c72ba1d7b2de36d7cdfb676db7f4303e/propcache-0.3.2-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f066b437bb3fa39c58ff97ab2ca351db465157d68ed0440abecb21715eb24b28", size = 276934, upload-time = "2025-06-09T22:55:21.5Z" },- { url = "https://files.pythonhosted.org/packages/74/ab/935beb6f1756e0476a4d5938ff44bf0d13a055fed880caf93859b4f1baf4/propcache-0.3.2-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f1304b085c83067914721e7e9d9917d41ad87696bf70f0bc7dee450e9c71ad0a", size = 278316, upload-time = "2025-06-09T22:55:22.918Z" },- { url = "https://files.pythonhosted.org/packages/f8/9d/994a5c1ce4389610838d1caec74bdf0e98b306c70314d46dbe4fcf21a3e2/propcache-0.3.2-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ab50cef01b372763a13333b4e54021bdcb291fc9a8e2ccb9c2df98be51bcde6c", size = 282619, upload-time = "2025-06-09T22:55:24.651Z" },- { url = "https://files.pythonhosted.org/packages/2b/00/a10afce3d1ed0287cef2e09506d3be9822513f2c1e96457ee369adb9a6cd/propcache-0.3.2-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fad3b2a085ec259ad2c2842666b2a0a49dea8463579c606426128925af1ed725", size = 265896, upload-time = "2025-06-09T22:55:26.049Z" },- { url = "https://files.pythonhosted.org/packages/2e/a8/2aa6716ffa566ca57c749edb909ad27884680887d68517e4be41b02299f3/propcache-0.3.2-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:261fa020c1c14deafd54c76b014956e2f86991af198c51139faf41c4d5e83892", size = 252111, upload-time = "2025-06-09T22:55:27.381Z" },- { url = "https://files.pythonhosted.org/packages/36/4f/345ca9183b85ac29c8694b0941f7484bf419c7f0fea2d1e386b4f7893eed/propcache-0.3.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:46d7f8aa79c927e5f987ee3a80205c987717d3659f035c85cf0c3680526bdb44", size = 268334, upload-time = "2025-06-09T22:55:28.747Z" },- { url = "https://files.pythonhosted.org/packages/3e/ca/fcd54f78b59e3f97b3b9715501e3147f5340167733d27db423aa321e7148/propcache-0.3.2-cp313-cp313t-musllinux_1_2_armv7l.whl", hash = "sha256:6d8f3f0eebf73e3c0ff0e7853f68be638b4043c65a70517bb575eff54edd8dbe", size = 255026, upload-time = "2025-06-09T22:55:30.184Z" },- { url = "https://files.pythonhosted.org/packages/8b/95/8e6a6bbbd78ac89c30c225210a5c687790e532ba4088afb8c0445b77ef37/propcache-0.3.2-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:03c89c1b14a5452cf15403e291c0ccd7751d5b9736ecb2c5bab977ad6c5bcd81", size = 250724, upload-time = "2025-06-09T22:55:31.646Z" },- { url = "https://files.pythonhosted.org/packages/ee/b0/0dd03616142baba28e8b2d14ce5df6631b4673850a3d4f9c0f9dd714a404/propcache-0.3.2-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:0cc17efde71e12bbaad086d679ce575268d70bc123a5a71ea7ad76f70ba30bba", size = 268868, upload-time = "2025-06-09T22:55:33.209Z" },- { url = "https://files.pythonhosted.org/packages/c5/98/2c12407a7e4fbacd94ddd32f3b1e3d5231e77c30ef7162b12a60e2dd5ce3/propcache-0.3.2-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:acdf05d00696bc0447e278bb53cb04ca72354e562cf88ea6f9107df8e7fd9770", size = 271322, upload-time = "2025-06-09T22:55:35.065Z" },- { url = "https://files.pythonhosted.org/packages/35/91/9cb56efbb428b006bb85db28591e40b7736847b8331d43fe335acf95f6c8/propcache-0.3.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:4445542398bd0b5d32df908031cb1b30d43ac848e20470a878b770ec2dcc6330", size = 265778, upload-time = "2025-06-09T22:55:36.45Z" },- { url = "https://files.pythonhosted.org/packages/9a/4c/b0fe775a2bdd01e176b14b574be679d84fc83958335790f7c9a686c1f468/propcache-0.3.2-cp313-cp313t-win32.whl", hash = "sha256:f86e5d7cd03afb3a1db8e9f9f6eff15794e79e791350ac48a8c924e6f439f394", size = 41175, upload-time = "2025-06-09T22:55:38.436Z" },- { url = "https://files.pythonhosted.org/packages/a4/ff/47f08595e3d9b5e149c150f88d9714574f1a7cbd89fe2817158a952674bf/propcache-0.3.2-cp313-cp313t-win_amd64.whl", hash = "sha256:9704bedf6e7cbe3c65eca4379a9b53ee6a83749f047808cbb5044d40d7d72198", size = 44857, upload-time = "2025-06-09T22:55:39.687Z" },- { url = "https://files.pythonhosted.org/packages/cc/35/cc0aaecf278bb4575b8555f2b137de5ab821595ddae9da9d3cd1da4072c7/propcache-0.3.2-py3-none-any.whl", hash = "sha256:98f1ec44fb675f5052cccc8e609c46ed23a35a1cfd18545ad4e29002d858a43f", size = 12663, upload-time = "2025-06-09T22:56:04.484Z" },+version = "0.4.0"+source = { registry = "https://pypi.org/simple" }+sdist = { url = "https://files.pythonhosted.org/packages/ea/c8/d70cd26d845c6d85479d8f5a11a0fd7151e9bc4794cc5e6eb5a790f12df8/propcache-0.4.0.tar.gz", hash = "sha256:c1ad731253eb738f9cadd9fa1844e019576c70bca6a534252e97cf33a57da529", size = 45187, upload-time = "2025-10-04T21:57:39.546Z" }+wheels = [+ { url = "https://files.pythonhosted.org/packages/d1/7b/4bd85fea3dc58b6f246abf0e6c9e44adca26f6817e6c136780315d723b82/propcache-0.4.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:779aaae64089e2f4992e993faea801925395d26bb5de4a47df7ef7f942c14f80", size = 79437, upload-time = "2025-10-04T21:54:49.766Z" },+ { url = "https://files.pythonhosted.org/packages/e0/91/379ecc1ab37fe33648c7cb2d2252f58969adac1edcd6ec74682d7fb2d920/propcache-0.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:566552ed9b003030745e5bc7b402b83cf3cecae1bade95262d78543741786db5", size = 45369, upload-time = "2025-10-04T21:54:51.688Z" },+ { url = "https://files.pythonhosted.org/packages/de/8e/2e002e59e359bbc6ababbb7da168226f93e0533429ea1e93989a7eedcb2a/propcache-0.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:944de70384c62d16d4a00c686b422aa75efbc67c4addaebefbb56475d1c16034", size = 47191, upload-time = "2025-10-04T21:54:52.915Z" },+ { url = "https://files.pythonhosted.org/packages/b5/9a/f56eef9932dc3cbc63df4716f09fbaefec7a475608b643842784a01351b6/propcache-0.4.0-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e878553543ece1f8006d0ba4d096b40290580db173bfb18e16158045b9371335", size = 201000, upload-time = "2025-10-04T21:54:54.556Z" },+ { url = "https://files.pythonhosted.org/packages/6e/84/e7ad1e09c13f0574dbad261441f6a7f1fb8cc1e2fcb23ec4d4b3e4c7dc67/propcache-0.4.0-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8659f995b19185179474b18de8755689e1f71e1334d05c14e1895caa4e409cf7", size = 209175, upload-time = "2025-10-04T21:54:55.996Z" },+ { url = "https://files.pythonhosted.org/packages/4a/74/0b785ac0fbb44a5a7c267efc409b7a62d7a03b17c6442ecb52fd29152314/propcache-0.4.0-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7aa8cc5c94e682dce91cb4d12d7b81c01641f4ef5b3b3dc53325d43f0e3b9f2e", size = 214874, upload-time = "2025-10-04T21:54:57.831Z" },+ { url = "https://files.pythonhosted.org/packages/b4/fd/e8d795def2b1d8dc1dc4731d36da1f6111d7c73212909e79462172d0434c/propcache-0.4.0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:da584d917a1a17f690fc726617fd2c3f3006ea959dae5bb07a5630f7b16f9f5f", size = 196686, upload-time = "2025-10-04T21:54:59.218Z" },+ { url = "https://files.pythonhosted.org/packages/79/c2/dc992c712c3a1bfaa11d13ff177dbdf9b8b272e7bd443601e37f35728338/propcache-0.4.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:892a072e5b19c3f324a4f8543c9f7e8fc2b0aa08579e46f69bdf0cfc1b440454", size = 192000, upload-time = "2025-10-04T21:55:00.645Z" },+ { url = "https://files.pythonhosted.org/packages/b3/de/bb108dbdfae594148b033ff283d9fa6e4b0906a99f2c03b98b526883149d/propcache-0.4.0-cp310-cp310-musllinux_1_2_armv7l.whl", hash = "sha256:c20d796210720455086ef3f85adc413d1e41d374742f9b439354f122bbc3b528", size = 190310, upload-time = "2025-10-04T21:55:02.107Z" },+ { url = "https://files.pythonhosted.org/packages/ba/7b/1bdb5d44ba4c87d270bcf11354950f8f7fbc9ace1fbe7745e683fcb57b5a/propcache-0.4.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:df7107a91126a495880576610ae989f19106e1900dd5218d08498391fa43b31d", size = 199646, upload-time = "2025-10-04T21:55:03.55Z" },+ { url = "https://files.pythonhosted.org/packages/e5/04/44beda877f779f49f5b8c0ff4817a62b5f90a2dfac1ec5311df15a9dfceb/propcache-0.4.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:0b04ac2120c161416c866d0b6a4259e47e92231ff166b518cc0efb95777367c3", size = 200507, upload-time = "2025-10-04T21:55:04.914Z" },+ { url = "https://files.pythonhosted.org/packages/d4/62/a13ad0a63e06f3695fcaeaeeeb62e2cc685181a1248b23a2bc877c8b7111/propcache-0.4.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:1e7fa29c71ffa8d6a37324258737d09475f84715a6e8c350f67f0bc8e5e44993", size = 192787, upload-time = "2025-10-04T21:55:06.385Z" },+ { url = "https://files.pythonhosted.org/packages/9b/07/386246b3b4a6b11208bcbf57580210fb8c923ab26759389fe594e5615cd7/propcache-0.4.0-cp310-cp310-win32.whl", hash = "sha256:01c0ebc172ca28e9d62876832befbf7f36080eee6ed9c9e00243de2a8089ad57", size = 38004, upload-time = "2025-10-04T21:55:07.692Z" },+ { url = "https://files.pythonhosted.org/packages/a4/f2/e1fcb9694f590bc443ae5044f982546bb01cbaa3cdf05286e9473a9874bf/propcache-0.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:84f847e64f4d1a232e50460eebc1196642ee9b4c983612f41cd2d44fd2fe7c71", size = 41516, upload-time = "2025-10-04T21:55:08.854Z" },+ { url = "https://files.pythonhosted.org/packages/15/f4/d211744d41d72fbb89d3ee53963c1dc26892c49f53ae3c49fbc15cfb2548/propcache-0.4.0-cp310-cp310-win_arm64.whl", hash = "sha256:2166466a666a5bebc332cd209cad77d996fad925ca7e8a2a6310ba9e851ae641", size = 38122, upload-time = "2025-10-04T21:55:10.044Z" },+ { url = "https://files.pythonhosted.org/packages/f9/c4/72b8d41bdbae8aea9c25b869d7cdc3ab5f281f979d8aea30f4646ad12743/propcache-0.4.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:6a6a36b94c09711d6397d79006ca47901539fbc602c853d794c39abd6a326549", size = 80035, upload-time = "2025-10-04T21:55:11.266Z" },+ { url = "https://files.pythonhosted.org/packages/e9/f8/f87115733e221408a363f3a9753419cf2d4be7a8a7ec9dc0788325cd23f1/propcache-0.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:da47070e1340a1639aca6b1c18fe1f1f3d8d64d3a1f9ddc67b94475f44cd40f3", size = 45622, upload-time = "2025-10-04T21:55:12.41Z" },+ { url = "https://files.pythonhosted.org/packages/5d/cc/391f883248faa2efdf6886bdb12ac8edf20eac0863770d8d925450d8cc76/propcache-0.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:de536cf796abc5b58d11c0ad56580215d231d9554ea4bb6b8b1b3bed80aa3234", size = 47517, upload-time = "2025-10-04T21:55:13.819Z" },+ { url = "https://files.pythonhosted.org/packages/3e/d2/5593b59999f42d1044c5ab5f238be1f9d537ab91b0c910727986d520a6e9/propcache-0.4.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f5c82af8e329c3cdc3e717dd3c7b2ff1a218b6de611f6ce76ee34967570a9de9", size = 214540, upload-time = "2025-10-04T21:55:15.206Z" },+ { url = "https://files.pythonhosted.org/packages/bb/5d/028cdc0eaa1a66ee2ec339a08b5e6ec15e7e71dac86103bebe53ba10dc0f/propcache-0.4.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:abe04e7aa5ab2e4056fcf3255ebee2071e4a427681f76d4729519e292c46ecc1", size = 221603, upload-time = "2025-10-04T21:55:16.704Z" },+ { url = "https://files.pythonhosted.org/packages/e8/f8/e30aee5f59ea21647faef9c82bd67fa510295c34908a7a38571def555881/propcache-0.4.0-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:075ca32384294434344760fdcb95f7833e1d7cf7c4e55f0e726358140179da35", size = 227749, upload-time = "2025-10-04T21:55:18.082Z" },+ { url = "https://files.pythonhosted.org/packages/d7/85/0757dfc73931bea63b18d26b2c5e7bf13113ca60fe0e5f19905f104bcf6a/propcache-0.4.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:626ec13592928b677f48ff5861040b604b635e93d8e2162fb638397ea83d07e8", size = 209792, upload-time = "2025-10-04T21:55:19.475Z" },+ { url = "https://files.pythonhosted.org/packages/d2/45/35a6a6241f46948c0ac2418d5bf50cfbcd9735739f42028a1c11e9066a72/propcache-0.4.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:02e071548b6a376e173b0102c3f55dc16e7d055b5307d487e844c320e38cacf2", size = 207979, upload-time = "2025-10-04T21:55:21.164Z" },+ { url = "https://files.pythonhosted.org/packages/e3/d1/5930396e75c9ed477958eac1496e6fb08794d823e9b14a459f1c0e20f338/propcache-0.4.0-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:2af6de831a26f42a3f94592964becd8d7f238551786d7525807f02e53defbd13", size = 201923, upload-time = "2025-10-04T21:55:22.5Z" },+ { url = "https://files.pythonhosted.org/packages/98/72/675455f22bcefeda16907461f9a9a4a93709ff2095e8cf799bdb6c78e030/propcache-0.4.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:bd6c6dba1a3b8949e08c4280071c86e38cb602f02e0ed6659234108c7a7cd710", size = 212117, upload-time = "2025-10-04T21:55:23.858Z" },+ { url = "https://files.pythonhosted.org/packages/13/27/c533302ff80a49a848c3dbd01bb18f87b06826602b3b37043ff00d6b5005/propcache-0.4.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:783e91595cf9b66c2deda17f2e8748ae8591aa9f7c65dcab038872bfe83c5bb1", size = 216594, upload-time = "2025-10-04T21:55:25.169Z" },+ { url = "https://files.pythonhosted.org/packages/63/91/8250fbb601fd16c427e5f469132f27e175c6692dbfa784ef1266dc652e55/propcache-0.4.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c3f4b125285d354a627eb37f3ea7c13b8842c7c0d47783581d0df0e272dbf5f0", size = 204863, upload-time = "2025-10-04T21:55:26.511Z" },+ { url = "https://files.pythonhosted.org/packages/34/c4/fd945a9a25845aafb6094b9fa6a88286e4e1c55686e60172c60fe669e0d1/propcache-0.4.0-cp311-cp311-win32.whl", hash = "sha256:71c45f02ffbb8a21040ae816ceff7f6cd749ffac29fc0f9daa42dc1a9652d577", size = 37948, upload-time = "2025-10-04T21:55:27.719Z" },+ { url = "https://files.pythonhosted.org/packages/42/02/f30e7304661ffe8d51ff4050e06765ac2df6d95cf23c999dfe5a0cd0eb4c/propcache-0.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:7d51f70f77950f8efafed4383865d3533eeee52d8a0dd1c35b65f24de41de4e0", size = 41511, upload-time = "2025-10-04T21:55:29.15Z" },+ { url = "https://files.pythonhosted.org/packages/a5/f2/edd329d86085438a1ba32cf4cf45fc982d18343bed1f16b218b516c3340d/propcache-0.4.0-cp311-cp311-win_arm64.whl", hash = "sha256:858eaabd2191dd0da5272993ad08a748b5d3ae1aefabea8aee619b45c2af4a64", size = 37957, upload-time = "2025-10-04T21:55:30.31Z" },+ { url = "https://files.pythonhosted.org/packages/b3/cf/3f88344261d69f8021256f20e82e820c5df3aba96e5ba9b5fdd3685d3a9f/propcache-0.4.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:381c84a445efb8c9168f1393a5a7c566de22edc42bfe207a142fff919b37f5d9", size = 79846, upload-time = "2025-10-04T21:55:31.447Z" },+ { url = "https://files.pythonhosted.org/packages/be/fa/0286fc92764eead9dcfee639b67828daa32e61dd0f1618831547141eb28b/propcache-0.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5a531d29d7b873b12730972237c48b1a4e5980b98cf21b3f09fa4710abd3a8c3", size = 45850, upload-time = "2025-10-04T21:55:32.637Z" },+ { url = "https://files.pythonhosted.org/packages/c7/83/57840656f972f8a67992eee40781e4066657776dcb889f49df0e8eecb112/propcache-0.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cd6e22255ed73efeaaeb1765505a66a48a9ec9ebc919fce5ad490fe5e33b1555", size = 47171, upload-time = "2025-10-04T21:55:33.819Z" },+ { url = "https://files.pythonhosted.org/packages/9f/8e/e0a0bd376c3440476b924eca517589ee535bb4520420d178268bf88558ba/propcache-0.4.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d9a8d277dc218ddf04ec243a53ac309b1afcebe297c0526a8f82320139b56289", size = 225306, upload-time = "2025-10-04T21:55:35.312Z" },+ { url = "https://files.pythonhosted.org/packages/84/fe/76884442da1bab6d4353ba1c43fdc4a770c3b3973f3ac7620a7205402fdd/propcache-0.4.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:399c73201d88c856a994916200d7cba41d7687096f8eb5139eb68f02785dc3f7", size = 230013, upload-time = "2025-10-04T21:55:37.005Z" },+ { url = "https://files.pythonhosted.org/packages/f4/b7/322af273bd1136bb7e13628821fb855c9f61d64651c73fea71dded68dda5/propcache-0.4.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a1d5e474d43c238035b74ecf997f655afa67f979bae591ac838bb3fbe3076392", size = 238331, upload-time = "2025-10-04T21:55:38.713Z" },+ { url = "https://files.pythonhosted.org/packages/84/5e/036d2b105927ae7f179346c9911d16c345f4dba5a19a063f23a8d28acfbd/propcache-0.4.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:22f589652ee38de96aa58dd219335604e09666092bc250c1d9c26a55bcef9932", size = 221461, upload-time = "2025-10-04T21:55:40.034Z" },+ { url = "https://files.pythonhosted.org/packages/63/0d/babd038efb12a87a46ab070438c52daeac6bed0a930693a418feef8cb8a6/propcache-0.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e5227da556b2939da6125cda1d5eecf9e412e58bc97b41e2f192605c3ccbb7c2", size = 216707, upload-time = "2025-10-04T21:55:41.455Z" },+ { url = "https://files.pythonhosted.org/packages/ab/68/dd075a037381581f16e7e504a6da9c1d7e415e945dd8ed67905d608f0687/propcache-0.4.0-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:92bc43a1ab852310721ce856f40a3a352254aa6f5e26f0fad870b31be45bba2e", size = 212591, upload-time = "2025-10-04T21:55:42.938Z" },+ { url = "https://files.pythonhosted.org/packages/ff/43/22698f28fc8e04c32b109cb9cb81305a4873b77c907b17484566b6133aef/propcache-0.4.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:83ae2f5343f6f06f4c91ae530d95f56b415f768f9c401a5ee2a10459cf74370b", size = 220188, upload-time = "2025-10-04T21:55:44.53Z" },+ { url = "https://files.pythonhosted.org/packages/96/7a/27886e4a4c69598a38fbeeed64f9b8ddfa6f08fe3452035845a1fe90336f/propcache-0.4.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:077a32977399dc05299b16e793210341a0b511eb0a86d1796873e83ce47334cc", size = 226736, upload-time = "2025-10-04T21:55:46.348Z" },+ { url = "https://files.pythonhosted.org/packages/5b/c7/313c632b5888db3c9f4cb262420dcd5e57cf858d939d6ad9c3b1b90c12af/propcache-0.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:94a278c45e6463031b5a8278e40a07edf2bcc3b5379510e22b6c1a6e6498c194", size = 216363, upload-time = "2025-10-04T21:55:47.768Z" },+ { url = "https://files.pythonhosted.org/packages/7a/5d/5aaf82bd1542aedb47d10483b84f49ee8f00d970a58e27534cd241e9c5ac/propcache-0.4.0-cp312-cp312-win32.whl", hash = "sha256:4c491462e1dc80f9deb93f428aad8d83bb286de212837f58eb48e75606e7726c", size = 37945, upload-time = "2025-10-04T21:55:49.104Z" },+ { url = "https://files.pythonhosted.org/packages/4c/67/47ffff6eb176f383f56319f31c0e1bcf7500cb94ffb7582efc600c6b3c73/propcache-0.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:cdb0cecafb528ab15ed89cdfed183074d15912d046d3e304955513b50a34b907", size = 41530, upload-time = "2025-10-04T21:55:50.261Z" },+ { url = "https://files.pythonhosted.org/packages/f3/7e/61b70306b9d7527286ce887a8ff28c304ab2514e5893eea36b5bdf7a21af/propcache-0.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:b2f29697d1110e8cdf7a39cc630498df0082d7898b79b731c1c863f77c6e8cfc", size = 37662, upload-time = "2025-10-04T21:55:51.35Z" },+ { url = "https://files.pythonhosted.org/packages/cd/dd/f405b0fe84d29d356895bc048404d3321a2df849281cf3f932158c9346ac/propcache-0.4.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:e2d01fd53e89cb3d71d20b8c225a8c70d84660f2d223afc7ed7851a4086afe6d", size = 77565, upload-time = "2025-10-04T21:55:52.907Z" },+ { url = "https://files.pythonhosted.org/packages/c0/48/dfb2c45e1b0d92228c9c66fa929af7316c15cbe69a7e438786aaa60c1b3c/propcache-0.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7dfa60953169d2531dd8ae306e9c27c5d4e5efe7a2ba77049e8afdaece062937", size = 44602, upload-time = "2025-10-04T21:55:54.406Z" },+ { url = "https://files.pythonhosted.org/packages/d0/d9/b15e88b4463df45a7793fb04e2b5497334f8fcc24e281c221150a0af9aff/propcache-0.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:227892597953611fce2601d49f1d1f39786a6aebc2f253c2de775407f725a3f6", size = 46168, upload-time = "2025-10-04T21:55:55.537Z" },+ { url = "https://files.pythonhosted.org/packages/40/ac/983e69cce8800251aab85858069cf9359b22222a9cda47591e03e2f24eec/propcache-0.4.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5e0a5bc019014531308fb67d86066d235daa7551baf2e00e1ea7b00531f6ea85", size = 207997, upload-time = "2025-10-04T21:55:57.022Z" },+ { url = "https://files.pythonhosted.org/packages/ae/9c/5586a7a54e7e0b9a87fdd8ba935961f398c0e6eaecd57baaa8eca468a236/propcache-0.4.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:6ebc6e2e65c31356310ddb6519420eaa6bb8c30fbd809d0919129c89dcd70f4c", size = 210948, upload-time = "2025-10-04T21:55:58.397Z" },+ { url = "https://files.pythonhosted.org/packages/5f/ba/644e367f8a86461d45bd023ace521180938e76515040550af9b44085e99a/propcache-0.4.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:1927b78dd75fc31a7fdc76cc7039e39f3170cb1d0d9a271e60f0566ecb25211a", size = 217988, upload-time = "2025-10-04T21:56:00.251Z" },+ { url = "https://files.pythonhosted.org/packages/24/0e/1e21af74b4732d002b0452605bdf31d6bf990fd8b720cb44e27a97d80db5/propcache-0.4.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5b113feeda47f908562d9a6d0e05798ad2f83d4473c0777dafa2bc7756473218", size = 204442, upload-time = "2025-10-04T21:56:01.93Z" },+ { url = "https://files.pythonhosted.org/packages/fd/30/ae2eec96995a8a760acb9a0b6c92b9815f1fc885c7d8481237ccb554eab0/propcache-0.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4596c12aa7e3bb2abf158ea8f79eb0fb4851606695d04ab846b2bb386f5690a1", size = 199371, upload-time = "2025-10-04T21:56:03.25Z" },+ { url = "https://files.pythonhosted.org/packages/45/1d/a18fac8cb04f8379ccb79cf15aac31f4167a270d1cd1111f33c0d38ce4fb/propcache-0.4.0-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:6d1f67dad8cc36e8abc2207a77f3f952ac80be7404177830a7af4635a34cbc16", size = 196638, upload-time = "2025-10-04T21:56:04.619Z" },+ { url = "https://files.pythonhosted.org/packages/48/45/3549a2b6f74dce6f21b2664d078bd26ceb876aae9c58f3c017cf590f0ee3/propcache-0.4.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:e6229ad15366cd8b6d6b4185c55dd48debf9ca546f91416ba2e5921ad6e210a6", size = 203651, upload-time = "2025-10-04T21:56:06.153Z" },+ { url = "https://files.pythonhosted.org/packages/7d/f0/90ea14d518c919fc154332742a9302db3004af4f1d3df688676959733283/propcache-0.4.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:2a4bf309d057327f1f227a22ac6baf34a66f9af75e08c613e47c4d775b06d6c7", size = 205726, upload-time = "2025-10-04T21:56:07.955Z" },+ { url = "https://files.pythonhosted.org/packages/f6/de/8efc1dbafeb42108e7af744822cdca944b990869e9da70e79efb21569d6b/propcache-0.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:c2e274f3d1cbb2ddcc7a55ce3739af0f8510edc68a7f37981b2258fa1eedc833", size = 199576, upload-time = "2025-10-04T21:56:09.43Z" },+ { url = "https://files.pythonhosted.org/packages/d7/38/4d79fe3477b050398fb8d8f59301ed116d8c6ea3c4dbf09498c679103f90/propcache-0.4.0-cp313-cp313-win32.whl", hash = "sha256:f114a3e1f8034e2957d34043b7a317a8a05d97dfe8fddb36d9a2252c0117dbbc", size = 37474, upload-time = "2025-10-04T21:56:10.74Z" },+ { url = "https://files.pythonhosted.org/packages/36/9b/a283daf665a1945cff1b03d1104e7c9ee92bb7b6bbcc6518b24fcdac8bd0/propcache-0.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:9ba68c57cde9c667f6b65b98bc342dfa7240b1272ffb2c24b32172ee61b6d281", size = 40685, upload-time = "2025-10-04T21:56:11.896Z" },+ { url = "https://files.pythonhosted.org/packages/e9/f7/def8fc0b4d7a89f1628f337cb122bb9a946c5ed97760f2442b27b7fa5a69/propcache-0.4.0-cp313-cp313-win_arm64.whl", hash = "sha256:eb77a85253174bf73e52c968b689d64be62d71e8ac33cabef4ca77b03fb4ef92", size = 37046, upload-time = "2025-10-04T21:56:13.021Z" },+ { url = "https://files.pythonhosted.org/packages/ca/6b/f6e8b36b58d17dfb6c505b9ae1163fcf7a4cf98825032fdc77bba4ab5c4a/propcache-0.4.0-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:c0e1c218fff95a66ad9f2f83ad41a67cf4d0a3f527efe820f57bde5fda616de4", size = 81274, upload-time = "2025-10-04T21:56:14.206Z" },+ { url = "https://files.pythonhosted.org/packages/8e/c5/1fd0baa222b8faf53ba04dd4f34de33ea820b80e34f87c7960666bae5f4f/propcache-0.4.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:5710b1c01472542bb024366803812ca13e8774d21381bcfc1f7ae738eeb38acc", size = 46232, upload-time = "2025-10-04T21:56:15.337Z" },+ { url = "https://files.pythonhosted.org/packages/cb/6b/7aa5324983cab7666ed58fc32c68a0430468a18e02e3f04e7a879c002414/propcache-0.4.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:d7f008799682e8826ce98f25e8bc43532d2cd26c187a1462499fa8d123ae054f", size = 48239, upload-time = "2025-10-04T21:56:16.768Z" },+ { url = "https://files.pythonhosted.org/packages/24/0f/58c192301c0436762ed5fed5a3edadb0ae399cb73528fb9c1b5cb8e53523/propcache-0.4.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0596d2ae99d74ca436553eb9ce11fe4163dc742fcf8724ebe07d7cb0db679bb1", size = 275804, upload-time = "2025-10-04T21:56:18.066Z" },+ { url = "https://files.pythonhosted.org/packages/f7/b9/092ee32064ebfabedae4251952787e63e551075af1a1205e8061b3ed5838/propcache-0.4.0-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:ab9c1bd95ebd1689f0e24f2946c495808777e9e8df7bb3c1dfe3e9eb7f47fe0d", size = 273996, upload-time = "2025-10-04T21:56:19.801Z" },+ { url = "https://files.pythonhosted.org/packages/43/82/becf618ed28e732f3bba3df172cd290a1afbd99f291074f747fd5bd031bb/propcache-0.4.0-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a8ef2ea819549ae2e8698d2ec229ae948d7272feea1cb2878289f767b6c585a4", size = 280266, upload-time = "2025-10-04T21:56:21.136Z" },+ { url = "https://files.pythonhosted.org/packages/51/be/b370930249a9332a81b5c4c550dac614b7e11b6c160080777e903d57e197/propcache-0.4.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:71a400b2f0b079438cc24f9a27f02eff24d8ef78f2943f949abc518b844ade3d", size = 263186, upload-time = "2025-10-04T21:56:22.787Z" },+ { url = "https://files.pythonhosted.org/packages/33/b6/546fd3e31770aed3aed1c01b120944c689edb510aeb7a25472edc472ce23/propcache-0.4.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4c2735d3305e6cecab6e53546909edf407ad3da5b9eeaf483f4cf80142bb21be", size = 260721, upload-time = "2025-10-04T21:56:24.22Z" },+ { url = "https://files.pythonhosted.org/packages/80/70/3751930d16e5984490c73ca65b80777e4b26e7a0015f2d41f31d75959a71/propcache-0.4.0-cp313-cp313t-musllinux_1_2_armv7l.whl", hash = "sha256:72b51340047ac43b3cf388eebd362d052632260c9f73a50882edbb66e589fd44", size = 247516, upload-time = "2025-10-04T21:56:25.577Z" },+ { url = "https://files.pythonhosted.org/packages/59/90/4bc96ce6476f67e2e6b72469f328c92b53259a0e4d1d5386d71a36e9258c/propcache-0.4.0-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:184c779363740d6664982ad05699f378f7694220e2041996f12b7c2a4acdcad0", size = 262675, upload-time = "2025-10-04T21:56:27.065Z" },+ { url = "https://files.pythonhosted.org/packages/6f/d1/f16d096869c5f1c93d67fc37488c0c814add0560574f6877653a10239cde/propcache-0.4.0-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:a60634a9de41f363923c6adfb83105d39e49f7a3058511563ed3de6748661af6", size = 263379, upload-time = "2025-10-04T21:56:28.517Z" },+ { url = "https://files.pythonhosted.org/packages/ab/2a/da5cd1bc1c6412939c457ea65bbe7e034045c395d98ff8ff880d06ec4553/propcache-0.4.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:c9b8119244d122241a9c4566bce49bb20408a6827044155856735cf14189a7da", size = 257694, upload-time = "2025-10-04T21:56:30.051Z" },+ { url = "https://files.pythonhosted.org/packages/a5/11/938e67c07189b662a6c72551d48285a02496de885408392447c25657dd47/propcache-0.4.0-cp313-cp313t-win32.whl", hash = "sha256:515b610a364c8cdd2b72c734cc97dece85c416892ea8d5c305624ac8734e81db", size = 41321, upload-time = "2025-10-04T21:56:31.406Z" },+ { url = "https://files.pythonhosted.org/packages/f4/6e/72b11a4dcae68c728b15126cc5bc830bf275c84836da2633412b768d07e0/propcache-0.4.0-cp313-cp313t-win_amd64.whl", hash = "sha256:7ea86eb32e74f9902df57e8608e8ac66f1e1e1d24d1ed2ddeb849888413b924d", size = 44846, upload-time = "2025-10-04T21:56:32.5Z" },+ { url = "https://files.pythonhosted.org/packages/94/09/0ef3c025e0621e703ef71b69e0085181a3124bcc1beef29e0ffef59ed7f4/propcache-0.4.0-cp313-cp313t-win_arm64.whl", hash = "sha256:c1443fa4bb306461a3a8a52b7de0932a2515b100ecb0ebc630cc3f87d451e0a9", size = 39689, upload-time = "2025-10-04T21:56:33.686Z" },+ { url = "https://files.pythonhosted.org/packages/60/89/7699d8e9f8c222bbef1fae26afd72d448353f164a52125d5f87dd9fec2c7/propcache-0.4.0-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:de8e310d24b5a61de08812dd70d5234da1458d41b059038ee7895a9e4c8cae79", size = 77977, upload-time = "2025-10-04T21:56:34.836Z" },+ { url = "https://files.pythonhosted.org/packages/77/c5/2758a498199ce46d6d500ba4391a8594df35400cc85738aa9f0c9b8366db/propcache-0.4.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:55a54de5266bc44aa274915cdf388584fa052db8748a869e5500ab5993bac3f4", size = 44715, upload-time = "2025-10-04T21:56:36.075Z" },+ { url = "https://files.pythonhosted.org/packages/0d/da/5a44e10282a28c2dd576e5e1a2c7bb8145587070ddab7375fb643f7129d7/propcache-0.4.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:88d50d662c917ec2c9d3858920aa7b9d5bfb74ab9c51424b775ccbe683cb1b4e", size = 46463, upload-time = "2025-10-04T21:56:37.227Z" },+ { url = "https://files.pythonhosted.org/packages/d5/5a/b2c314f655f46c10c204dc0d69e19fadfb1cc4d40ab33f403698a35c3281/propcache-0.4.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ae3adf88a66f5863cf79394bc359da523bb27a2ed6ba9898525a6a02b723bfc5", size = 206980, upload-time = "2025-10-04T21:56:38.828Z" },+ { url = "https://files.pythonhosted.org/packages/7c/4e/f6643ec2cd5527b92c93488f9b67a170494736bb1c5460136399d709ce5a/propcache-0.4.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7f088e21d15b3abdb9047e4b7b7a0acd79bf166893ac2b34a72ab1062feb219e", size = 211385, upload-time = "2025-10-04T21:56:40.2Z" },+ { url = "https://files.pythonhosted.org/packages/71/41/362766a346c3f8d3bbeb7899e1ff40f18844e0fe37e9f6f536553cf6b6be/propcache-0.4.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a4efbaf10793fd574c76a5732c75452f19d93df6e0f758c67dd60552ebd8614b", size = 215315, upload-time = "2025-10-04T21:56:41.574Z" },+ { url = "https://files.pythonhosted.org/packages/ff/98/17385d51816d56fa6acc035d8625fbf833b6a795d7ef7fb37ea3f62db6c9/propcache-0.4.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:681a168d06284602d56e97f09978057aa88bcc4177352b875b3d781df4efd4cb", size = 201416, upload-time = "2025-10-04T21:56:42.947Z" },+ { url = "https://files.pythonhosted.org/packages/7a/83/801178ca1c29e217564ee507ff2a49d3f24a4dd85c9b9d681fd1d62b15f2/propcache-0.4.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a7f06f077fc4ef37e8a37ca6bbb491b29e29db9fb28e29cf3896aad10dbd4137", size = 197726, upload-time = "2025-10-04T21:56:44.313Z" },+ { url = "https://files.pythonhosted.org/packages/d2/38/c8743917bca92b7e5474366b6b04c7b3982deac32a0fe4b705f2e92c09bb/propcache-0.4.0-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:082a643479f49a6778dcd68a80262fc324b14fd8e9b1a5380331fe41adde1738", size = 192819, upload-time = "2025-10-04T21:56:45.702Z" },+ { url = "https://files.pythonhosted.org/packages/0b/74/3de3ef483e8615aaaf62026fcdcb20cbfc4535ea14871b12f72d52c1d6dc/propcache-0.4.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:26692850120241a99bb4a4eec675cd7b4fdc431144f0d15ef69f7f8599f6165f", size = 202492, upload-time = "2025-10-04T21:56:47.388Z" },+ { url = "https://files.pythonhosted.org/packages/46/86/a130dd85199d651a6986ba6bf1ce297b7bbcafc01c8e139e6ba2b8218a20/propcache-0.4.0-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:33ad7d37b9a386f97582f5d042cc7b8d4b3591bb384cf50866b749a17e4dba90", size = 204106, upload-time = "2025-10-04T21:56:49.139Z" },+ { url = "https://files.pythonhosted.org/packages/b2/f7/44eab58659d71d21995146c94139e63882bac280065b3a9ed10376897bcc/propcache-0.4.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:1e7fd82d4a5b7583588f103b0771e43948532f1292105f13ee6f3b300933c4ca", size = 198043, upload-time = "2025-10-04T21:56:50.561Z" },+ { url = "https://files.pythonhosted.org/packages/96/14/df37be1bf1423d2dda201a4cdb1c5cb44048d34e31a97df227cc25b0a55c/propcache-0.4.0-cp314-cp314-win32.whl", hash = "sha256:213eb0d3bc695a70cffffe11a1c2e1c2698d89ffd8dba35a49bc44a035d45c93", size = 38036, upload-time = "2025-10-04T21:56:51.868Z" },+ { url = "https://files.pythonhosted.org/packages/99/96/9cea65d6c50224737e80c57a3f3db4ca81bc7b1b52bc73346df8c50db400/propcache-0.4.0-cp314-cp314-win_amd64.whl", hash = "sha256:087e2d3d7613e1b59b2ffca0daabd500c1a032d189c65625ee05ea114afcad0b", size = 41156, upload-time = "2025-10-04T21:56:53.242Z" },+ { url = "https://files.pythonhosted.org/packages/52/4d/91523dcbe23cc127b097623a6ba177da51fca6b7c979082aa49745b527b7/propcache-0.4.0-cp314-cp314-win_arm64.whl", hash = "sha256:94b0f7407d18001dbdcbb239512e753b1b36725a6e08a4983be1c948f5435f79", size = 37976, upload-time = "2025-10-04T21:56:54.351Z" },+ { url = "https://files.pythonhosted.org/packages/ec/f7/7118a944cb6cdb548c9333cf311bda120f9793ecca54b2ca4a3f7e58723e/propcache-0.4.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:b730048ae8b875e2c0af1a09ca31b303fc7b5ed27652beec03fa22b29545aec9", size = 81270, upload-time = "2025-10-04T21:56:55.516Z" },+ { url = "https://files.pythonhosted.org/packages/ab/f9/04a8bc9977ea201783f3ccb04106f44697f635f70439a208852d4d08554d/propcache-0.4.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:f495007ada16a4e16312b502636fafff42a9003adf1d4fb7541e0a0870bc056f", size = 46224, upload-time = "2025-10-04T21:56:56.695Z" },+ { url = "https://files.pythonhosted.org/packages/0f/3d/808b074034156f130a0047304d811a5a5df3bb0976c9adfb9383718fd888/propcache-0.4.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:659a0ea6d9017558ed7af00fb4028186f64d0ba9adfc70a4d2c85fcd3d026321", size = 48246, upload-time = "2025-10-04T21:56:57.926Z" },+ { url = "https://files.pythonhosted.org/packages/66/eb/e311f3a59ddc93078cb079b12699af9fd844142c4b4d382b386ee071d921/propcache-0.4.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d74aa60b1ec076d4d5dcde27c9a535fc0ebb12613f599681c438ca3daa68acac", size = 275562, upload-time = "2025-10-04T21:56:59.221Z" },+ { url = "https://files.pythonhosted.org/packages/f4/05/a146094d6a00bb2f2036dd2a2f4c2b2733ff9574b59ce53bd8513edfca5d/propcache-0.4.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:34000e31795bdcda9826e0e70e783847a42e3dcd0d6416c5d3cb717905ebaec0", size = 273627, upload-time = "2025-10-04T21:57:00.582Z" },+ { url = "https://files.pythonhosted.org/packages/91/95/a6d138f6e3d5f6c9b34dbd336b964a1293f2f1a79cafbe70ae3403d7cc46/propcache-0.4.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:bcb5bfac5b9635e6fc520c8af6efc7a0a56f12a1fe9e9d3eb4328537e316dd6a", size = 279778, upload-time = "2025-10-04T21:57:01.944Z" },+ { url = "https://files.pythonhosted.org/packages/ac/09/19594a20da0519bfa00deef8cf35dda6c9a5b51bba947f366e85ea59b3de/propcache-0.4.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0ea11fceb31fa95b0fa2007037f19e922e2caceb7dc6c6cac4cb56e2d291f1a2", size = 262833, upload-time = "2025-10-04T21:57:03.326Z" },+ { url = "https://files.pythonhosted.org/packages/b5/92/60d2ddc7662f7b2720d3b628ad8ce888015f4ab5c335b7b1b50183194e68/propcache-0.4.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:cd8684f628fe285ea5c86f88e1c30716239dc9d6ac55e7851a4b7f555b628da3", size = 260456, upload-time = "2025-10-04T21:57:05.159Z" },+ { url = "https://files.pythonhosted.org/packages/6f/e2/4c2e25c77cf43add2e05a86c4fcf51107edc4d92318e5c593bbdc2515d57/propcache-0.4.0-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:790286d3d542c0ef9f6d0280d1049378e5e776dcba780d169298f664c39394db", size = 247284, upload-time = "2025-10-04T21:57:06.566Z" },+ { url = "https://files.pythonhosted.org/packages/dc/3e/c273ab8edc80683ec8b15b486e95c03096ef875d99e4b0ab0a36c1e42c94/propcache-0.4.0-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:009093c9b5dbae114a5958e6a649f8a5d94dd6866b0f82b60395eb92c58002d4", size = 262368, upload-time = "2025-10-04T21:57:08.231Z" },+ { url = "https://files.pythonhosted.org/packages/ac/a9/3fa231f65a9f78614c5aafa9cee788d7f55c22187cc2f33e86c7c16d0262/propcache-0.4.0-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:728d98179e92d77096937fdfecd2c555a3d613abe56c9909165c24196a3b5012", size = 263010, upload-time = "2025-10-04T21:57:09.641Z" },+ { url = "https://files.pythonhosted.org/packages/38/a0/f4f5d368e60c9dc04d3158eaf1ca0ad899b40ac3d29c015bf62735225a6f/propcache-0.4.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:a9725d96a81e17e48a0fe82d0c3de2f5e623d7163fec70a6c7df90753edd1bec", size = 257298, upload-time = "2025-10-04T21:57:11.125Z" },+ { url = "https://files.pythonhosted.org/packages/c7/30/f78d6758dc36a98f1cddc39b3185cefde616cc58248715b7c65495491cb1/propcache-0.4.0-cp314-cp314t-win32.whl", hash = "sha256:0964c55c95625193defeb4fd85f8f28a9a754ed012cab71127d10e3dc66b1373", size = 42484, upload-time = "2025-10-04T21:57:12.652Z" },+ { url = "https://files.pythonhosted.org/packages/4e/ad/de0640e9b56d2caa796c4266d7d1e6cc4544cc327c25b7ced5c59893b625/propcache-0.4.0-cp314-cp314t-win_amd64.whl", hash = "sha256:24403152e41abf09488d3ae9c0c3bf7ff93e2fb12b435390718f21810353db28", size = 46229, upload-time = "2025-10-04T21:57:14.034Z" },+ { url = "https://files.pythonhosted.org/packages/da/bf/5aed62dddbf2bbe62a3564677436261909c9dd63a0fa1fb6cf0629daa13c/propcache-0.4.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0363a696a9f24b37a04ed5e34c2e07ccbe92798c998d37729551120a1bb744c4", size = 40329, upload-time = "2025-10-04T21:57:15.198Z" },+ { url = "https://files.pythonhosted.org/packages/c7/16/794c114f6041bbe2de23eb418ef58a0f45de27224d5540f5dbb266a73d72/propcache-0.4.0-py3-none-any.whl", hash = "sha256:015b2ca2f98ea9e08ac06eecc409d5d988f78c5fd5821b2ad42bc9afcd6b1557", size = 13183, upload-time = "2025-10-04T21:57:38.054Z" },][[package]]@@ -2817,28 +2842,28 @@ wheels = [[[package]]name = "ruff"-version = "0.13.2"-source = { registry = "https://pypi.org/simple" }-sdist = { url = "https://files.pythonhosted.org/packages/02/df/8d7d8c515d33adfc540e2edf6c6021ea1c5a58a678d8cfce9fae59aabcab/ruff-0.13.2.tar.gz", hash = "sha256:cb12fffd32fb16d32cef4ed16d8c7cdc27ed7c944eaa98d99d01ab7ab0b710ff", size = 5416417, upload-time = "2025-09-25T14:54:09.936Z" }-wheels = [- { url = "https://files.pythonhosted.org/packages/6e/84/5716a7fa4758e41bf70e603e13637c42cfb9dbf7ceb07180211b9bbf75ef/ruff-0.13.2-py3-none-linux_armv6l.whl", hash = "sha256:3796345842b55f033a78285e4f1641078f902020d8450cade03aad01bffd81c3", size = 12343254, upload-time = "2025-09-25T14:53:27.784Z" },- { url = "https://files.pythonhosted.org/packages/9b/77/c7042582401bb9ac8eff25360e9335e901d7a1c0749a2b28ba4ecb239991/ruff-0.13.2-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ff7e4dda12e683e9709ac89e2dd436abf31a4d8a8fc3d89656231ed808e231d2", size = 13040891, upload-time = "2025-09-25T14:53:31.38Z" },- { url = "https://files.pythonhosted.org/packages/c6/15/125a7f76eb295cb34d19c6778e3a82ace33730ad4e6f28d3427e134a02e0/ruff-0.13.2-py3-none-macosx_11_0_arm64.whl", hash = "sha256:c75e9d2a2fafd1fdd895d0e7e24b44355984affdde1c412a6f6d3f6e16b22d46", size = 12243588, upload-time = "2025-09-25T14:53:33.543Z" },- { url = "https://files.pythonhosted.org/packages/9e/eb/0093ae04a70f81f8be7fd7ed6456e926b65d238fc122311293d033fdf91e/ruff-0.13.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cceac74e7bbc53ed7d15d1042ffe7b6577bf294611ad90393bf9b2a0f0ec7cb6", size = 12491359, upload-time = "2025-09-25T14:53:35.892Z" },- { url = "https://files.pythonhosted.org/packages/43/fe/72b525948a6956f07dad4a6f122336b6a05f2e3fd27471cea612349fedb9/ruff-0.13.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6ae3f469b5465ba6d9721383ae9d49310c19b452a161b57507764d7ef15f4b07", size = 12162486, upload-time = "2025-09-25T14:53:38.171Z" },- { url = "https://files.pythonhosted.org/packages/6a/e3/0fac422bbbfb2ea838023e0d9fcf1f30183d83ab2482800e2cb892d02dfe/ruff-0.13.2-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4f8f9e3cd6714358238cd6626b9d43026ed19c0c018376ac1ef3c3a04ffb42d8", size = 13871203, upload-time = "2025-09-25T14:53:41.943Z" },- { url = "https://files.pythonhosted.org/packages/6b/82/b721c8e3ec5df6d83ba0e45dcf00892c4f98b325256c42c38ef136496cbf/ruff-0.13.2-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:c6ed79584a8f6cbe2e5d7dbacf7cc1ee29cbdb5df1172e77fbdadc8bb85a1f89", size = 14929635, upload-time = "2025-09-25T14:53:43.953Z" },- { url = "https://files.pythonhosted.org/packages/c4/a0/ad56faf6daa507b83079a1ad7a11694b87d61e6bf01c66bd82b466f21821/ruff-0.13.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aed130b2fde049cea2019f55deb939103123cdd191105f97a0599a3e753d61b0", size = 14338783, upload-time = "2025-09-25T14:53:46.205Z" },- { url = "https://files.pythonhosted.org/packages/47/77/ad1d9156db8f99cd01ee7e29d74b34050e8075a8438e589121fcd25c4b08/ruff-0.13.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1887c230c2c9d65ed1b4e4cfe4d255577ea28b718ae226c348ae68df958191aa", size = 13355322, upload-time = "2025-09-25T14:53:48.164Z" },- { url = "https://files.pythonhosted.org/packages/64/8b/e87cfca2be6f8b9f41f0bb12dc48c6455e2d66df46fe61bb441a226f1089/ruff-0.13.2-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5bcb10276b69b3cfea3a102ca119ffe5c6ba3901e20e60cf9efb53fa417633c3", size = 13354427, upload-time = "2025-09-25T14:53:50.486Z" },- { url = "https://files.pythonhosted.org/packages/7f/df/bf382f3fbead082a575edb860897287f42b1b3c694bafa16bc9904c11ed3/ruff-0.13.2-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:afa721017aa55a555b2ff7944816587f1cb813c2c0a882d158f59b832da1660d", size = 13537637, upload-time = "2025-09-25T14:53:52.887Z" },- { url = "https://files.pythonhosted.org/packages/51/70/1fb7a7c8a6fc8bd15636288a46e209e81913b87988f26e1913d0851e54f4/ruff-0.13.2-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:1dbc875cf3720c64b3990fef8939334e74cb0ca65b8dbc61d1f439201a38101b", size = 12340025, upload-time = "2025-09-25T14:53:54.88Z" },- { url = "https://files.pythonhosted.org/packages/4c/27/1e5b3f1c23ca5dd4106d9d580e5c13d9acb70288bff614b3d7b638378cc9/ruff-0.13.2-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:5b939a1b2a960e9742e9a347e5bbc9b3c3d2c716f86c6ae273d9cbd64f193f22", size = 12133449, upload-time = "2025-09-25T14:53:57.089Z" },- { url = "https://files.pythonhosted.org/packages/2d/09/b92a5ccee289f11ab128df57d5911224197d8d55ef3bd2043534ff72ca54/ruff-0.13.2-py3-none-musllinux_1_2_i686.whl", hash = "sha256:50e2d52acb8de3804fc5f6e2fa3ae9bdc6812410a9e46837e673ad1f90a18736", size = 13051369, upload-time = "2025-09-25T14:53:59.124Z" },- { url = "https://files.pythonhosted.org/packages/89/99/26c9d1c7d8150f45e346dc045cc49f23e961efceb4a70c47dea0960dea9a/ruff-0.13.2-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:3196bc13ab2110c176b9a4ae5ff7ab676faaa1964b330a1383ba20e1e19645f2", size = 13523644, upload-time = "2025-09-25T14:54:01.622Z" },- { url = "https://files.pythonhosted.org/packages/f7/00/e7f1501e81e8ec290e79527827af1d88f541d8d26151751b46108978dade/ruff-0.13.2-py3-none-win32.whl", hash = "sha256:7c2a0b7c1e87795fec3404a485096bcd790216c7c146a922d121d8b9c8f1aaac", size = 12245990, upload-time = "2025-09-25T14:54:03.647Z" },- { url = "https://files.pythonhosted.org/packages/ee/bd/d9f33a73de84fafd0146c6fba4f497c4565fe8fa8b46874b8e438869abc2/ruff-0.13.2-py3-none-win_amd64.whl", hash = "sha256:17d95fb32218357c89355f6f6f9a804133e404fc1f65694372e02a557edf8585", size = 13324004, upload-time = "2025-09-25T14:54:06.05Z" },- { url = "https://files.pythonhosted.org/packages/c3/12/28fa2f597a605884deb0f65c1b1ae05111051b2a7030f5d8a4ff7f4599ba/ruff-0.13.2-py3-none-win_arm64.whl", hash = "sha256:da711b14c530412c827219312b7d7fbb4877fb31150083add7e8c5336549cea7", size = 12484437, upload-time = "2025-09-25T14:54:08.022Z" },+version = "0.13.3"+source = { registry = "https://pypi.org/simple" }+sdist = { url = "https://files.pythonhosted.org/packages/c7/8e/f9f9ca747fea8e3ac954e3690d4698c9737c23b51731d02df999c150b1c9/ruff-0.13.3.tar.gz", hash = "sha256:5b0ba0db740eefdfbcce4299f49e9eaefc643d4d007749d77d047c2bab19908e", size = 5438533, upload-time = "2025-10-02T19:29:31.582Z" }+wheels = [+ { url = "https://files.pythonhosted.org/packages/d2/33/8f7163553481466a92656d35dea9331095122bb84cf98210bef597dd2ecd/ruff-0.13.3-py3-none-linux_armv6l.whl", hash = "sha256:311860a4c5e19189c89d035638f500c1e191d283d0cc2f1600c8c80d6dcd430c", size = 12484040, upload-time = "2025-10-02T19:28:49.199Z" },+ { url = "https://files.pythonhosted.org/packages/b0/b5/4a21a4922e5dd6845e91896b0d9ef493574cbe061ef7d00a73c61db531af/ruff-0.13.3-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:2bdad6512fb666b40fcadb65e33add2b040fc18a24997d2e47fee7d66f7fcae2", size = 13122975, upload-time = "2025-10-02T19:28:52.446Z" },+ { url = "https://files.pythonhosted.org/packages/40/90/15649af836d88c9f154e5be87e64ae7d2b1baa5a3ef317cb0c8fafcd882d/ruff-0.13.3-py3-none-macosx_11_0_arm64.whl", hash = "sha256:fc6fa4637284708d6ed4e5e970d52fc3b76a557d7b4e85a53013d9d201d93286", size = 12346621, upload-time = "2025-10-02T19:28:54.712Z" },+ { url = "https://files.pythonhosted.org/packages/a5/42/bcbccb8141305f9a6d3f72549dd82d1134299177cc7eaf832599700f95a7/ruff-0.13.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1c9e6469864f94a98f412f20ea143d547e4c652f45e44f369d7b74ee78185838", size = 12574408, upload-time = "2025-10-02T19:28:56.679Z" },+ { url = "https://files.pythonhosted.org/packages/ce/19/0f3681c941cdcfa2d110ce4515624c07a964dc315d3100d889fcad3bfc9e/ruff-0.13.3-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5bf62b705f319476c78891e0e97e965b21db468b3c999086de8ffb0d40fd2822", size = 12285330, upload-time = "2025-10-02T19:28:58.79Z" },+ { url = "https://files.pythonhosted.org/packages/10/f8/387976bf00d126b907bbd7725219257feea58650e6b055b29b224d8cb731/ruff-0.13.3-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:78cc1abed87ce40cb07ee0667ce99dbc766c9f519eabfd948ed87295d8737c60", size = 13980815, upload-time = "2025-10-02T19:29:01.577Z" },+ { url = "https://files.pythonhosted.org/packages/0c/a6/7c8ec09d62d5a406e2b17d159e4817b63c945a8b9188a771193b7e1cc0b5/ruff-0.13.3-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:4fb75e7c402d504f7a9a259e0442b96403fa4a7310ffe3588d11d7e170d2b1e3", size = 14987733, upload-time = "2025-10-02T19:29:04.036Z" },+ { url = "https://files.pythonhosted.org/packages/97/e5/f403a60a12258e0fd0c2195341cfa170726f254c788673495d86ab5a9a9d/ruff-0.13.3-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:17b951f9d9afb39330b2bdd2dd144ce1c1335881c277837ac1b50bfd99985ed3", size = 14439848, upload-time = "2025-10-02T19:29:06.684Z" },+ { url = "https://files.pythonhosted.org/packages/39/49/3de381343e89364c2334c9f3268b0349dc734fc18b2d99a302d0935c8345/ruff-0.13.3-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6052f8088728898e0a449f0dde8fafc7ed47e4d878168b211977e3e7e854f662", size = 13421890, upload-time = "2025-10-02T19:29:08.767Z" },+ { url = "https://files.pythonhosted.org/packages/ab/b5/c0feca27d45ae74185a6bacc399f5d8920ab82df2d732a17213fb86a2c4c/ruff-0.13.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc742c50f4ba72ce2a3be362bd359aef7d0d302bf7637a6f942eaa763bd292af", size = 13444870, upload-time = "2025-10-02T19:29:11.234Z" },+ { url = "https://files.pythonhosted.org/packages/50/a1/b655298a1f3fda4fdc7340c3f671a4b260b009068fbeb3e4e151e9e3e1bf/ruff-0.13.3-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:8e5640349493b378431637019366bbd73c927e515c9c1babfea3e932f5e68e1d", size = 13691599, upload-time = "2025-10-02T19:29:13.353Z" },+ { url = "https://files.pythonhosted.org/packages/32/b0/a8705065b2dafae007bcae21354e6e2e832e03eb077bb6c8e523c2becb92/ruff-0.13.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:6b139f638a80eae7073c691a5dd8d581e0ba319540be97c343d60fb12949c8d0", size = 12421893, upload-time = "2025-10-02T19:29:15.668Z" },+ { url = "https://files.pythonhosted.org/packages/0d/1e/cbe7082588d025cddbb2f23e6dfef08b1a2ef6d6f8328584ad3015b5cebd/ruff-0.13.3-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:6b547def0a40054825de7cfa341039ebdfa51f3d4bfa6a0772940ed351d2746c", size = 12267220, upload-time = "2025-10-02T19:29:17.583Z" },+ { url = "https://files.pythonhosted.org/packages/a5/99/4086f9c43f85e0755996d09bdcb334b6fee9b1eabdf34e7d8b877fadf964/ruff-0.13.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:9cc48a3564423915c93573f1981d57d101e617839bef38504f85f3677b3a0a3e", size = 13177818, upload-time = "2025-10-02T19:29:19.943Z" },+ { url = "https://files.pythonhosted.org/packages/9b/de/7b5db7e39947d9dc1c5f9f17b838ad6e680527d45288eeb568e860467010/ruff-0.13.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:1a993b17ec03719c502881cb2d5f91771e8742f2ca6de740034433a97c561989", size = 13618715, upload-time = "2025-10-02T19:29:22.527Z" },+ { url = "https://files.pythonhosted.org/packages/28/d3/bb25ee567ce2f61ac52430cf99f446b0e6d49bdfa4188699ad005fdd16aa/ruff-0.13.3-py3-none-win32.whl", hash = "sha256:f14e0d1fe6460f07814d03c6e32e815bff411505178a1f539a38f6097d3e8ee3", size = 12334488, upload-time = "2025-10-02T19:29:24.782Z" },+ { url = "https://files.pythonhosted.org/packages/cf/49/12f5955818a1139eed288753479ba9d996f6ea0b101784bb1fe6977ec128/ruff-0.13.3-py3-none-win_amd64.whl", hash = "sha256:621e2e5812b691d4f244638d693e640f188bacbb9bc793ddd46837cea0503dd2", size = 13455262, upload-time = "2025-10-02T19:29:26.882Z" },+ { url = "https://files.pythonhosted.org/packages/fe/72/7b83242b26627a00e3af70d0394d68f8f02750d642567af12983031777fc/ruff-0.13.3-py3-none-win_arm64.whl", hash = "sha256:9e9e9d699841eaf4c2c798fa783df2fabc680b72059a02ca0ed81c460bc58330", size = 12538484, upload-time = "2025-10-02T19:29:28.951Z" },][[package]]@@ -2993,7 +3018,7 @@ wheels = [[[package]]name = "types-aioboto3"-version = "15.1.0"+version = "15.2.0"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "botocore-stubs" },@@ -3001,9 +3026,9 @@ dependencies = [{ name = "types-s3transfer" },{ name = "typing-extensions", marker = "python_full_version < '3.12'" },]-sdist = { url = "https://files.pythonhosted.org/packages/25/96/25b5f3b44dc6f0bb4efd21b1cc420d32ce34b4064e04e166ef0e852f8785/types_aioboto3-15.1.0.tar.gz", hash = "sha256:2f1bdfaf25ec015a50c0ce703b4298de1f2c9655f52b4a345334dd4f6ba14196", size = 81801, upload-time = "2025-08-15T01:17:05.565Z" }+sdist = { url = "https://files.pythonhosted.org/packages/9d/a5/6a9559fd76beb2c7177046a82181d02947c8b75a8972ec4a1c529970c6e5/types_aioboto3-15.2.0.tar.gz", hash = "sha256:bd8f344b9063e5919947d7e4079b610c7bd2d446b55b4ef56d1401f2af3230b0", size = 82322, upload-time = "2025-10-05T01:14:10.194Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/ad/32/8382d5eaa04c391400f5b012f168a234755069faba2b55e43546a5349b84/types_aioboto3-15.1.0-py3-none-any.whl", hash = "sha256:5b897de267eb1766f02d1cd089e21ca88eeff18bd04000cba8713ea3468a3db5", size = 42867, upload-time = "2025-08-15T01:17:01.927Z" },+ { url = "https://files.pythonhosted.org/packages/76/3a/368a27aab946caa472bf04fcb6eca0589c6cd404d14f1e0491b606a92c0a/types_aioboto3-15.2.0-py3-none-any.whl", hash = "sha256:8432aa01680fb9263b49780cb0bbff6fe5a42783072bf702ee9450a5d2e8092b", size = 43157, upload-time = "2025-10-05T01:14:07.038Z" },][package.optional-dependencies]