edsl 0.1.29.dev2__py3-none-any.whl → 0.1.29.dev6__py3-none-any.whl

edsl/Base.py

@@ -52,31 +52,28 @@ class PersistenceMixin:
         return c.create(self, description, visibility)
 
     @classmethod
-    def pull(cls, id_or_url: Union[str, UUID], exec_profile=None):
+    def pull(cls, uuid: Optional[Union[str, UUID]] = None, url: Optional[str] = None):
         """Pull the object from coop."""
         from edsl.coop import Coop
+        from edsl.coop.utils import ObjectRegistry
 
-        if id_or_url.startswith("http"):
-            uuid_value = id_or_url.split("/")[-1]
-        else:
-            uuid_value = id_or_url
-
-        c = Coop()
-
-        return c._get_base(cls, uuid_value, exec_profile=exec_profile)
+        object_type = ObjectRegistry.get_object_type_by_edsl_class(cls)
+        coop = Coop()
+        return coop.get(uuid, url, object_type)
 
     @classmethod
-    def delete(cls, id_or_url: Union[str, UUID]):
+    def delete(cls, uuid: Optional[Union[str, UUID]] = None, url: Optional[str] = None):
         """Delete the object from coop."""
         from edsl.coop import Coop
 
-        c = Coop()
-        return c._delete_base(cls, id_or_url)
+        coop = Coop()
+        return coop.delete(uuid, url)
 
     @classmethod
     def patch(
         cls,
-        id_or_url: Union[str, UUID],
+        uuid: Optional[Union[str, UUID]] = None,
+        url: Optional[str] = None,
         description: Optional[str] = None,
         value: Optional[Any] = None,
         visibility: Optional[str] = None,
@@ -89,8 +86,8 @@ class PersistenceMixin:
         """
         from edsl.coop import Coop
 
-        c = Coop()
-        return c._patch_base(cls, id_or_url, description, value, visibility)
+        coop = Coop()
+        return coop.patch(uuid, url, description, value, visibility)
 
     @classmethod
     def search(cls, query):

edsl/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.29.dev2"
+__version__ = "0.1.29.dev6"

edsl/agents/Agent.py

@@ -56,6 +56,7 @@ class Agent(Base):
     name = NameDescriptor()
     dynamic_traits_function_name = ""
     answer_question_directly_function_name = ""
+    has_dynamic_traits_function = False
 
     def __init__(
         self,
@@ -129,12 +130,16 @@ class Agent(Base):
 
         if self.dynamic_traits_function:
             self.dynamic_traits_function_name = self.dynamic_traits_function.__name__
+            self.has_dynamic_traits_function = True
+        else:
+            self.has_dynamic_traits_function = False
 
         if dynamic_traits_function_source_code:
             self.dynamic_traits_function_name = dynamic_traits_function_name
             self.dynamic_traits_function = create_restricted_function(
                 dynamic_traits_function_name, dynamic_traits_function
             )
+
         if answer_question_directly_source_code:
             self.answer_question_directly_function_name = (
                 answer_question_directly_function_name
@@ -159,7 +164,7 @@ class Agent(Base):
 
         This checks whether the dynamic traits function is valid.
         """
-        if self.dynamic_traits_function is not None:
+        if self.has_dynamic_traits_function:
             sig = inspect.signature(self.dynamic_traits_function)
             if "question" in sig.parameters:
                 if len(sig.parameters) > 1:
@@ -189,7 +194,7 @@ class Agent(Base):
         {'age': 10, 'hair': 'brown', 'height': 5.5}
 
         """
-        if self.dynamic_traits_function is not None:
+        if self.has_dynamic_traits_function:
             sig = inspect.signature(self.dynamic_traits_function)
             if "question" in sig.parameters:
                 return self.dynamic_traits_function(question=self.current_question)
@@ -273,6 +278,7 @@ class Agent(Base):
         *,
         question: QuestionBase,
         cache,
+        survey: Optional["Survey"] = None,
         scenario: Optional[Scenario] = None,
         model: Optional[LanguageModel] = None,
         debug: bool = False,
@@ -301,6 +307,7 @@ class Agent(Base):
         invigilator = self._create_invigilator(
             question=question,
             scenario=scenario,
+            survey=survey,
             model=model,
             debug=debug,
             memory_plan=memory_plan,
@@ -317,6 +324,7 @@ class Agent(Base):
         question: QuestionBase,
         cache: Cache,
         scenario: Optional[Scenario] = None,
+        survey: Optional["Survey"] = None,
         model: Optional[LanguageModel] = None,
         debug: bool = False,
         memory_plan: Optional[MemoryPlan] = None,
@@ -349,6 +357,7 @@ class Agent(Base):
             question=question,
             cache=cache,
             scenario=scenario,
+            survey=survey,
             model=model,
             debug=debug,
             memory_plan=memory_plan,
@@ -366,6 +375,7 @@ class Agent(Base):
         cache: Optional[Cache] = None,
         scenario: Optional[Scenario] = None,
         model: Optional[LanguageModel] = None,
+        survey: Optional["Survey"] = None,
         debug: bool = False,
         memory_plan: Optional[MemoryPlan] = None,
         current_answers: Optional[dict] = None,
@@ -404,6 +414,7 @@ class Agent(Base):
             self,
             question=question,
             scenario=scenario,
+            survey=survey,
             model=model,
             memory_plan=memory_plan,
             current_answers=current_answers,
@@ -479,6 +490,30 @@ class Agent(Base):
         """
         return self.data == other.data
 
+    def __getattr__(self, name):
+        # This will be called only if 'name' is not found in the usual places
+        # breakpoint()
+        if name == "has_dynamic_traits_function":
+            return self.has_dynamic_traits_function
+
+        if name in self.traits:
+            return self.traits[name]
+        raise AttributeError(
+            f"'{type(self).__name__}' object has no attribute '{name}'"
+        )
+
+
+    def __getstate__(self):
+        state = self.__dict__.copy()
+        # Include any additional state that needs to be serialized
+        return state
+
+    def __setstate__(self, state):
+        self.__dict__.update(state)
+        # Ensure _traits is initialized if it's missing
+        if "_traits" not in self.__dict__:
+            self._traits = {}
+
     def print(self) -> None:
         from rich import print_json
         import json

edsl/agents/AgentList.py

@@ -241,16 +241,16 @@ class AgentList(UserList, Base):
 
         """
         return cls([Agent.example(), Agent.example()])
-    
+
     @classmethod
-    def from_list(self, trait_name:str, values: List[Any]):
+    def from_list(self, trait_name: str, values: List[Any]):
         """Create an AgentList from a list of values.
 
         :param trait_name: The name of the trait.
         :param values: A list of values.
         """
         return AgentList([Agent({trait_name: value}) for value in values])
-    
+
     def __mul__(self, other: AgentList) -> AgentList:
         """Takes the cross product of two AgentLists."""
         from itertools import product
@@ -260,7 +260,6 @@ class AgentList(UserList, Base):
             new_sl.append(s1 + s2)
         return AgentList(new_sl)
 
-
     def code(self, string=True) -> Union[str, list[str]]:
         """Return code to construct an AgentList.
 

edsl/agents/InvigilatorBase.py

@@ -46,6 +46,7 @@ class InvigilatorBase(ABC):
         model: LanguageModel,
         memory_plan: MemoryPlan,
         current_answers: dict,
+        survey: Optional["Survey"],
         cache: Optional[Cache] = None,
         iteration: Optional[int] = 1,
         additional_prompt_data: Optional[dict] = None,
@@ -57,11 +58,12 @@ class InvigilatorBase(ABC):
         self.scenario = scenario
         self.model = model
         self.memory_plan = memory_plan
-        self.current_answers = current_answers
+        self.current_answers = current_answers or {}
         self.iteration = iteration
         self.additional_prompt_data = additional_prompt_data
         self.cache = cache
         self.sidecar_model = sidecar_model
+        self.survey = survey
 
     def __repr__(self) -> str:
         """Return a string representation of the Invigilator.
@@ -76,7 +78,7 @@ class InvigilatorBase(ABC):
         """Return an AgentResponseDict used in case the question-asking fails.
 
         >>> InvigilatorBase.example().get_failed_task_result()
-        {'answer': None, 'comment': 'Failed to get response', 'question_name': 'how_feeling', ...}
+        {'answer': None, 'comment': 'Failed to get response', ...}
         """
         return AgentResponseDict(
             answer=None,
@@ -86,11 +88,8 @@ class InvigilatorBase(ABC):
         )
 
     def get_prompts(self) -> Dict[str, Prompt]:
-        """Return the prompt used.
+        """Return the prompt used."""
 
-        >>> InvigilatorBase.example().get_prompts()
-        {'user_prompt': Prompt(text=\"""NA\"""), 'system_prompt': Prompt(text=\"""NA\""")}
-        """
         return {
             "user_prompt": Prompt("NA"),
             "system_prompt": Prompt("NA"),
@@ -129,7 +128,7 @@ class InvigilatorBase(ABC):
         )
 
     @classmethod
-    def example(cls, throw_an_exception=False):
+    def example(cls, throw_an_exception=False, question=None, scenario=None):
         """Return an example invigilator.
 
         >>> InvigilatorBase.example()
@@ -167,15 +166,20 @@ class InvigilatorBase(ABC):
         if throw_an_exception:
             model.throw_an_exception = True
         agent = Agent.example()
-        question = QuestionMultipleChoice.example()
-        scenario = Scenario.example()
+        # question = QuestionMultipleChoice.example()
+        from edsl.surveys import Survey
+
+        survey = Survey.example()
+        question = question or survey.questions[0]
+        scenario = scenario or Scenario.example()
         # memory_plan = None #memory_plan = MemoryPlan()
         from edsl import Survey
 
         memory_plan = MemoryPlan(survey=Survey.example())
         current_answers = None
+        from edsl.agents.PromptConstructionMixin import PromptConstructorMixin
 
-        class InvigilatorExample(InvigilatorBase):
+        class InvigilatorExample(PromptConstructorMixin, InvigilatorBase):
             """An example invigilator."""
 
             async def async_answer_question(self):
@@ -188,6 +192,7 @@ class InvigilatorBase(ABC):
             agent=agent,
             question=question,
             scenario=scenario,
+            survey=survey,
             model=model,
             memory_plan=memory_plan,
             current_answers=current_answers,