fmtr.tools 1.3.53__tar.gz → 1.3.54__tar.gz

{fmtr_tools-1.3.53 → fmtr_tools-1.3.54}/PKG-INFO

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

{fmtr_tools-1.3.53 → fmtr_tools-1.3.54}/fmtr/tools/__init__.py

@@ -21,6 +21,7 @@ import fmtr.tools.string_tools as string
 from fmtr.tools import ai_tools as ai
 from fmtr.tools import datetime_tools as dt
 from fmtr.tools import dns_tools as dns
+from fmtr.tools import docker_tools as docker
 from fmtr.tools import interface_tools as interface
 from fmtr.tools import version_tools as version
 from fmtr.tools.constants import Constants
@@ -40,11 +41,6 @@ try:
 except ModuleNotFoundError as exception:
     yaml = MissingExtraMockModule('yaml', exception)
 
-try:
-    from fmtr.tools import docker_tools as docker
-    from fmtr.tools.docker_tools import Container
-except ModuleNotFoundError as exception:
-    docker = Container = MissingExtraMockModule('docker.api', exception)
 
 try:
     from fmtr.tools import parallel_tools as parallel

fmtr_tools-1.3.54/fmtr/tools/docker_tools/__init__.py

@@ -0,0 +1,6 @@
+from fmtr.tools.import_tools import MissingExtraMockModule
+
+try:
+    from python_on_whales import docker as client
+except ModuleNotFoundError as exception:
+    client = MissingExtraMockModule('docker.client', exception)

fmtr_tools-1.3.54/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.54

{fmtr_tools-1.3.53 → fmtr_tools-1.3.54}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.3.53 → fmtr_tools-1.3.54}/fmtr.tools.egg-info/SOURCES.txt

@@ -14,7 +14,6 @@ setup.py
 ./fmtr/tools/datatype_tools.py
 ./fmtr/tools/datetime_tools.py
 ./fmtr/tools/debugging_tools.py
-./fmtr/tools/docker_tools.py
 ./fmtr/tools/environment_tools.py
 ./fmtr/tools/function_tools.py
 ./fmtr/tools/google_api_tools.py
@@ -63,6 +62,7 @@ setup.py
 ./fmtr/tools/dns_tools/dm.py
 ./fmtr/tools/dns_tools/proxy.py
 ./fmtr/tools/dns_tools/server.py
+./fmtr/tools/docker_tools/__init__.py
 ./fmtr/tools/entrypoints/__init__.py
 ./fmtr/tools/entrypoints/cache_hfh.py
 ./fmtr/tools/entrypoints/ep_test.py
@@ -107,7 +107,6 @@ fmtr/tools/dataclass_tools.py
 fmtr/tools/datatype_tools.py
 fmtr/tools/datetime_tools.py
 fmtr/tools/debugging_tools.py
-fmtr/tools/docker_tools.py
 fmtr/tools/environment_tools.py
 fmtr/tools/function_tools.py
 fmtr/tools/google_api_tools.py
@@ -156,6 +155,7 @@ fmtr/tools/dns_tools/client.py
 fmtr/tools/dns_tools/dm.py
 fmtr/tools/dns_tools/proxy.py
 fmtr/tools/dns_tools/server.py
+fmtr/tools/docker_tools/__init__.py
 fmtr/tools/entrypoints/__init__.py
 fmtr/tools/entrypoints/cache_hfh.py
 fmtr/tools/entrypoints/ep_test.py

{fmtr_tools-1.3.53 → fmtr_tools-1.3.54}/fmtr.tools.egg-info/requires.txt

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

{fmtr_tools-1.3.53 → fmtr_tools-1.3.54}/setup.py

@@ -10,7 +10,7 @@ DEPENDENCIES = {
     'augmentation': ['faker', 'sre_yield'],
     'process': ['logging'],
     'profiling': ['contexttimer'],
-    'docker.api': ['docker'],
+    'docker.client': ['python-on-whales'],
     'unicode': ['Unidecode'],
     'version': [],
     'version.dev': ['semver'],

fmtr_tools-1.3.53/fmtr/tools/docker_tools.py

@@ -1,30 +0,0 @@
-import contextlib
-import docker
-
-
-@contextlib.contextmanager
-def Container(image, ports=None, name=None, **kwargs):
-    """
-
-    Run a Docker container in a context manager
-
-    """
-    client = docker.from_env()
-
-    try:
-        container = client.containers.get(name)
-        container.stop()
-        container.remove()
-    except docker.errors.NotFound:
-        pass
-
-    ports = {f'{port}/tcp': port for port in ports}
-    container = client.containers.run(image, ports=ports, detach=True, name=name, **kwargs)
-
-    try:
-        yield container
-    finally:
-        container.stop()
-        container.remove()
-
-

fmtr_tools-1.3.53/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.53