fmtr.tools 1.3.52__py3-none-any.whl → 1.3.54__py3-none-any.whl

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/ai_tools/agentic_tools.py

@@ -1,10 +1,12 @@
 import pydantic_ai
 from pydantic import PlainValidator
 from pydantic_ai import RunContext, ModelRetry
+from pydantic_ai._output import OutputDataT
 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 pydantic_ai.tools import AgentDepsT
+from typing import List, Optional, Any, Annotated, Generic
 
 from fmtr.tools import environment_tools as env
 from fmtr.tools.constants import Constants
@@ -25,15 +27,16 @@ class Validator:
         raise NotImplementedError()
 
 
-
-
-class Task:
+class Task(Generic[AgentDepsT, OutputDataT]):
     """
 
     Linear task definition, as Agent configuration and typing, plus state history.
 
     """
 
+    TypeDeps = str
+    TypeOutput = str
+
     PROVIDER = OpenAIProvider(api_key=env.get(Constants.FMTR_OPENAI_API_KEY_KEY))
 
     API_HOST_FMTR = env.get(Constants.FMTR_AI_HOST_KEY, Constants.FMTR_AI_HOST_DEFAULT)
@@ -43,8 +46,6 @@ class Task:
     MODEL_ID = 'gpt-4o'
     MODEL_ID_FMTR = 'qwen2.5-coder:14b'
     SYSTEM_PROMPT_STATIC = None
-    DEPS_TYPE = str
-    RESULT_TYPE = str
     RESULT_RETRIES = 5
     VALIDATORS: List[Validator] = []
 
@@ -56,13 +57,13 @@ class Task:
         """
 
         self.model = OpenAIModel(self.MODEL_ID, provider=self.PROVIDER)
-        self.agent = Agent(
+        self.agent = Agent[AgentDepsT, OutputDataT](
             *args,
             model=self.model,
             system_prompt=self.SYSTEM_PROMPT_STATIC or [],
-            deps_type=self.DEPS_TYPE,
-            result_type=self.RESULT_TYPE,
-            result_retries=self.RESULT_RETRIES,
+            deps_type=self.TypeDeps,
+            output_type=self.TypeOutput,
+            output_retries=self.RESULT_RETRIES,
             **kwargs
         )
 
@@ -80,7 +81,7 @@ class Task:
         import asyncio
         return asyncio.run
 
-    async def run(self, *args, deps=None, **kwargs) -> AgentRunResult[RESULT_TYPE]:
+    async def run(self, *args, deps=None, **kwargs) -> AgentRunResult[OutputDataT]:
         """
 
         Run Agent with deps-relative user prompt and while storing history
@@ -90,7 +91,7 @@ class Task:
         self.history = result.all_messages()
         return result
 
-    async def validate(self, ctx: RunContext[DEPS_TYPE], output: RESULT_TYPE) -> RESULT_TYPE:
+    async def validate(self, ctx: RunContext[AgentDepsT], output: OutputDataT) -> OutputDataT:
         """
 
         Aggregate any validation failures and combine them into a single ModelRetry exception
@@ -107,7 +108,7 @@ class Task:
 
         return output
 
-    def get_prompt(self, deps: Optional[DEPS_TYPE]) -> Optional[str]:
+    def get_prompt(self, deps: Optional[AgentDepsT]) -> Optional[str]:
         """
 
         Dummy prompt generator
@@ -115,7 +116,7 @@ class Task:
         """
         return None
 
-    def add_system_prompt(self, ctx: RunContext[DEPS_TYPE]) -> str | List[str]:
+    def add_system_prompt(self, ctx: RunContext[AgentDepsT]) -> str | List[str]:
         """
 
         Dummy system prompt append
@@ -181,7 +182,7 @@ if __name__ == '__main__':
     class TaskTest(Task):
         # PROVIDER = Task.PROVIDER_FMTR
         # MODEL_ID = 'qwen2.5-coder:14b'
-        RESULT_TYPE = TestOutput
+        TypeOutput = TestOutput
         SYSTEM_PROMPT_STATIC = 'Tell the user jokes.'
 
         def add_system_prompt(self, ctx: RunContext[TestDeps]) -> str:

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/version

@@ -1 +1 @@
-1.3.52
+1.3.54

{fmtr_tools-1.3.52.dist-info → fmtr_tools-1.3.54.dist-info}/METADATA

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

{fmtr_tools-1.3.52.dist-info → fmtr_tools-1.3.54.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fmtr/tools/__init__.py,sha256=MwGzpdPZJq-ts-KVcq3tTnHlqLUEDEdbt_xD2Dq5Mmw,6125
+fmtr/tools/__init__.py,sha256=Qh3jGKdC3MMZd7vQvIlrhZ0U7oTcTpBueX39VZwxX4U,5952
 fmtr/tools/api_tools.py,sha256=RyZUlTefSQozfl-8feZGauyUkwcFd-jU0KtKHFxHea4,2272
 fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
@@ -10,7 +10,6 @@ fmtr/tools/dataclass_tools.py,sha256=0Gt6KeLhtPgubo_2tYkIVqB8oQ91Qzag8OAGZDdjvMU
 fmtr/tools/datatype_tools.py,sha256=3P4AWIFGkJ-UqvXlj0Jc9IvkIIgTOE9jRrOk3NVbpH8,1508
 fmtr/tools/datetime_tools.py,sha256=StliYw51ZXi-miVB4O9Ps0zI6wsT_nbWhIb6R2ybNuo,330
 fmtr/tools/debugging_tools.py,sha256=_xzqS0V5BpL8d06j-jVQjGgI7T020QsqVXKAKMz7Du8,2082
-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=QUungBoj5SCaBQnMjn9QpXtWmdNCplbw8ZPK9LXi77U,1691
@@ -46,11 +45,11 @@ fmtr/tools/tabular_tools.py,sha256=mw6vOij1Ch-pVAyHMPtm5zj__ULZN_TKeBYOfj33wFM,1
 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=6mg-f0Dob6XPK21vB0XIalETo4iilcVpjzUomZIQS3Y,6
+fmtr/tools/version,sha256=e7sG0pzqTEZCFyq-p4XV7ZnrBdiNXOVK9wniHT6cbaA,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
-fmtr/tools/ai_tools/agentic_tools.py,sha256=aLejbLSmftXQpxnt1Kgia9UcCmj108U1pqOiAUI6l_I,4939
+fmtr/tools/ai_tools/agentic_tools.py,sha256=-bYP5Kjlz1E75CDBW_qZEQjVWegyx_7BOgqx8C5vWl0,5089
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 fmtr/tools/database_tools/__init__.py,sha256=-YXEs3P4nwg7hdvALpaW4K2Pg9FIc49rD53smqnBgT4,221
 fmtr/tools/database_tools/document.py,sha256=QLW-Ll2uVp1UTjA4leiJ3gtrUJHQPzwpFT_AZ3jow3A,812
@@ -59,6 +58,7 @@ fmtr/tools/dns_tools/client.py,sha256=IBbd7Xgx9ExTn_EPoL7ts9JfXokHHuOiD9m4K6tl1Q
 fmtr/tools/dns_tools/dm.py,sha256=Lp1HaF7rpVtL_Ji4Bd32B29105H9ZKQ8AcVj_AB7nsA,6678
 fmtr/tools/dns_tools/proxy.py,sha256=gCWfH1pyWjj8xnJ8Pm4id7bsBWqcar3dQ9PeP5XjRXY,1624
 fmtr/tools/dns_tools/server.py,sha256=_Y5w5bGHhBI32fYWl-SmnOALAw_eF9fEbmrOqqgzSq8,4263
+fmtr/tools/docker_tools/__init__.py,sha256=yEw5v6aqA_PSiEu7uTvq2DhXiZ2DmA9LqV4R7qAxI_4,220
 fmtr/tools/entrypoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/entrypoints/cache_hfh.py,sha256=fQNs4J9twQuZH_Yj98-oOvEX7-LrSUP3kO8nzw2HrHs,60
 fmtr/tools/entrypoints/ep_test.py,sha256=B8HfWISfSgw_xVX475CbJGh_QnpOe9MH65H8qGjTWbY,46
@@ -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.52.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.52.dist-info/METADATA,sha256=beQhHRoQiWwSuBgp-9GIoWywNE6bI3BnoASw75lPYhM,17429
-fmtr_tools-1.3.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.52.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.52.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.52.dist-info/RECORD,,
+fmtr_tools-1.3.54.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.54.dist-info/METADATA,sha256=nDQPMFGoVatq6bJ8vS-uIKTVV9fgQA5zwQHhUuO9uWw,17455
+fmtr_tools-1.3.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.54.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.54.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.54.dist-info/RECORD,,

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()
-
-