lionagi 0.14.4__py3-none-any.whl → 0.14.5__py3-none-any.whl

lionagi/utils.py

@@ -43,9 +43,12 @@ from typing import (
     overload,
 )
 
+import anyio
 from pydantic import BaseModel, model_validator
 from pydantic_core import PydanticUndefinedType
 
+from .libs.concurrency import Lock as ConcurrencyLock
+from .libs.concurrency import Semaphore, create_task_group
 from .settings import Settings
 
 R = TypeVar("R")
@@ -612,32 +615,6 @@ class CallParams(Params):
         )
 
 
-class LCallParams(CallParams):
-    func: Any = None
-    sanitize_input: bool = False
-    unique_input: bool = False
-    flatten: bool = False
-    dropna: bool = False
-    unique_output: bool = False
-    flatten_tuple_set: bool = False
-
-    def __call__(self, input_: Any, func=None):
-        if self.func is None and func is None:
-            raise ValueError("a sync func must be provided")
-        return lcall(
-            input_,
-            func or self.func,
-            *self.args,
-            sanitize_input=self.sanitize_input,
-            unique_input=self.unique_input,
-            flatten=self.flatten,
-            dropna=self.dropna,
-            unique_output=self.unique_output,
-            flatten_tuple_set=self.flatten_tuple_set,
-            **self.kwargs,
-        )
-
-
 async def alcall(
     input_: list[Any],
     func: Callable[..., T],
@@ -651,7 +628,6 @@ async def alcall(
     backoff_factor: float = 1,
     retry_default: Any = UNDEFINED,
     retry_timeout: float | None = None,
-    retry_timing: bool = False,
     max_concurrent: int | None = None,
     throttle_period: float | None = None,
     flatten: bool = False,
@@ -659,7 +635,7 @@ async def alcall(
     unique_output: bool = False,
     flatten_tuple_set: bool = False,
     **kwargs: Any,
-) -> list[T] | list[tuple[T, float]]:
+) -> list[T]:
     """
     Asynchronously apply a function to each element of a list, with optional input sanitization,
     retries, timeout, and output processing.
@@ -675,7 +651,6 @@ async def alcall(
         backoff_factor (float): Multiplier for delay after each retry.
         retry_default (Any): Default value if all retries fail.
         retry_timeout (float | None): Timeout for each function call.
-        retry_timing (bool): If True, return (result, duration) tuples.
         max_concurrent (int | None): Maximum number of concurrent operations.
         throttle_period (float | None): Delay after each completed operation.
         flatten (bool): Flatten the final result if True.
@@ -685,7 +660,7 @@ async def alcall(
         **kwargs: Additional arguments passed to func.
 
     Returns:
-        list[T] or list[tuple[T, float]]: The processed results, or results with timing if retry_timing is True.
+        list[T]: The processed results.
 
     Raises:
         asyncio.TimeoutError: If a call times out and no default is provided.
@@ -734,9 +709,9 @@ async def alcall(
 
     # Optional initial delay before processing
     if initial_delay:
-        await asyncio.sleep(initial_delay)
+        await anyio.sleep(initial_delay)
 
-    semaphore = asyncio.Semaphore(max_concurrent) if max_concurrent else None
+    semaphore = Semaphore(max_concurrent) if max_concurrent else None
     throttle_delay = throttle_period or 0
     coro_func = is_coro_func(func)
 
@@ -744,137 +719,92 @@ async def alcall(
         if coro_func:
             # Async function
             if retry_timeout is not None:
-                return await asyncio.wait_for(
-                    func(item, **kwargs), timeout=retry_timeout
-                )
+                with anyio.move_on_after(retry_timeout) as cancel_scope:
+                    result = await func(item, **kwargs)
+                if cancel_scope.cancelled_caught:
+                    raise asyncio.TimeoutError(
+                        f"Function call timed out after {retry_timeout}s"
+                    )
+                return result
             else:
                 return await func(item, **kwargs)
         else:
             # Sync function
             if retry_timeout is not None:
-                return await asyncio.wait_for(
-                    asyncio.to_thread(func, item, **kwargs),
-                    timeout=retry_timeout,
-                )
+                with anyio.move_on_after(retry_timeout) as cancel_scope:
+                    result = await anyio.to_thread.run_sync(
+                        func, item, **kwargs
+                    )
+                if cancel_scope.cancelled_caught:
+                    raise asyncio.TimeoutError(
+                        f"Function call timed out after {retry_timeout}s"
+                    )
+                return result
             else:
-                return func(item, **kwargs)
+                return await anyio.to_thread.run_sync(func, item, **kwargs)
 
     async def execute_task(i: Any, index: int) -> Any:
-        start_time = asyncio.get_running_loop().time()
         attempts = 0
         current_delay = retry_delay
         while True:
             try:
                 result = await call_func(i)
-                if retry_timing:
-                    end_time = asyncio.get_running_loop().time()
-                    return index, result, end_time - start_time
-                else:
-                    return index, result
-            except asyncio.CancelledError as e:
-                raise e
+                return index, result
+            except anyio.get_cancelled_exc_class():
+                raise
 
             except Exception:
                 attempts += 1
                 if attempts <= num_retries:
                     if current_delay:
-                        await asyncio.sleep(current_delay)
+                        await anyio.sleep(current_delay)
                         current_delay *= backoff_factor
                     # Retry loop continues
                 else:
                     # Exhausted retries
                     if retry_default is not UNDEFINED:
-                        # Return default if provided
-                        if retry_timing:
-                            end_time = asyncio.get_running_loop().time()
-                            duration = end_time - (start_time or end_time)
-                            return index, retry_default, duration
-                        else:
-                            return index, retry_default
+                        return index, retry_default
                     # No default, re-raise
                     raise
 
     async def task_wrapper(item: Any, idx: int) -> Any:
         if semaphore:
             async with semaphore:
-                return await execute_task(item, idx)
+                result = await execute_task(item, idx)
         else:
-            return await execute_task(item, idx)
+            result = await execute_task(item, idx)
 
-    # Create tasks
-    tasks = [task_wrapper(item, idx) for idx, item in enumerate(input_)]
+        return result
 
-    # Collect results as they complete
+    # Use task group for structured concurrency
     results = []
-    for coro in asyncio.as_completed(tasks):
-        res = await coro
-        results.append(res)
-        if throttle_delay:
-            await asyncio.sleep(throttle_delay)
+    results_lock = ConcurrencyLock()  # Protect results list
 
-    # Sort by original index
-    results.sort(key=lambda x: x[0])
+    async def run_and_store(item: Any, idx: int):
+        result = await task_wrapper(item, idx)
+        async with results_lock:
+            results.append(result)
 
-    if retry_timing:
-        # (index, result, duration)
-        filtered = [
-            (r[1], r[2]) for r in results if not dropna or r[1] is not None
-        ]
-        return filtered
-    else:
-        # (index, result)
-        output_list = [r[1] for r in results]
-        return to_list(
-            output_list,
-            flatten=flatten,
-            dropna=dropna,
-            unique=unique_output,
-            flatten_tuple_set=flatten_tuple_set,
-        )
+    # Execute all tasks using task group
+    async with create_task_group() as tg:
+        for idx, item in enumerate(input_):
+            await tg.start_soon(run_and_store, item, idx)
+            # Apply throttle delay between starting tasks
+            if throttle_delay and idx < len(input_) - 1:
+                await anyio.sleep(throttle_delay)
 
+    # Sort by original index
+    results.sort(key=lambda x: x[0])
 
-class ALCallParams(CallParams):
-    func: Any = None
-    sanitize_input: bool = False
-    unique_input: bool = False
-    num_retries: int = 0
-    initial_delay: float = 0
-    retry_delay: float = 0
-    backoff_factor: float = 1
-    retry_default: Any = UNDEFINED
-    retry_timeout: float | None = None
-    retry_timing: bool = False
-    max_concurrent: int | None = None
-    throttle_period: float | None = None
-    flatten: bool = False
-    dropna: bool = False
-    unique_output: bool = False
-    flatten_tuple_set: bool = False
-
-    async def __call__(self, input_: Any, func=None):
-        if self.func is None and func is None:
-            raise ValueError("a sync/async func must be provided")
-        return await alcall(
-            input_,
-            func or self.func,
-            *self.args,
-            sanitize_input=self.sanitize_input,
-            unique_input=self.unique_input,
-            num_retries=self.num_retries,
-            initial_delay=self.initial_delay,
-            retry_delay=self.retry_delay,
-            backoff_factor=self.backoff_factor,
-            retry_default=self.retry_default,
-            retry_timeout=self.retry_timeout,
-            retry_timing=self.retry_timing,
-            max_concurrent=self.max_concurrent,
-            throttle_period=self.throttle_period,
-            flatten=self.flatten,
-            dropna=self.dropna,
-            unique_output=self.unique_output,
-            flatten_tuple_set=self.flatten_tuple_set,
-            **self.kwargs,
-        )
+    # (index, result)
+    output_list = [r[1] for r in results]
+    return to_list(
+        output_list,
+        flatten=flatten,
+        dropna=dropna,
+        unique=unique_output,
+        flatten_tuple_set=flatten_tuple_set,
+    )
 
 
 async def bcall(
@@ -891,7 +821,6 @@ async def bcall(
     backoff_factor: float = 1,
     retry_default: Any = UNDEFINED,
     retry_timeout: float | None = None,
-    retry_timing: bool = False,
     max_concurrent: int | None = None,
     throttle_period: float | None = None,
     flatten: bool = False,
@@ -915,7 +844,6 @@ async def bcall(
             backoff_factor=backoff_factor,
             retry_default=retry_default,
             retry_timeout=retry_timeout,
-            retry_timing=retry_timing,
             max_concurrent=max_concurrent,
             throttle_period=throttle_period,
             flatten=flatten,
@@ -926,52 +854,6 @@ async def bcall(
         )
 
 
-class BCallParams(CallParams):
-    func: Any = None
-    batch_size: int
-    sanitize_input: bool = False
-    unique_input: bool = False
-    num_retries: int = 0
-    initial_delay: float = 0
-    retry_delay: float = 0
-    backoff_factor: float = 1
-    retry_default: Any = UNDEFINED
-    retry_timeout: float | None = None
-    retry_timing: bool = False
-    max_concurrent: int | None = None
-    throttle_period: float | None = None
-    flatten: bool = False
-    dropna: bool = False
-    unique_output: bool = False
-    flatten_tuple_set: bool = False
-
-    async def __call__(self, input_, func=None):
-        if self.func is None and func is None:
-            raise ValueError("a sync/async func must be provided")
-        return await bcall(
-            input_,
-            func or self.func,
-            *self.args,
-            batch_size=self.batch_size,
-            sanitize_input=self.sanitize_input,
-            unique_input=self.unique_input,
-            num_retries=self.num_retries,
-            initial_delay=self.initial_delay,
-            retry_delay=self.retry_delay,
-            backoff_factor=self.backoff_factor,
-            retry_default=self.retry_default,
-            retry_timeout=self.retry_timeout,
-            retry_timing=self.retry_timing,
-            max_concurrent=self.max_concurrent,
-            throttle_period=self.throttle_period,
-            flatten=self.flatten,
-            dropna=self.dropna,
-            unique_output=self.unique_output,
-            flatten_tuple_set=self.flatten_tuple_set,
-            **self.kwargs,
-        )
-
-
 def create_path(
     directory: Path | str,
     filename: str,

lionagi/version.py

@@ -1 +1 @@
-__version__ = "0.14.4"
+__version__ = "0.14.5"

{lionagi-0.14.4.dist-info → lionagi-0.14.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lionagi
-Version: 0.14.4
+Version: 0.14.5
 Summary: An Intelligence Operating System.
 Author-email: HaiyangLi <quantocean.li@gmail.com>, Liangbingyan Luo <llby_luo@outlook.com>
 License:            Apache License
@@ -225,7 +225,6 @@ Requires-Dist: anyio>=4.8.0
 Requires-Dist: backoff>=2.2.1
 Requires-Dist: jinja2>=3.1.0
 Requires-Dist: json-repair>=0.40.0
-Requires-Dist: matplotlib>=3.9.0
 Requires-Dist: pillow>=11.0.0
 Requires-Dist: psutil>=7.0.0
 Requires-Dist: pydantic-settings>=2.8.0
@@ -239,6 +238,8 @@ 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: matplotlib>=3.7.0; extra == 'all'
+Requires-Dist: networkx>=3.0.0; extra == 'all'
 Requires-Dist: ollama>=0.4.0; extra == 'all'
 Requires-Dist: pydapter[postgres]; extra == 'all'
 Requires-Dist: rich>=13.0.0; extra == 'all'
@@ -248,6 +249,9 @@ Provides-Extra: docs
 Requires-Dist: furo>=2024.8.6; extra == 'docs'
 Requires-Dist: sphinx-autobuild>=2024.10.3; extra == 'docs'
 Requires-Dist: sphinx>=8.1.3; extra == 'docs'
+Provides-Extra: graph
+Requires-Dist: matplotlib>=3.7.0; extra == 'graph'
+Requires-Dist: networkx>=3.0.0; extra == 'graph'
 Provides-Extra: lint
 Requires-Dist: black[jupyter]>=24.10.0; extra == 'lint'
 Requires-Dist: isort>=5.13.2; extra == 'lint'

{lionagi-0.14.4.dist-info → lionagi-0.14.5.dist-info}/RECORD

@@ -5,8 +5,8 @@ lionagi/_types.py,sha256=9cKKDMl0l5DLGhHzDAtnlKT2XqLv1IeynmhFYBno2_k,185
 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=YRLFuSQ7B4BOvfgIKljisitjUCumC3fc-JOtKRSdPCc,23
+lionagi/utils.py,sha256=n2aUMSnLLgy7HWFlfzDV1OqMDbatLNX0QYc7jIjXwQA,75023
+lionagi/version.py,sha256=NAUBX_trzQBx5ZMxPGVgGrbbz9R2O-FqcIBv7OYAuIg,23
 lionagi/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/adapters/async_postgres_adapter.py,sha256=Kf2YCzwRqKpEHY3GQCXEiMl201CCIkDvXcvddwZNkkE,12723
 lionagi/adapters/postgres_model_adapter.py,sha256=e_wfJNyihbpLCXuAs_W9tbLoMXAXbAXtkQDaHfqWz3o,4555
@@ -20,12 +20,13 @@ lionagi/fields/reason.py,sha256=eTGI9jDaaZJInUjCR9lEpYvw2_1UUF-xzCVCFP3-JRI,1437
 lionagi/fields/research.py,sha256=eEPKocx8eQy2E9FExRWVIo6MK_xvmwBAoRZciBY3RG0,1421
 lionagi/libs/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
 lionagi/libs/parse.py,sha256=JRS3bql0InHJqATnAatl-hQv4N--XXw4P77JHhTFnrc,1011
-lionagi/libs/concurrency/__init__.py,sha256=AZfvtBAnK4nNRQrqHU9NCMYm6_qjMEWnp4ylX3_hkso,658
+lionagi/libs/concurrency/__init__.py,sha256=huQR4vk3l7mGyoYiGtsjF06xP_5fo9vgKqgB9Naq6PE,1185
 lionagi/libs/concurrency/cancel.py,sha256=21KdFjLq9HIq6MpWVE-5KrrU0e1nehmK-ZETGNjTf6Y,4028
 lionagi/libs/concurrency/errors.py,sha256=FhLgXGFSbKZYPNfXjdnkV-0ShPF_S34RBLyTO_Pk5C8,938
-lionagi/libs/concurrency/patterns.py,sha256=1_o_UsYaWF38YzE6H29-bMdsyhtgzhdgMz9-9LRfdQE,7857
-lionagi/libs/concurrency/primitives.py,sha256=k9YQAbO6SFFb2cI-PYRZiKN1FhtOADCtyZWdEH9s6to,6578
-lionagi/libs/concurrency/task.py,sha256=zHtgzzenHVTfyk08azHlPBrHAv67onHO3p2DxwVLoiU,3122
+lionagi/libs/concurrency/patterns.py,sha256=dlC7nhIYE-D5VySNAPsd6PYYlORRAqNX50oKJRR1PO8,7796
+lionagi/libs/concurrency/primitives.py,sha256=fgml37nggaEGuvAJHQY6-rpSuAuei56YVSjTlIieM2o,8996
+lionagi/libs/concurrency/resource_tracker.py,sha256=52Rq7yMWK7DlebBW90imSjYeEAp8Gp9nL0dG2PD8Ivs,5464
+lionagi/libs/concurrency/task.py,sha256=nVts_yPylkZVSk3l3I4MkUdC7rhoN2qQeFfrsvekVgE,3146
 lionagi/libs/file/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
 lionagi/libs/file/chunk.py,sha256=XeVMwM33JF0X1W6udz_nhlb3DCevA_EK6A50Hn_e5SY,9300
 lionagi/libs/file/concat.py,sha256=YSauXVBL3WWx5Mvpn208Cj7q9TLt_aq-0M9J1fm-ins,3864
@@ -142,8 +143,8 @@ lionagi/protocols/generic/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGv
 lionagi/protocols/generic/element.py,sha256=Eaij2YpTWsGk28Tqjazmjmc_tOnalH7_iGFZrL6QJb4,14420
 lionagi/protocols/generic/event.py,sha256=InjBd2K9aSYxgai1c20d4jaJOkEx5VGFfb7iZbiMiNA,5200
 lionagi/protocols/generic/log.py,sha256=vepclOaY3fdR1QgFDj9usOffsx9T-9PbgwXjTvm6twQ,7441
-lionagi/protocols/generic/pile.py,sha256=sSj999xPf9pAKxa3TgB6Wc7xGrY4sMYNYtIk-k9TDhw,30362
-lionagi/protocols/generic/processor.py,sha256=GQ_j_5f4UE-jJeqIJ9L2NdicpZnu50DSP1mvxlc7O_4,10381
+lionagi/protocols/generic/pile.py,sha256=-eF7ojrg65MCNGAmogGehDNip1o6jPIU6nXL9LJjMGA,29984
+lionagi/protocols/generic/processor.py,sha256=c_a7HB9WAaCY-HoI19YyStef8WOXcDj9UeiQb5bz_TM,11759
 lionagi/protocols/generic/progression.py,sha256=qlITq1qzV119iR5qR__fBAzV489S7d4t20E8uDRicEw,15189
 lionagi/protocols/graph/__init__.py,sha256=UPu3OmUpjSgX2aBuBJUdG2fppGlfqAH96hU0qIMBMp0,253
 lionagi/protocols/graph/edge.py,sha256=YxSGj4w_fG7khm-zpKduuK5fJzhJDx23JhU1dZp29d8,5241
@@ -177,7 +178,7 @@ lionagi/protocols/operatives/step.py,sha256=PHKehsJESx0I2PnWQG8lHgX7mPp3jX1eiLAQ
 lionagi/service/__init__.py,sha256=DMGXIqPsmut9H5GT0ZeSzQIzYzzPwI-2gLXydpbwiV8,21
 lionagi/service/imodel.py,sha256=jE1Y3JzGwJZesHQtRSadVTAHA2TGdBAwfmzQoOA5Meg,12651
 lionagi/service/manager.py,sha256=tN3p0kM7pg_CEs6wXK62_B_h49Q3nrU-9qniFhw2ABE,1164
-lionagi/service/rate_limited_processor.py,sha256=MUgMgcOXFbzLmQmDyKxnvQv0M06kzJI9rJXwf5WLVDU,5228
+lionagi/service/rate_limited_processor.py,sha256=JhkuzJMHUCdndkRbAUf9wUQI9zOw-dutRy_nHf8EE5I,6101
 lionagi/service/resilience.py,sha256=uYJYZQ9M-tje8ME3vJmYabXwKHF1c3Ij4-WrdCwogcs,18742
 lionagi/service/token_calculator.py,sha256=piTidArzUkIMCtOLC_HBLoZNYZcENQywgeKM31bxezM,6457
 lionagi/service/types.py,sha256=6zavqBxK1Fj0nB9eZgJn3JICxmdT-n0nn8YWZFzM5LU,508
@@ -202,7 +203,7 @@ lionagi/service/third_party/exa_models.py,sha256=G_hnekcy-DillPLzMoDQ8ZisVAL8Mp7
 lionagi/service/third_party/openai_models.py,sha256=sF-fQ726CnaDBgLY_r2NdPqc3GicPKhZjh5F8IfjBO0,501904
 lionagi/service/third_party/pplx_models.py,sha256=Nkm1ftESBa_NwP9ITBUNqLmAZ3Jh92aL732g_i6T8LQ,5947
 lionagi/session/__init__.py,sha256=kDypY6L3kGPnatAw7YNQAykgg-9MlIBnlhHExaXvt-c,202
-lionagi/session/branch.py,sha256=bMNZQhCB7s_vWCOqQ3X1w2gZ9mhkDUMf21OvJGMWOyM,69713
+lionagi/session/branch.py,sha256=Bm3EzkE0y6UkSGeZUx70r9YY6T7x7MQiEtibBCNFW9A,69496
 lionagi/session/prompts.py,sha256=GPr0jibyAAqS3awDzGC8SoCL6aWJLLCCbXY0JUuxOC0,3170
 lionagi/session/session.py,sha256=4zPB2E2yn7JcdlAkh757pmG6tjobvlryvvVRCO7uCW0,10795
 lionagi/tools/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
@@ -211,7 +212,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.14.4.dist-info/METADATA,sha256=-p9jMY7KWE6p5JaVu2cYN3DR3Tm_U97Xr4fWmPDA8WQ,21051
-lionagi-0.14.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lionagi-0.14.4.dist-info/licenses/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
-lionagi-0.14.4.dist-info/RECORD,,
+lionagi-0.14.5.dist-info/METADATA,sha256=lrwijIFHxQRurFu-fEnD5n0-bx23rd2t8hIrpl6Tikg,21236
+lionagi-0.14.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lionagi-0.14.5.dist-info/licenses/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
+lionagi-0.14.5.dist-info/RECORD,,