edsl 0.1.28__py3-none-any.whl → 0.1.29.dev1__py3-none-any.whl

edsl/__version__.py

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

edsl/coop/coop.py

@@ -211,7 +211,7 @@ class Coop:
                 "version": o.get("version"),
                 "description": o.get("description"),
                 "visibility": o.get("visibility"),
-                "url": f"{self.url}/explore/{object_page}/{o.get('uuid')}",
+                "url": f"{self.url}/content/{o.get('uuid')}",
             }
             for o in response.json()
         ]

edsl/jobs/Jobs.py

@@ -368,7 +368,7 @@ class Jobs(Base):
         if self.verbose:
             print(message)
 
-    def _check_parameters(self, strict=False) -> None:
+    def _check_parameters(self, strict=False, warn = True) -> None:
         """Check if the parameters in the survey and scenarios are consistent.
 
         >>> from edsl import QuestionFreeText
@@ -403,7 +403,8 @@ class Jobs(Base):
             if strict:
                 raise ValueError(message)
             else:
-                warnings.warn(message)
+                if warn:
+                    warnings.warn(message)
 
     def run(
         self,

edsl/results/Results.py

@@ -757,10 +757,15 @@ class Results(UserList, Mixins, Base):
 
         return Dataset(new_data)
 
-    def sort_by(self, columns, reverse: bool = False) -> Results:
+    def sort_by(self, *columns: str, reverse: bool = False) -> Results:
+        import warnings
+        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:
         """Sort the results by one or more columns.
 
-        :param columns: A string or a list of strings that are column names.
+        :param columns: One or more column names as strings.
         :param reverse: A boolean that determines whether to sort in reverse order.
 
         Each column name can be a single key, e.g. "how_feeling", or a dot-separated string, e.g. "answer.how_feeling".
@@ -768,7 +773,7 @@ class Results(UserList, Mixins, Base):
         Example:
 
         >>> r = Results.example()
-        >>> r.sort_by(['how_feeling'], reverse=False).select('how_feeling').print()
+        >>> r.sort_by('how_feeling', reverse=False).select('how_feeling').print()
         ┏━━━━━━━━━━━━━━┓
         ┃ answer       ┃
         ┃ .how_feeling ┃
@@ -781,7 +786,7 @@ class Results(UserList, Mixins, Base):
         ├──────────────┤
         │ Terrible     │
         └──────────────┘
-        >>> r.sort_by(['how_feeling'], reverse=True).select('how_feeling').print()
+        >>> r.sort_by('how_feeling', reverse=True).select('how_feeling').print()
         ┏━━━━━━━━━━━━━━┓
         ┃ answer       ┃
         ┃ .how_feeling ┃
@@ -795,9 +800,6 @@ class Results(UserList, Mixins, Base):
         │ Great        │
         └──────────────┘
         """
-        if isinstance(columns, str):
-            columns = [columns]
-
         def to_numeric_if_possible(v):
             try:
                 return float(v)
@@ -805,28 +807,14 @@ class Results(UserList, Mixins, Base):
                 return v
 
         def sort_key(item):
-            # Create an empty list to store the key components for sorting
             key_components = []
-
-            # Loop through each column specified in the sort
             for col in columns:
-                # Parse the column into its data type and key
                 data_type, key = self._parse_column(col)
-
-                # Retrieve the value from the item based on the parsed data type and key
                 value = item.get_value(data_type, key)
-
-                # Convert the value to numeric if possible, and append it to the key components
                 key_components.append(to_numeric_if_possible(value))
-
-            # Convert the list of key components into a tuple to serve as the sorting key
             return tuple(key_components)
 
-        new_data = sorted(
-            self.data,
-            key=sort_key,
-            reverse=reverse,
-        )
+        new_data = sorted(self.data, key=sort_key, reverse=reverse)
         return Results(survey=self.survey, data=new_data, created_columns=None)
 
     def filter(self, expression: str) -> Results:

edsl/scenarios/ScenarioList.py

@@ -119,7 +119,7 @@ class ScenarioList(Base, UserList, ScenarioListPdfMixin, ResultsExportMixin):
 
         return ScenarioList(random.sample(self.data, n))
 
-    def expand(self, expand_field: str) -> ScenarioList:
+    def expand(self, expand_field: str, number_field = False) -> ScenarioList:
         """Expand the ScenarioList by a field.
 
         Example:
@@ -133,9 +133,11 @@ class ScenarioList(Base, UserList, ScenarioListPdfMixin, ResultsExportMixin):
             values = scenario[expand_field]
             if not isinstance(values, Iterable) or isinstance(values, str):
                 values = [values]
-            for value in values:
+            for index, value in enumerate(values):
                 new_scenario = scenario.copy()
                 new_scenario[expand_field] = value
+                if number_field:
+                    new_scenario[expand_field + '_number'] = index + 1
                 new_scenarios.append(new_scenario)
         return ScenarioList(new_scenarios)
 
@@ -178,16 +180,20 @@ class ScenarioList(Base, UserList, ScenarioListPdfMixin, ResultsExportMixin):
 
         return ScenarioList(new_data)
 
-    def order_by(self, field: str, reverse: bool = False) -> ScenarioList:
-        """Order the scenarios by a field.
+    def order_by(self, *fields: str, reverse: bool = False) -> ScenarioList:
+        """Order the scenarios by one or more fields.
 
         Example:
 
         >>> s = ScenarioList([Scenario({'a': 1, 'b': 2}), Scenario({'a': 1, 'b': 1})])
-        >>> s.order_by('b')
+        >>> s.order_by('b', 'a')
         ScenarioList([Scenario({'a': 1, 'b': 1}), Scenario({'a': 1, 'b': 2})])
         """
-        return ScenarioList(sorted(self, key=lambda x: x[field], reverse=reverse))
+
+        def get_sort_key(scenario: Any) -> tuple:
+            return tuple(scenario[field] for field in fields)
+        
+        return ScenarioList(sorted(self, key=get_sort_key, reverse=reverse))
 
     def filter(self, expression: str) -> ScenarioList:
         """
@@ -437,7 +443,7 @@ class ScenarioList(Base, UserList, ScenarioListPdfMixin, ResultsExportMixin):
         pretty_labels: Optional[dict] = None,
         filename: str = None,
     ):
-        print_scenario_list(self)
+        print_scenario_list(self[:max_rows])
 
     def __getitem__(self, key: Union[int, slice]) -> Any:
         """Return the item at the given index.

edsl/study/Study.py

@@ -473,7 +473,7 @@ class Study:
             obj_entry.push(refresh=refresh)
 
     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.28.dist-info → edsl-0.1.29.dev1.dist-info}/METADATA

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

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

@@ -1,7 +1,7 @@
 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=MWZDdAHrdUZS0c3VlLqX4O1eaxPodI7irMtEvknKQ94,23
+edsl/__version__.py,sha256=ZM9fzsLnBYnHLisEQKPZIhnHnvCp-zegZOzwrlIwCZ8,28
 edsl/agents/Agent.py,sha256=_PvcQIjeJpyn-ZLOPl3d8f0UZ2AmW-PuHjl9nuhzOEY,25955
 edsl/agents/AgentList.py,sha256=6zHzs7jQFBnNQIRz_zYGDyTGptyvqSqciVwr7kxwyEk,8479
 edsl/agents/Invigilator.py,sha256=vUjNsQrE724Cepr1XvOp2CTER7GBGZ8XoVl6yzfbeP0,10061
@@ -31,7 +31,7 @@ edsl/conversation/car_buying.py,sha256=70nCXQNCc2kR-NBY6YOPHfkuZ5g7nww2r4GwlYosV
 edsl/conversation/mug_negotiation.py,sha256=mjvAqErD4AjN3G2za2c-X-3axOShW-zAJUeiJqTxVPA,2616
 edsl/conversation/next_speaker_utilities.py,sha256=bqr5JglCd6bdLc9IZ5zGOAsmN2F4ERiubSMYvZIG7qk,3629
 edsl/coop/__init__.py,sha256=4iZCwJSzJVyjBYk8ggGxY2kZjq9dXVT1jhyPDNyew4I,115
-edsl/coop/coop.py,sha256=JfcbOv487mG9rc5k_iXWTsrB60pwbj6eljtcDj_mY5A,24854
+edsl/coop/coop.py,sha256=JvRgnZqQfuO-2idiW3etAk2RNZ9yaAzmLMYt8KZ0qhU,24840
 edsl/coop/utils.py,sha256=OVfVUIBCH5ATj0yFLe0Ui0_KYGwwzWsVHqyavVVaN_w,3773
 edsl/data/Cache.py,sha256=f7tuzuA7T4C9qp8BP45UamcmJbvH8RGClr9lbf7PS1s,14880
 edsl/data/CacheEntry.py,sha256=AnZBUautQc19KhE6NkI87U_P9wDZI2eu-8B1XopPTOI,7235
@@ -65,7 +65,7 @@ edsl/inference_services/rate_limits_cache.py,sha256=HYslviz7mxF9U4CUTPAkoyBsiXjS
 edsl/inference_services/registry.py,sha256=-Yz86do-KZraunIrziVs9b95EbY-__JUnQb5Ulni7KI,483
 edsl/inference_services/write_available.py,sha256=NNwhATlaMp8IYY635MSx-oYxt5X15acjAfaqYCo_I1Y,285
 edsl/jobs/Answers.py,sha256=mtSjlRbVJbqZKA6DBngEwDxIfloRAKkrsTRriMTPRD4,1493
-edsl/jobs/Jobs.py,sha256=aCncdADfc834GLwUEWrOqqLWoqhqE31slZMoSu6sQ2c,27019
+edsl/jobs/Jobs.py,sha256=zRJMeqeOSrkZrVvoc3KUw1dXW6C30imtVCWKTglpxZw,27061
 edsl/jobs/__init__.py,sha256=aKuAyd_GoalGj-k7djOoVwEbFUE2XLPlikXaA1_8yAg,32
 edsl/jobs/buckets/BucketCollection.py,sha256=LA8DBVwMdeTFCbSDI0S2cDzfi_Qo6kRizwrG64tE8S4,1844
 edsl/jobs/buckets/ModelBuckets.py,sha256=1_WPi1wV5k8kO9TuLEA7tDt9rF_myaC5XKyf4T0EmQ8,1969
@@ -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=xCAv6-azf9jdBuvGUAz8AdgaOjVINsPWqIkJqprecHw,34939
+edsl/results/Results.py,sha256=r13Rog0bNwHbV5Uat6YKTf-6zH2_sBqLbdsbfnV9zAE,34575
 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
@@ -152,14 +152,14 @@ edsl/results/__init__.py,sha256=2YcyiVtXi-3vIV0ZzOy1PqBLm2gaziufJVi4fdNrAt8,80
 edsl/scenarios/Scenario.py,sha256=C2HPOcP8YypcWffay6AA4cSPlD35xeMywiDomLCRHcY,14768
 edsl/scenarios/ScenarioHtmlMixin.py,sha256=EmugmbPJYW5eZS30rM6pDMDQD9yrrvHjmgZWB1qBfq4,1882
 edsl/scenarios/ScenarioImageMixin.py,sha256=VJ5FqyPrL5-ieORlWMpnjmOAFIau8QFZCIZyEBKgb6I,3530
-edsl/scenarios/ScenarioList.py,sha256=TGyV94T5FmIgYmdf8IjroY-gW8s6CtCsM4D7JJNvRVA,17606
+edsl/scenarios/ScenarioList.py,sha256=0yH58tbcKJxflsQVcOwh98uU_pzW3w3AGQdKHzftdZk,17895
 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=gJEY_aYCu5JoxT836G4Zqm4M2IP_NeJ7-Poy6BI_I2w,16658
+edsl/study/Study.py,sha256=oXr86MLb005dDVRAflQpnaqBuqltvbz05qiZCMg040s,16660
 edsl/study/__init__.py,sha256=HzE6z2vgmY19NNOW2s9R_WkmNzqswtkw53XV5fiE6ws,94
 edsl/surveys/DAG.py,sha256=ozQuHo9ZQ8Eet5nDXtp7rFpiSocvvfxIHtyTnztvodg,2380
 edsl/surveys/Memory.py,sha256=-ikOtkkQldGB_BkPCW3o7AYwV5B_pIwlREw7aVCSHaQ,1113
@@ -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.28.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
-edsl-0.1.28.dist-info/METADATA,sha256=jh2_asIb3GQcl89X7NdtesPTr1dLM8H7jQDZLjqOnlY,4097
-edsl-0.1.28.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-edsl-0.1.28.dist-info/entry_points.txt,sha256=yqJs04hJLRusoLzIYXGv8tl4TH__0D5SDRwLKV9IJCg,56
-edsl-0.1.28.dist-info/RECORD,,
+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,,