lionagi 0.17.8__py3-none-any.whl → 0.17.9__py3-none-any.whl

lionagi/_types.py

@@ -1,3 +1,5 @@
+"""lionagi type definitions."""
+
 # Lazy loading for heavy type imports to improve startup performance
 _lazy_type_imports = {}
 

lionagi/protocols/action/manager.py

@@ -296,19 +296,22 @@ class ActionManager(Manager):
         if isinstance(server_config, dict) and "server" in server_config:
             server_name = server_config["server"]
 
+        if request_options:
+            for k in list(request_options.keys()):
+                if not k.startswith(f"{server_name}_"):
+                    request_options[f"{server_name}_{k}"] = (
+                        request_options.pop(k)
+                    )
+
         if tool_names:
             # Register specific tools with qualified names
             for tool_name in tool_names:
                 # Use qualified name to avoid collisions
-                qualified_name = (
-                    f"{server_name}_{tool_name}" if server_name else tool_name
-                )
-
                 # Store original tool name in config for MCP calls
                 config_with_metadata = dict(server_config)
                 config_with_metadata["_original_tool_name"] = tool_name
 
-                mcp_config = {qualified_name: config_with_metadata}
+                mcp_config = {tool_name: config_with_metadata}
 
                 # Get request_options for this tool if provided
                 tool_request_options = None
@@ -320,7 +323,7 @@ class ActionManager(Manager):
                     mcp_config=mcp_config, request_options=tool_request_options
                 )
                 self.register_tool(tool, update=update)
-                registered_tools.append(qualified_name)
+                registered_tools.append(tool_name)
         else:
             # Auto-discover tools from the server
             from lionagi.service.connections.mcp.wrapper import (
@@ -333,16 +336,12 @@ class ActionManager(Manager):
 
             # Register each discovered tool with qualified name
             for tool in tools:
-                # Use qualified name to avoid collisions: server_toolname
-                qualified_name = (
-                    f"{server_name}_{tool.name}" if server_name else tool.name
-                )
 
                 # Store original tool name in config for MCP calls
                 config_with_metadata = dict(server_config)
                 config_with_metadata["_original_tool_name"] = tool.name
 
-                mcp_config = {qualified_name: config_with_metadata}
+                mcp_config = {tool.name: config_with_metadata}
 
                 # Get request_options for this tool if provided
                 tool_request_options = None
@@ -356,11 +355,9 @@ class ActionManager(Manager):
                         request_options=tool_request_options,
                     )
                     self.register_tool(tool_obj, update=update)
-                    registered_tools.append(qualified_name)
+                    registered_tools.append(tool.name)
                 except Exception as e:
-                    print(
-                        f"Warning: Failed to register tool {qualified_name}: {e}"
-                    )
+                    print(f"Warning: Failed to register tool {tool.name}: {e}")
 
         return registered_tools
 

lionagi/service/connections/providers/claude_code_cli.py

@@ -79,7 +79,7 @@ class ClaudeCodeCLIEndpoint(Endpoint):
     def create_payload(self, request: dict | BaseModel, **kwargs):
         req_dict = {**self.config.kwargs, **to_dict(request), **kwargs}
         messages = req_dict.pop("messages")
-        req_obj = ClaudeCodeRequest.create(messages=messages, **req_dict)
+        req_obj = ClaudeCodeRequest(messages=messages, **req_dict)
         return {"request": req_obj}, {}
 
     async def stream(

lionagi/service/third_party/claude_code.py

@@ -26,7 +26,6 @@ from lionagi import ln
 from lionagi.libs.schema.as_readable import as_readable
 from lionagi.utils import is_coro_func, is_import_installed
 
-HAS_CLAUDE_CODE_SDK = is_import_installed("claude_code_sdk")
 HAS_CLAUDE_CODE_CLI = False
 CLAUDE_CLI = None
 
@@ -68,7 +67,6 @@ __all__ = (
     "ClaudeChunk",
     "ClaudeSession",
     "stream_claude_code_cli",
-    "stream_cc_sdk_events",
 )
 
 
@@ -117,6 +115,59 @@ class ClaudeCodeRequest(BaseModel):
             return "bypassPermissions"
         return v
 
+    @model_validator(mode="before")
+    def _validate_message_prompt(cls, data):
+        if "prompt" in data and data["prompt"]:
+            return data
+
+        if not (msg := data.get("messages")):
+            raise ValueError("messages may not be empty")
+        resume = data.get("resume")
+        continue_conversation = data.get("continue_conversation")
+
+        prompt = ""
+
+        # 1. if resume or continue_conversation, use the last message
+        if resume or continue_conversation:
+            continue_conversation = True
+            prompt = msg[-1]["content"]
+            if isinstance(prompt, (dict, list)):
+                prompt = ln.json_dumps(prompt)
+
+        # 2. else, use entire messages except system message
+        else:
+            prompts = []
+            continue_conversation = False
+            for message in msg:
+                if message["role"] != "system":
+                    content = message["content"]
+                    prompts.append(
+                        ln.json_dumps(content)
+                        if isinstance(content, (dict, list))
+                        else content
+                    )
+
+            prompt = "\n".join(prompts)
+
+        # 3. assemble the request data
+        data_: dict[str, Any] = dict(
+            prompt=prompt,
+            resume=resume,
+            continue_conversation=bool(continue_conversation),
+        )
+
+        # 4. extract system prompt if available
+        if (msg[0]["role"] == "system") and (resume or continue_conversation):
+            data_["system_prompt"] = msg[0]["content"]
+
+        if "append_system_prompt" in data and data["append_system_prompt"]:
+            data_["append_system_prompt"] = str(
+                data.get("append_system_prompt")
+            )
+
+        data_.update(data)
+        return data_
+
     # Workspace path derived from repo + ws
     def cwd(self) -> Path:
         if not self.ws:
@@ -209,73 +260,6 @@ class ClaudeCodeRequest(BaseModel):
         args += ["--model", self.model or "sonnet", "--verbose"]
         return args
 
-    # ------------------------ SDK helpers -----------------------------------
-    def as_claude_options(self):
-        from claude_code_sdk import ClaudeCodeOptions
-
-        data = {
-            k: v
-            for k, v in self.model_dump(exclude_none=True).items()
-            if k in CLAUDE_CODE_OPTION_PARAMS
-        }
-        return ClaudeCodeOptions(**data)
-
-    # ------------------------ convenience constructor -----------------------
-    @classmethod
-    def create(
-        cls,
-        messages: list[dict[str, Any]],
-        resume: str | None = None,
-        continue_conversation: bool | None = None,
-        **kwargs,
-    ):
-        if not messages:
-            raise ValueError("messages may not be empty")
-
-        prompt = ""
-
-        # 1. if resume or continue_conversation, use the last message
-        if resume or continue_conversation:
-            continue_conversation = True
-            prompt = messages[-1]["content"]
-            if isinstance(prompt, (dict, list)):
-                prompt = ln.json_dumps(prompt)
-
-        # 2. else, use entire messages except system message
-        else:
-            prompts = []
-            continue_conversation = False
-            for message in messages:
-                if message["role"] != "system":
-                    content = message["content"]
-                    prompts.append(
-                        ln.json_dumps(content)
-                        if isinstance(content, (dict, list))
-                        else content
-                    )
-
-            prompt = "\n".join(prompts)
-
-        # 3. assemble the request data
-        data: dict[str, Any] = dict(
-            prompt=prompt,
-            resume=resume,
-            continue_conversation=bool(continue_conversation),
-        )
-
-        # 4. extract system prompt if available
-        if (messages[0]["role"] == "system") and (
-            resume or continue_conversation
-        ):
-            data["system_prompt"] = messages[0]["content"]
-        if kwargs.get("append_system_prompt"):
-            data["append_system_prompt"] = str(
-                kwargs.get("append_system_prompt")
-            )
-
-        data.update(kwargs)
-        return cls.model_validate(data, strict=False)
-
 
 @dataclass
 class ClaudeChunk:
@@ -499,23 +483,6 @@ async def _ndjson_from_cli(request: ClaudeCodeRequest):
         await proc.wait()
 
 
-def _stream_claude_code(request: ClaudeCodeRequest):
-    from claude_code_sdk import query as sdk_query
-
-    return sdk_query(
-        prompt=request.prompt, options=request.as_claude_options()
-    )
-
-
-def stream_cc_sdk_events(request: ClaudeCodeRequest):
-    if not HAS_CLAUDE_CODE_SDK:
-        raise RuntimeError(
-            "claude_code_sdk not installed (uv pip install lionagi[claude_code])"
-        )
-
-    return _stream_claude_code(request)
-
-
 # --------------------------------------------------------------------------- SSE route
 async def stream_cc_cli_events(request: ClaudeCodeRequest):
     if not CLAUDE_CLI:

lionagi/version.py

@@ -1 +1 @@
-__version__ = "0.17.8"
+__version__ = "0.17.9"

{lionagi-0.17.8.dist-info → lionagi-0.17.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lionagi
-Version: 0.17.8
+Version: 0.17.9
 Summary: An Intelligence Operating System.
 Author-email: HaiyangLi <quantocean.li@gmail.com>
 License:            Apache License

{lionagi-0.17.8.dist-info → lionagi-0.17.9.dist-info}/RECORD

@@ -1,11 +1,11 @@
 lionagi/__init__.py,sha256=iS8Y4ZSsP2EPwEsqeodelqdoL1BdiK1bCAYJHak1AUM,2474
 lionagi/_class_registry.py,sha256=pfUO1DjFZIqr3OwnNMkFqL_fiEBrrf8-swkGmP_KDLE,3112
 lionagi/_errors.py,sha256=ia_VWhPSyr5FIJLSdPpl04SrNOLI2skN40VC8ePmzeQ,3748
-lionagi/_types.py,sha256=COWRrmstmABGKKn-h_cKiAREGsMp_Ik49OdR4lSS3P8,1263
+lionagi/_types.py,sha256=nGtsaSee7FaIZvym3PH8NPaN5PN8QscTgcZfpMNaMEo,1296
 lionagi/config.py,sha256=yGnzj5D14B2TBhqVeyp1uccvAK6mk4hm0QA8dAEJUeQ,4776
 lionagi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/utils.py,sha256=yRHKN_v9xRnUa-nYg1lTpCCK2wNDg4pCpicUEIyFwKg,7084
-lionagi/version.py,sha256=H2Y9686JbmOVItv-s7YNC6eYseSRZPwHCIXOoDgBIEM,23
+lionagi/version.py,sha256=MY-kSx5QDTHjTQLJRkNa1ih3bsMMiGFMr264PPlSZRY,23
 lionagi/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/adapters/_utils.py,sha256=sniMG1LDDkwJNzUF2K32jv7rA6Y1QcohgyNclYsptzI,453
 lionagi/adapters/async_postgres_adapter.py,sha256=2XlxYNPow78dFHIQs8W1oJ2zkVD5Udn3aynMBF9Nf3k,3498
@@ -103,7 +103,7 @@ lionagi/protocols/ids.py,sha256=RM40pP_4waMJcfCGmEK_PfS8-k_DuDbC1fG-2Peuf6s,2472
 lionagi/protocols/types.py,sha256=6GJ5ZgDyWl8tckNLXB0z8jbtkordWpgm5r4ht31KVRc,2431
 lionagi/protocols/action/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
 lionagi/protocols/action/function_calling.py,sha256=jFy6Ruh3QWkERtBHXqPWVwrOH5aDitEo8oJHZgW5xnI,5066
-lionagi/protocols/action/manager.py,sha256=akq3HuLUuTRkm7ENmn8oycNH-4ksfekXOwOJky5OBrE,18835
+lionagi/protocols/action/manager.py,sha256=5RgXj7dbQn0DThrwq4qgZxM9HKAsdA_gIIdKdokAMGE,18692
 lionagi/protocols/action/tool.py,sha256=_o7rLokD3poupqst6YoQqEC6RvePDueySoVrGK2S538,5850
 lionagi/protocols/forms/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
 lionagi/protocols/forms/base.py,sha256=1J8UU2LXm1Lax5McJos0xjZTzMVLYQWd_hwtxI2wSuM,2838
@@ -164,7 +164,7 @@ lionagi/service/connections/mcp/__init__.py,sha256=3lzOakDoBWmMaNnT2g-YwktPKa_Wm
 lionagi/service/connections/mcp/wrapper.py,sha256=M7k-XH7x1__SZ0pq7ddnM0_G0t5ZZD3c8O_AbldkSjA,9158
 lionagi/service/connections/providers/__init__.py,sha256=3lzOakDoBWmMaNnT2g-YwktPKa_Wme4lnPRSmOQfayY,105
 lionagi/service/connections/providers/anthropic_.py,sha256=vok8mIyFiuV3K83tOjdYfruA6cv1h_57ML6RtpuW-bU,3157
-lionagi/service/connections/providers/claude_code_cli.py,sha256=kqEOnCUOOh2O_3NGi6W7r-gdLsbW-Jcp11tm30VEv4Q,4455
+lionagi/service/connections/providers/claude_code_cli.py,sha256=XWIF96Ypb3ExfD-wbEggaX0phxu5O_X1OXAdImNyz2g,4448
 lionagi/service/connections/providers/exa_.py,sha256=kuWD7yyYRqIa4ChSn0TsxFA5V5LwvFUD-w8TZ6mx4rk,1048
 lionagi/service/connections/providers/nvidia_nim_.py,sha256=95vmo0DSONYBVHkR9SGJ5BiHNKFZNZBrjw4_7ShOXQA,3154
 lionagi/service/connections/providers/oai_.py,sha256=3x5d6Ei1hKu8Mix0N2V2K21O9dd-2jtAELHhHXj5iHk,6071
@@ -180,7 +180,7 @@ lionagi/service/hooks/hooked_event.py,sha256=D_1HtWCH3CriNlmsksi5lerXuF_LV2lbktc
 lionagi/service/third_party/README.md,sha256=qFjWnI8rmLivIyr6Tc-hRZh-rQwntROp76af4MBNJJc,2214
 lionagi/service/third_party/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lionagi/service/third_party/anthropic_models.py,sha256=oqSPSlcayYG-fS5BLiLeTtkrpaxgkPhEK_YgneumrOo,4004
-lionagi/service/third_party/claude_code.py,sha256=wRqNBSy4kc-pHkuntNJnstyqOVdSKK9NV1s2x3Ia704,24794
+lionagi/service/third_party/claude_code.py,sha256=C3EKtEEqN3zto42pJhd7hhqJQt1gtShSDDeTzphUUss,23844
 lionagi/service/third_party/exa_models.py,sha256=G_hnekcy-DillPLzMoDQ8ZisVAL8Mp7iMAK4xqAT_3w,5470
 lionagi/service/third_party/openai_model_names.py,sha256=C44tnqexgc4ZU2-3I_sn5d688hf3WWx-25xBd50bvas,5121
 lionagi/service/third_party/pplx_models.py,sha256=-EhyJgOWR6rzSv3zczUtk80X6c19p18Dg9KC6l8BFRQ,6473
@@ -193,7 +193,7 @@ lionagi/tools/base.py,sha256=hEGnE4MD0CM4UqnF0xsDRKB0aM-pyrTFHl8utHhyJLU,1897
 lionagi/tools/types.py,sha256=XtJLY0m-Yi_ZLWhm0KycayvqMCZd--HxfQ0x9vFUYDE,230
 lionagi/tools/file/__init__.py,sha256=5y5joOZzfFWERl75auAcNcKC3lImVJ5ZZGvvHZUFCJM,112
 lionagi/tools/file/reader.py,sha256=Q9x1UP7YmBqN53e1kUN68OmIs-D1m9EM9VVbWfM35js,9658
-lionagi-0.17.8.dist-info/METADATA,sha256=d_5YV53ajCQjD7HDhICy31gl4NjaJlDCt2n6pXHF4wg,23448
-lionagi-0.17.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lionagi-0.17.8.dist-info/licenses/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
-lionagi-0.17.8.dist-info/RECORD,,
+lionagi-0.17.9.dist-info/METADATA,sha256=0v_5cWnPYJKWZwBEceY9UNdFncXb3Bfs1gg60CF8gjE,23448
+lionagi-0.17.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lionagi-0.17.9.dist-info/licenses/LICENSE,sha256=VXFWsdoN5AAknBCgFqQNgPWYx7OPp-PFEP961zGdOjc,11288
+lionagi-0.17.9.dist-info/RECORD,,