Merge branch 'missing-agentir-plugins' into 'main'

Add missing agentir-wayflowcore plugins

See merge request wayflow-dev/wayflow-public!188

Author: wayflow-bot

wayflowcore/src/wayflowcore/agentir/_agentirconverter.py

@@ -5,13 +5,25 @@
 from .contextprovider import (
     PluginConstantContextProvider,
     PluginContextProvider,
+    PluginFlowContextProvider,
+    PluginToolContextProvider,
     contextprovider_deserialization_plugin,
     contextprovider_serialization_plugin,
 )
 from .datastores.plugin import (
     wayflowcore_datastore_deserialization_plugin,
     wayflowcore_datastore_serialization_plugin,
 )
+from .embeddingmodels import (
+    PluginEmbeddingConfig,
+    PluginOciGenAiEmbeddingConfig,
+    PluginOllamaEmbeddingConfig,
+    PluginOpenAiCompatibleEmbeddingConfig,
+    PluginOpenAiEmbeddingConfig,
+    PluginVllmEmbeddingConfig,
+    embeddingmodel_deserialization_plugin,
+    embeddingmodel_serialization_plugin,
+)
 from .flow import ExtendedFlow, flow_deserialization_plugin, flow_serialization_plugin
 from .managerworkers import (
     PluginManagerWorkers,
@@ -32,11 +44,14 @@
     ExtendedToolNode,
     PluginCatchExceptionNode,
     PluginChoiceNode,
+    PluginConstantValuesNode,
     PluginExtractNode,
+    PluginGetChatHistoryNode,
     PluginInputMessageNode,
     PluginOutputMessageNode,
     PluginReadVariableNode,
     PluginRegexNode,
+    PluginRetryNode,
     PluginTemplateNode,
     PluginWriteVariableNode,
     nodes_deserialization_plugin,
@@ -71,6 +86,7 @@
     PluginMessageTransform,
     PluginReactMergeToolRequestAndCallsTransform,
     PluginRemoveEmptyNonUserMessageTransform,
+    PluginSwarmToolRequestAndCallsTransform,
     messagetransform_deserialization_plugin,
     messagetransform_serialization_plugin,
 )
@@ -88,6 +104,7 @@
     messagetransform_serialization_plugin,
     prompttemplate_serialization_plugin,
     outputparser_serialization_plugin,
+    embeddingmodel_serialization_plugin,
 ]
 
 
@@ -104,6 +121,7 @@
     messagetransform_deserialization_plugin,
     prompttemplate_deserialization_plugin,
     outputparser_deserialization_plugin,
+    embeddingmodel_deserialization_plugin,
 ]
 
 
@@ -138,20 +156,26 @@
     "PluginRegexNode",
     "PluginWriteVariableNode",
     "PluginReadVariableNode",
+    "PluginConstantValuesNode",
+    "PluginGetChatHistoryNode",
+    "PluginRetryNode",
     "nodes_serialization_plugin",
     "nodes_deserialization_plugin",
     "ExtendedFlow",
     "flow_serialization_plugin",
     "flow_deserialization_plugin",
     "PluginConstantContextProvider",
     "PluginContextProvider",
+    "PluginFlowContextProvider",
+    "PluginToolContextProvider",
     "contextprovider_serialization_plugin",
     "contextprovider_deserialization_plugin",
     "PluginAppendTrailingSystemMessageToUserMessageTransform",
     "PluginMessageTransform",
     "PluginCoalesceSystemMessagesTransform",
     "PluginRemoveEmptyNonUserMessageTransform",
     "PluginReactMergeToolRequestAndCallsTransform",
+    "PluginSwarmToolRequestAndCallsTransform",
     "messagetransform_serialization_plugin",
     "messagetransform_deserialization_plugin",
     "PluginPromptTemplate",
@@ -171,4 +195,19 @@
     "wayflowcore_datastore_serialization_plugin",
     "wayflowcore_datastore_deserialization_plugin",
     "PluginManagerWorkers",
+    "PluginAppendTrailingSystemMessageToUserMessageTransform",
+    "PluginCoalesceSystemMessagesTransform",
+    "PluginMessageTransform",
+    "PluginReactMergeToolRequestAndCallsTransform",
+    "PluginRemoveEmptyNonUserMessageTransform",
+    "messagetransform_deserialization_plugin",
+    "messagetransform_serialization_plugin",
+    "PluginEmbeddingConfig",
+    "PluginVllmEmbeddingConfig",
+    "PluginOllamaEmbeddingConfig",
+    "PluginOciGenAiEmbeddingConfig",
+    "PluginOpenAiCompatibleEmbeddingConfig",
+    "PluginOpenAiEmbeddingConfig",
+    "embeddingmodel_deserialization_plugin",
+    "embeddingmodel_serialization_plugin",
 ]

wayflowcore/src/wayflowcore/agentir/_runtimeconverter.py

@@ -1,10 +1,13 @@
 # Copyright © 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-from typing import Any
+from typing import Any, List, Optional
 
+from pyagentir.flows.flow import Flow
 from pyagentir.flows.node import Node
+from pyagentir.tools import ServerTool
 from pyagentir.validation_helpers import model_validator_with_error_accumulation
+from pydantic import SerializeAsAny
 from typing_extensions import Self
 
 from wayflowcore.agentir.components._pydantic_plugins import (
@@ -33,17 +36,39 @@ class PluginConstantContextProvider(PluginContextProvider):
     """The value that this context provider should always return"""
 
 
+class PluginToolContextProvider(PluginContextProvider):
+    """Context provider that returns the output of a Server Tool"""
+
+    tool: SerializeAsAny[ServerTool]
+    """Server tool to execute to get the context provider value"""
+    output_name: str
+    """Name of the output of the context provider"""
+
+
+class PluginFlowContextProvider(PluginContextProvider):
+    """Context provider that uses a flow to compute some values"""
+
+    flow: SerializeAsAny[Flow]
+    """Flow to execute to get the value of the context provider"""
+    output_names: Optional[List[str]] = None
+    """Names of the flow outputs to return"""
+
+
 CONTEXTPROVIDER_PLUGIN_NAME = "ContextProviderPlugin"
 
 contextprovider_serialization_plugin = PydanticComponentSerializationPlugin(
     name=CONTEXTPROVIDER_PLUGIN_NAME,
     component_types_and_models={
-        PluginConstantContextProvider.__name__: PluginConstantContextProvider
+        PluginConstantContextProvider.__name__: PluginConstantContextProvider,
+        PluginToolContextProvider.__name__: PluginToolContextProvider,
+        PluginFlowContextProvider.__name__: PluginFlowContextProvider,
     },
 )
 contextprovider_deserialization_plugin = PydanticComponentDeserializationPlugin(
     name=CONTEXTPROVIDER_PLUGIN_NAME,
     component_types_and_models={
-        PluginConstantContextProvider.__name__: PluginConstantContextProvider
+        PluginConstantContextProvider.__name__: PluginConstantContextProvider,
+        PluginToolContextProvider.__name__: PluginToolContextProvider,
+        PluginFlowContextProvider.__name__: PluginFlowContextProvider,
     },
 )

wayflowcore/src/wayflowcore/agentir/components/__init__.py

@@ -0,0 +1,100 @@
+# Copyright © 2025 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+
+from pyagentir import Component
+from pyagentir.component import SerializeAsEnum
+from pyagentir.llms.ociclientconfig import OciClientConfig
+from pydantic import SerializeAsAny
+
+from wayflowcore.agentir.components._pydantic_plugins import (
+    PydanticComponentDeserializationPlugin,
+    PydanticComponentSerializationPlugin,
+)
+from wayflowcore.models.ocigenaimodel import ServingMode
+
+
+class PluginEmbeddingConfig(Component, abstract=True):
+    """Embedding models are components that can transform text into float vectors, to be used later
+    for retrieval for example."""
+
+
+class PluginOciGenAiEmbeddingConfig(PluginEmbeddingConfig):
+    """
+    Class to configure a connection to a OCI GenAI hosted embedding model.
+
+    Requires to specify the model id, compartment id and the client configuration to the OCI GenAI service.
+    """
+
+    model_id: str
+    """ID of the model to use"""
+    compartment_id: str
+    """ID of the compartment to use"""
+    client_config: SerializeAsAny[OciClientConfig]
+    """Client configuration to connect to the Oci GenAI service"""
+    serving_mode: SerializeAsEnum[ServingMode] = ServingMode.ON_DEMAND
+    """The serving mode of this remote Oci GenAI embedding model"""
+
+
+class PluginOpenAiCompatibleEmbeddingConfig(PluginEmbeddingConfig):
+    """
+    Class to configure a connection to an openai-compatible remotely hosted embedding model.
+
+    Requires to specify the url at which the instance is running.
+    """
+
+    url: str
+    """Url of the model deployment"""
+    model_id: str
+    """ID of the model to use"""
+
+
+class PluginOllamaEmbeddingConfig(PluginOpenAiCompatibleEmbeddingConfig):
+    """
+    Class to configure a connection to a local embedding model ran with Ollama.
+
+    Requires to specify the url and port at which the model is running.
+    """
+
+
+class PluginOpenAiEmbeddingConfig(PluginEmbeddingConfig):
+    """
+    Class to configure a connection to a OpenAI embedding model.
+
+    Requires to specify the name of the model to use.
+    """
+
+    model_id: str
+    """ID of the model to use"""
+
+
+class PluginVllmEmbeddingConfig(PluginOpenAiCompatibleEmbeddingConfig):
+    """
+    Class to configure a connection to a vLLM-hosted embedding model.
+
+    Requires to specify the url at which the instance is running.
+    """
+
+
+EMBEDDINGMODEL_PLUGIN_NAME = "EmbeddingModelPlugin"
+
+embeddingmodel_serialization_plugin = PydanticComponentSerializationPlugin(
+    name=EMBEDDINGMODEL_PLUGIN_NAME,
+    component_types_and_models={
+        PluginOciGenAiEmbeddingConfig.__name__: PluginOciGenAiEmbeddingConfig,
+        PluginOllamaEmbeddingConfig.__name__: PluginOllamaEmbeddingConfig,
+        PluginOpenAiEmbeddingConfig.__name__: PluginOpenAiEmbeddingConfig,
+        PluginVllmEmbeddingConfig.__name__: PluginVllmEmbeddingConfig,
+        PluginOpenAiCompatibleEmbeddingConfig.__name__: PluginOpenAiCompatibleEmbeddingConfig,
+    },
+)
+embeddingmodel_deserialization_plugin = PydanticComponentDeserializationPlugin(
+    name=EMBEDDINGMODEL_PLUGIN_NAME,
+    component_types_and_models={
+        PluginOciGenAiEmbeddingConfig.__name__: PluginOciGenAiEmbeddingConfig,
+        PluginOllamaEmbeddingConfig.__name__: PluginOllamaEmbeddingConfig,
+        PluginOpenAiEmbeddingConfig.__name__: PluginOpenAiEmbeddingConfig,
+        PluginVllmEmbeddingConfig.__name__: PluginVllmEmbeddingConfig,
+        PluginOpenAiCompatibleEmbeddingConfig.__name__: PluginOpenAiCompatibleEmbeddingConfig,
+    },
+)