edsl 0.1.29.dev1__py3-none-any.whl → 0.1.29.dev3__py3-none-any.whl

edsl/__init__.py

@@ -37,6 +37,6 @@ from edsl.shared import shared_globals
 from edsl.jobs import Jobs
 from edsl.notebooks import Notebook
 from edsl.study.Study import Study
-from edsl.coop.coop import Coop
 from edsl.conjure.Conjure import Conjure
 from edsl.language_models.ModelList import ModelList
+from edsl.coop.coop import Coop

edsl/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.29.dev1"
+__version__ = "0.1.29.dev3"

edsl/agents/AgentList.py

@@ -12,7 +12,7 @@ Example usage:
 
 from __future__ import annotations
 from collections import UserList
-from typing import Optional, Union, Sequence
+from typing import Optional, Union, Sequence, List, Any
 from rich import print_json
 from rich.table import Table
 import json
@@ -241,6 +241,25 @@ class AgentList(UserList, Base):
 
         """
         return cls([Agent.example(), Agent.example()])
+    
+    @classmethod
+    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
+
+        new_sl = []
+        for s1, s2 in list(product(self, other)):
+            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/language_models/ModelList.py

@@ -56,11 +56,11 @@ class ModelList(Base, UserList):
             return {"models": [model._to_dict() for model in self]}
 
     @classmethod
-    def from_names(self, *args):
+    def from_names(self, *args, **kwargs):
         """A a model list from a list of names"""
         if len(args) == 1 and isinstance(args[0], list):
             args = args[0]
-        return ModelList([Model(model_name) for model_name in args])
+        return ModelList([Model(model_name, **kwargs) for model_name in args])
 
     @add_edsl_version
     def to_dict(self):

edsl/results/Results.py

@@ -165,13 +165,7 @@ class Results(UserList, Mixins, Base):
         )
 
     def __repr__(self) -> str:
-        # return f"Results(data = {self.data}, survey = {repr(self.survey)}, created_columns = {self.created_columns})"
-        return f"""Results object 
-                Size: {len(self.data)}. 
-                Survey questions: {[q.question_name for q in self.survey.questions]}. 
-                Created columns: {self.created_columns}
-                Hash: {hash(self)}
-            """
+        return f"Results(data = {self.data}, survey = {repr(self.survey)}, created_columns = {self.created_columns})"
 
     def _repr_html_(self) -> str:
         json_str = json.dumps(self.to_dict()["data"], indent=4)
@@ -759,7 +753,10 @@ class Results(UserList, Mixins, Base):
 
     def sort_by(self, *columns: str, reverse: bool = False) -> Results:
         import warnings
-        warnings.warn("sort_by is deprecated. Use order_by instead.", DeprecationWarning)
+
+        warnings.warn(
+            "sort_by is deprecated. Use order_by instead.", DeprecationWarning
+        )
         return self.order_by(*columns, reverse=reverse)
 
     def order_by(self, *columns: str, reverse: bool = False) -> Results:
@@ -800,6 +797,7 @@ class Results(UserList, Mixins, Base):
         │ Great        │
         └──────────────┘
         """
+
         def to_numeric_if_possible(v):
             try:
                 return float(v)

edsl/study/ObjectEntry.py

@@ -1,5 +1,8 @@
 import time
-from typing import Optional, Dict, Any, Type
+import webbrowser
+from typing import Any, Dict, Optional, Type
+from edsl import QuestionBase
+from edsl.Base import RegisterSubclassesMeta
 
 
 class ObjectEntry:
@@ -12,6 +15,16 @@ class ObjectEntry:
         created_at: Optional[float] = None,
         edsl_class_name: Optional[str] = None,
     ):
+        """
+        Initialize an ObjectEntry instance.
+
+        :param variable_name: The name of the variable.
+        :param object: The object being wrapped.
+        :param description: A description of the object.
+        :param coop_info: Optional Coop information dictionary.
+        :param created_at: Optional creation timestamp. Defaults to current time.
+        :param edsl_class_name: Optional EDSL class name. Defaults to object's class name.
+        """
         self.created_at = created_at or time.time()
         self.variable_name = variable_name
         self.object = object
@@ -20,22 +33,33 @@ class ObjectEntry:
         self.coop_info = coop_info
 
     @classmethod
-    def _get_class(self, obj_dict: Dict[str, Any]) -> Type:
-        "Get the class of an object from its dictionary representation."
-        class_name = obj_dict["edsl_class_name"]
+    def _get_class(cls, object_dict: Dict[str, Any]) -> Type:
+        """
+        Get the class of an object from its dictionary representation.
+
+        :param object_dict: The dictionary representation of the object.
+        :return: The class of the object.
+        """
+        class_name = object_dict["edsl_class_name"]
         if class_name == "QuestionBase":
-            from edsl import QuestionBase
-
             return QuestionBase
         else:
-            from edsl.Base import RegisterSubclassesMeta
-
             return RegisterSubclassesMeta._registry[class_name]
 
     def __repr__(self) -> str:
+        """
+        Return a string representation of the ObjectEntry instance.
+
+        :return: A string representation of the ObjectEntry instance.
+        """
         return f"ObjectEntry(variable_name='{self.variable_name}', object={self.object!r}, description='{self.description}', coop_info={self.coop_info}, created_at={self.created_at}, edsl_class_name='{self.edsl_class_name}')"
 
     def to_dict(self) -> Dict[str, Any]:
+        """
+        Convert the ObjectEntry instance to a dictionary.
+
+        :return: A dictionary representation of the ObjectEntry instance.
+        """
         return {
             "created_at": self.created_at,
             "variable_name": self.variable_name,
@@ -47,34 +71,65 @@ class ObjectEntry:
 
     @classmethod
     def from_dict(cls, d: Dict[str, Any]) -> "ObjectEntry":
+        """
+        Create an ObjectEntry instance from a dictionary.
+
+        :param d: The dictionary representation of the ObjectEntry instance.
+        :return: An ObjectEntry instance.
+        """
         d["object"] = cls._get_class(d["object"]).from_dict(d["object"])
         return cls(**d)
 
     @property
     def hash(self) -> str:
+        """
+        Compute the hash of the object.
+
+        :return: The hash of the object as a string.
+        """
         return str(hash(self.object))
 
     def add_to_namespace(self) -> None:
+        """
+        Add the object to the global namespace using its variable name.
+        """
         globals()[self.variable_name] = self.object
 
     @property
     def coop_info(self) -> Optional[Dict[str, Any]]:
+        """
+        Get the Coop information for the object.
+
+        :return: The Coop information dictionary, if available.
+        """
         return self._coop_info
 
     @coop_info.setter
     def coop_info(self, coop_info: Optional[Dict[str, Any]]) -> None:
+        """
+        Set the Coop information for the object.
+
+        :param coop_info: The Coop information dictionary.
+        """
         self._coop_info = coop_info
 
     def view_on_coop(self) -> None:
+        """
+        Open the object's Coop URL in a web browser.
+        """
         if self.coop_info is None:
             print("Object not pushed to coop")
             return
-        url = self.coop_info["url"]
-        import webbrowser
-
+        url = self.coop_info.get("url")
         webbrowser.open(url)
 
-    def push(self, refresh: bool = False) -> Dict[str, Any]:
+    def push(self, refresh: Optional[bool] = False) -> Dict[str, Any]:
+        """
+        Push the object to the Coop.
+
+        :param refresh: Whether to refresh the Coop entry for the object.
+        :return: The Coop info dictionary.
+        """
         if self.coop_info is None or refresh:
             self.coop_info = self.object.push(description=self.description)
             print(
@@ -85,13 +140,34 @@ class ObjectEntry:
                 f"Object {self.variable_name} already pushed to coop with info: {self._coop_info}"
             )
 
+    def __eq__(self, other: "ObjectEntry") -> bool:
+        """
+        Check if two ObjectEntry instances are equal.
+
+        :param other: The other ObjectEntry instance.
+        :return: True if the two instances are equal, False otherwise.
+        """
+        # if the other item is not "ObjectEntry" type, return False
+        if not isinstance(other, ObjectEntry):
+            return False
+
+        return (
+            self.variable_name == other.variable_name
+            and self.object == other.object
+            and self.description == other.description
+            and self.coop_info == other.coop_info
+            and self.created_at == other.created_at
+            and self.edsl_class_name == other.edsl_class_name
+        )
+
 
 if __name__ == "__main__":
     from edsl import QuestionFreeText
+    from edsl.study import ObjectEntry
 
     q = QuestionFreeText.example()
 
     oe = ObjectEntry("q", q, "This is a question")
     d = oe.to_dict()
     new_oe = ObjectEntry.from_dict(d)
-    # print(oe.coop_info)
+    new_oe == oe

edsl/study/ProofOfWork.py

@@ -1,6 +1,6 @@
 import hashlib
 import time
-from typing import Optional, Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 
 class ProofOfWork:
@@ -16,7 +16,10 @@ class ProofOfWork:
         self.input_data = input_data
 
     def to_dict(self) -> Dict[str, Any]:
-        return {"input_data": self.input_data, "proof": self.proof}
+        return {
+            "input_data": self.input_data,
+            "proof": self.proof,
+        }
 
     @classmethod
     def from_dict(cls, data: Dict[str, Any]) -> "ProofOfWork":

edsl/study/SnapShot.py

@@ -1,16 +1,11 @@
-from typing import Generator
 import inspect
+from typing import Generator, List, Optional
 
 
 class SnapShot:
-    def __init__(self, namespace, exclude=None):
+    def __init__(self, namespace, exclude: Optional[List] = None):
         self.namespace = namespace
-
-        if exclude is None:
-            self.exclude = []
-        else:
-            self.exclude = exclude
-
+        self.exclude = exclude or []
         self.edsl_objects = dict(self._get_edsl_objects(namespace=self.namespace))
         self.edsl_classes = dict(self._get_edsl_classes(namespace=self.namespace))
 
@@ -63,6 +58,7 @@ class SnapShot:
         from edsl.study.Study import Study
 
         for name, value in namespace.items():
+            # TODO check this code logic (if there are other objects with to_dict method that are not from edsl)
             if (
                 hasattr(value, "to_dict")
                 and not inspect.isclass(value)

edsl/study/Study.py

@@ -1,23 +1,19 @@
-import os
-import platform
-import socket
 import copy
 import inspect
 import json
-from typing import Optional, List, Dict
+import os
+import platform
+import socket
 from datetime import datetime
-
-# from edsl.Base import Base
+from typing import Dict, Optional, Union
 from edsl import Cache, set_session_cache, unset_session_cache
 from edsl.utilities.utilities import dict_hash
-
 from edsl.study.ObjectEntry import ObjectEntry
 from edsl.study.ProofOfWork import ProofOfWork
 from edsl.study.SnapShot import SnapShot
+from uuid import UUID
 
-
-class _StudyFrameMarker:
-    pass
+# from edsl.Base import Base
 
 
 class Study:
@@ -58,7 +54,7 @@ class Study:
         proof_of_work=None,
         proof_of_work_difficulty: int = None,
         namespace: Optional[dict] = None,
-        verbose=True,
+        verbose: Optional[bool] = True,
     ):
         """
         :param name: The name of the study.
@@ -469,11 +465,28 @@ class Study:
 
     def push(self, refresh=False) -> None:
         """Push the objects to coop."""
-        for obj_entry in self.objects.values():
-            obj_entry.push(refresh=refresh)
+
+        from edsl import Coop
+
+        coop = Coop()
+        coop.create(self, description=self.description)
+
+    @classmethod
+    def pull(cls, id_or_url: Union[str, UUID], exec_profile=None):
+        """Pull the object from coop."""
+        from edsl.coop import Coop
+
+        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)
 
     def __repr__(self):
-        return f"""Study(name = {self.name}, description = {self.description}, objects = {self.objects}, cache = {self.cache}, filename = "{self.filename}", coop = {self.coop}, use_study_cache = {self.use_study_cache}, overwrite_on_change = {self.overwrite_on_change})"""
+        return f"""Study(name = "{self.name}", description = "{self.description}", objects = {self.objects}, cache = {self.cache}, filename = "{self.filename}", coop = {self.coop}, use_study_cache = {self.use_study_cache}, overwrite_on_change = {self.overwrite_on_change})"""
 
 
 if __name__ == "__main__":

edsl/study/__init__.py

@@ -1,2 +1,4 @@
 from edsl.study.ObjectEntry import ObjectEntry
 from edsl.study.ProofOfWork import ProofOfWork
+from edsl.study.SnapShot import SnapShot
+from edsl.study.Study import Study

{edsl-0.1.29.dev1.dist-info → edsl-0.1.29.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edsl
-Version: 0.1.29.dev1
+Version: 0.1.29.dev3
 Summary: Create and analyze LLM-based surveys
 Home-page: https://www.expectedparrot.com/
 License: MIT

{edsl-0.1.29.dev1.dist-info → edsl-0.1.29.dev3.dist-info}/RECORD

@@ -1,9 +1,9 @@
 edsl/Base.py,sha256=7xc-2fmIGVx-yofU54w5eDU6WSl1AwgrNP2YncDd93M,8847
 edsl/BaseDiff.py,sha256=RoVEh52UJs22yMa7k7jv8se01G62jJNWnBzaZngo-Ug,8260
-edsl/__init__.py,sha256=p4GjE-YbPKoGhGY4YULtJ4N4Sb8hx2GVeLa2UIxj8_U,1347
-edsl/__version__.py,sha256=ZM9fzsLnBYnHLisEQKPZIhnHnvCp-zegZOzwrlIwCZ8,28
+edsl/__init__.py,sha256=k_qOASWIvMoJTJI9m3t-v-VxFlEvp8Ks8ZtO97vrZ5g,1347
+edsl/__version__.py,sha256=KTeLw349pnwI0-4pMOlda9v4escQRhAXeA60NAeoZ4M,28
 edsl/agents/Agent.py,sha256=_PvcQIjeJpyn-ZLOPl3d8f0UZ2AmW-PuHjl9nuhzOEY,25955
-edsl/agents/AgentList.py,sha256=6zHzs7jQFBnNQIRz_zYGDyTGptyvqSqciVwr7kxwyEk,8479
+edsl/agents/AgentList.py,sha256=GK4AeQ7u9_1bR29UqiJOVnq7lqL_4JuUxGEHuM3ZQF0,9099
 edsl/agents/Invigilator.py,sha256=vUjNsQrE724Cepr1XvOp2CTER7GBGZ8XoVl6yzfbeP0,10061
 edsl/agents/InvigilatorBase.py,sha256=IRk2aVSJM3cTXgyuuoc7Dc9oBs311UK0mjkTDmgCjbU,7282
 edsl/agents/PromptConstructionMixin.py,sha256=Yovq-7wZG8i95QLEee90Xi3AFp3TpbzGhM-kdKNLZNg,5129
@@ -93,7 +93,7 @@ edsl/jobs/tasks/task_status_enum.py,sha256=DOyrz61YlIS8R1W7izJNphcLrJ7I_ReUlfdRm
 edsl/jobs/tokens/InterviewTokenUsage.py,sha256=u_6-IHpGFwZ6qMEXr24-jyLVUSSp4dSs_4iAZsBv7O4,1100
 edsl/jobs/tokens/TokenUsage.py,sha256=odj2-wDNEbHl9noyFAQ0DSKV0D9cv3aDOpmXufKZ8O4,1323
 edsl/language_models/LanguageModel.py,sha256=QoltKz6IEK59jKPG3dEI1Si5_9UgqzIAmdTLz5q54nU,19039
-edsl/language_models/ModelList.py,sha256=zRDbYQbG9guJl6o01Pv-BjTAAJIFgCZrSCEJVKUBvbs,2657
+edsl/language_models/ModelList.py,sha256=NAGDfr2bV52y3ITE0_5PbyJYrh-fp7dOu2IWiVawhGQ,2677
 edsl/language_models/RegisterLanguageModelsMeta.py,sha256=2bvWrVau2BRo-Bb1aO-QATH8xxuW_tF7NmqBMGDOfSg,8191
 edsl/language_models/__init__.py,sha256=bvY7Gy6VkX1gSbNkRbGPS-M1kUnb0EohL0FSagaEaTs,109
 edsl/language_models/registry.py,sha256=J7blAbRFHxr2nWSoe61G4p-6kOgzUlKclJ55xVldKWc,3191
@@ -142,7 +142,7 @@ edsl/questions/question_registry.py,sha256=7JvkwFzItwNTXjMwbdfpbZQT_WAXOBxjlSJGC
 edsl/questions/settings.py,sha256=Qk2imv_7N8uFGLoTEr163lbaKPbD2Begd17Hbh4GZKA,290
 edsl/results/Dataset.py,sha256=v_6e1khpfs5Ft-b7GgTKhitr4l9sys4rb_4z-dOdj68,7737
 edsl/results/Result.py,sha256=IvUFq23LwlBP7JN1QDap1fPTTIPUC0QlYEE4lsiKRqI,13913
-edsl/results/Results.py,sha256=r13Rog0bNwHbV5Uat6YKTf-6zH2_sBqLbdsbfnV9zAE,34575
+edsl/results/Results.py,sha256=HkONhTks0st9wc6dmBbgKOBq69ngXNXhGgqUZ33Y57w,34327
 edsl/results/ResultsDBMixin.py,sha256=Dv34yBuF5tkeoYnzbN1YwuBwKh1T-Y77YOYcWlu-GLY,7883
 edsl/results/ResultsExportMixin.py,sha256=KQ1GE2JDzrnl4XkyAGnCdgiFtF_mZrhFNDfkNPg_8C8,20501
 edsl/results/ResultsFetchMixin.py,sha256=VEa0TKDcXbnTinSKs9YaE4WjOSLmlp9Po1_9kklFvSo,848
@@ -156,11 +156,11 @@ edsl/scenarios/ScenarioList.py,sha256=0yH58tbcKJxflsQVcOwh98uU_pzW3w3AGQdKHzftdZ
 edsl/scenarios/ScenarioListPdfMixin.py,sha256=0xV033SMygr_ObamXwjbzfxEQ0zFEwAJ1w7Wq1ejjUY,3719
 edsl/scenarios/__init__.py,sha256=a2CIYQWh9bLeYY4qBJBz7ui7RfxpVd0WlYDf8TaT2D0,45
 edsl/shared.py,sha256=lgLa-mCk2flIhxXarXLtfXZjXG_6XHhC2A3O8yRTjXc,20
-edsl/study/ObjectEntry.py,sha256=AX3HtPfYlEM1gaa5RIgKyoTxWALakL2yiY2r2Vmg0G4,3164
-edsl/study/ProofOfWork.py,sha256=Rcf96Mch4qWersHNBq-vWUePGk1D4KmvNTSR2TfFjs8,3398
-edsl/study/SnapShot.py,sha256=Q_4NPznB3rwOuIuUep1Bw7tenK3cnw-gctDrOq-2Qpk,2364
-edsl/study/Study.py,sha256=oXr86MLb005dDVRAflQpnaqBuqltvbz05qiZCMg040s,16660
-edsl/study/__init__.py,sha256=HzE6z2vgmY19NNOW2s9R_WkmNzqswtkw53XV5fiE6ws,94
+edsl/study/ObjectEntry.py,sha256=e3xRPH8wCN8Pum5HZsQRYgnSoauSvjXunIEH79wu5A8,5788
+edsl/study/ProofOfWork.py,sha256=FaqYtLgeiTEQXWKukPgPUTWMcIN5t1FR7h7Re8QEtgc,3433
+edsl/study/SnapShot.py,sha256=-5zoP4uTvnqtu3zRNMD-fKsNAVYX9psoKRADfotsF9E,2439
+edsl/study/Study.py,sha256=vbivUuESbK4_myMsLdW02hK9BmFXTMrdg-bUyAy1V8I,17080
+edsl/study/__init__.py,sha256=YAvPLTPG3hK_eN9Ar3d1_d-E3laXpSya879A25-JAxU,170
 edsl/surveys/DAG.py,sha256=ozQuHo9ZQ8Eet5nDXtp7rFpiSocvvfxIHtyTnztvodg,2380
 edsl/surveys/Memory.py,sha256=-ikOtkkQldGB_BkPCW3o7AYwV5B_pIwlREw7aVCSHaQ,1113
 edsl/surveys/MemoryPlan.py,sha256=k65OP2oozG_d99OpkBqXXWH5iXxS-ois3hTf8_1iuj8,7786
@@ -193,8 +193,8 @@ edsl/utilities/interface.py,sha256=U8iScZb4jB1npPwbndpjCove59ow2cbAST4fl-46FdI,1
 edsl/utilities/repair_functions.py,sha256=tftmklAqam6LOQQu_-9U44N-llycffhW8LfO63vBmNw,929
 edsl/utilities/restricted_python.py,sha256=5-_zUhrNbos7pLhDl9nr8d24auRlquR6w-vKkmNjPiA,2060
 edsl/utilities/utilities.py,sha256=7LOMa1ahhi2t3SRwEs3VjroAj0A-5Q-Cn83v0HESADQ,10113
-edsl-0.1.29.dev1.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
-edsl-0.1.29.dev1.dist-info/METADATA,sha256=aoyFfhoIFYOHUt4ixbzqy0oSP7WF7g4FalKAreSo1OA,4102
-edsl-0.1.29.dev1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-edsl-0.1.29.dev1.dist-info/entry_points.txt,sha256=yqJs04hJLRusoLzIYXGv8tl4TH__0D5SDRwLKV9IJCg,56
-edsl-0.1.29.dev1.dist-info/RECORD,,
+edsl-0.1.29.dev3.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
+edsl-0.1.29.dev3.dist-info/METADATA,sha256=SHjFA4V7BUbdt63W-l60YPIyaQlKX0Y6Y_BAj8ODvjM,4102
+edsl-0.1.29.dev3.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+edsl-0.1.29.dev3.dist-info/entry_points.txt,sha256=yqJs04hJLRusoLzIYXGv8tl4TH__0D5SDRwLKV9IJCg,56
+edsl-0.1.29.dev3.dist-info/RECORD,,