fmtr.tools 1.3.62__tar.gz → 1.3.63__tar.gz

{fmtr_tools-1.3.62 → fmtr_tools-1.3.63}/PKG-INFO

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

{fmtr_tools-1.3.62 → fmtr_tools-1.3.63}/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-1.3.63/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.63

{fmtr_tools-1.3.62 → fmtr_tools-1.3.63}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.62/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.62

{fmtr_tools-1.3.62 → fmtr_tools-1.3.63}/fmtr.tools.egg-info/requires.txt

@@ -18,68 +18,68 @@ pydantic-ai[logfire,openai]
 ollama
 
 [all]
-setuptools
-google-auth
+huggingface_hub
+sre_yield
+torchaudio
 google-auth-oauthlib
-cachetools
-uvicorn[standard]
-pydantic
-openai
-ollama
-json_repair
-sentence_transformers
 tabulate
-sre_yield
-google-api-python-client
-pyyaml
-regex
-httpx_retries
-flet-video
-pandas
-openpyxl
+logfire[fastapi]
 google-auth-httplib2
-semver
-yamlscript
-dask[bag]
-peft
-html2text
-transformers[sentencepiece]
-tinynetrc
+torchvision
+pyyaml
+openai
 flet[all]
+pymupdf4llm
 appdirs
-deepmerge
-httpx
-huggingface_hub
-pymupdf
-pytest-cov
-beanie[odm]
+uvicorn[standard]
+semver
 logfire[httpx]
-deepdiff
-bokeh
+tokenizers
+cachetools
+pydantic-settings
 pycountry
-dnspython[doh]
-faker
+pytest-cov
+deepmerge
+regex
+json_repair
+Unidecode
 pydantic-ai[logfire,openai]
+pymupdf
+playwright
+tinynetrc
 odfpy
-pydantic-settings
+ollama
 pydantic-extra-types
-torchaudio
-motor
-torchvision
+peft
+distributed
+diskcache
+google-api-python-client
 filetype
-python-on-whales
-pymupdf4llm
+flet-video
+bokeh
+google-auth
 logfire
+beanie[odm]
+openpyxl
+setuptools
+transformers[sentencepiece]
+httpx
 pydevd-pycharm~=251.25410.159
-logfire[fastapi]
+yamlscript
+faker
 contexttimer
+pandas
 fastapi
+motor
+dask[bag]
+dnspython[doh]
+sentence_transformers
+deepdiff
+python-on-whales
+httpx_retries
 flet-webview
-playwright
-Unidecode
-distributed
-diskcache
-tokenizers
+pydantic
+html2text
 
 [api]
 fastapi