ibm-watsonx-orchestrate 1.8.0b0__py3-none-any.whl → 1.8.1__py3-none-any.whl

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 (
@@ -7,7 +9,6 @@ from typing import (
 )
 
 import docstring_parser
-from munch import Munch
 from pydantic import BaseModel, Field
 
 from langchain_core.tools.base import create_schema_from_function
@@ -167,8 +168,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 +514,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 +743,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 +752,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 +779,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/flow_builder/utils.py

@@ -6,7 +6,6 @@ import logging
 from pydantic import BaseModel, TypeAdapter
 
 from langchain_core.utils.json_schema import dereference_refs
-from rpds import List
 import typer
 import yaml
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.8.0b0
+Version: 1.8.1
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License
@@ -11,12 +11,10 @@ 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
 Requires-Dist: langsmith<=0.3.45
-Requires-Dist: munch>=4.0.0
 Requires-Dist: packaging>=24.2
 Requires-Dist: pydantic<3.0.0,>=2.10.3
 Requires-Dist: pyjwt<3.0.0,>=2.10.1

{ibm_watsonx_orchestrate-1.8.0b0.dist-info → ibm_watsonx_orchestrate-1.8.1.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ibm_watsonx_orchestrate/__init__.py,sha256=4d69fLyzfeRTVOA__Q6T_majiXB51xYDqWZBiQE1VKw,427
+ibm_watsonx_orchestrate/__init__.py,sha256=b17FhWemtG_CY1jQrXXiXeEtvz6vWNWDGSzVp1A6er4,426
 ibm_watsonx_orchestrate/agent_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/agent_builder/agents/__init__.py,sha256=lmZwaiWXD4Ea19nrMwZXaqCxFMG29xNS8vUoZtK3yI4,392
 ibm_watsonx_orchestrate/agent_builder/agents/agent.py,sha256=W0uya81fQPrYZFaO_tlsxBL56Bfpw0xrqdxQJhAZ6XI,983
 ibm_watsonx_orchestrate/agent_builder/agents/assistant_agent.py,sha256=NnWThJ2N8HUOD9IDL6ZhtTKyLMHSacJCpxDNityRmgY,1051
 ibm_watsonx_orchestrate/agent_builder/agents/external_agent.py,sha256=7HzEFjd7JiiRTgvA1RVA3M0-Mr42FTQnOtGMII5ufk0,1045
-ibm_watsonx_orchestrate/agent_builder/agents/types.py,sha256=6in639wzd0mhy5X6LD6sojWiIePRD5Ryzd_btJ746BA,12797
+ibm_watsonx_orchestrate/agent_builder/agents/types.py,sha256=kXbWWz4iHo-knQ5OZRZW7kc8rTwfOzPVn7iyndk5cDs,13013
 ibm_watsonx_orchestrate/agent_builder/agents/webchat_customizations/__init__.py,sha256=5TXa8UqKUAlDo4hTbE5S9OPEkQhxXhPJHJC4pEe8U00,92
 ibm_watsonx_orchestrate/agent_builder/agents/webchat_customizations/prompts.py,sha256=jNVF_jgz1Dmt7-RxAceAS0XWXk_fx9h3sS_fGrvZT28,941
 ibm_watsonx_orchestrate/agent_builder/agents/webchat_customizations/welcome_content.py,sha256=U76wZrblSXx4qv7phcPYs3l8SiFzwZ5cJ74u8Y2iYhU,608
 ibm_watsonx_orchestrate/agent_builder/connections/__init__.py,sha256=VG45ifpp6B00-ZAGW-dIEHFh18Fx3wbyfUiDDKS74u4,718
 ibm_watsonx_orchestrate/agent_builder/connections/connections.py,sha256=CD3QHI4d-j3rTugHOgvPZUdRu_zpWCwsSzkN63_Ke_c,5423
-ibm_watsonx_orchestrate/agent_builder/connections/types.py,sha256=Lu_LPHKIo_vuptNixU8Uu_j8d_YT85Fjy9rMNYxnXGA,9253
+ibm_watsonx_orchestrate/agent_builder/connections/types.py,sha256=YOOlXXNKVxTZ6tK2ceeytWXUApZjwfi4mgdYwXoiqOk,9532
 ibm_watsonx_orchestrate/agent_builder/knowledge_bases/knowledge_base.py,sha256=_KuGF0RZpKpwdt31rzjlTjrhGRFz2RtLzleNkhMNX4k,1831
 ibm_watsonx_orchestrate/agent_builder/knowledge_bases/knowledge_base_requests.py,sha256=3xTfFMZR17EN8eYRhsVyBfOEzlTqyi0eYaMXyv0_ZtQ,862
 ibm_watsonx_orchestrate/agent_builder/knowledge_bases/types.py,sha256=_jHu9ELQqj1qwDK6U7jqemzNFeM2O5APlykiZRsDOcY,7009
@@ -23,41 +23,40 @@ ibm_watsonx_orchestrate/agent_builder/toolkits/types.py,sha256=yY-V4Hqct91-Rs4rJ
 ibm_watsonx_orchestrate/agent_builder/tools/__init__.py,sha256=adkYX0wgB-RKFCUBw6LPJhNVelUjUdsxipGPk2ghLns,479
 ibm_watsonx_orchestrate/agent_builder/tools/base_tool.py,sha256=0vwMIAyKyB8v1QmNrubLy8Al58g3qT78EUgrmOjegoI,1220
 ibm_watsonx_orchestrate/agent_builder/tools/flow_tool.py,sha256=DJWYVmIjw1O_cbzPpwU0a_vIZGvo0mj8UsjW9zkKMlA,2589
-ibm_watsonx_orchestrate/agent_builder/tools/openapi_tool.py,sha256=IuXJ6-A66Jiss-4jI7yMhg3QZRKFdc2GKBB8D52Wxvc,16473
+ibm_watsonx_orchestrate/agent_builder/tools/openapi_tool.py,sha256=h9ma18GUQHt88UIakd6QZHic822bAXzYokh6sfqAMZk,19410
 ibm_watsonx_orchestrate/agent_builder/tools/python_tool.py,sha256=FDY-y9jy4bNy88i7JG85Zj_YrxnPfJPD0DjwvL9ITxc,12012
-ibm_watsonx_orchestrate/agent_builder/tools/types.py,sha256=NIH0p-iqi6s0KmAjSnsGuMXnyW_gaob9Pi192vaCjYE,7998
+ibm_watsonx_orchestrate/agent_builder/tools/types.py,sha256=SAyDEnWYuguTFk6WxgSDnMaONqDqcr6QhBAxD1u5FDU,8165
 ibm_watsonx_orchestrate/agent_builder/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ibm_watsonx_orchestrate/agent_builder/utils/pydantic_utils.py,sha256=QEanM6FpkmntvS02whdhWx1d4v6zT_1l9ipEbfTgHs8,7623
 ibm_watsonx_orchestrate/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/cli/config.py,sha256=iXjDxymWhAmLSUu6eh7zJR20dYZDzbxcU5VoBdh3VIw,8318
 ibm_watsonx_orchestrate/cli/init_helper.py,sha256=qxnKdFcPtGsV_6RqP_IuLshRxgB004SxzDAkBTExA-4,1675
 ibm_watsonx_orchestrate/cli/main.py,sha256=eE71dfx-EdDYHymYDqXcTjyMXpX0b3cueXOxCI2YLLs,3119
 ibm_watsonx_orchestrate/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/cli/commands/agents/agents_command.py,sha256=Zif3bH3X7j5qf7MWGcr53mJ2oEKXNRHeg3ZHeoHTIqQ,8984
-ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py,sha256=skAElLfh8Ip4wVkxpn1wnLskHb1eLU1p9W7GF1abHus,47998
+ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py,sha256=AvDZ3HSRFzaCQ00Kgu9IsOtq0Dv6HPv2E0o9IrisA7Y,47981
 ibm_watsonx_orchestrate/cli/commands/channels/channels_command.py,sha256=fVIFhPUTPdxsxIE10nWL-W5wvBR-BS8V8D6r__J8R98,822
 ibm_watsonx_orchestrate/cli/commands/channels/channels_controller.py,sha256=WjQxwJujvo28SsWgfJSXIpkcgniKcskJ2arL4MOz0Ys,455
-ibm_watsonx_orchestrate/cli/commands/channels/types.py,sha256=h8gA3EM7k5X08sk8T9b5siL-XL9uUE-hl_jS-0PDBHA,254
+ibm_watsonx_orchestrate/cli/commands/channels/types.py,sha256=hMFvWPr7tAmDrhBqtzfkCsrubX3lsU6lapTSOFsUbHM,475
 ibm_watsonx_orchestrate/cli/commands/channels/webchat/channels_webchat_command.py,sha256=vPCr6z1n1yzGDjTlM4f3_9MiuVRzNmXbvUifm6XyQi8,1103
-ibm_watsonx_orchestrate/cli/commands/channels/webchat/channels_webchat_controller.py,sha256=1Oze6sN8rH8LVL_52-lG_fjfGLCI0Ui4OytwHRdXAH0,8410
+ibm_watsonx_orchestrate/cli/commands/channels/webchat/channels_webchat_controller.py,sha256=CGfmKsCBX4E3HMZ8C0IXD-DHQNwe96V1Y_BxUZM2us0,8557
 ibm_watsonx_orchestrate/cli/commands/chat/chat_command.py,sha256=Q9vg2Z5Fsunu6GQFY_TIsNRhUCa0SSGSPnK4jxSGK34,1581
-ibm_watsonx_orchestrate/cli/commands/connections/connections_command.py,sha256=qgg2NbAB7g_PHPHd0ZLUm0EjyaCSPi1qpOhtyOlydcY,10151
-ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py,sha256=ka7uBpuRlICZ4ACGiT4WqmufZYEw566NlZX5FhB9pXM,22178
+ibm_watsonx_orchestrate/cli/commands/connections/connections_command.py,sha256=bZBzaaVMFmGY4Guk-JCknZqd8HvXY5L-FirxpxddQfc,10497
+ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py,sha256=odsqxthEDyPO3C-GEtSn31sxLjRYgUBf1Vdkg6ZEwms,22290
 ibm_watsonx_orchestrate/cli/commands/copilot/copilot_command.py,sha256=IxasApIyQYWRMKPXKa38ZPVkUvOc4chggSmSGjgQGXc,2345
-ibm_watsonx_orchestrate/cli/commands/copilot/copilot_controller.py,sha256=FdvBmz7KXq-B9yp6MAuHCXILTgJcvEGZMtXsHFGWfmw,11777
-ibm_watsonx_orchestrate/cli/commands/copilot/copilot_server_controller.py,sha256=OYt0WA0PW9p2R3unpcIplwlTXIK2so9L65JqdGgnLlA,5348
+ibm_watsonx_orchestrate/cli/commands/copilot/copilot_controller.py,sha256=rr6p4_yqriq3ts1FwFC4aV0ub5UC5D6JqpuLoba4j_U,14808
+ibm_watsonx_orchestrate/cli/commands/copilot/copilot_server_controller.py,sha256=AcBE97qNYsRN0ftY_E-AAjKFyVea4fHtU5eB2HsB42I,5619
 ibm_watsonx_orchestrate/cli/commands/environment/environment_command.py,sha256=xwq7gdyjMtl2RYAnLAahGk2wDetr9BStt8yu7JkeBhk,3768
 ibm_watsonx_orchestrate/cli/commands/environment/environment_controller.py,sha256=oHZ7LONtPg3-SSnU_rRZryLi8N2mplz5h-LGg4XjzD4,10261
-ibm_watsonx_orchestrate/cli/commands/environment/types.py,sha256=HX8QvqYcc-DGnunQKgYp8q2ohedaHKqsJc7WGlaCxks,223
-ibm_watsonx_orchestrate/cli/commands/evaluations/evaluations_command.py,sha256=YHaTxcQxLkuojFhNcTtYbzb_lTv_dYBuz2IHl9RXXwU,11689
-ibm_watsonx_orchestrate/cli/commands/evaluations/evaluations_controller.py,sha256=pTWyuPNHKOPCYTMlYWwoGojZBdvDrHme2EAel0l4ltk,6957
+ibm_watsonx_orchestrate/cli/commands/environment/types.py,sha256=X6jEnyBdxakromA7FhQ5btZMj9kwGcwRSFz8vpD65jA,224
+ibm_watsonx_orchestrate/cli/commands/evaluations/evaluations_command.py,sha256=nOVxeZSTp1bfV_l_06B6x6wfNeusNAr5KImJYkwGWx8,14298
+ibm_watsonx_orchestrate/cli/commands/evaluations/evaluations_controller.py,sha256=dZEAD0rIS9DQjWD2-i6367RjNd2PWB3Fm_DDk25toBg,7855
 ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_command.py,sha256=hOzRcGVoqq7dTc4bSregKxH-kYbrVqaFdhBLawqnRNo,2668
-ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_controller.py,sha256=bzRL-GGDWtBx-uZw4OBRg10yilOdIsL_UQi4iXwTiEc,10010
+ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_controller.py,sha256=M19rRMFEEcAarPVw4fOr3S94Se1ZEo4hD7sCUr0xYTI,10115
 ibm_watsonx_orchestrate/cli/commands/login/login_command.py,sha256=xArMiojoozg7Exn6HTpbTcjDO2idZRA-y0WV-_Ic1Sk,651
 ibm_watsonx_orchestrate/cli/commands/models/model_provider_mapper.py,sha256=RVZfFCuPWiASkR9Mox61v5SZ1AoRxo4_g9stnbfjCkc,7994
 ibm_watsonx_orchestrate/cli/commands/models/models_command.py,sha256=PW-PIM5Nq0qdCopWjANGBWEuEoA3NLTFThYrN8ggGCI,6425
-ibm_watsonx_orchestrate/cli/commands/models/models_controller.py,sha256=BNfUoWST60x3k7yIvSbtBR3rmyTQmz9g0TDK2WOoOE4,18610
-ibm_watsonx_orchestrate/cli/commands/server/server_command.py,sha256=IkVcYjC_ijmDOYtKfeoMmGNC0Y0M63j5k8x2dF8Cqnc,39952
+ibm_watsonx_orchestrate/cli/commands/models/models_controller.py,sha256=eZSYQUg9TL_-8lgcPVpKIx7MtOE7K_NCvZW9Y9YsFA0,18466
+ibm_watsonx_orchestrate/cli/commands/server/server_command.py,sha256=ho1rSTN_fIJKeKzA5d4BdoQELl_4aF5Gzx90VySbaX8,39687
 ibm_watsonx_orchestrate/cli/commands/server/types.py,sha256=UCrgGErbSVBnOzesfjrIii4tTCuVfWemYz5AKGZX0oA,4213
 ibm_watsonx_orchestrate/cli/commands/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/cli/commands/settings/settings_command.py,sha256=CzXRkd-97jXyS6LtaaNtMah-aZu0919dYl-mDwzGThc,344
@@ -78,7 +77,7 @@ ibm_watsonx_orchestrate/client/client_errors.py,sha256=72MKCNZbKoo2QXyY0RicLhP3r
 ibm_watsonx_orchestrate/client/credentials.py,sha256=gDVeeQZDdbbjJiO1EI61yx2oRgTQctxA2ZesSDHI4DA,3786
 ibm_watsonx_orchestrate/client/local_service_instance.py,sha256=dt7vfLnjgt7mT8wSq8SJZndNTwsPzhb0XDhcnPUPFpU,3524
 ibm_watsonx_orchestrate/client/service_instance.py,sha256=fp3Lc4yQf4zTkxVS5WnIAkrHT0xG_a5i44qcLeQkaa4,6600
-ibm_watsonx_orchestrate/client/utils.py,sha256=xf52qHluV-fKiKY29IeIN0xWlBCFbdUF19XCnN6HxQA,5666
+ibm_watsonx_orchestrate/client/utils.py,sha256=MUw11r0_wYv3RdF6-1BmSxcwYNF6q2_Urte7tMYTKVA,5836
 ibm_watsonx_orchestrate/client/agents/agent_client.py,sha256=v1ZqXKj3p5JeJyOLpV84UUI2LY8XPjW1ejo5yzkeiMQ,4708
 ibm_watsonx_orchestrate/client/agents/assistant_agent_client.py,sha256=1JQN0E4T_uz5V0LM-LD1ahNu2KCeFBjXAr8WCiP9mkE,1745
 ibm_watsonx_orchestrate/client/agents/external_agent_client.py,sha256=iQ44XBdC4rYfS-zFn4St1xC5y5gf5SNqKHzMNQcFDZc,1808
@@ -86,9 +85,9 @@ ibm_watsonx_orchestrate/client/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 ibm_watsonx_orchestrate/client/analytics/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/client/analytics/llm/analytics_llm_client.py,sha256=0YS_BCpmf5oGFawpZkJ38cuz5ArhKsZIbSydWRd194s,1340
 ibm_watsonx_orchestrate/client/connections/__init__.py,sha256=J7TOyVg38h71AlaJjlFs5fOuAXTceHvELtOJ9oz4Mvg,207
-ibm_watsonx_orchestrate/client/connections/connections_client.py,sha256=B6LQPwoFHg_CIXHEJBjVu6fXnRj_xVsLGsC-DhmdfSQ,8478
+ibm_watsonx_orchestrate/client/connections/connections_client.py,sha256=8f_olWVgQVLi6xKO_DvV68zu_AMLe1DMhoQAhC-BG3g,7583
 ibm_watsonx_orchestrate/client/connections/utils.py,sha256=f6HsiDI6cycOqfYN6P4uZ3SQds83xlh83zTUioZPeYk,2618
-ibm_watsonx_orchestrate/client/copilot/cpe/copilot_cpe_client.py,sha256=ZXm0o-LDcmSoMw2o4AaCwRDLT0GuffmAidsbHwW856M,1878
+ibm_watsonx_orchestrate/client/copilot/cpe/copilot_cpe_client.py,sha256=eGE5VJb47XZxiMszBVQ7u0NKTVeHPuGVyfRJ6qPKlVs,1939
 ibm_watsonx_orchestrate/client/knowledge_bases/knowledge_base_client.py,sha256=YjC16dcL_l0jd-6yZ6uH8anlL4yaIv9f-7Y_urPuXWM,2201
 ibm_watsonx_orchestrate/client/model_policies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/client/model_policies/model_policies_client.py,sha256=Ddjraesv1MRPhZebB0PdBL0zgdsoWmnYpWTUci_6XFI,2258
@@ -97,8 +96,8 @@ ibm_watsonx_orchestrate/client/models/models_client.py,sha256=ZvP3iPgUFw_SXp41kJ
 ibm_watsonx_orchestrate/client/toolkit/toolkit_client.py,sha256=TLFNS39EeBD_t4Y-rX9sGp4sWBDr--mE5qVtHq8Q2hk,3121
 ibm_watsonx_orchestrate/client/tools/tempus_client.py,sha256=24fKDZUOVHBW-Vj4mubnpnUmab5LgGn8u5hOVyJaozI,1804
 ibm_watsonx_orchestrate/client/tools/tool_client.py,sha256=d3i3alVwa0TCN72w9sWOrM20GCbNmnpTnqEOJVbBIFM,1994
-ibm_watsonx_orchestrate/docker/compose-lite.yml,sha256=KG2k-HsRBpxlhlEMTY9dUecSpdkzIPf__Kcm1AeJxOk,39168
-ibm_watsonx_orchestrate/docker/default.env,sha256=jyaZtxq7G6oPfmSl74DRmnEImkmwXaIFKmud2QVt5bQ,5795
+ibm_watsonx_orchestrate/docker/compose-lite.yml,sha256=igtukwqVFamdaRbuAbrlLPU8EfZ7hpveWSA0Ka34YHo,39437
+ibm_watsonx_orchestrate/docker/default.env,sha256=84p3BEFeA0mVe_C_WKMi4JLiOhQkFLq8hwI_Hoe1eWE,5894
 ibm_watsonx_orchestrate/docker/proxy-config-single.yaml,sha256=WEbK4ENFuTCYhzRu_QblWp1_GMARgZnx5vReQafkIG8,308
 ibm_watsonx_orchestrate/docker/start-up.sh,sha256=LTtwHp0AidVgjohis2LXGvZnkFQStOiUAxgGABOyeUI,1811
 ibm_watsonx_orchestrate/docker/sdk/ibm_watsonx_orchestrate-0.6.0-py3-none-any.whl,sha256=Hi3-owh5OM0Jz2ihX9nLoojnr7Ky1TV-GelyqLcewLE,2047417
@@ -106,14 +105,14 @@ ibm_watsonx_orchestrate/docker/sdk/ibm_watsonx_orchestrate-0.6.0.tar.gz,sha256=e
 ibm_watsonx_orchestrate/docker/tempus/common-config.yaml,sha256=Zo3F36F5DV4VO_vUg1RG-r4WhcukVh79J2fXhGl6j0A,22
 ibm_watsonx_orchestrate/flow_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/flow_builder/data_map.py,sha256=1brmWWFERDsNG2XGais-5-r58LKUUwBtqwdaLQIFRhE,503
-ibm_watsonx_orchestrate/flow_builder/node.py,sha256=L7PPGJ9bb2QiyJSLcQRpcwC_igXTBsQx8MnSchYtjCs,4489
-ibm_watsonx_orchestrate/flow_builder/types.py,sha256=G2sFk2-HwY3-giqLqpDIvVSPvQjPhb6rLjxaamnR6uY,34863
-ibm_watsonx_orchestrate/flow_builder/utils.py,sha256=wTyYnLmB_SsT7A-VxRRnqNZ6jwChJ95EnlZ2wZXU03o,11731
-ibm_watsonx_orchestrate/flow_builder/flows/__init__.py,sha256=ZXinYYsxtplVqoJJSZtog-LCWIN80SrdleTsCEmRtK0,956
+ibm_watsonx_orchestrate/flow_builder/node.py,sha256=I90a-K_xnEgZrl2NHo_rDmfT2Dj0n0Om15aDnEzhe74,4755
+ibm_watsonx_orchestrate/flow_builder/types.py,sha256=bpnodCo9PnacSCvKHEybx8F8rvcp55DXITrXUmt2q88,37142
+ibm_watsonx_orchestrate/flow_builder/utils.py,sha256=1ZetA6GBCG5MGqhGWDM66R_VuyRZ1pYCtVeeIRQgNIg,11709
+ibm_watsonx_orchestrate/flow_builder/flows/__init__.py,sha256=dHS2fB-xbVS5yt_yNyZqYeuiAGs78lbCF65AX_VQlD4,1025
 ibm_watsonx_orchestrate/flow_builder/flows/constants.py,sha256=XXYtL5Y1OTjj3jKo2zoJiwb7FCUNu_M43fgU8w591TY,322
 ibm_watsonx_orchestrate/flow_builder/flows/decorators.py,sha256=lr4qSWq5PWqlGFf4fzUQZCVQDHBYflrYwZ24S89Aq80,2794
 ibm_watsonx_orchestrate/flow_builder/flows/events.py,sha256=VyaBm0sADwr15LWfKbcBQS1M80NKqzYDj3UlW3OpOf4,2984
-ibm_watsonx_orchestrate/flow_builder/flows/flow.py,sha256=SX7iPfUD7OKoxH2-Y8kqpHVfkqHDgRKtuwk5e1uNaEo,53707
+ibm_watsonx_orchestrate/flow_builder/flows/flow.py,sha256=a33ciPFM5VUQlY4BdcXAQVed_MGARNi_GpChIHJ1uS4,55124
 ibm_watsonx_orchestrate/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/run/connections.py,sha256=K-65GXPA8GEsVmRdPfMe_LB2G9RfXQUr95wvRUOhkS4,1828
 ibm_watsonx_orchestrate/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -122,8 +121,8 @@ ibm_watsonx_orchestrate/utils/utils.py,sha256=U7z_2iASoFiZ2zM0a_2Mc2Y-P5oOT7hOwu
 ibm_watsonx_orchestrate/utils/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/utils/logging/logger.py,sha256=FzeGnidXAjC7yHrvIaj4KZPeaBBSCniZFlwgr5yV3oA,1037
 ibm_watsonx_orchestrate/utils/logging/logging.yaml,sha256=9_TKfuFr1barnOKP0fZT5D6MhddiwsXVTFjtRbcOO5w,314
-ibm_watsonx_orchestrate-1.8.0b0.dist-info/METADATA,sha256=MlvtXVevJQdRFHTTwAFAXw0TFTI4ZP8E2tyWQobPvuI,1431
-ibm_watsonx_orchestrate-1.8.0b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ibm_watsonx_orchestrate-1.8.0b0.dist-info/entry_points.txt,sha256=SfIT02-Jen5e99OcLhzbcM9Bdyf8SGVOCtnSplgZdQI,69
-ibm_watsonx_orchestrate-1.8.0b0.dist-info/licenses/LICENSE,sha256=Shgxx7hTdCOkiVRmfGgp_1ISISrwQD7m2f0y8Hsapl4,1083
-ibm_watsonx_orchestrate-1.8.0b0.dist-info/RECORD,,
+ibm_watsonx_orchestrate-1.8.1.dist-info/METADATA,sha256=GqBl0E5ZkcUj_R4Muk7lL7hR0GgV3UsS4PB2xEaBiVo,1360
+ibm_watsonx_orchestrate-1.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ibm_watsonx_orchestrate-1.8.1.dist-info/entry_points.txt,sha256=SfIT02-Jen5e99OcLhzbcM9Bdyf8SGVOCtnSplgZdQI,69
+ibm_watsonx_orchestrate-1.8.1.dist-info/licenses/LICENSE,sha256=Shgxx7hTdCOkiVRmfGgp_1ISISrwQD7m2f0y8Hsapl4,1083
+ibm_watsonx_orchestrate-1.8.1.dist-info/RECORD,,

ibm_watsonx_orchestrate/agent_builder/utils/pydantic_utils.py

@@ -1,149 +0,0 @@
-import json
-from pathlib import Path
-from typing import Any, Dict, Type, Literal
-
-import jsonschema
-from pydantic import BaseModel
-from pydantic.json_schema import DEFAULT_REF_TEMPLATE, GenerateJsonSchema, JsonSchemaMode
-from pydantic.main import IncEx
-from typing_extensions import Self
-
-from ibm_watsonx_orchestrate.agent_builder.tools import ToolRequestBody, ToolResponseBody, JsonSchemaObject
-
-
-def generate_schema_only_base_model(schema: ToolRequestBody | ToolResponseBody | JsonSchemaObject) -> Type[BaseModel]:
-    class SchemaOnlyBaseModel(BaseModel):
-        __primitive__: Any
-        model_config = {
-            'extra': 'allow'
-        }
-        """
-        The purpose of a SchemaOnlyBaseModel is to pass along the json schema represented by schema
-        to a langchain tool's arg_schema
-        :arg schema The json schema to emulate
-        :returns a fake BaseModel that only returns a json schema
-        """
-
-        def __init__(self, /, *args, **kwargs: Any) -> None:
-            if schema.type == 'object':
-                super().__init__(**kwargs)
-                for name, value in kwargs.items():
-                    setattr(self, name, value)
-            else:
-                kwargs={}
-                kwargs['__primitive__'] = args[0]
-                super().__init__(**kwargs)
-                setattr(self, '__primitive__', args[0])
-
-        @classmethod
-        def model_json_schema(cls, by_alias: bool = True, ref_template: str = DEFAULT_REF_TEMPLATE,
-                              schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-                              mode: JsonSchemaMode = 'validation') -> dict[str, Any]:
-            return schema.model_dump(exclude_unset=True, exclude_none=True)
-
-        @classmethod
-        def schema(cls, by_alias: bool = True, ref_template: str = DEFAULT_REF_TEMPLATE) -> Dict[str, Any]:
-            return schema.model_dump(exclude_unset=True, exclude_none=True)
-
-        @classmethod
-        def schema_json(cls, *, by_alias: bool = True, ref_template: str = DEFAULT_REF_TEMPLATE,
-                        **dumps_kwargs: Any) -> str:
-            return schema.model_dump_json(exclude_unset=True, exclude_none=True)
-
-        @classmethod
-        def model_validate_json(cls, json_data: str | bytes | bytearray, *, strict: bool | None = None,
-                                context: Any | None = None) -> Self:
-            obj = json.loads(json_data)
-            jsonschema.validate(obj, schema=schema.model_dump(exclude_unset=True))
-            if schema.type == 'object':
-                return SchemaOnlyBaseModel(**obj)
-            else:
-                return SchemaOnlyBaseModel(obj)
-
-        @classmethod
-        def model_validate(cls, obj: Any, *, strict: bool | None = None, from_attributes: bool | None = None,
-                           context: Any | None = None) -> Self:
-            jsonschema.validate(obj, schema=schema.model_dump(exclude_unset=True))
-            if schema.type == 'object':
-                return SchemaOnlyBaseModel(**obj)
-            else:
-                return SchemaOnlyBaseModel(obj)
-
-        @classmethod
-        def model_validate_strings(cls, obj: Any, *, strict: bool | None = None, context: Any | None = None) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def validate(cls, value: Any) -> Self:
-            jsonschema.validate(value, schema=schema.model_dump(exclude_unset=True))
-            return SchemaOnlyBaseModel(**value)
-
-        @classmethod
-        def model_construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def model_parametrized_name(cls, params: tuple[type[Any], ...]) -> str:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def model_rebuild(cls, *, force: bool = False, raise_errors: bool = True, _parent_namespace_depth: int = 2,
-                          _types_namespace: Any = None) -> bool | None:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def parse_obj(cls, obj: Any) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def parse_raw(cls, b: str | bytes, *, content_type: str | None = None, encoding: str = 'utf8',
-                      proto: Any | None = None, allow_pickle: bool = False) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def parse_file(cls, path: str | Path, *, content_type: str | None = None, encoding: str = 'utf8',
-                       proto: Any | None = None, allow_pickle: bool = False) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def from_orm(cls, obj: Any) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def update_forward_refs(cls, **localns: Any) -> None:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        def model_dump(self, *, mode: Literal['json', 'python'] | str = 'python', include: IncEx | None = None,
-                       exclude: IncEx | None = None, context: Any | None = None, by_alias: bool = False,
-                       exclude_unset: bool = False, exclude_defaults: bool = False, exclude_none: bool = False,
-                       round_trip: bool = False, warnings: bool | Literal['none', 'warn', 'error'] = True,
-                       serialize_as_any: bool = False) -> dict[str, Any]:
-            primitive = getattr(self, '__primitive__', None)
-            if primitive is not None:
-                return primitive
-            else:
-                return super().model_dump(mode=mode, include=include, exclude=exclude, context=context, by_alias=by_alias,
-                                          exclude_unset=exclude_unset, exclude_defaults=exclude_defaults,
-                                          exclude_none=exclude_none, round_trip=round_trip, warnings=warnings,
-                                          serialize_as_any=serialize_as_any)
-
-        def model_dump_json(self, *, indent: int | None = None, include: IncEx | None = None,
-                            exclude: IncEx | None = None, context: Any | None = None, by_alias: bool = False,
-                            exclude_unset: bool = False, exclude_defaults: bool = False, exclude_none: bool = False,
-                            round_trip: bool = False, warnings: bool | Literal['none', 'warn', 'error'] = True,
-                            serialize_as_any: bool = False) -> str:
-            primitive = getattr(self, '__primitive__')
-            if primitive is not None:
-                return json.dumps(primitive)
-            else:
-                return super().model_dump_json(indent=indent, include=include, exclude=exclude, context=context,
-                                           by_alias=by_alias, exclude_unset=exclude_unset,
-                                           exclude_defaults=exclude_defaults, exclude_none=exclude_none,
-                                           round_trip=round_trip, warnings=warnings, serialize_as_any=serialize_as_any)
-
-    return SchemaOnlyBaseModel
-