fmtr.tools 1.3.37__py3-none-any.whl → 1.3.39__py3-none-any.whl

fmtr/tools/ai_tools/agentic_tools.py

@@ -1,11 +1,10 @@
-from typing import List, Optional, Any, Annotated
-
 import pydantic_ai
 from pydantic import PlainValidator
 from pydantic_ai import RunContext, ModelRetry
 from pydantic_ai.agent import AgentRunResult, Agent
 from pydantic_ai.models.openai import OpenAIModel
 from pydantic_ai.providers.openai import OpenAIProvider
+from typing import List, Optional, Any, Annotated
 
 from fmtr.tools import environment_tools as env
 from fmtr.tools.constants import Constants
@@ -153,7 +152,7 @@ def default_prompt_none_specified(text):
     return text
 
 
-StringDefaultNoneSpecified = Annotated[str, PlainValidator(default_prompt_none_specified)]
+StringDefaultNoneSpecified = Annotated[Optional[str], PlainValidator(default_prompt_none_specified)]
 
 
 if __name__ == '__main__':

fmtr/tools/google_api_tools.py

@@ -1,3 +1,4 @@
+from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
 from google_auth_oauthlib.flow import InstalledAppFlow
 from googleapiclient.discovery import build
@@ -20,8 +21,12 @@ class Authenticator:
 
     @classmethod
     def auth(cls):
-        msg = f'Doing auth for service {cls.SERVICE} ({cls.VERSION})...'
-        logger.info(msg)
+        """
+
+        Do initial authentication or refresh token if expired.
+
+        """
+        logger.info(f'Doing auth for service {cls.SERVICE} ({cls.VERSION})...')
 
         PATH_CREDS = cls.PATH / 'credentials.json'
         PATH_TOKEN = cls.PATH / f'{cls.SERVICE}.json'
@@ -29,9 +34,15 @@ class Authenticator:
         if PATH_TOKEN.exists():
             data_token = PATH_TOKEN.read_json()
             credentials = Credentials.from_authorized_user_info(data_token, cls.SCOPES)
+            if credentials.expired:
+                with logger.span(f'Credentials expired for {cls.SERVICE}. Will refresh...'):
+                    logger.warning(f'{cls.SERVICE}. {PATH_CREDS.exists()=} {PATH_TOKEN.exists()=} {credentials.valid=} {credentials.expired=} {credentials.expiry=}')
+                    credentials.refresh(Request())
+                    PATH_TOKEN.write_text(credentials.to_json())
         else:
             flow = InstalledAppFlow.from_client_secrets_file(PATH_CREDS, cls.SCOPES)
+            flow.authorization_url(prompt='consent', access_type='offline')
             credentials = flow.run_local_server(open_browser=False, port=cls.PORT)
             PATH_TOKEN.write_text(credentials.to_json())
-        service = build(cls.SERVICE, cls.VERSION, credentials=credentials)
-        return service
+
+        return build(cls.SERVICE, cls.VERSION, credentials=credentials)

fmtr/tools/iterator_tools.py

@@ -1,6 +1,9 @@
 from itertools import chain, batched
+
 from typing import List, Dict, Any
 
+from fmtr.tools.datatype_tools import is_none
+
 
 def enlist(value) -> List[Any]:
     """
@@ -52,3 +55,12 @@ def rebatch(batches, size: int):
 
     """
     return batched(chain.from_iterable(batches), size)
+
+
+def strip_none(*items):
+    """
+
+    Remove nones from a list of arguments
+
+    """
+    return [item for item in items if not is_none(item)]

fmtr/tools/string_tools.py

@@ -1,7 +1,8 @@
 from collections import namedtuple
+from string import Formatter
 
 import re
-from string import Formatter
+from dataclasses import dataclass
 from textwrap import dedent
 from typing import List
 
@@ -84,17 +85,70 @@ def sanitize(*strings, sep: str = '-') -> str:
     return string
 
 
-def truncate_mid(text, length=None, sep=ELLIPSIS):
+@dataclass
+class Truncation:
+    """
+
+    Result type for truncation functions
+
+    """
+    text: str
+    text_without_sep: str | None
+    original: str
+    remainder: str | None
+    sep: str
+
+
+def truncate(text, length=None, sep=ELLIPSIS, return_type=str):
+    """
+
+    Truncate a string to length characters
+
     """
+    text = flatten(text)
+    if len(text) <= length or not length:
+        return text if return_type is str else Truncation(text, text, text, None, sep)
+
+    cutoff = length - len(sep)
+    truncated = text[:cutoff] + sep
+
+    if return_type is str:
+        return truncated
+    else:
+        return Truncation(
+            text=truncated,
+            text_without_sep=text[:cutoff],
+            original=text,
+            remainder=text[cutoff:] or None,
+            sep=sep
+        )
 
-    Truncate a string to `length` characters in the middle
+
+def truncate_mid(text, length=None, sep=ELLIPSIS, return_type=str):
+    """
+
+    Truncate a string to `length` characters in the middle.
 
     """
     text = flatten(text)
     if len(text) <= length or not length:
-        return text
-    half_length = (length - 3) // 2
-    return text[:half_length] + sep + text[-half_length:]
+        return text if return_type is str else Truncation(text, text, text, '', sep)
+
+    half = (length - len(sep)) // 2
+    left = text[:half]
+    right = text[-half:]
+    truncated = left + sep + right
+
+    if return_type is str:
+        return truncated
+    else:
+        return Truncation(
+            text=truncated,
+            text_without_sep=None,
+            original=text,
+            remainder=None,
+            sep=sep
+        )
 
 
 def flatten(raw):

fmtr/tools/version

@@ -1 +1 @@
-1.3.37
+1.3.39

{fmtr_tools-1.3.37.dist-info → fmtr_tools-1.3.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.37
+Version: 1.3.39
 Summary: Collection of high-level tools to simplify everyday development tasks, with a focus on AI/ML
 Home-page: https://github.com/fmtr/fmtr.tools
 Author: Frontmatter
@@ -133,62 +133,62 @@ Requires-Dist: logfire[httpx]; extra == "webhook"
 Provides-Extra: browsers
 Requires-Dist: playwright; extra == "browsers"
 Provides-Extra: all
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: appdirs; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: tabulate; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: google-auth; extra == "all"
 Requires-Dist: flet-video; extra == "all"
-Requires-Dist: logfire[httpx]; extra == "all"
+Requires-Dist: appdirs; extra == "all"
+Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
+Requires-Dist: html2text; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
 Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: diskcache; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
 Requires-Dist: docker; extra == "all"
 Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: pandas; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: json_repair; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
 Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: peft; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
 Requires-Dist: faker; extra == "all"
-Requires-Dist: google-auth; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: sentence_transformers; extra == "all"
+Requires-Dist: setuptools; extra == "all"
 Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: logfire[httpx]; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
 Requires-Dist: pydantic; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
 Requires-Dist: regex; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
+Requires-Dist: diskcache; extra == "all"
 Requires-Dist: playwright; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: html2text; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: semver; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: peft; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: setuptools; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.37.dist-info → fmtr_tools-1.3.39.dist-info}/RECORD

@@ -12,7 +12,7 @@ fmtr/tools/debugging_tools.py,sha256=_xzqS0V5BpL8d06j-jVQjGgI7T020QsqVXKAKMz7Du8
 fmtr/tools/docker_tools.py,sha256=rdaZje2xhlmnfQqZnR7IHgRdWncTLjrJcViUTt5oEwk,617
 fmtr/tools/environment_tools.py,sha256=43uqfj1G1bNX0IwKz-NKbu3AbFYSdbBuGN9rlThe030,1845
 fmtr/tools/function_tools.py,sha256=O1K8HwftXfzrBblNZrj-BhWNbr4poJghrXNr2mFcylI,2831
-fmtr/tools/google_api_tools.py,sha256=owWE0GlnJjmVbXus8ENxT2PH7Fnd3m_r-14xyR7lAnA,1107
+fmtr/tools/google_api_tools.py,sha256=QUungBoj5SCaBQnMjn9QpXtWmdNCplbw8ZPK9LXi77U,1691
 fmtr/tools/hash_tools.py,sha256=tr4HXpeT6rRrDk6TvMlRPUSrLRRaov96y128OI2tzsc,729
 fmtr/tools/hfh_tools.py,sha256=DCDIWuWlhtmIGCtp9cLcOTTEw_4yN_NocLX8w5NZsbk,2384
 fmtr/tools/html_tools.py,sha256=0nN8Nz5HtG9bXyApYfHSKEivLlxjsm3Gn6Mg2TK0brI,394
@@ -20,7 +20,7 @@ fmtr/tools/http_tools.py,sha256=RVwGrBNMyjfbpgAPCSnxEkXfSzXXWARb3ayq981ONQE,464
 fmtr/tools/import_tools.py,sha256=XJmiWLukRncJAcaGReDn4jIz1_IpVBjfYCQHH1hIg7c,588
 fmtr/tools/inherit_tools.py,sha256=gTGL4mRm5RsbFW76s25AbuAJ2vlymbh1c8Q4Hl2uJGU,646
 fmtr/tools/inspection_tools.py,sha256=tLTRvzy9XVomQPi0dfnF_cgwc7KiDVZAr7gPTk4S_bQ,278
-fmtr/tools/iterator_tools.py,sha256=xj5f0c7LgLK53dddRRRJxBoLaBzlZoQS3_GfmpDPMoo,1311
+fmtr/tools/iterator_tools.py,sha256=ysNT2h39_ukEGrj8k7Z_CLKjWoguKBqVdjj4PLe7faE,1502
 fmtr/tools/json_fix_tools.py,sha256=vNSlswVQnujPmKEqDjFJcO901mjMyv59q3awsT7mlhs,477
 fmtr/tools/json_tools.py,sha256=WkFc5q7oqMtcFejhN1K5zQFULa9TdLOup83Fr0saDRY,348
 fmtr/tools/logging_tools.py,sha256=M7I5igs_tX5SIRv4f-jfb75LOODclSdmEg5ziAAMSPE,2503
@@ -40,16 +40,16 @@ fmtr/tools/random_tools.py,sha256=4VlQdk5THbR8ka4pZaLbk_ZO_4yy6PF_lHZes_rgenY,22
 fmtr/tools/semantic_tools.py,sha256=cxY9NSAHWj4nEc6Oj4qA1omR3dWbl2OuH7_PkINc6_E,1386
 fmtr/tools/settings_tools.py,sha256=o11W3T60UZSvCTkh_eEQq1Mx74GycQ6JxUr0plBDbsk,2356
 fmtr/tools/spaces_tools.py,sha256=D_he3mve6DruB3OPS6QyzqD05ChHnRTb4buViKPe7To,1099
-fmtr/tools/string_tools.py,sha256=mjO7NSqhtYMtnX7fKb8eXZ7MO2lXWGMl0kXxnZznupM,3764
+fmtr/tools/string_tools.py,sha256=On6YRLTAK1i6mmMpOUWVM618CykJiuaoyKIsU1cB_mA,4952
 fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,120
 fmtr/tools/tokenization_tools.py,sha256=me-IBzSLyNYejLybwjO9CNB6Mj2NYfKPaOVThXyaGNg,4268
 fmtr/tools/tools.py,sha256=CAsApa1YwVdNE6H66Vjivs_mXYvOas3rh7fPELAnTpk,795
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=xEb7rMAeLm9uuQhatt0xeEAwgvUjA0oSJCj3kyDaJq8,6
+fmtr/tools/version,sha256=X0h-7BeauKqNJDa25REZFacQpPeKRTGCByBGn_deWBk,6
 fmtr/tools/webhook_tools.py,sha256=q3pVJ1NCem2SrMuFcLxiWd7DibFs7Q-uGtojfXd3Qcg,380
 fmtr/tools/yaml_tools.py,sha256=Bhhyd6GQVKO72Lp8ky7bAUjIB_65Hdh0Q45SKIEe6S8,1901
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
-fmtr/tools/ai_tools/agentic_tools.py,sha256=8su8wmSEoQaDoDnmcKy_DvtWzssBEpNJtH4PzNAKZUE,4782
+fmtr/tools/ai_tools/agentic_tools.py,sha256=-6q9Cp8WUbLu9AmS5SI5R8qtWMp1Ky4rFXMtfLvcQ7A,4791
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 fmtr/tools/dns_tools/__init__.py,sha256=Mzaepy8lEdT0SJtUOCnF3IkpOt0vrZn-IOgOf4xfd8Q,258
 fmtr/tools/dns_tools/client.py,sha256=IBbd7Xgx9ExTn_EPoL7ts9JfXokHHuOiD9m4K6tl1Q0,2817
@@ -81,9 +81,9 @@ fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
 fmtr/tools/version_tools/__init__.py,sha256=pg4iLtmIr5HtyEW_j0fMFoIdzqi_w9xH8-grQaXLB28,318
 fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
-fmtr_tools-1.3.37.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.37.dist-info/METADATA,sha256=q7hKlM2vaxq51NAtlOCNKdplXcKuPd52gHjCedsH5uA,16259
-fmtr_tools-1.3.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.37.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.37.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.37.dist-info/RECORD,,
+fmtr_tools-1.3.39.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.39.dist-info/METADATA,sha256=LioB91BL767fAM6aTZjf73CDtwZD39UnOw6XnrMcSuk,16259
+fmtr_tools-1.3.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.39.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.39.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.39.dist-info/RECORD,,