lionagi 0.13.5__py3-none-any.whl → 0.13.6__py3-none-any.whl

lionagi/libs/schema/load_pydantic_model_from_schema.py

@@ -13,18 +13,16 @@ from pydantic import BaseModel, PydanticUserError
 
 from lionagi.utils import is_import_installed
 
-_HAS_DATAMODEL_CODE_GENERATOR = is_import_installed("datamodel-code-generator")
+_HAS_DATAMODEL_CODE_GENERATOR = is_import_installed("datamodel_code_generator")
 
-# Import at module level for easier mocking in tests
-if _HAS_DATAMODEL_CODE_GENERATOR:
-    from datamodel_code_generator import (
+try:
+    from datamodel_code_generator import (  # type: ignore[import]
         DataModelType,
         InputFileType,
         PythonVersion,
         generate,
     )
-else:
-    # Create dummy objects for when package is not installed
+except ImportError:
     DataModelType = None
     InputFileType = None
     PythonVersion = None

lionagi/operations/flow.py

@@ -3,10 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import asyncio
+import contextlib
 from typing import Any
 
 from lionagi.operations.node import Operation
-from lionagi.protocols.types import Graph, Node
+from lionagi.operations.utils import prepare_session
+from lionagi.protocols.types import ID, Edge, Graph, Node
 from lionagi.session.branch import Branch
 from lionagi.session.session import Session
 from lionagi.utils import to_dict
@@ -44,19 +46,10 @@ async def flow(
     if not graph.is_acyclic():
         raise ValueError("Graph must be acyclic for flow execution")
 
-    # Simple sequential execution on single branch
+    session, branch = prepare_session(session, branch)
     if not parallel or max_concurrent == 1:
         return await _execute_sequential(branch, graph, context, verbose)
 
-    # Parallel execution using session
-    if session is None:
-        # Create temporary session for this flow
-        from lionagi.session.session import Session
-
-        session = Session()
-        session.branches.include(branch)
-        session.default_branch = branch
-
     return await _execute_parallel(
         session, graph, context, max_concurrent, verbose
     )
@@ -167,7 +160,7 @@ async def _execute_parallel(
 
         # Process nodes in dependency order
         remaining_nodes = {node.id for node in operation_nodes}
-        executing_tasks = {}  # node_id -> asyncio.Task
+        executing_tasks: dict[ID[Operation], asyncio.Task] = {}
         blocked_nodes = set()  # Nodes that have been checked and found blocked
 
         max_iterations = 1000  # Prevent infinite loops
@@ -392,7 +385,7 @@ async def _dependencies_satisfied_async(
 ) -> bool:
     """Check if node dependencies are satisfied and edge conditions pass."""
     # Get all incoming edges to this node
-    incoming_edges = []
+    incoming_edges: list[Edge] = []
     for edge in graph.internal_edges:
         if edge.tail == node.id:
             incoming_edges.append(edge)
@@ -406,10 +399,6 @@ async def _dependencies_satisfied_async(
     for edge in incoming_edges:
         # Check if predecessor is completed
         if edge.head not in completed:
-            # If edge has no condition, we need to wait for predecessor
-            if not edge.condition:
-                continue
-            # If edge has condition but predecessor not complete, skip
             continue
 
         # Predecessor is completed
@@ -423,12 +412,9 @@ async def _dependencies_satisfied_async(
                 result_value = to_dict(result_value, recursive=True)
 
             ctx = {"result": result_value, "context": execution_context or {}}
-            try:
+            with contextlib.suppress(Exception):
                 if await edge.condition.apply(ctx):
                     at_least_one_satisfied = True
-            except Exception as e:
-                # Condition evaluation failed
-                continue
         else:
             # No condition, edge is satisfied
             at_least_one_satisfied = True

lionagi/operations/utils.py

@@ -7,7 +7,9 @@ from lionagi.session.session import Branch, Session
 
 
 def prepare_session(
-    session=None, branch=None, branch_kwargs=None
+    session: Session | None = None,
+    branch: Branch | None = None,
+    branch_kwargs=None,
 ) -> tuple[Session, Branch]:
     if session is not None:
         if branch is not None:

lionagi/service/connections/endpoint_config.py

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+import logging
 import os
 from typing import Any, TypeVar
 
@@ -17,6 +18,9 @@ from pydantic import (
 
 from .header_factory import AUTH_TYPES
 
+logger = logging.getLogger(__name__)
+
+
 B = TypeVar("B", bound=type[BaseModel])
 
 
@@ -32,7 +36,7 @@ class EndpointConfig(BaseModel):
     auth_type: AUTH_TYPES = "bearer"
     default_headers: dict = {}
     request_options: B | None = None
-    api_key: str | SecretStr | None = None
+    api_key: str | SecretStr | None = Field(None, exclude=True)
     timeout: int = 300
     max_retries: int = 3
     openai_compatible: bool = False
@@ -98,9 +102,16 @@ class EndpointConfig(BaseModel):
                 return v.__class__
             if isinstance(v, dict | str):
                 from lionagi.libs.schema.load_pydantic_model_from_schema import (
+                    _HAS_DATAMODEL_CODE_GENERATOR,
                     load_pydantic_model_from_schema,
                 )
 
+                if not _HAS_DATAMODEL_CODE_GENERATOR:
+                    logger.warning(
+                        "datamodel-code-generator is not installed, "
+                        "request_options will not be validated"
+                    )
+                    return None
                 return load_pydantic_model_from_schema(v)
         except Exception as e:
             raise ValueError("Invalid request options") from e

lionagi/version.py

@@ -1 +1 @@
-__version__ = "0.13.5"
+__version__ = "0.13.6"

{lionagi-0.13.5.dist-info → lionagi-0.13.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lionagi
-Version: 0.13.5
+Version: 0.13.6
 Summary: An Intelligence Operating System.
 Author-email: HaiyangLi <quantocean.li@gmail.com>, Liangbingyan Luo <llby_luo@outlook.com>
 License:            Apache License
@@ -235,6 +235,7 @@ Requires-Dist: tiktoken>=0.8.0
 Requires-Dist: toml>=0.9.0
 Provides-Extra: all
 Requires-Dist: claude-code-sdk>=0.0.14; extra == 'all'
+Requires-Dist: datamodel-code-generator>=0.31.2; extra == 'all'
 Requires-Dist: docling>=2.15.1; extra == 'all'
 Requires-Dist: fastmcp>=2.10.5; extra == 'all'
 Requires-Dist: ollama>=0.4.0; extra == 'all'
@@ -257,6 +258,8 @@ Provides-Extra: reader
 Requires-Dist: docling>=2.15.1; extra == 'reader'
 Provides-Extra: rich
 Requires-Dist: rich>=13.0.0; extra == 'rich'
+Provides-Extra: schema
+Requires-Dist: datamodel-code-generator>=0.31.2; extra == 'schema'
 Provides-Extra: test
 Requires-Dist: pytest-asyncio>=1.0.0; extra == 'test'
 Requires-Dist: pytest>=8.3.4; extra == 'test'

{lionagi-0.13.5.dist-info → lionagi-0.13.6.dist-info}/RECORD

@@ -6,7 +6,7 @@ lionagi/config.py,sha256=Dxs5FA9UCv1YX5H54qOJcPsDrIF9wFokWEPZ212eH-k,3715
 lionagi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/settings.py,sha256=HDuKCEJCpc4HudKodBnhoQUGuTGhRHdlIFhbtf3VBtY,1633
 lionagi/utils.py,sha256=8zCdJHKbDJv2WSzAAiFnMSpvfyZb9RnmfSNaMEqdTJE,79003
-lionagi/version.py,sha256=SPNxRvWdZ_wlG_AeFzA45_LV_z5u-nzgOJwVcknxEJ8,23
+lionagi/version.py,sha256=riz4KLyxI3rKxqm-AbvFFuR22uDgmXnMIjs0NxKBiIE,23
 lionagi/fields/__init__.py,sha256=yrn9NDAM6_v73kK7aJeb-Pvqigeu8WASaV-My-6CDsc,939
 lionagi/fields/action.py,sha256=OziEpbaUeEVo34KdtbzDxXJBgkf3QLxlcKIQAfHe4O0,5791
 lionagi/fields/base.py,sha256=5CJc7j8kTTWzXwpYzkSAFzx4BglABfx3AElIATKB7bg,3857
@@ -46,7 +46,7 @@ lionagi/libs/schema/extract_code_block.py,sha256=PuJbJj1JnqR5fSZudowPcVPpEoKISLr
 lionagi/libs/schema/extract_docstring.py,sha256=uWyUevXS4JSN60tfouoBBAyE4_jyE-fz45CiS-fvKeI,5714
 lionagi/libs/schema/function_to_schema.py,sha256=XAB031WbYu3a7eFJyYjXVMAjmtWYSYr5kC_DYgjiuyM,5604
 lionagi/libs/schema/json_schema.py,sha256=cuHcaMr748O9g6suNGmRx4tRXcidd5-c7AMGjTIZyHM,7670
-lionagi/libs/schema/load_pydantic_model_from_schema.py,sha256=VGrmnMb26JNcB9LaQcqTwW--sUljqqlqqsPD69zjcEc,10183
+lionagi/libs/schema/load_pydantic_model_from_schema.py,sha256=p4UTgGcb2Tmxc9tLznHPSOWXnHeztJLpl6XTSDcIZ90,10078
 lionagi/libs/token_transform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/libs/token_transform/base.py,sha256=LBnaDgi4HNgaJJGwIzWcQjVMdu49i_93rRvOvMU22Rw,1545
 lionagi/libs/token_transform/llmlingua.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
@@ -84,11 +84,11 @@ lionagi/models/operable_model.py,sha256=fXbcpBjO-SoaeF8fn-F1_KIcYw9_L73VIUM1BDg5
 lionagi/models/schema_model.py,sha256=ghRIM8aBNaToAknwNlhQKpuKXcwzyCw5pDE31bVKxs0,667
 lionagi/operations/__init__.py,sha256=L22n8rRls9oVdzHoDlznHFGiKJMNw3ZhbwVQbm1Fn6M,584
 lionagi/operations/builder.py,sha256=6OEPQuONlJuC7bkrmaxOrurMdygjSsvwEX_Zsqf1EmM,20300
-lionagi/operations/flow.py,sha256=iERw_owbu3tgh_6a35aV2US7r2KaztQ0e54Fu2ETm1w,15074
+lionagi/operations/flow.py,sha256=o_o_UTXvW1MRvsCwbIXG5pbJPEvLA0d3Qb7Fk3wRHF4,14627
 lionagi/operations/manager.py,sha256=7KD6NMWqYJHCPI2LumDRwGinF8WYKFjrr3bsNUi9xzI,564
 lionagi/operations/node.py,sha256=JNJpn_LUP_46F7C8DcvwAg6rzlaRKzs9RcVGQakARyU,3066
 lionagi/operations/types.py,sha256=fM8HphnbBifMzhoKKvdl3JxGCBHlEGPJEYkLWj9b7vE,704
-lionagi/operations/utils.py,sha256=Cl4HuWQ1nCGkTexwOtDx7fpEWMc2L3ZQMCqylRBDy74,1219
+lionagi/operations/utils.py,sha256=b8HmpF5vRgmf6PTzg3_fZCIKMnhoGa0HCyOlX6JCz7g,1263
 lionagi/operations/ReAct/ReAct.py,sha256=uoJnFMoPP1kzzmgLDFNBwEbWdfGNfG37IT22N1AM-hE,13504
 lionagi/operations/ReAct/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
 lionagi/operations/ReAct/utils.py,sha256=FKb0v-1tboN17imxef9jLKWhet0Iz049eqvZCcJKNX8,4436
@@ -175,7 +175,7 @@ lionagi/service/types.py,sha256=6zavqBxK1Fj0nB9eZgJn3JICxmdT-n0nn8YWZFzM5LU,508
 lionagi/service/connections/__init__.py,sha256=yHQZ7OJpCftd6CStYR8inbxjJydYdmv9kCvbUBhJ2zU,362
 lionagi/service/connections/api_calling.py,sha256=XetCrjMhOHNKGGv-NzHhBhVS7XjKPalrS_iExzU-4S4,8005
 lionagi/service/connections/endpoint.py,sha256=yNIjq9wETMnytynGbq3qY_dkyaMlaHrcfiZjS-tnmLg,14756
-lionagi/service/connections/endpoint_config.py,sha256=mu-5KoETd4Y2RcRmc6MWJ2-FJyxYLjJhebBGYfWgjRs,4758
+lionagi/service/connections/endpoint_config.py,sha256=7u5HDWe-4nttG2cDXtx_OxPzAI4DAA0bPtjJ6BA4gk8,5162
 lionagi/service/connections/header_factory.py,sha256=22sG4ian3MiNklF6SdQqkEYgtWKOZik_yDE0Lna6BiE,1754
 lionagi/service/connections/match_endpoint.py,sha256=K3I4vU6GH6utlEArlyDFUmNdnp94CEPxqKrehAx29J4,2410
 lionagi/service/connections/providers/__init__.py,sha256=3lzOakDoBWmMaNnT2g-YwktPKa_Wme4lnPRSmOQfayY,105
@@ -202,7 +202,7 @@ lionagi/tools/types.py,sha256=XtJLY0m-Yi_ZLWhm0KycayvqMCZd--HxfQ0x9vFUYDE,230
 lionagi/tools/file/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
 lionagi/tools/file/reader.py,sha256=0TdnfVGVCKuM58MmGM-NyVjhU9BFoitkNYEepdc0z_Y,9529
 lionagi/tools/memory/tools.py,sha256=zTGBenVsF8Wuh303kWntmQSGlAFKonHNdh5ePuQ26KE,15948
-lionagi-0.13.5.dist-info/METADATA,sha256=yeL__lYZs3cqhHL_tFW-sGatSfwK6FZA6z4DD1nakPE,20664
-lionagi-0.13.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lionagi-0.13.5.dist-info/licenses/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
-lionagi-0.13.5.dist-info/RECORD,,
+lionagi-0.13.6.dist-info/METADATA,sha256=ENE6dEOAAy0IbJkdVVgryZ8v-ySobfMqzgdsZguQsJE,20818
+lionagi-0.13.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lionagi-0.13.6.dist-info/licenses/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
+lionagi-0.13.6.dist-info/RECORD,,