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

edsl/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.56"
+__version__ = "0.1.57"

edsl/coop/coop.py

@@ -1256,13 +1256,13 @@ class Coop(CoopFunctionsMixin):
         self, input: Union["Jobs", "Survey"], iterations: int = 1
     ) -> int:
         """
-        Get the cost of a remote inference job.
+        Get the estimated cost in credits of a remote inference job.
 
         :param input: The EDSL job to send to the server.
 
         >>> job = Jobs.example()
         >>> coop.remote_inference_cost(input=job)
-        {'credits': 0.77, 'usd': 0.0076950000000000005}
+        {'credits_hold': 0.77, 'usd': 0.0076950000000000005}
         """
         from ..jobs import Jobs
         from ..surveys import Survey
@@ -1290,7 +1290,7 @@ class Coop(CoopFunctionsMixin):
         self._resolve_server_response(response)
         response_json = response.json()
         return {
-            "credits": response_json.get("cost_in_credits"),
+            "credits_hold": response_json.get("cost_in_credits"),
             "usd": response_json.get("cost_in_usd"),
         }
 

edsl/jobs/jobs_pricing_estimation.py

@@ -366,6 +366,20 @@ class JobsPrompts:
             },
         )
 
+    @staticmethod
+    def usd_to_credits(usd: float) -> float:
+        """Converts USD to credits."""
+        cents = usd * 100
+        credits_per_cent = 1
+        credits = cents * credits_per_cent
+
+        # Round up to the nearest hundredth of a credit
+        minicredits = math.ceil(credits * 100)
+
+        # Convert back to credits
+        credits = round(minicredits / 100, 2)
+        return credits
+
     def estimate_job_cost_from_external_prices(
         self, price_lookup: dict, iterations: int = 1
     ) -> dict:
@@ -429,8 +443,15 @@ class JobsPrompts:
             group["cost_usd"] *= iterations
             detailed_costs.append(group)
 
+        # Convert to credits
+        for group in detailed_costs:
+            group["credits_hold"] = self.usd_to_credits(group["cost_usd"])
+
         # Calculate totals
-        estimated_total_cost = sum(group["cost_usd"] for group in detailed_costs)
+        estimated_total_cost_usd = sum(group["cost_usd"] for group in detailed_costs)
+        total_credits_hold = sum(
+            group["credits_hold"] for group in detailed_costs
+        )
         estimated_total_input_tokens = sum(
             group["tokens"]
             for group in detailed_costs
@@ -443,7 +464,8 @@ class JobsPrompts:
         )
 
         output = {
-            "estimated_total_cost_usd": estimated_total_cost,
+            "estimated_total_cost_usd": estimated_total_cost_usd,
+            "total_credits_hold": total_credits_hold,
             "estimated_total_input_tokens": estimated_total_input_tokens,
             "estimated_total_output_tokens": estimated_total_output_tokens,
             "detailed_costs": detailed_costs,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edsl
-Version: 0.1.56
+Version: 0.1.57
 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.57.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=4_3hAGEogvYbOy6vn6QDJpHwwyZfPSVQHAgrUMAMbLI,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=sRGNN6QNsXN2xukKbxvZM8WdFhOSGCYIYVnBBnkAZ1k,65568
 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
@@ -136,7 +136,7 @@ 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_pricing_estimation.py,sha256=jPIWUizpqRxtxPmldc4x4IbQ_LlZLNMtCvmWF20VEoU,17547
 edsl/jobs/jobs_remote_inference_logger.py,sha256=2v3uxkq2UA10UEiwTFGAaC7ekYC0M0UGK3U67WvATpk,9325
 edsl/jobs/jobs_runner_status.py,sha256=ME0v4TTH7qzS4vOROGtNKaWqHZmhzrCl_-FeTRSa9C8,10701
 edsl/jobs/jobs_status_enums.py,sha256=8Kgtr-ffcGGniQ2x5gCOqwURb_HaBWmYcWbUB_KTCY0,214
@@ -382,8 +382,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.57.dist-info/LICENSE,sha256=_qszBDs8KHShVYcYzdMz3HNMtH-fKN_p5zjoVAVumFc,1111
+edsl-0.1.57.dist-info/METADATA,sha256=9Cds0oJ5nt66EWjA2SMAx5v_WbBdnJKxGbrCFwYBYcw,12032
+edsl-0.1.57.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+edsl-0.1.57.dist-info/entry_points.txt,sha256=JnG7xqMtHaQu9BU-yPATxdyCeA48XJpuclnWCqMfIMU,38
+edsl-0.1.57.dist-info/RECORD,,