edsl 0.1.39.dev2__py3-none-any.whl → 0.1.39.dev3__py3-none-any.whl

edsl/jobs/tasks/QuestionTaskCreator.py

@@ -1,244 +1,242 @@
-import asyncio
-from typing import Callable, Union, List, TYPE_CHECKING
-from collections import UserList, UserDict
-
-from edsl.exceptions.jobs import InterviewErrorPriorTaskCanceled
-
-from edsl.jobs.tasks.task_status_enum import TaskStatus, TaskStatusDescriptor
-from edsl.jobs.tasks.TaskStatusLog import TaskStatusLog
-from edsl.jobs.tokens.TokenUsage import TokenUsage
-from edsl.jobs.Answers import Answers
-
-if TYPE_CHECKING:
-    from edsl.questions.QuestionBase import QuestionBase
-    from edsl.jobs.buckets import ModelBuckets
-
-
-class TokensUsed(UserDict):
-    """ "Container for tokens used by a task."""
-
-    def __init__(self, cached_tokens, new_tokens):
-        d = {"cached_tokens": cached_tokens, "new_tokens": new_tokens}
-        super().__init__(d)
-
-
-class QuestionTaskCreator(UserList):
-    """Class to create and manage a single question and its dependencies.
-
-    It is a UserList with all the tasks that must be completed before the focal task can be run.
-    The focal task is the question that we are interested in answering.
-    """
-
-    task_status = TaskStatusDescriptor()
-
-    def __init__(
-        self,
-        *,
-        question: "QuestionBase",
-        answer_question_func: Callable,
-        model_buckets: "ModelBuckets",
-        token_estimator: Union[Callable, None] = None,
-        iteration: int = 0,
-    ):
-        """Initialize the QuestionTaskCreator instance.
-
-        :param question: the question that we are interested in answering.
-        :param answer_question_func: the function that will answer the question.
-        :param model_buckets: the bucket collection that contains the requests and tokens buckets which control the rate of API calls and token usage.
-        :param token_estimator: a function that estimates the number of tokens required to answer the question.
-        :param iteration: the iteration number of the question.
-
-        """
-        super().__init__([])
-        self.answer_question_func = answer_question_func
-        self.question = question
-        self.iteration = iteration
-
-        self.model_buckets = model_buckets
-
-        self.requests_bucket = self.model_buckets.requests_bucket
-        self.tokens_bucket = self.model_buckets.tokens_bucket
-
-        self.status_log = TaskStatusLog()
-
-        def fake_token_estimator(question):
-            return 1
-
-        self.token_estimator = token_estimator or fake_token_estimator
-
-        # Assume that the task is *not* from the cache until we know otherwise; the _run_focal_task might flip this bit later.
-        self.from_cache = False
-
-        self.cached_token_usage = TokenUsage(from_cache=True)
-        self.new_token_usage = TokenUsage(from_cache=False)
-        self.task_status = TaskStatus.NOT_STARTED
-
-    def add_dependency(self, task: asyncio.Task) -> None:
-        """Adds a task dependency to the list of dependencies.
-
-        >>> qt1 = QuestionTaskCreator.example()
-        >>> qt2 = QuestionTaskCreator.example()
-        >>> qt2.add_dependency(qt1)
-        >>> len(qt2)
-        1
-        """
-        self.append(task)
-
-    def generate_task(self) -> asyncio.Task:
-        """Create a task that depends on the passed-in dependencies."""
-        task = asyncio.create_task(
-            self._run_task_async(), name=self.question.question_name
-        )
-        task.depends_on = [t.get_name() for t in self]
-        return task
-
-    def estimated_tokens(self) -> int:
-        """Estimates the number of tokens that will be required to run the focal task."""
-        return self.token_estimator(self.question)
-
-    def token_usage(self) -> TokensUsed:
-        """Returns the token usage for the task.
-
-        >>> qt = QuestionTaskCreator.example()
-        >>> answers = asyncio.run(qt._run_focal_task())
-        >>> qt.token_usage()
-        {'cached_tokens': TokenUsage(from_cache=True, prompt_tokens=0, completion_tokens=0), 'new_tokens': TokenUsage(from_cache=False, prompt_tokens=0, completion_tokens=0)}
-        """
-        return TokensUsed(
-            cached_tokens=self.cached_token_usage, new_tokens=self.new_token_usage
-        )
-
-    async def _run_focal_task(self) -> Answers:
-        """Run the focal task i.e., the question that we are interested in answering.
-
-        It is only called after all the dependency tasks are completed.
-
-        >>> qt = QuestionTaskCreator.example()
-        >>> answers = asyncio.run(qt._run_focal_task())
-        >>> answers.answer
-        'This is an example answer'
-        """
-
-        requested_tokens = self.estimated_tokens()
-        if (estimated_wait_time := self.tokens_bucket.wait_time(requested_tokens)) > 0:
-            self.task_status = TaskStatus.WAITING_FOR_TOKEN_CAPACITY
-
-        await self.tokens_bucket.get_tokens(requested_tokens)
-
-        if (estimated_wait_time := self.model_buckets.requests_bucket.wait_time(1)) > 0:
-            self.waiting = True  #  do we need this?
-            self.task_status = TaskStatus.WAITING_FOR_REQUEST_CAPACITY
-
-        await self.model_buckets.requests_bucket.get_tokens(
-            1, cheat_bucket_capacity=True
-        )
-
-        self.task_status = TaskStatus.API_CALL_IN_PROGRESS
-        try:
-            results = await self.answer_question_func(
-                question=self.question, task=None  # self
-            )
-            self.task_status = TaskStatus.SUCCESS
-        except Exception as e:
-            self.task_status = TaskStatus.FAILED
-            raise e
-
-        if results.cache_used:
-            self.model_buckets.tokens_bucket.add_tokens(requested_tokens)
-            self.model_buckets.requests_bucket.add_tokens(1)
-            self.from_cache = True
-            # Turbo mode means that we don't wait for tokens or requests.
-            self.model_buckets.tokens_bucket.turbo_mode_on()
-            self.model_buckets.requests_bucket.turbo_mode_on()
-        else:
-            self.model_buckets.tokens_bucket.turbo_mode_off()
-            self.model_buckets.requests_bucket.turbo_mode_off()
-
-        return results
-
-    @classmethod
-    def example(cls):
-        """Return an example instance of the class."""
-        from edsl.questions.QuestionFreeText import QuestionFreeText
-        from edsl.jobs.buckets.ModelBuckets import ModelBuckets
-
-        m = ModelBuckets.infinity_bucket()
-
-        from collections import namedtuple
-
-        AnswerDict = namedtuple("AnswerDict", ["answer", "cache_used"])
-        answer = AnswerDict(answer="This is an example answer", cache_used=False)
-
-        async def answer_question_func(question, task):
-            return answer
-
-        return cls(
-            question=QuestionFreeText.example(),
-            answer_question_func=answer_question_func,
-            model_buckets=m,
-            token_estimator=None,
-            iteration=0,
-        )
-
-    async def _run_task_async(self) -> None:
-        """Run the task asynchronously, awaiting the tasks that must be completed before this one can be run.
-
-        >>> qt1 = QuestionTaskCreator.example()
-        >>> qt2 = QuestionTaskCreator.example()
-        >>> qt2.add_dependency(qt1)
-
-        The method follows these steps:
-            1. Set the task_status to TaskStatus.WAITING_FOR_DEPENDENCIES, indicating that the task is waiting for its dependencies to complete.
-            2. Await asyncio.gather(*self, return_exceptions=True) to run all the dependent tasks concurrently.
-
-            - the return_exceptions=True flag ensures that the task does not raise an exception if any of the dependencies fail.
-
-            3. If any of the dependencies raise an exception:
-            - If it is a CancelledError, set the current task's task_status to TaskStatus.CANCELLED, and re-raise the CancelledError,
-                terminating the execution of the current task.
-            - If it is any other exception, set the task_status to TaskStatus.PARENT_FAILED, and raise a custom exception
-                InterviewErrorPriorTaskCanceled with the original exception as the cause, terminating the execution of the current task.
-            4. If all the dependencies complete successfully without raising any exceptions, the code reaches the else block.
-            5. In the else block, run the focal task (self._run_focal_task(debug)).
-
-            If any of the dependencies fail (raise an exception), the focal task will not run. The execution will be terminated,
-            and an exception will be raised to indicate the failure of the dependencies.
-
-            The focal task (self._run_focal_task(debug)) is only executed if all the dependencies complete successfully.
-
-            Args:
-                debug: A boolean value indicating whether to run the task in debug mode.
-
-            Returns:
-                None
-        """
-        try:
-            self.task_status = TaskStatus.WAITING_FOR_DEPENDENCIES
-            # If this were set to 'return_exceptions=False', then the first exception would be raised immediately.
-            # and it would cancel all the other tasks. This is not the behavior we want.
-
-            gather_results = await asyncio.gather(*self, return_exceptions=True)
-
-            for result in gather_results:
-                if isinstance(result, Exception):
-                    raise result
-
-        except asyncio.CancelledError:
-            self.task_status = TaskStatus.CANCELLED
-            raise
-        except Exception as e:
-            # one of the dependencies failed
-            self.task_status = TaskStatus.PARENT_FAILED
-            # turns the parent exception into a custom exception so the task gets canceled but this InterviewErrorPriorTaskCanceled exception
-            raise InterviewErrorPriorTaskCanceled(
-                f"Required tasks failed for {self.question.question_name}"
-            ) from e
-
-        # this only runs if all the dependencies are successful
-        return await self._run_focal_task()
-
-
-if __name__ == "__main__":
-    import doctest
-
-    doctest.testmod(optionflags=doctest.ELLIPSIS)
+import asyncio
+from typing import Callable, Union, List
+from collections import UserList, UserDict
+
+from edsl.jobs.buckets import ModelBuckets
+from edsl.exceptions import InterviewErrorPriorTaskCanceled
+
+from edsl.jobs.interviews.InterviewStatusDictionary import InterviewStatusDictionary
+from edsl.jobs.tasks.task_status_enum import TaskStatus, TaskStatusDescriptor
+from edsl.jobs.tasks.TaskStatusLog import TaskStatusLog
+from edsl.jobs.tokens.InterviewTokenUsage import InterviewTokenUsage
+from edsl.jobs.tokens.TokenUsage import TokenUsage
+from edsl.jobs.Answers import Answers
+from edsl.questions.QuestionBase import QuestionBase
+
+
+class TokensUsed(UserDict):
+    """ "Container for tokens used by a task."""
+
+    def __init__(self, cached_tokens, new_tokens):
+        d = {"cached_tokens": cached_tokens, "new_tokens": new_tokens}
+        super().__init__(d)
+
+
+class QuestionTaskCreator(UserList):
+    """Class to create and manage a single question and its dependencies.
+    The class is an instance of a UserList of tasks that must be completed before the focal task can be run.
+
+    It is a UserList with all the tasks that must be completed before the focal task can be run.
+    The focal task is the question that we are interested in answering.
+    """
+
+    task_status = TaskStatusDescriptor()
+
+    def __init__(
+        self,
+        *,
+        question: QuestionBase,
+        answer_question_func: Callable,
+        model_buckets: ModelBuckets,
+        token_estimator: Union[Callable, None] = None,
+        iteration: int = 0,
+    ):
+        """Initialize the QuestionTaskCreator instance.
+
+        :param question: the question that we are interested in answering.
+        :param answer_question_func: the function that will answer the question.
+        :param model_buckets: the bucket collection that contains the requests and tokens buckets which control the rate of API calls and token usage.
+        :param token_estimator: a function that estimates the number of tokens required to answer the question.
+        :param iteration: the iteration number of the question.
+
+        """
+        super().__init__([])
+        # answer_question_func is the 'interview.answer_question_and_record_task" method
+        self.answer_question_func = answer_question_func
+        self.question = question
+        self.iteration = iteration
+
+        self.model_buckets = model_buckets
+        self.requests_bucket = self.model_buckets.requests_bucket
+        self.tokens_bucket = self.model_buckets.tokens_bucket
+        self.status_log = TaskStatusLog()
+
+        def fake_token_estimator(question):
+            return 1
+
+        self.token_estimator = token_estimator or fake_token_estimator
+
+        # Assume that the task is *not* from the cache until we know otherwise; the _run_focal_task might flip this bit later.
+        self.from_cache = False
+
+        self.cached_token_usage = TokenUsage(from_cache=True)
+        self.new_token_usage = TokenUsage(from_cache=False)
+        self.task_status = TaskStatus.NOT_STARTED
+
+    def add_dependency(self, task: asyncio.Task) -> None:
+        """Adds a task dependency to the list of dependencies.
+
+        >>> qt1 = QuestionTaskCreator.example()
+        >>> qt2 = QuestionTaskCreator.example()
+        >>> qt2.add_dependency(qt1)
+        >>> len(qt2)
+        1
+        """
+        self.append(task)
+
+    def generate_task(self) -> asyncio.Task:
+        """Create a task that depends on the passed-in dependencies."""
+        task = asyncio.create_task(
+            self._run_task_async(), name=self.question.question_name
+        )
+        task.depends_on = [t.get_name() for t in self]
+        return task
+
+    def estimated_tokens(self) -> int:
+        """Estimates the number of tokens that will be required to run the focal task."""
+        return self.token_estimator(self.question)
+
+    def token_usage(self) -> TokensUsed:
+        """Returns the token usage for the task.
+
+        >>> qt = QuestionTaskCreator.example()
+        >>> answers = asyncio.run(qt._run_focal_task())
+        >>> qt.token_usage()
+        {'cached_tokens': TokenUsage(from_cache=True, prompt_tokens=0, completion_tokens=0), 'new_tokens': TokenUsage(from_cache=False, prompt_tokens=0, completion_tokens=0)}
+        """
+        return TokensUsed(
+            cached_tokens=self.cached_token_usage, new_tokens=self.new_token_usage
+        )
+
+    async def _run_focal_task(self) -> Answers:
+        """Run the focal task i.e., the question that we are interested in answering.
+
+        It is only called after all the dependency tasks are completed.
+
+        >>> qt = QuestionTaskCreator.example()
+        >>> answers = asyncio.run(qt._run_focal_task())
+        >>> answers.answer
+        'This is an example answer'
+        """
+
+        requested_tokens = self.estimated_tokens()
+        if (estimated_wait_time := self.tokens_bucket.wait_time(requested_tokens)) > 0:
+            self.task_status = TaskStatus.WAITING_FOR_TOKEN_CAPACITY
+
+        await self.tokens_bucket.get_tokens(requested_tokens)
+
+        if (estimated_wait_time := self.requests_bucket.wait_time(1)) > 0:
+            self.waiting = True  #  do we need this?
+            self.task_status = TaskStatus.WAITING_FOR_REQUEST_CAPACITY
+
+        await self.requests_bucket.get_tokens(1, cheat_bucket_capacity=True)
+
+        self.task_status = TaskStatus.API_CALL_IN_PROGRESS
+        try:
+            results = await self.answer_question_func(
+                question=self.question, task=None  # self
+            )
+            self.task_status = TaskStatus.SUCCESS
+        except Exception as e:
+            self.task_status = TaskStatus.FAILED
+            raise e
+
+        if results.cache_used:
+            self.tokens_bucket.add_tokens(requested_tokens)
+            self.requests_bucket.add_tokens(1)
+            self.from_cache = True
+            # Turbo mode means that we don't wait for tokens or requests.
+            self.tokens_bucket.turbo_mode_on()
+            self.requests_bucket.turbo_mode_on()
+        else:
+            self.tokens_bucket.turbo_mode_off()
+            self.requests_bucket.turbo_mode_off()
+
+        return results
+
+    @classmethod
+    def example(cls):
+        """Return an example instance of the class."""
+        from edsl import QuestionFreeText
+        from edsl.jobs.buckets.ModelBuckets import ModelBuckets
+
+        m = ModelBuckets.infinity_bucket()
+
+        from collections import namedtuple
+
+        AnswerDict = namedtuple("AnswerDict", ["answer", "cache_used"])
+        answer = AnswerDict(answer="This is an example answer", cache_used=False)
+
+        async def answer_question_func(question, task):
+            return answer
+
+        return cls(
+            question=QuestionFreeText.example(),
+            answer_question_func=answer_question_func,
+            model_buckets=m,
+            token_estimator=None,
+            iteration=0,
+        )
+
+    async def _run_task_async(self) -> None:
+        """Run the task asynchronously, awaiting the tasks that must be completed before this one can be run.
+
+        >>> qt1 = QuestionTaskCreator.example()
+        >>> qt2 = QuestionTaskCreator.example()
+        >>> qt2.add_dependency(qt1)
+
+        The method follows these steps:
+            1. Set the task_status to TaskStatus.WAITING_FOR_DEPENDENCIES, indicating that the task is waiting for its dependencies to complete.
+            2. Await asyncio.gather(*self, return_exceptions=True) to run all the dependent tasks concurrently.
+
+            - the return_exceptions=True flag ensures that the task does not raise an exception if any of the dependencies fail.
+
+            3. If any of the dependencies raise an exception:
+            - If it is a CancelledError, set the current task's task_status to TaskStatus.CANCELLED, and re-raise the CancelledError,
+                terminating the execution of the current task.
+            - If it is any other exception, set the task_status to TaskStatus.PARENT_FAILED, and raise a custom exception
+                InterviewErrorPriorTaskCanceled with the original exception as the cause, terminating the execution of the current task.
+            4. If all the dependencies complete successfully without raising any exceptions, the code reaches the else block.
+            5. In the else block, run the focal task (self._run_focal_task(debug)).
+
+            If any of the dependencies fail (raise an exception), the focal task will not run. The execution will be terminated,
+            and an exception will be raised to indicate the failure of the dependencies.
+
+            The focal task (self._run_focal_task(debug)) is only executed if all the dependencies complete successfully.
+
+            Args:
+                debug: A boolean value indicating whether to run the task in debug mode.
+
+            Returns:
+                None
+        """
+        try:
+            self.task_status = TaskStatus.WAITING_FOR_DEPENDENCIES
+            # If this were set to 'return_exceptions=False', then the first exception would be raised immediately.
+            # and it would cancel all the other tasks. This is not the behavior we want.
+
+            gather_results = await asyncio.gather(*self, return_exceptions=True)
+
+            for result in gather_results:
+                if isinstance(result, Exception):
+                    raise result
+
+        except asyncio.CancelledError:
+            self.task_status = TaskStatus.CANCELLED
+            raise
+        except Exception as e:
+            # one of the dependencies failed
+            self.task_status = TaskStatus.PARENT_FAILED
+            # turns the parent exception into a custom exception so the task gets canceled but this InterviewErrorPriorTaskCanceled exception
+            raise InterviewErrorPriorTaskCanceled(
+                f"Required tasks failed for {self.question.question_name}"
+            ) from e
+
+        # this only runs if all the dependencies are successful
+        return await self._run_focal_task()
+
+
+if __name__ == "__main__":
+    import doctest
+
+    doctest.testmod(optionflags=doctest.ELLIPSIS)

edsl/jobs/tasks/TaskCreators.py

@@ -1,64 +1,64 @@
-from typing import Callable, Union, List
-from collections import UserDict
-
-from edsl.jobs.tokens.TokenUsage import TokenUsage
-from edsl.jobs.interviews.InterviewStatusDictionary import InterviewStatusDictionary
-from edsl.jobs.tokens.InterviewTokenUsage import InterviewTokenUsage
-
-
-class TaskCreators(UserDict):
-    """A dictionary of task creators. A task is one question being answered.
-
-    This is used to track the status of the tasks within an interview.
-    """
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    @property
-    def token_usage(self) -> InterviewTokenUsage:
-        """Determines how many tokens were used for the interview.
-
-        This is iterates through all tasks that make up an interview.
-        For each task, it determines how many tokens were used and whether they were cached or new.
-        It then sums the total number of cached and new tokens used for the interview.
-
-        """
-        cached_tokens = TokenUsage(from_cache=True)
-        new_tokens = TokenUsage(from_cache=False)
-        for task_creator in self.values():
-            token_usage = task_creator.token_usage()
-            cached_tokens += token_usage["cached_tokens"]
-            new_tokens += token_usage["new_tokens"]
-        return InterviewTokenUsage(
-            new_token_usage=new_tokens, cached_token_usage=cached_tokens
-        )
-
-    def print(self) -> None:
-        from rich import print
-
-        print({task.get_name(): task.task_status for task in self.values()})
-
-    @property
-    def interview_status(self) -> InterviewStatusDictionary:
-        """Returns a dictionary, InterviewStatusDictionary, mapping task status codes to counts of tasks in that state.
-
-        >>> t = TaskCreators()
-        >>> t.interview_status
-        InterviewStatusDictionary({<TaskStatus.NOT_STARTED: 1>: 0, <TaskStatus.WAITING_FOR_DEPENDENCIES: 2>: 0, <TaskStatus.CANCELLED: 3>: 0, <TaskStatus.PARENT_FAILED: 4>: 0, <TaskStatus.WAITING_FOR_REQUEST_CAPACITY: 5>: 0, <TaskStatus.WAITING_FOR_TOKEN_CAPACITY: 6>: 0, <TaskStatus.API_CALL_IN_PROGRESS: 7>: 0, <TaskStatus.SUCCESS: 8>: 0, <TaskStatus.FAILED: 9>: 0, 'number_from_cache': 0})
-        """
-        status_dict = InterviewStatusDictionary()
-        for task_creator in self.values():
-            status_dict[task_creator.task_status] += 1
-            status_dict["number_from_cache"] += task_creator.from_cache
-        return status_dict
-
-    def status_logs(self):
-        """Returns a list of status logs for each task."""
-        return [task_creator.status_log for task_creator in self.values()]
-
-
-if __name__ == "__main__":
-    import doctest
-
-    doctest.testmod(optionflags=doctest.ELLIPSIS)
+from typing import Callable, Union, List
+from collections import UserDict
+
+from edsl.jobs.tokens.TokenUsage import TokenUsage
+from edsl.jobs.interviews.InterviewStatusDictionary import InterviewStatusDictionary
+from edsl.jobs.tokens.InterviewTokenUsage import InterviewTokenUsage
+
+
+class TaskCreators(UserDict):
+    """A dictionary of task creators. A task is one question being answered.
+
+    This is used to track the status of the tasks within an interview.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+    @property
+    def token_usage(self) -> InterviewTokenUsage:
+        """Determines how many tokens were used for the interview.
+
+        This is iterates through all tasks that make up an interview.
+        For each task, it determines how many tokens were used and whether they were cached or new.
+        It then sums the total number of cached and new tokens used for the interview.
+
+        """
+        cached_tokens = TokenUsage(from_cache=True)
+        new_tokens = TokenUsage(from_cache=False)
+        for task_creator in self.values():
+            token_usage = task_creator.token_usage()
+            cached_tokens += token_usage["cached_tokens"]
+            new_tokens += token_usage["new_tokens"]
+        return InterviewTokenUsage(
+            new_token_usage=new_tokens, cached_token_usage=cached_tokens
+        )
+
+    def print(self) -> None:
+        from rich import print
+
+        print({task.get_name(): task.task_status for task in self.values()})
+
+    @property
+    def interview_status(self) -> InterviewStatusDictionary:
+        """Returns a dictionary, InterviewStatusDictionary, mapping task status codes to counts of tasks in that state.
+
+        >>> t = TaskCreators()
+        >>> t.interview_status
+        InterviewStatusDictionary({<TaskStatus.NOT_STARTED: 1>: 0, <TaskStatus.WAITING_FOR_DEPENDENCIES: 2>: 0, <TaskStatus.CANCELLED: 3>: 0, <TaskStatus.PARENT_FAILED: 4>: 0, <TaskStatus.WAITING_FOR_REQUEST_CAPACITY: 5>: 0, <TaskStatus.WAITING_FOR_TOKEN_CAPACITY: 6>: 0, <TaskStatus.API_CALL_IN_PROGRESS: 7>: 0, <TaskStatus.SUCCESS: 8>: 0, <TaskStatus.FAILED: 9>: 0, 'number_from_cache': 0})
+        """
+        status_dict = InterviewStatusDictionary()
+        for task_creator in self.values():
+            status_dict[task_creator.task_status] += 1
+            status_dict["number_from_cache"] += task_creator.from_cache
+        return status_dict
+
+    def status_logs(self):
+        """Returns a list of status logs for each task."""
+        return [task_creator.status_log for task_creator in self.values()]
+
+
+if __name__ == "__main__":
+    import doctest
+
+    doctest.testmod(optionflags=doctest.ELLIPSIS)