lionagi 0.5.0__py3-none-any.whl → 0.5.2__py3-none-any.whl

lionagi/protocols/operatives/instruct.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 """Field definitions and validation for InstructModel components."""
 
 from typing import Any, ClassVar
@@ -169,7 +173,7 @@ class OperationInstruct(Instruct):
         return ACTIONS_FIELD.validator(cls, v)
 
 
-INSTRUCT_MODEL_FIELD = FieldModel(
+INSTRUCT_FIELD_MODEL = FieldModel(
     name="instruct_models",
     annotation=list[Instruct],
     default_factory=list,
@@ -191,6 +195,6 @@ __all__ = [
     "REASON_FIELD",
     "ACTIONS_FIELD",
     "Instruct",
-    "INSTRUCT_MODEL_FIELD",
+    "INSTRUCT_FIELD_MODEL",
     "InstructResponse",
 ]

lionagi/protocols/operatives/operative.py

@@ -1,25 +1,13 @@
-"""
-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
 
 from typing import Self
 
 from pydantic import BaseModel, Field, PrivateAttr, model_validator
 from pydantic.fields import FieldInfo
 
-from lionagi.core.models import FieldModel, NewModelParams, OperableModel
+from lionagi.core.models import FieldModel, ModelParams, OperableModel
 from lionagi.core.typing import UNDEFINED
 from lionagi.libs.parse import to_json, validate_keys
 
@@ -29,10 +17,10 @@ class Operative(OperableModel):
 
     name: str | None = None
 
-    request_params: NewModelParams | None = Field(default=None)
+    request_params: ModelParams | None = Field(default=None)
     request_type: type[BaseModel] | None = Field(default=None)
 
-    response_params: NewModelParams | None = Field(default=None)
+    response_params: ModelParams | None = Field(default=None)
     response_type: type[BaseModel] | None = Field(default=None)
     response_model: OperableModel | None = Field(default=None)
     response_str_dict: dict | str | None = Field(default=None)
@@ -140,7 +128,7 @@ class Operative(OperableModel):
 
     def create_response_type(
         self,
-        response_params: NewModelParams | None = None,
+        response_params: ModelParams | None = None,
         field_models: list[FieldModel] | None = None,
         parameter_fields: dict[str, FieldInfo] | None = None,
         exclude_fields: list[str] | None = None,
@@ -154,7 +142,7 @@ class Operative(OperableModel):
         """Creates a new response type based on the provided parameters.
 
         Args:
-            response_params (NewModelParams, optional): Parameters for the new response model.
+            response_params (ModelParams, optional): Parameters for the new response model.
             field_models (list[FieldModel], optional): List of field models.
             parameter_fields (dict[str, FieldInfo], optional): Dictionary of parameter fields.
             exclude_fields (list, optional): List of fields to exclude.
@@ -165,7 +153,7 @@ class Operative(OperableModel):
             frozen (bool, optional): Whether the model is frozen.
             validators (dict, optional): Dictionary of validators.
         """
-        self.response_params = response_params or NewModelParams(
+        self.response_params = response_params or ModelParams(
             parameter_fields=parameter_fields,
             field_models=field_models,
             exclude_fields=exclude_fields,

lionagi/protocols/operatives/prompts.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 JsonValue
 
 function_field_description = (

lionagi/protocols/operatives/reason.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_validator
 
 from lionagi.core.models import FieldModel

lionagi/protocols/operatives/step.py

@@ -1,23 +1,11 @@
-"""
-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
 
 from pydantic import BaseModel
 from pydantic.fields import FieldInfo
 
-from lionagi.core.typing import FieldModel, NewModelParams
+from lionagi.core.typing import FieldModel, ModelParams
 from lionagi.protocols.operatives.operative import Operative
 
 from .action import (
@@ -54,7 +42,7 @@ class Step:
         operative_name: str | None = None,
         reason: bool = False,
         actions: bool = False,
-        request_params: NewModelParams | None = None,
+        request_params: ModelParams | None = None,
         parameter_fields: dict[str, FieldInfo] | None = None,
         base_type: type[BaseModel] | None = None,
         field_models: list[FieldModel] | None = None,
@@ -72,7 +60,7 @@ class Step:
             operative_name (str, optional): Name of the operative.
             reason (bool, optional): Whether to include reason field.
             actions (bool, optional): Whether to include action fields.
-            request_params (NewModelParams, optional): Parameters for the new model.
+            request_params (ModelParams, optional): Parameters for the new model.
             parameter_fields (dict[str, FieldInfo], optional): Parameter fields for the model.
             base_type (type[BaseModel], optional): Base type for the model.
             field_models (list[FieldModel], optional): List of field models.
@@ -100,7 +88,7 @@ class Step:
                     ACTION_REQUIRED_FIELD,
                 ]
             )
-        request_params = request_params or NewModelParams(
+        request_params = request_params or ModelParams(
             parameter_fields=parameter_fields,
             base_type=base_type,
             field_models=field_models,
@@ -119,7 +107,7 @@ class Step:
         *,
         operative: Operative,
         additional_data: dict | None = None,
-        response_params: NewModelParams | None = None,
+        response_params: ModelParams | None = None,
         field_models: list[FieldModel] | None = None,
         frozen_response: bool = False,
         response_config_dict: dict | None = None,
@@ -131,7 +119,7 @@ class Step:
         Args:
             operative (Operative): The operative instance to update.
             additional_data (dict | None, optional): Additional data to include in the response.
-            response_params (NewModelParams | None, optional): Parameters for the response model.
+            response_params (ModelParams | None, optional): Parameters for the response model.
             field_models (list[FieldModel] | None, optional): List of field models.
             frozen_response (bool, optional): Whether the response model is frozen.
             response_config_dict (dict | None, optional): Configuration dictionary for the response.
@@ -162,7 +150,7 @@ class Step:
     @staticmethod
     def _create_response_type(
         operative: Operative,
-        response_params: NewModelParams | None = None,
+        response_params: ModelParams | None = None,
         response_validators: dict | None = None,
         frozen_response: bool = False,
         response_config_dict: dict | None = None,
@@ -174,7 +162,7 @@ class Step:
 
         Args:
             operative (Operative): The operative instance.
-            response_params (NewModelParams | None, optional): Parameters for the response model.
+            response_params (ModelParams | None, optional): Parameters for the response model.
             response_validators (dict | None, optional): Validators for the response model.
             frozen_response (bool, optional): Whether the response model is frozen.
             response_config_dict (dict | None, optional): Configuration dictionary for the response.

lionagi/protocols/operatives/types.py

@@ -0,0 +1,19 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from .action import ActionRequestModel, ActionResponseModel
+from .instruct import Instruct
+from .operative import Operative
+from .reason import ReasonModel
+from .step import Step, StepModel
+
+__all__: list[str] = [
+    "Operative",
+    "Step",
+    "ActionRequestModel",
+    "ActionResponseModel",
+    "StepModel",
+    "Instruct",
+    "ReasonModel",
+]

lionagi/protocols/registries/__init__.py

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

lionagi/protocols/registries/_component_registry.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from lionagi.protocols.adapters.adapter import AdapterRegistry
 from lionagi.protocols.adapters.json_adapter import (
     JsonAdapter,

lionagi/protocols/registries/_pile_registry.py

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 - 2024, HaiyangLi <quantocean.li at gmail dot com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from lionagi.protocols.adapters.adapter import AdapterRegistry
 from lionagi.protocols.adapters.json_adapter import (
     JsonAdapter,

lionagi/service/__init__.py

@@ -1,3 +1,5 @@
+from lionagi.integrations.litellm_.imodel import LiteiModel
+
 from .imodel import iModel
 from .rate_limiter import RateLimiter, RateLimitError
 from .service import Service, register_service
@@ -10,4 +12,5 @@ __all__ = [
     "RateLimitError",
     "invoke_retry",
     "iModel",
+    "LiteiModel",
 ]

lionagi/service/imodel.py

@@ -9,6 +9,7 @@ from lionagi.service.service_match_util import (
 
 
 class iModel:
+
     def __init__(
         self,
         provider: str | Service,
@@ -20,25 +21,34 @@ class iModel:
         interval_requests: int = None,
         **kwargs,
     ):
-
         if api_key is not None:
             api_key = api_key
         elif api_key_schema is not None:
             api_key = api_key_schema
 
-        if api_key is None:
-            if isinstance(provider, str):
+        if task == "chat":
+            match provider:
+                case "openai":
+                    task = "create_chat_completion"
+                case "anthropic":
+                    task = "create_message"
+                case "groq":
+                    task = "create_chat_completion"
+                case "perplexity":
+                    task = "create_chat_completion"
+
+        if isinstance(provider, str):
+            if api_key is None:
                 match provider:
                     case "openai":
                         api_key = "OPENAI_API_KEY"
                     case "anthropic":
                         api_key = "ANTHROPIC_API_KEY"
-                    case "grok":
-                        api_key = "GROK_API_KEY"
+                    case "groq":
+                        api_key = "GROQ_API_KEY"
                     case "perplexity":
-                        api_key = "PERPLEXITY_API_KEY"
+                        api_key = "PERPLEXIY_API_KEY"
 
-        if isinstance(provider, str):
             self.service = match_service(provider, api_key=api_key, **kwargs)
         elif isinstance(provider, Service):
             self.service = provider
@@ -80,6 +90,7 @@ class iModel:
         self.data_model = self.service.match_data_model(self.task)
 
     def parse_to_data_model(self, **kwargs):
+
         if kwargs.get("model") and self.model:
             if kwargs.get("model") != self.model:
                 raise ValueError(
@@ -106,5 +117,9 @@ class iModel:
     def list_tasks(self):
         return self.service.list_tasks()
 
+    @property
+    def allowed_roles(self):
+        return self.service.allowed_roles
+
 
 __all__ = ["iModel"]

lionagi/service/service.py

@@ -3,6 +3,10 @@ class Service:
     def list_tasks(self):
         pass
 
+    @property
+    def allowed_roles(self):
+        return ["user", "assistant", "system"]
+
 
 def register_service(cls):
     original_init = cls.__init__

lionagi/service/service_match_util.py

@@ -19,7 +19,7 @@ def match_service(service_name: str, **kwargs):
         return key1 == key2
 
     if service_name == "openai":
-        from lionagi.integrations.services import OpenAIService
+        from lionagi.integrations._services import OpenAIService
 
         api_key = kwargs.get("api_key")
         openai_organization = kwargs.get("openai_organization")
@@ -44,7 +44,7 @@ def match_service(service_name: str, **kwargs):
         )
 
     elif service_name == "anthropic":
-        from lionagi.integrations.services import AnthropicService
+        from lionagi.integrations._services import AnthropicService
 
         api_key = kwargs.get("api_key")
         api_version = kwargs.get("api_version", "2023-06-01")
@@ -63,7 +63,7 @@ def match_service(service_name: str, **kwargs):
         )
 
     elif service_name == "perplexity":
-        from lionagi.integrations.services import PerplexityService
+        from lionagi.integrations._services import PerplexityService
 
         api_key = kwargs.get("api_key")
         api_version = kwargs.get("api_version", "2023-06-01")
@@ -77,7 +77,7 @@ def match_service(service_name: str, **kwargs):
         return PerplexityService(api_key=api_key)
 
     elif service_name == "groq":
-        from lionagi.integrations.services import GroqService
+        from lionagi.integrations._services import GroqService
 
         api_key = kwargs.get("api_key")
         for service in ServiceSetting.services.values():

lionagi/settings.py

@@ -1,19 +1,18 @@
 from datetime import timezone
 from enum import Enum
 
-from lionagi.protocols.configs import (
+from lionagi.protocols.configs.types import (
     BranchConfig,
-    LionIDConfig,
+    LogConfig,
     MessageConfig,
     RetryConfig,
     TimedFuncCallConfig,
     iModelConfig,
 )
-from lionagi.protocols.configs.log_config import LogConfig
 
 
 class BaseSystemFields(str, Enum):
-    ln_id = "ln_id"
+    LN_ID = "ln_id"
     TIMESTAMP = "timestamp"
     METADATA = "metadata"
     EXTRA_FIELDS = "extra_fields"
@@ -22,15 +21,8 @@ class BaseSystemFields(str, Enum):
     EMBEDDING = "embedding"
 
 
-DEFAULT_ID_CONFIG = LionIDConfig(
-    n=36,
-    random_hyphen=True,
-    num_hyphens=4,
-    hyphen_start_index=6,
-    hyphen_end_index=-6,
-    prefix="ao",
-    postfix="",
-)
+UUID_VERSION = 4
+
 
 DEFAULT_TIMED_FUNC_CALL_CONFIG = TimedFuncCallConfig(
     initial_delay=0,
@@ -61,7 +53,7 @@ DEFAULT_CHAT_CONFIG = iModelConfig(
 )
 
 
-DEFAULT_RETRY_iMODEL_CONFIG = iModelConfig(
+DEFAULT_PARSE_CONFIG = iModelConfig(
     provider="openai",
     task="chat",
     model="gpt-4o-mini",
@@ -109,7 +101,7 @@ DEFAULT_BRANCH_CONFIG = BranchConfig(
     auto_register_tools=True,
     action_call_config=DEFAULT_TIMED_FUNC_CALL_CONFIG,
     imodel_config=DEFAULT_CHAT_CONFIG,
-    retry_imodel_config=DEFAULT_RETRY_iMODEL_CONFIG,
+    retry_imodel_config=DEFAULT_PARSE_CONFIG,
 )
 
 
@@ -120,7 +112,7 @@ BASE_LION_FIELDS = set(BaseSystemFields.__members__.values())
 class Settings:
 
     class Config:
-        ID: LionIDConfig = DEFAULT_ID_CONFIG
+        UUID_VERSION: int = UUID_VERSION
         RETRY: RetryConfig = DEFAULT_RETRY_CONFIG
         TIMED_CALL: TimedFuncCallConfig = DEFAULT_TIMED_FUNC_CALL_CONFIG
         TIMEZONE: timezone = DEFAULT_TIMEZONE
@@ -129,8 +121,8 @@ class Settings:
         BRANCH: BranchConfig = DEFAULT_BRANCH_CONFIG
 
     class iModel:
-        CHAT: dict = {"model": "openai/gpt-4o"}
-        PARSE: iModelConfig = DEFAULT_CHAT_CONFIG
+        CHAT: iModelConfig = DEFAULT_CHAT_CONFIG
+        PARSE: iModelConfig = DEFAULT_PARSE_CONFIG
 
 
 # File: autoos/setting.py

lionagi/strategies/base.py

@@ -1,15 +1,14 @@
 from typing import ClassVar
 
-from pydantic import model_validator
+from pydantic import BaseModel, model_validator
 
-from lionagi.fields.instruct import Instruct, InstructResponse
+from lionagi.core.session.types import Branch, Session
+from lionagi.protocols.operatives.instruct import Instruct, InstructResponse
 
-from ..protocols.types import BaseLionModel
-from ..session.types import Branch, Session
 from .params import StrategyParams
 
 
-class StrategyExecutor(BaseLionModel):
+class StrategyExecutor(BaseModel):
     """Base class for different execution strategies.
 
     Each concrete executor should implement `execute()` to run instructions

lionagi/strategies/concurrent.py

@@ -1,6 +1,7 @@
-from lionagi.fields.instruct import Instruct, InstructResponse
-from lionagi.session.types import Branch
-from lionagi.utils import alcall, to_list
+from lionagi.core.session.types import Branch
+from lionagi.libs.func.types import alcall
+from lionagi.libs.parse.types import to_list
+from lionagi.protocols.operatives.instruct import Instruct, InstructResponse
 
 from .base import StrategyExecutor
 

lionagi/strategies/concurrent_chunk.py

@@ -1,9 +1,9 @@
 from typing import ClassVar
 
-from lionagi.fields.instruct import Instruct, InstructResponse
-from lionagi.utils import to_list
+from lionagi.libs.func.types import bcall
+from lionagi.libs.parse.types import to_list
+from lionagi.protocols.operatives.instruct import Instruct, InstructResponse
 
-from ..libs.async_utils import bcall
 from .concurrent import ConcurrentExecutor
 from .params import ChunkStrategyParams
 

lionagi/strategies/concurrent_sequential_chunk.py

@@ -1,8 +1,8 @@
 from pydantic import model_validator
 
-from lionagi.fields.instruct import Instruct, InstructResponse
-from lionagi.session.types import Branch, Session
-from lionagi.utils import alcall
+from lionagi.core.session.types import Branch, Session
+from lionagi.libs.func.types import alcall
+from lionagi.protocols.operatives.instruct import Instruct, InstructResponse
 
 from .base import StrategyExecutor
 from .params import HybridStrategyParams

lionagi/strategies/params.py

@@ -2,10 +2,13 @@ from typing import Any, Literal
 
 from pydantic import Field, field_validator, model_validator
 
-from lionagi.fields.instruct import INSTRUCT_FIELD_MODEL, Instruct
-from lionagi.libs.async_utils import RCallParams
-from lionagi.protocols.types import FieldModel, SchemaModel
-from lionagi.session.types import Branch, Session
+from lionagi.core.models.types import FieldModel, SchemaModel
+from lionagi.core.session.types import Branch, Session
+from lionagi.libs.func.types import RCallParams
+from lionagi.protocols.operatives.instruct import (
+    INSTRUCT_FIELD_MODEL,
+    Instruct,
+)
 
 
 class StrategyParams(SchemaModel):

lionagi/version.py

@@ -1 +1 @@
-__version__ = "0.5.0"
+__version__ = "0.5.2"