python-fastllm 0.0.29__tar.gz → 0.0.31__tar.gz

{python_fastllm-0.0.29 → python_fastllm-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fastllm
-Version: 0.0.29
+Version: 0.0.31
 Author-email: Kerem Turgutlu <keremturgutlu@gmail.com>
 License: Apache-2.0
 Project-URL: Repository, https://github.com/AnswerDotAI/fastllm

python_fastllm-0.0.31/fastllm/__init__.py

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

{python_fastllm-0.0.29 → python_fastllm-0.0.31}/fastllm/_modidx.py

@@ -16,7 +16,8 @@ d = { 'settings': { 'branch': 'main',
                                    'fastllm.acomplete._retry_call': ('acomplete.html#_retry_call', 'fastllm/acomplete.py'),
                                    'fastllm.acomplete._retry_stream': ('acomplete.html#_retry_stream', 'fastllm/acomplete.py'),
                                    'fastllm.acomplete.acomplete': ('acomplete.html#acomplete', 'fastllm/acomplete.py'),
-                                   'fastllm.acomplete.mk_client': ('acomplete.html#mk_client', 'fastllm/acomplete.py')},
+                                   'fastllm.acomplete.mk_client': ('acomplete.html#mk_client', 'fastllm/acomplete.py'),
+                                   'fastllm.acomplete.split_vendor': ('acomplete.html#split_vendor', 'fastllm/acomplete.py')},
             'fastllm.anthropic': { 'fastllm.anthropic._ant_cc': ('anthropic.html#_ant_cc', 'fastllm/anthropic.py'),
                                    'fastllm.anthropic._ant_part_type': ('anthropic.html#_ant_part_type', 'fastllm/anthropic.py'),
                                    'fastllm.anthropic._sanid': ('anthropic.html#_sanid', 'fastllm/anthropic.py'),

{python_fastllm-0.0.29 → python_fastllm-0.0.31}/fastllm/acomplete.py

@@ -3,8 +3,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/06_acomplete.ipynb.
 
 # %% auto #0
-__all__ = ['specs_path', 'ant_spec', 'oai_spec', 'gem_spec', 'vendor_mapping', 'api2spec', 'defaults', 'mk_client',
-           'ContextWindowExceededError', 'acomplete']
+__all__ = ['specs_path', 'ant_spec', 'oai_spec', 'gem_spec', 'vendor_mapping', 'api2spec', 'defaults', 'split_vendor',
+           'mk_client', 'ContextWindowExceededError', 'acomplete']
 
 # %% ../nbs/06_acomplete.ipynb #f2f57253
 import asyncio,json,httpx
@@ -51,11 +51,22 @@ vendor_mapping = {
 # %% ../nbs/06_acomplete.ipynb #77d27ea7
 api2spec = {'openai':oai_spec, 'openai_chat':oai_spec, 'anthropic':ant_spec, 'gemini':gem_spec}
 
+# %% ../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)`."
+    if model and '/' in model:
+        v, m = model.split('/', 1)
+        if v in vendor_mapping or v in api_registry.apis: return v, m
+    return None, model
+
 # %% ../nbs/06_acomplete.ipynb #79075d95
 @flexicache()
 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`"
+    if not vendor_name and not api_name and not (base_url and api_key):
+        v, m = split_vendor(model)
+        if v in vendor_mapping: vendor_name, model = v, m
     if vendor_name:
         override_base_url = base_url
         try:
@@ -145,6 +156,10 @@ async def acomplete(msgs, model, api_name=None, vendor_name=None, api_key=None,
                     base_url=None, xtra_body=None, xtra_hdrs=None, stream=False,
                     stop_callables=None, retries=2, retry_delay=0.5, **kwargs):
     "Unified completion across different APIs."
+    if not vendor_name and not api_name and not (base_url and api_key):
+        v, m = split_vendor(model)
+        if v in vendor_mapping: vendor_name, model = v, m
+        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]

{python_fastllm-0.0.29 → python_fastllm-0.0.31}/fastllm/chat.py

@@ -319,12 +319,12 @@ def _has_stop(tres_parts): return any(isinstance(p.text, StopResponse) for p in
 # %% ../nbs/07_chat.ipynb #f58ce348
 def _trunc_str(s, mx=2000, skip=10, replace="TRUNCATED"):
     "Truncate `s` to `mx` chars max, adding `replace` if truncated; `mx=None` disables truncation"
+    if mx is None or isinstance_str(s, ('FullResponse','Safe','PrettyString')): return s
     if not isinstance(s, str): s = str(s)
     s = type(s)(s.rstrip())
     if len(s)>2 and s[0]=='𝍁' and s[-1]=='𝍁':
         s = s[1:-1]
         if replace: return s
-    if isinstance_str(s, ('FullResponse','Safe','PrettyString')): return s
     if mx is None or len(s)<=mx: return s
     s = s[skip:mx-skip]
     ss = s.split(' ')
@@ -406,12 +406,17 @@ class AsyncChat:
         default_cbs=True          # Whether to include default callbacks
     ):
         "LiteLLM chat client."
+        if not vendor_name and not api_name and not (base_url and api_key):
+            v, model = split_vendor(model)
+            if v in vendor_mapping: vendor_name = v
+            elif v: api_name = v  # a registered transport api (e.g. claude_code)
         self.model = model
         hist,tools = mk_msgs(hist,cache,cache_idxs,ttl),listify(tools)
         if ns is None and tools: ns = mk_ns(tools)
         elif ns is None: ns = globals()
         self.tool_schemas = [lite_mk_func(t) for t in tools] if tools else None
         self.use = UsageStats()
+        self.last_req_use = None  # usage of the latest request only; `use` accumulates across a turn's tool-call steps
         store_attr(but='cbs')
         self.cbs = L()
         if default_cbs: self.add_cbs(defaults.chat_callbacks)
@@ -435,6 +440,7 @@ class AsyncChat:
     def _track(self, res):
         u = UsageStats.from_response(res)
         u.cost *= (1 + self.markup)
+        self.last_req_use = u
         self.use += u
 
     def add_cb(self, cb):

{python_fastllm-0.0.29 → python_fastllm-0.0.31}/python_fastllm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fastllm
-Version: 0.0.29
+Version: 0.0.31
 Author-email: Kerem Turgutlu <keremturgutlu@gmail.com>
 License: Apache-2.0
 Project-URL: Repository, https://github.com/AnswerDotAI/fastllm

python_fastllm-0.0.29/fastllm/__init__.py

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