lionagi 0.1.2__py3-none-any.whl → 0.2.1__py3-none-any.whl

lionagi/libs/special_tokens.py

@@ -0,0 +1,172 @@
+# disallowed special tokens
+
+disallowed_tokens = [
+    "▄",
+    "▅",
+    "▆",
+    "▇",
+    "█",
+    "▏",
+    "▎",
+    "▍",
+    "▌",
+    "▋",
+    "▊",
+    "▉",
+    "▔",
+    "▕",
+    "▁▁",
+    "▁▂",
+    "▁▃",
+    "▁▄",
+    "▁▅",
+    "▁▆",
+    "▁▇",
+    "▁█",
+    "▁▏",
+    "▁▎",
+    "▁▍",
+    "▁▌",
+    "▁▋",
+    "▁▊",
+    "▁▉",
+    "▁▔",
+    "▁▕",
+    "▄▄",
+    "▄▅",
+    "▄▆",
+    "▄▇",
+    "▄█",
+    "▄▏",
+    "▄▎",
+    "▄▍",
+    "▄▌",
+    "▄▋",
+    "▄▊",
+    "▄▉",
+    "▄▔",
+    "▄▕",
+    "▅▅",
+    "▅▆",
+    "▅▇",
+    "▅█",
+    "▅▏",
+    "▅▎",
+    "▅▍",
+    "▅▌",
+    "▅▋",
+    "▅▊",
+    "▅▉",
+    "▅▔",
+    "▅▕",
+    "▆▆",
+    "▆▇",
+    "▆█",
+    "▆▏",
+    "▆▎",
+    "▆▍",
+    "▆▌",
+    "▆▋",
+    "▆▊",
+    "▆▉",
+    "▆▔",
+    "▆▕",
+    "▇▇",
+    "▇█",
+    "▇▏",
+    "▇▎",
+    "▇▍",
+    "▇▌",
+    "▇▋",
+    "▇▊",
+    "▇▉",
+    "▇▔",
+    "▇▕",
+    "██",
+    "█▏",
+    "█▎",
+    "█▍",
+    "█▌",
+    "█▋",
+    "█▊",
+    "█▉",
+    "█",
+    "█▔",
+    "█▕",
+    "▏▏",
+    "▏▎",
+    "▏▍",
+    "▏▌",
+    "▏▋",
+    "▏▊",
+    "▏▉",
+    "▏",
+    "▏▔",
+    "▏▕",
+    "▎▎",
+    "▎▍",
+    "▎▌",
+    "▎▋",
+    "▎▊",
+    "▎▉",
+    "▎",
+    "▎▔",
+    "▎▕",
+    "▍▍",
+    "▍▌",
+    "▍▋",
+    "▍▊",
+    "▍▉",
+    "▍",
+    "▍▔",
+    "▍▕",
+    "▌▌",
+    "▌▋",
+    "▌▊",
+    "▌▉",
+    "▌",
+    "▌▔",
+    "▌▕",
+    "▋▋",
+    "▋▊",
+    "▋▉",
+    "▋",
+    "▋▔",
+    "▋▕",
+    "▊▊",
+    "▊▉",
+    "▊",
+    "▊▔",
+    "▊▕",
+    "▉▉",
+    "▉",
+    "▉▔",
+    "▉▕",
+    "▔▔",
+    "▔▕",
+    "▕▕",
+    "▁▁▁",
+    "▁▁▂",
+    "▁▁▃",
+    "▁▁▄",
+    "▁▁▅",
+    "▁▁▆",
+    "▁▁▇",
+    "▁▁█",
+    "▁▁▏",
+    "▁▁▎",
+    "▁▁▍",
+    "▁▁▌",
+    "▁▁▋",
+    "▁▁▊",
+    "▁▁▉",
+    "▁▁▔",
+    "▁▁▕",
+    "▁▂▂",
+    "▁▂▃",
+    "▁▂▄",
+    "▁▂▅",
+    "▁▂▆",
+    "▁▂▇",
+    "▁▂█",
+]

lionagi/libs/sys_util.py

@@ -1,28 +1,17 @@
 """
-MIT License
-
-Copyright (c) 2023 HaiyangLi quantocean.li@gmail.com
-
-Permission is hereby granted, free of charge, to any person 
-obtaining a copy of this software and associated documentation 
-files (the "Software"), to deal in the Software without 
-restriction, including without limitation the rights to use, 
-copy, modify, merge, publish, distribute, sublicense, and/or 
-sell copies of the Software, and to permit persons to whom 
-the Software is furnished to do so, subject to the following 
-conditions:
-
-The above copyright notice and this permission notice shall be 
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.
+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 copy
@@ -430,6 +419,19 @@ class SysUtil:
 
     @staticmethod
     def list_files(dir_path: Path | str, extension: str = None) -> list[Path]:
+        """
+        Lists all files in a specified directory with an optional filter for file extensions.
+
+        Args:
+            dir_path (Path | str): The directory path where files are listed.
+            extension (str, optional): Filter files by extension. Default is None, which lists all files.
+
+        Returns:
+            list[Path]: A list of Path objects representing files in the directory.
+
+        Raises:
+            NotADirectoryError: If the provided dir_path is not a directory.
+        """
         dir_path = Path(dir_path)
         if not dir_path.is_dir():
             raise NotADirectoryError(f"{dir_path} is not a directory.")
@@ -440,6 +442,16 @@ class SysUtil:
 
     @staticmethod
     def copy_file(src: Path | str, dest: Path | str) -> None:
+        """
+        Copies a file from a source path to a destination path.
+
+        Args:
+            src (Path | str): The source file path.
+            dest (Path | str): The destination file path.
+
+        Raises:
+            FileNotFoundError: If the source file does not exist or is not a file.
+        """
         from shutil import copy2
 
         src, dest = Path(src), Path(dest)
@@ -450,6 +462,18 @@ class SysUtil:
 
     @staticmethod
     def get_size(path: Path | str) -> int:
+        """
+        Gets the size of a file or total size of files in a directory.
+
+        Args:
+            path (Path | str): The file or directory path.
+
+        Returns:
+            int: The size in bytes.
+
+        Raises:
+            FileNotFoundError: If the path does not exist.
+        """
         path = Path(path)
         if path.is_file():
             return path.stat().st_size
@@ -457,3 +481,50 @@ class SysUtil:
             return sum(f.stat().st_size for f in path.glob("**/*") if f.is_file())
         else:
             raise FileNotFoundError(f"{path} does not exist.")
+
+    @staticmethod
+    def save_to_file(
+        text,
+        directory: Path | str,
+        filename: str,
+        timestamp: bool = True,
+        dir_exist_ok: bool = True,
+        time_prefix: bool = False,
+        custom_timestamp_format: str | None = None,
+        random_hash_digits=0,
+        verbose=True,
+    ):
+        """
+        Saves text to a file within a specified directory, optionally adding a timestamp, hash, and verbose logging.
+
+        Args:
+            text (str): The text to save.
+            directory (Path | str): The directory path to save the file.
+            filename (str): The filename for the saved text.
+            timestamp (bool): If True, append a timestamp to the filename. Default is True.
+            dir_exist_ok (bool): If True, creates the directory if it does not exist. Default is True.
+            time_prefix (bool): If True, prepend the timestamp instead of appending. Default is False.
+            custom_timestamp_format (str | None): A custom format for the timestamp, if None uses default format. Default is None.
+            random_hash_digits (int): Number of random hash digits to append to filename. Default is 0.
+            verbose (bool): If True, prints the file path after saving. Default is True.
+
+        Returns:
+            bool: True if the text was successfully saved.
+        """
+        file_path = SysUtil.create_path(
+            directory=directory,
+            filename=filename,
+            timestamp=timestamp,
+            dir_exist_ok=dir_exist_ok,
+            time_prefix=time_prefix,
+            custom_timestamp_format=custom_timestamp_format,
+            random_hash_digits=random_hash_digits,
+        )
+
+        with open(file_path, "w") as file:
+            file.write(text)
+
+        if verbose:
+            print(f"Text saved to: {file_path}")
+
+        return True

lionagi/lions/coder/code_form.py

@@ -0,0 +1,13 @@
+from typing import Any
+from pydantic import Field
+from lionagi.libs import ParseUtil, SysUtil
+from lionagi.core import Session
+from lionagi.core.form.action_form import ActionForm
+
+
+class CodeForm(ActionForm):
+    template_name: str = "code_form"
+    language: str = Field(
+        default="python",
+        description="The programming language of the code to be executed.",
+    )

lionagi/lions/coder/coder.py

@@ -1,18 +1,49 @@
 import asyncio
+from pathlib import Path
+
+from lionagi import logging as _logging
 from lionagi.core import Session
+from lionagi.libs import ParseUtil
 
 from .base_prompts import CODER_PROMPTS
-from .util import extract_code_blocks, install_missing_dependencies, set_up_interpreter
+from .util import install_missing_dependencies, set_up_interpreter, save_code_file
 
 
 class Coder:
+
     def __init__(
-        self, prompts=None, session=None, session_kwargs=None, required_libraries=None
+        self,
+        prompts: dict = None,
+        session: Session = None,
+        session_kwargs: dict = None,
+        required_libraries: list = None,
+        work_dir: Path | str = None,
+    ) -> None:
+
+        self.prompts = prompts or CODER_PROMPTS
+        self.session = session or self._create_session(session_kwargs)
+        self.required_libraries = required_libraries or ["lionagi"]
+        self.work_dir = work_dir or Path.cwd() / "coder" / "code_files"
+
+    def _create_session(self, session_kwargs: dict = None) -> Session:
+        session_kwargs = session_kwargs or {}
+        return Session(system=self.prompts["system"], **session_kwargs)
+
+
+class Coder:
+    def __init__(
+        self,
+        prompts=None,
+        session=None,
+        session_kwargs=None,
+        required_libraries=None,
+        work_dir=None,
     ):
         print("Initializing Coder...")
         self.prompts = prompts or CODER_PROMPTS
         self.session = session or self._create_session(session_kwargs)
         self.required_libraries = required_libraries or ["lionagi"]
+        self.work_dir = work_dir or Path.cwd() / "coder" / "code_files"
         print("Coder initialized.")
 
     def _create_session(self, session_kwargs=None):
@@ -32,7 +63,7 @@ class Coder:
         print("Writing code...")
         code = await self.session.chat(self.prompts["write_code"], context=context)
         print("Code writing completed.")
-        return extract_code_blocks(code)
+        return ParseUtil.extract_code_blocks(code)
 
     async def _review_code(self, context=None):
         print("Reviewing code...")
@@ -78,6 +109,22 @@ class Coder:
             print("Code execution completed.")
             return execution
 
+    def _save_code_file(self, code, **kwargs):
+        print("Saving code...")
+        save_code_file(code, self.work_dir, **kwargs)
+        print("Code saved.")
+
+    @staticmethod
+    def _load_code_file(file_path):
+        print("Loading code...")
+        try:
+            with open(file_path, "r") as file:
+                print("Code loaded.")
+                return file.read()
+        except FileNotFoundError:
+            _logging.error(f"File not found: {file_path}")
+            return None
+
 
 async def main():
     print("Starting main function...")

lionagi/lions/coder/util.py

@@ -1,3 +1,6 @@
+from typing import Any
+from pathlib import Path
+
 E2B_key_scheme = "E2B_API_KEY"
 
 
@@ -21,31 +24,6 @@ def set_up_interpreter(interpreter_provider="e2b", key_scheme=E2B_key_scheme):
         raise ValueError("Invalid interpreter provider")
 
 
-def extract_code_blocks(code):
-    print("Extracting code blocks...")
-    code_blocks = []
-    lines = code.split("\n")
-    inside_code_block = False
-    current_block = []
-
-    for line in lines:
-        if line.startswith("```"):
-            if inside_code_block:
-                code_blocks.append("\n".join(current_block))
-                current_block = []
-                inside_code_block = False
-            else:
-                inside_code_block = True
-        elif inside_code_block:
-            current_block.append(line)
-
-    if current_block:
-        code_blocks.append("\n".join(current_block))
-
-    print(f"Extracted {len(code_blocks)} code block(s).")
-    return "\n\n".join(code_blocks)
-
-
 def install_missing_dependencies(required_libraries):
     print("Checking for missing dependencies...")
     missing_libraries = [
@@ -89,3 +67,30 @@ def install_library(library):
         print(
             "You may need to run the script with administrative privileges or use a virtual environment."
         )
+
+
+def save_code_file(
+    code: Any,
+    directory: Path | str = None,
+    filename: str = "code.py",
+    timestamp: bool = True,
+    dir_exist_ok: bool = True,
+    time_prefix: bool = False,
+    custom_timestamp_format: str | None = None,
+    random_hash_digits: int = 3,
+    verbose: bool = True,
+):
+
+    from lionagi.libs import SysUtil
+
+    return SysUtil.save_to_file(
+        text=code,
+        directory=directory,
+        filename=filename,
+        timestamp=timestamp,
+        dir_exist_ok=dir_exist_ok,
+        time_prefix=time_prefix,
+        custom_timestamp_format=custom_timestamp_format,
+        random_hash_digits=random_hash_digits,
+        verbose=verbose,
+    )

lionagi/tests/libs/test_func_call.py

@@ -296,8 +296,8 @@ class TestRCall(unittest.IsolatedAsyncioTestCase):
             await asyncio.sleep(2)
             return x
 
-        with self.assertRaises(asyncio.TimeoutError):
-            await rcall(async_func, 5, timeout=1)
+        with self.assertRaises(RuntimeError):
+            await rcall(async_func, 5, timeout=0.1)
 
     async def test_retry_mechanism(self):
         attempt_count = 0
@@ -307,22 +307,22 @@ class TestRCall(unittest.IsolatedAsyncioTestCase):
             attempt_count += 1
             raise ValueError("Test Error")
 
-        with self.assertRaises(ValueError):
-            await rcall(sync_func, 5, retries=3)
+        with self.assertRaises(RuntimeError):
+            await rcall(sync_func, 5, retries=3, delay=0.1, backoff_factor=1.1)
         self.assertEqual(attempt_count, 3)  # Initial call + 3 retries
 
     async def test_default_value_on_exception(self):
         def sync_func(x):
             raise ValueError("Test Error")
 
-        result = await rcall(sync_func, 5, default=10)
+        result = await rcall(sync_func, 5, default=10, delay=0)
         self.assertEqual(result, 10)
 
     async def test_exception_propagation(self):
         def sync_func(x):
             raise ValueError("Test Error")
 
-        with self.assertRaises(ValueError):
+        with self.assertRaises(RuntimeError):
             await rcall(sync_func, 5)
 
 
@@ -581,22 +581,22 @@ class TestCallDecorator(unittest.IsolatedAsyncioTestCase):
 class TestThrottleClass(unittest.TestCase):
 
     def test_throttling_behavior_sync(self):
-        throttle_decorator = Throttle(2)  # 2 seconds throttle period
+        throttle_decorator = Throttle(0.1)  # 2 seconds throttle period
 
         @throttle_decorator
         def test_func():
             return time.time()
 
         first_call_time = test_func()
-        time.sleep(1)  # Sleep less than the throttle period
+        time.sleep(0.1)  # Sleep less than the throttle period
         second_call_time = test_func()
 
         self.assertGreaterEqual(
-            second_call_time - first_call_time, 2
+            second_call_time - first_call_time, 0.1
         )  # Second call should be throttled
 
     def test_throttling_behavior_async(self):
-        throttle_decorator = Throttle(2)  # 2 seconds throttle period
+        throttle_decorator = Throttle(1)  # 2 seconds throttle period
 
         @throttle_decorator
         async def test_func():
@@ -604,28 +604,28 @@ class TestThrottleClass(unittest.TestCase):
 
         async def async_test():
             first_call_time = await test_func()
-            await asyncio.sleep(1)  # Sleep less than the throttle period
+            await asyncio.sleep(0.1)  # Sleep less than the throttle period
             second_call_time = await test_func()
 
             self.assertGreaterEqual(
-                second_call_time - first_call_time, 2
+                second_call_time - first_call_time, 1
             )  # Second call should be throttled
 
         asyncio.run(async_test())
 
     def test_successive_calls_with_sufficient_delay(self):
-        throttle_decorator = Throttle(1)  # 1 second throttle period
+        throttle_decorator = Throttle(0.1)  # 1 second throttle period
 
         @throttle_decorator
         def test_func():
             return time.time()
 
         first_call_time = test_func()
-        time.sleep(1.1)  # Sleep more than the throttle period
+        time.sleep(0.12)  # Sleep more than the throttle period
         second_call_time = test_func()
 
         self.assertLess(
-            second_call_time - first_call_time, 1.5
+            second_call_time - first_call_time, 0.2
         )  # Second call should not be throttled
 
 
@@ -633,7 +633,7 @@ class TestAsyncRetryDecorator(unittest.IsolatedAsyncioTestCase):
     async def test_successful_retry(self):
         attempt = 0
 
-        @CallDecorator.retry(retries=3, delay=1, backoff_factor=2)
+        @CallDecorator.retry(retries=3, delay=0.1, backoff_factor=2)
         async def test_func():
             nonlocal attempt
             attempt += 1
@@ -648,20 +648,22 @@ class TestAsyncRetryDecorator(unittest.IsolatedAsyncioTestCase):
     async def test_retry_limit(self):
         attempt = 0
 
-        @CallDecorator.retry(retries=2, delay=1, backoff_factor=2)
+        @CallDecorator.retry(retries=2, delay=0.1, backoff_factor=2)
         async def test_func():
             nonlocal attempt
             attempt += 1
             raise ValueError("Test failure")
 
-        with self.assertRaises(ValueError):
+        try:
             await test_func()
+        except:
+            pass
         self.assertEqual(attempt, 2)
 
     async def test_immediate_success(self):
         attempt = 0
 
-        @CallDecorator.retry(retries=3, delay=1, backoff_factor=2)
+        @CallDecorator.retry(retries=3, delay=0.1, backoff_factor=2)
         async def test_func():
             nonlocal attempt
             attempt += 1
@@ -675,7 +677,7 @@ class TestAsyncRetryDecorator(unittest.IsolatedAsyncioTestCase):
         attempt = 0
         start_time = time.time()
 
-        @CallDecorator.retry(retries=3, delay=1, backoff_factor=2)
+        @CallDecorator.retry(retries=3, delay=0.1, backoff_factor=2)
         async def test_func():
             nonlocal attempt
             attempt += 1
@@ -690,7 +692,7 @@ class TestAsyncRetryDecorator(unittest.IsolatedAsyncioTestCase):
         self.assertEqual(result, "Success")
         # Note: The actual delay might be slightly longer than expected due to asyncio's event loop scheduling.
         self.assertTrue(
-            elapsed_time >= 3, f"Elapsed time was {elapsed_time}, expected >= 3"
+            elapsed_time >= 0.3, f"Elapsed time was {elapsed_time}, expected >= 3"
         )
         self.assertEqual(attempt, 3)