ibm-watsonx-orchestrate 1.8.0b0__py3-none-any.whl → 1.8.0b1__py3-none-any.whl

ibm_watsonx_orchestrate/cli/commands/evaluations/evaluations_controller.py

@@ -3,12 +3,12 @@ import os.path
 from typing import List, Dict, Optional, Tuple
 import csv
 from pathlib import Path
-import rich
+import sys
 from wxo_agentic_evaluation import main as evaluate
 from wxo_agentic_evaluation.tool_planner import build_snapshot
 from wxo_agentic_evaluation.analyze_run import analyze
 from wxo_agentic_evaluation.batch_annotate import generate_test_cases_from_stories
-from wxo_agentic_evaluation.arg_configs import TestConfig, AuthConfig, LLMUserConfig, ChatRecordingConfig, AnalyzeConfig
+from wxo_agentic_evaluation.arg_configs import TestConfig, AuthConfig, LLMUserConfig, ChatRecordingConfig, AnalyzeConfig, ProviderConfig
 from wxo_agentic_evaluation.record_chat import record_chats
 from wxo_agentic_evaluation.external_agent.external_validate import ExternalAgentValidation
 from wxo_agentic_evaluation.external_agent.performance_test import ExternalAgentPerformanceTest
@@ -41,12 +41,26 @@ class EvaluationsController:
     def evaluate(self, config_file: Optional[str] = None, test_paths: Optional[str] = None, output_dir: Optional[str] = None) -> None:
         url, tenant_name, token = self._get_env_config()
 
+        if "WATSONX_SPACE_ID" in os.environ and "WATSONX_APIKEY" in os.environ:
+            provider = "watsonx"
+        elif "WO_INSTANCE" in os.environ and "WO_API_KEY" in os.environ:
+            provider = "model_proxy"
+        else:
+            logger.error(
+                "No provider found. Please either provide a config_file or set either WATSONX_SPACE_ID and WATSONX_APIKEY or WO_INSTANCE and WO_API_KEY in your system environment variables."
+            )
+            sys.exit(1)
+        
         config_data = {
             "wxo_lite_version": __version__,
             "auth_config": AuthConfig(
                 url=url,
                 tenant_name=tenant_name,
                 token=token
+            ),
+            "provider_config": ProviderConfig(
+                provider=provider,
+                model_id="meta-llama/llama-3-405b-instruct",
             )
         }
 
@@ -62,6 +76,10 @@ class EvaluationsController:
                 if "llm_user_config" in file_config:
                     llm_config_data = file_config.pop("llm_user_config")
                     config_data["llm_user_config"] = LLMUserConfig(**llm_config_data)
+
+                if "provider_config" in file_config:
+                    provider_config_data = file_config.pop("provider_config")
+                    config_data["provider_config"] = ProviderConfig(**provider_config_data)
                 
                 config_data.update(file_config)
 

ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_controller.py

@@ -71,6 +71,7 @@ class KnowledgeBaseController:
         client = self.get_client()
 
         knowledge_bases = parse_file(file=file)
+        
         existing_knowledge_bases = client.get_by_names([kb.name for kb in knowledge_bases])
         
         for kb in knowledge_bases:
@@ -137,23 +138,24 @@ class KnowledgeBaseController:
 
     def update_knowledge_base(
         self, knowledge_base_id: str, kb: KnowledgeBase, file_dir: str
-    ) -> None:
-        filtered_files = []
-        
+    ) -> None:        
         if kb.documents:
             status = self.get_client().status(knowledge_base_id)
             existing_docs = [doc.get("metadata", {}).get("original_file_name", "") for doc in status.get("documents", [])]
             
+            removed_docs = existing_docs[:]
             for filepath in kb.documents:
                 filename = get_file_name(filepath)
 
                 if filename in existing_docs:
-                    logger.warning(f'Document \"{filename}\" already exists in knowledge base, skipping.')
-                else:
-                    filtered_files.append(filepath)
+                    logger.warning(f'Document \"{filename}\" already exists in knowledge base. Updating...')
+                    removed_docs.remove(filename)
+
+            for filename in removed_docs:
+                logger.warning(f'Document \"{filename}\" removed from knowledge base.')
+
 
-        if filtered_files:
-            files = [('files', (get_file_name(file_path), open(get_relative_file_path(file_path, file_dir), 'rb'))) for file_path in filtered_files]
+            files = [('files', (get_file_name(file_path), open(get_relative_file_path(file_path, file_dir), 'rb'))) for file_path in kb.documents]
             
             kb.prioritize_built_in_index = True
             payload = kb.model_dump(exclude_none=True);

ibm_watsonx_orchestrate/cli/commands/server/server_command.py

@@ -46,15 +46,7 @@ _ALWAYS_UNSET: set[str] = {
   
 def define_saas_wdu_runtime(value: str = "none") -> None:
     cfg = Config()
-
-    current_config_file_values = cfg.get(USER_ENV_CACHE_HEADER)
-    current_config_file_values["SAAS_WDU_RUNTIME"] = value
-
-    cfg.save(
-        {
-            USER_ENV_CACHE_HEADER: current_config_file_values
-        }
-    )
+    cfg.write(USER_ENV_CACHE_HEADER,"SAAS_WDU_RUNTIME",value)
 
 def ensure_docker_installed() -> None:
     try:

ibm_watsonx_orchestrate/client/copilot/cpe/copilot_cpe_client.py

@@ -21,10 +21,11 @@ class CPEClient(BaseAPIClient):
         }
 
 
-    def submit_pre_cpe_chat(self, user_message: str | None =None, tools: Dict[str, Any] = None) -> dict:
+    def submit_pre_cpe_chat(self, user_message: str | None =None, tools: Dict[str, Any] = None, agents: Dict[str, Any] = None) -> dict:
         payload = {
             "message": user_message,
             "tools": tools,
+            "agents": agents,
             "chat_id": self.chat_id,
             "chat_model_name": self.chat_model_name
         }

ibm_watsonx_orchestrate/client/utils.py

@@ -16,6 +16,7 @@ from ibm_watsonx_orchestrate.cli.config import (
 from threading import Lock
 from ibm_watsonx_orchestrate.client.base_api_client import BaseAPIClient
 from ibm_watsonx_orchestrate.utils.utils import yaml_safe_load
+from ibm_watsonx_orchestrate.cli.commands.channels.types import RuntimeEnvironmentType
 import logging
 from typing import TypeVar
 import os
@@ -92,13 +93,13 @@ def is_ga_platform(url: str | None = None) -> bool:
 
 def get_environment() -> str:
     if is_local_dev():
-        return "local"
+        return RuntimeEnvironmentType.LOCAL
     if is_cpd_env():
-        return "cpd"
+        return RuntimeEnvironmentType.CPD
     if is_ibm_cloud_platform():
-        return "ibmcloud"
+        return RuntimeEnvironmentType.IBM_CLOUD
     if is_ga_platform():
-        return "ga"
+        return RuntimeEnvironmentType.AWS
     return None
 
 def check_token_validity(token: str) -> bool:

ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -46,7 +46,7 @@ services:
       WXO_SERVER_URL: http://wxo-server:4321
       MAX_POOL: 60
       DEPLOYMENT_MODE: laptop
-      SUFFIXLIST: '["global_05d7ba72", "ibm_184bdbd3"]'
+      SUFFIXLIST: ${CM_SUFFIXLIST:-[]}
     ports:
       - 3001:3001
 
@@ -804,6 +804,13 @@ services:
     environment:
       WATSONX_APIKEY: ${WATSONX_APIKEY}
       WATSONX_SPACE_ID: ${WATSONX_SPACE_ID}
+      WO_API_KEY: ${WO_API_KEY}
+      WO_USERNAME: ${WO_USERNAME}
+      WO_PASSWORD: ${WO_PASSWORD}
+      WO_INSTANCE: ${WO_INSTANCE}
+      USE_SAAS_ML_TOOLS_RUNTIME: ${USE_SAAS_ML_TOOLS_RUNTIME}
+      WO_AUTH_TYPE: ${WO_AUTH_TYPE}
+      AUTHORIZATION_URL: ${AUTHORIZATION_URL}
     ports:
       - 8081:8080
 
@@ -909,7 +916,7 @@ services:
       ENRICHMENT_BATCH_SIZE: "1000"
       CIPHER_AES_REALM_KEY: "dGVzdHRlc3R0ZXN0dGVzdA=="
       SIDECAR_METERED_ENABLED: "false"
-      DPI_DEBUG: true
+      DPI_DEBUG: "false"
       DPI_WO_WDU_SERVER_ENDPOINT: https://wxo-doc-processing-service:8080
       # DPI_RAG_SERVER_ENDPOINT: https://wxo-doc-processing-llm-service:8083
       DISABLE_TLS: true

ibm_watsonx_orchestrate/docker/default.env

@@ -53,10 +53,10 @@ EVENT_BROKER_TTL="-1"
 REGISTRY_URL=
 
 
-SERVER_TAG=02-07-2025
+SERVER_TAG=10-07-2025-beb40a3a
 SERVER_REGISTRY=
 
-WORKER_TAG=02-07-2025
+WORKER_TAG=10-07-2025-beb40a3a
 WORKER_REGISTRY=
 
 AI_GATEWAY_TAG=01-07-2025
@@ -84,10 +84,10 @@ TRM_REGISTRY=
 TR_TAG=08-07-2025
 TR_REGISTRY=
 
-BUILDER_TAG=02-07-2025
+BUILDER_TAG=15-07-2025
 BUILDER_REGISTRY=
 
-FLOW_RUNTIME_TAG=10-07-2025
+FLOW_RUNTIME_TAG=15-07-2025
 FLOW_RUMTIME_REGISTRY=
 
 
@@ -100,7 +100,7 @@ JAEGER_PROXY_REGISTRY=
 SOCKET_HANDLER_TAG=29-05-2025
 SOCKET_HANDLER_REGISTRY=
 
-CPE_TAG=08-07-2025
+CPE_TAG=17-07-2025
 CPE_REGISTRY=
 
 # IBM Document Processing
@@ -171,6 +171,7 @@ WO_INSTANCE=
 AUTHORIZATION_URL=
 WO_AUTH_TYPE=
 PYTHONPATH=
+CM_SUFFIXLIST=
 
 # Use your machine's local IP address for external async tool communication.
 CALLBACK_HOST_URL=

ibm_watsonx_orchestrate/flow_builder/flows/__init__.py

@@ -1,6 +1,8 @@
 from .constants import START, END, RESERVED
-from ..types import FlowContext, TaskData, TaskEventType, DocumentContent
-from ..node import UserNode, AgentNode, StartNode, EndNode, PromptNode, ToolNode
+
+from ..types import FlowContext, TaskData, TaskEventType, File, DecisionsCondition, DecisionsRule
+from ..node import UserNode, AgentNode, StartNode, EndNode, PromptNode, ToolNode, DecisionsNode
+
 from .flow import Flow, CompiledFlow, FlowRun, FlowEvent, FlowEventType, FlowFactory, MatchPolicy, WaitPolicy, ForeachPolicy, Branch, Foreach, Loop
 from .decorators import flow
 from ..data_map import Assignment, DataMap
@@ -14,7 +16,7 @@ __all__ = [
     "FlowContext",
     "TaskData",
     "TaskEventType",
-    "DocumentContent",
+    "File",
 
     "DocProcNode",
     "UserNode",
@@ -23,6 +25,7 @@ __all__ = [
     "EndNode",
     "PromptNode",
     "ToolNode",
+    "DecisionsNode",
     "Assignment",
     "DataMap",
 
@@ -38,8 +41,8 @@ __all__ = [
     "Branch",
     "Foreach",
     "Loop",
+    "DecisionsCondition",
+    "DecisionsRule",
 
-    "user",
-    "flow_spec",
     "flow"
 ]

ibm_watsonx_orchestrate/flow_builder/flows/flow.py

@@ -27,12 +27,11 @@ from ibm_watsonx_orchestrate.client.utils import instantiate_client
 from ..types import (
     EndNodeSpec, Expression, ForeachPolicy, ForeachSpec, LoopSpec, BranchNodeSpec, MatchPolicy, PromptLLMParameters, PromptNodeSpec, 
     StartNodeSpec, ToolSpec, JsonSchemaObject, ToolRequestBody, ToolResponseBody, UserFieldKind, UserFieldOption, UserFlowSpec, UserNodeSpec, WaitPolicy,
-    DocProcSpec, TextExtractionResponse, KVPInvoicesExtractionResponse, KVPUtilityBillsExtractionResponse,
-    DocumentContent
+    DocProcSpec, TextExtractionResponse, File, DecisionsNodeSpec, DecisionsRule
 )
 from .constants import CURRENT_USER, START, END, ANY_USER
 from ..node import (
-    EndNode, Node, PromptNode, StartNode, UserNode, AgentNode, DataMap, ToolNode, DocProcNode
+    EndNode, Node, PromptNode, StartNode, UserNode, AgentNode, DataMap, ToolNode, DocProcNode, DecisionsNode
 )
 from ..types import (
     AgentNodeSpec, extract_node_spec, FlowContext, FlowEventType, FlowEvent, FlowSpec,
@@ -434,6 +433,49 @@ class Flow(Node):
         node = self._add_node(node)
         return cast(PromptNode, node)
     
+    def decisions(self, 
+            name: str, 
+            display_name: str|None=None,
+            rules: list[DecisionsRule] | None = None,
+            default_actions: dict[str, Any] = None,
+            locale: str | None = None,
+            description: str | None = None,
+            input_schema: type[BaseModel]|None = None, 
+            output_schema: type[BaseModel]|None=None,
+            input_map: DataMap = None) -> PromptNode:
+
+        if name is None:
+            raise ValueError("name must be provided.")
+        
+        if rules is None:
+            raise ValueError("rules must be specified.")
+
+         # create input spec
+        input_schema_obj = _get_json_schema_obj(parameter_name = "input", type_def = input_schema)
+        output_schema_obj = _get_json_schema_obj("output", output_schema)
+
+        # Create the tool spec
+        task_spec = DecisionsNodeSpec(
+            name=name,
+            display_name=display_name if display_name is not None else name,
+            description=description,
+            rules=rules,
+            default_actions=default_actions,
+            locale=locale,
+            input_schema=_get_tool_request_body(input_schema_obj),
+            output_schema=_get_tool_response_body(output_schema_obj),
+            output_schema_object = output_schema_obj
+        )
+
+        node = DecisionsNode(spec=task_spec)
+        # setup input map
+        if input_map:
+            node.input_map = self._get_data_map(input_map)
+        
+        # add the node to the list of node
+        node = self._add_node(node)
+        return cast(DecisionsNode, node)
+    
     def docproc(self, 
             name: str, 
             task: str,
@@ -448,12 +490,10 @@ class Flow(Node):
             raise ValueError("task must be provided.")
         
         output_schema_dict = { 
-            "text_extraction" : TextExtractionResponse,
-            "kvp_invoices_extraction" : KVPInvoicesExtractionResponse,
-            "kvp_utility_bills_extraction" : KVPUtilityBillsExtractionResponse
+            "text_extraction" : TextExtractionResponse
         }
          # create input spec
-        input_schema_obj = _get_json_schema_obj(parameter_name = "input", type_def = DocumentContent)
+        input_schema_obj = _get_json_schema_obj(parameter_name = "input", type_def = File)
         output_schema_obj = _get_json_schema_obj("output", output_schema_dict[task])
         if "$defs" in output_schema_obj.model_extra:
             output_schema_obj.model_extra.pop("$defs")

ibm_watsonx_orchestrate/flow_builder/node.py

@@ -5,7 +5,7 @@ import uuid
 import yaml
 from pydantic import BaseModel, Field, SerializeAsAny
 
-from .types import EndNodeSpec, NodeSpec, AgentNodeSpec, PromptNodeSpec, StartNodeSpec, ToolNodeSpec, UserFieldKind, UserFieldOption, UserNodeSpec, DocProcSpec
+from .types import EndNodeSpec, NodeSpec, AgentNodeSpec, PromptNodeSpec, StartNodeSpec, ToolNodeSpec, UserFieldKind, UserFieldOption, UserNodeSpec, DocProcSpec, DecisionsNodeSpec
 from .data_map import DataMap
 
 class Node(BaseModel):
@@ -116,7 +116,13 @@ class DocProcNode(Node):
 
     def get_spec(self) -> DocProcSpec:
         return cast(DocProcSpec, self.spec)
+class DecisionsNode(Node):
+    def __repr__(self):
+        return f"DecisionsNode(name='{self.spec.name}', description='{self.spec.description}')"
 
+    def get_spec(self) -> DecisionsNodeSpec:
+        return cast(DecisionsNodeSpec, self.spec)
+    
 class NodeInstance(BaseModel):
     node: Node
     id: str # unique id of this task instance

ibm_watsonx_orchestrate/flow_builder/types.py

@@ -1,5 +1,7 @@
 from dataclasses import dataclass
 from enum import Enum, StrEnum, auto
+from datetime import date
+import numbers
 import inspect
 import logging
 from typing import (
@@ -167,8 +169,6 @@ class DocProcTask(StrEnum):
     Possible names for the Document processing task parameter
     '''
     text_extraction = auto()
-    kvp_invoices_extraction = auto()
-    kvp_utility_bills_extraction = auto()
 
 class DocProcSpec(NodeSpec):
     task: DocProcTask = Field(description='The document processing operation name', default=DocProcTask.text_extraction)
@@ -515,6 +515,7 @@ class PromptNodeSpec(NodeSpec):
             model_spec["llm_parameters"] = self.llm_parameters.to_json()
 
         return model_spec
+    
 
 class Expression(BaseModel):
     '''An expression could return a boolean or a value'''
@@ -743,7 +744,7 @@ class LanguageCode(StrEnum):
     fr = auto()
     en_hw = auto()
 
-class DocumentContent(BaseModel):
+class File(BaseModel):
     '''
     This class represents the input of a Document processing task. 
 
@@ -752,7 +753,7 @@ class DocumentContent(BaseModel):
         language (LanguageCode): Optional language code used when processing the input document
     '''
     # This is declared as bytes but the runtime will understand if a URL is send in as input.
-    # We need to use bytes here for Chat-with-doc to recognize the input as a Document.
+    # We need to use bytes here for Chat-with-doc to recognize the input as a File.
     document_ref: bytes | str = Field(
         description="Either an ID or a URL identifying the document to be used.", 
         title='Document reference', 
@@ -779,73 +780,175 @@ class TextExtractionResponse(BaseModel):
     '''
     output: TextExtraction = Field(description='The text extraction response')
 
-class Invoice(BaseModel):
-    '''
-    This class represents the fields extracted by the "kvp_invoices_extraction" document processing (docproc) operation.
-    '''
-    bank_account_number: Optional[str] = Field(title='Bank account number', default=None)
-    bank_name: Optional[str] = Field(title='Bank name', default=None)
-    bill_to_address: Optional[str] = Field(title='Bill-to address', default=None)
-    bill_to_name: Optional[str] = Field(title='Bill-to name', default=None)
-    invoice_date: Optional[str] = Field(title='Invoice date', format='date', default=None)
-    invoice_number: Optional[str] = Field(title='Invoice number', default=None)
-    invoice_total: Optional[float] = Field(title='Invoice total', default=None)
-    payment_due_date: Optional[str] = Field(title='Payment due date', format='date', default=None)
-    payment_terms: Optional[str] = Field(title='Payment terms', default=None)
-    purchase_order_number: Optional[str] = Field(title='Purchase order number', default=None)
-    ship_to_address: Optional[str] = Field(title='Ship-to address', default=None)
-    ship_to_name: Optional[str] = Field(title='Ship-to name', default=None)
-    shipping_amount: Optional[float] = Field(title='Shipping amount', default=None)
-    subtotal: Optional[float] = Field(title='Subtotal', default=None)
-    tax_amount: Optional[float] = Field(title='Tax amount', default=None)
-    tax_rate: Optional[float] = Field(title='Tax rate', default=None)
-    tax_type: Optional[str] = Field(title='Tax type', default=None)
-    vendor_address: Optional[str] = Field(title='Vendor address', default=None)
-    vendor_name: Optional[str] = Field(title='Vendor name', default=None)
-
-
-class KVPInvoicesExtractionResponse(BaseModel):
-    '''
-    The response of a "kvp_invoices_extraction" document processing (docproc) operation.
-    Attributes:
-        invoice: an object with the fields extracted from the input invoice document
-    '''
-    output: Invoice = Field(
-        title='Invoice',
-        description='The fields extracted from an invoice document'
-    )
 
+class DecisionsCondition(BaseModel):
+    _condition: str | None = None
+
+    def greater_than(self, value: Union[numbers.Number, date, str]) -> Self:
+        self._check_type_is_number_or_date_or_str(value)
+        self._condition = f"> {self._format_value(value)}"
+        return self
+
+    def greater_than_or_equal(self, value: Union[numbers.Number, date, str]) -> Self:
+        self._check_type_is_number_or_date_or_str(value)
+        self._condition = f">= {self._format_value(value)}"
+        return self
+
+    def less_than(self, value: Union[numbers.Number, date, str]) -> Self:
+        self._check_type_is_number_or_date_or_str(value)
+        self._condition = f"< {self._format_value(value)}"
+        return self
+
+    def less_than_or_equal(self, value: Union[numbers.Number, date, str]) -> Self:
+        self._check_type_is_number_or_date_or_str(value)
+        self._condition = f"<= {self._format_value(value)}"
+        return self
 
-class UtilityBill(BaseModel):
+    def equal(self, value: Union[numbers.Number, date, str]) -> Self:
+        self._check_type_is_number_or_date_or_str(value)
+        self._condition = f"== {self._format_value(value)}"
+        return self
+
+    def not_equal(self, value: Union[numbers.Number, date, str]) -> Self:
+        self._check_type_is_number_or_date_or_str(value)
+        self._condition = f"== {self._format_value(value)}"
+        return self
+    
+    def contains(self, value: str) -> Self:
+        self._check_type_is_str(value)
+        self._condition = f"contains {self._format_value(value)}"
+        return self
+
+    def not_contains(self, value: str) -> Self:
+        self._check_type_is_str(value)
+        self._condition = f"doesNotContain {self._format_value(value)}"
+        return self
+
+    def is_in(self, value: str) -> Self:
+        self._check_type_is_str(value)
+        self._condition = f"in {self._format_value(value)}"
+        return self
+
+    def is_not_in(self, value: str) -> Self:
+        self._check_type_is_str(value)
+        self._condition = f"notIn {self._format_value(value)}"
+        return self
+
+    def startswith(self, value: str) -> Self:
+        self._check_type_is_str(value)
+        self._condition = f"startsWith {self._format_value(value)}"
+        return self
+
+    def endswith(self, value: str) -> Self:
+        self._check_type_is_str(value)
+        self._condition = f"endsWith {self._format_value(value)}"
+        return self
+
+
+    def in_range(self, startValue: Union[numbers.Number, date], endValue: Union[numbers.Number, date], 
+                 startsInclusive: bool = False, endsInclusive: bool = False) -> Self:
+        self._check_type_is_number_or_date_or_str(startValue)
+        self._check_type_is_number_or_date_or_str(endValue)
+        if type(startValue) is not type(endValue):
+            raise TypeError("startValue and endValue must be of the same type")
+        start_op = "[" if startsInclusive else "("    # [ is inclusive, ( is exclusive
+        end_op =  "]" if endsInclusive else ")" 
+        self._condition = f"{start_op}{self._format_value(startValue)}:{self._format_value(endValue)}{end_op}"
+        return self
+
+    def _check_type_is_number_or_date(self, value: Union[numbers.Number, date]):
+        if not isinstance(value, (numbers.Number, date)):
+            raise TypeError("Value must be a number or a date")
+
+    def _check_type_is_number_or_date_or_str(self, value: Union[numbers.Number, date, str]):
+        if not isinstance(value, (numbers.Number, date, str)):
+            raise TypeError("Value must be a number or a date or a string")
+        
+    def _check_type_is_str(self, value: str):
+        if not isinstance(value, str):
+            raise TypeError("Value must be a string")
+    
+    @staticmethod
+    def _format_value(value: Union[numbers.Number, date, str]):
+        if isinstance(value, numbers.Number):
+            return f"{value}"
+        if isinstance(value, date):
+            return f"\"{value.strftime('%B %d, %Y')}\""
+        return f"\"{value}\""
+    
+    def condition(self):
+        return self._condition
+
+
+
+class DecisionsRule(BaseModel):
     '''
-    This class represents the fields extracted by the "kvp_utility_bills_extraction" document processing (docproc) operation.
+    A set of decisions rules.
     '''
-    account_number: Optional[str] = Field(title='Account number', default=None)
-    amount_due: Optional[float] = Field(title='Amount due', default=None)
-    client_number: Optional[str] = Field(title='Client number', default=None)
-    company_name: Optional[str] = Field(title='Company name', default=None)
-    company_address: Optional[str] = Field(title='Company address', default=None)
-    customer_name: Optional[str] = Field(title='Customer name', default=None)
-    customer_address: Optional[str] = Field(title='Customer address', default=None)
-    due_date: Optional[str] = Field(title='Due date', format='date', default=None)
-    payment_received: Optional[float] = Field(title='Payment received', default=None)
-    previous_balance: Optional[float] = Field(title='Previous balance', default=None)
-    service_address: Optional[str] = Field(title='Service address', default=None)
-    statement_date: Optional[str] = Field(title='Statement date', format='date', default=None)
-
-#class UtilityBillResponse(BaseModel):
-#    field_value: UtilityBill = Field(title='Field value')
-
-class KVPUtilityBillsExtractionResponse(BaseModel):
+    _conditions: dict[str, str]
+    _actions: dict[str, Union[numbers.Number, str]]
+
+    def __init__(self, **data):
+        super().__init__(**data)
+        self._conditions = {}
+        self._actions = {}
+
+    def condition(self, key: str, cond: DecisionsCondition) -> Self:
+        self._conditions[key] = cond.condition()
+        return self
+    
+    def action(self, key: str, value: Union[numbers.Number, date, str]) -> Self:
+        if isinstance(value, date):
+            self._actions[key] = value.strftime("%B %d, %Y")
+            return self
+        self._actions[key] = value
+        return self
+
+    def to_json(self) -> dict[str, Any]:
+        '''
+        Serialize the rules into JSON object
+        '''
+        model_spec = {}
+        if self._conditions:
+            model_spec["conditions"] = self._conditions
+        if self._actions:
+            model_spec["actions"] = self._actions
+        return model_spec
+
+
+class DecisionsNodeSpec(NodeSpec):
     '''
-    The response of a "kvp_utility_bills_extraction" document processing (docproc) operation.
-    Attributes:
-        utility_bull: an object with the fields extracted from the input utility bill document
+    Node specification for Decision Table
     '''
-    output: UtilityBill = Field(
-        title='Utility bill',
-        description='The fields extracted from a utility bill document'
-    )
+    locale: str | None = None
+    rules: list[DecisionsRule]
+    default_actions: dict[str, Union[int, float, complex, str]] | None
+
+    def __init__(self, **data):
+        super().__init__(**data)
+        self.kind = "decisions"
+
+    def default_action(self, key: str, value: Union[int, float, complex, date, str]) -> Self:
+        '''
+        create a new default action
+        '''
+        if isinstance(value, date):
+            self.default_actions[key] = value.strftime("%B %d, %Y")
+            return self
+        self.default_actions[key] = value
+        return self
+
+    def to_json(self) -> dict[str, Any]:
+        model_spec = super().to_json()
+        if self.locale:
+            model_spec["locale"] = self.locale
+        if self.rules:
+            model_spec["rules"] = [rule.to_json() for rule in self.rules]
+        if self.default_actions:
+            model_spec["default_actions"] = self.default_actions
+
+        return model_spec
+
 
 def extract_node_spec(
         fn: Callable | PythonTool,

{ibm_watsonx_orchestrate-1.8.0b0.dist-info → ibm_watsonx_orchestrate-1.8.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.8.0b0
+Version: 1.8.0b1
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License
@@ -11,7 +11,7 @@ Requires-Dist: click<8.2.0,>=8.0.0
 Requires-Dist: docstring-parser<1.0,>=0.16
 Requires-Dist: httpx<1.0.0,>=0.28.1
 Requires-Dist: ibm-cloud-sdk-core>=3.24.2
-Requires-Dist: ibm-watsonx-orchestrate-evaluation-framework==1.0.6
+Requires-Dist: ibm-watsonx-orchestrate-evaluation-framework==1.0.8
 Requires-Dist: jsonref==1.1.0
 Requires-Dist: jsonschema<5.0.0,>=4.23.0
 Requires-Dist: langchain-core<=0.3.63