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

lionagi/core/unit/unit_mixin.py

@@ -1,37 +1,17 @@
-"""
-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.
-"""
-
-"""
-The base directive module.
-"""
-
 import asyncio
 import contextlib
 import re
 from abc import ABC
-
 from typing import Any, Optional
 
-from lionagi.libs import ParseUtil, StringMatch, to_list
-from lionagi.libs.ln_nested import nmerge
+from lionfuncs import extract_json_block, to_dict, validate_mapping
+
 from lionagi.core.collections.abc import ActionError
 from lionagi.core.message import ActionRequest, ActionResponse, Instruction
 from lionagi.core.message.util import _parse_action_request
 from lionagi.core.report.form import Form
 from lionagi.core.unit.util import process_tools
-from lionagi.core.validator.validator import Validator
+from lionagi.libs.ln_nested import nmerge
 
 
 class DirectiveMixin(ABC):
@@ -868,7 +848,7 @@ class DirectiveMixin(ABC):
 
         if plan:
             keys = [f"step_{i+1}" for i in range(len(plan))]
-            plan = StringMatch.force_validate_dict(plan, keys)
+            plan = validate_mapping(plan, keys, handle_unmatched="force")
 
             # If plan is provided, process each step
             for i in keys:
@@ -904,7 +884,7 @@ class DirectiveMixin(ABC):
             return form
 
         keys = [f"action_{i+1}" for i in range(len(actions))]
-        actions = StringMatch.force_validate_dict(actions, keys)
+        actions = validate_mapping(actions, keys, handle_unmatched="force")
 
         try:
             requests = []
@@ -1149,18 +1129,20 @@ class DirectiveMixin(ABC):
 
         if requested_fields:
             with contextlib.suppress(Exception):
-                return StringMatch.force_validate_dict(out_, requested_fields)
+                return validate_mapping(
+                    out_, requested_fields, handle_unmatched="force"
+                )
 
         if isinstance(out_, str):
             with contextlib.suppress(Exception):
-                return ParseUtil.fuzzy_parse_json(out_)
+                return to_dict(out_, fuzzy_parse=True)
 
             with contextlib.suppress(Exception):
-                return ParseUtil.extract_json_block(out_)
+                return extract_json_block(out_)
 
             with contextlib.suppress(Exception):
                 match = re.search(r"```json\n({.*?})\n```", out_, re.DOTALL)
                 if match:
-                    return ParseUtil.fuzzy_parse_json(match.group(1))
+                    return to_dict(match.group(1), fuzzy_parse=True)
 
         return out_

lionagi/core/unit/util.py

@@ -22,6 +22,7 @@ choices_fields = ["index", "message", "logprobs", "finish_reason"]
 usage_fields = ["prompt_tokens", "completion_tokens", "total_tokens"]
 
 from typing import Callable
+
 from lionagi.core.action.tool import Tool
 from lionagi.core.action.tool_manager import func_to_tool
 

lionagi/core/validator/validator.py

@@ -1,30 +1,16 @@
-"""
-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
+import asyncio
+from typing import Any, Callable, Dict, List, Union
 
-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 lcall
 
-import asyncio
-from typing import Any, Dict, List, Union, Callable
-from lionagi.libs import SysUtil
-from lionagi.libs.ln_func_call import lcall
 from lionagi.core.collections.abc import FieldError
-from lionagi.core.collections.model import iModel
-from ..rule.base import Rule
-from ..rule._default import DEFAULT_RULES
-from ..rule.rulebook import RuleBook
+from lionagi.libs import SysUtil
+
 from ..report.form import Form
 from ..report.report import Report
+from ..rule._default import DEFAULT_RULES
+from ..rule.base import Rule
+from ..rule.rulebook import RuleBook
 
 _DEFAULT_RULEORDER = [
     "choice",

lionagi/core/work/work.py

@@ -1,26 +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
-
-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 collections.abc import Coroutine
 from enum import Enum
-import asyncio
 from typing import Any
-from collections.abc import Coroutine
 
-from lionagi.libs import SysUtil
 from lionagi.core.collections.abc import Component
+from lionagi.libs import SysUtil
 
 
 class WorkStatus(str, Enum):

lionagi/core/work/work_edge.py

@@ -1,10 +1,10 @@
+import inspect
 from typing import Callable
+
 from pydantic import Field, field_validator
-import inspect
 
-from lionagi.core.generic.edge import Edge
 from lionagi.core.collections.abc.concepts import Progressable
-
+from lionagi.core.generic.edge import Edge
 from lionagi.core.work.worker import Worker
 
 

lionagi/core/work/work_function.py

@@ -1,24 +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.
-"""
-
 import asyncio
-import logging
 
-from lionagi.libs.ln_func_call import rcall
 from lionagi.core.work.worklog import WorkLog
+from lionagi.libs.ln_func_call import rcall
 
 
 class WorkFunction:

lionagi/core/work/work_function_node.py

@@ -1,10 +1,5 @@
-from pydantic import Field
-import asyncio
-
 from lionagi.core.generic.node import Node
 from lionagi.core.work.work_function import WorkFunction
-from lionagi.core.collections import Exchange
-from lionagi.core.mail.mail import Mail
 
 
 class WorkFunctionNode(WorkFunction, Node):

lionagi/core/work/work_queue.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.
-"""
-
 import asyncio
+
 from lionagi.core.work.work import WorkStatus
 
 

lionagi/core/work/work_task.py

@@ -1,10 +1,10 @@
 import inspect
-from typing import Any, Callable
-from pydantic import Field, field_validator, model_validator
+from typing import Callable
+
+from pydantic import Field, field_validator
 
 from lionagi.core.collections.abc.component import Component
-from lionagi.core.work.work import WorkStatus, Work
-from collections.abc import Coroutine
+from lionagi.core.work.work import Work, WorkStatus
 
 
 class WorkTask(Component):

lionagi/core/work/worker.py

@@ -1,27 +1,12 @@
-"""
-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.
-"""
-
+import inspect
 from abc import ABC
 from functools import wraps
-import inspect
+
 from lionagi import logging as _logging
-from lionagi.core.work.work_function import WorkFunction
-from lionagi.core.work.work import Work
-from lionagi.core.report.form import Form
 from lionagi.core.collections.abc import get_lion_id
+from lionagi.core.report.form import Form
+from lionagi.core.work.work import Work
+from lionagi.core.work.work_function import WorkFunction
 
 
 class Worker(ABC):

lionagi/core/work/worker_engine.py

@@ -1,12 +1,12 @@
 import asyncio
-from lionagi.core.work.work import WorkStatus
-from lionagi.core.work.worker import Worker
-from lionagi.core.work.work_task import WorkTask
-from lionagi.core.work.work_edge import WorkEdge
-from lionagi.core.work.work_function_node import WorkFunctionNode
 
 from lionagi.core.collections.pile import pile
 from lionagi.core.generic.graph import Graph
+from lionagi.core.work.work import WorkStatus
+from lionagi.core.work.work_edge import WorkEdge
+from lionagi.core.work.work_function_node import WorkFunctionNode
+from lionagi.core.work.work_task import WorkTask
+from lionagi.core.work.worker import Worker
 
 
 class WorkerEngine:

lionagi/core/work/worklog.py

@@ -1,21 +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.core.collections import Pile, pile, progression
 from lionagi.core.collections.abc import Progressable
-from lionagi.core.collections import pile, progression, Pile
 from lionagi.core.work.work import Work, WorkStatus
 from lionagi.core.work.work_queue import WorkQueue
 

lionagi/experimental/compressor/base.py

@@ -1,4 +1,5 @@
 from abc import ABC
+
 from lionagi.core.collections import iModel
 
 

lionagi/experimental/compressor/llm_compressor.py

@@ -1,11 +1,14 @@
 import asyncio
-from lionagi import alcall
-from lionagi.libs.ln_convert import to_list
+from time import time
+
 import numpy as np
+
+from lionagi import alcall
 from lionagi.core.collections import iModel
-from .base import TokenCompressor
+from lionagi.libs.ln_convert import to_list
 from lionagi.libs.ln_tokenize import TokenizeUtil
-from time import time
+
+from .base import TokenCompressor
 
 # inspired by LLMLingua, MIT License, Copyright (c) Microsoft Corporation.
 # https://github.com/microsoft/LLMLingua

lionagi/experimental/directive/README.md

@@ -0,0 +1 @@
+TODO

lionagi/experimental/directive/parser/base_parser.py

@@ -1,23 +1,8 @@
-"""
-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 List, Optional
 
 from lionagi.experimental.directive.tokenizer import BaseToken
-from ..template.schema import IfNode, TryNode, ForNode
+
+from ..template.schema import ForNode, IfNode, TryNode
 
 
 class BaseDirectiveParser:

lionagi/experimental/directive/parser/base_syntax.txt

@@ -0,0 +1,200 @@
+
+"""
+# basic syntax
+executeAction(param1, param2) IF condition1 && condition2 || !condition3;
+
+# verb
+DO
+
+# logic operator
+
+AND: &&
+OR: ||
+NOT: !
+GREATER_THAN: >
+LESS_THAN: <
+GREATER_THAN_OR_EQUAL: >=
+LESS_THAN_OR_EQUAL: <=
+EQUAL: ==
+NOT_EQUAL: !=
+
+# conditions
+IF
+ELIF
+ELSE
+
+# loop
+FOR 
+IN
+
+# EXCEPTION
+TRY 
+EXCEPT
+
+"""
+
+"""
+DO: perform a single action
+THEN: extend directive to include more statment
+IF: condition
+
+FOR
+IN
+END
+BEGIN
+
+TRY
+EXCEPT
+
+---
+
+tools 1,2,3
+
+
+
+def main():  <-> compose
+
+    If condition1 && condition2 || !condition3; 
+    DO tool1(param1, param2);
+    ENDIF;
+    
+    IF  must follow condition, (condition parsing logic);
+    DO ....;
+    ENDIF;
+    
+    
+    
+    
+THEN; 
+    DO tool2(param1, param2);
+    
+THEN;
+    
+    TRY; DO ACTION_C; 
+    EXCEPT; DO ACTION_D;    
+    ENDEXCEPT; 
+    ENDTRY; 
+
+    RETURN  <-> run
+
+
+
+
+COMPOSE; - indicate the beginning of a script-like block to execute 
+
+THEN; - indicate continuation of a script-like block, another statement to execute
+
+RUN; - indicate the end of script-like block, and let the script execute
+
+
+XX;  ; END XX;
+
+
+
+TRY; DO ACTION_A; END TRY; 
+
+
+
+COMPOSE;
+
+IF CONDITION_A; DO ACTION_B; ELIF CONDITION_C; DO ACTION_D; ELSE; DO ACTION_E; ENDIF;
+
+THEN TRY; DO ACTION_C; EXCEPT; DO ACTION_D; ENDEXCEPT; ENDTRY;
+
+
+THEN TRY; DO ACTION_C ENDTRY;
+
+
+
+THEN IF EXCEPT; IF CONDITION_C; DO ACTION_D; ENDEXCEPT
+
+; 
+THEN FOR ITEM IN COLLECTION; DO ACTION_E(input_.param1, input_.param2); ENDFOR
+RUN;
+
+
+
+DO ACTION B; 
+
+IF 
+THEN
+
+GROUP
+
+"""
+
+"""syntax:
+
+
+BEGIN; IF condition1 && condition2 || !condition3; THEN DO action(param1, param2); END IF; END;
+
+BEGIN; FOR input_ IN nested_structure; DO action(input_.param1, input_.param2); END FOR; END;
+
+BEGIN; DO action1(param1, param2); DO action2(param3, param4); END GROUP; END;
+
+
+"""
+
+"""
+FOR input_ IN nested_structure DO
+    executeAction(input_.param1, input_.param2);
+END FOR;
+"""
+
+"""
+example 1:
+
+BEGIN; IF condition1 && condition2 || !condition3; DO action1(param1, param2); ENDIF;
+FOR input_ IN collections DO action2(input_.param1, input_.param2); ENDFOR; END;
+
+
+example 2:
+BEGIN; IF condition1; TRY DO action1(param1, param2); EXCEPT DO action2(param3, param4);
+ENDTRY; ELIF condition2; DO action2(param1, param2); ELSE DO action3(param1, param2); 
+ENDIF; END;
+
+"""
+
+"""
+BEGIN
+    executeAction1(param1, param2);
+    IF condition2 THEN executeAction2(param3, param4);
+    FOR input_ IN nested_structure DO
+        executeAction3(input_.param1, input_.param2);
+    END FOR;
+END;
+"""
+
+"""
+TRY
+    executeAction(param1, param2);
+EXCEPT
+    handleErrorAction(param1, param2);
+"""
+
+"""
+
+CHAT / REACT
+
+
+DO 1,2
+    session = Li.Session(..., tools=tools)
+    await alcall(session.branches, func_1)
+    
+
+THEN DO 3,4
+    session.chat.py(3,4)
+
+
+THEN 5
+    session.chat.py(5)
+
+
+call (1,2,3,4,5)
+
+run 1,2,3,4,5
+
+
+1->2, or 1->3, or 1->4, THEN....
+
+"""

lionagi/experimental/directive/template/base_template.py

@@ -1,21 +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 typing import Any, Dict
 import re
+from typing import Any, Dict
 
 from ..evaluator.base_evaluator import BaseEvaluator
 

lionagi/experimental/directive/tokenizer.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.
-"""
-
 import re
 
 

lionagi/experimental/evaluator/README.md

@@ -0,0 +1 @@
+TODO

lionagi/experimental/evaluator/ast_evaluator.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.
-"""
-
 import ast
 import operator
 

lionagi/experimental/evaluator/base_evaluator.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.
-"""
-
 import ast
 import operator
-from typing import Any, Dict, Tuple, Callable
+from typing import Any, Callable, Dict, Tuple
 
 from lionagi.libs.ln_convert import to_dict
 

lionagi/experimental/knowledge/base.py

@@ -1,5 +1,5 @@
-from ..collections.abc import Component, Field
 from ..collections import Pile, pile
+from ..collections.abc import Component, Field
 from ..generic import Node