edsl 0.1.39__py3-none-any.whl → 0.1.39.dev1__py3-none-any.whl

edsl/auto/StageBase.py

@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-import json
 from typing import Dict, List, Any, TypeVar, Generator, Dict, Callable
 from dataclasses import dataclass, field, KW_ONLY, fields, asdict
 import textwrap
@@ -36,13 +35,6 @@ class FlowDataBase:
     sent_to_stage_name: str = field(default_factory=str)
     came_from_stage_name: str = field(default_factory=str)
 
-    def to_dict(self):
-        return asdict(self)
-
-    @classmethod
-    def from_dict(cls, data: dict):
-        return cls(**data)
-
     def __getitem__(self, key):
         """Allows dictionary-style getting."""
         return getattr(self, key)
@@ -134,10 +126,6 @@ class StageBase(ABC):
         else:
             self.next_stage = None
 
-    @classmethod
-    def function_parameters(self):
-        return fields(self.input)
-
     @classmethod
     def func(cls, **kwargs):
         "This provides a shortcut for running a stage by passing keyword arguments to the input function."
@@ -185,59 +173,58 @@ class StageBase(ABC):
 
 
 if __name__ == "__main__":
-    pass
-    # try:
+    try:
 
-    #     class StageMissing(StageBase):
-    #         def handle_data(self, data):
-    #             return data
+        class StageMissing(StageBase):
+            def handle_data(self, data):
+                return data
 
-    # except NotImplementedError as e:
-    #     print(e)
-    # else:
-    #     raise Exception("Should have raised NotImplementedError")
+    except NotImplementedError as e:
+        print(e)
+    else:
+        raise Exception("Should have raised NotImplementedError")
 
-    # try:
+    try:
 
-    #     class StageMissingInput(StageBase):
-    #         output = FlowDataBase
+        class StageMissingInput(StageBase):
+            output = FlowDataBase
 
-    # except NotImplementedError as e:
-    #     print(e)
+    except NotImplementedError as e:
+        print(e)
 
-    # else:
-    #     raise Exception("Should have raised NotImplementedError")
+    else:
+        raise Exception("Should have raised NotImplementedError")
 
-    # @dataclass
-    # class MockInputOutput(FlowDataBase):
-    #     text: str
+    @dataclass
+    class MockInputOutput(FlowDataBase):
+        text: str
 
-    # class StageTest(StageBase):
-    #     input = MockInputOutput
-    #     output = MockInputOutput
+    class StageTest(StageBase):
+        input = MockInputOutput
+        output = MockInputOutput
 
-    #     def handle_data(self, data):
-    #         return self.output(text=data["text"] + "processed")
+        def handle_data(self, data):
+            return self.output(text=data["text"] + "processed")
 
-    # result = StageTest().process(MockInputOutput(text="Hello world!"))
-    # print(result.text)
+    result = StageTest().process(MockInputOutput(text="Hello world!"))
+    print(result.text)
 
-    # pipeline = StageTest(next_stage=StageTest(next_stage=StageTest()))
-    # result = pipeline.process(MockInputOutput(text="Hello world!"))
-    # print(result.text)
+    pipeline = StageTest(next_stage=StageTest(next_stage=StageTest()))
+    result = pipeline.process(MockInputOutput(text="Hello world!"))
+    print(result.text)
 
-    # class BadMockInput(FlowDataBase):
-    #     text: str
-    #     other: str
+    class BadMockInput(FlowDataBase):
+        text: str
+        other: str
 
-    # class StageBad(StageBase):
-    #     input = BadMockInput
-    #     output = BadMockInput
+    class StageBad(StageBase):
+        input = BadMockInput
+        output = BadMockInput
 
-    #     def handle_data(self, data):
-    #         return self.output(text=data["text"] + "processed")
+        def handle_data(self, data):
+            return self.output(text=data["text"] + "processed")
 
-    # try:
-    #     pipeline = StageTest(next_stage=StageBad(next_stage=StageTest()))
-    # except ExceptionPipesDoNotFit as e:
-    #     print(e)
+    try:
+        pipeline = StageTest(next_stage=StageBad(next_stage=StageTest()))
+    except ExceptionPipesDoNotFit as e:
+        print(e)

edsl/auto/StageQuestions.py

@@ -68,7 +68,6 @@ if __name__ == "__main__":
             population="Consumers",
         )
     )
-
-    results = StageQuestions.func(
+    StageQuestions.func(
         overall_question="Why aren't my students studying more?", population="Tech"
     )

edsl/auto/utilities.py

@@ -88,6 +88,12 @@ def agent_eligibility(
         q_eligibility(model=model, questions=questions, persona=persona, cache=cache)
         == "Yes"
     )
+    # results = (
+    #     q.by(model)
+    #     .by(Scenario({"questions": questions, "persona": persona}))
+    #     .run(cache=cache)
+    # )
+    # return results.select("eligibility").first() == "Yes"
 
 
 def gen_agent_traits(dimension_dict: dict, seed_value: Optional[str] = None):

edsl/config.py

@@ -1,16 +1,12 @@
 """This module provides a Config class that loads environment variables from a .env file and sets them as class attributes."""
 
 import os
-import platformdirs
 from dotenv import load_dotenv, find_dotenv
-from edsl.exceptions.configuration import (
+from edsl.exceptions import (
     InvalidEnvironmentVariableError,
     MissingEnvironmentVariableError,
 )
 
-cache_dir = platformdirs.user_cache_dir("edsl")
-os.makedirs(cache_dir, exist_ok=True)
-
 # valid values for EDSL_RUN_MODE
 EDSL_RUN_MODES = [
     "development",
@@ -38,8 +34,7 @@ CONFIG_MAP = {
         "info": "This config var determines the maximum number of seconds to wait before retrying a failed API call.",
     },
     "EDSL_DATABASE_PATH": {
-        # "default": f"sqlite:///{os.path.join(os.getcwd(), '.edsl_cache/data.db')}",
-        "default": f"sqlite:///{os.path.join(platformdirs.user_cache_dir('edsl'), 'lm_model_calls.db')}",
+        "default": f"sqlite:///{os.path.join(os.getcwd(), '.edsl_cache/data.db')}",
         "info": "This config var determines the path to the cache file.",
     },
     "EDSL_DEFAULT_MODEL": {
@@ -74,10 +69,6 @@ CONFIG_MAP = {
         "default": "False",
         "info": "This config var determines whether to open the exception report URL in the browser",
     },
-    "EDSL_REMOTE_TOKEN_BUCKET_URL": {
-        "default": "None",
-        "info": "This config var holds the URL of the remote token bucket server.",
-    },
 }
 
 
@@ -90,9 +81,6 @@ class Config:
         self._load_dotenv()
         self._set_env_vars()
 
-    def show_path_to_dot_env(self):
-        print(find_dotenv(usecwd=True))
-
     def _set_run_mode(self) -> None:
         """
         Sets EDSL_RUN_MODE as a class attribute.
@@ -156,14 +144,6 @@ class Config:
             raise MissingEnvironmentVariableError(f"{env_var} is not set. {info}")
         return self.__dict__.get(env_var)
 
-    def __iter__(self):
-        """Iterate over the environment variables."""
-        return iter(self.__dict__)
-
-    def items(self):
-        """Iterate over the environment variables and their values."""
-        return self.__dict__.items()
-
     def show(self) -> str:
         """Print the currently set environment vars."""
         max_env_var_length = max(len(env_var) for env_var in self.__dict__)

edsl/conversation/car_buying.py

@@ -29,8 +29,7 @@ a3 = Agent(
 c1 = Conversation(agent_list=AgentList([a1, a3, a2]), max_turns=5, verbose=True)
 c2 = Conversation(agent_list=AgentList([a1, a2]), max_turns=5, verbose=True)
 
-# c = Cache.load("car_talk.json.gz")
-c = Cache()
+c = Cache.load("car_talk.json.gz")
 # breakpoint()
 combo = ConversationList([c1, c2], cache=c)
 combo.run()

edsl/coop/PriceFetcher.py

@@ -18,7 +18,7 @@ class PriceFetcher:
 
         import os
         import requests
-        from edsl.config import CONFIG
+        from edsl import CONFIG
 
         try:
             # Fetch the pricing data

edsl/coop/coop.py

@@ -1,19 +1,11 @@
 import aiohttp
 import json
+import os
 import requests
-
-from typing import Any, Optional, Union, Literal, TypedDict
+from typing import Any, Optional, Union, Literal
 from uuid import UUID
-from collections import UserDict, defaultdict
-
 import edsl
-from pathlib import Path
-
-from edsl.config import CONFIG
-from edsl.data.CacheEntry import CacheEntry
-from edsl.jobs.Jobs import Jobs
-from edsl.surveys.Survey import Survey
-
+from edsl import CONFIG, CacheEntry, Jobs, Survey
 from edsl.exceptions.coop import CoopNoUUIDError, CoopServerResponseError
 from edsl.coop.utils import (
     EDSLObject,
@@ -23,48 +15,19 @@ from edsl.coop.utils import (
     VisibilityType,
 )
 
-from edsl.coop.CoopFunctionsMixin import CoopFunctionsMixin
-from edsl.coop.ExpectedParrotKeyHandler import ExpectedParrotKeyHandler
-
-from edsl.inference_services.data_structures import ServiceToModelsMapping
-
 
-class RemoteInferenceResponse(TypedDict):
-    job_uuid: str
-    results_uuid: str
-    results_url: str
-    latest_error_report_uuid: str
-    latest_error_report_url: str
-    status: str
-    reason: str
-    credits_consumed: float
-    version: str
-
-
-class RemoteInferenceCreationInfo(TypedDict):
-    uuid: str
-    description: str
-    status: str
-    iterations: int
-    visibility: str
-    version: str
-
-
-class Coop(CoopFunctionsMixin):
+class Coop:
     """
     Client for the Expected Parrot API.
     """
 
-    def __init__(
-        self, api_key: Optional[str] = None, url: Optional[str] = None
-    ) -> None:
+    def __init__(self, api_key: str = None, url: str = None) -> None:
         """
         Initialize the client.
         - Provide an API key directly, or through an env variable.
         - Provide a URL directly, or use the default one.
         """
-        self.ep_key_handler = ExpectedParrotKeyHandler()
-        self.api_key = api_key or self.ep_key_handler.get_ep_api_key()
+        self.api_key = api_key or os.getenv("EXPECTED_PARROT_API_KEY")
 
         self.url = url or CONFIG.EXPECTED_PARROT_URL
         if self.url.endswith("/"):
@@ -179,7 +142,6 @@ class Coop(CoopFunctionsMixin):
         Check the response from the server and raise errors as appropriate.
         """
         # Get EDSL version from header
-        # breakpoint()
         server_edsl_version = response.headers.get("X-EDSL-Version")
 
         if server_edsl_version:
@@ -188,18 +150,11 @@ class Coop(CoopFunctionsMixin):
                 server_version_str=server_edsl_version,
             ):
                 print(
-                    "Please upgrade your EDSL version to access our latest features. To upgrade, open your terminal and run `pip install --upgrade edsl`"
+                    "Please upgrade your EDSL version to access our latest features. To upgrade, open your terminal and run `pip upgrade edsl`"
                 )
 
         if response.status_code >= 400:
-            try:
-                message = response.json().get("detail")
-            except json.JSONDecodeError:
-                raise CoopServerResponseError(
-                    f"Server returned status code {response.status_code}."
-                    "JSON response could not be decoded.",
-                    "The server response was: " + response.text,
-                )
+            message = response.json().get("detail")
             # print(response.text)
             if "The API key you provided is invalid" in message and check_api_key:
                 import secrets
@@ -208,27 +163,19 @@ class Coop(CoopFunctionsMixin):
                 edsl_auth_token = secrets.token_urlsafe(16)
 
                 print("Your Expected Parrot API key is invalid.")
-                self._display_login_url(
-                    edsl_auth_token=edsl_auth_token,
-                    link_description="\n🔗 Use the link below to log in to Expected Parrot so we can automatically update your API key.",
+                print(
+                    "\nUse the link below to log in to Expected Parrot so we can automatically update your API key."
                 )
+                self._display_login_url(edsl_auth_token=edsl_auth_token)
                 api_key = self._poll_for_api_key(edsl_auth_token)
 
                 if api_key is None:
                     print("\nTimed out waiting for login. Please try again.")
                     return
 
-                print("\n✨ API key retrieved.")
-
-                if stored_in_user_space := self.ep_key_handler.ask_to_store(api_key):
-                    pass
-                else:
-                    path_to_env = write_api_key_to_env(api_key)
-                    print(
-                        "\n✨ API key retrieved and written to .env file at the following path:"
-                    )
-                    print(f"    {path_to_env}")
-                    print("Rerun your code to try again with a valid API key.")
+                write_api_key_to_env(api_key)
+                print("\n✨ API key retrieved and written to .env file.")
+                print("Rerun your code to try again with a valid API key.")
                 return
 
             elif "Authorization" in message:
@@ -321,7 +268,6 @@ class Coop(CoopFunctionsMixin):
         self,
         object: EDSLObject,
         description: Optional[str] = None,
-        alias: Optional[str] = None,
         visibility: Optional[VisibilityType] = "unlisted",
     ) -> dict:
         """
@@ -333,7 +279,6 @@ class Coop(CoopFunctionsMixin):
             method="POST",
             payload={
                 "description": description,
-                "alias": alias,
                 "json_string": json.dumps(
                     object.to_dict(),
                     default=self._json_handle_none,
@@ -428,7 +373,6 @@ class Coop(CoopFunctionsMixin):
         uuid: Union[str, UUID] = None,
         url: str = None,
         description: Optional[str] = None,
-        alias: Optional[str] = None,
         value: Optional[EDSLObject] = None,
         visibility: Optional[VisibilityType] = None,
     ) -> dict:
@@ -445,7 +389,6 @@ class Coop(CoopFunctionsMixin):
             params={"uuid": uuid},
             payload={
                 "description": description,
-                "alias": alias,
                 "json_string": (
                     json.dumps(
                         value.to_dict(),
@@ -659,6 +602,9 @@ class Coop(CoopFunctionsMixin):
         self._resolve_server_response(response)
         return response.json()
 
+    ################
+    # Remote Inference
+    ################
     def remote_inference_create(
         self,
         job: Jobs,
@@ -667,7 +613,7 @@ class Coop(CoopFunctionsMixin):
         visibility: Optional[VisibilityType] = "unlisted",
         initial_results_visibility: Optional[VisibilityType] = "unlisted",
         iterations: Optional[int] = 1,
-    ) -> RemoteInferenceCreationInfo:
+    ) -> dict:
         """
         Send a remote inference job to the server.
 
@@ -699,21 +645,18 @@ class Coop(CoopFunctionsMixin):
         )
         self._resolve_server_response(response)
         response_json = response.json()
-
-        return RemoteInferenceCreationInfo(
-            **{
-                "uuid": response_json.get("job_uuid"),
-                "description": response_json.get("description"),
-                "status": response_json.get("status"),
-                "iterations": response_json.get("iterations"),
-                "visibility": response_json.get("visibility"),
-                "version": self._edsl_version,
-            }
-        )
+        return {
+            "uuid": response_json.get("job_uuid"),
+            "description": response_json.get("description"),
+            "status": response_json.get("status"),
+            "iterations": response_json.get("iterations"),
+            "visibility": response_json.get("visibility"),
+            "version": self._edsl_version,
+        }
 
     def remote_inference_get(
         self, job_uuid: Optional[str] = None, results_uuid: Optional[str] = None
-    ) -> RemoteInferenceResponse:
+    ) -> dict:
         """
         Get the details of a remote inference job.
         You can pass either the job uuid or the results uuid as a parameter.
@@ -755,30 +698,17 @@ class Coop(CoopFunctionsMixin):
                 f"{self.url}/home/remote-inference/error/{latest_error_report_uuid}"
             )
 
-        return RemoteInferenceResponse(
-            **{
-                "job_uuid": data.get("job_uuid"),
-                "results_uuid": results_uuid,
-                "results_url": results_url,
-                "latest_error_report_uuid": latest_error_report_uuid,
-                "latest_error_report_url": latest_error_report_url,
-                "status": data.get("status"),
-                "reason": data.get("reason"),
-                "credits_consumed": data.get("price"),
-                "version": data.get("version"),
-            }
-        )
-
-    def get_running_jobs(self) -> list[str]:
-        """
-        Get a list of currently running job IDs.
-
-        Returns:
-            list[str]: List of running job UUIDs
-        """
-        response = self._send_server_request(uri="jobs/status", method="GET")
-        self._resolve_server_response(response)
-        return response.json().get("running_jobs", [])
+        return {
+            "job_uuid": data.get("job_uuid"),
+            "results_uuid": results_uuid,
+            "results_url": results_url,
+            "latest_error_report_uuid": latest_error_report_uuid,
+            "latest_error_report_url": latest_error_report_url,
+            "status": data.get("status"),
+            "reason": data.get("reason"),
+            "credits_consumed": data.get("price"),
+            "version": data.get("version"),
+        }
 
     def remote_inference_cost(
         self, input: Union[Jobs, Survey], iterations: int = 1
@@ -880,7 +810,7 @@ class Coop(CoopFunctionsMixin):
                 "Invalid EDSL_FETCH_TOKEN_PRICES value---should be 'True' or 'False'."
             )
 
-    def fetch_models(self) -> ServiceToModelsMapping:
+    def fetch_models(self) -> dict:
         """
         Fetch a dict of available models from Coop.
 
@@ -889,7 +819,7 @@ class Coop(CoopFunctionsMixin):
         response = self._send_server_request(uri="api/v0/models", method="GET")
         self._resolve_server_response(response)
         data = response.json()
-        return ServiceToModelsMapping(data)
+        return data
 
     def fetch_rate_limit_config_vars(self) -> dict:
         """
@@ -905,9 +835,7 @@ class Coop(CoopFunctionsMixin):
         data = response.json()
         return data
 
-    def _display_login_url(
-        self, edsl_auth_token: str, link_description: Optional[str] = None
-    ):
+    def _display_login_url(self, edsl_auth_token: str):
         """
         Uses rich.print to display a login URL.
 
@@ -917,12 +845,7 @@ class Coop(CoopFunctionsMixin):
 
         url = f"{CONFIG.EXPECTED_PARROT_URL}/login?edsl_auth_token={edsl_auth_token}"
 
-        if link_description:
-            rich_print(
-                f"{link_description}\n    [#38bdf8][link={url}]{url}[/link][/#38bdf8]"
-            )
-        else:
-            rich_print(f"    [#38bdf8][link={url}]{url}[/link][/#38bdf8]")
+        rich_print(f"[#38bdf8][link={url}]{url}[/link][/#38bdf8]")
 
     def _get_api_key(self, edsl_auth_token: str):
         """
@@ -950,18 +873,17 @@ class Coop(CoopFunctionsMixin):
 
         edsl_auth_token = secrets.token_urlsafe(16)
 
-        self._display_login_url(
-            edsl_auth_token=edsl_auth_token,
-            link_description="\n🔗 Use the link below to log in to Expected Parrot so we can automatically update your API key.",
+        print(
+            "\nUse the link below to log in to Expected Parrot so we can automatically update your API key."
         )
+        self._display_login_url(edsl_auth_token=edsl_auth_token)
         api_key = self._poll_for_api_key(edsl_auth_token)
 
         if api_key is None:
             raise Exception("Timed out waiting for login. Please try again.")
 
-        path_to_env = write_api_key_to_env(api_key)
-        print("\n✨ API key retrieved and written to .env file at the following path:")
-        print(f"    {path_to_env}")
+        write_api_key_to_env(api_key)
+        print("\n✨ API key retrieved and written to .env file.")
 
         # Add API key to environment
         load_dotenv()

edsl/coop/utils.py

@@ -1,19 +1,19 @@
+from edsl import (
+    Agent,
+    AgentList,
+    Cache,
+    ModelList,
+    Notebook,
+    Results,
+    Scenario,
+    ScenarioList,
+    Survey,
+    Study,
+)
+from edsl.language_models import LanguageModel
+from edsl.questions import QuestionBase
 from typing import Literal, Optional, Type, Union
 
-from edsl.agents.Agent import Agent
-from edsl.agents.AgentList import AgentList
-from edsl.data.Cache import Cache
-from edsl.language_models.ModelList import ModelList
-from edsl.notebooks.Notebook import Notebook
-from edsl.results.Results import Results
-from edsl.scenarios.Scenario import Scenario
-from edsl.scenarios.ScenarioList import ScenarioList
-from edsl.surveys.Survey import Survey
-from edsl.study.Study import Study
-
-from edsl.language_models.LanguageModel import LanguageModel
-from edsl.questions.QuestionBase import QuestionBase
-
 EDSLObject = Union[
     Agent,
     AgentList,