edsl 0.1.53__py3-none-any.whl → 0.1.54__py3-none-any.whl

edsl/questions/question_dict.py

@@ -51,7 +51,7 @@ def _parse_type_string(type_str: str) -> Any:
         return List[Any]
     elif type_str.startswith("list["):
         # e.g. "list[str]" or "list[int]" etc.
-        inner = type_str[len("list["):-1].strip()
+        inner = type_str[len("list[") : -1].strip()
         return List[_parse_type_string(inner)]
     # If none matched, return a very permissive type or raise an error
     return Any
@@ -74,15 +74,16 @@ def create_dict_response(
     # 1) Build the 'answer' submodel fields
     #    Each key is required (using `...`), with the associated type from value_types.
     field_definitions = {}
+    if len(value_types) == 0:
+        value_types = ["str"] * len(answer_keys)  # Default to str if no types provided
+
     for key, t_str in zip(answer_keys, value_types):
         python_type = _parse_type_string(t_str)
         field_definitions[key] = (python_type, Field(...))
 
     # Use Pydantic's create_model to construct an "AnswerSubModel" with these fields
     AnswerSubModel = create_model(
-        "AnswerSubModel",
-        __base__=BaseModel,
-        **field_definitions
+        "AnswerSubModel", __base__=BaseModel, **field_definitions
     )
 
     # 2) Define the top-level model with `answer` + optional `comment`
@@ -102,12 +103,12 @@ def create_dict_response(
 class DictResponseValidator(ResponseValidatorABC):
     """
     Validator for dictionary responses with specific keys and value types.
-    
+
     This validator ensures that:
     1. All required keys are present in the answer
     2. Each value has the correct type as specified
     3. Extra keys are forbidden unless permissive=True
-    
+
     Examples:
         >>> from edsl.questions import QuestionDict
         >>> q = QuestionDict(
@@ -119,7 +120,7 @@ class DictResponseValidator(ResponseValidatorABC):
         >>> validator = q.response_validator
         >>> result = validator.validate({
         ...     "answer": {
-        ...         "name": "Pancakes", 
+        ...         "name": "Pancakes",
         ...         "ingredients": ["flour", "milk", "eggs"],
         ...         "steps": ["Mix", "Cook", "Serve"]
         ...     }
@@ -127,12 +128,13 @@ class DictResponseValidator(ResponseValidatorABC):
         >>> sorted(result.keys())
         ['answer', 'comment', 'generated_tokens']
     """
+
     required_params = ["answer_keys", "permissive"]
 
     def fix(self, response, verbose=False):
         """
         Attempt to fix an invalid dictionary response.
-        
+
         Examples:
             >>> # Set up validator with proper response model
             >>> from pydantic import BaseModel, create_model, Field
@@ -151,7 +153,7 @@ class DictResponseValidator(ResponseValidatorABC):
             ...     permissive=False
             ... )
             >>> validator.value_types = ["str", "int"]
-            
+
             # Fix dictionary with comment on same line
             >>> response = "{'name': 'john', 'age': 23} Here you go."
             >>> result = validator.fix(response)
@@ -159,13 +161,13 @@ class DictResponseValidator(ResponseValidatorABC):
             {'name': 'john', 'age': 23}
             >>> result['comment']
             'Here you go.'
-            
+
             # Fix type conversion (string to int)
             >>> response = {"answer": {"name": "john", "age": "23"}}
             >>> result = validator.fix(response)
             >>> dict(result['answer'])  # Convert to dict for consistent output
             {'name': 'john', 'age': 23}
-            
+
             # Fix list from comma-separated string
             >>> AnswerModel2 = create_model('AnswerModel2', name=(str, ...), hobbies=(List[str], ...))
             >>> ResponseModel2 = create_model(
@@ -184,7 +186,7 @@ class DictResponseValidator(ResponseValidatorABC):
             >>> result = validator.fix(response)
             >>> dict(result['answer'])  # Convert to dict for consistent output
             {'name': 'john', 'hobbies': ['reading', 'gaming', 'coding']}
-            
+
             # Handle invalid input gracefully
             >>> response = "not a dictionary"
             >>> validator.fix(response)
@@ -194,14 +196,14 @@ class DictResponseValidator(ResponseValidatorABC):
         if isinstance(response, str):
             # Try to find where the dictionary ends and comment begins
             try:
-                dict_match = re.match(r'(\{.*?\})(.*)', response.strip())
+                dict_match = re.match(r"(\{.*?\})(.*)", response.strip())
                 if dict_match:
                     dict_str, comment = dict_match.groups()
                     try:
                         answer_dict = ast.literal_eval(dict_str)
                         response = {
                             "answer": answer_dict,
-                            "comment": comment.strip() if comment.strip() else None
+                            "comment": comment.strip() if comment.strip() else None,
                         }
                     except (ValueError, SyntaxError):
                         pass
@@ -213,10 +215,10 @@ class DictResponseValidator(ResponseValidatorABC):
             if verbose:
                 print("Cannot fix response: 'answer' field missing or not a dictionary")
             return response
-            
+
         answer_dict = response["answer"]
         fixed_answer = {}
-        
+
         # Try to convert values to expected types
         for key, type_str in zip(self.answer_keys, getattr(self, "value_types", [])):
             if key in answer_dict:
@@ -226,20 +228,24 @@ class DictResponseValidator(ResponseValidatorABC):
                     try:
                         fixed_answer[key] = int(value)
                         if verbose:
-                            print(f"Converted '{key}' from {type(value).__name__} to int")
+                            print(
+                                f"Converted '{key}' from {type(value).__name__} to int"
+                            )
                         continue
                     except (ValueError, TypeError):
                         pass
-                
+
                 elif type_str == "float" and not isinstance(value, float):
                     try:
                         fixed_answer[key] = float(value)
                         if verbose:
-                            print(f"Converted '{key}' from {type(value).__name__} to float")
+                            print(
+                                f"Converted '{key}' from {type(value).__name__} to float"
+                            )
                         continue
                     except (ValueError, TypeError):
                         pass
-                
+
                 elif type_str.startswith("list[") and not isinstance(value, list):
                     # Try to convert string to list by splitting
                     if isinstance(value, str):
@@ -248,22 +254,22 @@ class DictResponseValidator(ResponseValidatorABC):
                         if verbose:
                             print(f"Converted '{key}' from string to list: {items}")
                         continue
-                
+
                 # If no conversion needed or possible, keep original
                 fixed_answer[key] = value
-        
+
         # Preserve any keys we didn't try to fix
         for key, value in answer_dict.items():
             if key not in fixed_answer:
                 fixed_answer[key] = value
-        
+
         # Return fixed response
         fixed_response = {
             "answer": fixed_answer,
             "comment": response.get("comment"),
-            "generated_tokens": response.get("generated_tokens")
+            "generated_tokens": response.get("generated_tokens"),
         }
-        
+
         try:
             # Validate the fixed answer
             self.response_model.model_validate(fixed_response)
@@ -281,12 +287,12 @@ class DictResponseValidator(ResponseValidatorABC):
                 "answer": {
                     "name": "Hot Chocolate",
                     "num_ingredients": 5,
-                    "ingredients": ["milk", "cocoa", "sugar"]
+                    "ingredients": ["milk", "cocoa", "sugar"],
                 }
             },
             {
                 "answer_keys": ["name", "num_ingredients", "ingredients"],
-                "value_types": ["str", "int", "list[str]"]
+                "value_types": ["str", "int", "list[str]"],
             },
         )
     ]
@@ -300,7 +306,7 @@ class DictResponseValidator(ResponseValidatorABC):
             {"answer": {"ingredients": "milk"}},  # Should be a list
             {"answer_keys": ["ingredients"], "value_types": ["list[str]"]},
             "Key 'ingredients' should be a list, got str",
-        )
+        ),
     ]
 
 
@@ -373,7 +379,9 @@ class QuestionDict(QuestionBase):
             raise QuestionCreationValidationError(
                 "Length of value_types must match length of answer_keys."
             )
-        if self.value_descriptions and len(self.value_descriptions) != len(self.answer_keys):
+        if self.value_descriptions and len(self.value_descriptions) != len(
+            self.answer_keys
+        ):
             raise QuestionCreationValidationError(
                 "Length of value_descriptions must match length of answer_keys."
             )
@@ -386,7 +394,7 @@ class QuestionDict(QuestionBase):
         return create_dict_response(
             answer_keys=self.answer_keys,
             value_types=self.value_types or [],
-            permissive=self.permissive
+            permissive=self.permissive,
         )
 
     def _get_default_answer(self) -> Dict[str, Any]:
@@ -397,7 +405,7 @@ class QuestionDict(QuestionBase):
                 "title": "Sample Recipe",
                 "ingredients": ["ingredient1", "ingredient2"],
                 "num_ingredients": 2,
-                "instructions": "Sample instructions"
+                "instructions": "Sample instructions",
             }
 
         answer = {}
@@ -405,7 +413,7 @@ class QuestionDict(QuestionBase):
             t_str = type_str.lower()
             if t_str.startswith("list["):
                 # e.g. list[str], list[int], etc.
-                inner = t_str[len("list["):-1].strip()
+                inner = t_str[len("list[") : -1].strip()
                 if inner == "str":
                     answer[key] = ["sample_string"]
                 elif inner == "int":
@@ -445,7 +453,9 @@ class QuestionDict(QuestionBase):
             return f"Template {template_name} not found in {template_dir}."
 
     @staticmethod
-    def _normalize_value_types(value_types: Optional[List[Union[str, type]]]) -> Optional[List[str]]:
+    def _normalize_value_types(
+        value_types: Optional[List[Union[str, type]]]
+    ) -> Optional[List[str]]:
         """
         Convert all value_types to string representations (e.g. "int", "list[str]", etc.).
         This logic is similar to your original approach but expanded to handle
@@ -486,7 +496,7 @@ class QuestionDict(QuestionBase):
         }
 
     @classmethod
-    def from_dict(cls, data: dict) -> 'QuestionDict':
+    def from_dict(cls, data: dict) -> "QuestionDict":
         """Recreate from a dictionary."""
         return cls(
             question_name=data["question_name"],
@@ -500,7 +510,7 @@ class QuestionDict(QuestionBase):
 
     @classmethod
     @inject_exception
-    def example(cls) -> 'QuestionDict':
+    def example(cls) -> "QuestionDict":
         """Return an example question."""
         return cls(
             question_name="example",
@@ -511,16 +521,13 @@ class QuestionDict(QuestionBase):
                 "The title of the recipe.",
                 "A list of ingredients.",
                 "The number of ingredients.",
-                "The instructions for making the recipe."
+                "The instructions for making the recipe.",
             ],
         )
 
     def _simulate_answer(self) -> dict:
         """Simulate an answer for the question."""
-        return {
-            "answer": self._get_default_answer(),
-            "comment": None
-        }
+        return {"answer": self._get_default_answer(), "comment": None}
 
 
 if __name__ == "__main__":

{edsl-0.1.53.dist-info → edsl-0.1.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edsl
-Version: 0.1.53
+Version: 0.1.54
 Summary: Create and analyze LLM-based surveys
 Home-page: https://www.expectedparrot.com/
 License: MIT
@@ -83,6 +83,7 @@ results = q.run()
 results.select("example")
 ```
 
+
 > | answer.example  |
 > |-----------------|
 > | Good            |

{edsl-0.1.53.dist-info → edsl-0.1.54.dist-info}/RECORD

@@ -1,5 +1,5 @@
 edsl/__init__.py,sha256=SXi_Zm4kf6H2WW_YeTuF6zRNZEWKzpKa7NRXUzn2Ty4,4593
-edsl/__version__.py,sha256=FdQ5_-vfyHXSNAuzQXtxxDH2WjNJ3g581mH_zvly6Xo,23
+edsl/__version__.py,sha256=0U9S9zRz7MduvARyiWFUbfYZNKDf9XCo9-1NqTcx3CU,23
 edsl/agents/__init__.py,sha256=AyhfXjygRHT1Pd9w16lcu5Bu0jnBmMPz86aKP1uRL3Y,93
 edsl/agents/agent.py,sha256=svTVvvg9eCMUhnb49Bxsf9nAwXragtRaeBkyB6q89EE,54423
 edsl/agents/agent_list.py,sha256=JA39_6RSmiD2mqJgWr2NWovNxNmu4mhZbYmn5be87NQ,21572
@@ -87,7 +87,7 @@ edsl/inference_services/services/mistral_ai_service.py,sha256=Q4eWCAUhsibMaBpq5I
 edsl/inference_services/services/ollama_service.py,sha256=quSKlgD0bHG9mO_s9verGePfqQi_rZWovHEQ6dy-Fe0,303
 edsl/inference_services/services/open_ai_service.py,sha256=_gK1MVJGla-LF9YvySNuVDY5g-SmSsNhByEfIO7usAI,8481
 edsl/inference_services/services/perplexity_service.py,sha256=th6Zx3YNBBc4MsgjzmpkAfqMwqrPNFBdAhmUxed-gYM,5793
-edsl/inference_services/services/test_service.py,sha256=ZvqXlshPlo2okPCoDE7xK4qgQalTZN2mM0XEjZmI5jY,2987
+edsl/inference_services/services/test_service.py,sha256=1skcodQ9JN7IsIeaperh7gxeQ_CGEQkO2mamNQTHAx0,3363
 edsl/inference_services/services/together_ai_service.py,sha256=biUYs07jsrIHp19O81o0nJCwYdSWudMEXdGtmA1-y60,6151
 edsl/inference_services/services/xai_service.py,sha256=hJbXF26DuFTZdy0lYT1wo3yyuWDcwcXA6EiGYUahK1w,280
 edsl/inference_services/write_available.py,sha256=9L8chJb8iafHfwRBfqZKjMjkSBRWUa5gEe7F0mxsZu0,261
@@ -112,7 +112,7 @@ edsl/interviews/statistics.py,sha256=lZCtq79QrDKG3jXao_OWuBRhnly9VyuhM6IdTJaYqPg
 edsl/invigilators/__init__.py,sha256=fKbZ7p9-kMelpvET3Ku2Owu-tL_apC-8gi9JychpMBY,1843
 edsl/invigilators/exceptions.py,sha256=ejoF-Gt-YcnW1yHyfpJ3jZm8AC_zD0GCYafRO2LlAMQ,2767
 edsl/invigilators/invigilator_base.py,sha256=DgrXTK4AAxXr4wg2pzc0p1aGPPf1UUt01C-JW1UBTvo,20099
-edsl/invigilators/invigilators.py,sha256=UH8gy59qq0_f9jzumDbdugF0SvGW_eIr2GT5zCUO8V0,22355
+edsl/invigilators/invigilators.py,sha256=hY66Nwl1_Y-f_MAs7iqbU36zRQTKQA4JuW2Zi2Rq4qc,22365
 edsl/invigilators/prompt_constructor.py,sha256=THHGcZPI-QUOH8Z9cQEzH7bZEoo0V_Nc_Phlhc9AzL0,19115
 edsl/invigilators/prompt_helpers.py,sha256=LuMZFZkInPY8M7Rw9fG9rpJIcT89tr2_Iq10ZHH_Y4A,5409
 edsl/invigilators/question_instructions_prompt_builder.py,sha256=E5zpwctpt_5JjONkZRcMwB0MACAzDvvnzUhmuWTnjd0,9684
@@ -130,7 +130,7 @@ edsl/jobs/jobs.py,sha256=HI8akFqRbDVEeT8DuIy2i_tyEx6Gnv3oOU7SS0TrmcM,38931
 edsl/jobs/jobs_checks.py,sha256=bfPJ3hQ4qvRBhyte4g-4J8zExJxJr3nlLHmtVmFPJcQ,5390
 edsl/jobs/jobs_component_constructor.py,sha256=XxnJCQEJVC99QHNXjhR3lCfzSn46Z0JMtkgHRiBUfj8,6907
 edsl/jobs/jobs_interview_constructor.py,sha256=1XTfQ-XAsabIagYQWWn9jLkdXAWqw_7KffNVLQWCfDs,2001
-edsl/jobs/jobs_pricing_estimation.py,sha256=znHvWlWM8Gc_im1V5TebITpLYEWpJFc1IztJic6i21o,12789
+edsl/jobs/jobs_pricing_estimation.py,sha256=rb4zr0d8DicLmHy2_0l1qVAdskCyBLrXeqtz5Qa60c8,15433
 edsl/jobs/jobs_remote_inference_logger.py,sha256=1lOlzsBXg69zwVP40Je-WiI4wcvS-Ov7BBuW6V4Mkes,9185
 edsl/jobs/jobs_runner_asyncio.py,sha256=wSs_Ts__-2BbPqZ_xQG7BM1mQ1YqZFliPUoq9MFuSUY,11034
 edsl/jobs/jobs_runner_status.py,sha256=hIHHC_sWkK6clqQwnxz8YXAvwrEoL-VVtwWnHij3vfw,10446
@@ -146,7 +146,7 @@ edsl/key_management/models.py,sha256=z9TimNMnz47mnITM5SlJy2m2sk1aKKtt0ybV89rsaiY
 edsl/language_models/__init__.py,sha256=WtefJs6XOCn5RSz22PgoAi3eTEr1NzGtnnBpDIie2mg,240
 edsl/language_models/compute_cost.py,sha256=noWk0osCANksfKSh0sXFkPrcQegtSV8-jCRBjz_52uQ,2570
 edsl/language_models/exceptions.py,sha256=P9dMA8XfK_qcuXNJZ-Xsb_Ny-12Ldu3fPC133RB40Ek,13728
-edsl/language_models/language_model.py,sha256=iIe0YxTulrDNwuvn8px6DaLXpcw75oRSLGf0mwmyW4M,39643
+edsl/language_models/language_model.py,sha256=oYxJtE7lBR-1uPnby5-zQc5je0-3OLU0fw3QbQcsbTI,40279
 edsl/language_models/model.py,sha256=UhBFV7eSgUBub0hR7vpmnerXvLXTX-4Xda2tA_eNJbU,11616
 edsl/language_models/model_list.py,sha256=Eb62xQdrlayqWYyJVgYxheMiNi14e1U9b_12qYzy1ws,4522
 edsl/language_models/price_manager.py,sha256=vLqMmrFecdW6aH4csFoM8w_MtRmMGCmi8pb79oS5_EY,5747
@@ -155,7 +155,7 @@ edsl/language_models/registry.py,sha256=HY1fEHKXz92AQF8fIMfkvtA8p-_o9mWwr9rt2VDO
 edsl/language_models/repair.py,sha256=ljm0xc9e1tMdyKc9b-v7ikpYRBh639xJ11SkDzI2vZE,5245
 edsl/language_models/unused/fake_openai_call.py,sha256=dxbL5e4NLF-eTk9IduPyGwLiVCX_-eGCJDaLYPlQTqc,364
 edsl/language_models/unused/fake_openai_service.py,sha256=p0slW9cTdhuCjym64-uOcH_eHu4tzq5CHPPjvY8C2Ok,1691
-edsl/language_models/utilities.py,sha256=SMhP6-fs7oU2YU-iphF2mxTnN_tw6spDr2CJfQBBCCk,2235
+edsl/language_models/utilities.py,sha256=WHhSVzBw_ujm226sfxi38uCiAMJn-PC4NarQP7bqUYU,2284
 edsl/load_plugins.py,sha256=rJJiVHguGoeri4ZT6E3AKftRjibnw-o6JMA9R6Qv3Ng,2480
 edsl/logger.py,sha256=vnik_w_gHPxdRgF4ctgkuhjBeFwUkDt0c0uVUwWKfy4,4291
 edsl/notebooks/__init__.py,sha256=5uN54Xgjv4J0f_wdtdLoRnSzSUkHpSNTDtjLE2_jpZg,612
@@ -198,8 +198,8 @@ edsl/questions/question_base.py,sha256=WJMah2OLOoKvLo288sS4PfAWw2kBYM7q0FWW-yDBB
 edsl/questions/question_base_gen_mixin.py,sha256=Zb1nd0O6NR1c1rf6ik-Im7WPXAiIQrHkZTqK4PPUXSU,9768
 edsl/questions/question_base_prompts_mixin.py,sha256=YWWAsI-_fzm8UTDbryfnA0g-1ufiGa1QxeZMb6r0T8A,11916
 edsl/questions/question_budget.py,sha256=C7TmJVk9XT_1Ado2S_JbLOGr4OtRONeR9mp3BoPbif4,24541
-edsl/questions/question_check_box.py,sha256=gs5HuVnQRr1C1LRI_OGZt5VcSjtQkPQId4mh6ytyCRc,34065
-edsl/questions/question_dict.py,sha256=D3bwvZZqQeaWOebjpnc94G7ItDrDmreDMus3PDbTbZg,20708
+edsl/questions/question_check_box.py,sha256=PNxCae2gAbuSqApGMWOdA2zZ2uhZFv_0O8lm6T8nvhg,33613
+edsl/questions/question_dict.py,sha256=OcKGuA3KpyXn7UjZbC41wIhiIIGxSJySdfoxOtU3Prc,20793
 edsl/questions/question_extract.py,sha256=6x5LOqwDko_-DnhJAtZBRAju11JIa4PxTjU-5lg1rE0,20227
 edsl/questions/question_free_text.py,sha256=Oaw7C5BCclCiaWJlWHQJFEPppKxT7zWBFyIbF03LJh0,12879
 edsl/questions/question_functional.py,sha256=iwFlJmXBoFDu5D4tZ4Ci_yhfQo8_tB9C3W5I2p7KipA,9524
@@ -358,8 +358,8 @@ edsl/utilities/repair_functions.py,sha256=EXkXsqnmgPqj9b3dff1cZnJyaZw-qEvGENXCRH
 edsl/utilities/restricted_python.py,sha256=248N2p5EWHDSpcK1G-q7DUoJeWy4sB6aO-RV0-5O7uY,2038
 edsl/utilities/template_loader.py,sha256=SCAcnTnxNQ67MNSkmfz7F-S_u2peyGn2j1oRIqi1wfg,870
 edsl/utilities/utilities.py,sha256=irHheAGOnl_6RwI--Hi9StVzvsHcWCqB48PWsWJQYOw,12045
-edsl-0.1.53.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
-edsl-0.1.53.dist-info/METADATA,sha256=WUkrcqMnf8uKQvTyrQTx0q3oVFDurmcI3HkXz9Ljk6g,12670
-edsl-0.1.53.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-edsl-0.1.53.dist-info/entry_points.txt,sha256=JnG7xqMtHaQu9BU-yPATxdyCeA48XJpuclnWCqMfIMU,38
-edsl-0.1.53.dist-info/RECORD,,
+edsl-0.1.54.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
+edsl-0.1.54.dist-info/METADATA,sha256=NGU-XmzH8XskOALpmyMCfowQaFzeGwHkdvBskv1BBns,12671
+edsl-0.1.54.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+edsl-0.1.54.dist-info/entry_points.txt,sha256=JnG7xqMtHaQu9BU-yPATxdyCeA48XJpuclnWCqMfIMU,38
+edsl-0.1.54.dist-info/RECORD,,