python-fastllm 0.0.51__py3-none-any.whl → 0.0.53__py3-none-any.whl

fastllm/__init__.py

@@ -2,4 +2,4 @@
 
 - `fastllm.responses`: Provider-independent Responses resources and streaming over FastLLM"""
 
-__version__ = "0.0.51"
+__version__ = "0.0.53"

fastllm/_modidx.py

@@ -274,6 +274,17 @@ d = { 'settings': { 'branch': 'main',
                                    'fastllm.responses.ResponseState': ('responses.html#responsestate', 'fastllm/responses.py'),
                                    'fastllm.responses.ResponseState.__init__': ( 'responses.html#responsestate.__init__',
                                                                                  'fastllm/responses.py'),
+                                   'fastllm.responses.ResponseState.from_dict': ( 'responses.html#responsestate.from_dict',
+                                                                                  'fastllm/responses.py'),
+                                   'fastllm.responses.ResponseState.to_dict': ( 'responses.html#responsestate.to_dict',
+                                                                                'fastllm/responses.py'),
+                                   'fastllm.responses.ResponseStore': ('responses.html#responsestore', 'fastllm/responses.py'),
+                                   'fastllm.responses.ResponseStore.__init__': ( 'responses.html#responsestore.__init__',
+                                                                                 'fastllm/responses.py'),
+                                   'fastllm.responses.ResponseStore.dump': ('responses.html#responsestore.dump', 'fastllm/responses.py'),
+                                   'fastllm.responses.ResponseStore.get': ('responses.html#responsestore.get', 'fastllm/responses.py'),
+                                   'fastllm.responses.ResponseStore.load': ('responses.html#responsestore.load', 'fastllm/responses.py'),
+                                   'fastllm.responses.ResponseStore.put': ('responses.html#responsestore.put', 'fastllm/responses.py'),
                                    'fastllm.responses.ResponseTurn': ('responses.html#responseturn', 'fastllm/responses.py'),
                                    'fastllm.responses.ResponseTurn.__init__': ( 'responses.html#responseturn.__init__',
                                                                                 'fastllm/responses.py'),

fastllm/responses.py

@@ -12,7 +12,7 @@ Every request is streamed. `_ResponseStream` only tracks the standard event gram
 
 # %% auto #0
 __all__ = ['ResponsesError', 'response_input', 'normalize_call_ids', 'response_output', 'response_usage', 'response_object',
-           'ResponseState', 'ResponseTurn', 'AsyncResponses', 'response_event', 'pending_response']
+           'ResponseState', 'ResponseStore', 'ResponseTurn', 'AsyncResponses', 'response_event', 'pending_response']
 
 # %% ../nbs/06a_responses.ipynb #e16fc24e
 import asyncio, copy, json, secrets, time
@@ -22,7 +22,7 @@ from fasttransport.errors import APIError
 
 from .acomplete import acomplete
 from .streaming import Status
-from aidialog.msg_parts import Msg, Text, ToolUse, ToolResult, InputImage, InputFile, Completion, tool_text
+from aidialog.msg_parts import Msg, Text, ToolUse, ToolResult, InputImage, InputFile, Completion, tool_text, msg2dict, dict2msg
 
 # %% ../nbs/06a_responses.ipynb #f904c16f
 class ResponsesError(Exception):
@@ -145,6 +145,43 @@ class ResponseState(BasicRepr):
     "Canonical history and optional provider continuation metadata."
     def __init__(self, id, model, history, provider_response_id=None): store_attr()
 
+# %% ../nbs/06a_responses.ipynb #b28fa30d
+@patch
+def to_dict(self:ResponseState):
+    "This state as a JSON-ready dict"
+    return dict(id=self.id, model=self.model, history=[msg2dict(m) for m in self.history], provider_response_id=self.provider_response_id)
+
+@patch(cls_method=True)
+def from_dict(cls:ResponseState, d):
+    "The state `to_dict` produced `d` from"
+    return cls(d['id'], d['model'], tuple(dict2msg(m) for m in d['history']), d['provider_response_id'])
+
+# %% ../nbs/06a_responses.ipynb #74e09d18
+class ResponseStore:
+    "Continuation states kept for `ttl` seconds; override `dump` and `load` to keep them outside this process"
+    def __init__(self, ttl=3600): self.ttl,self.items = ttl,{}
+
+    async def dump(self, rid, data):
+        "Keep JSON-ready `data` under `rid` for `ttl` seconds"
+        now = time.time()
+        self.items = {k:v for k,v in self.items.items() if v[0] > now}
+        self.items[rid] = (now+self.ttl, data)
+
+    async def load(self, rid):
+        "The data kept under `rid`, or `None` once it has expired"
+        exp,data = self.items.get(rid, (0, None))
+        return data if exp > time.time() else None
+
+    async def put(self, state, **meta):
+        "Store `state` with the host's `meta` about it"
+        await self.dump(state.id, dict(state=state.to_dict(), **meta))
+
+    async def get(self, rid):
+        "The `(state, meta)` stored under `rid`, or `None`"
+        data = await self.load(rid)
+        if data is None: return None
+        return ResponseState.from_dict(data['state']),{k:v for k,v in data.items() if k != 'state'}
+
 # %% ../nbs/06a_responses.ipynb #c9ca3744
 class ResponseTurn(BasicRepr):
     "A prepared Responses request for one provider call."
@@ -337,7 +374,7 @@ async def events(self:AsyncResponses, turn, finalize=None, stream=None):
         comp.message,comp.usage = Msg('assistant', texts + comp.message.content),usage
         for event in state.done_events(comp): yield event
         response = response_object(first.id, first.body, comp, first.previous.id if first.previous else None, first.created_at)
-        if finalize: await finalize(next_state, comp)
+        if finalize and (extra := await finalize(next_state, comp)): response['usage'].update(extra)
         name = 'response.incomplete' if response['status'] == 'incomplete' else 'response.completed'
         yield state.event(name, response=response)
     except asyncio.CancelledError: raise

fastllm/types.py

@@ -365,6 +365,7 @@ def tier_rate(meta, key, tier):
 # %% ../nbs/00_types.ipynb #8bfca02d
 @patch(as_prop=True)
 def cost(self:Completion):
+    if self.usage and 'cost' in self.usage.raw: return self.usage.raw['cost']
     meta = dict2obj(get_model_info(self.model, self.vendor_name))
     if not meta: return 0.0  # unregistered model (e.g. a custom base_url server): no pricing metadata
     api = api_registry[self.api_name]

{python_fastllm-0.0.51.dist-info → python_fastllm-0.0.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fastllm
-Version: 0.0.51
+Version: 0.0.53
 Author-email: Kerem Turgutlu <keremturgutlu@gmail.com>
 License: Apache-2.0
 Project-URL: Repository, https://github.com/AnswerDotAI/fastllm
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: fastcore>=2.1.18
-Requires-Dist: aidialog>=0.0.25
+Requires-Dist: aidialog>=0.0.26
 Requires-Dist: fasttransport>=0.0.2
 Requires-Dist: pillow
 

{python_fastllm-0.0.51.dist-info → python_fastllm-0.0.53.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fastllm/__init__.py,sha256=9Ir0J8R-z0_JnZDe2PsJohUmaNENqlehYHPTO3403g8,131
-fastllm/_modidx.py,sha256=fQ6pg5H_5Pp8l7k12Fb5ca6uWmQewKtGtZBDi8hCuFg,44277
+fastllm/__init__.py,sha256=p94hx8eEtzJ2eou5yZY7R3C9ab8YAXbWNrFNQoK6S-s,131
+fastllm/_modidx.py,sha256=5WI8_unIttNYqjHBQBHf33C1OVgMgCcdO2SbdOk04Io,45637
 fastllm/acomplete.py,sha256=aP1ff9a7WKNhBd1kwKE2TJ-YyihLcdhd9-1Izi4wQP4,10772
 fastllm/anthropic.py,sha256=k0QeuRnl_CalfCq74WXN6llRQqRiAQ9d8ohn_0YYC7A,18386
 fastllm/chat.py,sha256=klji3SOYs5xyzrSFbNhy3uoQ2TSZ3a-8HTjvdRtaG5Q,25036
@@ -7,11 +7,11 @@ fastllm/codex.py,sha256=r6auZ8egia83aGkWcF4132AzW4SsBvKeDwg_CxyXj9E,5808
 fastllm/gemini.py,sha256=zbxNmI1cMUJJ10xIfBqPqh38hAQ0exsFKkhTXvG2-eE,16281
 fastllm/openai_chat.py,sha256=n5INfDCsAZIiKUImWeaX6SJ_OAJ_uMhw20HUkgFgdgM,12379
 fastllm/openai_responses.py,sha256=zsaOjkQUZ-7iuGPc-UpvnM6oAyqW09BDYwZ_ma4-1Qo,14346
-fastllm/responses.py,sha256=mFFaBpKNsq85sJjXIK5rYKb6WO7nlImEfowqDPf_yzA,19633
+fastllm/responses.py,sha256=ASTWk_dghOfJozQAm6QAZ8VnkGFA-sBLGVeS60DfP3E,21303
 fastllm/streaming.py,sha256=i_FU_Mt-3F2lBEImYav8I5pEjUSKYk3JFIW3lkiXEb8,8813
-fastllm/types.py,sha256=BIZHwlzsbkZELjAib2oSFRab8gKBa216DNNeE_P68go,19525
-python_fastllm-0.0.51.dist-info/METADATA,sha256=Btmnr0P4mLlxL6J39LJEBg6Zw4KkTLu1-1o4ulP3RFY,18537
-python_fastllm-0.0.51.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_fastllm-0.0.51.dist-info/entry_points.txt,sha256=WkWd04F3xVYFP5bsexaQe9Se6uelwE5ULoTtHWreO0s,133
-python_fastllm-0.0.51.dist-info/top_level.txt,sha256=F8qodL7nEGUHGmzzqfhNKCTIr1i0D6cvudOnm3z7o0Y,8
-python_fastllm-0.0.51.dist-info/RECORD,,
+fastllm/types.py,sha256=q4rZHTD9sghHI8j5cNQRWmrQW_NO8zYa0KEibKGiSyI,19603
+python_fastllm-0.0.53.dist-info/METADATA,sha256=5mJQJPAsu4tKE4Icowyjc1HaZCEE8xNRH7F1kUJVkKY,18537
+python_fastllm-0.0.53.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+python_fastllm-0.0.53.dist-info/entry_points.txt,sha256=WkWd04F3xVYFP5bsexaQe9Se6uelwE5ULoTtHWreO0s,133
+python_fastllm-0.0.53.dist-info/top_level.txt,sha256=F8qodL7nEGUHGmzzqfhNKCTIr1i0D6cvudOnm3z7o0Y,8
+python_fastllm-0.0.53.dist-info/RECORD,,