python-fastllm 0.0.33__tar.gz → 0.0.34__tar.gz

{python_fastllm-0.0.33 → python_fastllm-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fastllm
-Version: 0.0.33
+Version: 0.0.34
 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.11
-Requires-Dist: aidialog>=0.0.3
+Requires-Dist: aidialog>=0.0.5
 Requires-Dist: fastspec>=0.0.11
 Requires-Dist: toolslm
 Requires-Dist: pillow

python_fastllm-0.0.34/fastllm/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.34"

{python_fastllm-0.0.33 → python_fastllm-0.0.34}/fastllm/_modidx.py

@@ -10,6 +10,7 @@ d = { 'settings': { 'branch': 'main',
                                    'fastllm.acomplete._classify_error': ('acomplete.html#_classify_error', 'fastllm/acomplete.py'),
                                    'fastllm.acomplete._classify_error_stream': ( 'acomplete.html#_classify_error_stream',
                                                                                  'fastllm/acomplete.py'),
+                                   'fastllm.acomplete._codex_mtime_policy': ('acomplete.html#_codex_mtime_policy', 'fastllm/acomplete.py'),
                                    'fastllm.acomplete._debug_print': ('acomplete.html#_debug_print', 'fastllm/acomplete.py'),
                                    'fastllm.acomplete._is_ctx_exceeded': ('acomplete.html#_is_ctx_exceeded', 'fastllm/acomplete.py'),
                                    'fastllm.acomplete._raise_if_done': ('acomplete.html#_raise_if_done', 'fastllm/acomplete.py'),
@@ -106,7 +107,6 @@ d = { 'settings': { 'branch': 'main',
                               'fastllm.chat._add_cache_control': ('chat.html#_add_cache_control', 'fastllm/chat.py'),
                               'fastllm.chat._alite_call_func': ('chat.html#_alite_call_func', 'fastllm/chat.py'),
                               'fastllm.chat._apply_cache_idxs': ('chat.html#_apply_cache_idxs', 'fastllm/chat.py'),
-                              'fastllm.chat._bytes2content': ('chat.html#_bytes2content', 'fastllm/chat.py'),
                               'fastllm.chat._call_func': ('chat.html#_call_func', 'fastllm/chat.py'),
                               'fastllm.chat._handle_stop_reason': ('chat.html#_handle_stop_reason', 'fastllm/chat.py'),
                               'fastllm.chat._has_cache': ('chat.html#_has_cache', 'fastllm/chat.py'),
@@ -114,14 +114,11 @@ d = { 'settings': { 'branch': 'main',
                               'fastllm.chat._has_stop': ('chat.html#_has_stop', 'fastllm/chat.py'),
                               'fastllm.chat._inject_tool_reminder': ('chat.html#_inject_tool_reminder', 'fastllm/chat.py'),
                               'fastllm.chat._lite_call_func': ('chat.html#_lite_call_func', 'fastllm/chat.py'),
-                              'fastllm.chat._mime2part_type': ('chat.html#_mime2part_type', 'fastllm/chat.py'),
-                              'fastllm.chat._mk_content': ('chat.html#_mk_content', 'fastllm/chat.py'),
                               'fastllm.chat._mk_prefill': ('chat.html#_mk_prefill', 'fastllm/chat.py'),
                               'fastllm.chat._mk_tool_result': ('chat.html#_mk_tool_result', 'fastllm/chat.py'),
                               'fastllm.chat._tc_summary': ('chat.html#_tc_summary', 'fastllm/chat.py'),
                               'fastllm.chat._think_kw': ('chat.html#_think_kw', 'fastllm/chat.py'),
                               'fastllm.chat._trunc_param': ('chat.html#_trunc_param', 'fastllm/chat.py'),
-                              'fastllm.chat._url2content': ('chat.html#_url2content', 'fastllm/chat.py'),
                               'fastllm.chat._usrtools': ('chat.html#_usrtools', 'fastllm/chat.py'),
                               'fastllm.chat.add_warning': ('chat.html#add_warning', 'fastllm/chat.py'),
                               'fastllm.chat.adisplay_stream': ('chat.html#adisplay_stream', 'fastllm/chat.py'),
@@ -253,7 +250,9 @@ d = { 'settings': { 'branch': 'main',
                                    'fastllm.streaming.norm_and_yield': ('streaming.html#norm_and_yield', 'fastllm/streaming.py'),
                                    'fastllm.streaming.stop_and_trim': ('streaming.html#stop_and_trim', 'fastllm/streaming.py')},
             'fastllm.types': { 'fastllm.types.APIRegistry': ('types.html#apiregistry', 'fastllm/types.py'),
-                               'fastllm.types.APIRegistry.__init__': ('types.html#apiregistry.__init__', 'fastllm/types.py'),
+                               'fastllm.types.APIRegistry.__contains__': ('types.html#apiregistry.__contains__', 'fastllm/types.py'),
+                               'fastllm.types.APIRegistry.__missing__': ('types.html#apiregistry.__missing__', 'fastllm/types.py'),
+                               'fastllm.types.APIRegistry._load': ('types.html#apiregistry._load', 'fastllm/types.py'),
                                'fastllm.types.APIRegistry.register': ('types.html#apiregistry.register', 'fastllm/types.py'),
                                'fastllm.types.Completion': ('types.html#completion', 'fastllm/types.py'),
                                'fastllm.types.Completion._repr_markdown_': ('types.html#completion._repr_markdown_', 'fastllm/types.py'),

{python_fastllm-0.0.33 → python_fastllm-0.0.34}/fastllm/acomplete.py

@@ -54,14 +54,29 @@ api2spec = {'openai':oai_spec, 'openai_chat':oai_spec, 'anthropic':ant_spec, 'ge
 
 # %% ../nbs/06_acomplete.ipynb #e3ed40fb
 def split_vendor(model):
-    "Split a `'vendor/model'` path into `(vendor_name, model)`: the prefix must name a known vendor or a registered api, else `(None, model)`."
+    "Split a `'vendor/model'` path into `(vendor_name, model)`: the prefix must name a known vendor or a registered api (installed `fastllm.apis` plugins load on demand), else `(None, model)`."
     if model and '/' in model:
         v, m = model.split('/', 1)
-        if v in vendor_mapping or v in api_registry.apis: return v, m
+        if v in vendor_mapping or v in api_registry: return v, m
     return None, model
 
+# %% ../nbs/06_acomplete.ipynb #977a115b
+def _codex_mtime_policy():
+    "`flexicache` policy: expire codex clients when the codex auth file changes"
+    def policy(state, args, kwargs):
+        v = kwargs.get('vendor_name') or (args[1] if len(args)>1 else None)
+        if not v:
+            m = kwargs.get('model') or (args[0] if args else None)
+            v = split_vendor(m)[0] if m else None
+        if v != 'codex': return None
+        try: mt = Path(_codex_path).expanduser().stat().st_mtime
+        except OSError: mt = None
+        return mt if state != mt else None
+    policy.needs_args = True
+    return policy
+
 # %% ../nbs/06_acomplete.ipynb #79075d95
-@flexicache()
+@flexicache(_codex_mtime_policy())
 def mk_client(model=None, vendor_name=None, api_name=None, api_key=None, base_url=None, xtra_hdrs=None,
     timeout=httpx.Timeout(connect=30, read=300, write=30, pool=10)):
     err_msg = f"please pass a valid one vendor: {', '.join(list(vendor_mapping))} or pass `api_name`,`base_url` and `api_key`"
@@ -82,7 +97,7 @@ def mk_client(model=None, vendor_name=None, api_name=None, api_key=None, base_ur
     elif base_url and api_key: vendor_name, api_name = ifnone(vendor_name, 'custom'), ifnone(api_name, 'openai_chat')
     elif (api_name:=infer_api_name(model)):  base_url, vendor_name = None, api_name
     else: raise ValueError(f"Model {model} can't be auto resolved, {err_msg}")
-    api = api_registry.apis[api_name]
+    api = api_registry[api_name]
     spec, hdrs = api2spec[api_name], api.get_hdrs(api_key)
     cli = OpenAPIClient(spec, headers=merge(hdrs, ifnone(xtra_hdrs, {})), timeout=timeout)
     if base_url is not None:
@@ -163,13 +178,13 @@ async def acomplete(msgs, model, api_name=None, vendor_name=None, api_key=None,
         elif v: api_name, model = v, m  # a registered transport api (e.g. claude_code): not an HTTP vendor
     if api_name == 'claude_code':
         if not stream: raise NotImplementedError("claude_code backend supports stream=True only for now")
-        api = api_registry.apis[api_name]
+        api = api_registry[api_name]
         payload = api.mk_payload(msgs, model, stream=stream, **kwargs)
         async def _mk_gen():
             async for o in api.acollect_stream(payload, model=model, vendor_name='claude_code', stop_callables=stop_callables): yield o
         return _retry_stream(_mk_gen, retries, retry_delay)
-    cli, api_name, vendor_name = mk_client(model, vendor_name, api_name, api_key, base_url, xtra_hdrs)
-    api = api_registry.apis[api_name]
+    cli, api_name, vendor_name = mk_client(model=model, vendor_name=vendor_name, api_name=api_name, api_key=api_key, base_url=base_url, xtra_hdrs=xtra_hdrs)
+    api = api_registry[api_name]
     payload = api.mk_payload(msgs, model, stream=stream, **kwargs)
     payload = merge(payload, ifnone(xtra_body, {}))
     if vendor_name == 'codex':

{python_fastllm-0.0.33 → python_fastllm-0.0.34}/fastllm/chat.py

@@ -15,35 +15,13 @@ from toolslm.funccall import mk_ns, call_func, call_func_async, get_schema
 from fastcore.utils import *
 from fastcore.meta import delegates
 from dataclasses import dataclass
-import base64
 
 from .types import *
-from fastcore.xtras import detect_mime
 from aidialog.msg_parts import (Msg, Part, PartType, ToolCall, mk_tool_res_msg, mk_tr_details,
-    tool_info, usage_info, think_start, think_end, StopResponse, display_list, MediaUrl, url_mime, fmt2hist,
-    _mk_result_fence, _split_fence_msgs, _fence_back, _trunc_str)
+    tool_info, usage_info, think_start, think_end, StopResponse, display_list, fmt2hist,
+    _mk_content, _mk_result_fence, _split_fence_msgs, _fence_back, _trunc_str)
 from .acomplete import *
 
-# %% ../nbs/07_chat.ipynb #4a37bae5
-def _mime2part_type(mime):
-    "Map MIME string to canonical PartType"
-    if mime.startswith('image/'): return PartType.input_image
-    if mime.startswith('audio/'): return PartType.input_audio
-    if mime.startswith('video/'): return PartType.input_video
-    return PartType.input_file
-
-def _bytes2content(data):
-    "Convert bytes to fastllm canonical content"
-    mtype = detect_mime(data)
-    if not mtype: raise ValueError(f'Data must be a supported file type, got {data[:10]}')
-    encoded = base64.b64encode(data).decode("utf-8")
-    return Part(type=_mime2part_type(mtype), text=f'data:{mtype};base64,{encoded}')
-
-def _url2content(o):
-    "Convert MediaUrl to fastllm canonical content"
-    mime = o.mime or url_mime(o.url)
-    return Part(type=_mime2part_type(mime), text=o.url, data=dict(mime=mime))
-
 # %% ../nbs/07_chat.ipynb #43a55cda
 def _add_cache_control(
     msg,          # LiteLLM formatted msg
@@ -67,12 +45,6 @@ def remove_cache_ckpts(msg):
         if part.data: part.data.pop('cache_control', None)
     return msg
 
-def _mk_content(o):
-    if isinstance(o, str):        return Part(type=PartType.text, text=o)
-    elif isinstance(o, bytes):    return _bytes2content(o)
-    elif isinstance(o, MediaUrl): return _url2content(o)
-    return o
-
 
 # %% ../nbs/07_chat.ipynb #48c78e48
 def contents(c):

{python_fastllm-0.0.33 → python_fastllm-0.0.34}/fastllm/streaming.py

@@ -150,7 +150,7 @@ async def mk_acollect_stream(it, index_fn, model=None, api_name=None, vendor_nam
         deltas.append(d)
     part_accum.finalize()
     tcs = part_accum.tool_calls
-    if api_name: usg = api_registry.apis[api_name].finalize_usage(usg, part_accum.parts)
+    if api_name: usg = api_registry[api_name].finalize_usage(usg, part_accum.parts)
     if stop: fin = FinishReason.stop
     fin = FinishReason.tool_calls if fin==FinishReason.stop and any(~L(tcs).attrgot('server')) else fin # recheck tool calls post collation
     # tool calls and non-anthropic citations are yielded at the end

{python_fastllm-0.0.33 → python_fastllm-0.0.34}/fastllm/types.py

@@ -13,6 +13,7 @@ __all__ = ['FinishReason', 'api_registry', 'model_prices_url', 'haik45', 'sonn45
 
 # %% ../nbs/00_types.ipynb #b4d047fd
 import httpx, base64, io
+from importlib.metadata import entry_points
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
 from fastcore.net import urljson
@@ -74,9 +75,18 @@ def _repr_markdown_(self: Completion):
 FinishReason = str_enum('finish_reason', 'stop', 'tool_calls', 'length', 'content_filter')
 
 # %% ../nbs/00_types.ipynb #fc681c52
-class APIRegistry:
-    def __init__(self): self.apis = {}
-    def register(self, name, finalize_usage=noop, **kwargs): self.apis[name] = SimpleNamespace(finalize_usage=finalize_usage, **kwargs)
+class APIRegistry(dict):
+    _eps = None
+    def register(self, name, finalize_usage=noop, **kwargs): self[name] = SimpleNamespace(finalize_usage=finalize_usage, **kwargs)
+    def _load(self, name):
+        "Import the plugin providing api `name` from the `fastllm.apis` entry-point group; its import registers the api."
+        if self._eps is None: self._eps = {o.name:o for o in entry_points(group='fastllm.apis')}
+        if name in self._eps: self._eps[name].load()
+        return dict.__contains__(self, name)
+    def __contains__(self, name): return dict.__contains__(self, name) or self._load(name)
+    def __missing__(self, name):
+        if self._load(name): return self[name]
+        raise KeyError(name)
 
 api_registry = APIRegistry()
 
@@ -85,7 +95,7 @@ api_registry = APIRegistry()
 def mk_completion(resp, model, api_name, vendor_name):
     "Normalize an api response into Completion."
     resp = obj2dict(resp)
-    api = api_registry.apis[api_name]
+    api = api_registry[api_name]
     tcs = api.norm_tool_calls(resp)
     parts = api.norm_parts(resp)
     usg = api.finalize_usage(api.norm_usage(resp), parts)
@@ -314,7 +324,7 @@ def is_deepseek_peak_hour(dt=None):
 @patch(as_prop=True)
 def cost(self:Completion):
     meta = dict2obj(get_model_info(self.model, self.vendor_name))
-    api = api_registry.apis[self.api_name]
+    api = api_registry[self.api_name]
     if not hasattr(api, 'cost'): raise NotImplementedError(f"API: {self.api_name} doesn't have a registered `cost` function in ns")
     res = api.cost(self.usage, meta)
     return res*2 if self.vendor_name=='deepseek' and self.model.startswith('deepseek-v4') and is_deepseek_peak_hour() else res

{python_fastllm-0.0.33 → python_fastllm-0.0.34}/pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
 ]
-dependencies = ['fastcore>=2.1.11', 'aidialog>=0.0.3', 'fastspec>=0.0.11', 'toolslm', 'pillow']
+dependencies = ['fastcore>=2.1.11', 'aidialog>=0.0.5', 'fastspec>=0.0.11', 'toolslm', 'pillow']
 
 [project.urls]
 Repository = "https://github.com/AnswerDotAI/fastllm"

{python_fastllm-0.0.33 → python_fastllm-0.0.34}/python_fastllm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fastllm
-Version: 0.0.33
+Version: 0.0.34
 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.11
-Requires-Dist: aidialog>=0.0.3
+Requires-Dist: aidialog>=0.0.5
 Requires-Dist: fastspec>=0.0.11
 Requires-Dist: toolslm
 Requires-Dist: pillow

{python_fastllm-0.0.33 → python_fastllm-0.0.34}/python_fastllm.egg-info/requires.txt

@@ -1,5 +1,5 @@
 fastcore>=2.1.11
-aidialog>=0.0.3
+aidialog>=0.0.5
 fastspec>=0.0.11
 toolslm
 pillow

python_fastllm-0.0.33/fastllm/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.33"