lionagi 0.0.107__tar.gz → 0.0.111__tar.gz

{lionagi-0.0.107 → lionagi-0.0.111}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lionagi
-Version: 0.0.107
+Version: 0.0.111
 Summary: Towards automated general intelligence.
 Author: HaiyangLi
 Author-email: Haiyang Li <ocean@lionagi.ai>

{lionagi-0.0.107 → lionagi-0.0.111}/lionagi/api/__init__.py

@@ -1,7 +1,8 @@
-from .oai_service import OpenAIService
+from .oai_service import OpenAIService, OpenAIRateLimiter
 from .oai_config import oai_llmconfig
 
 __all__ = [
     "oai_llmconfig",
+    "OpenAIRateLimiter",
     "OpenAIService",
 ]

{lionagi-0.0.107 → lionagi-0.0.111}/lionagi/api/oai_service.py

@@ -31,7 +31,9 @@ class OpenAIRateLimiter(RateLimiter):
             Calculates the required tokens for a request.
     """
 
-    def __init__(self, max_requests_per_minute: int, max_tokens_per_minute: int) -> None:
+    def __init__(
+        self, max_requests_per_minute: int, max_tokens_per_minute: int
+    ) -> None:
         """
         Initializes the rate limiter with specific limits for OpenAI API.
 
@@ -41,9 +43,18 @@ class OpenAIRateLimiter(RateLimiter):
             max_tokens_per_minute (int): The maximum number of tokens that can accumulate per minute.
         """
         super().__init__(max_requests_per_minute, max_tokens_per_minute)
-        if not os.getenv('env_readthedocs'):
-            self.rate_limit_replenisher_task = asyncio.create_task(self.rate_limit_replenisher())
-    
+
+    @classmethod
+    async def create(
+        cls, max_requests_per_minute: int, max_tokens_per_minute: int
+    ) -> None:
+        self = cls(max_requests_per_minute, max_tokens_per_minute)
+        if not os.getenv("env_readthedocs"):
+            self.rate_limit_replenisher_task = await asyncio.create_task(
+                self.rate_limit_replenisher()
+            )
+        return self
+
     async def rate_limit_replenisher(self) -> NoReturn:
         """
         Asynchronously replenishes the rate limit capacities at regular intervals.
@@ -61,9 +72,13 @@ class OpenAIRateLimiter(RateLimiter):
             await asyncio.sleep(60)  # Replenishes every 60 seconds
             self.available_request_capacity = self.max_requests_per_minute
             self.available_token_capacity = self.max_tokens_per_minute
-            
-    def calculate_num_token(self, payload: Dict[str, Any] =None, 
-                            api_endpoint: str =None, token_encoding_name: str =None) -> int:
+
+    def calculate_num_token(
+        self,
+        payload: Dict[str, Any] = None,
+        api_endpoint: str = None,
+        token_encoding_name: str = None,
+    ) -> int:
         """
         Calculates the number of tokens required for a request based on the payload and API endpoint.
 
@@ -76,6 +91,8 @@ class OpenAIRateLimiter(RateLimiter):
 
             api_endpoint (str): The specific API endpoint for the request.
 
+            token_encoding_name (str): The name of the token encoding method.
+
         Returns:
             int: The estimated number of tokens required for the request.
 
@@ -100,7 +117,9 @@ class OpenAIRateLimiter(RateLimiter):
                     for key, value in message.items():
                         num_tokens += len(encoding.encode(value))
                         if key == "name":  # if there's a name, the role is omitted
-                            num_tokens -= 1  # role is always required and always 1 token
+                            num_tokens -= (
+                                1  # role is always required and always 1 token
+                            )
                 num_tokens += 2  # every reply is primed with <im_start>assistant
                 return num_tokens + completion_tokens
             # normal completions
@@ -134,7 +153,7 @@ class OpenAIRateLimiter(RateLimiter):
             raise NotImplementedError(
                 f'API endpoint "{api_endpoint}" not implemented in this script'
             )
-            
+
 
 class OpenAIService(BaseAPIService):
     """
@@ -159,9 +178,9 @@ class OpenAIService(BaseAPIService):
         max_attempts: int = 3,
         max_requests_per_minute: int = 500,
         max_tokens_per_minute: int = 150_000,
-        ratelimiter = OpenAIRateLimiter,
+        ratelimiter=OpenAIRateLimiter,
         status_tracker: Optional[StatusTracker] = None,
-        queue: Optional[AsyncQueue] = None
+        queue: Optional[AsyncQueue] = None,
     ):
         """
         Initializes the OpenAI service with configuration for API interaction.
@@ -191,11 +210,20 @@ class OpenAIService(BaseAPIService):
             # Service is configured for interacting with OpenAI API.
         """
         api_key = api_key or os.getenv("OPENAI_API_KEY")
-        super().__init__(api_key, token_encoding_name, max_attempts, 
-                         max_requests_per_minute, max_tokens_per_minute,
-                         ratelimiter, status_tracker, queue)
-
-    async def call_api(self, http_session, endpoint, payload: Dict[str, any] = None) -> Optional[Dict[str, any]]:
+        super().__init__(
+            api_key,
+            token_encoding_name,
+            max_attempts,
+            max_requests_per_minute,
+            max_tokens_per_minute,
+            ratelimiter,
+            status_tracker,
+            queue,
+        )
+
+    async def call_api(
+        self, http_session, endpoint, payload: Dict[str, any] = None
+    ) -> Optional[Dict[str, any]]:
         """
         Call an OpenAI API endpoint with a specific payload and handle the response.
 
@@ -221,15 +249,20 @@ class OpenAIService(BaseAPIService):
             ... )
             # Calls the specified API endpoint with the given payload.
         """
-        endpoint = self.api_endpoint_from_url(self.base_url+endpoint)
-        
+        endpoint = self.api_endpoint_from_url(self.base_url + endpoint)
+
         while True:
-            if self.rate_limiter.available_request_capacity < 1 or self.rate_limiter.available_token_capacity < 10:  # Minimum token count
+            if (
+                self.rate_limiter.available_request_capacity < 1
+                or self.rate_limiter.available_token_capacity < 10
+            ):  # Minimum token count
                 await asyncio.sleep(1)  # Wait for capacity
                 continue
-            
-            required_tokens = self.rate_limiter.calculate_num_token(payload, endpoint, self.token_encoding_name)
-            
+
+            required_tokens = self.rate_limiter.calculate_num_token(
+                payload, endpoint, self.token_encoding_name
+            )
+
             if self.rate_limiter.available_token_capacity >= required_tokens:
                 self.rate_limiter.available_request_capacity -= 1
                 self.rate_limiter.available_token_capacity -= required_tokens
@@ -240,7 +273,9 @@ class OpenAIService(BaseAPIService):
                 while attempts_left > 0:
                     try:
                         async with http_session.post(
-                            url=(self.base_url+endpoint), headers=request_headers, json=payload
+                            url=(self.base_url + endpoint),
+                            headers=request_headers,
+                            json=payload,
                         ) as response:
                             response_json = await response.json()
 
@@ -250,7 +285,9 @@ class OpenAIService(BaseAPIService):
                                 )
                                 attempts_left -= 1
 
-                                if "Rate limit" in response_json["error"].get("message", ""):
+                                if "Rate limit" in response_json["error"].get(
+                                    "message", ""
+                                ):
                                     await asyncio.sleep(15)
                             else:
                                 return response_json

lionagi-0.0.111/lionagi/session/__init__.py

@@ -0,0 +1,7 @@
+from .message import Message
+from .conversation import Conversation
+from .session import Session
+
+__all__ = [
+    "Session", "Message", "Conversation"
+]

{lionagi-0.0.107 → lionagi-0.0.111}/lionagi/session/session.py

@@ -1,9 +1,10 @@
+import os
 import aiohttp
 import asyncio
 import json
 from typing import Any
 
-import lionagi
+
 from .conversation import Conversation
 from ..utils.sys_util import to_list, l_call, al_call
 from ..utils.log_util import DataLogger
@@ -13,7 +14,7 @@ from ..api.oai_service import OpenAIService
 from ..api.oai_config import oai_llmconfig
 
 status_tracker = StatusTracker()
-OAIService = OpenAIService()
+OAIService = OpenAIService(api_key=os.getenv('OPENAI_API_KEY'))
 
 
 class Session():
@@ -52,6 +53,9 @@ class Session():
         _output(output, invoke=True, out=True) -> Any:
             Process the output, invoke tools if needed, and optionally return the output.
 
+        _is_invoked():
+            Checks if the current message indicates the invocation of a function call.
+
         register_tools(tools, funcs, update=False, new=False, prefix=None, postfix=None):
             Register tools and their corresponding functions.
 
@@ -64,10 +68,10 @@ class Session():
         auto_followup(self, instruct, num=3, tool_parser=None, **kwags):
             Automates the follow-up process for a specified number of times or until the session concludes.
 
-        create_payload_chatcompletion(**kwargs) -> dict:
+        _create_payload_chatcompletion(**kwargs) -> dict:
             Create a payload for chat completion based on the conversation state and configuration.
 
-        call_chatcompletion(sleep=0.1, **kwargs) -> None:
+        _call_chatcompletion(sleep=0.1, **kwargs) -> None:
             Make a call to the chat completion API and process the response.
 
         messages_to_csv(dir=None, filename="_messages.csv", **kwargs) -> None:

lionagi-0.0.111/lionagi/utils/__init__.py

@@ -0,0 +1,11 @@
+from .sys_util import to_flat_dict, to_list, str_to_num, make_copy, to_temp, to_csv, hold_call, ahold_call, l_call, al_call, m_call, am_call, e_call, ae_call, get_timestamp, create_path, append_to_jsonl
+from .doc_util import dir_to_path, read_text, dir_to_files, file_to_chunks, get_bins
+from .log_util import DataLogger
+from .tool_util import ToolManager
+from .api_util import StatusTracker, AsyncQueue, RateLimiter, BaseAPIService
+
+__all__ = [
+    "to_flat_dict", "to_list", "str_to_num", "make_copy", "to_temp", "to_csv", "hold_call", "ahold_call", 
+    "l_call", "al_call", "m_call", "am_call", "e_call", "ae_call", "get_timestamp", "create_path", "append_to_jsonl",
+    "dir_to_path", "read_text", "dir_to_files", "file_to_chunks", "get_bins", "DataLogger", "ToolManager", "StatusTracker", "AsyncQueue", "RateLimiter", "BaseAPIService"
+]

{lionagi-0.0.107 → lionagi-0.0.111}/lionagi/utils/api_util.py

@@ -288,18 +288,18 @@ class BaseAPIService(ABC):
             The maximum number of retry attempts for API calls.
         status_tracker (StatusTracker):
             Tracker for API call statuses.
-        rate_limiter (RateLimiter):
-            Limiter to control the rate of API calls.
         queue (AsyncQueue):
             Queue for managing API call tasks.
+        rate_limiter (RateLimiter):
+            Limiter to control the rate of API calls.
+        append_to_jsonl (callable):
+            Callable for appending data to a file in JSONL format.
 
     Methods:
         call_api:
             Abstract method to define API call mechanism in subclasses.
         handle_error:
             Handle errors by logging and saving details to a JSONL file.
-        append_to_jsonl:
-            Append data to a file in JSONL format.
         api_endpoint_from_url:
             Extract the API endpoint from a URL.
         task_id_generator_function:

lionagi-0.0.111/lionagi/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.111"

{lionagi-0.0.107 → lionagi-0.0.111}/lionagi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lionagi
-Version: 0.0.107
+Version: 0.0.111
 Summary: Towards automated general intelligence.
 Author: HaiyangLi
 Author-email: Haiyang Li <ocean@lionagi.ai>

lionagi-0.0.107/lionagi/session/__init__.py

@@ -1,5 +0,0 @@
-from .session import Session
-
-__all__ = [
-    "Session",
-]

lionagi-0.0.107/lionagi/utils/__init__.py

@@ -1,7 +0,0 @@
-from .sys_util import to_flat_dict, to_list, str_to_num, make_copy, to_temp, to_csv, hold_call, ahold_call, l_call, al_call, m_call, am_call, e_call, ae_call, get_timestamp, create_path
-from .doc_util import dir_to_path, read_text, dir_to_files, file_to_chunks, get_bins
-
-__all__ = [
-    "to_list", "str_to_num", "make_copy", "to_temp", "to_csv", "hold_call", "ahold_call", "l_call", "al_call", "m_call", "am_call", "e_call", "ae_call", "get_timestamp", "create_path", "to_flat_dict",
-    "dir_to_path", "read_text", "dir_to_files", "file_to_chunks", "get_bins"
-]

lionagi-0.0.107/lionagi/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.107"