Skip to content

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

Refactor/tweaks to stuff factory (#344)

Louis Choquel4dd663d548e2
diff --git a/pipelex/client/api_serializer.py b/pipelex/client/api_serializer.py
index 7dabee824..9c5b60b05 100644
--- a/pipelex/client/api_serializer.py
+++ b/pipelex/client/api_serializer.py
@@ -5,7 +5,7 @@ from pathlib import Path
from typing import TYPE_CHECKING, Any, cast
from pipelex.client.protocol import CompactMemory
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory import WorkingMemory
from pipelex.core.pipes.pipe_output import PipeOutput
@@ -36,7 +36,7 @@ class ApiSerializer:
return compact_memory
for stuff_name, stuff in working_memory.root.items():
- if NativeConceptEnum.is_text(concept_code=stuff.concept.code):
+ if NativeConceptCode.is_text(concept_code=stuff.concept.code):
stuff_content = cast("TextContent", stuff.content)
item_dict: dict[str, Any] = {
"concept_code": stuff.concept.code,
diff --git a/pipelex/core/concepts/concept.py b/pipelex/core/concepts/concept.py
index fb1a6a81c..1720d8c1f 100644
--- a/pipelex/core/concepts/concept.py
+++ b/pipelex/core/concepts/concept.py
@@ -3,7 +3,7 @@ from pydantic import BaseModel, ConfigDict, field_validator
from pipelex import log
from pipelex.core.concepts.concept_blueprint import ConceptBlueprint
-from pipelex.core.concepts.concept_native import NativeConceptManager
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.domains.domain_blueprint import DomainBlueprint
from pipelex.core.stuffs.image_field_search import search_for_nested_image_fields
@@ -32,20 +32,20 @@ class Concept(BaseModel):
return concept_string.startswith(SpecialDomain.IMPLICIT)
@field_validator("code")
- @staticmethod
- def validate_code(code: str) -> str:
+ @classmethod
+ def validate_code(cls, code: str) -> str:
ConceptBlueprint.validate_concept_code(concept_code=code)
return code
@field_validator("domain")
- @staticmethod
- def validate_domain(domain: str) -> str:
+ @classmethod
+ def validate_domain(cls, domain: str) -> str:
DomainBlueprint.validate_domain_code(code=domain)
return domain
@field_validator("refines", mode="before")
- @staticmethod
- def validate_refines(refines: str | None) -> str | None:
+ @classmethod
+ def validate_refines(cls, refines: str | None) -> str | None:
if refines is None:
return None
ConceptBlueprint.validate_concept_string(concept_string=refines)
@@ -57,7 +57,7 @@ class Concept(BaseModel):
@classmethod
def is_native_concept(cls, concept: "Concept") -> bool:
- return NativeConceptManager.is_native_concept(concept_string_or_code=concept.concept_string)
+ return NativeConceptCode.get_validated_native_concept_string(concept_string_or_code=concept.concept_string) is not None
@classmethod
def are_concept_compatible(cls, concept_1: "Concept", concept_2: "Concept", strict: bool = False) -> bool:
diff --git a/pipelex/core/concepts/concept_blueprint.py b/pipelex/core/concepts/concept_blueprint.py
index f01dfb0f7..fae92136d 100644
--- a/pipelex/core/concepts/concept_blueprint.py
+++ b/pipelex/core/concepts/concept_blueprint.py
@@ -3,7 +3,7 @@ from typing import Any
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
-from pipelex.core.concepts.concept_native import NativeConceptEnum, NativeConceptManager
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.concepts.exceptions import ConceptCodeError, ConceptStringError, ConceptStringOrConceptCodeError
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.domains.domain_blueprint import DomainBlueprint
@@ -124,7 +124,7 @@ class ConceptBlueprint(BaseModel):
@classmethod
def is_native_concept_code(cls, concept_code: str) -> bool:
ConceptBlueprint.validate_concept_code(concept_code=concept_code)
- return concept_code in NativeConceptEnum.values_list()
+ return NativeConceptCode.is_native_concept(concept_code=concept_code)
@classmethod
def validate_concept_code(cls, concept_code: str) -> None:
@@ -175,7 +175,7 @@ class ConceptBlueprint(BaseModel):
raise ConceptCodeError(msg)
# Validate that if the concept code is among the native concepts, the domain MUST be native.
- if concept_code in NativeConceptEnum.values_list():
+ if concept_code in NativeConceptCode.values_list():
if not SpecialDomain.is_native(domain=domain):
msg = (
f"Concept string '{concept_string}' is invalid. "
@@ -185,7 +185,7 @@ class ConceptBlueprint(BaseModel):
raise ConceptStringError(msg)
# Validate that if the domain is native, the concept code is a native concept
if SpecialDomain.is_native(domain=domain):
- if concept_code not in NativeConceptEnum.values_list():
+ if concept_code not in NativeConceptCode.values_list():
msg = (
f"Concept string '{concept_string}' is invalid. "
f"Concept code '{concept_code}' is not a native concept, so the domain must not be '{SpecialDomain.NATIVE}'."
@@ -196,10 +196,9 @@ class ConceptBlueprint(BaseModel):
@classmethod
def validate_refines(cls, refines: str | None = None) -> str | None:
if refines is not None:
- if not NativeConceptManager.is_native_concept(refines):
- msg = f"Forbidden to refine a non-native concept: '{refines}'. Refining non-native concepts will come soon."
+ if not NativeConceptCode.get_validated_native_concept_string(concept_string_or_code=refines):
+ msg = f"Refine '{refines}' is not a native concept and we currently can only refine native concepts"
raise ConceptBlueprintError(msg)
- cls.validate_concept_string_or_code(concept_string_or_code=refines)
return refines
@model_validator(mode="before")
diff --git a/pipelex/core/concepts/concept_factory.py b/pipelex/core/concepts/concept_factory.py
index 57c033b4d..f48fd2694 100644
--- a/pipelex/core/concepts/concept_factory.py
+++ b/pipelex/core/concepts/concept_factory.py
@@ -7,7 +7,7 @@ from pipelex.core.concepts.concept_blueprint import (
ConceptStructureBlueprint,
ConceptStructureBlueprintFieldType,
)
-from pipelex.core.concepts.concept_native import NativeConceptEnumData, NativeConceptManager
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.concepts.structure_generator import StructureGenerator
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.stuffs.text_content import TextContent
@@ -69,13 +69,76 @@ class ConceptFactory:
)
@classmethod
- def make_native_concept(cls, native_concept_data: NativeConceptEnumData) -> Concept:
- return Concept(
- code=native_concept_data.code,
- domain=SpecialDomain.NATIVE,
- description=native_concept_data.description,
- structure_class_name=native_concept_data.content_class_name,
- )
+ def make_native_concept_from_enum(cls, native_concept_code: NativeConceptCode) -> Concept:
+ structure_class_name = native_concept_code.structure_class_name
+ match native_concept_code:
+ case NativeConceptCode.DYNAMIC:
+ return Concept(
+ code=native_concept_code,
+ domain=SpecialDomain.NATIVE,
+ description="A dynamic concept",
+ structure_class_name=structure_class_name,
+ )
+ case NativeConceptCode.TEXT:
+ return Concept(
+ code=native_concept_code,
+ domain=SpecialDomain.NATIVE,
+ description="A text",
+ structure_class_name=structure_class_name,
+ )
+ case NativeConceptCode.IMAGE:
+ return Concept(
+ code=native_concept_code,
+ domain=SpecialDomain.NATIVE,
+ description="An image",
+ structure_class_name=structure_class_name,
+ )
+ case NativeConceptCode.PDF:
+ return Concept(
+ code=native_concept_code,
+ domain=SpecialDomain.NATIVE,
+ description="A PDF",
+ structure_class_name=structure_class_name,
+ )
+ case NativeConceptCode.TEXT_AND_IMAGES:
+ return Concept(
+ code=native_concept_code,
+ domain=SpecialDomain.NATIVE,
+ description="A text and an image",
+ structure_class_name=structure_class_name,
+ )
+ case NativeConceptCode.NUMBER:
+ return Concept(
+ code=native_concept_code,
+ domain=SpecialDomain.NATIVE,
+ description="A number",
+ structure_class_name=structure_class_name,
+ )
+ case NativeConceptCode.LLM_PROMPT:
+ return Concept(
+ code=native_concept_code,
+ domain=SpecialDomain.NATIVE,
+ description="A prompt for an LLM",
+ structure_class_name=structure_class_name,
+ )
+ case NativeConceptCode.PAGE:
+ return Concept(
+ code=native_concept_code,
+ domain=SpecialDomain.NATIVE,
+ description="The content of a page of a document, comprising text and linked images and an optional page view image",
+ structure_class_name=structure_class_name,
+ )
+ case NativeConceptCode.ANYTHING:
+ return Concept(
+ code=native_concept_code,
+ domain=SpecialDomain.NATIVE,
+ description="Anything",
+ structure_class_name=structure_class_name,
+ )
+
+ @classmethod
+ def make_all_native_concepts(cls) -> list[Concept]:
+ return [cls.make_native_concept_from_enum(native_concept_code=native_concept) for native_concept in NativeConceptCode.values_list()]
@classmethod
def make_domain_and_concept_code_from_concept_string_or_code(
@@ -89,7 +152,7 @@ class ConceptFactory:
# Is a concept string.
parts = concept_string_or_code.rsplit(".")
return DomainAndConceptCode(domain=parts[0], concept_code=parts[1])
- if NativeConceptManager.is_native_concept(concept_string_or_code=concept_string_or_code):
+ if NativeConceptCode.get_validated_native_concept_string(concept_string_or_code=concept_string_or_code):
return DomainAndConceptCode(domain=SpecialDomain.NATIVE, concept_code=concept_string_or_code)
if (
@@ -119,10 +182,11 @@ class ConceptFactory:
@classmethod
def make_refine(cls, refine: str) -> str:
- if not NativeConceptManager.is_native_concept(concept_string_or_code=refine):
- msg = f"Refine '{refine}' is not a native concept"
+ if native_concept_string := NativeConceptCode.get_validated_native_concept_string(concept_string_or_code=refine):
+ return native_concept_string
+ else:
+ msg = f"Refine '{refine}' is not a native concept and we currently can only refine native concepts"
raise ConceptRefineError(msg)
- return NativeConceptManager.get_native_concept_string(concept_string_or_code=refine)
@classmethod
def make_from_blueprint_or_description(
diff --git a/pipelex/core/concepts/concept_library.py b/pipelex/core/concepts/concept_library.py
index c44230b63..807184ead 100644
--- a/pipelex/core/concepts/concept_library.py
+++ b/pipelex/core/concepts/concept_library.py
@@ -7,7 +7,7 @@ from pipelex.core.concepts.concept import Concept
from pipelex.core.concepts.concept_blueprint import ConceptBlueprint
from pipelex.core.concepts.concept_factory import ConceptFactory
from pipelex.core.concepts.concept_library_abstract import ConceptLibraryAbstract
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.stuffs.image_content import ImageContent
from pipelex.exceptions import ConceptLibraryConceptNotFoundError, ConceptLibraryError
@@ -29,11 +29,8 @@ class ConceptLibrary(RootModel[ConceptLibraryRoot], ConceptLibraryAbstract):
@override
def setup(self):
- native_concepts = [
- ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[native_concept])
- for native_concept in NativeConceptEnum.values_list()
- ]
- self.add_concepts(native_concepts)
+ all_native_concepts = ConceptFactory.make_all_native_concepts()
+ self.add_concepts(concepts=all_native_concepts)
@override
def reset(self):
@@ -96,7 +93,7 @@ class ConceptLibrary(RootModel[ConceptLibraryRoot], ConceptLibraryAbstract):
return the_concept
@override
- def get_native_concept(self, native_concept: NativeConceptEnum) -> Concept:
+ def get_native_concept(self, native_concept: NativeConceptCode) -> Concept:
the_native_concept = self.get_optional_concept(f"{SpecialDomain.NATIVE}.{native_concept}")
if not the_native_concept:
msg = f"Native concept '{native_concept}' not found in the library"
@@ -105,7 +102,7 @@ class ConceptLibrary(RootModel[ConceptLibraryRoot], ConceptLibraryAbstract):
def get_native_concepts(self) -> list[Concept]:
"""Create all native concepts from the hardcoded data"""
- return [self.get_native_concept(native_concept=native_concept) for native_concept in NativeConceptEnum.values_list()]
+ return [self.get_native_concept(native_concept=native_concept) for native_concept in NativeConceptCode.values_list()]
@override
def get_class(self, concept_code: str) -> type[Any] | None:
@@ -121,7 +118,7 @@ class ConceptLibrary(RootModel[ConceptLibraryRoot], ConceptLibraryAbstract):
is_image_class = bool(pydantic_model and issubclass(pydantic_model, ImageContent))
refines_image = self.is_compatible(
tested_concept=concept,
- wanted_concept=self.get_native_concept(native_concept=NativeConceptEnum.IMAGE),
+ wanted_concept=self.get_native_concept(native_concept=NativeConceptCode.IMAGE),
strict=True,
)
return is_image_class or refines_image
diff --git a/pipelex/core/concepts/concept_library_abstract.py b/pipelex/core/concepts/concept_library_abstract.py
index 9ecc03542..386e895a3 100644
--- a/pipelex/core/concepts/concept_library_abstract.py
+++ b/pipelex/core/concepts/concept_library_abstract.py
@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
from typing import Any
from pipelex.core.concepts.concept import Concept
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
class ConceptLibraryAbstract(ABC):
@@ -59,5 +59,5 @@ class ConceptLibraryAbstract(ABC):
pass
@abstractmethod
- def get_native_concept(self, native_concept: NativeConceptEnum) -> Concept:
+ def get_native_concept(self, native_concept: NativeConceptCode) -> Concept:
pass
diff --git a/pipelex/core/concepts/concept_native.py b/pipelex/core/concepts/concept_native.py
index eab191f56..559976609 100644
--- a/pipelex/core/concepts/concept_native.py
+++ b/pipelex/core/concepts/concept_native.py
@@ -1,5 +1,3 @@
-from typing import NamedTuple
-
from pipelex.core.domains.domain import SpecialDomain
from pipelex.types import StrEnum
@@ -8,13 +6,7 @@ class NativeConceptEnumError(Exception):
pass
-class NativeConceptEnumData(NamedTuple):
- code: str
- content_class_name: str
- description: str
-
-
-class NativeConceptEnum(StrEnum):
+class NativeConceptCode(StrEnum):
DYNAMIC = "Dynamic"
TEXT = "Text"
IMAGE = "Image"
@@ -25,119 +17,60 @@ class NativeConceptEnum(StrEnum):
PAGE = "Page"
ANYTHING = "Anything"
- @classmethod
- def values_list(cls) -> list["NativeConceptEnum"]:
- return list(cls)
+ @property
+ def concept_string(self) -> str:
+ return f"{SpecialDomain.NATIVE}.{self.value}"
+
+ @property
+ def structure_class_name(self) -> str:
+ return f"{self.value}Content"
@classmethod
def is_text(cls, concept_code: str) -> bool:
try:
- enum_value = NativeConceptEnum(concept_code)
+ enum_value = NativeConceptCode(concept_code)
except ValueError:
return False
match enum_value:
- case NativeConceptEnum.TEXT:
+ case NativeConceptCode.TEXT:
return True
case (
- NativeConceptEnum.DYNAMIC
- | NativeConceptEnum.IMAGE
- | NativeConceptEnum.PDF
- | NativeConceptEnum.TEXT_AND_IMAGES
- | NativeConceptEnum.NUMBER
- | NativeConceptEnum.LLM_PROMPT
- | NativeConceptEnum.PAGE
- | NativeConceptEnum.ANYTHING
+ NativeConceptCode.DYNAMIC
+ | NativeConceptCode.IMAGE
+ | NativeConceptCode.PDF
+ | NativeConceptCode.TEXT_AND_IMAGES
+ | NativeConceptCode.NUMBER
+ | NativeConceptCode.LLM_PROMPT
+ | NativeConceptCode.PAGE
+ | NativeConceptCode.ANYTHING
):
return False
-
-NATIVE_CONCEPTS_DATA: dict[NativeConceptEnum, NativeConceptEnumData] = {
- NativeConceptEnum.DYNAMIC: NativeConceptEnumData(
- code=NativeConceptEnum.DYNAMIC,
- content_class_name=f"{NativeConceptEnum.DYNAMIC}Content",
- description="A dynamic concept",
- ),
- NativeConceptEnum.TEXT: NativeConceptEnumData(
- code=NativeConceptEnum.TEXT,
- content_class_name=f"{NativeConceptEnum.TEXT}Content",
- description="A text",
- ),
- NativeConceptEnum.IMAGE: NativeConceptEnumData(
- code=NativeConceptEnum.IMAGE,
- content_class_name=f"{NativeConceptEnum.IMAGE}Content",
- description="An image",
- ),
- NativeConceptEnum.PDF: NativeConceptEnumData(
- code=NativeConceptEnum.PDF,
- content_class_name=f"{NativeConceptEnum.PDF}Content",
- description="A PDF",
- ),
- NativeConceptEnum.TEXT_AND_IMAGES: NativeConceptEnumData(
- code=NativeConceptEnum.TEXT_AND_IMAGES,
- content_class_name=f"{NativeConceptEnum.TEXT_AND_IMAGES}Content",
- description="A text and an image",
- ),
- NativeConceptEnum.NUMBER: NativeConceptEnumData(
- code=NativeConceptEnum.NUMBER,
- content_class_name=f"{NativeConceptEnum.NUMBER}Content",
- description="A number",
- ),
- NativeConceptEnum.LLM_PROMPT: NativeConceptEnumData(
- code=NativeConceptEnum.LLM_PROMPT,
- content_class_name=f"{NativeConceptEnum.LLM_PROMPT}Content",
- description="A prompt for an LLM",
- ),
- NativeConceptEnum.PAGE: NativeConceptEnumData(
- code=NativeConceptEnum.PAGE,
- content_class_name=f"{NativeConceptEnum.PAGE}Content",
- description="The content of a page of a document, comprising text and linked images and an optional page view image",
- ),
- NativeConceptEnum.ANYTHING: NativeConceptEnumData(
- code=NativeConceptEnum.ANYTHING,
- content_class_name=f"{NativeConceptEnum.ANYTHING}Content",
- description="Anything",
- ),
-}
-
-
-class NativeConceptManager:
@classmethod
- def is_native_concept(cls, concept_string_or_code: str) -> bool:
- native_concept_values = NativeConceptEnum.values_list()
-
- if "." in concept_string_or_code:
- domain, concept_code = concept_string_or_code.split(".", 1)
- if SpecialDomain.is_native(domain=domain) and concept_code in native_concept_values:
- return True
-
- return concept_string_or_code in native_concept_values
+ def values_list(cls) -> list["NativeConceptCode"]:
+ return list(cls)
@classmethod
- def get_native_concept_string(cls, concept_string_or_code: str) -> str:
- if not cls.is_native_concept(concept_string_or_code):
- msg = f"Trying to get a native concept with code '{concept_string_or_code}' that is not a native concept"
- raise NativeConceptEnumError(msg)
-
- if "." in concept_string_or_code and SpecialDomain.is_native(domain=concept_string_or_code.split(".")[0]):
- return concept_string_or_code
-
- return f"{SpecialDomain.NATIVE}.{concept_string_or_code}"
+ def is_native_concept(cls, concept_code: str) -> bool:
+ return concept_code in cls.values_list()
@classmethod
- def get_native_concept_enum(cls, concept_string_or_code: str) -> NativeConceptEnum:
- if not cls.is_native_concept(concept_string_or_code):
- msg = f"Trying to get a native concept with string or code '{concept_string_or_code}' that is not a native concept"
- raise NativeConceptEnumError(msg)
+ def native_concept_class_names(cls):
+ return [native_concept.structure_class_name for native_concept in cls]
+ @classmethod
+ def get_validated_native_concept_string(cls, concept_string_or_code: str) -> str | None:
if "." in concept_string_or_code:
- _, concept_code = concept_string_or_code.split(".", 1)
+ if concept_string_or_code.count(".") > 1:
+ msg = f"Trying to get a native concept with code '{concept_string_or_code}' but that is not a native concept"
+ raise NativeConceptEnumError(msg)
+ domain_code, concept_code = concept_string_or_code.split(".", 1)
+ if SpecialDomain.is_native(domain=domain_code) and concept_code in cls.values_list():
+ return concept_string_or_code
+ else:
+ return None
+ elif concept_string_or_code in cls.values_list():
+ return f"{SpecialDomain.NATIVE}.{concept_string_or_code}"
else:
- concept_code = concept_string_or_code
-
- return NativeConceptEnum(concept_code)
-
- @classmethod
- def get_native_concept_data(cls, concept_string_or_code: str) -> NativeConceptEnumData:
- enum_value = cls.get_native_concept_enum(concept_string_or_code)
- return NATIVE_CONCEPTS_DATA[enum_value]
+ return None
diff --git a/pipelex/core/memory/working_memory_factory.py b/pipelex/core/memory/working_memory_factory.py
index 0d58c7c84..f43f39518 100644
--- a/pipelex/core/memory/working_memory_factory.py
+++ b/pipelex/core/memory/working_memory_factory.py
@@ -7,7 +7,7 @@ from pydantic import BaseModel
from pipelex import log
from pipelex.client.protocol import CompactMemory, ImplicitMemory
from pipelex.core.concepts.concept import ConceptBlueprint, SpecialDomain
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory import MAIN_STUFF_NAME, StuffDict, WorkingMemory
from pipelex.core.pipes.input_requirements import TypedNamedInputRequirement
from pipelex.core.stuffs.image_content import ImageContent
@@ -26,7 +26,7 @@ class WorkingMemoryFactory(BaseModel):
def make_from_text(
cls,
text: str,
- concept_string: str = SpecialDomain.NATIVE + "." + NativeConceptEnum.TEXT,
+ concept_string: str = SpecialDomain.NATIVE + "." + NativeConceptCode.TEXT,
name: str | None = "text",
) -> WorkingMemory:
ConceptBlueprint.validate_concept_string(concept_string=concept_string)
@@ -42,7 +42,7 @@ class WorkingMemoryFactory(BaseModel):
def make_from_image(
cls,
image_url: str,
- concept_string: str = SpecialDomain.NATIVE + "." + NativeConceptEnum.IMAGE,
+ concept_string: str = SpecialDomain.NATIVE + "." + NativeConceptCode.IMAGE,
name: str | None = "image",
) -> WorkingMemory:
# TODO: validate that the concept is compatible with an image concept
@@ -58,7 +58,7 @@ class WorkingMemoryFactory(BaseModel):
def make_from_pdf(
cls,
pdf_url: str,
- concept_string: str = SpecialDomain.NATIVE + "." + NativeConceptEnum.PDF,
+ concept_string: str = SpecialDomain.NATIVE + "." + NativeConceptCode.PDF,
name: str | None = "pdf",
) -> WorkingMemory:
ConceptBlueprint.validate_concept_string(concept_string=concept_string)
@@ -111,7 +111,7 @@ class WorkingMemoryFactory(BaseModel):
continue
text_content = TextContent(text=content)
stuff_dict[name] = StuffFactory.make_stuff(
- concept=get_required_concept(concept_string=SpecialDomain.NATIVE + "." + NativeConceptEnum.TEXT),
+ concept=get_required_concept(concept_string=SpecialDomain.NATIVE + "." + NativeConceptCode.TEXT),
content=text_content,
name=name,
code="",
diff --git a/pipelex/core/stuffs/stuff_factory.py b/pipelex/core/stuffs/stuff_factory.py
index 2ae305068..000674e53 100644
--- a/pipelex/core/stuffs/stuff_factory.py
+++ b/pipelex/core/stuffs/stuff_factory.py
@@ -7,7 +7,7 @@ from pipelex.client.protocol import StuffContentOrData
from pipelex.core.concepts.concept import Concept
from pipelex.core.concepts.concept_blueprint import ConceptBlueprint
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum, NativeConceptManager
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.stuffs.list_content import ListContent
from pipelex.core.stuffs.stuff import Stuff
from pipelex.core.stuffs.stuff_content import StuffContent
@@ -38,6 +38,14 @@ 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_from_enum(native_concept_code=NativeConceptCode.TEXT),
+ content=TextContent(text=str_value),
+ name=name,
+ )
+
@classmethod
def make_from_concept_string(cls, concept_string: str, name: str, content: StuffContent) -> Stuff:
ConceptBlueprint.validate_concept_string(concept_string)
@@ -65,35 +73,15 @@ class StuffFactory:
stuff_code=code or shortuuid.uuid()[:5],
)
- @classmethod
- def make_stuff_using_concept_name_and_search_domains(
- cls,
- concept_name: str,
- search_domains: list[str],
- content: StuffContent,
- name: str | None = None,
- code: str | None = None,
- ) -> Stuff:
- # TODO: Add unit tests for this method
- concept_library = get_concept_library()
- concept = concept_library.search_for_concept_in_domains(
- concept_code=concept_name,
- search_domains=search_domains,
- )
- if not concept:
- msg = f"Could not find a concept named '{concept_name}' in domains {search_domains}"
- raise StuffFactoryError(msg)
- return cls.make_stuff(concept=concept, content=content, name=name, code=code)
-
@classmethod
def make_from_blueprint(cls, blueprint: StuffBlueprint) -> "Stuff":
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),
+ wanted_concept=get_native_concept(native_concept=NativeConceptCode.TEXT),
):
the_stuff = cls.make_stuff(
- concept=get_native_concept(native_concept=NativeConceptEnum.TEXT),
+ concept=get_native_concept(native_concept=NativeConceptCode.TEXT),
content=TextContent(text=blueprint.content),
name=blueprint.stuff_name,
)
@@ -130,6 +118,26 @@ class StuffFactory:
name=name,
)
+ @classmethod
+ def make_stuff_using_concept_name_and_search_domains(
+ cls,
+ concept_name: str,
+ search_domains: list[str],
+ content: StuffContent,
+ name: str | None = None,
+ code: str | None = None,
+ ) -> Stuff:
+ # TODO: Add unit tests for this method
+ concept_library = get_concept_library()
+ concept = concept_library.search_for_concept_in_domains(
+ concept_code=concept_name,
+ search_domains=search_domains,
+ )
+ if not concept:
+ msg = f"Could not find a concept named '{concept_name}' in domains {search_domains}"
+ raise StuffFactoryError(msg)
+ return cls.make_stuff(concept=concept, content=content, name=name, code=code)
+
@classmethod
def make_stuff_from_stuff_content_using_search_domains(
cls,
@@ -161,10 +169,10 @@ class StuffFactory:
elif isinstance(stuff_content_or_data, StuffContent):
content = stuff_content_or_data
concept_class_name = type(content).__name__
- native_concept_class_names = [data.content_class_name for data in NATIVE_CONCEPTS_DATA.values()]
+ native_concept_class_names = NativeConceptCode.native_concept_class_names()
if concept_class_name in native_concept_class_names:
- concept = get_native_concept(native_concept=NativeConceptEnum(concept_class_name.split("Content")[0]))
+ concept = get_native_concept(native_concept=NativeConceptCode(concept_class_name.split("Content")[0]))
return cls.make_stuff(
concept=concept,
content=content,
@@ -206,7 +214,7 @@ class StuffFactory:
elif isinstance(stuff_content_or_data, str):
str_stuff: str = stuff_content_or_data
return StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
content=TextContent(text=str_stuff),
name=name,
)
@@ -218,8 +226,8 @@ class StuffFactory:
msg = "Stuff content data dict is badly formed: no concept code"
raise StuffFactoryError(msg)
content_value = stuff_content_dict["content"]
- if NativeConceptManager.is_native_concept(concept_string_or_code=concept_code):
- concept = ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum(concept_code)])
+ if NativeConceptCode.get_validated_native_concept_string(concept_string_or_code=concept_code):
+ concept = ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode(concept_code))
content = StuffContentFactory.make_stuff_content_from_concept_with_fallback(
concept=concept,
value=content_value,
diff --git a/pipelex/hub.py b/pipelex/hub.py
index 59866a182..3fb2f5d2f 100644
--- a/pipelex/hub.py
+++ b/pipelex/hub.py
@@ -14,7 +14,7 @@ from pipelex.cogt.models.model_manager_abstract import ModelManagerAbstract
from pipelex.cogt.ocr.ocr_worker_abstract import OcrWorkerAbstract
from pipelex.core.concepts.concept import Concept
from pipelex.core.concepts.concept_library_abstract import ConceptLibraryAbstract
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import Domain
from pipelex.core.domains.domain_library_abstract import DomainLibraryAbstract
from pipelex.core.pipes.pipe_abstract import PipeAbstract
@@ -452,5 +452,5 @@ def get_observer_provider() -> ObserverProtocol:
return get_pipelex_hub().get_observer_provider()
-def get_native_concept(native_concept: NativeConceptEnum) -> Concept:
+def get_native_concept(native_concept: NativeConceptCode) -> Concept:
return get_pipelex_hub().get_required_concept_library().get_native_concept(native_concept=native_concept)
diff --git a/pipelex/libraries/pipelines/builder/concept/concept_spec.py b/pipelex/libraries/pipelines/builder/concept/concept_spec.py
index fe2a7ecf5..f418fa125 100644
--- a/pipelex/libraries/pipelines/builder/concept/concept_spec.py
+++ b/pipelex/libraries/pipelines/builder/concept/concept_spec.py
@@ -11,7 +11,7 @@ from pipelex.core.concepts.concept_blueprint import (
ConceptStructureBlueprintError,
ConceptStructureBlueprintFieldType,
)
-from pipelex.core.concepts.concept_native import NativeConceptManager
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.concepts.exceptions import ConceptCodeError, ConceptStringOrConceptCodeError
from pipelex.core.domains.domain_blueprint import DomainBlueprint
from pipelex.core.memory.working_memory import WorkingMemory
@@ -195,10 +195,9 @@ class ConceptSpec(StructuredContent):
@classmethod
def validate_refines(cls, refines: str | None = None) -> str | None:
if refines is not None:
- if not NativeConceptManager.is_native_concept(refines):
+ if not NativeConceptCode.get_validated_native_concept_string(concept_string_or_code=refines):
msg = f"Forbidden to refine a non-native concept: '{refines}'. Refining non-native concepts will come soon."
raise ConceptBlueprintError(msg)
- cls.validate_concept_string_or_code(concept_string_or_code=refines)
return refines
@model_validator(mode="before")
diff --git a/pipelex/pipe_controllers/condition/pipe_condition.py b/pipelex/pipe_controllers/condition/pipe_condition.py
index 84ac1a5ef..6b211ba84 100644
--- a/pipelex/pipe_controllers/condition/pipe_condition.py
+++ b/pipelex/pipe_controllers/condition/pipe_condition.py
@@ -7,7 +7,7 @@ from typing_extensions import override
from pipelex import log
from pipelex.config import StaticValidationReaction, get_config
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum, NativeConceptManager
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory import WorkingMemory
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
from pipelex.core.pipes.input_requirements import InputRequirements
@@ -65,7 +65,7 @@ class PipeCondition(PipeController):
pipe = get_required_pipe(pipe_code=pipe_code)
if self.output.concept_string not in (
pipe.output.concept_string,
- NativeConceptManager.get_native_concept_string(NativeConceptEnum.DYNAMIC),
+ NativeConceptCode.DYNAMIC.concept_string,
):
msg = (
f"The output concept code '{self.output.concept_string}' of the pipe '{self.code}' is "
@@ -156,8 +156,8 @@ class PipeCondition(PipeController):
# so we'll use a generic placeholder that will be validated later
needed_inputs.add_requirement(
variable_name=var_name,
- concept=ConceptFactory.make_native_concept(
- native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.ANYTHING],
+ concept=ConceptFactory.make_native_concept_from_enum(
+ native_concept_code=NativeConceptCode.ANYTHING,
),
)
diff --git a/pipelex/pipe_operators/compose/pipe_compose.py b/pipelex/pipe_operators/compose/pipe_compose.py
index 5519094c6..5d3f2fdd5 100644
--- a/pipelex/pipe_operators/compose/pipe_compose.py
+++ b/pipelex/pipe_operators/compose/pipe_compose.py
@@ -10,7 +10,7 @@ from pipelex.cogt.content_generation.content_generator_protocol import ContentGe
from pipelex.config import get_config
from pipelex.core.concepts.concept import Concept
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory import WorkingMemory
from pipelex.core.pipes.input_requirements import InputRequirements
from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactory
@@ -41,8 +41,8 @@ class PipeCompose(PipeOperator[PipeComposeOutput]):
model_config = ConfigDict(extra="forbid", strict=False)
adhoc_pipe_code: ClassVar[str] = "jinja2_render"
- output: Concept = ConceptFactory.make_native_concept(
- native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT],
+ output: Concept = ConceptFactory.make_native_concept_from_enum(
+ native_concept_code=NativeConceptCode.TEXT,
)
jinja2_name: str | None = None
diff --git a/pipelex/pipe_operators/img_gen/pipe_img_gen.py b/pipelex/pipe_operators/img_gen/pipe_img_gen.py
index e8250350a..6be720126 100644
--- a/pipelex/pipe_operators/img_gen/pipe_img_gen.py
+++ b/pipelex/pipe_operators/img_gen/pipe_img_gen.py
@@ -12,7 +12,7 @@ from pipelex.cogt.img_gen.img_gen_setting import ImgGenChoice, ImgGenSetting
from pipelex.cogt.models.model_deck_check import check_img_gen_choice_with_deck
from pipelex.config import StaticValidationReaction, get_config
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory import WorkingMemory
from pipelex.core.pipes.input_requirements import InputRequirements
from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactory
@@ -106,7 +106,7 @@ class PipeImgGen(PipeOperator[PipeImgGenOutput]):
def validate_output(self):
if not get_concept_library().is_compatible(
tested_concept=self.output,
- wanted_concept=get_native_concept(native_concept=NativeConceptEnum.IMAGE),
+ wanted_concept=get_native_concept(native_concept=NativeConceptCode.IMAGE),
strict=True,
):
msg = (
@@ -121,8 +121,8 @@ class PipeImgGen(PipeOperator[PipeImgGenOutput]):
if self.img_gen_prompt:
needed_inputs.add_requirement(
variable_name="img_gen_prompt",
- concept=ConceptFactory.make_native_concept(
- native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT],
+ concept=ConceptFactory.make_native_concept_from_enum(
+ native_concept_code=NativeConceptCode.TEXT,
),
)
else:
@@ -185,7 +185,7 @@ class PipeImgGen(PipeOperator[PipeImgGenOutput]):
input_name, requirement = self.inputs.items[0]
if concept_library.is_compatible(
tested_concept=requirement.concept,
- wanted_concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ wanted_concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
):
self.img_gen_prompt_var_name = input_name
else:
diff --git a/pipelex/pipe_operators/llm/pipe_llm.py b/pipelex/pipe_operators/llm/pipe_llm.py
index 6bfc2cb0b..6313c3fb8 100644
--- a/pipelex/pipe_operators/llm/pipe_llm.py
+++ b/pipelex/pipe_operators/llm/pipe_llm.py
@@ -14,7 +14,7 @@ from pipelex.cogt.llm.llm_setting import LLMChoice, LLMSetting, LLMSettingChoice
from pipelex.cogt.models.model_deck_check import check_llm_choice_with_deck
from pipelex.config import StaticValidationReaction, get_config
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import Domain, SpecialDomain
from pipelex.core.memory.working_memory import WorkingMemory
from pipelex.core.pipes.input_requirements import InputRequirements
@@ -75,10 +75,10 @@ class PipeLLM(PipeOperator[PipeLLMOutput]):
@model_validator(mode="after")
def validate_output_concept_consistency(self) -> Self:
- if self.structuring_method is not None and self.output.structure_class_name == NativeConceptEnum.TEXT:
+ if self.structuring_method is not None and self.output.structure_class_name == NativeConceptCode.TEXT:
msg = (
f"Output concept '{self.output.code}' is considered a Text concept, "
- f"so it cannot be structured. Maybe you forgot to add '{NativeConceptEnum.TEXT}' to the class registry?"
+ f"so it cannot be structured. Maybe you forgot to add '{NativeConceptCode.TEXT}' to the class registry?"
)
raise PipeDefinitionError(msg)
return self
@@ -99,7 +99,7 @@ class PipeLLM(PipeOperator[PipeLLMOutput]):
def validate_output(self):
if get_concept_library().is_compatible(
tested_concept=self.output,
- wanted_concept=get_native_concept(native_concept=NativeConceptEnum.IMAGE),
+ wanted_concept=get_native_concept(native_concept=NativeConceptCode.IMAGE),
):
msg = (
f"The output of a LLM pipe cannot be compatible with the Image concept. In the "
@@ -184,13 +184,13 @@ class PipeLLM(PipeOperator[PipeLLMOutput]):
# interpret / unwrap the arguments
log.debug(f"PipeLLM pipe_code = {self.code}")
output_concept = self.output
- if self.output.code == SpecialDomain.NATIVE + "." + NativeConceptEnum.DYNAMIC:
+ if self.output.code == SpecialDomain.NATIVE + "." + NativeConceptCode.DYNAMIC:
# TODO: This DYNAMIC_OUTPUT_CONCEPT should not be a field in the params attribute of PipeRunParams.
# It should be an attribute of PipeRunParams.
output_concept_code = pipe_run_params.dynamic_output_concept_code or pipe_run_params.params.get(PipeRunParamKey.DYNAMIC_OUTPUT_CONCEPT)
if not output_concept_code:
- output_concept_code = SpecialDomain.NATIVE + "." + NativeConceptEnum.TEXT
+ output_concept_code = SpecialDomain.NATIVE + "." + NativeConceptCode.TEXT
else:
output_concept = get_required_concept(
concept_string=ConceptFactory.make_concept_string_with_domain(domain=self.domain, concept_code=output_concept_code),
diff --git a/pipelex/pipe_operators/llm/pipe_llm_factory.py b/pipelex/pipe_operators/llm/pipe_llm_factory.py
index fd9663f76..761ca982c 100644
--- a/pipelex/pipe_operators/llm/pipe_llm_factory.py
+++ b/pipelex/pipe_operators/llm/pipe_llm_factory.py
@@ -4,7 +4,7 @@ from pipelex.cogt.llm.llm_prompt_spec import LLMPromptSpec
from pipelex.cogt.llm.llm_setting import LLMSettingChoices
from pipelex.core.concepts.concept import Concept
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
from pipelex.core.pipes.input_requirements_factory import InputRequirementsFactory
from pipelex.core.pipes.pipe_factory import PipeFactoryProtocol
@@ -84,9 +84,9 @@ class PipeLLMFactory(PipeFactoryProtocol[PipeLLMBlueprint, PipeLLM]):
),
)
- if Concept.are_concept_compatible(concept_1=concept, concept_2=get_native_concept(NativeConceptEnum.IMAGE), strict=True):
+ if Concept.are_concept_compatible(concept_1=concept, concept_2=get_native_concept(NativeConceptCode.IMAGE), strict=True):
user_images.append(stuff_name)
- elif Concept.are_concept_compatible(concept_1=concept, concept_2=get_native_concept(NativeConceptEnum.IMAGE), strict=False):
+ elif Concept.are_concept_compatible(concept_1=concept, concept_2=get_native_concept(NativeConceptCode.IMAGE), strict=False):
# Get image field paths relative to the concept
image_field_paths = concept.search_for_nested_image_fields_in_structure_class()
# Prefix each path with the stuff_name to make them absolute
diff --git a/pipelex/pipe_operators/ocr/pipe_ocr.py b/pipelex/pipe_operators/ocr/pipe_ocr.py
index 4c39b0606..35953832b 100644
--- a/pipelex/pipe_operators/ocr/pipe_ocr.py
+++ b/pipelex/pipe_operators/ocr/pipe_ocr.py
@@ -11,7 +11,7 @@ from pipelex.cogt.ocr.ocr_input import OcrInput
from pipelex.cogt.ocr.ocr_job_components import OcrJobConfig, OcrJobParams
from pipelex.cogt.ocr.ocr_setting import OcrChoice, OcrSetting
from pipelex.config import StaticValidationReaction, get_config
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory import WorkingMemory
from pipelex.core.pipes.input_requirements import InputRequirements
from pipelex.core.pipes.pipe_output import PipeOutput
@@ -71,7 +71,7 @@ class PipeOcr(PipeOperator[PipeOcrOutput]):
@override
def validate_output(self):
- if self.output != get_native_concept(native_concept=NativeConceptEnum.PAGE):
+ if self.output != get_native_concept(native_concept=NativeConceptCode.PAGE):
msg = f"PipeOcr output should be a Page concept, but is {self.output.concept_string}"
raise PipeDefinitionError(msg)
@@ -119,13 +119,13 @@ class PipeOcr(PipeOperator[PipeOcrOutput]):
log.debug(f"Validating input '{input_name}' with concept code '{requirement.concept.code}'")
if concept_library.is_compatible(
tested_concept=requirement.concept,
- wanted_concept=get_native_concept(native_concept=NativeConceptEnum.IMAGE),
+ wanted_concept=get_native_concept(native_concept=NativeConceptCode.IMAGE),
strict=True,
):
self.image_stuff_name = input_name
elif concept_library.is_compatible(
tested_concept=requirement.concept,
- wanted_concept=get_native_concept(native_concept=NativeConceptEnum.PDF),
+ wanted_concept=get_native_concept(native_concept=NativeConceptCode.PDF),
strict=True,
):
self.pdf_stuff_name = input_name
diff --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.py
index f47b8fe93..8be49dba4 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
@@ -4,7 +4,7 @@ import pytest
from pipelex import pretty_print
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
@@ -28,7 +28,7 @@ class TestPipeConditionSimple:
pipe_condition_blueprint = PipeConditionBlueprint(
description="Test condition that should fail",
inputs={"user_category": InputRequirementBlueprint(concept="test_pipe_condition.CategoryInput")},
- output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ output=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
expression_template="{{ user_category.category }}",
outcomes={"small": "process_small", "medium": "process_medium", "large": "process_large"},
default_outcome="process_small",
@@ -62,7 +62,7 @@ class TestPipeConditionSimple:
pipe_condition_blueprint = PipeConditionBlueprint(
description="Test condition that should succeed",
inputs={"user_status": InputRequirementBlueprint(concept="test_pipe_condition.CategoryInput")},
- output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ output=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
expression_template="{{ user_status.category }}",
outcomes={"active": "process_small", "inactive": "process_medium", "pending": "process_large"},
default_outcome="process_small",
diff --git a/tests/integration/pipelex/client/test_client.py b/tests/integration/pipelex/client/test_client.py
index 23fedb8f2..c049103ce 100644
--- a/tests/integration/pipelex/client/test_client.py
+++ b/tests/integration/pipelex/client/test_client.py
@@ -5,7 +5,7 @@ from pipelex import pretty_print
from pipelex.client.client import PipelexClient
from pipelex.client.protocol import COMPACT_MEMORY_KEY, PipelineState
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.stuffs.stuff import Stuff
@@ -29,7 +29,7 @@ class TestPipelexApiClient:
pipe_code="retrieve_excerpts",
memory=[
StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
name="text",
content=TextContent(
text="""
@@ -140,7 +140,7 @@ class TestPipelexApiClient:
assert isinstance(item["justification"], str)
# Verify text structure
- assert working_memory["text"]["concept_code"] == f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}"
+ assert working_memory["text"]["concept_code"] == f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}"
assert "content" in working_memory["text"]
assert isinstance(working_memory["text"]["content"], str)
assert "The Dawn of Ultra-Rapid Transit" in working_memory["text"]["content"]
diff --git a/tests/integration/pipelex/core/memory/test_working_memory_factory.py b/tests/integration/pipelex/core/memory/test_working_memory_factory.py
index 84362d27e..e83835511 100644
--- a/tests/integration/pipelex/core/memory/test_working_memory_factory.py
+++ b/tests/integration/pipelex/core/memory/test_working_memory_factory.py
@@ -1,6 +1,6 @@
from typing import TYPE_CHECKING
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.stuffs.image_content import ImageContent
from pipelex.core.stuffs.page_content import PageContent
@@ -15,7 +15,7 @@ class TestWorkingMemoryFactory:
def test_make_from_compact_memory_with_text_content(self):
compact_memory: CompactMemory = {
"text_item": {
- "concept_code": NativeConceptEnum.TEXT,
+ "concept_code": NativeConceptCode.TEXT,
"content": "Hello, world!",
},
}
@@ -26,7 +26,7 @@ class TestWorkingMemoryFactory:
assert "text_item" in working_memory.root
stuff = working_memory.root["text_item"]
- assert stuff.concept.code == NativeConceptEnum.TEXT
+ assert stuff.concept.code == NativeConceptCode.TEXT
assert isinstance(stuff.content, TextContent)
assert stuff.content.text == "Hello, world!"
@@ -34,7 +34,7 @@ class TestWorkingMemoryFactory:
"""Test deserialization of compact memory with complex nested structured content."""
compact_memory: CompactMemory = {
"complex_page": {
- "concept_code": NativeConceptEnum.PAGE,
+ "concept_code": NativeConceptCode.PAGE,
"content": {
"text_and_images": {
"text": {
@@ -66,7 +66,7 @@ class TestWorkingMemoryFactory:
assert "complex_page" in working_memory.root
stuff = working_memory.root["complex_page"]
- assert stuff.concept.code == NativeConceptEnum.PAGE
+ assert stuff.concept.code == NativeConceptCode.PAGE
assert isinstance(stuff.content, PageContent)
# Verify text_and_images structure
@@ -124,11 +124,11 @@ class TestWorkingMemoryFactory:
"""Test deserialization of compact memory with multiple items."""
compact_memory: CompactMemory = {
"text1": {
- "concept_code": NativeConceptEnum.TEXT,
+ "concept_code": NativeConceptCode.TEXT,
"content": "First text",
},
"text2": {
- "concept_code": NativeConceptEnum.TEXT,
+ "concept_code": NativeConceptCode.TEXT,
"content": "Second text",
},
}
diff --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.py
index 6b46c2a28..e95b932ca 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
@@ -7,7 +7,7 @@ from pytest import FixtureRequest
from pipelex import pretty_print
from pipelex.core.concepts.concept_factory import ConceptBlueprint, ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
from pipelex.core.stuffs.list_content import ListContent
@@ -74,7 +74,7 @@ class TestPipeBatchSimple:
]
text_list_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
content=ListContent[StuffContent](items=cast("list[StuffContent]", text_items)),
name="text_list",
)
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.py
index f5e1e30d8..a0d29fd34 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
@@ -7,7 +7,7 @@ from pytest import FixtureRequest
from pipelex import pretty_print
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
@@ -33,8 +33,8 @@ class TestPipeConditionSimple:
"""Test PipeCondition with long text that should trigger capitalize_long_text pipe."""
pipe_condition_blueprint = PipeConditionBlueprint(
description="Text length condition for testing",
- inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}")},
- output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}")},
+ output=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
expression_template="{% if input_text.text|length > 5 %}long{% else %}short{% endif %}",
outcomes={"long": "capitalize_long_text", "short": "add_prefix_short_text"},
default_outcome=SpecialOutcome.CONTINUE,
@@ -46,7 +46,7 @@ class TestPipeConditionSimple:
blueprint=pipe_condition_blueprint,
)
input_text_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
content=TextContent(text="hello world"), # 11 characters
name="input_text",
)
@@ -96,15 +96,15 @@ class TestPipeConditionSimple:
assert isinstance(final_result_in_memory.content, TextContent)
if pipe_run_mode != PipeRunMode.DRY:
assert final_result_in_memory.content.text == "LONG: HELLO WORLD"
- assert f"{final_result_in_memory.concept.domain}.{final_result_in_memory.concept.code}" == f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}"
+ assert f"{final_result_in_memory.concept.domain}.{final_result_in_memory.concept.code}" == f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}"
async def test_condition_short_text_processing(self, request: FixtureRequest, pipe_run_mode: PipeRunMode):
"""Test PipeCondition with short text that should trigger add_prefix_short_text pipe."""
# Create PipeCondition instance - pipes are loaded from PLX files
pipe_condition_blueprint = PipeConditionBlueprint(
description="Text length condition for short text testing",
- inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}")},
- output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}")},
+ output=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
expression_template="{% if input_text.text|length > 5 %}long{% else %}short{% endif %}",
outcomes={"long": "capitalize_long_text", "short": "add_prefix_short_text"},
default_outcome=SpecialOutcome.CONTINUE,
@@ -118,7 +118,7 @@ class TestPipeConditionSimple:
# Create test data - short text input (<= 5 characters)
input_text_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
content=TextContent(text="hi"), # 2 characters
name="input_text",
)
@@ -166,7 +166,7 @@ class TestPipeConditionSimple:
assert isinstance(final_result_in_memory.content, TextContent)
if pipe_run_mode != PipeRunMode.DRY:
assert final_result_in_memory.content.text == "SHORT: hi"
- assert f"{final_result_in_memory.concept.domain}.{final_result_in_memory.concept.code}" == f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}"
+ assert f"{final_result_in_memory.concept.domain}.{final_result_in_memory.concept.code}" == f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}"
async def test_condition_dry_run_success(self, request: FixtureRequest):
"""Test PipeCondition dry run with valid inputs using real pipe - should succeed."""
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.py
index 5c3d7ba82..69323565c 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
@@ -4,7 +4,7 @@ import pytest
from pytest import FixtureRequest
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
@@ -27,8 +27,8 @@ class TestPipeParallelSimple:
# Create PipeParallel instance - pipes are loaded from PLX files
pipe_parallel_blueprint = PipeParallelBlueprint(
description="Parallel text analysis pipeline",
- inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}")},
- output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}")},
+ output=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
parallels=[
SubPipeBlueprint(pipe="analyze_sentiment", result="sentiment_result"),
SubPipeBlueprint(pipe="count_words", result="word_count_result"),
@@ -46,7 +46,7 @@ class TestPipeParallelSimple:
# Create test data
input_text_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
content=TextContent(text="The weather is beautiful today. I love sunny days and outdoor activities."),
name="input_text",
)
@@ -104,7 +104,7 @@ class TestPipeParallelSimple:
# Should return one of: positive, negative, neutral
if pipe_run_mode != PipeRunMode.DRY:
assert sentiment_result.content.text.lower() in ["positive", "negative", "neutral"]
- assert f"{sentiment_result.concept.domain}.{sentiment_result.concept.code}" == f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}"
+ assert f"{sentiment_result.concept.domain}.{sentiment_result.concept.code}" == f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}"
# Verify word count result
word_count_result = final_working_memory.get_stuff("word_count_result")
@@ -143,8 +143,8 @@ class TestPipeParallelSimple:
# Create PipeParallel instance
pipe_parallel_blueprint = PipeParallelBlueprint(
description="Parallel text analysis pipeline for short text",
- inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}")},
- output=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ inputs={"input_text": InputRequirementBlueprint(concept=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}")},
+ output=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
parallels=[
SubPipeBlueprint(pipe="analyze_sentiment", result="sentiment_result"),
SubPipeBlueprint(pipe="count_words", result="word_count_result"),
@@ -161,7 +161,7 @@ class TestPipeParallelSimple:
)
# Create test data - shorter text
input_text_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
content=TextContent(text="Hello world"),
name="input_text",
)
diff --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.py
index dd71b76fd..356a1f791 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
@@ -8,7 +8,7 @@ from pytest import FixtureRequest
from pipelex import pretty_print
from pipelex.core.concepts.concept_blueprint import ConceptBlueprint
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
from pipelex.core.stuffs.stuff_factory import StuffFactory
@@ -39,7 +39,7 @@ class TestPipeSequenceSimple:
)
concept_library = get_concept_library()
concept_library.add_concepts([concept_1])
- concept_2 = get_native_concept(native_concept=NativeConceptEnum.TEXT)
+ concept_2 = get_native_concept(native_concept=NativeConceptCode.TEXT)
# Create PipeSequence instance - pipes are loaded from PLX files
pipe_sequence_blueprint = PipeSequenceBlueprint(
@@ -60,7 +60,7 @@ class TestPipeSequenceSimple:
# Create test data - single text input
input_text_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
content=TextContent(text="hello world"),
name="input_text",
)
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.py
index 062faec40..832cdad0c 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
@@ -2,7 +2,7 @@ import pytest
from pipelex import log, pretty_print
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.stuffs.stuff_factory import StuffFactory
from pipelex.core.stuffs.text_content import TextContent
@@ -45,7 +45,7 @@ if __name__ == "__main__":
# Create stuff with the source code
source_text_stuff = StuffFactory.make_stuff(
name="source_text",
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
content=TextContent(text=sample_code),
)
@@ -56,7 +56,7 @@ if __name__ == "__main__":
pipe_func_blueprint = PipeFuncBlueprint(
description="Function pipe for wrapping lines",
function_name="wrap_lines",
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
)
pipe_job = PipeJobFactory.make_pipe_job(
diff --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.py
index 2386b4b77..7e70a6cfd 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
@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, cast
import pytest
from pipelex import pretty_print
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.hub import get_pipe_router
from pipelex.pipe_operators.img_gen.pipe_img_gen_blueprint import PipeImgGenBlueprint
from pipelex.pipe_operators.img_gen.pipe_img_gen_factory import PipeImgGenFactory
@@ -32,7 +32,7 @@ class TestPipeImgGen:
pipe_img_gen_blueprint = PipeImgGenBlueprint(
description="Image generation test",
img_gen_prompt=image_desc,
- output=NativeConceptEnum.IMAGE,
+ output=NativeConceptCode.IMAGE,
nb_output=1,
)
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.py
index 170ad1847..fc1c19cfb 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
@@ -1,7 +1,7 @@
import pytest
from pipelex import log, pretty_print
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
from pipelex.core.stuffs.stuff import Stuff
@@ -25,7 +25,7 @@ class TestPipeLLM:
):
pipe_llm_blueprint = PipeLLMBlueprint(
description="LLM test for basic text generation",
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
system_prompt=PipeTestCases.SYSTEM_PROMPT,
prompt=PipeTestCases.USER_PROMPT,
)
@@ -145,7 +145,7 @@ class TestPipeLLM:
pipe_llm_blueprint = PipeLLMBlueprint(
description="LLM test for image processing with attributes",
inputs={stuff_name: InputRequirementBlueprint(concept=stuff.concept.concept_string)},
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
system_prompt=PipeTestCases.SYSTEM_PROMPT,
prompt=PipeTestCases.MULTI_IMG_DESC_PROMPT,
)
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.py
index 6c852c1ce..ac7c09f4c 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
@@ -3,7 +3,7 @@ import pytest
from pipelex import pretty_print
from pipelex.core.concepts.concept_blueprint import ConceptBlueprint
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
from pipelex.core.stuffs.page_content import PageContent
@@ -46,8 +46,8 @@ class TestPipeOCR:
):
pipe_ocr_blueprint = PipeOcrBlueprint(
description="OCR test for image processing",
- inputs={"page_scan": InputRequirementBlueprint(concept=NativeConceptEnum.IMAGE)},
- output=NativeConceptEnum.TEXT_AND_IMAGES,
+ inputs={"page_scan": InputRequirementBlueprint(concept=NativeConceptCode.IMAGE)},
+ output=NativeConceptCode.TEXT_AND_IMAGES,
page_images=True,
page_image_captions=False,
page_views=True,
@@ -84,8 +84,8 @@ class TestPipeOCR:
input_name = "arbitrary_name"
pipe_ocr_blueprint = PipeOcrBlueprint(
description="OCR test for PDF processing",
- inputs={input_name: InputRequirementBlueprint(concept=NativeConceptEnum.PDF)},
- output=NativeConceptEnum.TEXT_AND_IMAGES,
+ inputs={input_name: InputRequirementBlueprint(concept=NativeConceptCode.PDF)},
+ output=NativeConceptCode.TEXT_AND_IMAGES,
ocr=ocr_choice_for_pdf,
page_images=True,
page_image_captions=False,
diff --git a/tests/integration/pipelex/pipes/test_image_inputs.py b/tests/integration/pipelex/pipes/test_image_inputs.py
index 2346ee517..b6e9e2f71 100644
--- a/tests/integration/pipelex/pipes/test_image_inputs.py
+++ b/tests/integration/pipelex/pipes/test_image_inputs.py
@@ -2,7 +2,7 @@ import pytest
from pytest import FixtureRequest
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.stuffs.image_content import ImageContent
from pipelex.core.stuffs.page_content import PageContent
@@ -67,7 +67,7 @@ class TestImageInputs:
# Create stuff from page content
stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.PAGE]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.PAGE),
content=page_content,
name="page",
)
diff --git a/tests/integration/pipelex/pipes/test_pipe_compose.py b/tests/integration/pipelex/pipes/test_pipe_compose.py
index 8a36942f1..4e870e147 100644
--- a/tests/integration/pipelex/pipes/test_pipe_compose.py
+++ b/tests/integration/pipelex/pipes/test_pipe_compose.py
@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, cast
import pytest
from pipelex import pretty_print
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.hub import get_pipe_router
from pipelex.pipe_operators.compose.pipe_compose_blueprint import PipeComposeBlueprint
@@ -30,7 +30,7 @@ class TestPipeCompose:
pipe_compose_blueprint = PipeComposeBlueprint(
description="Jinja2 test for any context",
jinja2=jinja2,
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
extra_context={"place_holder": "[some text from test_pipe_compose_for_any]"},
)
@@ -58,7 +58,7 @@ class TestPipeCompose:
description="Jinja2 test for stuff context",
jinja2=jinja2,
prompting_style=PromptingStyle(tag_style=TagStyle.TICKS, text_format=TextFormat.MARKDOWN),
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
)
pipe_job = PipeJobFactory.make_pipe_job(
diff --git a/tests/integration/pipelex/plugins/test_external_plugin.py b/tests/integration/pipelex/plugins/test_external_plugin.py
index a07d19145..a8bf2ebe4 100644
--- a/tests/integration/pipelex/plugins/test_external_plugin.py
+++ b/tests/integration/pipelex/plugins/test_external_plugin.py
@@ -10,7 +10,7 @@ from pipelex.cogt.llm.llm_prompt import LLMPrompt
from pipelex.cogt.llm.llm_setting import LLMSetting
from pipelex.cogt.llm.llm_worker_abstract import LLMWorkerAbstract
from pipelex.cogt.usage.token_category import NbTokensByCategoryDict, TokenCategory
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.hub import get_inference_manager, get_pipe_router, get_report_delegate
from pipelex.pipe_operators.llm.pipe_llm_blueprint import PipeLLMBlueprint
from pipelex.pipe_operators.llm.pipe_llm_factory import PipeLLMFactory
@@ -89,7 +89,7 @@ class TestExternalPlugin:
pipe_llm_blueprint = PipeLLMBlueprint(
description="LLM test with external plugin",
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
system_prompt=PipeTestCases.SYSTEM_PROMPT,
prompt=PipeTestCases.USER_PROMPT,
llm=LLMSetting(
diff --git a/tests/integration/pipelex/test_data.py b/tests/integration/pipelex/test_data.py
index 479d4b110..4b797b45d 100644
--- a/tests/integration/pipelex/test_data.py
+++ b/tests/integration/pipelex/test_data.py
@@ -1,7 +1,7 @@
from typing import ClassVar
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.stuffs.image_content import ImageContent
from pipelex.core.stuffs.list_content import ListContent
from pipelex.core.stuffs.pdf_content import PDFContent
@@ -48,17 +48,17 @@ class PipeTestCases:
# Create simple Stuff objects
SIMPLE_STUFF_TEXT = StuffFactory.make_stuff(
name="text",
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
content=TextContent(text="Describe a t-shirt in 2 sentences"),
)
SIMPLE_STUFF_IMAGE = StuffFactory.make_stuff(
name="image",
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.IMAGE]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.IMAGE),
content=ImageContent(url=URL_IMG_FASHION_PHOTO_1),
)
SIMPLE_STUFF_PDF = StuffFactory.make_stuff(
name="document",
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.PDF]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.PDF),
content=PDFContent(url=PDFTestCases.DOCUMENT_URLS[0]),
)
COMPLEX_STUFF = StuffFactory.make_stuff(
@@ -74,7 +74,7 @@ class PipeTestCases:
STUFF_CONTENT_WITH_IMAGE_ATTRIBUTE_1 = SomeContentWithImageAttribute(image_attribute=ImageContent(url=URL_IMG_FASHION_PHOTO_1))
STUFF_WITH_IMAGE_ATTRIBUTE = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.IMAGE]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.IMAGE),
content=STUFF_CONTENT_WITH_IMAGE_ATTRIBUTE_1,
name="stuff_with_image",
)
@@ -83,7 +83,7 @@ class PipeTestCases:
sub_object=STUFF_CONTENT_WITH_IMAGE_ATTRIBUTE_1,
)
STUFF_WITH_IMAGE_ATTRIBUTE_IN_SUB_OBJECT = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.IMAGE]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.IMAGE),
content=STUFF_CONTENT_WITH_IMAGE_ATTRIBUTE_IN_SUB_OBJECT,
name="stuff_with_image_in_sub_object",
)
diff --git a/tests/unit/pipelex/client/test_api_serialization.py b/tests/unit/pipelex/client/test_api_serialization.py
index 0703bd211..5873596d4 100644
--- a/tests/unit/pipelex/client/test_api_serialization.py
+++ b/tests/unit/pipelex/client/test_api_serialization.py
@@ -9,7 +9,7 @@ from pydantic import BaseModel
from pipelex.client.api_serializer import ApiSerializer
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory import WorkingMemory
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.stuffs.number_content import NumberContent
@@ -73,7 +73,7 @@ class TestApiSerialization:
@pytest.fixture
def text_content_memory(self) -> WorkingMemory:
stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
name="sample_text",
content=TextContent(text="Sample text content"),
)
@@ -83,7 +83,7 @@ class TestApiSerialization:
def number_content_memory(self) -> WorkingMemory:
number_content = NumberContent(number=3.14159)
stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.NUMBER]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.NUMBER),
name="pi_value",
content=number_content,
)
@@ -144,7 +144,7 @@ class TestApiSerialization:
assert "sample_text" in compact_memory
text_blueprint = compact_memory["sample_text"]
- assert text_blueprint["concept_code"] == NativeConceptEnum.TEXT
+ assert text_blueprint["concept_code"] == NativeConceptCode.TEXT
assert isinstance(text_blueprint["content"], str)
assert text_blueprint["content"] == "Sample text content"
@@ -155,6 +155,6 @@ class TestApiSerialization:
assert "pi_value" in compact_memory
number_blueprint = compact_memory["pi_value"]
- assert number_blueprint["concept_code"] == NativeConceptEnum.NUMBER
+ assert number_blueprint["concept_code"] == NativeConceptCode.NUMBER
assert isinstance(number_blueprint["content"], dict)
assert number_blueprint["content"]["number"] == 3.14159
diff --git a/tests/unit/pipelex/core/concepts/concept/test_concept.py b/tests/unit/pipelex/core/concepts/concept/test_concept.py
index fc77d572d..9608e6daf 100644
--- a/tests/unit/pipelex/core/concepts/concept/test_concept.py
+++ b/tests/unit/pipelex/core/concepts/concept/test_concept.py
@@ -3,7 +3,7 @@ import pytest
from pipelex.core.concepts.concept import Concept
from pipelex.core.concepts.concept_blueprint import ConceptBlueprint
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum, NativeConceptManager
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.concepts.exceptions import ConceptCodeError, ConceptStringError
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.domains.exceptions import DomainError
@@ -14,97 +14,127 @@ class TestConcept:
def test_is_native_concept_code(self):
"""Test is_native_concept_code method."""
- assert ConceptBlueprint.is_native_concept_code(NativeConceptEnum.TEXT) is True
- assert ConceptBlueprint.is_native_concept_code(NativeConceptEnum.IMAGE) is True
- assert ConceptBlueprint.is_native_concept_code(NativeConceptEnum.PDF) is True
- assert ConceptBlueprint.is_native_concept_code(NativeConceptEnum.TEXT_AND_IMAGES) is True
- assert ConceptBlueprint.is_native_concept_code(NativeConceptEnum.NUMBER) is True
- assert ConceptBlueprint.is_native_concept_code(NativeConceptEnum.LLM_PROMPT) is True
- assert ConceptBlueprint.is_native_concept_code(NativeConceptEnum.ANYTHING) is True
- assert ConceptBlueprint.is_native_concept_code(NativeConceptEnum.DYNAMIC) is True
+ assert ConceptBlueprint.is_native_concept_code(NativeConceptCode.TEXT) is True
+ assert ConceptBlueprint.is_native_concept_code(NativeConceptCode.IMAGE) is True
+ assert ConceptBlueprint.is_native_concept_code(NativeConceptCode.PDF) is True
+ assert ConceptBlueprint.is_native_concept_code(NativeConceptCode.TEXT_AND_IMAGES) is True
+ assert ConceptBlueprint.is_native_concept_code(NativeConceptCode.NUMBER) is True
+ assert ConceptBlueprint.is_native_concept_code(NativeConceptCode.LLM_PROMPT) is True
+ assert ConceptBlueprint.is_native_concept_code(NativeConceptCode.ANYTHING) is True
+ assert ConceptBlueprint.is_native_concept_code(NativeConceptCode.DYNAMIC) is True
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}")
+ ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.IMAGE}")
+ ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptCode.IMAGE}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.PDF}")
+ ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptCode.PDF}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT_AND_IMAGES}")
+ ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT_AND_IMAGES}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.NUMBER}")
+ ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptCode.NUMBER}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.LLM_PROMPT}")
+ ConceptBlueprint.is_native_concept_code(f"{SpecialDomain.NATIVE}.{NativeConceptCode.LLM_PROMPT}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptEnum.TEXT}")
+ ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptCode.TEXT}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptEnum.IMAGE}")
+ ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptCode.IMAGE}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptEnum.PDF}")
+ ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptCode.PDF}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptEnum.TEXT_AND_IMAGES}")
+ ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptCode.TEXT_AND_IMAGES}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptEnum.NUMBER}")
+ ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptCode.NUMBER}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptEnum.LLM_PROMPT}")
+ ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptCode.LLM_PROMPT}")
with pytest.raises(ConceptCodeError):
- ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptEnum.DYNAMIC}")
+ ConceptBlueprint.is_native_concept_code(f"not_native.{NativeConceptCode.DYNAMIC}")
assert ConceptBlueprint.is_native_concept_code("RandomConcept") is False
with pytest.raises(ConceptCodeError):
ConceptBlueprint.is_native_concept_code("text")
- def test_is_native_concept_string_or_code(self):
+ def test_get_validated_native_concept_string(self):
"""Test is_native_concept_code method."""
- assert NativeConceptManager.is_native_concept(NativeConceptEnum.TEXT) is True
- assert NativeConceptManager.is_native_concept(NativeConceptEnum.IMAGE) is True
- assert NativeConceptManager.is_native_concept(NativeConceptEnum.PDF) is True
- assert NativeConceptManager.is_native_concept(NativeConceptEnum.TEXT_AND_IMAGES) is True
- assert NativeConceptManager.is_native_concept(NativeConceptEnum.NUMBER) is True
- assert NativeConceptManager.is_native_concept(NativeConceptEnum.LLM_PROMPT) is True
- assert NativeConceptManager.is_native_concept(NativeConceptEnum.ANYTHING) is True
- assert NativeConceptManager.is_native_concept(NativeConceptEnum.DYNAMIC) is True
- assert NativeConceptManager.is_native_concept(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}") is True
- assert NativeConceptManager.is_native_concept(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.IMAGE}") is True
- assert NativeConceptManager.is_native_concept(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.PDF}") is True
- assert NativeConceptManager.is_native_concept(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT_AND_IMAGES}") is True
- assert NativeConceptManager.is_native_concept(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.NUMBER}") is True
- assert NativeConceptManager.is_native_concept(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.LLM_PROMPT}") is True
- assert NativeConceptManager.is_native_concept(f"not_native.{NativeConceptEnum.TEXT}") is False
- assert NativeConceptManager.is_native_concept(f"not_native.{NativeConceptEnum.IMAGE}") is False
- assert NativeConceptManager.is_native_concept(f"not_native.{NativeConceptEnum.PDF}") is False
- assert NativeConceptManager.is_native_concept(f"not_native.{NativeConceptEnum.TEXT_AND_IMAGES}") is False
- assert NativeConceptManager.is_native_concept(f"not_native.{NativeConceptEnum.NUMBER}") is False
- assert NativeConceptManager.is_native_concept(f"not_native.{NativeConceptEnum.LLM_PROMPT}") is False
- assert NativeConceptManager.is_native_concept(f"not_native.{NativeConceptEnum.ANYTHING}") is False
- assert NativeConceptManager.is_native_concept(f"not_native.{NativeConceptEnum.DYNAMIC}") is False
- assert NativeConceptManager.is_native_concept("RandomConcept") is False
- assert NativeConceptManager.is_native_concept("text") is False
+ assert NativeConceptCode.get_validated_native_concept_string(NativeConceptCode.TEXT) == f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}"
+ assert NativeConceptCode.get_validated_native_concept_string(NativeConceptCode.IMAGE) == f"{SpecialDomain.NATIVE}.{NativeConceptCode.IMAGE}"
+ assert NativeConceptCode.get_validated_native_concept_string(NativeConceptCode.PDF) == f"{SpecialDomain.NATIVE}.{NativeConceptCode.PDF}"
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(NativeConceptCode.TEXT_AND_IMAGES)
+ == f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT_AND_IMAGES}"
+ )
+ assert NativeConceptCode.get_validated_native_concept_string(NativeConceptCode.NUMBER) == f"{SpecialDomain.NATIVE}.{NativeConceptCode.NUMBER}"
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(NativeConceptCode.LLM_PROMPT)
+ == f"{SpecialDomain.NATIVE}.{NativeConceptCode.LLM_PROMPT}"
+ )
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(NativeConceptCode.ANYTHING)
+ == f"{SpecialDomain.NATIVE}.{NativeConceptCode.ANYTHING}"
+ )
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(NativeConceptCode.DYNAMIC) == f"{SpecialDomain.NATIVE}.{NativeConceptCode.DYNAMIC}"
+ )
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}")
+ == f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}"
+ )
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(f"{SpecialDomain.NATIVE}.{NativeConceptCode.IMAGE}")
+ == f"{SpecialDomain.NATIVE}.{NativeConceptCode.IMAGE}"
+ )
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(f"{SpecialDomain.NATIVE}.{NativeConceptCode.PDF}")
+ == f"{SpecialDomain.NATIVE}.{NativeConceptCode.PDF}"
+ )
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT_AND_IMAGES}")
+ == f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT_AND_IMAGES}"
+ )
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(f"{SpecialDomain.NATIVE}.{NativeConceptCode.NUMBER}")
+ == f"{SpecialDomain.NATIVE}.{NativeConceptCode.NUMBER}"
+ )
+ assert (
+ NativeConceptCode.get_validated_native_concept_string(f"{SpecialDomain.NATIVE}.{NativeConceptCode.LLM_PROMPT}")
+ == f"{SpecialDomain.NATIVE}.{NativeConceptCode.LLM_PROMPT}"
+ )
+ assert NativeConceptCode.get_validated_native_concept_string(f"not_native.{NativeConceptCode.TEXT}") is None
+ assert NativeConceptCode.get_validated_native_concept_string(f"not_native.{NativeConceptCode.IMAGE}") is None
+ assert NativeConceptCode.get_validated_native_concept_string(f"not_native.{NativeConceptCode.PDF}") is None
+ assert NativeConceptCode.get_validated_native_concept_string(f"not_native.{NativeConceptCode.TEXT_AND_IMAGES}") is None
+ assert NativeConceptCode.get_validated_native_concept_string(f"not_native.{NativeConceptCode.NUMBER}") is None
+ assert NativeConceptCode.get_validated_native_concept_string(f"not_native.{NativeConceptCode.LLM_PROMPT}") is None
+ assert NativeConceptCode.get_validated_native_concept_string(f"not_native.{NativeConceptCode.ANYTHING}") is None
+ assert NativeConceptCode.get_validated_native_concept_string(f"not_native.{NativeConceptCode.DYNAMIC}") is None
+ assert NativeConceptCode.get_validated_native_concept_string("RandomConcept") is None
+ assert NativeConceptCode.get_validated_native_concept_string("text") is None
def test_is_native_concept(self):
"""Test is_native_concept method."""
valid_domain = "valid_domain"
valid_definition = "Lorem Ipsum"
- for native_concept in NativeConceptEnum.values_list():
- assert Concept.is_native_concept(ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[native_concept])) is True
+ for native_concept_code in NativeConceptCode.values_list():
+ native_concept = ConceptFactory.make_native_concept_from_enum(native_concept_code=native_concept_code)
+ assert Concept.is_native_concept(native_concept) is True
assert (
Concept.is_native_concept(
ConceptFactory.make_from_blueprint(
- concept_code=NativeConceptEnum.TEXT,
+ concept_code=NativeConceptCode.TEXT,
domain=valid_domain,
blueprint=ConceptBlueprint(description=valid_definition),
concept_codes_from_the_same_domain=["RandomConcept"],
@@ -115,7 +145,7 @@ class TestConcept:
assert (
Concept.is_native_concept(
ConceptFactory.make_from_blueprint(
- concept_code=NativeConceptEnum.TEXT,
+ concept_code=NativeConceptCode.TEXT,
domain=SpecialDomain.NATIVE,
blueprint=ConceptBlueprint(description=valid_definition),
),
@@ -125,7 +155,7 @@ class TestConcept:
assert (
Concept.is_native_concept(
ConceptFactory.make_from_blueprint(
- concept_code=NativeConceptEnum.IMAGE,
+ concept_code=NativeConceptCode.IMAGE,
domain=valid_domain,
blueprint=ConceptBlueprint(description=valid_definition),
concept_codes_from_the_same_domain=["RandomConcept"],
@@ -136,7 +166,7 @@ class TestConcept:
assert (
Concept.is_native_concept(
ConceptFactory.make_from_blueprint(
- concept_code=NativeConceptEnum.PDF,
+ concept_code=NativeConceptCode.PDF,
domain=valid_domain,
blueprint=ConceptBlueprint(description=valid_definition),
concept_codes_from_the_same_domain=["RandomConcept"],
@@ -147,7 +177,7 @@ class TestConcept:
assert (
Concept.is_native_concept(
ConceptFactory.make_from_blueprint(
- concept_code=NativeConceptEnum.TEXT_AND_IMAGES,
+ concept_code=NativeConceptCode.TEXT_AND_IMAGES,
domain=valid_domain,
blueprint=ConceptBlueprint(description=valid_definition),
concept_codes_from_the_same_domain=["RandomConcept"],
@@ -158,7 +188,7 @@ class TestConcept:
assert (
Concept.is_native_concept(
ConceptFactory.make_from_blueprint(
- concept_code=NativeConceptEnum.NUMBER,
+ concept_code=NativeConceptCode.NUMBER,
domain=valid_domain,
blueprint=ConceptBlueprint(description=valid_definition),
concept_codes_from_the_same_domain=["RandomConcept"],
@@ -169,7 +199,7 @@ class TestConcept:
assert (
Concept.is_native_concept(
ConceptFactory.make_from_blueprint(
- concept_code=NativeConceptEnum.LLM_PROMPT,
+ concept_code=NativeConceptCode.LLM_PROMPT,
domain=valid_domain,
blueprint=ConceptBlueprint(description=valid_definition),
concept_codes_from_the_same_domain=["RandomConcept"],
@@ -180,7 +210,7 @@ class TestConcept:
assert (
Concept.is_native_concept(
ConceptFactory.make_from_blueprint(
- concept_code=NativeConceptEnum.ANYTHING,
+ concept_code=NativeConceptCode.ANYTHING,
domain=valid_domain,
blueprint=ConceptBlueprint(description=valid_definition),
concept_codes_from_the_same_domain=["RandomConcept"],
@@ -204,8 +234,8 @@ class TestConcept:
"""Test construct_concept_string_with_domain method."""
valid_domain = "valid_domain"
assert (
- ConceptFactory.make_concept_string_with_domain(domain=valid_domain, concept_code=NativeConceptEnum.TEXT)
- == f"{valid_domain}.{NativeConceptEnum.TEXT}"
+ ConceptFactory.make_concept_string_with_domain(domain=valid_domain, concept_code=NativeConceptCode.TEXT)
+ == f"{valid_domain}.{NativeConceptCode.TEXT}"
)
def test_validate_concept_string(self):
@@ -218,7 +248,7 @@ class TestConcept:
assert ConceptBlueprint.validate_concept_string(f"snake_case_domain.{valid_concept_code}") is None
assert ConceptBlueprint.validate_concept_string(f"domain_123.{valid_concept_code}") is None
assert ConceptBlueprint.validate_concept_string(f"{valid_domain}.TEXT") is None
- assert ConceptBlueprint.validate_concept_string(f"{SpecialDomain.NATIVE}.{NativeConceptEnum.ANYTHING}") is None
+ assert ConceptBlueprint.validate_concept_string(f"{SpecialDomain.NATIVE}.{NativeConceptCode.ANYTHING}") is None
# Invalid cases - should raise ConceptCodeError
@@ -263,13 +293,13 @@ class TestConcept:
concept1 = ConceptFactory.make_from_blueprint(
concept_code="Code1",
domain="domain1",
- blueprint=ConceptBlueprint(description="Lorem Ipsum", refines=NativeConceptEnum.TEXT),
+ blueprint=ConceptBlueprint(description="Lorem Ipsum", refines=NativeConceptCode.TEXT),
concept_codes_from_the_same_domain=["Code1"],
)
concept2 = ConceptFactory.make_from_blueprint(
concept_code="Code2",
domain="domain1",
- blueprint=ConceptBlueprint(description="Lorem Ipsum", refines=NativeConceptEnum.TEXT),
+ blueprint=ConceptBlueprint(description="Lorem Ipsum", refines=NativeConceptCode.TEXT),
concept_codes_from_the_same_domain=["Code1"],
)
concept3 = ConceptFactory.make_from_blueprint(
@@ -285,12 +315,12 @@ class TestConcept:
concept_codes_from_the_same_domain=["Code1"],
)
- concept_5 = ConceptFactory.make_native_concept(
- native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.PAGE],
+ concept_5 = ConceptFactory.make_native_concept_from_enum(
+ native_concept_code=NativeConceptCode.PAGE,
)
- concept_6 = ConceptFactory.make_native_concept(
- native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.IMAGE],
+ concept_6 = ConceptFactory.make_native_concept_from_enum(
+ native_concept_code=NativeConceptCode.IMAGE,
)
concept_7 = ConceptFactory.make_from_blueprint(
diff --git a/tests/unit/pipelex/core/concepts/concept_factory/data.py b/tests/unit/pipelex/core/concepts/concept_factory/data.py
index 38a8f2328..a705929c1 100644
--- a/tests/unit/pipelex/core/concepts/concept_factory/data.py
+++ b/tests/unit/pipelex/core/concepts/concept_factory/data.py
@@ -7,7 +7,7 @@ from pipelex.core.concepts.concept_blueprint import (
ConceptStructureBlueprintFieldType,
)
from pipelex.core.concepts.concept_factory import DomainAndConceptCode
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import SpecialDomain
@@ -16,16 +16,16 @@ class TestCases:
MAKE_REFINES_TEST_CASES: ClassVar[list[tuple[str, ConceptBlueprint, str]]] = [
(
"native_concept_string",
- ConceptBlueprint(description="A concept that refines a native text concept", refines=NativeConceptEnum.TEXT),
- f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ ConceptBlueprint(description="A concept that refines a native text concept", refines=NativeConceptCode.TEXT),
+ f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
),
(
"fully_qualified_native_string",
ConceptBlueprint(
description="A concept that refines a fully qualified native concept",
- refines=f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ refines=f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
),
- f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
),
]
@@ -82,7 +82,7 @@ class TestCases:
domain=SpecialDomain.IMPLICIT,
code="SimpleConcept",
description="A simple concept",
- structure_class_name=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT].content_class_name,
+ structure_class_name=NativeConceptCode.TEXT.structure_class_name,
refines=None,
),
),
@@ -97,7 +97,7 @@ class TestCases:
domain=SpecialDomain.IMPLICIT,
code="ConceptWithStructure",
description="A concept with string structure",
- structure_class_name=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT].content_class_name,
+ structure_class_name=NativeConceptCode.TEXT.structure_class_name,
refines=None,
),
),
@@ -112,7 +112,7 @@ class TestCases:
domain=SpecialDomain.IMPLICIT,
code="MyTextConcept",
description="A concept that refines Text",
- structure_class_name=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT].content_class_name,
+ structure_class_name=NativeConceptCode.TEXT.structure_class_name,
refines="native.Text",
),
),
@@ -127,7 +127,7 @@ class TestCases:
domain=SpecialDomain.IMPLICIT,
code="MyImageConcept",
description="A concept that refines native.Image",
- structure_class_name=NATIVE_CONCEPTS_DATA[NativeConceptEnum.IMAGE].content_class_name,
+ structure_class_name=NativeConceptCode.IMAGE.structure_class_name,
refines="native.Image",
),
),
@@ -142,7 +142,7 @@ class TestCases:
domain=SpecialDomain.NATIVE,
code="Text",
description="Native text concept",
- structure_class_name=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT].content_class_name,
+ structure_class_name=NativeConceptCode.TEXT.structure_class_name,
refines=None,
),
),
@@ -157,7 +157,7 @@ class TestCases:
domain="my_domain",
code="DomainConcept",
description="A concept from same domain",
- structure_class_name=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT].content_class_name,
+ structure_class_name=NativeConceptCode.TEXT.structure_class_name,
refines=None,
),
),
@@ -172,7 +172,7 @@ class TestCases:
domain=SpecialDomain.IMPLICIT,
code="UnknownConcept",
description="An unknown concept",
- structure_class_name=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT].content_class_name,
+ structure_class_name=NativeConceptCode.TEXT.structure_class_name,
refines=None,
),
),
@@ -241,7 +241,7 @@ class TestCases:
domain=SpecialDomain.IMPLICIT,
code="ConceptWithRefines",
description="A concept with refines",
- structure_class_name=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT].content_class_name,
+ structure_class_name=NativeConceptCode.TEXT.structure_class_name,
refines="native.Text",
),
),
@@ -256,7 +256,7 @@ class TestCases:
domain="my_domain",
code="ConceptWithRefines",
description="A concept with refines",
- structure_class_name=NATIVE_CONCEPTS_DATA[NativeConceptEnum.IMAGE].content_class_name,
+ structure_class_name=NativeConceptCode.IMAGE.structure_class_name,
refines="native.Image",
),
),
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.py
index 519e97cee..85bc3a468 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,13 +1,13 @@
from pipelex.core.concepts.concept_blueprint import ConceptBlueprint
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.hub import get_concept_library
class TestConceptLibrary:
def test_is_image_concept(self):
concept_library = get_concept_library()
- native_image_concept = ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.IMAGE])
+ native_image_concept = ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.IMAGE)
concept_1 = ConceptFactory.make_from_blueprint(
domain="test",
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.py
index f5ced9000..13ee6d3a1 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
@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
import pytest
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.stuffs.structured_content import StructuredContent
from pipelex.hub import get_concept_library, get_native_concept, get_required_concept
from pipelex.tools.class_registry_utils import ClassRegistryUtils
@@ -37,7 +37,7 @@ def register_test_concepts():
# 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}"),
+ ("ProfilePhoto", "A profile photo", "ProfilePhoto", f"native.{NativeConceptCode.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),
@@ -122,7 +122,7 @@ class TestConceptFindImageFieldPaths:
the concept is an image, not a structured type with image fields.
"""
# Get concept
- concept = get_native_concept(NativeConceptEnum.IMAGE)
+ concept = get_native_concept(NativeConceptCode.IMAGE)
# Find image paths
image_paths = concept.search_for_nested_image_fields_in_structure_class()
@@ -136,7 +136,7 @@ class TestConceptFindImageFieldPaths:
This tests the native concept that combines text and images.
"""
# Get the native TextAndImages concept
- concept = get_native_concept(NativeConceptEnum.TEXT_AND_IMAGES)
+ concept = get_native_concept(NativeConceptCode.TEXT_AND_IMAGES)
# Find image paths
image_paths = concept.search_for_nested_image_fields_in_structure_class()
diff --git a/tests/unit/pipelex/core/memory/test_dry_working_memory.py b/tests/unit/pipelex/core/memory/test_dry_working_memory.py
index 0692d920b..9553a47dd 100644
--- a/tests/unit/pipelex/core/memory/test_dry_working_memory.py
+++ b/tests/unit/pipelex/core/memory/test_dry_working_memory.py
@@ -2,7 +2,7 @@ import pytest
from pipelex import log
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
from pipelex.core.pipes.input_requirements import TypedNamedInputRequirement
from pipelex.core.stuffs.page_content import PageContent
@@ -24,7 +24,7 @@ class TestDryWorkingMemory:
TypedNamedInputRequirement(
variable_name="page",
concept=ConceptFactory.make(
- concept_code=NativeConceptEnum.PAGE, domain="test_tricky_questions", description="Lorem Ipsum", structure_class_name="Page"
+ concept_code=NativeConceptCode.PAGE, domain="test_tricky_questions", description="Lorem Ipsum", structure_class_name="Page"
),
structure_class=PageContent,
),
@@ -37,7 +37,7 @@ class TestDryWorkingMemory:
# Verify concept code is correct
page_stuff = dry_memory.get_stuff("page")
- assert page_stuff.concept.code == NativeConceptEnum.PAGE
+ assert page_stuff.concept.code == NativeConceptCode.PAGE
assert page_stuff.stuff_name == "page"
# Verify structured content was created properly
diff --git a/tests/unit/pipelex/core/memory/test_working_memory.py b/tests/unit/pipelex/core/memory/test_working_memory.py
index f187b04c9..3c1ce3e5c 100644
--- a/tests/unit/pipelex/core/memory/test_working_memory.py
+++ b/tests/unit/pipelex/core/memory/test_working_memory.py
@@ -3,7 +3,7 @@ from typing import ClassVar
import pytest
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.memory.working_memory import MAIN_STUFF_NAME, WorkingMemory
from pipelex.core.memory.working_memory_factory import WorkingMemoryFactory
@@ -63,7 +63,7 @@ class TestWorkingMemory:
def single_text_memory(self) -> WorkingMemory:
"""Create WorkingMemory with single text content."""
return WorkingMemoryFactory.make_from_text(
- text=TestWorkingMemoryData.SAMPLE_TEXT, concept_string=SpecialDomain.NATIVE + "." + NativeConceptEnum.TEXT, name="sample_text"
+ text=TestWorkingMemoryData.SAMPLE_TEXT, concept_string=SpecialDomain.NATIVE + "." + NativeConceptCode.TEXT, name="sample_text"
)
@pytest.fixture
@@ -79,26 +79,26 @@ class TestWorkingMemory:
def single_pdf_memory(self) -> WorkingMemory:
"""Create WorkingMemory with single PDF content."""
return WorkingMemoryFactory.make_from_pdf(
- pdf_url=TestWorkingMemoryData.SAMPLE_PDF_URL, concept_string=NativeConceptEnum.PDF, name="pdf_document"
+ pdf_url=TestWorkingMemoryData.SAMPLE_PDF_URL, concept_string=NativeConceptCode.PDF, name="pdf_document"
)
@pytest.fixture
def multiple_stuff_memory(self) -> WorkingMemory:
"""Create WorkingMemory with multiple stuff items."""
text_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
name="question",
content=TextContent(text="What are the aerodynamic features?"),
)
document_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
name="document",
content=TextContent(text=TestWorkingMemoryData.SAMPLE_TEXT),
)
image_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.IMAGE]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.IMAGE),
name="diagram",
content=ImageContent(url=TestWorkingMemoryData.SAMPLE_IMAGE_URL),
)
@@ -109,13 +109,13 @@ class TestWorkingMemory:
def memory_with_aliases(self) -> WorkingMemory:
"""Create WorkingMemory with aliases."""
text_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
name="primary_text",
content=TextContent(text="Primary content"),
)
secondary_stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
name="secondary_text",
content=TextContent(text="Secondary content"),
)
@@ -156,7 +156,7 @@ class TestWorkingMemory:
)
stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT_AND_IMAGES]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT_AND_IMAGES),
name="project_overview",
content=text_and_images_content,
)
@@ -187,7 +187,7 @@ class TestWorkingMemory:
number_content = NumberContent(number=3.14159)
stuff = StuffFactory.make_stuff(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.NUMBER]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.NUMBER),
name="pi_value",
content=number_content,
)
@@ -202,7 +202,7 @@ class TestWorkingMemory:
# Check stuff retrieval
stuff = single_text_memory.get_stuff("sample_text")
- assert stuff.concept.code == NativeConceptEnum.TEXT
+ assert stuff.concept.code == NativeConceptCode.TEXT
assert isinstance(stuff.content, TextContent)
assert stuff.content.text == TestWorkingMemoryData.SAMPLE_TEXT
diff --git a/tests/unit/pipelex/core/stuffs/test_stuff_content_factory.py b/tests/unit/pipelex/core/stuffs/test_stuff_content_factory.py
index 61d9dbece..402a3aa66 100644
--- a/tests/unit/pipelex/core/stuffs/test_stuff_content_factory.py
+++ b/tests/unit/pipelex/core/stuffs/test_stuff_content_factory.py
@@ -4,7 +4,7 @@ import pytest
from pipelex import log
from pipelex.core.concepts.concept_factory import ConceptFactory
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.domains.domain import SpecialDomain
from pipelex.core.stuffs.structured_content import StructuredContent
from pipelex.core.stuffs.stuff_factory import StuffContentFactory
@@ -14,19 +14,19 @@ from pipelex.core.stuffs.text_content import TextContent
class TestCases:
# Test cases for TextContent with string content
TEXT_STRING_BLUEPRINT: ClassVar[dict[str, Any]] = {
- "concept_string": f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ "concept_string": f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
"content": "The Dawn of Ultra-Rapid Transit: NextGen High-Speed Trains Redefine Travel",
}
# Test cases for TextContent with dict content
TEXT_DICT_BLUEPRINT: ClassVar[dict[str, Any]] = {
- "concept_string": f"{SpecialDomain.NATIVE}.{NativeConceptEnum.TEXT}",
+ "concept_string": f"{SpecialDomain.NATIVE}.{NativeConceptCode.TEXT}",
"content": {"text": "Sample text content"},
}
# Test cases for native concept without prefix (should work)
TEXT_NO_PREFIX_BLUEPRINT: ClassVar[dict[str, Any]] = {
- "concept_string": f"{NativeConceptEnum.TEXT}",
+ "concept_string": f"{NativeConceptCode.TEXT}",
"content": {"text": "Text content without native prefix"},
}
@@ -92,7 +92,7 @@ class TestStuffContentFactory:
def test_make_stuffcontent_from_concept_code_required_text_content(self):
"""Test required method with native.Text concept (should work)."""
result = StuffContentFactory.make_stuff_content_from_concept_required(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value="Test text content",
)
@@ -102,7 +102,7 @@ class TestStuffContentFactory:
def test_make_stuffcontent_from_concept_code_required_implicit_concept(self):
"""Test required method with implicit concept (should create TextContent)."""
result = StuffContentFactory.make_stuff_content_from_concept_required(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value="Test content for implicit concept",
)
@@ -112,7 +112,7 @@ class TestStuffContentFactory:
def test_make_stuffcontent_from_concept_code_with_fallback_text_success(self):
"""Test fallback method with native.Text concept."""
result = StuffContentFactory.make_stuff_content_from_concept_with_fallback(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value="Test text content",
)
@@ -122,7 +122,7 @@ class TestStuffContentFactory:
def test_make_stuffcontent_from_concept_code_with_fallback_implicit_string(self):
"""Test fallback method with implicit concept and string value."""
result = StuffContentFactory.make_stuff_content_from_concept_with_fallback(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value="Fallback text content",
)
@@ -132,7 +132,7 @@ class TestStuffContentFactory:
def test_make_stuffcontent_from_concept_code_with_fallback_implicit_dict(self):
"""Test fallback method with implicit concept and dict value."""
result = StuffContentFactory.make_stuff_content_from_concept_with_fallback(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value={"text": "Dict fallback content"},
)
@@ -150,7 +150,7 @@ class TestStuffContentFactory:
if test_name.startswith("text_"):
# Test native.Text concept with required method
result = StuffContentFactory.make_stuff_content_from_concept_required(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value=content,
)
assert isinstance(result, TextContent)
@@ -168,7 +168,7 @@ class TestStuffContentFactory:
# The dict will be passed through model_validate which should fail for TextContent
try:
result_required = StuffContentFactory.make_stuff_content_from_concept_required(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value=content,
)
# If it succeeds, it should be TextContent (due to implicit concept)
@@ -180,7 +180,7 @@ class TestStuffContentFactory:
# Test fallback method - same behavior expected
try:
result_fallback = StuffContentFactory.make_stuff_content_from_concept_with_fallback(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value=content,
)
# If it succeeds, it should be TextContent (due to implicit concept)
@@ -193,13 +193,13 @@ class TestStuffContentFactory:
# Both methods should work and return TextContent due to implicit concept creation
result_required = StuffContentFactory.make_stuff_content_from_concept_required(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value=content,
)
assert isinstance(result_required, TextContent)
result_fallback = StuffContentFactory.make_stuff_content_from_concept_with_fallback(
- concept=ConceptFactory.make_native_concept(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT]),
+ concept=ConceptFactory.make_native_concept_from_enum(native_concept_code=NativeConceptCode.TEXT),
value=content,
)
assert isinstance(result_fallback, TextContent)
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.py
index 165bd73c2..98e740f7a 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
@@ -3,7 +3,7 @@ from typing import Any, ClassVar
import pytest
from pytest_mock import MockerFixture
-from pipelex.core.concepts.concept_native import NATIVE_CONCEPTS_DATA, NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.stuffs.list_content import ListContent
from pipelex.core.stuffs.structured_content import StructuredContent
from pipelex.core.stuffs.stuff import Stuff
@@ -32,7 +32,7 @@ class TestData:
EMPTY_LIST_CONTENT: ClassVar[ListContent[TextContent]] = ListContent(items=[])
# Dictionary test data - native concept
- NATIVE_TEXT_DICT: ClassVar[dict[str, Any]] = {"concept": NativeConceptEnum.TEXT, "content": {"text": "Native text content"}}
+ NATIVE_TEXT_DICT: ClassVar[dict[str, Any]] = {"concept": NativeConceptCode.TEXT, "content": {"text": "Native text content"}}
# Dictionary test data - custom concept with concept field
CUSTOM_CONCEPT_DICT: ClassVar[dict[str, Any]] = {
@@ -115,7 +115,7 @@ class TestMakeStuffFromStuffContentUsingSearchDomains:
)
assert result == mock_stuff
- mock_get_native_concept.assert_called_once_with(native_concept=NativeConceptEnum.TEXT)
+ mock_get_native_concept.assert_called_once_with(native_concept=NativeConceptCode.TEXT)
def test_stuffcontent_with_non_native_concept(self, mocker: MockerFixture):
"""Test StuffContent with non-native concept properly extracts concept name."""
@@ -187,7 +187,7 @@ class TestMakeStuffFromStuffContentUsingSearchDomains:
"""Test string input creates TextContent with TEXT concept."""
mock_concept = mocker.Mock()
mock_concept_factory = mocker.patch("pipelex.core.stuffs.stuff_factory.ConceptFactory")
- mock_concept_factory.make_native_concept.return_value = mock_concept
+ mock_concept_factory.make_native_concept_from_enum.return_value = mock_concept
mock_stuff = mocker.Mock(spec=Stuff)
mocker.patch.object(StuffFactory, "make_stuff", return_value=mock_stuff)
@@ -199,13 +199,13 @@ class TestMakeStuffFromStuffContentUsingSearchDomains:
)
assert result == mock_stuff
- mock_concept_factory.make_native_concept.assert_called_once_with(native_concept_data=NATIVE_CONCEPTS_DATA[NativeConceptEnum.TEXT])
+ mock_concept_factory.make_native_concept_from_enum.assert_called_once_with(native_concept_code=NativeConceptCode.TEXT)
def test_dict_with_native_concept(self, mocker: MockerFixture):
"""Test dictionary with native concept."""
mock_concept = mocker.Mock()
mock_concept_factory = mocker.patch("pipelex.core.stuffs.stuff_factory.ConceptFactory")
- mock_concept_factory.make_native_concept.return_value = mock_concept
+ mock_concept_factory.make_native_concept_from_enum.return_value = mock_concept
mock_content = mocker.Mock(spec=StuffContent)
mock_content_factory = mocker.patch("pipelex.core.stuffs.stuff_factory.StuffContentFactory")
@@ -222,7 +222,7 @@ class TestMakeStuffFromStuffContentUsingSearchDomains:
)
assert result == mock_stuff
- mock_concept_factory.make_native_concept.assert_called_once()
+ mock_concept_factory.make_native_concept_from_enum.assert_called_once()
mock_content_factory.make_stuff_content_from_concept_with_fallback.assert_called_once()
def test_dict_with_custom_concept_and_stuffcontent_value(self, mocker: MockerFixture):
diff --git a/tests/unit/pipelex/core/test_data/pipes/operators/compose/pipe_compose.py b/tests/unit/pipelex/core/test_data/pipes/operators/compose/pipe_compose.py
index 1586be20f..981429745 100644
--- a/tests/unit/pipelex/core/test_data/pipes/operators/compose/pipe_compose.py
+++ b/tests/unit/pipelex/core/test_data/pipes/operators/compose/pipe_compose.py
@@ -1,5 +1,5 @@
from pipelex.core.bundles.pipelex_bundle_blueprint import PipelexBundleBlueprint
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.pipe_operators.compose.pipe_compose_blueprint import PipeComposeBlueprint
from pipelex.tools.templating.jinja2_template_category import Jinja2TemplateCategory
@@ -22,7 +22,7 @@ template_category = "markdown"
"process_template": PipeComposeBlueprint(
type="PipeCompose",
description="Process a Jinja2 template",
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
jinja2="Hello {{ name }}!",
template_category=Jinja2TemplateCategory.MARKDOWN,
),
diff --git a/tests/unit/pipelex/core/test_data/pipes/operators/img_gen/pipe_img_gen.py b/tests/unit/pipelex/core/test_data/pipes/operators/img_gen/pipe_img_gen.py
index 6e55d9b72..67db2e092 100644
--- a/tests/unit/pipelex/core/test_data/pipes/operators/img_gen/pipe_img_gen.py
+++ b/tests/unit/pipelex/core/test_data/pipes/operators/img_gen/pipe_img_gen.py
@@ -1,5 +1,5 @@
from pipelex.core.bundles.pipelex_bundle_blueprint import PipelexBundleBlueprint
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.pipe_operators.img_gen.pipe_img_gen_blueprint import PipeImgGenBlueprint
PIPE_IMG_GEN = (
@@ -20,7 +20,7 @@ img_gen_prompt = "A beautiful landscape"
"generate_image": PipeImgGenBlueprint(
type="PipeImgGen",
description="Generate an image from a prompt",
- output=NativeConceptEnum.IMAGE,
+ output=NativeConceptCode.IMAGE,
img_gen_prompt="A beautiful landscape",
),
},
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.py
index f8b2ec2ef..acc9ded15 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,6 +1,6 @@
# ruff: noqa: E501
from pipelex.core.bundles.pipelex_bundle_blueprint import PipelexBundleBlueprint
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.core.pipes.input_requirement_blueprint import InputRequirementBlueprint
from pipelex.pipe_operators.llm.pipe_llm_blueprint import PipeLLMBlueprint
@@ -23,7 +23,7 @@ prompt_template = "Generate a story about a programmer"
"generate_text": PipeLLMBlueprint(
type="PipeLLM",
description="Generate text using LLM",
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
prompt_template="Generate a story about a programmer",
),
},
@@ -55,7 +55,7 @@ Extract information about $topic from this text:
type="PipeLLM",
description="Extract information from text",
inputs={"text": "Text", "topic": "Text"},
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
prompt_template="Extract information about $topic from this text:\n\n@text\n",
),
},
@@ -82,7 +82,7 @@ prompt_template = "Analyze the following data and provide insights"
"expert_analysis": PipeLLMBlueprint(
type="PipeLLM",
description="Expert analysis with system prompt",
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
system_prompt="You are a data analysis expert with 20 years of experience",
prompt_template="Analyze the following data and provide insights",
),
@@ -112,7 +112,7 @@ Extract all articles/items from this invoice text: $extracted_text. For each ite
"expert_analysis": PipeLLMBlueprint(
type="PipeLLM",
description="Expert analysis with system prompt",
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
prompt_template="""Extract all articles/items from this invoice text: $extracted_text. For each item find: item name, quantity, unit price, total price, description, and product code if
available. Return each article as separate structured data.
""",
@@ -140,7 +140,7 @@ nb_output = 3
"generate_ideas": PipeLLMBlueprint(
type="PipeLLM",
description="Generate multiple ideas",
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
nb_output=3,
prompt_template="Generate creative ideas for a mobile app",
),
@@ -170,7 +170,7 @@ multiple_output = true
type="PipeLLM",
description="Brainstorm multiple solutions",
inputs={"problem": InputRequirementBlueprint(concept="Text")},
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
multiple_output=True,
prompt_template="Brainstorm solutions for this problem: $problem",
),
@@ -199,7 +199,7 @@ prompt_template = "Describe what you see in this image in detail"
type="PipeLLM",
description="Analyze image content",
inputs={"image": "Image"},
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
prompt_template="Describe what you see in this image in detail",
),
},
@@ -227,7 +227,7 @@ template_name = "analysis_template"
type="PipeLLM",
description="Use named template",
inputs={"data": "Text"},
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
template_name="analysis_template",
),
},
@@ -253,7 +253,7 @@ prompt = "Write a haiku about programming"
"simple_generation": PipeLLMBlueprint(
type="PipeLLM",
description="Simple text generation with fixed prompt",
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
prompt="Write a haiku about programming",
),
},
@@ -282,7 +282,7 @@ prompt_template = "Analyze this content: @content"
type="PipeLLM",
description="Analysis with dynamic system prompt",
inputs={"expertise_level": "Text", "content": "Text"},
- output=NativeConceptEnum.TEXT,
+ output=NativeConceptCode.TEXT,
system_prompt_template="You are an expert with $expertise_level level knowledge",
prompt_template="Analyze this content: @content",
),
diff --git a/tests/unit/pipelex/core/test_data/pipes/operators/ocr/pipe_ocr.py b/tests/unit/pipelex/core/test_data/pipes/operators/ocr/pipe_ocr.py
index 99575c201..08f52d728 100644
--- a/tests/unit/pipelex/core/test_data/pipes/operators/ocr/pipe_ocr.py
+++ b/tests/unit/pipelex/core/test_data/pipes/operators/ocr/pipe_ocr.py
@@ -1,5 +1,5 @@
from pipelex.core.bundles.pipelex_bundle_blueprint import PipelexBundleBlueprint
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.pipe_operators.ocr.pipe_ocr_blueprint import PipeOcrBlueprint
PIPE_OCR = (
@@ -20,7 +20,7 @@ ocr = "base_ocr_pypdfium2"
"extract_text": PipeOcrBlueprint(
type="PipeOcr",
description="Extract text from document",
- output=NativeConceptEnum.PAGE,
+ output=NativeConceptCode.PAGE,
ocr="base_ocr_pypdfium2",
),
},
diff --git a/tests/unit/pipelex/tools/misc/test_dict_utils.py b/tests/unit/pipelex/tools/misc/test_dict_utils.py
index 0b7bb0dde..4cc21158c 100644
--- a/tests/unit/pipelex/tools/misc/test_dict_utils.py
+++ b/tests/unit/pipelex/tools/misc/test_dict_utils.py
@@ -1,6 +1,6 @@
from typing import Any
-from pipelex.core.concepts.concept_native import NativeConceptEnum
+from pipelex.core.concepts.concept_native import NativeConceptCode
from pipelex.tools.misc.dict_utils import apply_to_strings_in_list, apply_to_strings_recursive, insert_before
@@ -37,7 +37,7 @@ class TestDictUtils:
def test_complex_nested_structure(self) -> None:
"""Test with complex nested dictionary structure."""
- original = {"type": "PipeLLM", "description": "Test pipe", "output": NativeConceptEnum.TEXT, "system_prompt": "Test prompt"}
+ original = {"type": "PipeLLM", "description": "Test pipe", "output": NativeConceptCode.TEXT, "system_prompt": "Test prompt"}
# Insert inputs before output
result = insert_before(original, "output", "inputs", "InputText")