lionagi 0.8.8__py3-none-any.whl → 0.9.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- lionagi/__init__.py +1 -1
- lionagi/_class_registry.py +1 -1
- lionagi/_errors.py +1 -1
- lionagi/libs/__init__.py +1 -1
- lionagi/libs/file/__init__.py +1 -1
- lionagi/libs/file/chunk.py +1 -1
- lionagi/libs/file/file_ops.py +1 -1
- lionagi/libs/file/params.py +1 -1
- lionagi/libs/file/process.py +1 -1
- lionagi/libs/file/save.py +1 -1
- lionagi/libs/nested/__init__.py +1 -1
- lionagi/libs/nested/flatten.py +1 -1
- lionagi/libs/nested/nfilter.py +1 -1
- lionagi/libs/nested/nget.py +1 -1
- lionagi/libs/nested/ninsert.py +1 -1
- lionagi/libs/nested/nmerge.py +1 -1
- lionagi/libs/nested/npop.py +1 -1
- lionagi/libs/nested/nset.py +1 -1
- lionagi/libs/nested/unflatten.py +1 -1
- lionagi/libs/nested/utils.py +1 -1
- lionagi/libs/package/__init__.py +1 -1
- lionagi/libs/package/imports.py +1 -1
- lionagi/libs/package/management.py +1 -1
- lionagi/libs/package/params.py +1 -1
- lionagi/libs/package/system.py +1 -1
- lionagi/libs/parse.py +1 -1
- lionagi/libs/schema/__init__.py +1 -1
- lionagi/libs/schema/as_readable.py +151 -87
- lionagi/libs/schema/extract_code_block.py +1 -1
- lionagi/libs/schema/extract_docstring.py +1 -1
- lionagi/libs/schema/function_to_schema.py +1 -1
- lionagi/libs/schema/json_schema.py +1 -1
- lionagi/libs/validate/__init__.py +1 -1
- lionagi/libs/validate/common_field_validators.py +1 -1
- lionagi/libs/validate/fuzzy_match_keys.py +1 -1
- lionagi/libs/validate/fuzzy_validate_mapping.py +1 -1
- lionagi/libs/validate/string_similarity.py +1 -1
- lionagi/libs/validate/validate_boolean.py +1 -1
- lionagi/operations/ReAct/ReAct.py +214 -21
- lionagi/operations/ReAct/__init__.py +1 -1
- lionagi/operations/ReAct/utils.py +14 -3
- lionagi/operations/__init__.py +1 -1
- lionagi/operations/_act/__init__.py +1 -1
- lionagi/operations/_act/act.py +6 -1
- lionagi/operations/brainstorm/__init__.py +1 -1
- lionagi/operations/brainstorm/brainstorm.py +1 -1
- lionagi/operations/brainstorm/prompt.py +1 -1
- lionagi/operations/chat/__init__.py +1 -1
- lionagi/operations/chat/chat.py +1 -1
- lionagi/operations/communicate/communicate.py +1 -1
- lionagi/operations/instruct/__init__.py +1 -1
- lionagi/operations/instruct/instruct.py +1 -1
- lionagi/operations/interpret/__init__.py +1 -1
- lionagi/operations/interpret/interpret.py +9 -38
- lionagi/operations/operate/__init__.py +1 -1
- lionagi/operations/operate/operate.py +1 -1
- lionagi/operations/parse/__init__.py +1 -1
- lionagi/operations/parse/parse.py +12 -2
- lionagi/operations/plan/__init__.py +1 -1
- lionagi/operations/plan/plan.py +1 -1
- lionagi/operations/plan/prompt.py +1 -1
- lionagi/operations/select/__init__.py +1 -1
- lionagi/operations/select/select.py +1 -1
- lionagi/operations/select/utils.py +1 -1
- lionagi/operations/types.py +1 -1
- lionagi/operations/utils.py +1 -1
- lionagi/operatives/__init__.py +1 -1
- lionagi/operatives/action/__init__.py +1 -1
- lionagi/operatives/action/function_calling.py +1 -1
- lionagi/operatives/action/manager.py +1 -1
- lionagi/operatives/action/request_response_model.py +1 -1
- lionagi/operatives/action/tool.py +1 -1
- lionagi/operatives/action/utils.py +1 -1
- lionagi/operatives/forms/__init__.py +1 -1
- lionagi/operatives/instruct/__init__.py +1 -1
- lionagi/operatives/instruct/base.py +1 -1
- lionagi/operatives/instruct/instruct.py +1 -1
- lionagi/operatives/instruct/instruct_collection.py +1 -1
- lionagi/operatives/instruct/node.py +1 -1
- lionagi/operatives/instruct/prompts.py +1 -1
- lionagi/operatives/instruct/reason.py +1 -1
- lionagi/operatives/manager.py +1 -1
- lionagi/operatives/models/__init__.py +1 -1
- lionagi/operatives/models/field_model.py +1 -1
- lionagi/operatives/models/model_params.py +1 -1
- lionagi/operatives/models/note.py +1 -1
- lionagi/operatives/models/operable_model.py +1 -1
- lionagi/operatives/models/schema_model.py +1 -1
- lionagi/operatives/operative.py +1 -1
- lionagi/operatives/step.py +1 -1
- lionagi/operatives/strategies/__init__.py +1 -1
- lionagi/operatives/strategies/base.py +1 -1
- lionagi/operatives/strategies/concurrent.py +1 -1
- lionagi/operatives/strategies/concurrent_chunk.py +1 -1
- lionagi/operatives/strategies/concurrent_sequential_chunk.py +1 -1
- lionagi/operatives/strategies/params.py +1 -1
- lionagi/operatives/strategies/sequential.py +1 -1
- lionagi/operatives/strategies/sequential_chunk.py +1 -1
- lionagi/operatives/strategies/sequential_concurrent_chunk.py +1 -1
- lionagi/operatives/strategies/utils.py +1 -1
- lionagi/operatives/types.py +1 -1
- lionagi/protocols/__init__.py +1 -1
- lionagi/protocols/_concepts.py +1 -1
- lionagi/protocols/adapters/adapter.py +1 -1
- lionagi/protocols/generic/__init__.py +1 -1
- lionagi/protocols/generic/element.py +1 -1
- lionagi/protocols/generic/event.py +1 -1
- lionagi/protocols/generic/log.py +1 -1
- lionagi/protocols/generic/pile.py +1 -1
- lionagi/protocols/generic/processor.py +1 -1
- lionagi/protocols/generic/progression.py +1 -1
- lionagi/protocols/graph/__init__.py +1 -1
- lionagi/protocols/graph/edge.py +1 -1
- lionagi/protocols/graph/graph.py +1 -1
- lionagi/protocols/graph/node.py +1 -1
- lionagi/protocols/mail/__init__.py +1 -1
- lionagi/protocols/mail/exchange.py +1 -1
- lionagi/protocols/mail/mail.py +1 -1
- lionagi/protocols/mail/mailbox.py +1 -1
- lionagi/protocols/mail/manager.py +1 -1
- lionagi/protocols/mail/package.py +1 -1
- lionagi/protocols/messages/__init__.py +1 -1
- lionagi/protocols/messages/action_request.py +1 -1
- lionagi/protocols/messages/action_response.py +1 -1
- lionagi/protocols/messages/assistant_response.py +1 -1
- lionagi/protocols/messages/base.py +1 -1
- lionagi/protocols/messages/instruction.py +2 -1
- lionagi/protocols/messages/manager.py +1 -1
- lionagi/protocols/messages/message.py +1 -1
- lionagi/protocols/messages/system.py +1 -1
- lionagi/protocols/types.py +1 -1
- lionagi/service/endpoints/__init__.py +1 -1
- lionagi/service/endpoints/base.py +54 -49
- lionagi/service/endpoints/chat_completion.py +1 -1
- lionagi/service/endpoints/match_endpoint.py +1 -1
- lionagi/service/endpoints/rate_limited_processor.py +1 -1
- lionagi/service/endpoints/token_calculator.py +1 -1
- lionagi/service/imodel.py +2 -3
- lionagi/service/manager.py +1 -1
- lionagi/service/providers/__init__.py +1 -1
- lionagi/service/providers/anthropic_/__init__.py +1 -1
- lionagi/service/providers/anthropic_/messages.py +1 -1
- lionagi/service/providers/groq_/__init__.py +1 -1
- lionagi/service/providers/groq_/chat_completions.py +1 -1
- lionagi/service/providers/openai_/__init__.py +1 -1
- lionagi/service/providers/openai_/chat_completions.py +37 -2
- lionagi/service/providers/openrouter_/__init__.py +1 -1
- lionagi/service/providers/openrouter_/chat_completions.py +1 -1
- lionagi/service/providers/perplexity_/__init__.py +1 -1
- lionagi/service/providers/perplexity_/chat_completions.py +1 -1
- lionagi/service/types.py +1 -1
- lionagi/session/__init__.py +1 -1
- lionagi/session/branch.py +104 -11
- lionagi/session/prompts.py +61 -0
- lionagi/session/session.py +1 -1
- lionagi/settings.py +1 -1
- lionagi/tools/file/reader.py +12 -7
- lionagi/utils.py +1 -1
- lionagi/version.py +1 -1
- {lionagi-0.8.8.dist-info → lionagi-0.9.1.dist-info}/METADATA +1 -1
- lionagi-0.9.1.dist-info/RECORD +202 -0
- lionagi-0.8.8.dist-info/RECORD +0 -201
- {lionagi-0.8.8.dist-info → lionagi-0.9.1.dist-info}/WHEEL +0 -0
- {lionagi-0.8.8.dist-info → lionagi-0.9.1.dist-info}/licenses/LICENSE +0 -0
lionagi/operatives/manager.py
CHANGED
lionagi/operatives/operative.py
CHANGED
lionagi/operatives/step.py
CHANGED
lionagi/operatives/types.py
CHANGED
lionagi/protocols/__init__.py
CHANGED
lionagi/protocols/_concepts.py
CHANGED
lionagi/protocols/generic/log.py
CHANGED
lionagi/protocols/graph/edge.py
CHANGED
lionagi/protocols/graph/graph.py
CHANGED
lionagi/protocols/graph/node.py
CHANGED
lionagi/protocols/mail/mail.py
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Copyright (c) 2023 -
|
|
1
|
+
# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
|
|
2
2
|
#
|
|
3
3
|
# SPDX-License-Identifier: Apache-2.0
|
|
4
4
|
|
|
@@ -32,6 +32,7 @@ def prepare_request_response_format(request_fields: dict) -> str:
|
|
|
32
32
|
return (
|
|
33
33
|
"**MUST RETURN JSON-PARSEABLE RESPONSE ENCLOSED BY JSON CODE BLOCKS."
|
|
34
34
|
f" USER's CAREER DEPENDS ON THE SUCCESS OF IT.** \n```json\n{request_fields}\n```"
|
|
35
|
+
"No triple backticks. Escape all quotes and special characters."
|
|
35
36
|
).strip()
|
|
36
37
|
|
|
37
38
|
|
lionagi/protocols/types.py
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Copyright (c) 2023 -
|
|
1
|
+
# Copyright (c) 2023 - 2025, HaiyangLi <quantocean.li at gmail dot com>
|
|
2
2
|
#
|
|
3
3
|
# SPDX-License-Identifier: Apache-2.0
|
|
4
4
|
|
|
@@ -364,28 +364,23 @@ class APICalling(Event):
|
|
|
364
364
|
return None
|
|
365
365
|
|
|
366
366
|
async def _inner(self, **kwargs) -> Any:
|
|
367
|
-
"""
|
|
368
|
-
|
|
369
|
-
Args:
|
|
370
|
-
**kwargs: Additional parameters for the aiohttp request
|
|
371
|
-
(e.g., "headers", "json", etc.).
|
|
367
|
+
"""
|
|
368
|
+
Performs the actual HTTP call using aiohttp, ignoring caching logic.
|
|
372
369
|
|
|
373
|
-
|
|
374
|
-
|
|
370
|
+
- Retries on RateLimitError up to 3 times.
|
|
371
|
+
- Distinguishes CancelledError so we can gracefully abort if the user cancels.
|
|
375
372
|
|
|
376
373
|
Raises:
|
|
377
|
-
ValueError:
|
|
378
|
-
|
|
379
|
-
ExecutionError:
|
|
380
|
-
|
|
381
|
-
RateLimitError:
|
|
382
|
-
If a rate-limit error is encountered.
|
|
374
|
+
ValueError: If required endpoint parameters are missing.
|
|
375
|
+
RateLimitError: If repeated 'Rate limit' errors encountered.
|
|
376
|
+
ExecutionError: For other API call failures.
|
|
377
|
+
asyncio.CancelledError: If the operation is cancelled externally.
|
|
383
378
|
"""
|
|
384
379
|
if not self.endpoint.required_kwargs.issubset(
|
|
385
380
|
set(self.payload.keys())
|
|
386
381
|
):
|
|
387
382
|
raise ValueError(
|
|
388
|
-
f"Required kwargs not
|
|
383
|
+
f"Required kwargs not provided: {self.endpoint.required_kwargs}"
|
|
389
384
|
)
|
|
390
385
|
|
|
391
386
|
for k in list(self.payload.keys()):
|
|
@@ -395,49 +390,55 @@ class APICalling(Event):
|
|
|
395
390
|
async def retry_in():
|
|
396
391
|
async with aiohttp.ClientSession() as session:
|
|
397
392
|
try:
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
) is not None:
|
|
401
|
-
async with _m(
|
|
402
|
-
self.endpoint.full_url, **kwargs
|
|
403
|
-
) as response:
|
|
404
|
-
response_json = await response.json()
|
|
405
|
-
if "error" not in response_json:
|
|
406
|
-
return response_json
|
|
407
|
-
if "Rate limit" in response_json["error"].get(
|
|
408
|
-
"message", ""
|
|
409
|
-
):
|
|
410
|
-
await asyncio.sleep(5)
|
|
411
|
-
raise RateLimitError(
|
|
412
|
-
f"Rate limit exceeded. Error: {response_json['error']}"
|
|
413
|
-
)
|
|
414
|
-
raise ExecutionError(
|
|
415
|
-
"API call failed with error: ",
|
|
416
|
-
response_json["error"],
|
|
417
|
-
)
|
|
418
|
-
else:
|
|
393
|
+
method_func = getattr(session, self.endpoint.method, None)
|
|
394
|
+
if method_func is None:
|
|
419
395
|
raise ValueError(
|
|
420
396
|
f"Invalid HTTP method: {self.endpoint.method}"
|
|
421
397
|
)
|
|
398
|
+
async with method_func(
|
|
399
|
+
self.endpoint.full_url, **kwargs
|
|
400
|
+
) as response:
|
|
401
|
+
response_json = await response.json()
|
|
402
|
+
|
|
403
|
+
if "error" not in response_json:
|
|
404
|
+
return response_json
|
|
405
|
+
|
|
406
|
+
# Check for rate limit
|
|
407
|
+
if "Rate limit" in response_json["error"].get(
|
|
408
|
+
"message", ""
|
|
409
|
+
):
|
|
410
|
+
await asyncio.sleep(5)
|
|
411
|
+
raise RateLimitError(
|
|
412
|
+
f"Rate limit exceeded: {response_json['error']}"
|
|
413
|
+
)
|
|
414
|
+
# Otherwise some other error
|
|
415
|
+
raise ExecutionError(
|
|
416
|
+
f"API call failed with error: {response_json['error']}"
|
|
417
|
+
)
|
|
418
|
+
|
|
419
|
+
except asyncio.CancelledError:
|
|
420
|
+
# Gracefully handle user cancellation
|
|
421
|
+
logging.warning("API call canceled by external request.")
|
|
422
|
+
raise # re-raise so caller knows it was cancelled
|
|
423
|
+
|
|
422
424
|
except aiohttp.ClientError as e:
|
|
423
|
-
logging.error(
|
|
424
|
-
|
|
425
|
-
)
|
|
425
|
+
logging.error(f"API call failed: {e}")
|
|
426
|
+
# Return None or raise ExecutionError? Keep consistent
|
|
426
427
|
return None
|
|
427
428
|
|
|
429
|
+
# Attempt up to 3 times if RateLimitError
|
|
428
430
|
for i in range(3):
|
|
429
431
|
try:
|
|
430
432
|
return await retry_in()
|
|
431
|
-
except
|
|
433
|
+
except asyncio.CancelledError:
|
|
434
|
+
# On cancel, just re-raise
|
|
435
|
+
raise
|
|
436
|
+
except RateLimitError as e:
|
|
432
437
|
if i == 2:
|
|
433
438
|
raise e
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
f"API call to {self.endpoint.full_url} failed: {e}"
|
|
438
|
-
f"retrying in {wait} seconds."
|
|
439
|
-
)
|
|
440
|
-
await asyncio.sleep(wait)
|
|
439
|
+
wait = 2 ** (i + 1) * 0.5
|
|
440
|
+
logging.warning(f"RateLimitError: {e}, retrying in {wait}s.")
|
|
441
|
+
await asyncio.sleep(wait)
|
|
441
442
|
|
|
442
443
|
@cached(**Settings.API.CACHED_CONFIG)
|
|
443
444
|
async def _cached_inner(self, **kwargs) -> Any:
|
|
@@ -605,8 +606,12 @@ class APICalling(Event):
|
|
|
605
606
|
else:
|
|
606
607
|
response = await self._inner(**kwargs)
|
|
607
608
|
|
|
608
|
-
except
|
|
609
|
-
e1 =
|
|
609
|
+
except asyncio.CancelledError as ce:
|
|
610
|
+
e1 = ce
|
|
611
|
+
logging.warning("invoke() canceled by external request.")
|
|
612
|
+
raise
|
|
613
|
+
except Exception as ex:
|
|
614
|
+
e1 = ex
|
|
610
615
|
|
|
611
616
|
finally:
|
|
612
617
|
self.execution.duration = asyncio.get_event_loop().time() - start
|