ibm-watsonx-orchestrate 1.6.3__py3-none-any.whl → 1.6.3.dev1__py3-none-any.whl

ibm_watsonx_orchestrate/__init__.py

@@ -5,7 +5,7 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "1.6.3"
+__version__ = "1.6.3.dev1"
 
 
 

ibm_watsonx_orchestrate/agent_builder/knowledge_bases/types.py

@@ -134,12 +134,13 @@ class MilvusConnection(BaseModel):
     }
     """
     grpc_host: Optional[str] = None
+    grpc_port: Optional[str] = None
+    server_cert: Optional[str] = None
     database: Optional[str] = None
     collection: Optional[str] = None
     index: Optional[str] = None
     embedding_model_id: Optional[str] = None
     limit : Optional[int] = None
-    grpc_port: Optional[str] = None
     filter: Optional[str] = None
     field_mapping: Optional[FieldMapping] = None
 

ibm_watsonx_orchestrate/flow_builder/types.py

@@ -7,7 +7,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

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.6.3.dist-info → ibm_watsonx_orchestrate-1.6.3.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.6.3
+Version: 1.6.3.dev1
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License
@@ -17,7 +17,6 @@ Requires-Dist: jsonschema<5.0.0,>=4.23.0
 Requires-Dist: langchain-community<=0.3.25,>=0.3.12
 Requires-Dist: langchain-core<=0.3.63
 Requires-Dist: langsmith<=0.3.45
-Requires-Dist: munch>=4.0.0
 Requires-Dist: numpy>=1.26.0
 Requires-Dist: packaging>=24.2
 Requires-Dist: pydantic<3.0.0,>=2.10.3

{ibm_watsonx_orchestrate-1.6.3.dist-info → ibm_watsonx_orchestrate-1.6.3.dev1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ibm_watsonx_orchestrate/__init__.py,sha256=CbopMoehY1_Eu70QIrWB9YuqS3K2iAFeTipgew_ZQcI,425
+ibm_watsonx_orchestrate/__init__.py,sha256=2piz3u4Jo_Yw2Q2xd5lVhpkvMU7tG0oxDJqdzmHEaNc,430
 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=I8ZpOKOGXAmhUIwusDmLqCUawSg74-WZFJ5IijruxAQ,932
@@ -13,7 +13,7 @@ ibm_watsonx_orchestrate/agent_builder/connections/connections.py,sha256=UiqTps0y
 ibm_watsonx_orchestrate/agent_builder/connections/types.py,sha256=Lu_LPHKIo_vuptNixU8Uu_j8d_YT85Fjy9rMNYxnXGA,9253
 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=mRow0rf5EHeJCCsTrONeTq10jShs_yIBQjpgDY_mTrI,1641
-ibm_watsonx_orchestrate/agent_builder/knowledge_bases/types.py,sha256=ttre2pRs_I_KBWSht60zT3dJw8twQml3m92ZkiRAoxs,7994
+ibm_watsonx_orchestrate/agent_builder/knowledge_bases/types.py,sha256=G6w7yuFTDv1RhcIlAENugSzoXOecQbMthfp6pmXknm4,8032
 ibm_watsonx_orchestrate/agent_builder/model_policies/__init__.py,sha256=alJEjlneWlGpadmvOVlDjq5wulytKOmpkq3849fhKNc,131
 ibm_watsonx_orchestrate/agent_builder/model_policies/types.py,sha256=a6f9HP2OlZIe36k_PDRmFtefz2Ms2KBpzJ_jz8ggYbk,882
 ibm_watsonx_orchestrate/agent_builder/models/__init__.py,sha256=R5nTbyMBzahONdp5-bJFp-rbtTDnp2184k6doZqt67w,31
@@ -27,7 +27,6 @@ ibm_watsonx_orchestrate/agent_builder/tools/openapi_tool.py,sha256=Q2-TcUUjBAZWl
 ibm_watsonx_orchestrate/agent_builder/tools/python_tool.py,sha256=qVyAe7hKLZ1V4cvqDUCpYs6JBKl9MHSr0yrri-nSceA,10600
 ibm_watsonx_orchestrate/agent_builder/tools/types.py,sha256=TXxWCSddXqRL2GbjkxT4vYJcRMjWS7g22wMMrBz-Wj8,7934
 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=BE2ze0o9vLoyrk7q9mcRek2rDL2cTsVtsSGWw4W0y6M,8212
 ibm_watsonx_orchestrate/cli/init_helper.py,sha256=Lb0bj6b8EaeBxkfGyrBBvc581ORg_S5-tHcXWQ-mBmE,1466
@@ -103,8 +102,8 @@ ibm_watsonx_orchestrate/docker/tempus/common-config.yaml,sha256=Zo3F36F5DV4VO_vU
 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=tp_ssBOSDDi8q-ET2bP7xRPwNOLmLUgQ7v9zZZqn9SU,4090
-ibm_watsonx_orchestrate/flow_builder/types.py,sha256=KPASSlw55Dzp_8nhFdJUN0UI8_knMzLCK9epVcfP5NY,27689
-ibm_watsonx_orchestrate/flow_builder/utils.py,sha256=gKIKtb6hOfImt4cll4LOGgDoEUHubcz-AFq1byCpmaM,8203
+ibm_watsonx_orchestrate/flow_builder/types.py,sha256=Mc2na6jIkt1lTZBgAhEon6nF4cyIDcm8DcmT5sdSSIA,27665
+ibm_watsonx_orchestrate/flow_builder/utils.py,sha256=ufIhoQiEIkHNK1VKQ9dc0jSJgIBKCwwUUUp2UvmFJlI,8181
 ibm_watsonx_orchestrate/flow_builder/flows/__init__.py,sha256=UTwpiAlT9Wytn1kK-kgUaY6UYjLKsiaQK0ZdSbKLtM0,897
 ibm_watsonx_orchestrate/flow_builder/flows/constants.py,sha256=XXYtL5Y1OTjj3jKo2zoJiwb7FCUNu_M43fgU8w591TY,322
 ibm_watsonx_orchestrate/flow_builder/flows/decorators.py,sha256=k9-r9ly5ih5oHBqjEgrc2vfeVC4LOMKg3YVLacBDubM,2702
@@ -118,8 +117,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.6.3.dist-info/METADATA,sha256=d0rBdBGHfrTQ76r9RyovniCwQRhhliisLp44zzgQU0Q,1510
-ibm_watsonx_orchestrate-1.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ibm_watsonx_orchestrate-1.6.3.dist-info/entry_points.txt,sha256=SfIT02-Jen5e99OcLhzbcM9Bdyf8SGVOCtnSplgZdQI,69
-ibm_watsonx_orchestrate-1.6.3.dist-info/licenses/LICENSE,sha256=Shgxx7hTdCOkiVRmfGgp_1ISISrwQD7m2f0y8Hsapl4,1083
-ibm_watsonx_orchestrate-1.6.3.dist-info/RECORD,,
+ibm_watsonx_orchestrate-1.6.3.dev1.dist-info/METADATA,sha256=vPU4-80B6yCeSJP5t_9jU1MTUuSjJi-Unk1_Rh0HmGs,1487
+ibm_watsonx_orchestrate-1.6.3.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ibm_watsonx_orchestrate-1.6.3.dev1.dist-info/entry_points.txt,sha256=SfIT02-Jen5e99OcLhzbcM9Bdyf8SGVOCtnSplgZdQI,69
+ibm_watsonx_orchestrate-1.6.3.dev1.dist-info/licenses/LICENSE,sha256=Shgxx7hTdCOkiVRmfGgp_1ISISrwQD7m2f0y8Hsapl4,1083
+ibm_watsonx_orchestrate-1.6.3.dev1.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
-