edsl 0.1.41__tar.gz → 0.1.42__tar.gz

{edsl-0.1.41 → edsl-0.1.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edsl
-Version: 0.1.41
+Version: 0.1.42
 Summary: Create and analyze LLM-based surveys
 Home-page: https://www.expectedparrot.com/
 License: MIT
@@ -107,5 +107,5 @@ See instructions on [storing API keys](https://docs.expectedparrot.com/en/latest
 
 ## 💡 Contributions, feature requests & bugs
 Interested in contributing? Want us to add a new feature? Found a bug for us to squash? 
-Please send us an email at [info@expectedparrot.com](mailto:info@expectedparrot.com) or message us at our [Discord channel](https://discord.com/invite/mxAYkjfy9m).
+Please send us an email at [info@expectedparrot.com](mailto:info@expectedparrot.com) or message us at our [Discord channel](https://discord.com/invite/mxAYkjfy9m)..
 

{edsl-0.1.41 → edsl-0.1.42}/README.md

@@ -51,4 +51,4 @@ See instructions on [storing API keys](https://docs.expectedparrot.com/en/latest
 
 ## 💡 Contributions, feature requests & bugs
 Interested in contributing? Want us to add a new feature? Found a bug for us to squash? 
-Please send us an email at [info@expectedparrot.com](mailto:info@expectedparrot.com) or message us at our [Discord channel](https://discord.com/invite/mxAYkjfy9m).
+Please send us an email at [info@expectedparrot.com](mailto:info@expectedparrot.com) or message us at our [Discord channel](https://discord.com/invite/mxAYkjfy9m)..

edsl-0.1.42/edsl/__version__.py

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

{edsl-0.1.41 → edsl-0.1.42}/edsl/agents/Invigilator.py

@@ -1,6 +1,6 @@
 """Module for creating Invigilators, which are objects to administer a question to an Agent."""
 
-from typing import Dict, Any, Optional, TYPE_CHECKING
+from typing import Dict, Any, Optional, TYPE_CHECKING, Literal
 
 from edsl.utilities.decorators import sync_wrapper
 from edsl.exceptions.questions import QuestionAnswerValidationError
@@ -12,6 +12,7 @@ if TYPE_CHECKING:
     from edsl.scenarios.Scenario import Scenario
     from edsl.surveys.Survey import Survey
 
+PromptType = Literal["user_prompt", "system_prompt", "encoded_image", "files_list"]
 
 NA = "Not Applicable"
 
@@ -19,7 +20,7 @@ NA = "Not Applicable"
 class InvigilatorAI(InvigilatorBase):
     """An invigilator that uses an AI model to answer questions."""
 
-    def get_prompts(self) -> Dict[str, "Prompt"]:
+    def get_prompts(self) -> Dict[PromptType, "Prompt"]:
         """Return the prompts used."""
         return self.prompt_constructor.get_prompts()
 

{edsl-0.1.41 → edsl-0.1.42}/edsl/agents/InvigilatorBase.py

@@ -135,6 +135,7 @@ class InvigilatorBase(ABC):
         d["additional_prompt_data"] = data["additional_prompt_data"]
 
         d = cls(**d)
+        return d
 
     def __repr__(self) -> str:
         """Return a string representation of the Invigilator.
@@ -143,7 +144,7 @@ class InvigilatorBase(ABC):
         'InvigilatorExample(...)'
 
         """
-        return f"{self.__class__.__name__}(agent={repr(self.agent)}, question={repr(self.question)}, scneario={repr(self.scenario)}, model={repr(self.model)}, memory_plan={repr(self.memory_plan)}, current_answers={repr(self.current_answers)}, iteration{repr(self.iteration)}, additional_prompt_data={repr(self.additional_prompt_data)}, cache={repr(self.cache)})"
+        return f"{self.__class__.__name__}(agent={repr(self.agent)}, question={repr(self.question)}, scenario={repr(self.scenario)}, model={repr(self.model)}, memory_plan={repr(self.memory_plan)}, current_answers={repr(self.current_answers)}, iteration={repr(self.iteration)}, additional_prompt_data={repr(self.additional_prompt_data)}, cache={repr(self.cache)})"
 
     def get_failed_task_result(self, failure_reason: str) -> EDSLResultObjectInput:
         """Return an AgentResponseDict used in case the question-asking fails.

{edsl-0.1.41 → edsl-0.1.42}/edsl/agents/QuestionTemplateReplacementsBuilder.py

@@ -1,4 +1,4 @@
-from jinja2 import Environment, meta
+from jinja2 import Environment, meta, TemplateSyntaxError
 from typing import Any, Set, TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -29,7 +29,12 @@ class QuestionTemplateReplacementsBuilder:
         Set[str]: A set of variable names found in the template
         """
         env = Environment()
-        ast = env.parse(template_str)
+        try:
+            ast = env.parse(template_str)
+        except TemplateSyntaxError:
+            print(f"Error parsing template: {template_str}")
+            raise
+
         return meta.find_undeclared_variables(ast)
 
     @staticmethod

{edsl-0.1.41 → edsl-0.1.42}/edsl/coop/coop.py

@@ -894,6 +894,38 @@ class Coop(CoopFunctionsMixin):
         data = response.json()
         return ServiceToModelsMapping(data)
 
+    def fetch_working_models(self) -> list[dict]:
+        """
+        Fetch a list of working models from Coop.
+
+        Example output:
+
+        [
+            {
+                "service": "openai",
+                "model": "gpt-4o",
+                "works_with_text": True,
+                "works_with_images": True,
+                "usd_per_1M_input_tokens": 2.5,
+                "usd_per_1M_output_tokens": 10.0,
+            }
+        ]
+        """
+        response = self._send_server_request(uri="api/v0/working-models", method="GET")
+        self._resolve_server_response(response)
+        data = response.json()
+        return [
+            {
+                "service": record.get("service"),
+                "model": record.get("model"),
+                "works_with_text": record.get("works_with_text"),
+                "works_with_images": record.get("works_with_images"),
+                "usd_per_1M_input_tokens": record.get("input_price_per_1M_tokens"),
+                "usd_per_1M_output_tokens": record.get("output_price_per_1M_tokens"),
+            }
+            for record in data
+        ]
+
     def fetch_rate_limit_config_vars(self) -> dict:
         """
         Fetch a dict of rate limit config vars from Coop.

{edsl-0.1.41 → edsl-0.1.42}/edsl/enums.py

@@ -66,6 +66,7 @@ class InferenceServiceType(EnumWithChecks):
     MISTRAL = "mistral"
     TOGETHER = "together"
     PERPLEXITY = "perplexity"
+    DEEPSEEK = "deepseek"
 
 
 # unavoidable violation of the DRY principle but it is necessary
@@ -84,6 +85,7 @@ InferenceServiceLiteral = Literal[
     "mistral",
     "together",
     "perplexity",
+    "deepseek",
 ]
 
 available_models_urls = {
@@ -107,6 +109,7 @@ service_to_api_keyname = {
     InferenceServiceType.MISTRAL.value: "MISTRAL_API_KEY",
     InferenceServiceType.TOGETHER.value: "TOGETHER_API_KEY",
     InferenceServiceType.PERPLEXITY.value: "PERPLEXITY_API_KEY",
+    InferenceServiceType.DEEPSEEK.value: "DEEPSEEK_API_KEY",
 }
 
 

edsl-0.1.42/edsl/exceptions/jobs.py

@@ -0,0 +1,25 @@
+from textwrap import dedent
+
+
+class JobsErrors(Exception):
+    pass
+
+
+class JobsRunError(JobsErrors):
+    pass
+
+
+class MissingRemoteInferenceError(JobsErrors):
+    pass
+
+
+class InterviewError(Exception):
+    pass
+
+
+class InterviewErrorPriorTaskCanceled(InterviewError):
+    pass
+
+
+class InterviewTimeoutError(InterviewError):
+    pass

{edsl-0.1.41 → edsl-0.1.42}/edsl/exceptions/language_models.py

@@ -34,11 +34,15 @@ class LanguageModelNotFound(LanguageModelExceptions):
         msg = dedent(
             f"""\
             Model {model_name} not found.
-            To create an instance, you can do: 
-            >>> m = Model('gpt-4-1106-preview', temperature=0.5, ...)
+            To create an instance of this model, pass the model name to a `Model` object.
+            You can optionally pass additional parameters to the model, e.g.: 
+            >>> m = Model('gpt-4-1106-preview', temperature=0.5)
             
-            To get the default model, you can leave out the model name. 
-            To see the available models, you can do:
+            To use the default model, simply run your job without specifying a model.
+            To check the default model, run the following code:
+            >>> Model()
+
+            To see information about all available models, run the following code:
             >>> Model.available()
 
             See https://docs.expectedparrot.com/en/latest/language_models.html#available-models for more details.

{edsl-0.1.41 → edsl-0.1.42}/edsl/exceptions/questions.py

@@ -16,7 +16,8 @@ class QuestionErrors(Exception):
 class QuestionAnswerValidationError(QuestionErrors):
     documentation = "https://docs.expectedparrot.com/en/latest/exceptions.html"
 
-    explanation = """This when the answer coming from the Language Model does not conform to the expectation for that question type.
+    explanation = """
+    This can occur when the answer coming from the Language Model does not conform to the expectations for the question type.
     For example, if the question is a multiple choice question, the answer should be drawn from the list of options provided.
     """
 
@@ -52,28 +53,24 @@ class QuestionAnswerValidationError(QuestionErrors):
 
     def to_html_dict(self):
         return {
-            "error_type": ("Name of the exception", "p", "/p", self.__class__.__name__),
-            "explaination": ("Explanation", "p", "/p", self.explanation),
-            "edsl answer": (
-                "What model returned",
+            "Exception type": ("p", "/p", self.__class__.__name__),
+            "Explanation": ("p", "/p", self.explanation),
+            "EDSL response": (
                 "pre",
                 "/pre",
                 json.dumps(self.data, indent=2),
             ),
-            "validating_model": (
-                "Pydantic model for answers",
+            "Validating model": (
                 "pre",
                 "/pre",
                 json.dumps(self.model.model_json_schema(), indent=2),
             ),
-            "error_message": (
-                "Error message Pydantic returned",
+            "Error message": (
                 "p",
                 "/p",
                 self.message,
             ),
-            "documentation_url": (
-                "URL to EDSL docs",
+            "Documentation": (
                 f"a href='{self.documentation}'",
                 "/a",
                 self.documentation,

edsl-0.1.42/edsl/inference_services/DeepSeekService.py

@@ -0,0 +1,18 @@
+import aiohttp
+import json
+import requests
+from typing import Any, List
+
+# from edsl.inference_services.InferenceServiceABC import InferenceServiceABC
+from edsl.language_models import LanguageModel
+
+from edsl.inference_services.OpenAIService import OpenAIService
+
+
+class DeepSeekService(OpenAIService):
+    """DeepInfra service class."""
+
+    _inference_service_ = "deepseek"
+    _env_key_name_ = "DEEPSEEK_API_KEY"
+    _base_url_ = "https://api.deepseek.com"
+    _models_list_cache: List[str] = []

{edsl-0.1.41 → edsl-0.1.42}/edsl/inference_services/registry.py

@@ -13,6 +13,7 @@ from edsl.inference_services.OllamaService import OllamaService
 from edsl.inference_services.TestService import TestService
 from edsl.inference_services.TogetherAIService import TogetherAIService
 from edsl.inference_services.PerplexityService import PerplexityService
+from edsl.inference_services.DeepSeekService import DeepSeekService
 
 try:
     from edsl.inference_services.MistralAIService import MistralAIService
@@ -33,6 +34,7 @@ services = [
     TestService,
     TogetherAIService,
     PerplexityService,
+    DeepSeekService,
 ]
 
 if mistral_available:

{edsl-0.1.41 → edsl-0.1.42}/edsl/jobs/Jobs.py

@@ -521,16 +521,18 @@ class Jobs(Base):
             results = runner.run(self.run_config.parameters)
         return results
 
-    def _setup_and_check(self) -> Tuple[RunConfig, Optional[Results]]:
-        self._prepare_to_run()
-        self._check_if_remote_keys_ok()
+    # def _setup_and_check(self) -> Tuple[RunConfig, Optional[Results]]:
+    #     self._prepare_to_run()
+    #     self._check_if_remote_keys_ok()
 
-        # first try to run the job remotely
-        if results := self._remote_results():
-            return results
+    #     # first try to run the job remotely
+    #     results = self._remote_results()
+    #     #breakpoint()
+    #     if results is not None:
+    #         return results
 
-        self._check_if_local_keys_ok()
-        return None
+    #     self._check_if_local_keys_ok()
+    #     return None
 
     @property
     def num_interviews(self):
@@ -539,7 +541,7 @@ class Jobs(Base):
         else:
             return len(self) * self.run_config.parameters.n
 
-    def _run(self, config: RunConfig):
+    def _run(self, config: RunConfig) -> Union[None, "Results"]:
         "Shared code for run and run_async"
         if config.environment.cache is not None:
             self.run_config.environment.cache = config.environment.cache
@@ -581,7 +583,7 @@ class Jobs(Base):
         # first try to run the job remotely
         if results := self._remote_results():
             return results
-
+                
         self._check_if_local_keys_ok()
 
         if config.environment.bucket_collection is None:
@@ -589,6 +591,8 @@ class Jobs(Base):
                 self.create_bucket_collection()
             )
 
+        return None
+
     @with_config
     def run(self, *, config: RunConfig) -> "Results":
         """
@@ -608,7 +612,10 @@ class Jobs(Base):
         :param bucket_collection: A BucketCollection object to track API calls
         :param key_lookup: A KeyLookup object to manage API keys
         """
-        self._run(config)
+        potentially_completed_results = self._run(config)
+        
+        if potentially_completed_results is not None:
+            return potentially_completed_results
 
         return asyncio.run(self._execute_with_remote_cache(run_job_async=False))
 

{edsl-0.1.41 → edsl-0.1.42}/edsl/jobs/JobsPrompts.py

@@ -12,6 +12,7 @@ if TYPE_CHECKING:
     # from edsl.surveys.Survey import Survey
 
 from edsl.jobs.FetchInvigilator import FetchInvigilator
+from edsl.data.CacheEntry import CacheEntry
 
 
 class JobsPrompts:
@@ -47,7 +48,7 @@ class JobsPrompts:
         agent_indices = []
         models = []
         costs = []
-
+        cache_keys = []
         for interview_index, interview in enumerate(interviews):
             invigilators = [
                 FetchInvigilator(interview)(question)
@@ -76,6 +77,14 @@ class JobsPrompts:
                 )
                 costs.append(prompt_cost["cost_usd"])
 
+                cache_key = CacheEntry.gen_key(
+                    model=invigilator.model.model,
+                    parameters=invigilator.model.parameters,
+                    system_prompt=system_prompt,
+                    user_prompt=user_prompt,
+                    iteration=0,  # TODO how to handle when there are multiple iterations?
+                )
+                cache_keys.append(cache_key)
         d = Dataset(
             [
                 {"user_prompt": user_prompts},
@@ -86,6 +95,7 @@ class JobsPrompts:
                 {"agent_index": agent_indices},
                 {"model": models},
                 {"estimated_cost": costs},
+                {"cache_key": cache_keys},
             ]
         )
         return d

{edsl-0.1.41 → edsl-0.1.42}/edsl/jobs/JobsRemoteInferenceHandler.py

@@ -219,6 +219,7 @@ class JobsRemoteInferenceHandler:
         job_info.logger.add_info("results_uuid", results_uuid)
         results = object_fetcher(results_uuid, expected_object_type="results")
         results_url = remote_job_data.get("results_url")
+        job_info.logger.add_info("results_url", results_url)
         job_info.logger.update(
             f"Job completed and Results stored on Coop: {results_url}",
             status=JobsStatus.COMPLETED,

{edsl-0.1.41 → edsl-0.1.42}/edsl/jobs/JobsRemoteInferenceLogger.py

@@ -32,7 +32,7 @@ class JobsInfo:
     pretty_names = {
         "job_uuid": "Job UUID",
         "progress_bar_url": "Progress Bar URL",
-        "error_report_url": "Error Report URL",
+        "error_report_url": "Exceptions Report URL",
         "results_uuid": "Results UUID",
         "results_url": "Results URL",
     }

{edsl-0.1.41 → edsl-0.1.42}/edsl/jobs/interviews/Interview.py

@@ -153,7 +153,7 @@ class Interview:
 
         >>> i = Interview.example()
         >>> hash(i)
-        193593189022259693
+        767745459362662063
         """
         d = {
             "agent": self.agent.to_dict(add_edsl_version=add_edsl_version),

{edsl-0.1.41 → edsl-0.1.42}/edsl/jobs/loggers/HTMLTableJobLogger.py

@@ -9,7 +9,8 @@ from edsl.jobs.jobs_status_enums import JobsStatus
 class HTMLTableJobLogger(JobLogger):
     def __init__(self, verbose=True, theme="auto", **kwargs):
         super().__init__(verbose=verbose)
-        self.display_handle = display(HTML(""), display_id=True)
+        self.display_handle = display(HTML(""), display_id=True) if verbose else None
+        #self.display_handle = display(HTML(""), display_id=True)
         self.current_message = None
         self.log_id = str(uuid.uuid4())
         self.is_expanded = True
@@ -22,6 +23,9 @@ class HTMLTableJobLogger(JobLogger):
 
     def _init_css(self):
         """Initialize the CSS styles with enhanced theme support"""
+        if not self.verbose:
+            return None
+        
         css = """
         <style>
             /* Base theme variables */
@@ -217,6 +221,7 @@ class HTMLTableJobLogger(JobLogger):
             }});
         </script>
         """
+        
 
         display(HTML(css + init_script))
 

{edsl-0.1.41 → edsl-0.1.42}/edsl/jobs/results_exceptions_handler.py

@@ -66,9 +66,7 @@ class ResultsExceptionsHandler:
 
     def _generate_error_message(self, indices) -> str:
         """Generate appropriate error message based on number of exceptions."""
-        msg = f"Exceptions were raised in {len(indices)} interviews.\n"
-        if len(indices) > 5:
-            msg += f"Exceptions were raised in the following interviews: {indices}.\n"
+        msg = f"Exceptions were raised.\n" 
         return msg
 
     def handle_exceptions(self) -> None:
@@ -84,7 +82,6 @@ class ResultsExceptionsHandler:
 
         # Generate HTML report
         filepath = self.results.task_history.html(
-            cta="Open report to see details.",
             open_in_browser=self.open_in_browser,
             return_link=True,
         )
@@ -92,7 +89,5 @@ class ResultsExceptionsHandler:
         # Handle remote logging if enabled
         if self.remote_logging:
             filestore = HTMLFileStore(filepath)
-            coop_details = filestore.push(description="Error report")
+            coop_details = filestore.push(description="Exceptions Report")
             print(coop_details)
-
-        print("Also see: https://docs.expectedparrot.com/en/latest/exceptions.html")

{edsl-0.1.41 → edsl-0.1.42}/edsl/jobs/tasks/TaskHistory.py

@@ -264,9 +264,27 @@ class TaskHistory(RepresentationMixin):
         js = env.joinpath("report.js").read_text()
         return js
 
+    @property
+    def exceptions_table(self) -> dict:
+        """Return a dictionary of exceptions organized by type, service, model, and question name."""
+        exceptions_table = {}
+        for interview in self.total_interviews:
+            for question_name, exceptions in interview.exceptions.items():
+                for exception in exceptions:
+                    key = (
+                        exception.exception.__class__.__name__,  # Exception type
+                        interview.model._inference_service_,    # Service
+                        interview.model.model,                  # Model
+                        question_name                           # Question name
+                    )
+                    if key not in exceptions_table:
+                        exceptions_table[key] = 0
+                    exceptions_table[key] += 1
+        return exceptions_table
+    
     @property
     def exceptions_by_type(self) -> dict:
-        """Return a dictionary of exceptions by type."""
+        """Return a dictionary of exceptions tallied by type."""
         exceptions_by_type = {}
         for interview in self.total_interviews:
             for question_name, exceptions in interview.exceptions.items():
@@ -324,6 +342,27 @@ class TaskHistory(RepresentationMixin):
         }
         return sorted_exceptions_by_question_name
 
+    # @property
+    # def exceptions_by_model(self) -> dict:
+    #     """Return a dictionary of exceptions tallied by model and question name."""
+    #     exceptions_by_model = {}
+    #     for interview in self.total_interviews:
+    #         model = interview.model.model
+    #         service = interview.model._inference_service_
+    #         if (service, model) not in exceptions_by_model:
+    #             exceptions_by_model[(service, model)] = 0
+    #         if interview.exceptions != {}:
+    #             exceptions_by_model[(service, model)] += len(interview.exceptions)
+
+    #     # sort the exceptions by model
+    #     sorted_exceptions_by_model = {
+    #         k: v
+    #         for k, v in sorted(
+    #             exceptions_by_model.items(), key=lambda item: item[1], reverse=True
+    #         )
+    #     }
+    #     return sorted_exceptions_by_model
+
     @property
     def exceptions_by_model(self) -> dict:
         """Return a dictionary of exceptions tallied by model and question name."""
@@ -331,19 +370,12 @@ class TaskHistory(RepresentationMixin):
         for interview in self.total_interviews:
             model = interview.model.model
             service = interview.model._inference_service_
-            if (service, model) not in exceptions_by_model:
-                exceptions_by_model[(service, model)] = 0
-            if interview.exceptions != {}:
-                exceptions_by_model[(service, model)] += len(interview.exceptions)
-
-        # sort the exceptions by model
-        sorted_exceptions_by_model = {
-            k: v
-            for k, v in sorted(
-                exceptions_by_model.items(), key=lambda item: item[1], reverse=True
-            )
-        }
-        return sorted_exceptions_by_model
+            for question_name, exceptions in interview.exceptions.items():
+                key = (service, model, question_name)
+                if key not in exceptions_by_model:
+                    exceptions_by_model[key] = 0
+                exceptions_by_model[key] += len(exceptions)
+        return exceptions_by_model
 
     def generate_html_report(self, css: Optional[str], include_plot=False):
         if include_plot:
@@ -372,6 +404,7 @@ class TaskHistory(RepresentationMixin):
             javascript=self.javascript(),
             num_exceptions=len(self.exceptions),
             performance_plot_html=performance_plot_html,
+            exceptions_table=self.exceptions_table,
             exceptions_by_type=self.exceptions_by_type,
             exceptions_by_question_name=self.exceptions_by_question_name,
             exceptions_by_model=self.exceptions_by_model,
@@ -386,11 +419,10 @@ class TaskHistory(RepresentationMixin):
         filename: Optional[str] = None,
         return_link=False,
         css=None,
-        cta="Open Report in New Tab",
+        cta="\nClick to open the report in a new tab\n",
         open_in_browser=False,
     ):
         """Return an HTML report."""
-
         from IPython.display import display, HTML
         import tempfile
         import os
@@ -419,7 +451,7 @@ class TaskHistory(RepresentationMixin):
             html_link = f'<a href="{html_url}" target="_blank">{cta}</a>'
             display(HTML(html_link))
             escaped_output = html.escape(output)
-            iframe = f""""
+            iframe = f"""
             <iframe srcdoc="{ escaped_output }" style="width: 800px; height: 600px;"></iframe>
             """
             display(HTML(iframe))

{edsl-0.1.41 → edsl-0.1.42}/edsl/language_models/LanguageModel.py

@@ -244,7 +244,7 @@ class LanguageModel(
 
         >>> m = LanguageModel.example()
         >>> hash(m)
-        1811901442659237949
+        325654563661254408
         """
         from edsl.utilities.utilities import dict_hash
 
@@ -495,11 +495,12 @@ class LanguageModel(
 
         >>> m = LanguageModel.example()
         >>> m.to_dict()
-        {'model': '...', 'parameters': {'temperature': ..., 'max_tokens': ..., 'top_p': ..., 'frequency_penalty': ..., 'presence_penalty': ..., 'logprobs': False, 'top_logprobs': ...}, 'edsl_version': '...', 'edsl_class_name': 'LanguageModel'}
+        {'model': '...', 'parameters': {'temperature': ..., 'max_tokens': ..., 'top_p': ..., 'frequency_penalty': ..., 'presence_penalty': ..., 'logprobs': False, 'top_logprobs': ...}, 'inference_service': 'openai', 'edsl_version': '...', 'edsl_class_name': 'LanguageModel'}
         """
         d = {
             "model": self.model,
             "parameters": self.parameters,
+            "inference_service": self._inference_service_,
         }
         if add_edsl_version:
             from edsl import __version__
@@ -511,7 +512,10 @@ class LanguageModel(
     @classmethod
     @remove_edsl_version
     def from_dict(cls, data: dict) -> Type[LanguageModel]:
-        """Convert dictionary to a LanguageModel child instance."""
+        """Convert dictionary to a LanguageModel child instance.
+
+        NB: This method does not use the stores inference_service but rather just fetches a model class based on the name.
+        """
         from edsl.language_models.model import get_model_class
 
         model_class = get_model_class(data["model"])
@@ -558,7 +562,6 @@ class LanguageModel(
         >>> m = LanguageModel.example(test_model = True, canned_response = "WOWZA!", throw_exception = True)
         >>> r = q.by(m).run(cache = False, disable_remote_cache = True, disable_remote_inference = True, print_exceptions = True)
         Exception report saved to ...
-        Also see: ...
         """
         from edsl.language_models.model import Model
 

{edsl-0.1.41 → edsl-0.1.42}/edsl/language_models/ModelList.py

@@ -60,7 +60,7 @@ class ModelList(Base, UserList):
 
         sl = ScenarioList()
         for model in self:
-            d = {"model": model.model}
+            d = {"model": model.model, "inference_service": model._inference_service_}
             d.update(model.parameters)
             sl.append(Scenario(d))
         return sl