@elizaos/python 2.0.0-alpha.10 → 2.0.0-alpha.26

package/elizaos/services/message_service.py

@@ -262,7 +262,7 @@ def _parse_params_from_xml(xml_response: str) -> dict[str, list[dict[str, str]]]
     if not params_content:
         return result
 
-    # First try XML parsing of the inner params content
+    # First try strict XML parsing of the inner params content
     try:
         root = ET.fromstring(f"<params>{params_content}</params>")
         for action_elem in list(root):
@@ -270,7 +270,8 @@ def _parse_params_from_xml(xml_response: str) -> dict[str, list[dict[str, str]]]
             action_params: dict[str, str] = {}
 
             for param_elem in list(action_elem):
-                value_text = (param_elem.text or "").strip()
+                # Use itertext() to capture ALL text including mixed content
+                value_text = "".join(param_elem.itertext()).strip()
                 action_params[param_elem.tag] = value_text
 
             # If the action block contains text but no nested tags, try JSON-in-action.
@@ -283,35 +284,69 @@ def _parse_params_from_xml(xml_response: str) -> dict[str, list[dict[str, str]]]
                             for k, v in loaded.items():
                                 action_params[str(k)] = str(v)
                     except json.JSONDecodeError:
-                        return result
+                        pass  # Fall through to regex fallback
 
             if action_params:
                 result.setdefault(action_name, []).append(action_params)
 
-        return result
+        if result:
+            return result
     except ET.ParseError:
-        return result
+        pass  # Fall through to regex-based extraction
 
-    # Fall back to JSON inside <params>...</params>
-    if not params_content.startswith("{"):
-        return result
+    # Regex-based fallback for content that breaks XML parsing
+    # (e.g. C code with <stdio.h>, shell commands with < > &, etc.)
+    # Look for <ACTION_NAME>...<param>...</param>...</ACTION_NAME> patterns
+    action_block_pattern = re.compile(r"<([A-Z_]+)>(.*?)</\1>", re.DOTALL | re.IGNORECASE)
+    param_pattern = re.compile(r"<(\w+)>(.*?)</\1>", re.DOTALL)
 
-    try:
-        loaded = json.loads(params_content)
-    except json.JSONDecodeError:
-        return result
+    for action_match in action_block_pattern.finditer(params_content):
+        action_name = action_match.group(1).upper()
+        action_body = action_match.group(2).strip()
+        action_params: dict[str, str] = {}
 
-    if not isinstance(loaded, dict):
+        # Try JSON inside the action block first
+        if action_body.startswith("{"):
+            try:
+                loaded = json.loads(action_body)
+                if isinstance(loaded, dict):
+                    for k, v in loaded.items():
+                        action_params[str(k)] = str(v)
+            except json.JSONDecodeError:
+                pass
+
+        # Extract nested param tags via regex
+        if not action_params:
+            for param_match in param_pattern.finditer(action_body):
+                param_name = param_match.group(1)
+                param_value = param_match.group(2).strip()
+                # Skip if the param name looks like an action (all caps)
+                if param_name == param_name.upper() and len(param_name) > 2:
+                    continue
+                action_params[param_name] = param_value
+
+        if action_params:
+            result.setdefault(action_name, []).append(action_params)
+
+    if result:
         return result
 
-    for action_name, action_params_raw in loaded.items():
-        if not isinstance(action_params_raw, dict):
-            continue
-        params: dict[str, str] = {}
-        for k, v in action_params_raw.items():
-            params[str(k)] = str(v)
-        if params:
-            result.setdefault(str(action_name).upper(), []).append(params)
+    # Fall back to JSON inside <params>...</params>
+    if params_content.startswith("{") or params_content.startswith("["):
+        try:
+            loaded_any = json.loads(params_content)
+        except json.JSONDecodeError:
+            return result
+
+        if isinstance(loaded_any, dict):
+            for action_name, action_params_raw in loaded_any.items():
+                if not isinstance(action_params_raw, dict):
+                    continue
+                params_out: dict[str, str] = {}
+                for k, v in action_params_raw.items():
+                    params_out[str(k)] = str(v)
+                if params_out:
+                    result.setdefault(str(action_name).upper(), []).append(params_out)
 
     return result
 
@@ -366,6 +401,9 @@ class DefaultMessageService(IMessageService):
         traj_step_id: str | None = None
         if message.metadata is not None:
             maybe_step = getattr(message.metadata, "trajectoryStepId", None)
+            if not maybe_step and hasattr(message.metadata, "message"):
+                nested_meta = message.metadata.message
+                maybe_step = getattr(nested_meta, "trajectory_step_id", None)
             if isinstance(maybe_step, str) and maybe_step:
                 traj_step_id = maybe_step
 
@@ -430,9 +468,7 @@ class DefaultMessageService(IMessageService):
             # or rewrite it (e.g. redact credentials).
             pre_result = await runtime.evaluate_pre(message)
             if pre_result.blocked:
-                runtime.logger.warning(
-                    f"Message blocked by pre-evaluator: {pre_result.reason}"
-                )
+                runtime.logger.warning(f"Message blocked by pre-evaluator: {pre_result.reason}")
                 return MessageProcessingResult(
                     did_respond=False,
                     response_content=None,
@@ -440,9 +476,7 @@ class DefaultMessageService(IMessageService):
                     state=None,
                 )
             if pre_result.rewritten_text is not None:
-                runtime.logger.info(
-                    f"Pre-evaluator rewrote message text: {pre_result.reason}"
-                )
+                runtime.logger.info(f"Pre-evaluator rewrote message text: {pre_result.reason}")
                 message.content.text = pre_result.rewritten_text
 
             # Step 1: Save incoming message to memory (if adapter available)
@@ -452,12 +486,13 @@ class DefaultMessageService(IMessageService):
                 existing_memory = await runtime.get_memory_by_id(message.id)
                 if not existing_memory:
                     await runtime.create_memory(message, "messages")
+                    _spawn_embedding_generation(runtime, message)
             except RuntimeError:
                 # No database adapter - skip persistence (benchmark mode)
                 runtime.logger.debug("No database adapter, skipping message persistence")
 
             # Step 2: Compose state from providers
-            state = await runtime.compose_state(message)
+            state = await runtime.compose_state(message, trajectory_phase="generate")
 
             # Optional: multi-step strategy (TypeScript parity)
             use_multi_step = _parse_bool(runtime.get_setting("USE_MULTI_STEP"))
@@ -688,6 +723,9 @@ class DefaultMessageService(IMessageService):
                 },
             )
 
+            # Spawn async embedding generation for response
+            _spawn_embedding_generation(runtime, response_memory)
+
             responses = [response_memory]
 
             # Step 7: Process actions via runtime.process_actions()
@@ -701,6 +739,20 @@ class DefaultMessageService(IMessageService):
                 # Simple chat-style response
                 await callback(response_content)
 
+            # Complete trajectory step with actual action data
+            if traj_step_id and traj_logger is not None:
+                try:
+                    if hasattr(traj_logger, "complete_step_by_step_id"):
+                        traj_logger.complete_step_by_step_id(
+                            step_id=traj_step_id,
+                            action_type=",".join(actions) if actions else "REPLY",
+                            action_name=",".join(actions) if actions else "REPLY",
+                            success=True,
+                            reward=0.1,
+                        )
+                except Exception as e:
+                    runtime.logger.debug(f"Trajectory step completion failed: {e}")
+
             # Step 8: Run evaluators via runtime.evaluate()
             runtime.logger.debug("Running evaluators")
             await runtime.evaluate(
@@ -726,6 +778,22 @@ class DefaultMessageService(IMessageService):
             runtime.logger.error(
                 f"Error processing message: {e}\n{''.join(_tb.format_exception(e))}"
             )
+
+            # Mark trajectory step as failed on error
+            if traj_step_id and traj_logger is not None:
+                try:
+                    if hasattr(traj_logger, "complete_step_by_step_id"):
+                        traj_logger.complete_step_by_step_id(
+                            step_id=traj_step_id,
+                            action_type="ERROR",
+                            action_name="ERROR",
+                            success=False,
+                            reward=-0.1,
+                            error=str(e)[:500],
+                        )
+                except Exception:
+                    pass
+
             raise
         finally:
             CURRENT_TRAJECTORY_STEP_ID.reset(token)
@@ -833,6 +901,7 @@ class DefaultMessageService(IMessageService):
                 include_list=["RECENT_MESSAGES", "ACTION_STATE", "ACTIONS", "PROVIDERS"],
                 only_include=True,
                 skip_cache=True,
+                trajectory_phase="multi_step_iteration",
             )
             state.data.action_results = list(trace_results)
             state.values["actionResults"] = _format_action_results(trace_results)
@@ -918,6 +987,7 @@ class DefaultMessageService(IMessageService):
                     include_list=providers,
                     only_include=True,
                     skip_cache=True,
+                    trajectory_phase="multi_step_provider",
                 )
 
             if action_name:
@@ -953,6 +1023,7 @@ class DefaultMessageService(IMessageService):
             include_list=["RECENT_MESSAGES", "ACTION_STATE", "ACTIONS", "PROVIDERS"],
             only_include=True,
             skip_cache=True,
+            trajectory_phase="multi_step_summary",
         )
         state.data.action_results = list(trace_results)
         state.values["actionResults"] = _format_action_results(trace_results)
@@ -1176,7 +1247,7 @@ class DefaultMessageService(IMessageService):
                 await runtime.create_memory(message, "messages")
 
             # Compose state from providers
-            state = await runtime.compose_state(message)
+            state = await runtime.compose_state(message, trajectory_phase="generate")
 
             # Build the prompt using canonical template
             from elizaos.prompts import MESSAGE_HANDLER_TEMPLATE
@@ -1246,3 +1317,78 @@ class DefaultMessageService(IMessageService):
             StreamingMessageResult: Final result with metadata (yielded last)
         """
         return self._handle_message_stream_impl(runtime, message)
+
+
+def _spawn_embedding_generation(runtime: IAgentRuntime, memory: Memory) -> None:
+    """Spawn a background task to generate intent and embedding for a memory."""
+    import asyncio
+
+    # Create a background task for embedding generation
+    # We don't await it here so it doesn't block the main flow
+    try:
+        loop = asyncio.get_running_loop()
+        loop.create_task(_generate_embedding_task(runtime, memory))
+    except RuntimeError:
+        # If no loop is running, we might be in a thread or startup.
+        # Fallback to creating a new loop or skipping?
+        # Standard asyncio usage implies a loop exists.
+        pass
+
+
+async def _generate_embedding_task(runtime: IAgentRuntime, memory: Memory) -> None:
+    try:
+        text = memory.content.text or ""
+        if not text:
+            return
+
+        # 1. Generate Intent (Augmented Query)
+        intent_prompt = (
+            "Analyze the following message and extract the core intent or meaning to be used as a search query for retrieval. "
+            "Return ONLY the intent text, no explanation.\\n\\n"
+            f"Message: {text}"
+        )
+
+        intent = text
+        try:
+            # parsing logic handles string response
+            intent_resp = await runtime.use_model(
+                ModelType.TEXT_SMALL,
+                {"prompt": intent_prompt, "maxTokens": 128, "temperature": 0.0},
+            )
+            if isinstance(intent_resp, str):
+                intent = intent_resp.strip()
+        except Exception as e:
+            runtime.logger.debug(f"Failed to generate intent: {e}")
+
+        # Store intent in metadata
+        if memory.metadata is None:
+            from google.protobuf.struct_pb2 import Struct
+
+            memory.metadata = Struct()
+
+        # Handle both dict access (Python object) and struct access (Protobuf)
+        if hasattr(memory.metadata, "update") and callable(memory.metadata.update):
+            # For dict
+            memory.metadata.update({"intent": intent})
+        elif hasattr(memory.metadata, "__setitem__"):
+            memory.metadata["intent"] = intent
+
+        # 2. Generate Embedding for Intent
+        embedding_resp = await runtime.use_model(
+            ModelType.TEXT_EMBEDDING, {"input": intent, "text": intent}
+        )
+
+        embedding: list[float] | None = None
+        if isinstance(embedding_resp, list):
+            embedding = [float(x) for x in embedding_resp]
+
+        if embedding:
+            memory.embedding = embedding
+
+            # 3. Update Memory in DB
+            if runtime._adapter:
+                await runtime.update_memory(memory)
+                runtime.logger.debug(f"Generated intent and embedding for memory {memory.id}")
+
+    except Exception as e:
+        runtime.logger.debug(f"Async embedding task failed for memory {memory.id}: {e}")

package/elizaos/types/components.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Awaitable, Callable
-from dataclasses import dataclass, field
-from enum import Enum
+from dataclasses import dataclass
 from typing import TYPE_CHECKING, Literal, TypeAlias
 
 from elizaos.types.generated.eliza.v1 import components_pb2
@@ -47,6 +46,7 @@ class PreEvaluatorResult:
     rewritten_text: str | None = None
     reason: str | None = None
 
+
 # Proto-backed data types
 ActionExample = components_pb2.ActionExample
 ActionParameterSchema = components_pb2.ActionParameterSchema

package/elizaos/types/generated/__init__.py

@@ -0,0 +1,12 @@
+"""Generated protobuf modules for elizaOS types.
+
+This __init__.py adds the 'generated' directory to sys.path so that
+protobuf-generated files can resolve ``from eliza.v1 import …`` imports.
+"""
+
+import os
+import sys
+
+_generated_dir = os.path.dirname(os.path.abspath(__file__))
+if _generated_dir not in sys.path:
+    sys.path.insert(0, _generated_dir)

package/elizaos/types/generated/eliza/v1/agent_pb2.py

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: eliza/v1/agent.proto
+# Protobuf Python Version: 6.33.5
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    33,
+    5,
+    '',
+    'eliza/v1/agent.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from eliza.v1 import primitives_pb2 as eliza_dot_v1_dot_primitives__pb2
+from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x65liza/v1/agent.proto\x12\x08\x65liza.v1\x1a\x19\x65liza/v1/primitives.proto\x1a\x1cgoogle/protobuf/struct.proto\"Q\n\x0eMessageExample\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12+\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x11.eliza.v1.ContentR\x07\x63ontent\"k\n\rKnowledgeItem\x12\x14\n\x04path\x18\x01 \x01(\tH\x00R\x04path\x12<\n\tdirectory\x18\x02 \x01(\x0b\x32\x1c.eliza.v1.KnowledgeDirectoryH\x00R\tdirectoryB\x06\n\x04item\"P\n\x12KnowledgeDirectory\x12\x12\n\x04path\x18\x01 \x01(\tR\x04path\x12\x1b\n\x06shared\x18\x02 \x01(\x08H\x00R\x06shared\x88\x01\x01\x42\t\n\x07_shared\"\xed\t\n\x11\x43haracterSettings\x12\x35\n\x14should_respond_model\x18\x01 \x01(\tH\x00R\x12shouldRespondModel\x88\x01\x01\x12)\n\x0euse_multi_step\x18\x02 \x01(\x08H\x01R\x0cuseMultiStep\x88\x01\x01\x12=\n\x18max_multistep_iterations\x18\x03 \x01(\x05H\x02R\x16maxMultistepIterations\x88\x01\x01\x12\x34\n\x13\x62ootstrap_defllmoff\x18\x04 \x01(\x08H\x03R\x12\x62ootstrapDefllmoff\x88\x01\x01\x12\x33\n\x13\x62ootstrap_keep_resp\x18\x05 \x01(\x08H\x04R\x11\x62ootstrapKeepResp\x88\x01\x01\x12@\n\x1aproviders_total_timeout_ms\x18\x06 \x01(\x05H\x05R\x17providersTotalTimeoutMs\x88\x01\x01\x12@\n\x1amax_working_memory_entries\x18\x07 \x01(\x05H\x06R\x17maxWorkingMemoryEntries\x88\x01\x01\x12;\n\x17\x61lways_respond_channels\x18\x08 \x01(\tH\x07R\x15\x61lwaysRespondChannels\x88\x01\x01\x12\x39\n\x16\x61lways_respond_sources\x18\t \x01(\tH\x08R\x14\x61lwaysRespondSources\x88\x01\x01\x12\x34\n\x13\x64\x65\x66\x61ult_temperature\x18\n \x01(\x01H\tR\x12\x64\x65\x66\x61ultTemperature\x88\x01\x01\x12\x31\n\x12\x64\x65\x66\x61ult_max_tokens\x18\x0b \x01(\x05H\nR\x10\x64\x65\x66\x61ultMaxTokens\x88\x01\x01\x12?\n\x19\x64\x65\x66\x61ult_frequency_penalty\x18\x0c \x01(\x01H\x0bR\x17\x64\x65\x66\x61ultFrequencyPenalty\x88\x01\x01\x12=\n\x18\x64\x65\x66\x61ult_presence_penalty\x18\r \x01(\x01H\x0cR\x16\x64\x65\x66\x61ultPresencePenalty\x88\x01\x01\x12\x41\n\x1a\x64isable_basic_capabilities\x18\x0e \x01(\x08H\rR\x18\x64isableBasicCapabilities\x88\x01\x01\x12-\n\x05\x65xtra\x18\x10 \x01(\x0b\x32\x17.google.protobuf.StructR\x05\x65xtraB\x17\n\x15_should_respond_modelB\x11\n\x0f_use_multi_stepB\x1b\n\x19_max_multistep_iterationsB\x16\n\x14_bootstrap_defllmoffB\x16\n\x14_bootstrap_keep_respB\x1d\n\x1b_providers_total_timeout_msB\x1d\n\x1b_max_working_memory_entriesB\x1a\n\x18_always_respond_channelsB\x19\n\x17_always_respond_sourcesB\x16\n\x14_default_temperatureB\x15\n\x13_default_max_tokensB\x1c\n\x1a_default_frequency_penaltyB\x1b\n\x19_default_presence_penaltyB\x1d\n\x1b_disable_basic_capabilities\"G\n\x0bStyleGuides\x12\x10\n\x03\x61ll\x18\x01 \x03(\tR\x03\x61ll\x12\x12\n\x04\x63hat\x18\x02 \x03(\tR\x04\x63hat\x12\x12\n\x04post\x18\x03 \x03(\tR\x04post\"\xa4\x07\n\tCharacter\x12\x13\n\x02id\x18\x01 \x01(\tH\x00R\x02id\x88\x01\x01\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x1f\n\x08username\x18\x03 \x01(\tH\x01R\x08username\x88\x01\x01\x12\x1b\n\x06system\x18\x04 \x01(\tH\x02R\x06system\x88\x01\x01\x12@\n\ttemplates\x18\x05 \x03(\x0b\x32\".eliza.v1.Character.TemplatesEntryR\ttemplates\x12\x10\n\x03\x62io\x18\x06 \x03(\tR\x03\x62io\x12H\n\x10message_examples\x18\x07 \x03(\x0b\x32\x1d.eliza.v1.MessageExampleGroupR\x0fmessageExamples\x12#\n\rpost_examples\x18\x08 \x03(\tR\x0cpostExamples\x12\x16\n\x06topics\x18\t \x03(\tR\x06topics\x12\x1e\n\nadjectives\x18\n \x03(\tR\nadjectives\x12\x35\n\tknowledge\x18\x0b \x03(\x0b\x32\x17.eliza.v1.KnowledgeItemR\tknowledge\x12\x18\n\x07plugins\x18\x0c \x03(\tR\x07plugins\x12<\n\x08settings\x18\r \x01(\x0b\x32\x1b.eliza.v1.CharacterSettingsH\x03R\x08settings\x88\x01\x01\x12:\n\x07secrets\x18\x0e \x03(\x0b\x32 .eliza.v1.Character.SecretsEntryR\x07secrets\x12\x30\n\x05style\x18\x0f \x01(\x0b\x32\x15.eliza.v1.StyleGuidesH\x04R\x05style\x88\x01\x01\x12\x30\n\x11\x61\x64vanced_planning\x18\x10 \x01(\x08H\x05R\x10\x61\x64vancedPlanning\x88\x01\x01\x12,\n\x0f\x61\x64vanced_memory\x18\x11 \x01(\x08H\x06R\x0e\x61\x64vancedMemory\x88\x01\x01\x1a<\n\x0eTemplatesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x1a:\n\x0cSecretsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n\x05value\x18\x02 \x01(\tR\x05value:\x02\x38\x01\x42\x05\n\x03_idB\x0b\n\t_usernameB\t\n\x07_systemB\x0b\n\t_settingsB\x08\n\x06_styleB\x14\n\x12_advanced_planningB\x12\n\x10_advanced_memory\"K\n\x13MessageExampleGroup\x12\x34\n\x08\x65xamples\x18\x01 \x03(\x0b\x32\x18.eliza.v1.MessageExampleR\x08\x65xamples\"\xd2\x01\n\x05\x41gent\x12\x31\n\tcharacter\x18\x01 \x01(\x0b\x32\x13.eliza.v1.CharacterR\tcharacter\x12\x1d\n\x07\x65nabled\x18\x02 \x01(\x08H\x00R\x07\x65nabled\x88\x01\x01\x12-\n\x06status\x18\x03 \x01(\x0e\x32\x15.eliza.v1.AgentStatusR\x06status\x12\x1d\n\ncreated_at\x18\x04 \x01(\x03R\tcreatedAt\x12\x1d\n\nupdated_at\x18\x05 \x01(\x03R\tupdatedAtB\n\n\x08_enabled*_\n\x0b\x41gentStatus\x12\x1c\n\x18\x41GENT_STATUS_UNSPECIFIED\x10\x00\x12\x17\n\x13\x41GENT_STATUS_ACTIVE\x10\x01\x12\x19\n\x15\x41GENT_STATUS_INACTIVE\x10\x02\x42\x8d\x01\n\x0c\x63om.eliza.v1B\nAgentProtoP\x01Z0github.com/elizaos/eliza/gen/go/eliza/v1;elizav1\xa2\x02\x03\x45XX\xaa\x02\x08\x45liza.V1\xca\x02\x08\x45liza\\V1\xe2\x02\x14\x45liza\\V1\\GPBMetadata\xea\x02\tEliza::V1b\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'eliza.v1.agent_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\014com.eliza.v1B\nAgentProtoP\001Z0github.com/elizaos/eliza/gen/go/eliza/v1;elizav1\242\002\003EXX\252\002\010Eliza.V1\312\002\010Eliza\\V1\342\002\024Eliza\\V1\\GPBMetadata\352\002\tEliza::V1'
+  _globals['_CHARACTER_TEMPLATESENTRY']._loaded_options = None
+  _globals['_CHARACTER_TEMPLATESENTRY']._serialized_options = b'8\001'
+  _globals['_CHARACTER_SECRETSENTRY']._loaded_options = None
+  _globals['_CHARACTER_SECRETSENTRY']._serialized_options = b'8\001'
+  _globals['_AGENTSTATUS']._serialized_start=2927
+  _globals['_AGENTSTATUS']._serialized_end=3022
+  _globals['_MESSAGEEXAMPLE']._serialized_start=91
+  _globals['_MESSAGEEXAMPLE']._serialized_end=172
+  _globals['_KNOWLEDGEITEM']._serialized_start=174
+  _globals['_KNOWLEDGEITEM']._serialized_end=281
+  _globals['_KNOWLEDGEDIRECTORY']._serialized_start=283
+  _globals['_KNOWLEDGEDIRECTORY']._serialized_end=363
+  _globals['_CHARACTERSETTINGS']._serialized_start=366
+  _globals['_CHARACTERSETTINGS']._serialized_end=1627
+  _globals['_STYLEGUIDES']._serialized_start=1629
+  _globals['_STYLEGUIDES']._serialized_end=1700
+  _globals['_CHARACTER']._serialized_start=1703
+  _globals['_CHARACTER']._serialized_end=2635
+  _globals['_CHARACTER_TEMPLATESENTRY']._serialized_start=2419
+  _globals['_CHARACTER_TEMPLATESENTRY']._serialized_end=2479
+  _globals['_CHARACTER_SECRETSENTRY']._serialized_start=2481
+  _globals['_CHARACTER_SECRETSENTRY']._serialized_end=2539
+  _globals['_MESSAGEEXAMPLEGROUP']._serialized_start=2637
+  _globals['_MESSAGEEXAMPLEGROUP']._serialized_end=2712
+  _globals['_AGENT']._serialized_start=2715
+  _globals['_AGENT']._serialized_end=2925
+# @@protoc_insertion_point(module_scope)

package/elizaos/types/generated/eliza/v1/agent_pb2.pyi

@@ -0,0 +1,159 @@
+from eliza.v1 import primitives_pb2 as _primitives_pb2
+from google.protobuf import struct_pb2 as _struct_pb2
+from google.protobuf.internal import containers as _containers
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from collections.abc import Iterable as _Iterable, Mapping as _Mapping
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class AgentStatus(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    AGENT_STATUS_UNSPECIFIED: _ClassVar[AgentStatus]
+    AGENT_STATUS_ACTIVE: _ClassVar[AgentStatus]
+    AGENT_STATUS_INACTIVE: _ClassVar[AgentStatus]
+AGENT_STATUS_UNSPECIFIED: AgentStatus
+AGENT_STATUS_ACTIVE: AgentStatus
+AGENT_STATUS_INACTIVE: AgentStatus
+
+class MessageExample(_message.Message):
+    __slots__ = ("name", "content")
+    NAME_FIELD_NUMBER: _ClassVar[int]
+    CONTENT_FIELD_NUMBER: _ClassVar[int]
+    name: str
+    content: _primitives_pb2.Content
+    def __init__(self, name: _Optional[str] = ..., content: _Optional[_Union[_primitives_pb2.Content, _Mapping]] = ...) -> None: ...
+
+class KnowledgeItem(_message.Message):
+    __slots__ = ("path", "directory")
+    PATH_FIELD_NUMBER: _ClassVar[int]
+    DIRECTORY_FIELD_NUMBER: _ClassVar[int]
+    path: str
+    directory: KnowledgeDirectory
+    def __init__(self, path: _Optional[str] = ..., directory: _Optional[_Union[KnowledgeDirectory, _Mapping]] = ...) -> None: ...
+
+class KnowledgeDirectory(_message.Message):
+    __slots__ = ("path", "shared")
+    PATH_FIELD_NUMBER: _ClassVar[int]
+    SHARED_FIELD_NUMBER: _ClassVar[int]
+    path: str
+    shared: bool
+    def __init__(self, path: _Optional[str] = ..., shared: _Optional[bool] = ...) -> None: ...
+
+class CharacterSettings(_message.Message):
+    __slots__ = ("should_respond_model", "use_multi_step", "max_multistep_iterations", "bootstrap_defllmoff", "bootstrap_keep_resp", "providers_total_timeout_ms", "max_working_memory_entries", "always_respond_channels", "always_respond_sources", "default_temperature", "default_max_tokens", "default_frequency_penalty", "default_presence_penalty", "disable_basic_capabilities", "extra")
+    SHOULD_RESPOND_MODEL_FIELD_NUMBER: _ClassVar[int]
+    USE_MULTI_STEP_FIELD_NUMBER: _ClassVar[int]
+    MAX_MULTISTEP_ITERATIONS_FIELD_NUMBER: _ClassVar[int]
+    BOOTSTRAP_DEFLLMOFF_FIELD_NUMBER: _ClassVar[int]
+    BOOTSTRAP_KEEP_RESP_FIELD_NUMBER: _ClassVar[int]
+    PROVIDERS_TOTAL_TIMEOUT_MS_FIELD_NUMBER: _ClassVar[int]
+    MAX_WORKING_MEMORY_ENTRIES_FIELD_NUMBER: _ClassVar[int]
+    ALWAYS_RESPOND_CHANNELS_FIELD_NUMBER: _ClassVar[int]
+    ALWAYS_RESPOND_SOURCES_FIELD_NUMBER: _ClassVar[int]
+    DEFAULT_TEMPERATURE_FIELD_NUMBER: _ClassVar[int]
+    DEFAULT_MAX_TOKENS_FIELD_NUMBER: _ClassVar[int]
+    DEFAULT_FREQUENCY_PENALTY_FIELD_NUMBER: _ClassVar[int]
+    DEFAULT_PRESENCE_PENALTY_FIELD_NUMBER: _ClassVar[int]
+    DISABLE_BASIC_CAPABILITIES_FIELD_NUMBER: _ClassVar[int]
+    EXTRA_FIELD_NUMBER: _ClassVar[int]
+    should_respond_model: str
+    use_multi_step: bool
+    max_multistep_iterations: int
+    bootstrap_defllmoff: bool
+    bootstrap_keep_resp: bool
+    providers_total_timeout_ms: int
+    max_working_memory_entries: int
+    always_respond_channels: str
+    always_respond_sources: str
+    default_temperature: float
+    default_max_tokens: int
+    default_frequency_penalty: float
+    default_presence_penalty: float
+    disable_basic_capabilities: bool
+    extra: _struct_pb2.Struct
+    def __init__(self, should_respond_model: _Optional[str] = ..., use_multi_step: _Optional[bool] = ..., max_multistep_iterations: _Optional[int] = ..., bootstrap_defllmoff: _Optional[bool] = ..., bootstrap_keep_resp: _Optional[bool] = ..., providers_total_timeout_ms: _Optional[int] = ..., max_working_memory_entries: _Optional[int] = ..., always_respond_channels: _Optional[str] = ..., always_respond_sources: _Optional[str] = ..., default_temperature: _Optional[float] = ..., default_max_tokens: _Optional[int] = ..., default_frequency_penalty: _Optional[float] = ..., default_presence_penalty: _Optional[float] = ..., disable_basic_capabilities: _Optional[bool] = ..., extra: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ...) -> None: ...
+
+class StyleGuides(_message.Message):
+    __slots__ = ("all", "chat", "post")
+    ALL_FIELD_NUMBER: _ClassVar[int]
+    CHAT_FIELD_NUMBER: _ClassVar[int]
+    POST_FIELD_NUMBER: _ClassVar[int]
+    all: _containers.RepeatedScalarFieldContainer[str]
+    chat: _containers.RepeatedScalarFieldContainer[str]
+    post: _containers.RepeatedScalarFieldContainer[str]
+    def __init__(self, all: _Optional[_Iterable[str]] = ..., chat: _Optional[_Iterable[str]] = ..., post: _Optional[_Iterable[str]] = ...) -> None: ...
+
+class Character(_message.Message):
+    __slots__ = ("id", "name", "username", "system", "templates", "bio", "message_examples", "post_examples", "topics", "adjectives", "knowledge", "plugins", "settings", "secrets", "style", "advanced_planning", "advanced_memory")
+    class TemplatesEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: str
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
+    class SecretsEntry(_message.Message):
+        __slots__ = ("key", "value")
+        KEY_FIELD_NUMBER: _ClassVar[int]
+        VALUE_FIELD_NUMBER: _ClassVar[int]
+        key: str
+        value: str
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[str] = ...) -> None: ...
+    ID_FIELD_NUMBER: _ClassVar[int]
+    NAME_FIELD_NUMBER: _ClassVar[int]
+    USERNAME_FIELD_NUMBER: _ClassVar[int]
+    SYSTEM_FIELD_NUMBER: _ClassVar[int]
+    TEMPLATES_FIELD_NUMBER: _ClassVar[int]
+    BIO_FIELD_NUMBER: _ClassVar[int]
+    MESSAGE_EXAMPLES_FIELD_NUMBER: _ClassVar[int]
+    POST_EXAMPLES_FIELD_NUMBER: _ClassVar[int]
+    TOPICS_FIELD_NUMBER: _ClassVar[int]
+    ADJECTIVES_FIELD_NUMBER: _ClassVar[int]
+    KNOWLEDGE_FIELD_NUMBER: _ClassVar[int]
+    PLUGINS_FIELD_NUMBER: _ClassVar[int]
+    SETTINGS_FIELD_NUMBER: _ClassVar[int]
+    SECRETS_FIELD_NUMBER: _ClassVar[int]
+    STYLE_FIELD_NUMBER: _ClassVar[int]
+    ADVANCED_PLANNING_FIELD_NUMBER: _ClassVar[int]
+    ADVANCED_MEMORY_FIELD_NUMBER: _ClassVar[int]
+    id: str
+    name: str
+    username: str
+    system: str
+    templates: _containers.ScalarMap[str, str]
+    bio: _containers.RepeatedScalarFieldContainer[str]
+    message_examples: _containers.RepeatedCompositeFieldContainer[MessageExampleGroup]
+    post_examples: _containers.RepeatedScalarFieldContainer[str]
+    topics: _containers.RepeatedScalarFieldContainer[str]
+    adjectives: _containers.RepeatedScalarFieldContainer[str]
+    knowledge: _containers.RepeatedCompositeFieldContainer[KnowledgeItem]
+    plugins: _containers.RepeatedScalarFieldContainer[str]
+    settings: CharacterSettings
+    secrets: _containers.ScalarMap[str, str]
+    style: StyleGuides
+    advanced_planning: bool
+    advanced_memory: bool
+    def __init__(self, id: _Optional[str] = ..., name: _Optional[str] = ..., username: _Optional[str] = ..., system: _Optional[str] = ..., templates: _Optional[_Mapping[str, str]] = ..., bio: _Optional[_Iterable[str]] = ..., message_examples: _Optional[_Iterable[_Union[MessageExampleGroup, _Mapping]]] = ..., post_examples: _Optional[_Iterable[str]] = ..., topics: _Optional[_Iterable[str]] = ..., adjectives: _Optional[_Iterable[str]] = ..., knowledge: _Optional[_Iterable[_Union[KnowledgeItem, _Mapping]]] = ..., plugins: _Optional[_Iterable[str]] = ..., settings: _Optional[_Union[CharacterSettings, _Mapping]] = ..., secrets: _Optional[_Mapping[str, str]] = ..., style: _Optional[_Union[StyleGuides, _Mapping]] = ..., advanced_planning: _Optional[bool] = ..., advanced_memory: _Optional[bool] = ...) -> None: ...
+
+class MessageExampleGroup(_message.Message):
+    __slots__ = ("examples",)
+    EXAMPLES_FIELD_NUMBER: _ClassVar[int]
+    examples: _containers.RepeatedCompositeFieldContainer[MessageExample]
+    def __init__(self, examples: _Optional[_Iterable[_Union[MessageExample, _Mapping]]] = ...) -> None: ...
+
+class Agent(_message.Message):
+    __slots__ = ("character", "enabled", "status", "created_at", "updated_at")
+    CHARACTER_FIELD_NUMBER: _ClassVar[int]
+    ENABLED_FIELD_NUMBER: _ClassVar[int]
+    STATUS_FIELD_NUMBER: _ClassVar[int]
+    CREATED_AT_FIELD_NUMBER: _ClassVar[int]
+    UPDATED_AT_FIELD_NUMBER: _ClassVar[int]
+    character: Character
+    enabled: bool
+    status: AgentStatus
+    created_at: int
+    updated_at: int
+    def __init__(self, character: _Optional[_Union[Character, _Mapping]] = ..., enabled: _Optional[bool] = ..., status: _Optional[_Union[AgentStatus, str]] = ..., created_at: _Optional[int] = ..., updated_at: _Optional[int] = ...) -> None: ...

package/elizaos/types/generated/eliza/v1/components_pb2.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: eliza/v1/components.proto
+# Protobuf Python Version: 6.33.5
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    33,
+    5,
+    '',
+    'eliza/v1/components.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from eliza.v1 import primitives_pb2 as eliza_dot_v1_dot_primitives__pb2
+from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19\x65liza/v1/components.proto\x12\x08\x65liza.v1\x1a\x19\x65liza/v1/primitives.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xb8\x04\n\x15\x41\x63tionParameterSchema\x12\x12\n\x04type\x18\x01 \x01(\tR\x04type\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12;\n\rdefault_value\x18\x03 \x01(\x0b\x32\x16.google.protobuf.ValueR\x0c\x64\x65\x66\x61ultValue\x12\x1f\n\x0b\x65num_values\x18\x04 \x03(\tR\nenumValues\x12O\n\nproperties\x18\x05 \x03(\x0b\x32/.eliza.v1.ActionParameterSchema.PropertiesEntryR\nproperties\x12:\n\x05items\x18\x06 \x01(\x0b\x32\x1f.eliza.v1.ActionParameterSchemaH\x01R\x05items\x88\x01\x01\x12\x1d\n\x07minimum\x18\x07 \x01(\x01H\x02R\x07minimum\x88\x01\x01\x12\x1d\n\x07maximum\x18\x08 \x01(\x01H\x03R\x07maximum\x88\x01\x01\x12\x1d\n\x07pattern\x18\t \x01(\tH\x04R\x07pattern\x88\x01\x01\x1a^\n\x0fPropertiesEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32\x1f.eliza.v1.ActionParameterSchemaR\x05value:\x02\x38\x01\x42\x0e\n\x0c_descriptionB\x08\n\x06_itemsB\n\n\x08_minimumB\n\n\x08_maximumB\n\n\x08_pattern\"\xae\x01\n\x0f\x41\x63tionParameter\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x02 \x01(\tR\x0b\x64\x65scription\x12\x1f\n\x08required\x18\x03 \x01(\x08H\x00R\x08required\x88\x01\x01\x12\x37\n\x06schema\x18\x04 \x01(\x0b\x32\x1f.eliza.v1.ActionParameterSchemaR\x06schemaB\x0b\n\t_required\"P\n\rActionExample\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12+\n\x07\x63ontent\x18\x02 \x01(\x0b\x32\x11.eliza.v1.ContentR\x07\x63ontent\"C\n\x10\x41\x63tionParameters\x12/\n\x06values\x18\x01 \x01(\x0b\x32\x17.google.protobuf.StructR\x06values\"\xcd\x01\n\x0c\x41\x63tionResult\x12\x18\n\x07success\x18\x01 \x01(\x08R\x07success\x12\x17\n\x04text\x18\x02 \x01(\tH\x00R\x04text\x88\x01\x01\x12/\n\x06values\x18\x03 \x01(\x0b\x32\x17.google.protobuf.StructR\x06values\x12+\n\x04\x64\x61ta\x18\x04 \x01(\x0b\x32\x17.google.protobuf.StructR\x04\x64\x61ta\x12\x19\n\x05\x65rror\x18\x05 \x01(\tH\x01R\x05\x65rror\x88\x01\x01\x42\x07\n\x05_textB\x08\n\x06_error\"R\n\rActionContext\x12\x41\n\x10previous_results\x18\x01 \x03(\x0b\x32\x16.eliza.v1.ActionResultR\x0fpreviousResults\"\xfc\x01\n\x0eHandlerOptions\x12\x43\n\x0e\x61\x63tion_context\x18\x01 \x01(\x0b\x32\x17.eliza.v1.ActionContextH\x00R\ractionContext\x88\x01\x01\x12-\n\x10\x61\x63tion_plan_json\x18\x02 \x01(\tH\x01R\x0e\x61\x63tionPlanJson\x88\x01\x01\x12?\n\nparameters\x18\x03 \x01(\x0b\x32\x1a.eliza.v1.ActionParametersH\x02R\nparameters\x88\x01\x01\x42\x11\n\x0f_action_contextB\x13\n\x11_action_plan_jsonB\r\n\x0b_parameters\"\x92\x02\n\x0e\x41\x63tionManifest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x02 \x01(\tR\x0b\x64\x65scription\x12\x18\n\x07similes\x18\x03 \x03(\tR\x07similes\x12\x33\n\x08\x65xamples\x18\x04 \x03(\x0b\x32\x17.eliza.v1.ActionExampleR\x08\x65xamples\x12\x1f\n\x08priority\x18\x05 \x01(\x05H\x00R\x08priority\x88\x01\x01\x12\x12\n\x04tags\x18\x06 \x03(\tR\x04tags\x12\x39\n\nparameters\x18\x07 \x03(\x0b\x32\x19.eliza.v1.ActionParameterR\nparametersB\x0b\n\t_priority\"\x90\x01\n\x0eProviderResult\x12\x17\n\x04text\x18\x01 \x01(\tH\x00R\x04text\x88\x01\x01\x12/\n\x06values\x18\x02 \x01(\x0b\x32\x17.google.protobuf.StructR\x06values\x12+\n\x04\x64\x61ta\x18\x03 \x01(\x0b\x32\x17.google.protobuf.StructR\x04\x64\x61taB\x07\n\x05_text\"\xe1\x01\n\x10ProviderManifest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12%\n\x0b\x64\x65scription\x18\x02 \x01(\tH\x00R\x0b\x64\x65scription\x88\x01\x01\x12\x1d\n\x07\x64ynamic\x18\x03 \x01(\x08H\x01R\x07\x64ynamic\x88\x01\x01\x12\x1f\n\x08position\x18\x04 \x01(\x05H\x02R\x08position\x88\x01\x01\x12\x1d\n\x07private\x18\x05 \x01(\x08H\x03R\x07private\x88\x01\x01\x42\x0e\n\x0c_descriptionB\n\n\x08_dynamicB\x0b\n\t_positionB\n\n\x08_private\"z\n\x11\x45valuationExample\x12\x16\n\x06prompt\x18\x01 \x01(\tR\x06prompt\x12\x33\n\x08messages\x18\x02 \x03(\x0b\x32\x17.eliza.v1.ActionExampleR\x08messages\x12\x18\n\x07outcome\x18\x03 \x01(\tR\x07outcome\"\xcf\x01\n\x11\x45valuatorManifest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12 \n\x0b\x64\x65scription\x18\x02 \x01(\tR\x0b\x64\x65scription\x12\"\n\nalways_run\x18\x03 \x01(\x08H\x00R\talwaysRun\x88\x01\x01\x12\x18\n\x07similes\x18\x04 \x03(\tR\x07similes\x12\x37\n\x08\x65xamples\x18\x05 \x03(\x0b\x32\x1b.eliza.v1.EvaluationExampleR\x08\x65xamplesB\r\n\x0b_always_runB\x92\x01\n\x0c\x63om.eliza.v1B\x0f\x43omponentsProtoP\x01Z0github.com/elizaos/eliza/gen/go/eliza/v1;elizav1\xa2\x02\x03\x45XX\xaa\x02\x08\x45liza.V1\xca\x02\x08\x45liza\\V1\xe2\x02\x14\x45liza\\V1\\GPBMetadata\xea\x02\tEliza::V1b\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'eliza.v1.components_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\014com.eliza.v1B\017ComponentsProtoP\001Z0github.com/elizaos/eliza/gen/go/eliza/v1;elizav1\242\002\003EXX\252\002\010Eliza.V1\312\002\010Eliza\\V1\342\002\024Eliza\\V1\\GPBMetadata\352\002\tEliza::V1'
+  _globals['_ACTIONPARAMETERSCHEMA_PROPERTIESENTRY']._loaded_options = None
+  _globals['_ACTIONPARAMETERSCHEMA_PROPERTIESENTRY']._serialized_options = b'8\001'
+  _globals['_ACTIONPARAMETERSCHEMA']._serialized_start=97
+  _globals['_ACTIONPARAMETERSCHEMA']._serialized_end=665
+  _globals['_ACTIONPARAMETERSCHEMA_PROPERTIESENTRY']._serialized_start=509
+  _globals['_ACTIONPARAMETERSCHEMA_PROPERTIESENTRY']._serialized_end=603
+  _globals['_ACTIONPARAMETER']._serialized_start=668
+  _globals['_ACTIONPARAMETER']._serialized_end=842
+  _globals['_ACTIONEXAMPLE']._serialized_start=844
+  _globals['_ACTIONEXAMPLE']._serialized_end=924
+  _globals['_ACTIONPARAMETERS']._serialized_start=926
+  _globals['_ACTIONPARAMETERS']._serialized_end=993
+  _globals['_ACTIONRESULT']._serialized_start=996
+  _globals['_ACTIONRESULT']._serialized_end=1201
+  _globals['_ACTIONCONTEXT']._serialized_start=1203
+  _globals['_ACTIONCONTEXT']._serialized_end=1285
+  _globals['_HANDLEROPTIONS']._serialized_start=1288
+  _globals['_HANDLEROPTIONS']._serialized_end=1540
+  _globals['_ACTIONMANIFEST']._serialized_start=1543
+  _globals['_ACTIONMANIFEST']._serialized_end=1817
+  _globals['_PROVIDERRESULT']._serialized_start=1820
+  _globals['_PROVIDERRESULT']._serialized_end=1964
+  _globals['_PROVIDERMANIFEST']._serialized_start=1967
+  _globals['_PROVIDERMANIFEST']._serialized_end=2192
+  _globals['_EVALUATIONEXAMPLE']._serialized_start=2194
+  _globals['_EVALUATIONEXAMPLE']._serialized_end=2316
+  _globals['_EVALUATORMANIFEST']._serialized_start=2319
+  _globals['_EVALUATORMANIFEST']._serialized_end=2526
+# @@protoc_insertion_point(module_scope)