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

edsl/__version__.py

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

edsl/base/data_transfer_models.py

@@ -1,10 +1,11 @@
 from collections import UserDict
-from typing import NamedTuple, Dict, Optional, Any
+from typing import NamedTuple, Dict, Optional, Any, Union
 from dataclasses import dataclass, fields
 
 
 class ModelInputs(NamedTuple):
     "This is what was send by the agent to the model"
+
     user_prompt: str
     system_prompt: str
     encoded_image: Optional[str] = None
@@ -12,6 +13,7 @@ class ModelInputs(NamedTuple):
 
 class EDSLOutput(NamedTuple):
     "This is the edsl dictionary that is returned by the model"
+
     answer: Any
     generated_tokens: str
     comment: Optional[str] = None
@@ -19,11 +21,16 @@ class EDSLOutput(NamedTuple):
 
 class ModelResponse(NamedTuple):
     "This is the metadata that is returned by the model and includes info about the cache"
+
     response: dict
     cache_used: bool
     cache_key: str
     cached_response: Optional[Dict[str, Any]] = None
-    cost: Optional[float] = None
+    input_tokens: Optional[int] = None
+    output_tokens: Optional[int] = None
+    input_price_per_million_tokens: Optional[float] = None
+    output_price_per_million_tokens: Optional[float] = None
+    total_cost: Optional[Union[float, str]] = None
 
 
 class AgentResponseDict(NamedTuple):
@@ -44,7 +51,11 @@ class EDSLResultObjectInput(NamedTuple):
     comment: str
     validated: bool = False
     exception_occurred: Exception = None
-    cost: Optional[float] = None
+    input_tokens: Optional[int] = None
+    output_tokens: Optional[int] = None
+    input_price_per_million_tokens: Optional[float] = None
+    output_price_per_million_tokens: Optional[float] = None
+    total_cost: Optional[Union[float, str]] = None
 
 
 @dataclass
@@ -111,4 +122,4 @@ class Answers(UserDict):
 if __name__ == "__main__":
     import doctest
 
-    doctest.testmod()
+    doctest.testmod()

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"),
         }