edsl 0.1.49__py3-none-any.whl → 0.1.51__py3-none-any.whl

edsl/questions/question_base_gen_mixin.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import copy
 import itertools
-from typing import Optional, List, Callable, Type, TYPE_CHECKING, Union
+from typing import Optional, List, Callable, TYPE_CHECKING, Union
 
 if TYPE_CHECKING:
     from .question_base import QuestionBase
@@ -174,7 +174,7 @@ class QuestionBaseGenMixin:
                 return result
             except self.MaxTemplateNestingExceeded:
                 raise
-            except Exception as e:
+            except Exception:
                 import warnings
                 warnings.warn("Failed to render string: " + value)
                 return value

edsl/questions/question_base_prompts_mixin.py

@@ -1,9 +1,14 @@
 from importlib import resources
-from typing import Optional
+from typing import Optional, TYPE_CHECKING
 from functools import lru_cache
 
 from .exceptions import QuestionAnswerValidationError
 
+if TYPE_CHECKING:
+    from pydantic import BaseModel
+    from ..prompts import Prompt
+    from ..prompts.prompt import PromptBase
+
 class TemplateManager:
     _instance = None
 
@@ -69,7 +74,7 @@ class QuestionBasePromptsMixin:
         >>> q.get_instructions(model = "gpt3")
         Prompt(text=\"""{{question_text}}. Answer in valid JSON like so {'answer': 'comment: <>}\""")
         """
-        from edsl.language_models.model import Model
+        from ..language_models.model import Model
 
         if not hasattr(self, "_model_instructions"):
             self._model_instructions = {}
@@ -85,7 +90,7 @@ class QuestionBasePromptsMixin:
 
     @classmethod
     def path_to_folder(cls) -> str:
-        return resources.files(f"edsl.questions.templates", cls.question_type)
+        return resources.files("edsl.questions.templates", cls.question_type)
 
     @property
     def response_model(self) -> type["BaseModel"]:
@@ -120,7 +125,7 @@ class QuestionBasePromptsMixin:
         template_text = template_manager.get_template(
             cls.question_type, "answering_instructions.jinja"
         )
-        from edsl.prompts import Prompt
+        from ..prompts import Prompt
 
         return Prompt(text=template_text)
 
@@ -129,7 +134,7 @@ class QuestionBasePromptsMixin:
         template_text = template_manager.get_template(
             cls.question_type, "question_presentation.jinja"
         )
-        from edsl.prompts import Prompt
+        from ..prompts import Prompt
 
         return Prompt(text=template_text)
 
@@ -179,12 +184,13 @@ class QuestionBasePromptsMixin:
             except QuestionAnswerValidationError:
                 pass
             else:
-                raise ValueError(f"Example {answer} should have failed for {reason}.")
+                from .exceptions import QuestionValueError
+                raise QuestionValueError(f"Example {answer} should have failed for {reason}.")
 
     @property
     def new_default_instructions(self) -> "Prompt":
         "This is set up as a property because there are mutable question values that determine how it is rendered."
-        from edsl.prompts import Prompt
+        from ..prompts import Prompt
 
         return Prompt(self.question_presentation) + Prompt(self.answering_instructions)