edsl 0.1.36__py3-none-any.whl → 0.1.36.dev2__py3-none-any.whl

edsl/Base.py

@@ -7,8 +7,6 @@ import json
 from typing import Any, Optional, Union
 from uuid import UUID
 
-# from edsl.utilities.MethodSuggesterMixin import MethodSuggesterMixin
-
 
 class RichPrintingMixin:
     """Mixin for rich printing and persistence of objects."""
@@ -276,9 +274,6 @@ class Base(
         """This method should be implemented by subclasses."""
         raise NotImplementedError("This method is not implemented yet.")
 
-    def to_json(self):
-        return json.dumps(self.to_dict())
-
     @abstractmethod
     def from_dict():
         """This method should be implemented by subclasses."""

edsl/__init__.py

@@ -27,7 +27,6 @@ from edsl.questions import QuestionTopK
 
 from edsl.scenarios import Scenario
 from edsl.scenarios import ScenarioList
-from edsl.scenarios.FileStore import FileStore
 
 # from edsl.utilities.interface import print_dict_with_rich
 from edsl.surveys.Survey import Survey

edsl/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.36"
+__version__ = "0.1.36.dev2"

edsl/agents/Agent.py

@@ -111,11 +111,7 @@ class Agent(Base):
         self.name = name
         self._traits = traits or dict()
         self.codebook = codebook or dict()
-        if instruction is None:
-            self.instruction = self.default_instruction
-        else:
-            self.instruction = instruction
-        # self.instruction = instruction or self.default_instruction
+        self.instruction = instruction or self.default_instruction
         self.dynamic_traits_function = dynamic_traits_function
 
         # Deal with dynamic traits function
@@ -614,9 +610,9 @@ class Agent(Base):
             if dynamic_traits_func:
                 func = inspect.getsource(dynamic_traits_func)
                 raw_data["dynamic_traits_function_source_code"] = func
-                raw_data[
-                    "dynamic_traits_function_name"
-                ] = self.dynamic_traits_function_name
+                raw_data["dynamic_traits_function_name"] = (
+                    self.dynamic_traits_function_name
+                )
         if hasattr(self, "answer_question_directly"):
             raw_data.pop(
                 "answer_question_directly", None
@@ -632,9 +628,9 @@ class Agent(Base):
                 raw_data["answer_question_directly_source_code"] = inspect.getsource(
                     answer_question_directly_func
                 )
-                raw_data[
-                    "answer_question_directly_function_name"
-                ] = self.answer_question_directly_function_name
+                raw_data["answer_question_directly_function_name"] = (
+                    self.answer_question_directly_function_name
+                )
 
         return raw_data
 

edsl/agents/InvigilatorBase.py

@@ -115,11 +115,7 @@ class InvigilatorBase(ABC):
         iteration = data["iteration"]
         additional_prompt_data = data["additional_prompt_data"]
         cache = Cache.from_dict(data["cache"])
-
-        if data["sidecar_model"] is None:
-            sidecar_model = None
-        else:
-            sidecar_model = LanguageModel.from_dict(data["sidecar_model"])
+        sidecar_model = LanguageModel.from_dict(data["sidecar_model"])
 
         return cls(
             agent=agent,

edsl/agents/PromptConstructor.py

@@ -1,11 +1,17 @@
 from __future__ import annotations
 from typing import Dict, Any, Optional, Set
+from collections import UserList
+import pdb
 
 from jinja2 import Environment, meta
 
 from edsl.prompts.Prompt import Prompt
+from edsl.data_transfer_models import ImageInfo
 
-from edsl.agents.prompt_helpers import PromptPlan
+# from edsl.prompts.registry import get_classes as prompt_lookup
+from edsl.exceptions import QuestionScenarioRenderError
+
+from edsl.agents.prompt_helpers import PromptComponent, PromptList, PromptPlan
 
 
 def get_jinja2_variables(template_str: str) -> Set[str]:
@@ -147,28 +153,14 @@ class PromptConstructor:
 
                 # might be getting it from the prior answers
                 if self.prior_answers_dict().get(question_option_key) is not None:
-                    prior_question = self.prior_answers_dict().get(question_option_key)
-                    if hasattr(prior_question, "answer"):
-                        if isinstance(prior_question.answer, list):
-                            question_data["question_options"] = prior_question.answer
-                            self.question.question_options = prior_question.answer
-                    else:
-                        placeholder_options = [
-                            "N/A",
-                            "Will be populated by prior answer",
-                            "These are placeholder options",
-                        ]
-                        question_data["question_options"] = placeholder_options
-                        self.question.question_options = placeholder_options
-
-                    # 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 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}
@@ -220,10 +212,9 @@ class PromptConstructor:
             )
 
             if relevant_instructions != []:
-                # preamble_text = Prompt(
-                #    text="You were given the following instructions: "
-                # )
-                preamble_text = Prompt(text="")
+                preamble_text = Prompt(
+                    text="Before answer this question, you were given the following instructions: "
+                )
                 for instruction in relevant_instructions:
                     preamble_text += instruction.text
                 rendered_instructions = preamble_text + rendered_instructions

edsl/conversation/Conversation.py

@@ -169,7 +169,6 @@ class Conversation:
             agent=speaker,
             just_answer=False,
             cache=self.cache,
-            model=speaker.model,
         )
         return results[0]
 
@@ -180,6 +179,7 @@ class Conversation:
         i = 0
         while await self.continue_conversation():
             speaker = self.next_speaker()
+            # breakpoint()
 
             next_statement = AgentStatement(
                 statement=await self.get_next_statement(

edsl/coop/PriceFetcher.py

@@ -16,26 +16,30 @@ class PriceFetcher:
         if self._cached_prices is not None:
             return self._cached_prices
 
-        import os
         import requests
-        from edsl import CONFIG
+        import csv
+        from io import StringIO
+
+        sheet_id = "1SAO3Bhntefl0XQHJv27rMxpvu6uzKDWNXFHRa7jrUDs"
+
+        # Construct the URL to fetch the CSV
+        url = f"https://docs.google.com/spreadsheets/d/{sheet_id}/export?format=csv"
 
         try:
-            # Fetch the pricing data
-            url = f"{CONFIG.EXPECTED_PARROT_URL}/api/v0/prices"
-            api_key = os.getenv("EXPECTED_PARROT_API_KEY")
-            headers = {}
-            if api_key:
-                headers["Authorization"] = f"Bearer {api_key}"
-            else:
-                headers["Authorization"] = f"Bearer None"
-
-            response = requests.get(url, headers=headers, timeout=20)
+            # Fetch the CSV data
+            response = requests.get(url)
             response.raise_for_status()  # Raise an exception for bad responses
 
-            # Parse the data
-            data = response.json()
+            # Parse the CSV data
+            csv_data = StringIO(response.text)
+            reader = csv.reader(csv_data)
+
+            # Convert to list of dictionaries
+            headers = next(reader)
+            data = [dict(zip(headers, row)) for row in reader]
 
+            # self._cached_prices = data
+            # return data
             price_lookup = {}
             for entry in data:
                 service = entry.get("service", None)

edsl/coop/coop.py

@@ -6,7 +6,6 @@ from typing import Any, Optional, Union, Literal
 from uuid import UUID
 import edsl
 from edsl import CONFIG, CacheEntry, Jobs, Survey
-from edsl.exceptions.coop import CoopNoUUIDError, CoopServerResponseError
 from edsl.coop.utils import (
     EDSLObject,
     ObjectRegistry,
@@ -100,7 +99,7 @@ class Coop:
             if "Authorization" in message:
                 print(message)
                 message = "Please provide an Expected Parrot API key."
-            raise CoopServerResponseError(message)
+            raise Exception(message)
 
     def _json_handle_none(self, value: Any) -> Any:
         """
@@ -117,7 +116,7 @@ class Coop:
         Resolve the uuid from a uuid or a url.
         """
         if not url and not uuid:
-            raise CoopNoUUIDError("No uuid or url provided for the object.")
+            raise Exception("No uuid or url provided for the object.")
         if not uuid and url:
             uuid = url.split("/")[-1]
         return uuid
@@ -522,7 +521,7 @@ class Coop:
         self._resolve_server_response(response)
         response_json = response.json()
         return {
-            "uuid": response_json.get("job_uuid"),
+            "uuid": response_json.get("jobs_uuid"),
             "description": response_json.get("description"),
             "status": response_json.get("status"),
             "iterations": response_json.get("iterations"),
@@ -530,41 +529,29 @@ class Coop:
             "version": self._edsl_version,
         }
 
-    def remote_inference_get(
-        self, job_uuid: Optional[str] = None, results_uuid: Optional[str] = None
-    ) -> dict:
+    def remote_inference_get(self, job_uuid: str) -> dict:
         """
         Get the details of a remote inference job.
-        You can pass either the job uuid or the results uuid as a parameter.
-        If you pass both, the job uuid will be prioritized.
 
         :param job_uuid: The UUID of the EDSL job.
-        :param results_uuid: The UUID of the results associated with the EDSL job.
 
         >>> coop.remote_inference_get("9f8484ee-b407-40e4-9652-4133a7236c9c")
         {'jobs_uuid': '9f8484ee-b407-40e4-9652-4133a7236c9c', 'results_uuid': 'dd708234-31bf-4fe1-8747-6e232625e026', 'results_url': 'https://www.expectedparrot.com/content/dd708234-31bf-4fe1-8747-6e232625e026', 'status': 'completed', 'reason': None, 'price': 16, 'version': '0.1.29.dev4'}
         """
-        if job_uuid is None and results_uuid is None:
-            raise ValueError("Either job_uuid or results_uuid must be provided.")
-        elif job_uuid is not None:
-            params = {"job_uuid": job_uuid}
-        else:
-            params = {"results_uuid": results_uuid}
-
         response = self._send_server_request(
             uri="api/v0/remote-inference",
             method="GET",
-            params=params,
+            params={"uuid": job_uuid},
         )
         self._resolve_server_response(response)
         data = response.json()
         return {
-            "job_uuid": data.get("job_uuid"),
+            "jobs_uuid": data.get("jobs_uuid"),
             "results_uuid": data.get("results_uuid"),
             "results_url": f"{self.url}/content/{data.get('results_uuid')}",
             "status": data.get("status"),
             "reason": data.get("reason"),
-            "credits_consumed": data.get("price"),
+            "price": data.get("price"),
             "version": data.get("version"),
         }
 
@@ -597,10 +584,7 @@ class Coop:
         )
         self._resolve_server_response(response)
         response_json = response.json()
-        return {
-            "credits": response_json.get("cost_in_credits"),
-            "usd": response_json.get("cost_in_usd"),
-        }
+        return response_json.get("cost")
 
     ################
     # Remote Errors
@@ -665,10 +649,6 @@ class Coop:
         return response_json
 
     def fetch_prices(self) -> dict:
-        """
-        Fetch model prices from Coop. If the request fails, return an empty dict.
-        """
-
         from edsl.coop.PriceFetcher import PriceFetcher
 
         from edsl.config import CONFIG
@@ -679,20 +659,6 @@ class Coop:
         else:
             return {}
 
-    def fetch_rate_limit_config_vars(self) -> dict:
-        """
-        Fetch a dict of rate limit config vars from Coop.
-
-        The dict keys are RPM and TPM variables like EDSL_SERVICE_RPM_OPENAI.
-        """
-        response = self._send_server_request(
-            uri="api/v0/config-vars",
-            method="GET",
-        )
-        self._resolve_server_response(response)
-        data = response.json()
-        return data
-
 
 if __name__ == "__main__":
     sheet_data = fetch_sheet_data()

edsl/exceptions/coop.py

@@ -1,10 +1,2 @@
 class CoopErrors(Exception):
     pass
-
-
-class CoopNoUUIDError(CoopErrors):
-    pass
-
-
-class CoopServerResponseError(CoopErrors):
-    pass

edsl/inference_services/InferenceServiceABC.py

@@ -1,7 +1,6 @@
 from abc import abstractmethod, ABC
 import os
 import re
-from datetime import datetime, timedelta
 from edsl.config import CONFIG
 
 
@@ -11,8 +10,6 @@ class InferenceServiceABC(ABC):
     Anthropic: https://docs.anthropic.com/en/api/rate-limits
     """
 
-    _coop_config_vars = None
-
     default_levels = {
         "google": {"tpm": 2_000_000, "rpm": 15},
         "openai": {"tpm": 2_000_000, "rpm": 10_000},
@@ -34,37 +31,12 @@ class InferenceServiceABC(ABC):
                 f"Class {cls.__name__} must have a 'model_exclude_list' attribute."
             )
 
-    @classmethod
-    def _should_refresh_coop_config_vars(cls):
-        """
-        Returns True if config vars have been fetched over 24 hours ago, and False otherwise.
-        """
-
-        if cls._last_config_fetch is None:
-            return True
-        return (datetime.now() - cls._last_config_fetch) > timedelta(hours=24)
-
     @classmethod
     def _get_limt(cls, limit_type: str) -> int:
         key = f"EDSL_SERVICE_{limit_type.upper()}_{cls._inference_service_.upper()}"
         if key in os.environ:
             return int(os.getenv(key))
 
-        if cls._coop_config_vars is None or cls._should_refresh_coop_config_vars():
-            try:
-                from edsl import Coop
-
-                c = Coop()
-                cls._coop_config_vars = c.fetch_rate_limit_config_vars()
-                cls._last_config_fetch = datetime.now()
-                if key in cls._coop_config_vars:
-                    return cls._coop_config_vars[key]
-            except Exception:
-                cls._coop_config_vars = None
-        else:
-            if key in cls._coop_config_vars:
-                return cls._coop_config_vars[key]
-
         if cls._inference_service_ in cls.default_levels:
             return int(cls.default_levels[cls._inference_service_][limit_type])
 

edsl/inference_services/InferenceServicesCollection.py

@@ -56,19 +56,13 @@ class InferenceServicesCollection:
         self.services.append(service)
 
     def create_model_factory(self, model_name: str, service_name=None, index=None):
-        from edsl.inference_services.TestService import TestService
-
-        if model_name == "test":
-            return TestService.create_model(model_name)
-
-        if service_name:
-            for service in self.services:
-                if service_name == service._inference_service_:
-                    return service.create_model(model_name)
-
         for service in self.services:
             if model_name in self._get_service_available(service):
                 if service_name is None or service_name == service._inference_service_:
                     return service.create_model(model_name)
 
+        # if model_name == "test":
+        #     from edsl.language_models import LanguageModel
+        #     return LanguageModel(test = True)
+
         raise Exception(f"Model {model_name} not found in any of the services")

edsl/inference_services/models_available_cache.py

@@ -65,31 +65,7 @@ models_available = {
         "meta-llama/Meta-Llama-3-70B-Instruct",
         "openchat/openchat_3.5",
     ],
-    "google": [
-        "gemini-1.0-pro",
-        "gemini-1.0-pro-001",
-        "gemini-1.0-pro-latest",
-        "gemini-1.0-pro-vision-latest",
-        "gemini-1.5-flash",
-        "gemini-1.5-flash-001",
-        "gemini-1.5-flash-001-tuning",
-        "gemini-1.5-flash-002",
-        "gemini-1.5-flash-8b",
-        "gemini-1.5-flash-8b-001",
-        "gemini-1.5-flash-8b-exp-0827",
-        "gemini-1.5-flash-8b-exp-0924",
-        "gemini-1.5-flash-8b-latest",
-        "gemini-1.5-flash-exp-0827",
-        "gemini-1.5-flash-latest",
-        "gemini-1.5-pro",
-        "gemini-1.5-pro-001",
-        "gemini-1.5-pro-002",
-        "gemini-1.5-pro-exp-0801",
-        "gemini-1.5-pro-exp-0827",
-        "gemini-1.5-pro-latest",
-        "gemini-pro",
-        "gemini-pro-vision",
-    ],
+    "google": ["gemini-pro"],
     "bedrock": [
         "amazon.titan-tg1-large",
         "amazon.titan-text-lite-v1",