lionagi 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

lionagi/core/collections/abc/component.py

@@ -1,11 +1,11 @@
 """Component class, base building block in LionAGI."""
 
 import contextlib
-from abc import ABC
-from collections.abc import Sequence
 from functools import singledispatchmethod
-from typing import Any, Type, TypeAlias, TypeVar, Union
+from typing import Any, TypeAlias, TypeVar, Union
 
+import lionfuncs as ln
+from lionabc import Observable
 from pandas import DataFrame, Series
 from pydantic import AliasChoices, BaseModel, Field, ValidationError
 
@@ -22,7 +22,13 @@ T = TypeVar("T")
 _init_class = {}
 
 
-class Element(BaseModel, ABC):
+def change_dict_key(dict_: dict, old_key: str, new_key: str) -> None:
+    """Change a key in a dictionary."""
+    if old_key in dict_:
+        dict_[new_key] = dict_.pop(old_key)
+
+
+class Element(BaseModel, Observable):
     """Base class for elements within the LionAGI system.
 
     Attributes:
@@ -31,15 +37,14 @@ class Element(BaseModel, ABC):
     """
 
     ln_id: str = Field(
-        default_factory=SysUtil.create_id,
+        default_factory=SysUtil.id,
         title="ID",
-        description="A 32-char unique hash identifier.",
         frozen=True,
         validation_alias=AliasChoices("node_id", "ID", "id"),
     )
 
     timestamp: str = Field(
-        default_factory=lambda: SysUtil.get_timestamp(sep=None)[:-6],
+        default_factory=lambda: ln.time(type_="iso"),
         title="Creation Timestamp",
         description="The UTC timestamp of creation",
         frozen=True,
@@ -57,7 +62,7 @@ class Element(BaseModel, ABC):
         return True
 
 
-class Component(Element, ABC):
+class Component(Element):
     """
     Represents a distinguishable, temporal entity in LionAGI.
 
@@ -195,17 +200,15 @@ class Component(Element, ABC):
         """Create a Component instance from a LlamaIndex object."""
         dict_ = obj.to_dict()
 
-        SysUtil.change_dict_key(dict_, "text", "content")
+        change_dict_key(dict_, "text", "content")
         metadata = dict_.pop("metadata", {})
 
         for field in llama_meta_fields:
             metadata[field] = dict_.pop(field, None)
 
-        SysUtil.change_dict_key(metadata, "class_name", "llama_index_class")
-        SysUtil.change_dict_key(metadata, "id_", "llama_index_id")
-        SysUtil.change_dict_key(
-            metadata, "relationships", "llama_index_relationships"
-        )
+        change_dict_key(metadata, "class_name", "llama_index_class")
+        change_dict_key(metadata, "id_", "llama_index_id")
+        change_dict_key(metadata, "relationships", "llama_index_relationships")
 
         dict_["metadata"] = metadata
         return cls.from_obj(dict_)
@@ -244,7 +247,7 @@ class Component(Element, ABC):
     @classmethod
     def _process_langchain_dict(cls, dict_: dict) -> dict:
         """Process a dictionary containing Langchain-specific data."""
-        SysUtil.change_dict_key(dict_, "page_content", "content")
+        change_dict_key(dict_, "page_content", "content")
 
         metadata = dict_.pop("metadata", {})
         metadata.update(dict_.pop("kwargs", {}))
@@ -264,9 +267,9 @@ class Component(Element, ABC):
             if field in dict_:
                 metadata[field] = dict_.pop(field)
 
-        SysUtil.change_dict_key(metadata, "lc", "langchain")
-        SysUtil.change_dict_key(metadata, "type", "lc_type")
-        SysUtil.change_dict_key(metadata, "id", "lc_id")
+        change_dict_key(metadata, "lc", "langchain")
+        change_dict_key(metadata, "type", "lc_type")
+        change_dict_key(metadata, "id", "lc_id")
 
         extra_fields = {
             k: v for k, v in metadata.items() if k not in lc_meta_fields
@@ -298,9 +301,9 @@ class Component(Element, ABC):
         dict_["metadata"] = meta_
 
         if "ln_id" not in dict_:
-            dict_["ln_id"] = meta_.pop("ln_id", SysUtil.create_id())
+            dict_["ln_id"] = meta_.pop("ln_id", SysUtil.id())
         if "timestamp" not in dict_:
-            dict_["timestamp"] = SysUtil.get_timestamp(sep=None)[:-6]
+            dict_["timestamp"] = ln.time(type_="iso")
         if "metadata" not in dict_:
             dict_["metadata"] = {}
         if "extra_fields" not in dict_:
@@ -453,13 +456,13 @@ class Component(Element, ABC):
             ninsert(
                 self.metadata,
                 ["last_updated", name],
-                SysUtil.get_timestamp(sep=None)[:-6],
+                ln.time(type_="iso")[:-6],
             )
         elif isinstance(a, tuple) and isinstance(a[0], int):
             nset(
                 self.metadata,
                 ["last_updated", name],
-                SysUtil.get_timestamp(sep=None)[:-6],
+                ln.time(type_="iso")[:-6],
             )
 
     def _meta_pop(self, indices, default=...):
@@ -614,10 +617,4 @@ LionIDable: TypeAlias = Union[str, Element]
 
 def get_lion_id(item: LionIDable) -> str:
     """Get the Lion ID of an item."""
-    if isinstance(item, Sequence) and len(item) == 1:
-        item = item[0]
-    if isinstance(item, str) and len(item) == 32:
-        return item
-    if getattr(item, "ln_id", None) is not None:
-        return item.ln_id
-    raise LionTypeError("Item must be a single LionIDable object.")
+    return SysUtil.get_id(item)

lionagi/core/collections/abc/concepts.py

@@ -227,12 +227,6 @@ class Sendable(BaseModel, ABC):
             return value
 
         a = get_lion_id(value)
-        if not isinstance(a, str) or len(a) != 32:
-            raise LionTypeError(
-                "Invalid sender or recipient value. "
-                "Expected a valid node id or one of "
-                "'system' or 'user'."
-            )
         return a
 
 

lionagi/core/collections/flow.py

@@ -1,7 +1,6 @@
 import contextlib
 from collections import deque
 from collections.abc import Mapping
-from typing import Tuple
 
 from pydantic import Field
 

lionagi/core/collections/model.py

@@ -1,6 +1,7 @@
 import asyncio
 import os
 
+import lionfuncs as ln
 import numpy as np
 from dotenv import load_dotenv
 
@@ -91,8 +92,8 @@ class iModel:
             service (BaseService, optional): An instance of BaseService.
             **kwargs: Additional parameters for the model.
         """
-        self.ln_id: str = SysUtil.create_id()
-        self.timestamp: str = SysUtil.get_timestamp(sep=None)[:-6]
+        self.ln_id: str = SysUtil.id()
+        self.timestamp: str = ln.time(type_="iso")
         self.endpoint = endpoint
         self.allowed_parameters = allowed_parameters
         if isinstance(provider, type):

lionagi/core/collections/pile.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import asyncio
 from collections.abc import AsyncIterator, Callable, Iterable
 from functools import wraps
-from typing import Any, Generic, Type, TypeVar
+from typing import Any, Generic, TypeVar
 
 from pydantic import Field, field_validator
 

lionagi/core/collections/progression.py

@@ -1,9 +1,8 @@
 import contextlib
 
+import lionfuncs as ln
 from pydantic import Field, field_validator
 
-from lionagi.libs import SysUtil
-
 from .abc import Element, ItemNotFoundError, LionIDable, Ordering, get_lion_id
 from .util import _validate_order
 
@@ -90,7 +89,7 @@ class Progression(Element, Ordering):
         """Remove the next occurrence of an item from the progression."""
         if item in self:
             item = self._validate_order(item)
-            l_ = SysUtil.create_copy(self.order)
+            l_ = ln.copy(self.order)
 
             with contextlib.suppress(Exception):
                 for i in item:
@@ -143,7 +142,7 @@ class Progression(Element, Ordering):
     def __radd__(self, other):
         if not isinstance(other, Progression):
             _copy = self.copy()
-            l_ = SysUtil.create_copy(_copy.order)
+            l_ = ln.copy(_copy.order)
             l_.insert(0, get_lion_id(other))
             _copy.order = l_
             return _copy
@@ -190,7 +189,7 @@ class Progression(Element, Ordering):
 
     def __list__(self):
         """Return a list representation of the progression."""
-        return SysUtil.create_copy(self.order)
+        return ln.copy(self.order)
 
     def __reversed__(self):
         """Return a reversed progression."""

lionagi/core/director/operations/select.py

@@ -1,93 +1,3 @@
-from __future__ import annotations
+from lionagi.operations.select import select
 
-from collections.abc import Callable
-from enum import Enum
-
-from lionfuncs import choose_most_similar
-from pydantic import BaseModel
-
-from lionagi.core.director.models import ReasonModel
-from lionagi.core.session.branch import Branch
-
-from .utils import is_enum
-
-PROMPT = "Please select up to {max_num_selections} items from the following list {choices}. Provide the selection(s), and no comments from you"
-
-
-class SelectionModel(BaseModel):
-    selected: list[str | Enum]
-
-
-class ReasonSelectionModel(BaseModel):
-    selected: list[str | Enum]
-    reason: ReasonModel
-
-
-async def select(
-    choices: list[str] | type[Enum],
-    max_num_selections: int = 1,
-    instruction=None,
-    context=None,
-    system=None,
-    sender=None,
-    recipient=None,
-    reason: bool = False,
-    return_enum: bool = False,
-    enum_parser: Callable = None,  # parse the model string response to appropriate type
-    branch: Branch = None,
-    return_pydantic_model=False,
-    **kwargs,  # additional chat arguments
-):
-    selections = []
-    if return_enum and not is_enum(choices):
-        raise ValueError("return_enum can only be True if choices is an Enum")
-
-    if is_enum(choices):
-        selections = [selection.value for selection in choices]
-    else:
-        selections = choices
-
-    prompt = PROMPT.format(
-        max_num_selections=max_num_selections, choices=selections
-    )
-
-    if instruction:
-        prompt = f"{instruction}\n\n{prompt} \n\n "
-
-    branch = branch or Branch()
-    response: SelectionModel | ReasonSelectionModel | str = await branch.chat(
-        instruction=prompt,
-        context=context,
-        system=system,
-        sender=sender,
-        recipient=recipient,
-        pydantic_model=SelectionModel if not reason else ReasonSelectionModel,
-        return_pydantic_model=True,
-        **kwargs,
-    )
-
-    selected = response
-    if isinstance(response, SelectionModel | ReasonSelectionModel):
-        selected = response.selected
-    selected = [selected] if not isinstance(selected, list) else selected
-    corrected_selections = [
-        choose_most_similar(selection, selections) for selection in selected
-    ]
-
-    if return_enum:
-        out = []
-        if not enum_parser:
-            enum_parser = lambda x: x
-        for selection in corrected_selections:
-            selection = enum_parser(selection)
-            for member in choices.__members__.values():
-                if member.value == selection:
-                    out.append(member)
-        corrected_selections = out
-
-    if return_pydantic_model:
-        if not isinstance(response, SelectionModel | ReasonSelectionModel):
-            return SelectionModel(selected=corrected_selections)
-        response.selected = corrected_selections
-        return response
-    return corrected_selections
+__all__ = ["select"]

lionagi/core/rule/choice.py

@@ -1,4 +1,4 @@
-from lionfuncs import choose_most_similar
+from lionfuncs import string_similarity
 
 from lionagi.core.rule.base import Rule
 
@@ -45,4 +45,4 @@ class ChoiceRule(Rule):
         Returns:
             str: The most similar value from the set of predefined choices.
         """
-        return choose_most_similar(value, self.keys)
+        return string_similarity(value, self.keys, choose_most_similar=True)

lionagi/core/unit/unit_mixin.py

@@ -2,9 +2,9 @@ import asyncio
 import contextlib
 import re
 from abc import ABC
-from typing import Any, Optional
+from typing import Any
 
-from lionfuncs import extract_json_block, to_dict, validate_mapping
+from lionfuncs import extract_block, to_dict, validate_mapping
 
 from lionagi.core.collections.abc import ActionError
 from lionagi.core.message import ActionRequest, ActionResponse, Instruction
@@ -1156,7 +1156,7 @@ class DirectiveMixin(ABC):
                 return to_dict(out_, fuzzy_parse=True)
 
             with contextlib.suppress(Exception):
-                return extract_json_block(out_)
+                return extract_block(out_)
 
             with contextlib.suppress(Exception):
                 match = re.search(r"```json\n({.*?})\n```", out_, re.DOTALL)