lionagi 0.5.4__py3-none-any.whl → 0.6.0__py3-none-any.whl

lionagi/__init__.py

@@ -1,29 +1,21 @@
-"""The LION framework."""
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
 
-import logging
+from lionagi.operatives import types as ops_types
+from lionagi.protocols import types as types
+from lionagi.service.imodel import iModel
+from lionagi.session.session import Branch, Session
+from lionagi.version import __version__
 
-from dotenv import load_dotenv
+LiteiModel = iModel
 
-from .core.session.types import Branch, Session
-from .integrations.litellm_.imodel import LiteiModel
-from .protocols.operatives.step import Step
-from .service import iModel
-from .settings import Settings
-from .version import __version__
-
-load_dotenv()
-
-
-__all__ = [
-    "Settings",
-    "__version__",
-    "iModel",
-    "LiteiModel",
-    "Branch",
-    "Step",
+__all__ = (
     "Session",
+    "Branch",
+    "iModel",
     "LiteiModel",
-]
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
+    "types",
+    "ops_types",
+    "__version__",
+)

lionagi/{core/_class_registry.py → _class_registry.py}

@@ -2,23 +2,53 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+import ast
+import importlib.util
 import os
 from typing import TypeVar
 
-from lionagi.libs.utils import get_class_file_registry, get_class_objects
-
 T = TypeVar("T")
 LION_CLASS_REGISTRY: dict[str, type[T]] = {}
 LION_CLASS_FILE_REGISTRY: dict[str, str] = {}
 
 pattern_list = [
-    "lionagi/core/generic",
-    "lionagi/core/communication",
-    "lionagi/core/action",
-    "lionagi/core/session",
-    "lionagi/core/forms",
+    "lionagi/protocols/generic",
+    "lionagi/protocols/graph",
+    "lionagi/protocols/messages",
 ]
 
+__all__ = (
+    "get_class",
+    "LION_CLASS_REGISTRY",
+)
+
+
+def get_file_classes(file_path):
+    with open(file_path) as file:
+        file_content = file.read()
+
+    tree = ast.parse(file_content)
+
+    class_file_dict = {}
+    for node in tree.body:
+        if isinstance(node, ast.ClassDef):
+            class_file_dict[node.name] = file_path
+
+    return class_file_dict
+
+
+def get_class_file_registry(folder_path, pattern_list):
+    class_file_registry = {}
+    for root, _, files in os.walk(folder_path):
+        for file in files:
+            if file.endswith(".py"):
+                if any(pattern in root for pattern in pattern_list):
+                    class_file_dict = get_file_classes(
+                        os.path.join(root, file)
+                    )
+                    class_file_registry.update(class_file_dict)
+    return class_file_registry
+
 
 if not LION_CLASS_FILE_REGISTRY:
     script_path = os.path.abspath(__file__)
@@ -29,6 +59,20 @@ if not LION_CLASS_FILE_REGISTRY:
     )
 
 
+def get_class_objects(file_path):
+    class_objects = {}
+    spec = importlib.util.spec_from_file_location("module.name", file_path)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+
+    for class_name in dir(module):
+        obj = getattr(module, class_name)
+        if isinstance(obj, type):
+            class_objects[class_name] = obj
+
+    return class_objects
+
+
 def get_class(class_name: str) -> type:
     """
     Retrieve a class by name from the registry or dynamically import it.
@@ -64,6 +108,3 @@ def get_class(class_name: str) -> type:
         return found_class_dict[class_name]
     except Exception as e:
         raise ValueError(f"Unable to find class {class_name}: {e}")
-
-
-# File: lionagi/core/util/class_registry_util.py

lionagi/_errors.py

@@ -0,0 +1,35 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+
+class LionError(Exception):
+    pass
+
+
+class ItemNotFoundError(LionError):
+    pass
+
+
+class ItemExistsError(LionError):
+    pass
+
+
+class IDError(LionError):
+    pass
+
+
+class RelationError(LionError):
+    pass
+
+
+class RateLimitError(LionError):
+    pass
+
+
+class OperationError(LionError):
+    pass
+
+
+class ExecutionError(LionError):
+    pass

lionagi/libs/__init__.py

@@ -0,0 +1,3 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0

lionagi/libs/compress/__init__.py

@@ -0,0 +1,3 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0

lionagi/libs/compress/models.py

@@ -1,8 +1,12 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import numpy as np
 from pydantic import BaseModel
 
-from lionagi.core.generic import Log
-from lionagi.core.typing import Note
+from lionagi.operatives.models.note import Note
+from lionagi.protocols.generic.log import Log
 
 
 class PerplexityTokenScore(BaseModel):

lionagi/libs/compress/utils.py

@@ -1,22 +1,10 @@
-"""
-Copyright 2024 HaiyangLi
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-"""
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
 
 import asyncio
 
-from lionagi.integrations.litellm_.imodel import iModel
+from lionagi.service.imodel import iModel
 
 from .models import PerplexityScores
 

lionagi/libs/file/__init__.py

@@ -0,0 +1,3 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0

lionagi/libs/file/chunk.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import math
 from collections.abc import Callable
 from typing import Any, Literal

lionagi/libs/file/file_ops.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import logging
 from pathlib import Path
 from shutil import copy2

lionagi/libs/file/params.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from collections.abc import Callable
 from pathlib import Path
 from typing import Any, Literal
@@ -45,47 +49,6 @@ class ChunkContentParams(BaseModel):
     )
 
 
-class CreatePathParams(BaseModel):
-    """Parameters for creating file paths with various options.
-
-    This model defines parameters used by the create_path function to generate
-    file paths with support for timestamps, random hashes, and existence checks.
-    """
-
-    directory: Path | str = Field(
-        description="Directory where the file will be created"
-    )
-    filename: str = Field(description="Base name of the file to create")
-    extension: str | None = Field(
-        default=None,
-        description="File extension (with or without leading dot)",
-    )
-    timestamp: bool = Field(
-        default=False, description="If True, adds a timestamp to the filename"
-    )
-    dir_exist_ok: bool = Field(
-        default=True,
-        description="If True, doesn't raise an error if the directory exists",
-    )
-    file_exist_ok: bool = Field(
-        default=False,
-        description="If True, allows overwriting of existing files",
-    )
-    time_prefix: bool = Field(
-        default=False,
-        description="If True, adds timestamp as prefix instead of suffix",
-    )
-    timestamp_format: str | None = Field(
-        default=None,
-        description="Custom format for the timestamp (strftime format)",
-    )
-    random_hash_digits: int = Field(
-        default=0,
-        ge=0,
-        description="Number of random hash digits to append to filename",
-    )
-
-
 class DirToFilesParams(BaseModel):
     """Parameters for processing directories and collecting file paths.
 

lionagi/libs/file/process.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import logging
 from collections.abc import Callable
 from concurrent.futures import ThreadPoolExecutor, as_completed

lionagi/libs/file/save.py

@@ -1,9 +1,13 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import json
 import logging
 from pathlib import Path
 from typing import Any
 
-from .path import create_path
+from lionagi.utils import create_path
 
 
 def save_to_file(

lionagi/libs/{parse/flatten → nested}/flatten.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from collections import deque
 from collections.abc import Mapping, Sequence
 from typing import Any, Literal, TypeVar, overload

lionagi/libs/{parse/nested → nested}/nfilter.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from collections.abc import Callable
 from typing import Any
 

lionagi/libs/{parse/nested → nested}/nget.py

@@ -1,6 +1,11 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from typing import Any
 
-from ...constants import UNDEFINED
+from lionagi.utils import UNDEFINED
+
 from .utils import get_target_container
 
 

lionagi/libs/{parse/nested → nested}/ninsert.py

@@ -1,6 +1,10 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from typing import Any
 
-from ..type_convert.to_list import to_list
+from lionagi.utils import to_list
 
 
 def ninsert(

lionagi/libs/{parse/nested → nested}/nmerge.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from collections import defaultdict
 from collections.abc import Callable, Sequence
 from itertools import chain

lionagi/libs/{parse/nested → nested}/npop.py

@@ -1,8 +1,11 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from collections.abc import Sequence
 from typing import Any
 
-from ...constants import UNDEFINED
-from ..type_convert.to_list import to_list
+from lionagi.utils import UNDEFINED, to_list
 
 
 def npop(

lionagi/libs/{parse/nested → nested}/nset.py

@@ -1,7 +1,12 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from collections.abc import Sequence
 from typing import Any
 
-from ..type_convert.to_list import to_list
+from lionagi.utils import to_list
+
 from .utils import ensure_list_index
 
 

lionagi/libs/{parse/flatten → nested}/unflatten.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from typing import Any
 
 

lionagi/libs/{parse/nested → nested}/utils.py

@@ -1,6 +1,10 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from typing import Any
 
-from ...constants import UNDEFINED
+from lionagi.utils import UNDEFINED
 
 
 def is_homogeneous(

lionagi/libs/package/__init__.py

@@ -0,0 +1,3 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0

lionagi/libs/package/imports.py

@@ -1,10 +1,14 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import importlib.metadata
 import importlib.util
 import logging
 import subprocess
 from typing import Any
 
-from ..utils import run_pip_command
+from lionagi.utils import run_package_manager_command
 
 
 def check_import(
@@ -135,7 +139,7 @@ def install_import(
     except ImportError:
         logging.info(f"Installing {pip_name}...")
         try:
-            run_pip_command(["install", pip_name])
+            run_package_manager_command(["install", pip_name])
             return import_module(
                 package_name=package_name,
                 module_name=module_name,

lionagi/libs/package/management.py

@@ -1,8 +1,12 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import importlib.metadata
 import logging
 import subprocess
 
-from ..utils import run_pip_command
+from lionagi.utils import run_package_manager_command
 
 
 def list_installed_packages() -> list[str]:
@@ -33,7 +37,7 @@ def uninstall_package(package_name: str) -> None:
         subprocess.CalledProcessError: If the uninstallation fails.
     """
     try:
-        run_pip_command(["uninstall", package_name, "-y"])
+        run_package_manager_command(["uninstall", package_name, "-y"])
         logging.info(f"Successfully uninstalled {package_name}.")
     except subprocess.CalledProcessError as e:
         logging.error(f"Failed to uninstall {package_name}. Error: {e}")
@@ -51,7 +55,7 @@ def update_package(package_name: str) -> None:
         subprocess.CalledProcessError: If the update fails.
     """
     try:
-        run_pip_command(["install", "--upgrade", package_name])
+        run_package_manager_command(["install", "--upgrade", package_name])
         logging.info(f"Successfully updated {package_name}.")
     except subprocess.CalledProcessError as e:
         logging.error(f"Failed to update {package_name}. Error: {e}")

lionagi/libs/package/params.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from pydantic import BaseModel, Field
 
 

lionagi/libs/package/system.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import platform
 
 

lionagi/libs/parse.py

@@ -0,0 +1,30 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from lionagi.libs.schema.as_readable import as_readable
+from lionagi.libs.schema.extract_code_block import extract_code_block
+from lionagi.libs.schema.function_to_schema import function_to_schema
+from lionagi.libs.validate.fuzzy_match_keys import fuzzy_match_keys
+from lionagi.libs.validate.fuzzy_validate_mapping import fuzzy_validate_mapping
+from lionagi.libs.validate.string_similarity import string_similarity
+from lionagi.utils import fuzzy_parse_json, to_dict, to_json, to_num
+
+validate_keys = fuzzy_match_keys  # for backward compatibility
+validate_mapping = fuzzy_validate_mapping  # for backward compatibility
+
+
+__all__ = (
+    "as_readable",
+    "extract_code_block",
+    "function_to_schema",
+    "fuzzy_match_keys",
+    "fuzzy_validate_mapping",
+    "string_similarity",
+    "validate_keys",
+    "validate_mapping",
+    "to_dict",
+    "to_json",
+    "to_num",
+    "fuzzy_parse_json",
+)

lionagi/libs/{parse/json → schema}/as_readable.py

@@ -1,7 +1,11 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import json
 from typing import Any
 
-from ..type_convert.to_dict import to_dict
+from lionagi.utils import to_dict
 
 
 def as_readable_json(input_: Any, /, **kwargs) -> str:
@@ -22,7 +26,7 @@ def as_readable_json(input_: Any, /, **kwargs) -> str:
         "use_model_dump": True,
         "fuzzy_parse": True,
         "recursive": True,
-        "recursive_python_only": True,
+        "recursive_python_only": False,
         "max_recursive_depth": 5,
     }
     to_dict_kwargs.update(kwargs)
@@ -42,7 +46,7 @@ def as_readable_json(input_: Any, /, **kwargs) -> str:
                 items.append(
                     json.dumps(
                         dict_,
-                        indent=4,
+                        indent=2,
                         ensure_ascii=False,
                         default=lambda o: to_dict(o),
                     )
@@ -54,7 +58,7 @@ def as_readable_json(input_: Any, /, **kwargs) -> str:
 
         # Extract json.dumps kwargs from input kwargs
         json_kwargs = {
-            "indent": 4,
+            "indent": 2,
             "ensure_ascii": kwargs.get("ensure_ascii", False),
             "default": lambda o: to_dict(o),
         }
@@ -101,4 +105,6 @@ def as_readable(input_: Any, /, *, md: bool = False, **kwargs) -> str:
         return result
 
     except Exception:
+        if md:
+            return f"```json\n{str(input_)}\n```"
         return str(input_)

lionagi/libs/{parse/string_parse/code_block.py → schema/extract_code_block.py}

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import re
 
 

lionagi/libs/{parse/string_parse/docstring.py → schema/extract_docstring.py}

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import inspect
 from collections.abc import Callable
 from typing import Literal

lionagi/libs/{parse/string_parse/function_.py → schema/function_to_schema.py}

@@ -1,17 +1,29 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 import inspect
 from typing import Any, Literal
 
-from lionagi.libs.constants import py_json_msp
+from .extract_docstring import extract_docstring
 
-from .docstring import extract_docstring
+py_json_msp = {
+    "str": "string",
+    "int": "number",
+    "float": "number",
+    "list": "array",
+    "tuple": "array",
+    "bool": "boolean",
+    "dict": "object",
+}
 
 
 def function_to_schema(
     f_,
     style: Literal["google", "rest"] = "google",
     *,
-    f_description=None,
-    p_description=None,
+    func_description: str = None,
+    parametert_description: dict[str, str] = None,
 ) -> dict:
     """
     Generate a schema description for a given function. in openai format
@@ -53,10 +65,10 @@ def function_to_schema(
     func_name = f_.__name__
 
     # Extract function description and parameter descriptions
-    if not f_description or not p_description:
+    if not func_description or not parametert_description:
         func_desc, params_desc = extract_docstring(f_, style)
-        f_description = f_description or func_desc
-        p_description = p_description or params_desc
+        func_description = func_description or func_desc
+        parametert_description = parametert_description or params_desc
 
     # Extract parameter details using typing hints
     sig = inspect.signature(f_)
@@ -73,7 +85,7 @@ def function_to_schema(
             param_type = py_json_msp[param.annotation.__name__]
 
         # Extract parameter description from docstring, if available
-        param_description = p_description.get(name)
+        param_description = parametert_description.get(name)
 
         # Assuming all parameters are required for simplicity
         parameters["required"].append(name)
@@ -86,7 +98,7 @@ def function_to_schema(
         "type": "function",
         "function": {
             "name": func_name,
-            "description": f_description,
+            "description": func_description,
             "parameters": parameters,
         },
     }