edsl 0.1.37.dev3__py3-none-any.whl → 0.1.37.dev4__py3-none-any.whl

edsl/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.37.dev3"
+__version__ = "0.1.37.dev4"

edsl/coop/coop.py

@@ -568,7 +568,9 @@ class Coop:
             "version": data.get("version"),
         }
 
-    def remote_inference_cost(self, input: Union[Jobs, Survey]) -> int:
+    def remote_inference_cost(
+        self, input: Union[Jobs, Survey], iterations: int = 1
+    ) -> int:
         """
         Get the cost of a remote inference job.
 
@@ -593,6 +595,7 @@ class Coop:
                     job.to_dict(),
                     default=self._json_handle_none,
                 ),
+                "iterations": iterations,
             },
         )
         self._resolve_server_response(response)

edsl/inference_services/AwsBedrock.py

@@ -28,12 +28,16 @@ class AwsBedrockService(InferenceServiceABC):
         "ai21.j2-ultra",
         "ai21.j2-ultra-v1",
     ]
+    _models_list_cache: List[str] = []
 
     @classmethod
     def available(cls):
         """Fetch available models from AWS Bedrock."""
+
+        region = os.getenv("AWS_REGION", "us-east-1")
+
         if not cls._models_list_cache:
-            client = boto3.client("bedrock", region_name="us-west-2")
+            client = boto3.client("bedrock", region_name=region)
             all_models_ids = [
                 x["modelId"] for x in client.list_foundation_models()["modelSummaries"]
             ]
@@ -80,7 +84,8 @@ class AwsBedrockService(InferenceServiceABC):
                     self.api_token
                 )  # call to check the if env variables are set.
 
-                client = boto3.client("bedrock-runtime", region_name="us-west-2")
+                region = os.getenv("AWS_REGION", "us-east-1")
+                client = boto3.client("bedrock-runtime", region_name=region)
 
                 conversation = [
                     {

edsl/jobs/Jobs.py

@@ -193,7 +193,7 @@ class Jobs(Base):
                     inference_service=invigilator.model._inference_service_,
                     model=invigilator.model.model,
                 )
-                costs.append(prompt_cost["cost"])
+                costs.append(prompt_cost["cost_usd"])
 
         d = Dataset(
             [
@@ -241,10 +241,25 @@ class Jobs(Base):
 
         try:
             relevant_prices = price_lookup[key]
-            output_price_per_token = 1 / float(
-                relevant_prices["output"]["one_usd_buys"]
+
+            service_input_token_price = float(
+                relevant_prices["input"]["service_stated_token_price"]
+            )
+            service_input_token_qty = float(
+                relevant_prices["input"]["service_stated_token_qty"]
+            )
+            input_price_per_token = service_input_token_price / service_input_token_qty
+
+            service_output_token_price = float(
+                relevant_prices["output"]["service_stated_token_price"]
             )
-            input_price_per_token = 1 / float(relevant_prices["input"]["one_usd_buys"])
+            service_output_token_qty = float(
+                relevant_prices["output"]["service_stated_token_qty"]
+            )
+            output_price_per_token = (
+                service_output_token_price / service_output_token_qty
+            )
+
         except KeyError:
             # A KeyError is likely to occur if we cannot retrieve prices (the price_lookup dict is empty)
             # Use a sensible default
@@ -254,9 +269,8 @@ class Jobs(Base):
             warnings.warn(
                 "Price data could not be retrieved. Using default estimates for input and output token prices. Input: $0.15 / 1M tokens; Output: $0.60 / 1M tokens"
             )
-
-            output_price_per_token = 0.00000015  # $0.15 / 1M tokens
-            input_price_per_token = 0.00000060  # $0.60 / 1M tokens
+            input_price_per_token = 0.00000015  # $0.15 / 1M tokens
+            output_price_per_token = 0.00000060  # $0.60 / 1M tokens
 
         # Compute the number of characters (double if the question involves piping)
         user_prompt_chars = len(str(user_prompt)) * get_piping_multiplier(
@@ -279,7 +293,7 @@ class Jobs(Base):
         return {
             "input_tokens": input_tokens,
             "output_tokens": output_tokens,
-            "cost": cost,
+            "cost_usd": cost,
         }
 
     def estimate_job_cost_from_external_prices(
@@ -326,7 +340,7 @@ class Jobs(Base):
                         "system_prompt": system_prompt,
                         "estimated_input_tokens": prompt_cost["input_tokens"],
                         "estimated_output_tokens": prompt_cost["output_tokens"],
-                        "estimated_cost": prompt_cost["cost"],
+                        "estimated_cost_usd": prompt_cost["cost_usd"],
                         "inference_service": inference_service,
                         "model": model,
                     }
@@ -338,21 +352,21 @@ class Jobs(Base):
             df.groupby(["inference_service", "model"])
             .agg(
                 {
-                    "estimated_cost": "sum",
+                    "estimated_cost_usd": "sum",
                     "estimated_input_tokens": "sum",
                     "estimated_output_tokens": "sum",
                 }
             )
             .reset_index()
         )
-        df["estimated_cost"] = df["estimated_cost"] * iterations
+        df["estimated_cost_usd"] = df["estimated_cost_usd"] * iterations
         df["estimated_input_tokens"] = df["estimated_input_tokens"] * iterations
         df["estimated_output_tokens"] = df["estimated_output_tokens"] * iterations
 
         estimated_costs_by_model = df.to_dict("records")
 
         estimated_total_cost = sum(
-            model["estimated_cost"] for model in estimated_costs_by_model
+            model["estimated_cost_usd"] for model in estimated_costs_by_model
         )
         estimated_total_input_tokens = sum(
             model["estimated_input_tokens"] for model in estimated_costs_by_model
@@ -362,7 +376,7 @@ class Jobs(Base):
         )
 
         output = {
-            "estimated_total_cost": estimated_total_cost,
+            "estimated_total_cost_usd": estimated_total_cost,
             "estimated_total_input_tokens": estimated_total_input_tokens,
             "estimated_total_output_tokens": estimated_total_output_tokens,
             "model_costs": estimated_costs_by_model,

{edsl-0.1.37.dev3.dist-info → edsl-0.1.37.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edsl
-Version: 0.1.37.dev3
+Version: 0.1.37.dev4
 Summary: Create and analyze LLM-based surveys
 Home-page: https://www.expectedparrot.com/
 License: MIT

{edsl-0.1.37.dev3.dist-info → edsl-0.1.37.dev4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 edsl/__init__.py,sha256=Xc4AuXpEALuT7khU4CFgvV_WI9elsQ28w5RuyVx8MME,1865
-edsl/__version__.py,sha256=A3QLK8TySf0DLI2iYA29bIFRb2fHl1LUTU3Rz_zq6fc,29
+edsl/__version__.py,sha256=dAS6KospAxXp-Jke6rn3zCdBJVHr2Z4wB3o_aH5u42g,29
 edsl/agents/__init__.py,sha256=Jw2EmdckbcROk_4tRPcJ2i-YEutApOs8BCohy3IHzqY,139
 edsl/agents/Agent.py,sha256=Eoo4ixztM2abxMjYzLdYDNx95XIvtGuiQAMN2Ue5EwE,30258
 edsl/agents/AgentList.py,sha256=VeCP_Hpk5jJ5Z5-9eYhHLtSEviOz4C_oFQBkU5DUBqs,11799
@@ -44,7 +44,7 @@ edsl/conversation/Conversation.py,sha256=al29DNlKb1QnO1pHN6pAxNSilSrWPbcClySswjQ
 edsl/conversation/mug_negotiation.py,sha256=WhdhN6dCiZ8bvpptudEnIEObkUQuy4y52-ysQSPuk54,2697
 edsl/conversation/next_speaker_utilities.py,sha256=EpGlZ_J9-vSNzezpngC58EFCfxOoN8tZ3DHBKcT3h80,3722
 edsl/coop/__init__.py,sha256=XqMfFaHIeyAb_dfDw7VaKf6wCPdahh19ye4w6XAY3R4,117
-edsl/coop/coop.py,sha256=2RFa72XKmnP6GBvNIMG7StUmQgHjQNrtwoRLAKkmqR8,29942
+edsl/coop/coop.py,sha256=Dx6a6THS44SeopIidhbGEQaaIdZFHK23RLeuYXmVAU8,30022
 edsl/coop/PriceFetcher.py,sha256=CALznFyhdyiOylBuZFPfWg66iNVGG_q72CQMGCicfxU,1824
 edsl/coop/utils.py,sha256=r3FKAsNYnJ_bTTDKrq_TDubJrXnbW5lN3JzNExYHzuM,3732
 edsl/data/__init__.py,sha256=LW9OLfpkTtUZFpAnB-_E72dXdhsOew53BbcgYlDcU6A,174
@@ -70,7 +70,7 @@ edsl/exceptions/results.py,sha256=E0xOzjPKTLH3wXeudl5jUJ352vh4KL4jV0K_tYyT_HY,41
 edsl/exceptions/surveys.py,sha256=D1MQzGwhZbDEqcBtgyVnVbsnn5qCZ_gsdfS8In0MsuY,591
 edsl/inference_services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edsl/inference_services/AnthropicService.py,sha256=lm12W-vHUOByZMjz8CXuLO0vwpypI-KBumRRuWptXPo,3004
-edsl/inference_services/AwsBedrock.py,sha256=54Cq7hSR9K7eAcfVL7LPSBoQJCiePZ6q4Ol5WQ-KUKM,4041
+edsl/inference_services/AwsBedrock.py,sha256=xhh8k0judjum-iQd9Ez1cBNovAbi3i5N5pyev7MVxaY,4193
 edsl/inference_services/AzureAI.py,sha256=NCjmm0yggie8HClcal7Gi_n4lTKM1QvW10uhs4L8ILY,9106
 edsl/inference_services/DeepInfraService.py,sha256=OKpc9E9nyJu-mOqUHs_dBwOHh9xhDHksGfsvVwJHBf8,533
 edsl/inference_services/GoogleService.py,sha256=8nQIlnKNlfP_FNtc0aZGJq1mnAW9aFnU0x8k8YMvTU4,5578
@@ -100,7 +100,7 @@ edsl/jobs/interviews/InterviewStatisticsCollection.py,sha256=gAUQ77j1tTpBrhnGo4l
 edsl/jobs/interviews/InterviewStatusDictionary.py,sha256=mxNuG6rVtiqhaeN7r7z_A0ikAqOha-nzKztsPE8YV-4,2563
 edsl/jobs/interviews/InterviewStatusLog.py,sha256=ygccC-5G58-X9rYv6kJQA0hPHMdYhSYkeRmPcT7OGLQ,3344
 edsl/jobs/interviews/ReportErrors.py,sha256=3P8umwT_WTUgC5XvwNIxwuG-s-2ddSuKzhDHH1ogpWc,1849
-edsl/jobs/Jobs.py,sha256=nM2H0YvRtxHmO-gpDv-uVYEqHmEOJwwmpsBLsRe7wJg,41784
+edsl/jobs/Jobs.py,sha256=VRhAd-mdowqqpTRPDq4TCBnxijbhndywBelx_ZlG_wU,42363
 edsl/jobs/runners/JobsRunnerAsyncio.py,sha256=Fe_uddyLWLXfXxHXDDKs52U3J9UGwNQGD_T_Zfhgn7Y,13077
 edsl/jobs/runners/JobsRunnerStatus.py,sha256=yGRW4K-QueJbJ6wGoxfRg-131TeypwQ5is89lH8ymc4,12444
 edsl/jobs/runners/JobsRunnerStatusData.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -273,7 +273,7 @@ edsl/utilities/repair_functions.py,sha256=ZnoJsWzBRxhZnMf4yY3586nmoR_5pzktV-xWdh
 edsl/utilities/restricted_python.py,sha256=ZK4r_T3cNSvIMXTuyC6dCHVX6-ed2NRzzXUbHAcgLlw,2130
 edsl/utilities/SystemInfo.py,sha256=7xJ8MYEEx3aVFOoynu_nQqAv2ePQMyehEZOxFWMZk44,820
 edsl/utilities/utilities.py,sha256=7om9Nh9IWxusHEA2a2QuwZiaoLozbSTCIPkfKf5ZIGk,11758
-edsl-0.1.37.dev3.dist-info/LICENSE,sha256=hq3hkdxkn1rC8xTiiHh0VdWniMNkcS3rBozeiaKE5SQ,1132
-edsl-0.1.37.dev3.dist-info/METADATA,sha256=zIxI59xtjuGGG21eOCGUz32s26RNHZys2kFj9JKsT5k,4476
-edsl-0.1.37.dev3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-edsl-0.1.37.dev3.dist-info/RECORD,,
+edsl-0.1.37.dev4.dist-info/LICENSE,sha256=hq3hkdxkn1rC8xTiiHh0VdWniMNkcS3rBozeiaKE5SQ,1132
+edsl-0.1.37.dev4.dist-info/METADATA,sha256=vPaelDUUNHaNIiLsi9vphW8u9gopSxLqFXBcfCyhnpY,4476
+edsl-0.1.37.dev4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+edsl-0.1.37.dev4.dist-info/RECORD,,