fmtr.tools 1.3.62__py3-none-any.whl → 1.3.63__py3-none-any.whl

fmtr/tools/string_tools.py

@@ -1,11 +1,11 @@
-from collections import namedtuple
-from string import Formatter
-
 import re
 from dataclasses import dataclass
 from textwrap import dedent
 from typing import List
 
+from collections import namedtuple
+from string import Formatter
+
 from fmtr.tools.datatype_tools import is_none
 
 ELLIPSIS = '…'
@@ -151,14 +151,14 @@ def truncate_mid(text, length=None, sep=ELLIPSIS, return_type=str):
         )
 
 
-def flatten(raw):
+def flatten(raw, sep=' '):
     """
 
     Flatten a multiline string to a single line
 
     """
     lines = raw.splitlines()
-    text = ' '.join(lines)
+    text = sep.join(lines)
     text = text.strip()
     return text
 
@@ -175,6 +175,22 @@ def join(strings, sep=' '):
     return text
 
 
+def join_natural(items, sep=', ', conj='and'):
+    """
+
+    Natural language list
+
+    """
+
+    if not items:
+        return ""
+    if len(items) == 1:
+        return items[0]
+    firsts, last = items[:-1], items[-1]
+    firsts_str = join(firsts, sep=sep)
+    text = f"{firsts_str} {conj} {last}"
+    return text
+
 class Mask:
     """
 

fmtr/tools/version

@@ -1 +1 @@
-1.3.62
+1.3.63

{fmtr_tools-1.3.62.dist-info → fmtr_tools-1.3.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.62
+Version: 1.3.63
 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
@@ -154,68 +154,68 @@ Provides-Extra: db-document
 Requires-Dist: beanie[odm]; extra == "db-document"
 Requires-Dist: motor; extra == "db-document"
 Provides-Extra: all
-Requires-Dist: json_repair; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: pydantic; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
 Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: html2text; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: motor; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
 Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: pydantic-extra-types; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
+Requires-Dist: json_repair; extra == "all"
 Requires-Dist: fastapi; extra == "all"
+Requires-Dist: tabulate; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: beanie[odm]; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: pydantic-extra-types; extra == "all"
 Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: deepdiff; extra == "all"
-Requires-Dist: setuptools; extra == "all"
 Requires-Dist: flet-video; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: pycountry; extra == "all"
+Requires-Dist: torchvision; extra == "all"
+Requires-Dist: deepdiff; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
+Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: diskcache; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
 Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: html2text; extra == "all"
 Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: logfire; extra == "all"
+Requires-Dist: appdirs; extra == "all"
+Requires-Dist: python-on-whales; extra == "all"
+Requires-Dist: semver; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
 Requires-Dist: pandas; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: peft; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: filetype; extra == "all"
 Requires-Dist: faker; extra == "all"
-Requires-Dist: odfpy; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: openai; extra == "all"
+Requires-Dist: sentence_transformers; extra == "all"
+Requires-Dist: regex; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: setuptools; extra == "all"
 Requires-Dist: google-auth; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: diskcache; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
 Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
-Requires-Dist: regex; extra == "all"
-Requires-Dist: playwright; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: beanie[odm]; extra == "all"
 Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: httpx; extra == "all"
-Requires-Dist: motor; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: ollama; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
 Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: python-on-whales; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: pycountry; extra == "all"
+Requires-Dist: logfire[httpx]; extra == "all"
+Requires-Dist: playwright; extra == "all"
+Requires-Dist: odfpy; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: bokeh; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: peft; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.62.dist-info → fmtr_tools-1.3.63.dist-info}/RECORD

@@ -40,12 +40,12 @@ 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=On6YRLTAK1i6mmMpOUWVM618CykJiuaoyKIsU1cB_mA,4952
+fmtr/tools/string_tools.py,sha256=Lz_H9l25OOoxE48QBJ_Upkk5nno7dPA6G2Gc0Wo8rOk,5275
 fmtr/tools/tabular_tools.py,sha256=mw6vOij1Ch-pVAyHMPtm5zj__ULZN_TKeBYOfj33wFM,1634
 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=FKKPeGwGcnITJYQNL1W7YAPGPvigwhisVg9K99HxWho,6
+fmtr/tools/version,sha256=1-w7DNphgnwgQa3EckgnbD0Qx9ULcbjMgAOknBRyoWI,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=O8VRlPnnQCncg2ZZ2l_VdWLJf4jkKH6dkZFVbv6o7IM,388
@@ -85,9 +85,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=cjE6nO6AoVOUp3RwgTbqL9wiw8J1l2pHJOz6Gn6bxjA,326
 fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
-fmtr_tools-1.3.62.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.62.dist-info/METADATA,sha256=ylVUFuwLtaNvhNbmm4P8w1MCEZ5Ddkmu6Bc_exClAW4,17455
-fmtr_tools-1.3.62.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.62.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.62.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.62.dist-info/RECORD,,
+fmtr_tools-1.3.63.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.63.dist-info/METADATA,sha256=nSjkJECziz3f5ss_9fCnnyyVJCoAKvOl0LzYDPShNzo,17455
+fmtr_tools-1.3.63.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.63.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.63.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.63.dist-info/RECORD,,