lionagi 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

lionagi/core/rule/base.py

@@ -1,25 +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.
-"""
-
 from abc import abstractmethod
-from typing import Any, List, Dict
+from typing import Any, Dict, List
+
 from pandas import Series
-from lionagi.libs import SysUtil
 
-from lionagi.core.collections.abc import FieldError, Condition, Actionable, Component
+from lionagi.core.collections.abc import Actionable, Component, Condition, FieldError
+from lionagi.libs import SysUtil
 
 _rule_classes = {}
 

lionagi/core/rule/boolean.py

@@ -1,5 +1,5 @@
 from typing import Any
-from lionagi.libs.ln_convert import to_str, strip_lower
+
 from lionagi.core.rule.base import Rule
 
 
@@ -46,7 +46,7 @@ class BooleanRule(Rule):
         Raises:
             ValueError: If the value cannot be converted to a boolean.
         """
-        value = strip_lower(to_str(value))
+        value = str(value).strip().lower()
         if value in ["true", "1", "correct", "yes"]:
             return True
 

lionagi/core/rule/choice.py

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

lionagi/core/rule/mapping.py

@@ -1,23 +1,7 @@
-"""
-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.
-"""
-
-from typing import Any
 from collections.abc import Mapping
-from lionagi.libs.ln_convert import to_dict
-from lionagi.libs import StringMatch, ParseUtil
+from typing import Any
+
+from lionfuncs import to_dict, validate_mapping
 
 from lionagi.core.rule.choice import ChoiceRule
 
@@ -83,13 +67,15 @@ class MappingRule(ChoiceRule):
             check_keys = set(value.keys())
             if check_keys != set(self.keys):
                 try:
-                    return StringMatch.force_validate_dict(value, keys=self.keys)
+                    return validate_mapping(
+                        value, keys=self.keys, handle_unmatched="force"
+                    )
                 except Exception as e:
                     raise ValueError("Invalid dict keys.") from e
 
         else:
             try:
-                return ParseUtil.fuzzy_parse_json(value)
+                return to_dict(value, fuzzy_parse=True)
             except Exception as e:
                 raise ValueError("Invalid dict keys.") from e
 

lionagi/core/rule/number.py

@@ -1,5 +1,7 @@
 from typing import Any
-from lionagi.libs.ln_convert import to_num
+
+from lionfuncs import to_num
+
 from lionagi.core.rule.base import Rule
 
 

lionagi/core/rule/rulebook.py

@@ -1,6 +1,6 @@
-from lionagi.libs.ln_func_call import lcall
-from lionagi.core.rule.base import Rule
+from lionfuncs import lcall
 
+from lionagi.core.rule.base import Rule
 
 """
 rule config schema 
@@ -39,71 +39,3 @@ class RuleBook:
 
     def __getitem__(self, key: str) -> Rule:
         return self.rules[key]
-
-    # def add_rule(self, rule_name: str, rule: Rule, config: dict = None):
-    #     if rule_name in self.rules:
-    #         raise ValueError(f"Rule '{rule_name}' already exists.")
-    #     self.rules[rule_name] = rule
-    #     self.ruleorder.append(rule_name)
-    #     self.rule_config[rule_name] = config or {}
-
-    # def remove_rule(self, rule_name: str):
-    #     if rule_name not in self.rules:
-    #         raise ValueError(f"Rule '{rule_name}' does not exist.")
-    #     del self.rules[rule_name]
-    #     self.ruleorder.remove(rule_name)
-    #     del self.rule_config[rule_name]
-
-    # def update_rule_config(self, rule_name: str, config: dict):
-    #     if rule_name not in self.rules:
-    #         raise ValueError(f"Rule '{rule_name}' does not exist.")
-    #     self.rule_config[rule_name] = config
-
-    # def list_rules(self) -> list[str]:
-    #     return self.ruleorder
-
-    # def get_rule_details(self, rule_name: str) -> dict:
-    #     if rule_name not in self.rules:
-    #         raise ValueError(f"Rule '{rule_name}' does not exist.")
-    #     return {
-    #         "rule": self.rules[rule_name],
-    #         "config": self.rule_config[rule_name]
-    #     }
-
-    # async def validate_data(self, data: Any) -> bool:
-    #     for rule in self.rules.values():
-    #         if not await rule.validate(data):
-    #             return False
-    #     return True
-
-    # def export_rulebook(self, filepath: str):
-    #     import json
-    #     with open(filepath, 'w') as f:
-    #         json.dump({
-    #             "rules": list(self.rules.keys()),
-    #             "ruleorder": self.ruleorder,
-    #             "rule_config": self.rule_config
-    #         }, f)
-
-    # @classmethod
-    # def import_rulebook(cls, filepath: str) -> 'RuleBook':
-    #     import json
-    #     with open(filepath, 'r') as f:
-    #         config = json.load(f)
-    #     rules = {name: Rule() for name in config["rules"]}
-    #     return cls(rules=rules, ruleorder=config["ruleorder"], rule_config=config["rule_config"])
-
-    # def enable_rule(self, rule_name: str, enable: bool = True):
-    #     if rule_name not in self.rules:
-    #         raise ValueError(f"Rule '{rule_name}' does not exist.")
-    #     self.rules[rule_name].enabled = enable
-
-    # def log_rule_application(self, rule_name: str, data: Any):
-    #     if rule_name not in self.rules:
-    #         raise ValueError(f"Rule '{rule_name}' does not exist.")
-    #     log_entry = {
-    #         "rule": rule_name,
-    #         "data": data,
-    #         "timestamp": SysUtil.get_timestamp()
-    #     }
-    #     # Append log_entry to a log file or a logging system

lionagi/core/rule/string.py

@@ -1,4 +1,5 @@
-from lionagi.libs.ln_convert import to_str
+from lionfuncs import to_str
+
 from lionagi.core.rule.base import Rule
 
 
@@ -34,18 +35,6 @@ class StringRule(Rule):
         raise ValueError(f"Invalid string field type.")
 
     async def perform_fix(self, value):
-        """
-        Attempt to convert a value to a string.
-
-        Args:
-            value: The value to convert to a string.
-
-        Returns:
-            str: The value converted to a string.
-
-        Raises:
-            ValueError: If the value cannot be converted to a string.
-        """
         try:
             return to_str(value, **self.validation_kwargs)
         except Exception as e:

lionagi/core/rule/util.py

@@ -1,35 +0,0 @@
-# from lionagi.libs.ln_convert import is_same_dtype
-# from collections.abc import Mapping, Generator
-
-
-# def validate_keys(keys):
-#     """
-#     choices can be provided from various sources:
-#     - mapping such as dict, their keys will be used as choices
-#     - iterables including list, tuple, set, generator, enum, etc.
-#     - strings, comma separated values
-#     """
-
-#     try:
-#         if isinstance(keys, Mapping):
-#             keys = list(keys.keys())
-
-#         elif isinstance(keys, (list, tuple, set, Generator)):
-#             keys = set(keys)
-
-#         elif isinstance(keys, str):
-#             if "," in keys:
-#                 keys = list({i.strip() for i in keys.split(",")})
-#             else:
-#                 keys = [keys.strip()]
-
-#         else:
-#             keys = [i.value for i in keys]
-
-#     except Exception as e:
-#         raise ValueError(f"invalid choices {keys}") from e
-
-#     if not is_same_dtype(keys):
-#         raise ValueError(f"choices must be of the same type, got {keys}")
-
-#     return keys

lionagi/core/session/branch.py

@@ -1,44 +1,28 @@
-"""
-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.
-"""
-
 from typing import Any
-from lionagi.libs.ln_convert import is_same_dtype, to_df
-from lionagi.core.collections.abc import Field
+
+from lionagi.core.action import Tool, ToolManager
 from lionagi.core.collections import (
-    pile,
-    progression,
+    Exchange,
     Pile,
     Progression,
     iModel,
-    Exchange,
+    pile,
+    progression,
 )
+from lionagi.core.collections.abc import Field
 from lionagi.core.generic.node import Node
-from lionagi.core.action import Tool, ToolManager
 from lionagi.core.mail import Mail, Package
 from lionagi.core.message import (
-    create_message,
-    System,
-    Instruction,
-    AssistantResponse,
     ActionRequest,
     ActionResponse,
+    AssistantResponse,
+    Instruction,
     RoledMessage,
+    System,
+    create_message,
 )
-
 from lionagi.core.session.directive_mixin import DirectiveMixin
+from lionagi.libs.ln_convert import is_same_dtype, to_df
 
 
 class Branch(Node, DirectiveMixin):

lionagi/core/session/directive_mixin.py

@@ -1,22 +1,7 @@
-"""
-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.
-"""
-
 # lionagi/core/session/directive_mixin.py
 
 from lionagi.core.unit import Unit
+
 from ..message.action_response import ActionResponse
 
 

lionagi/core/session/session.py

@@ -1,36 +1,20 @@
-"""
-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.
-"""
+from typing import Any
 
+from lionagi.core.action.tool_manager import ToolManager
 from lionagi.core.collections import (
+    Exchange,
     Pile,
     Progression,
-    progression,
-    pile,
     iModel,
+    pile,
+    progression,
 )
-from lionagi.core.message import System
-from typing import Any
-from lionagi.core.action.tool_manager import ToolManager
-
-from lionagi.libs import SysUtil
-from lionagi.core.session.branch import Branch
-from lionagi.core.collections import pile, Pile, Exchange
 from lionagi.core.collections.abc import get_lion_id
 from lionagi.core.collections.util import to_list_type
 from lionagi.core.mail.mail_manager import MailManager
+from lionagi.core.message import System
+from lionagi.core.session.branch import Branch
+from lionagi.libs import SysUtil
 
 
 class Session:

lionagi/core/unit/__init__.py

@@ -1,5 +1,4 @@
-from .unit_form import UnitForm
 from .unit import Unit
-
+from .unit_form import UnitForm
 
 __all__ = ["UnitForm", "Unit"]

lionagi/core/unit/parallel_unit.py

@@ -1,27 +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.
-"""
-
-from lionagi.libs.ln_func_call import rcall, pcall
-from lionagi.libs import convert, AsyncUtil
-
-from lionagi.core.collections.abc import Directive
 from lionagi.core.collections import iModel
-from lionagi.core.validator.validator import Validator
+from lionagi.core.collections.abc import Directive
 from lionagi.core.session.branch import Branch
 from lionagi.core.unit.util import retry_kwargs
+from lionagi.core.validator.validator import Validator
+from lionagi.libs import AsyncUtil, convert
+from lionagi.libs.ln_func_call import rcall
 
 
 class ParallelUnit(Directive):

lionagi/core/unit/template/action.py

@@ -1,19 +1,3 @@
-"""
-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.
-"""
-
 from .base import BaseUnitForm, Field
 
 

lionagi/core/unit/template/base.py

@@ -1,19 +1,3 @@
-"""
-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.
-"""
-
 from lionagi.core.collections.abc import Field
 from lionagi.core.report.form import Form
 

lionagi/core/unit/template/plan.py

@@ -1,20 +1,5 @@
-"""
-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.
-"""
-
 from lionagi.libs.ln_convert import to_str
+
 from .base import BaseUnitForm, Field
 
 

lionagi/core/unit/template/predict.py

@@ -1,19 +1,3 @@
-"""
-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.
-"""
-
 from .base import BaseUnitForm, Field
 
 

lionagi/core/unit/template/score.py

@@ -1,22 +1,6 @@
-"""
-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.
-"""
-
-from lionagi.libs.ln_convert import to_str
 from lionagi.core.collections.abc import Field
 from lionagi.core.unit import UnitForm
+from lionagi.libs.ln_convert import to_str
 
 
 class ScoreTemplate(UnitForm):

lionagi/core/unit/template/select.py

@@ -1,20 +1,5 @@
-"""
-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.
-"""
-
 from enum import Enum
+
 from .base import BaseUnitForm, Field
 
 

lionagi/core/unit/unit.py

@@ -1,25 +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.
-"""
-
 from typing import Callable
-from lionagi.libs.ln_convert import strip_lower
-from lionagi.libs.ln_func_call import rcall
+
+from lionagi.core.collections import iModel
 from lionagi.core.collections.abc import Directive
 from lionagi.core.validator.validator import Validator
-from lionagi.core.collections import iModel
+from lionagi.libs.ln_func_call import rcall
+
 from .unit_form import UnitForm
 from .unit_mixin import DirectiveMixin
 from .util import retry_kwargs
@@ -361,8 +346,8 @@ class Unit(Directive, DirectiveMixin):
         if system:
             branch.add_message(system=system)
 
-        if hasattr(self, strip_lower(directive)):
-            directive = getattr(self, strip_lower(directive))
+        if hasattr(self, str(directive).strip().lower()):
+            directive = getattr(self, str(directive).strip().lower())
 
             verbose = verbose if verbose is not None else self.verbose
             if verbose:

lionagi/core/unit/unit_form.py

@@ -1,22 +1,9 @@
-"""
-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
+from enum import Enum
 
-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.
-"""
+from lionfuncs import to_dict
 
-from enum import Enum
-from lionagi.libs.ln_convert import to_str, to_dict
 from lionagi.core.collections.abc import Field
+
 from .template.base import BaseUnitForm
 
 
@@ -192,8 +179,8 @@ class UnitForm(BaseUnitForm):
 
         self.task = (
             f"Follow the prompt and provide the necessary output.\n"
-            f"- Additional instruction: {to_str(instruction or 'N/A')}\n"
-            f"- Additional context: {to_str(context or 'N/A')}\n"
+            f"- Additional instruction: {str(instruction or 'N/A')}\n"
+            f"- Additional context: {str(context or 'N/A')}\n"
         )
 
         if reason:
@@ -272,7 +259,7 @@ class UnitForm(BaseUnitForm):
             fields["task"] = fields["task"][:2000] + "..."
 
         if "tool_schema" in fields:
-            tools = to_dict(fields["tool_schema"])["tools"]
+            tools = to_dict(fields["tool_schema"], fuzzy_parse=True)["tools"]
             fields["available_tools"] = [i["function"]["name"] for i in tools]
             fields.pop("tool_schema")