edsl 0.1.56__py3-none-any.whl → 0.1.58__py3-none-any.whl

edsl/language_models/price_manager.py

@@ -19,56 +19,12 @@ class ResponseCost:
     total_cost: Union[float, str, None] = None
 
 
-class PriceManager:
-    _instance = None
-    _price_lookup: Dict[Tuple[str, str], Dict] = {}
-    _is_initialized = False
-
-    def __new__(cls):
-        if cls._instance is None:
-            instance = super(PriceManager, cls).__new__(cls)
-            instance._price_lookup = {}  # Instance-specific attribute
-            instance._is_initialized = False
-            cls._instance = instance  # Store the instance directly
-            return instance
-        return cls._instance
-
-    def __init__(self):
-        """Initialize the singleton instance only once."""
-        if not self._is_initialized:
-            self._is_initialized = True
-            self.refresh_prices()
-
-    @classmethod
-    def get_instance(cls):
-        """Get the singleton instance, creating it if necessary."""
-        if cls._instance is None:
-            cls()  # Create the instance if it doesn't exist
-        return cls._instance
-
-    @classmethod
-    def reset(cls):
-        """Reset the singleton instance to clean up resources."""
-        cls._instance = None
-        cls._is_initialized = False
-        cls._price_lookup = {}
-
-    def __del__(self):
-        """Ensure proper cleanup when the instance is garbage collected."""
-        try:
-            self._price_lookup = {}  # Clean up resources
-        except:
-            pass  # Ignore any cleanup errors
+class PriceRetriever:
+    DEFAULT_INPUT_PRICE_PER_MILLION_TOKENS = 1.0
+    DEFAULT_OUTPUT_PRICE_PER_MILLION_TOKENS = 1.0
 
-    def refresh_prices(self) -> None:
-        """Fetch fresh prices and update the internal price lookup."""
-        from edsl.coop import Coop
-
-        c = Coop()
-        try:
-            self._price_lookup = c.fetch_prices()
-        except Exception as e:
-            print(f"Error fetching prices: {str(e)}")
+    def __init__(self, price_lookup: Dict[Tuple[str, str], Dict]):
+        self._price_lookup = price_lookup
 
     def get_price(self, inference_service: str, model: str) -> Dict:
         """Get the price information for a specific service and model."""
@@ -77,10 +33,6 @@ class PriceManager:
             inference_service
         )
 
-    def get_all_prices(self) -> Dict[Tuple[str, str], Dict]:
-        """Get the complete price lookup dictionary."""
-        return self._price_lookup.copy()
-
     def _get_fallback_price(self, inference_service: str) -> Dict:
         """
         Get fallback prices for a service.
@@ -101,15 +53,21 @@ class PriceManager:
             if service == inference_service
         ]
 
-        default_price_info = {
+        default_input_price_info = {
+            "one_usd_buys": 1_000_000,
+            "service_stated_token_qty": 1_000_000,
+            "service_stated_token_price": self.DEFAULT_INPUT_PRICE_PER_MILLION_TOKENS,
+        }
+
+        default_output_price_info = {
             "one_usd_buys": 1_000_000,
             "service_stated_token_qty": 1_000_000,
-            "service_stated_token_price": 1.0,
+            "service_stated_token_price": self.DEFAULT_OUTPUT_PRICE_PER_MILLION_TOKENS,
         }
 
         # Find the most expensive price entries (lowest tokens per USD)
-        input_price_info = default_price_info
-        output_price_info = default_price_info
+        input_price_info = default_input_price_info
+        output_price_info = default_output_price_info
 
         input_prices = [
             PriceEntry(float(p["input"]["one_usd_buys"]), p["input"])
@@ -156,6 +114,82 @@ class PriceManager:
             price_per_million_tokens = round(price_per_token * 1_000_000, 10)
         return price_per_million_tokens
 
+
+class PriceManager:
+    _instance = None
+    _price_lookup: Dict[Tuple[str, str], Dict] = {}
+    _is_initialized = False
+
+    def __new__(cls):
+        if cls._instance is None:
+            instance = super(PriceManager, cls).__new__(cls)
+            instance._price_lookup = {}  # Instance-specific attribute
+            instance._is_initialized = False
+            cls._instance = instance  # Store the instance directly
+            return instance
+        return cls._instance
+
+    def __init__(self):
+        """Initialize the singleton instance only once."""
+        if not self._is_initialized:
+            self._is_initialized = True
+            self.refresh_prices()
+
+    @classmethod
+    def get_instance(cls):
+        """Get the singleton instance, creating it if necessary."""
+        if cls._instance is None:
+            cls()  # Create the instance if it doesn't exist
+        return cls._instance
+
+    @classmethod
+    def reset(cls):
+        """Reset the singleton instance to clean up resources."""
+        cls._instance = None
+        cls._is_initialized = False
+        cls._price_lookup = {}
+
+    def __del__(self):
+        """Ensure proper cleanup when the instance is garbage collected."""
+        try:
+            self._price_lookup = {}  # Clean up resources
+        except:
+            pass  # Ignore any cleanup errors
+
+    @property
+    def price_retriever(self):
+        return PriceRetriever(self._price_lookup)
+
+    def refresh_prices(self) -> None:
+        """Fetch fresh prices and update the internal price lookup."""
+        from edsl.coop import Coop
+
+        c = Coop()
+        try:
+            self._price_lookup = c.fetch_prices()
+        except Exception as e:
+            print(f"Error fetching prices: {str(e)}")
+
+    def get_price(self, inference_service: str, model: str) -> Dict:
+        """Get the price information for a specific service and model."""
+        return self.price_retriever.get_price(inference_service, model)
+
+    def get_all_prices(self) -> Dict[Tuple[str, str], Dict]:
+        """Get the complete price lookup dictionary."""
+        return self._price_lookup.copy()
+
+    def get_price_per_million_tokens(
+        self,
+        relevant_prices: Dict,
+        token_type: Literal["input", "output"],
+    ) -> Dict:
+        """
+        Get the price per million tokens for a specific service, model, and token type.
+        """
+        return self.price_retriever.get_price_per_million_tokens(
+            relevant_prices, token_type
+        )
+
     def _calculate_total_cost(
         self,
         relevant_prices: Dict,

{edsl-0.1.56.dist-info → edsl-0.1.58.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edsl
-Version: 0.1.56
+Version: 0.1.58
 Summary: Create and analyze LLM-based surveys
 Home-page: https://www.expectedparrot.com/
 License: MIT
@@ -23,7 +23,7 @@ Requires-Dist: azure-ai-inference (>=1.0.0b3,<2.0.0)
 Requires-Dist: black[jupyter] (>=24.4.2,<25.0.0)
 Requires-Dist: boto3 (>=1.34.161,<2.0.0)
 Requires-Dist: google-generativeai (>=0.8.2,<0.9.0)
-Requires-Dist: groq (>=0.9.0,<0.10.0)
+Requires-Dist: groq (==0.23.1)
 Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
 Requires-Dist: json-repair (>=0.28.4,<0.29.0)
 Requires-Dist: jupyter (>=1.0.0,<2.0.0)

{edsl-0.1.56.dist-info → edsl-0.1.58.dist-info}/RECORD

@@ -1,6 +1,6 @@
 edsl/__init__.py,sha256=EkpMsEKqKRbN9Qqcn_y8CjX8OjlWFyhxslLrt3SJY0Q,4827
 edsl/__init__original.py,sha256=PzMzANf98PrSleSThXT4anNkeVqZMdw0tfFonzsoiGk,4446
-edsl/__version__.py,sha256=sAxmq9B-f2SmXYi2UsleAKRrYxtQcxVilh7UIDB0-yM,23
+edsl/__version__.py,sha256=ujgZXX_cw13M2UkyXWVg5j1fgdE25Qb3rUzLZVokSKg,23
 edsl/agents/__init__.py,sha256=AyhfXjygRHT1Pd9w16lcu5Bu0jnBmMPz86aKP1uRL3Y,93
 edsl/agents/agent.py,sha256=J0y8dH8tWXffiAVhyPEWJ4xmOKdi-XtSrSlMJ08fd58,55606
 edsl/agents/agent_list.py,sha256=-bm8jozPPIHJAqb-1nt9m3TZGw5-tgg4LAjz5Mpj0AE,23071
@@ -40,7 +40,7 @@ edsl/conversation/exceptions.py,sha256=DoUCg-ymqGOjOl0cpGT8-sNRVsr3SEwdxGAKtdeZ2
 edsl/conversation/mug_negotiation.py,sha256=do3PTykM6A2cDGOcsohlevRgLpCICoPx8B0WIYe6hy8,2518
 edsl/conversation/next_speaker_utilities.py,sha256=bqr5JglCd6bdLc9IZ5zGOAsmN2F4ERiubSMYvZIG7qk,3629
 edsl/coop/__init__.py,sha256=DU2w1Nu8q6tMAa3xoPC722RrvGhmB_UgUUBJDUywsKY,1542
-edsl/coop/coop.py,sha256=cf7E8PaTi3jcgPXGtpIsx2x8AM-TxGXNfcw8zrjUoFs,65537
+edsl/coop/coop.py,sha256=NVcteUNmd-1k-MbSzplJnMzFHmFhqr_tjAIvdq2fhLI,71303
 edsl/coop/coop_functions.py,sha256=d31kddfj9MVZaMhqwUvkSIBwrdCTQglIvFWVfUr4NuE,688
 edsl/coop/coop_jobs_objects.py,sha256=_OFPVLKswXY9mKl9b3Y7gxlUhaMZ7GULx5OqyANpecU,1701
 edsl/coop/coop_objects.py,sha256=_cEspdAxh7BT672poxb0HsjU-QZ4Kthg-tKDvZ6I_v0,859
@@ -48,7 +48,7 @@ edsl/coop/coop_regular_objects.py,sha256=indDQPeesQjHEX_CkICpJPI7o-R8KX66m9DOR9Z
 edsl/coop/ep_key_handling.py,sha256=X0tskEaYKsRIbFUijaCL69uHYpLJcLbYFITzAu3PGJE,7872
 edsl/coop/exceptions.py,sha256=EY3eNTeJM15VzFnag93hgmiqn4pR3Y-6nS9ixKGIhM8,8874
 edsl/coop/price_fetcher.py,sha256=uvEPgKaSRsFq-ouRl5W9aksawUkJg9Lo7ucSePecwa4,4735
-edsl/coop/utils.py,sha256=N8RvZc-PZvz78sJJvyEW_66smWI3f4AlG5iJjoQ-_ZA,6530
+edsl/coop/utils.py,sha256=DON2ns5nWlUqqvlNVUsdgiPlz-6oEqFVOmjhnOwHQBs,8174
 edsl/data_transfer_models.py,sha256=pPaKsbo9pgNcBB9kX-U2O_dUtNkd0Xm4JNmv26jrbhI,265
 edsl/dataset/__init__.py,sha256=RIzfFIytKJfniKZ0VThMk8Z2fjejx91t9PZBct78xXw,422
 edsl/dataset/dataset.py,sha256=kfjfF4B-SlTeBL2FHDiLdwTZOm8RmWqTUOTQStNiOqk,39563
@@ -106,7 +106,7 @@ edsl/instructions/instruction_handler.py,sha256=MXy0LSyAUE5H2G8Pdhs-WerZM8VWGqNR
 edsl/interviews/ReportErrors.py,sha256=5NC6fFGaVe6Qk4gnFd7fUFRsw9MKb7g4MFOr-EblS0o,1728
 edsl/interviews/__init__.py,sha256=BC6NBomroZEc8uwOeZBMtVuXwAVQzTzm7kkgDBqEBic,328
 edsl/interviews/answering_function.py,sha256=zmUMGP1xSpDm49_dqj39g8BoGGy0OmhlcUrJQvUyio8,13695
-edsl/interviews/exception_tracking.py,sha256=Vgc6UVnzRdln_ZrxxcZVDGC7B0u_cQOQHpaJ0I2TWvo,10201
+edsl/interviews/exception_tracking.py,sha256=ayM7Ntoe7_FQbcsJICQ-fWiqo71hvu-nj62DLct4rfU,11223
 edsl/interviews/exceptions.py,sha256=qID-2HnSHJt5DyxBQd4698GZfTEu8rwk_VbIrBHcIRc,2626
 edsl/interviews/interview.py,sha256=LyLY6kbjeUih_DREgIU38AIkrSWsKqSSgoVoLiUMlCE,26450
 edsl/interviews/interview_status_dictionary.py,sha256=0ZvXLusfOA8xD_Fco4PjEBGwmR2sizHOGijTQI8RrI8,3031
@@ -131,17 +131,17 @@ edsl/jobs/data_structures.py,sha256=i-XXq2zul1K1aOZDZXbPIO8l-0bJLqDL2t7pxITXbks,
 edsl/jobs/decorators.py,sha256=0Eot9pFPsWmQIJAafNd0f5hdb9RUAFp_hGMmSUTJ_C8,3272
 edsl/jobs/exceptions.py,sha256=5lktTya2VgiBR5Bd977tG2xHdrMjDqhPhQO17O6jIdc,7220
 edsl/jobs/fetch_invigilator.py,sha256=nzXAIulvOvuDpRDEN5TDNmEfikUEwrnS_XCtnYG2uPQ,2795
-edsl/jobs/html_table_job_logger.py,sha256=4ouDnUWFsDQGl51wy95HsDHBYU8RyWRmvHE8WZ_Qfjw,20670
+edsl/jobs/html_table_job_logger.py,sha256=rtVnfP9aBG6_S-PdkUI3K4DZN7sS-paAj-smgyknDuE,33729
 edsl/jobs/jobs.py,sha256=WL3ODJ4HBElnw2XVaPXqfvHzyTsEe0XeUghOZOyI0FA,42334
 edsl/jobs/jobs_checks.py,sha256=bfPJ3hQ4qvRBhyte4g-4J8zExJxJr3nlLHmtVmFPJcQ,5390
 edsl/jobs/jobs_component_constructor.py,sha256=9956UURv3eo-cURNPd4EV8wAQsY-AlEtQRmBu1nCOH8,6982
 edsl/jobs/jobs_interview_constructor.py,sha256=8nIhhwBQWH_aZ9ZWjvRgOL0y2y6juRTb3pVngQ9Cs8g,2017
-edsl/jobs/jobs_pricing_estimation.py,sha256=u7LHxCH5DF1rJvPkjjAQxlxu58m1qoAyHi8sIFtZM4U,16828
-edsl/jobs/jobs_remote_inference_logger.py,sha256=2v3uxkq2UA10UEiwTFGAaC7ekYC0M0UGK3U67WvATpk,9325
-edsl/jobs/jobs_runner_status.py,sha256=ME0v4TTH7qzS4vOROGtNKaWqHZmhzrCl_-FeTRSa9C8,10701
+edsl/jobs/jobs_pricing_estimation.py,sha256=vCrqAMdzocKcJ3d0sWYStajY2G4YwGD26PAQZdS_Stk,14085
+edsl/jobs/jobs_remote_inference_logger.py,sha256=gHVxumpFQ2NxbLkd1fdkiZkOcMNoCdHqeQHxFdXOv9s,10039
+edsl/jobs/jobs_runner_status.py,sha256=gW8EA-BAKpBvahqRipzomALEAQizd24aRW8G2y7faLQ,11905
 edsl/jobs/jobs_status_enums.py,sha256=8Kgtr-ffcGGniQ2x5gCOqwURb_HaBWmYcWbUB_KTCY0,214
 edsl/jobs/progress_bar_manager.py,sha256=d8wuZf7SHq3LCA36JIv1sfYymyHFOUsYRSRlRpR6K04,2832
-edsl/jobs/remote_inference.py,sha256=J9lLFy7JZR4SkXfzBreT4qhPFeuQip_Qvo03Z9a0upg,14630
+edsl/jobs/remote_inference.py,sha256=d3Bxg4bJzZnQ2vVlZdMgMM8vMXkWh5odgH4svpfyb_Q,21308
 edsl/jobs/results_exceptions_handler.py,sha256=VCtnd60xwdFznzGhtXPbxLmyVf3kIjR2419LUJdFjEQ,3053
 edsl/key_management/__init__.py,sha256=JiOJ71Ly9aw-tVYbWZu-qRjsW4QETYMQ9IJjsKgW1DQ,1274
 edsl/key_management/exceptions.py,sha256=dDtoDh1UL52BUBrAlCIc_McgtZCAQkUx6onoSz26qeM,2158
@@ -150,12 +150,11 @@ edsl/key_management/key_lookup_builder.py,sha256=AlQxXbUYwyJc-3JjLddXBOBPVsYJ-B2
 edsl/key_management/key_lookup_collection.py,sha256=b1STYU4FIqgCtCf90bRZh6IXf8kcoTC8ad8RSHPmw-w,3471
 edsl/key_management/models.py,sha256=z9TimNMnz47mnITM5SlJy2m2sk1aKKtt0ybV89rsaiY,6703
 edsl/language_models/__init__.py,sha256=WtefJs6XOCn5RSz22PgoAi3eTEr1NzGtnnBpDIie2mg,240
-edsl/language_models/compute_cost.py,sha256=noWk0osCANksfKSh0sXFkPrcQegtSV8-jCRBjz_52uQ,2570
 edsl/language_models/exceptions.py,sha256=P9dMA8XfK_qcuXNJZ-Xsb_Ny-12Ldu3fPC133RB40Ek,13728
-edsl/language_models/language_model.py,sha256=9ZKmt_v0cPAUkonNegrlh2h-1ixtnjonGZCcsFpmEz0,44630
+edsl/language_models/language_model.py,sha256=u1sclHfmIfjXlgW6IGpr-nK4V-HJRIrpBmPiNAqbZOo,44675
 edsl/language_models/model.py,sha256=oYZsfgvko_EH4EWT9XZPEgLcs9KA36SGEAKZwYRFjv8,12013
 edsl/language_models/model_list.py,sha256=Eb62xQdrlayqWYyJVgYxheMiNi14e1U9b_12qYzy1ws,4522
-edsl/language_models/price_manager.py,sha256=GXNjD5NjutD44vZ2FRdQ7ayJWiuxkisETlX7UNGfpIk,9505
+edsl/language_models/price_manager.py,sha256=74XEkoVdQv06w7gMFZmXeeXGW6om4_ISr-qFnmX4lFE,10711
 edsl/language_models/raw_response_handler.py,sha256=i2Ye1WzjYq_2YJ1EKX946dx9m331GilwqC5qymGJlEI,4003
 edsl/language_models/registry.py,sha256=io_Cp-7PtLpPuvZs_j8XaMxJiv-zSplbAQdrzPp2pzg,7308
 edsl/language_models/repair.py,sha256=ljm0xc9e1tMdyKc9b-v7ikpYRBh639xJ11SkDzI2vZE,5245
@@ -382,8 +381,8 @@ edsl/utilities/repair_functions.py,sha256=EXkXsqnmgPqj9b3dff1cZnJyaZw-qEvGENXCRH
 edsl/utilities/restricted_python.py,sha256=248N2p5EWHDSpcK1G-q7DUoJeWy4sB6aO-RV0-5O7uY,2038
 edsl/utilities/template_loader.py,sha256=SCAcnTnxNQ67MNSkmfz7F-S_u2peyGn2j1oRIqi1wfg,870
 edsl/utilities/utilities.py,sha256=irHheAGOnl_6RwI--Hi9StVzvsHcWCqB48PWsWJQYOw,12045
-edsl-0.1.56.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
-edsl-0.1.56.dist-info/METADATA,sha256=9pPRI9zdy9a7TGVJmANKNXiiEFuyPtUPMxMTYYLEd4Y,12039
-edsl-0.1.56.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-edsl-0.1.56.dist-info/entry_points.txt,sha256=JnG7xqMtHaQu9BU-yPATxdyCeA48XJpuclnWCqMfIMU,38
-edsl-0.1.56.dist-info/RECORD,,
+edsl-0.1.58.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
+edsl-0.1.58.dist-info/METADATA,sha256=nEQbjRPWHb8aJaKUrfyakIvvXL2qIQyyQsDYa0IToqU,12032
+edsl-0.1.58.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+edsl-0.1.58.dist-info/entry_points.txt,sha256=JnG7xqMtHaQu9BU-yPATxdyCeA48XJpuclnWCqMfIMU,38
+edsl-0.1.58.dist-info/RECORD,,

edsl/language_models/compute_cost.py

@@ -1,78 +0,0 @@
-from typing import Any, Union, TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from .language_model import LanguageModel
-
-class ComputeCost:
-    """Computes the dollar cost of a raw response.
-    
-    # TODO: Add doctests
-    >>> True
-    True
-    
-    """
-    def __init__(self, language_model: "LanguageModel"):
-        self.language_model = language_model
-        self._price_lookup = None
-
-    @property
-    def price_lookup(self):
-        if self._price_lookup is None:
-            from ..coop import Coop
-
-            c = Coop()
-            self._price_lookup = c.fetch_prices()
-        return self._price_lookup
-
-    def cost(self, raw_response: dict[str, Any]) -> Union[float, str]:
-        """Return the dollar cost of a raw response."""
-
-        usage = self.get_usage_dict(raw_response)
-        from ..coop import Coop
-
-        c = Coop()
-        price_lookup = c.fetch_prices()
-        key = (self._inference_service_, self.model)
-        if key not in price_lookup:
-            return f"Could not find price for model {self.model} in the price lookup."
-
-        relevant_prices = price_lookup[key]
-        try:
-            input_tokens = int(usage[self.input_token_name])
-            output_tokens = int(usage[self.output_token_name])
-        except Exception as e:
-            return f"Could not fetch tokens from model response: {e}"
-
-        try:
-            inverse_output_price = relevant_prices["output"]["one_usd_buys"]
-            inverse_input_price = relevant_prices["input"]["one_usd_buys"]
-        except Exception as e:
-            if "output" not in relevant_prices:
-                return f"Could not fetch prices from {relevant_prices} - {e}; Missing 'output' key."
-            if "input" not in relevant_prices:
-                return f"Could not fetch prices from {relevant_prices} - {e}; Missing 'input' key."
-            return f"Could not fetch prices from {relevant_prices} - {e}"
-
-        if inverse_input_price == "infinity":
-            input_cost = 0
-        else:
-            try:
-                input_cost = input_tokens / float(inverse_input_price)
-            except Exception as e:
-                return f"Could not compute input price - {e}."
-
-        if inverse_output_price == "infinity":
-            output_cost = 0
-        else:
-            try:
-                output_cost = output_tokens / float(inverse_output_price)
-            except Exception as e:
-                return f"Could not compute output price - {e}"
-
-        return input_cost + output_cost
-
-
-
-if __name__ == "__main__":
-    import doctest
-    doctest.testmod()