edsl 0.1.34.dev2__tar.gz → 0.1.35__tar.gz

{edsl-0.1.34.dev2 → edsl-0.1.35}/PKG-INFO

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

edsl-0.1.35/edsl/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.1.35"

{edsl-0.1.34.dev2 → edsl-0.1.35}/edsl/agents/PromptConstructor.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import Dict, Any, Optional, Set
 from collections import UserList
-import enum
+import pdb
 
 from jinja2 import Environment, meta
 
@@ -197,14 +197,15 @@ class PromptConstructor:
                     self.question.question_options = question_options
 
                 # might be getting it from the prior answers
-                if isinstance(
-                    question_options := self.prior_answers_dict()
-                    .get(question_option_key)
-                    .answer,
-                    list,
-                ):
-                    question_data["question_options"] = question_options
-                    self.question.question_options = question_options
+                if self.prior_answers_dict().get(question_option_key) is not None:
+                    if isinstance(
+                        question_options := self.prior_answers_dict()
+                        .get(question_option_key)
+                        .answer,
+                        list,
+                    ):
+                        question_data["question_options"] = question_options
+                        self.question.question_options = question_options
 
             replacement_dict = (
                 {key: f"<see file {key}>" for key in self.scenario_file_keys}
@@ -240,10 +241,13 @@ class PromptConstructor:
                     )
 
             if undefined_template_variables:
-                # breakpoint()
-                raise QuestionScenarioRenderError(
-                    f"Question instructions still has variables: {undefined_template_variables}."
-                )
+                msg = f"Question instructions still has variables: {undefined_template_variables}."
+                import warnings
+
+                warnings.warn(msg)
+                # raise QuestionScenarioRenderError(
+                #     f"Question instructions still has variables: {undefined_template_variables}."
+                # )
 
             ####################################
             # Check if question has instructions - these are instructions in a Survey that can apply to multiple follow-on questions

{edsl-0.1.34.dev2 → edsl-0.1.35}/edsl/inference_services/OpenAIService.py

@@ -188,12 +188,16 @@ class OpenAIService(InferenceServiceABC):
                 else:
                     content = user_prompt
                 client = self.async_client()
+
                 messages = [
                     {"role": "system", "content": system_prompt},
                     {"role": "user", "content": content},
                 ]
-                if system_prompt == "" and self.omit_system_prompt_if_empty:
+                if (
+                    system_prompt == "" and self.omit_system_prompt_if_empty
+                ) or "o1" in self.model:
                     messages = messages[1:]
+
                 params = {
                     "model": self.model,
                     "messages": messages,
@@ -205,7 +209,14 @@ class OpenAIService(InferenceServiceABC):
                     "logprobs": self.logprobs,
                     "top_logprobs": self.top_logprobs if self.logprobs else None,
                 }
-                response = await client.chat.completions.create(**params)
+                if "o1" in self.model:
+                    params.pop("max_tokens")
+                    params["max_completion_tokens"] = self.max_tokens
+                    params["temperature"] = 1
+                try:
+                    response = await client.chat.completions.create(**params)
+                except Exception as e:
+                    print(e)
                 return response.model_dump()
 
         LLM.__name__ = "LanguageModel"

{edsl-0.1.34.dev2 → edsl-0.1.35}/edsl/jobs/interviews/Interview.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 import asyncio
 from typing import Any, Type, List, Generator, Optional, Union
+import copy
 
 from tenacity import (
     retry,
@@ -99,7 +100,9 @@ class Interview(InterviewStatusMixin):
 
         """
         self.agent = agent
-        self.survey = survey
+        # what I would like to do
+        self.survey = copy.deepcopy(survey)  # survey  copy.deepcopy(survey)
+        # self.survey = survey
         self.scenario = scenario
         self.model = model
         self.debug = debug

{edsl-0.1.34.dev2 → edsl-0.1.35}/edsl/questions/templates/numerical/answering_instructions.jinja

@@ -1,7 +1,6 @@
 This question requires a numerical response in the form of an integer or decimal (e.g., -12, 0, 1, 2, 3.45, ...).
 Respond with just your number on a single line.
 If your response is equivalent to zero, report '0'
-If you cannot determine the answer, report 'None'
 
 {% if include_comment %}
 After the answer, put a comment explaining your choice on the next line.

{edsl-0.1.34.dev2 → edsl-0.1.35}/edsl/scenarios/ScenarioList.py

@@ -39,6 +39,15 @@ class ScenarioList(Base, UserList, ScenarioListMixin):
             super().__init__([])
         self.codebook = codebook or {}
 
+    def unique(self) -> ScenarioList:
+        """Return a list of unique scenarios.
+
+        >>> s = ScenarioList([Scenario({'a': 1}), Scenario({'a': 1}), Scenario({'a': 2})])
+        >>> s.unique()
+        ScenarioList([Scenario({'a': 1}), Scenario({'a': 2})])
+        """
+        return ScenarioList(list(set(self)))
+
     @property
     def has_jinja_braces(self) -> bool:
         """Check if the ScenarioList has Jinja braces."""

{edsl-0.1.34.dev2 → edsl-0.1.35}/edsl/surveys/base.py

@@ -36,6 +36,10 @@ class EndOfSurveyParent:
         """
         return self
 
+    def __deepcopy__(self, memo):
+        # Return the same instance when deepcopy is called
+        return self
+
     def __radd__(self, other):
         """Add the object to another object.
 

{edsl-0.1.34.dev2 → edsl-0.1.35}/pyproject.toml

@@ -13,7 +13,7 @@ keywords = ["LLM", "social science", "surveys", "user research"]
 license = "MIT"
 name = "edsl"
 readme = "README.md"
-version = "0.1.34.dev2"
+version = "0.1.35"
 
 [tool.poetry.dependencies]
 python = ">=3.9.1,<3.13"

edsl-0.1.34.dev2/edsl/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.1.34.dev2"