edsl 0.1.29.dev1__tar.gz → 0.1.29.dev3__tar.gz

{edsl-0.1.29.dev1 → edsl-0.1.29.dev3}/PKG-INFO

@@ -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.dev3/edsl/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.1.29.dev3"

{edsl-0.1.29.dev1 → edsl-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-0.1.29.dev1 → edsl-0.1.29.dev3}/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-0.1.29.dev1 → edsl-0.1.29.dev3}/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-0.1.29.dev3/edsl/study/ObjectEntry.py

@@ -0,0 +1,173 @@
+import time
+import webbrowser
+from typing import Any, Dict, Optional, Type
+from edsl import QuestionBase
+from edsl.Base import RegisterSubclassesMeta
+
+
+class ObjectEntry:
+    def __init__(
+        self,
+        variable_name: str,
+        object: Any,
+        description: str,
+        coop_info: Optional[Dict[str, Any]] = None,
+        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
+        self.edsl_class_name = edsl_class_name or object.__class__.__name__
+        self.description = description
+        self.coop_info = coop_info
+
+    @classmethod
+    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":
+            return QuestionBase
+        else:
+            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,
+            "object": self.object.to_dict(),
+            "edsl_class_name": self.edsl_class_name,
+            "description": self.description,
+            "coop_info": self.coop_info,
+        }
+
+    @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.get("url")
+        webbrowser.open(url)
+
+    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(
+                f"Object {self.variable_name} pushed to coop with info: {self._coop_info}"
+            )
+        else:
+            print(
+                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)
+    new_oe == oe

{edsl-0.1.29.dev1 → edsl-0.1.29.dev3}/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-0.1.29.dev1 → edsl-0.1.29.dev3}/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-0.1.29.dev1 → edsl-0.1.29.dev3}/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-0.1.29.dev1 → edsl-0.1.29.dev3}/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 → edsl-0.1.29.dev3}/pyproject.toml

@@ -1,18 +1,27 @@
 [build-system]
 build-backend = "poetry.core.masonry.api"
-requires = ["poetry-core"]
+requires = [ "poetry-core",]
 
 [tool.poetry]
-authors = ["Apostolos Filippas <apostolos@expectedparrot.com>", "John Horton <john@expectedparrot.com>", "Robin Horton <robin@expectedparrot.com>"]
-classifiers = ["Topic :: Scientific/Engineering :: Artificial Intelligence", "Topic :: Software Development :: Libraries :: Application Frameworks", "Topic :: Software Development :: Libraries :: Python Modules"]
+authors = [ "Apostolos Filippas <apostolos@expectedparrot.com>", "John Horton <john@expectedparrot.com>", "Robin Horton <robin@expectedparrot.com>",]
+classifiers = [ "Topic :: Scientific/Engineering :: Artificial Intelligence", "Topic :: Software Development :: Libraries :: Application Frameworks", "Topic :: Software Development :: Libraries :: Python Modules",]
 description = "Create and analyze LLM-based surveys"
 documentation = "https://docs.expectedparrot.com"
 homepage = "https://www.expectedparrot.com/"
-keywords = ["LLM", "social science", "surveys", "user research"]
+keywords = [ "LLM", "social science", "surveys", "user research",]
 license = "MIT"
 name = "edsl"
 readme = "README.md"
-version = "0.1.29.dev1"
+version = "0.1.29.dev3"
+[[tool.poetry.packages]]
+include = "edsl"
+
+[tool.tomlsort]
+all = true
+in_place = true
+spaces_before_inline_comment = 2
+spaces_indent_inline_array = 4
+trailing_comma_inline_array = true
 
 [tool.poetry.dependencies]
 python = ">=3.9.1,<3.13"
@@ -38,10 +47,16 @@ pymupdf = "^1.24.4"
 restrictedpython = "^7.1"
 pyreadstat = "^1.2.7"
 
+[tool.poetry.scripts]
+postinstall = "scripts.postinstall:main"
+
 [tool.poetry.dependencies.black]
-extras = ["jupyter"]
+extras = [ "jupyter",]
 version = "^24.4.2"
 
+[tool.tomlsort.overrides."tool.poetry.dependencies"]
+table_keys = false
+
 [tool.poetry.group.dev.dependencies]
 coverage = "^7.3.3"
 mypy = "^1.7.1"
@@ -64,19 +79,3 @@ sphinx-fontawesome = "^0.0.6"
 sphinx-rtd-theme = "^2.0.0"
 toml = "^0.10.2"
 toml-sort = "^0.23.1"
-
-[[tool.poetry.packages]]
-include = "edsl"
-
-[tool.poetry.scripts]
-postinstall = "scripts.postinstall:main"
-
-[tool.tomlsort]
-all = true
-in_place = true
-spaces_before_inline_comment = 2
-spaces_indent_inline_array = 4
-trailing_comma_inline_array = true
-
-[tool.tomlsort.overrides."tool.poetry.dependencies"]
-table_keys = false

edsl-0.1.29.dev1/edsl/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.1.29.dev1"

edsl-0.1.29.dev1/edsl/study/ObjectEntry.py

@@ -1,97 +0,0 @@
-import time
-from typing import Optional, Dict, Any, Type
-
-
-class ObjectEntry:
-    def __init__(
-        self,
-        variable_name: str,
-        object: Any,
-        description: str,
-        coop_info: Optional[Dict[str, Any]] = None,
-        created_at: Optional[float] = None,
-        edsl_class_name: Optional[str] = None,
-    ):
-        self.created_at = created_at or time.time()
-        self.variable_name = variable_name
-        self.object = object
-        self.edsl_class_name = edsl_class_name or object.__class__.__name__
-        self.description = description
-        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"]
-        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 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]:
-        return {
-            "created_at": self.created_at,
-            "variable_name": self.variable_name,
-            "object": self.object.to_dict(),
-            "edsl_class_name": self.edsl_class_name,
-            "description": self.description,
-            "coop_info": self.coop_info,
-        }
-
-    @classmethod
-    def from_dict(cls, d: Dict[str, Any]) -> "ObjectEntry":
-        d["object"] = cls._get_class(d["object"]).from_dict(d["object"])
-        return cls(**d)
-
-    @property
-    def hash(self) -> str:
-        return str(hash(self.object))
-
-    def add_to_namespace(self) -> None:
-        globals()[self.variable_name] = self.object
-
-    @property
-    def coop_info(self) -> Optional[Dict[str, Any]]:
-        return self._coop_info
-
-    @coop_info.setter
-    def coop_info(self, coop_info: Optional[Dict[str, Any]]) -> None:
-        self._coop_info = coop_info
-
-    def view_on_coop(self) -> None:
-        if self.coop_info is None:
-            print("Object not pushed to coop")
-            return
-        url = self.coop_info["url"]
-        import webbrowser
-
-        webbrowser.open(url)
-
-    def push(self, refresh: bool = False) -> Dict[str, Any]:
-        if self.coop_info is None or refresh:
-            self.coop_info = self.object.push(description=self.description)
-            print(
-                f"Object {self.variable_name} pushed to coop with info: {self._coop_info}"
-            )
-        else:
-            print(
-                f"Object {self.variable_name} already pushed to coop with info: {self._coop_info}"
-            )
-
-
-if __name__ == "__main__":
-    from edsl import QuestionFreeText
-
-    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)

{edsl-0.1.29.dev1 → edsl-0.1.29.dev3}/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