fmtr.tools 1.0.53__tar.gz → 1.0.55__tar.gz

{fmtr.tools-1.0.53 → fmtr_tools-1.0.55}/PKG-INFO

@@ -1,43 +1,157 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.0.53
+Version: 1.0.55
 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
 Author-email: innovative.fowler@mask.pro.fmtr.dev
 License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
-Provides-Extra: ai
-Provides-Extra: ai.client
-Provides-Extra: api
-Provides-Extra: augmentation
-Provides-Extra: caching
-Provides-Extra: debug
-Provides-Extra: dm
-Provides-Extra: docker.api
-Provides-Extra: google.api
-Provides-Extra: hfh
-Provides-Extra: html
-Provides-Extra: interface
-Provides-Extra: json-fix
+License-File: LICENSE
+Provides-Extra: test
+Requires-Dist: distributed; extra == "test"
+Requires-Dist: ollama; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: semver; extra == "test"
+Requires-Dist: pyyaml; extra == "test"
+Requires-Dist: tinynetrc; extra == "test"
+Requires-Dist: dask[bag]; extra == "test"
+Requires-Dist: peft; extra == "test"
+Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: google-auth-oauthlib; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: bokeh; extra == "test"
+Requires-Dist: Unidecode; extra == "test"
+Requires-Dist: docker; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: json_repair; extra == "test"
+Requires-Dist: fastapi; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
+Requires-Dist: pydevd-pycharm; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
+Requires-Dist: diskcache; extra == "test"
+Requires-Dist: logfire; extra == "test"
+Requires-Dist: contexttimer; extra == "test"
+Requires-Dist: flet-video; extra == "test"
+Requires-Dist: torchvision; extra == "test"
+Requires-Dist: google-api-python-client; extra == "test"
+Requires-Dist: google-auth; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
+Requires-Dist: uvicorn; extra == "test"
+Requires-Dist: pydantic; extra == "test"
+Requires-Dist: tabulate; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
+Requires-Dist: openai; extra == "test"
+Requires-Dist: pandas; extra == "test"
+Requires-Dist: faker; extra == "test"
+Requires-Dist: pymupdf; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
+Requires-Dist: flet-webview; extra == "test"
+Requires-Dist: sentence_transformers; extra == "test"
+Requires-Dist: torchaudio; extra == "test"
+Requires-Dist: html2text; extra == "test"
+Provides-Extra: yaml
+Requires-Dist: pyyaml; extra == "yaml"
 Provides-Extra: logging
-Provides-Extra: merging
-Provides-Extra: metric
-Provides-Extra: netrc
-Provides-Extra: openai.api
+Requires-Dist: logfire; extra == "logging"
+Requires-Dist: semver; extra == "logging"
 Provides-Extra: parallel
-Provides-Extra: pdf
+Requires-Dist: dask[bag]; extra == "parallel"
+Requires-Dist: distributed; extra == "parallel"
+Requires-Dist: bokeh; extra == "parallel"
+Provides-Extra: tokenization
+Requires-Dist: tokenizers; extra == "tokenization"
+Provides-Extra: augmentation
+Requires-Dist: faker; extra == "augmentation"
+Requires-Dist: sre_yield; extra == "augmentation"
 Provides-Extra: process
+Requires-Dist: logfire; extra == "process"
+Requires-Dist: semver; extra == "process"
 Provides-Extra: profiling
-Provides-Extra: semantic
-Provides-Extra: spaces
-Provides-Extra: tabular
-Provides-Extra: test
-Provides-Extra: tokenization
+Requires-Dist: contexttimer; extra == "profiling"
+Provides-Extra: docker-api
+Requires-Dist: docker; extra == "docker-api"
 Provides-Extra: unicode
+Requires-Dist: Unidecode; extra == "unicode"
 Provides-Extra: version
-Provides-Extra: yaml
-License-File: LICENSE
+Requires-Dist: semver; extra == "version"
+Provides-Extra: spaces
+Requires-Dist: tinynetrc; extra == "spaces"
+Provides-Extra: netrc
+Requires-Dist: tinynetrc; extra == "netrc"
+Provides-Extra: hfh
+Requires-Dist: huggingface_hub; extra == "hfh"
+Provides-Extra: merging
+Requires-Dist: deepmerge; extra == "merging"
+Provides-Extra: api
+Requires-Dist: fastapi; extra == "api"
+Requires-Dist: uvicorn; extra == "api"
+Requires-Dist: logfire; extra == "api"
+Requires-Dist: semver; extra == "api"
+Requires-Dist: pydantic; extra == "api"
+Provides-Extra: ai
+Requires-Dist: peft; extra == "ai"
+Requires-Dist: transformers[sentencepiece]; extra == "ai"
+Requires-Dist: torchvision; extra == "ai"
+Requires-Dist: torchaudio; extra == "ai"
+Requires-Dist: pydantic; extra == "ai"
+Provides-Extra: dm
+Requires-Dist: pydantic; extra == "dm"
+Provides-Extra: openai-api
+Requires-Dist: openai; extra == "openai-api"
+Provides-Extra: ai-client
+Requires-Dist: logfire; extra == "ai-client"
+Requires-Dist: semver; extra == "ai-client"
+Requires-Dist: pydantic; extra == "ai-client"
+Requires-Dist: openai; extra == "ai-client"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "ai-client"
+Requires-Dist: ollama; extra == "ai-client"
+Provides-Extra: json-fix
+Requires-Dist: json_repair; extra == "json-fix"
+Provides-Extra: semantic
+Requires-Dist: sentence_transformers; extra == "semantic"
+Requires-Dist: pandas; extra == "semantic"
+Requires-Dist: tabulate; extra == "semantic"
+Requires-Dist: openpyxl; extra == "semantic"
+Provides-Extra: metric
+Requires-Dist: pandas; extra == "metric"
+Requires-Dist: tabulate; extra == "metric"
+Requires-Dist: openpyxl; extra == "metric"
+Provides-Extra: tabular
+Requires-Dist: pandas; extra == "tabular"
+Requires-Dist: tabulate; extra == "tabular"
+Requires-Dist: openpyxl; extra == "tabular"
+Provides-Extra: html
+Requires-Dist: html2text; extra == "html"
+Provides-Extra: interface
+Requires-Dist: flet[all]; extra == "interface"
+Requires-Dist: flet-video; extra == "interface"
+Requires-Dist: flet-webview; extra == "interface"
+Requires-Dist: pydantic; extra == "interface"
+Provides-Extra: google-api
+Requires-Dist: google-auth; extra == "google-api"
+Requires-Dist: google-auth-oauthlib; extra == "google-api"
+Requires-Dist: google-auth-httplib2; extra == "google-api"
+Requires-Dist: google-api-python-client; extra == "google-api"
+Provides-Extra: caching
+Requires-Dist: diskcache; extra == "caching"
+Provides-Extra: pdf
+Requires-Dist: pymupdf; extra == "pdf"
+Requires-Dist: pydantic; extra == "pdf"
+Requires-Dist: pymupdf4llm; extra == "pdf"
+Provides-Extra: debug
+Requires-Dist: pydevd-pycharm; extra == "debug"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: summary
 
 # `fmtr.tools`
 

{fmtr.tools-1.0.53 → fmtr_tools-1.0.55}/fmtr/tools/ai_tools/agentic_tools.py

@@ -1,7 +1,7 @@
 import pydantic_ai
-from pydantic_ai import RunContext, ModelRetry
-from pydantic_ai.agent import AgentRunResult
-from pydantic_ai.messages import ModelRequest, SystemPromptPart, ToolCallPart, RetryPromptPart, ModelResponse, ToolReturnPart, UserPromptPart
+from pydantic_ai import RunContext
+from pydantic_ai.agent import AgentRunResult, Agent
+from pydantic_ai.messages import ModelRequest, RetryPromptPart
 from pydantic_ai.models.openai import OpenAIModel
 from pydantic_ai.providers.openai import OpenAIProvider
 
@@ -10,16 +10,6 @@ from fmtr.tools.config import ToolsConfig
 
 pydantic_ai.Agent.instrument_all()
 
-class Agent(pydantic_ai.Agent):
-    """
-
-    Agent stub
-
-    TODO base class is marked `@final`, so is it safe to subclass?
-
-    """
-
-
 class Task:
     """
 
@@ -28,10 +18,15 @@ class Task:
     """
 
     PROVIDER = OpenAIProvider(api_key=env.get(ToolsConfig.FMTR_OPENAI_API_KEY_KEY))
+
+    API_HOST_FMTR = env.get(ToolsConfig.FMTR_AI_HOST_KEY, ToolsConfig.FMTR_AI_HOST_DEFAULT)
+    API_URL_FMTR = f'https://{API_HOST_FMTR}/v1'
+    PROVIDER_FMTR = OpenAIProvider(base_url=API_URL_FMTR)
+
     MODEL_ID = 'gpt-4o'
     SYSTEM_PROMPT = None
-    DEPS_TYPE = type(None)
-    RESULT_TYPE = type(None)
+    DEPS_TYPE = str
+    RESULT_TYPE = str
     RESULT_RETRIES = 5
 
     def __init__(self, *args, **kwargs):
@@ -45,7 +40,7 @@ class Task:
         self.agent = Agent(
             *args,
             model=self.model,
-            system_prompt=self.SYSTEM_PROMPT,
+            system_prompt=self.SYSTEM_PROMPT or [],
             deps_type=self.DEPS_TYPE,
             result_type=self.RESULT_TYPE,
             result_retries=self.RESULT_RETRIES,
@@ -90,3 +85,16 @@ class Task:
 
         """
         return output
+
+
+class TaskTest(Task):
+    PROVIDER = Task.PROVIDER_FMTR
+    MODEL_ID = 'mixtral:8x7b'
+
+
+if __name__ == '__main__':
+    import asyncio
+
+    task = TaskTest()
+    result = asyncio.run(task.run('Hello! What is your name?'))
+    result

{fmtr.tools-1.0.53 → fmtr_tools-1.0.55}/fmtr/tools/config.py

@@ -26,3 +26,6 @@ class ToolsConfig(ConfigClass):
     FMTR_REMOTE_DEBUG_ENABLED_KEY = 'FMTR_REMOTE_DEBUG_ENABLED'
 
     FMTR_OPENAI_API_KEY_KEY = 'FMTR_OPENAI_API_KEY'
+
+    FMTR_AI_HOST_KEY = 'FMTR_URL_HOST'
+    FMTR_AI_HOST_DEFAULT = 'ai.gex.fmtr.dev'

fmtr_tools-1.0.55/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.55

{fmtr.tools-1.0.53 → fmtr_tools-1.0.55}/fmtr.tools.egg-info/PKG-INFO

@@ -1,43 +1,157 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.0.53
+Version: 1.0.55
 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
 Author-email: innovative.fowler@mask.pro.fmtr.dev
 License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
-Provides-Extra: ai
-Provides-Extra: ai.client
-Provides-Extra: api
-Provides-Extra: augmentation
-Provides-Extra: caching
-Provides-Extra: debug
-Provides-Extra: dm
-Provides-Extra: docker.api
-Provides-Extra: google.api
-Provides-Extra: hfh
-Provides-Extra: html
-Provides-Extra: interface
-Provides-Extra: json-fix
+License-File: LICENSE
+Provides-Extra: test
+Requires-Dist: distributed; extra == "test"
+Requires-Dist: ollama; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: semver; extra == "test"
+Requires-Dist: pyyaml; extra == "test"
+Requires-Dist: tinynetrc; extra == "test"
+Requires-Dist: dask[bag]; extra == "test"
+Requires-Dist: peft; extra == "test"
+Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: google-auth-oauthlib; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: bokeh; extra == "test"
+Requires-Dist: Unidecode; extra == "test"
+Requires-Dist: docker; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: json_repair; extra == "test"
+Requires-Dist: fastapi; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
+Requires-Dist: pydevd-pycharm; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
+Requires-Dist: diskcache; extra == "test"
+Requires-Dist: logfire; extra == "test"
+Requires-Dist: contexttimer; extra == "test"
+Requires-Dist: flet-video; extra == "test"
+Requires-Dist: torchvision; extra == "test"
+Requires-Dist: google-api-python-client; extra == "test"
+Requires-Dist: google-auth; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: flet[all]; extra == "test"
+Requires-Dist: uvicorn; extra == "test"
+Requires-Dist: pydantic; extra == "test"
+Requires-Dist: tabulate; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
+Requires-Dist: openai; extra == "test"
+Requires-Dist: pandas; extra == "test"
+Requires-Dist: faker; extra == "test"
+Requires-Dist: pymupdf; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
+Requires-Dist: flet-webview; extra == "test"
+Requires-Dist: sentence_transformers; extra == "test"
+Requires-Dist: torchaudio; extra == "test"
+Requires-Dist: html2text; extra == "test"
+Provides-Extra: yaml
+Requires-Dist: pyyaml; extra == "yaml"
 Provides-Extra: logging
-Provides-Extra: merging
-Provides-Extra: metric
-Provides-Extra: netrc
-Provides-Extra: openai.api
+Requires-Dist: logfire; extra == "logging"
+Requires-Dist: semver; extra == "logging"
 Provides-Extra: parallel
-Provides-Extra: pdf
+Requires-Dist: dask[bag]; extra == "parallel"
+Requires-Dist: distributed; extra == "parallel"
+Requires-Dist: bokeh; extra == "parallel"
+Provides-Extra: tokenization
+Requires-Dist: tokenizers; extra == "tokenization"
+Provides-Extra: augmentation
+Requires-Dist: faker; extra == "augmentation"
+Requires-Dist: sre_yield; extra == "augmentation"
 Provides-Extra: process
+Requires-Dist: logfire; extra == "process"
+Requires-Dist: semver; extra == "process"
 Provides-Extra: profiling
-Provides-Extra: semantic
-Provides-Extra: spaces
-Provides-Extra: tabular
-Provides-Extra: test
-Provides-Extra: tokenization
+Requires-Dist: contexttimer; extra == "profiling"
+Provides-Extra: docker-api
+Requires-Dist: docker; extra == "docker-api"
 Provides-Extra: unicode
+Requires-Dist: Unidecode; extra == "unicode"
 Provides-Extra: version
-Provides-Extra: yaml
-License-File: LICENSE
+Requires-Dist: semver; extra == "version"
+Provides-Extra: spaces
+Requires-Dist: tinynetrc; extra == "spaces"
+Provides-Extra: netrc
+Requires-Dist: tinynetrc; extra == "netrc"
+Provides-Extra: hfh
+Requires-Dist: huggingface_hub; extra == "hfh"
+Provides-Extra: merging
+Requires-Dist: deepmerge; extra == "merging"
+Provides-Extra: api
+Requires-Dist: fastapi; extra == "api"
+Requires-Dist: uvicorn; extra == "api"
+Requires-Dist: logfire; extra == "api"
+Requires-Dist: semver; extra == "api"
+Requires-Dist: pydantic; extra == "api"
+Provides-Extra: ai
+Requires-Dist: peft; extra == "ai"
+Requires-Dist: transformers[sentencepiece]; extra == "ai"
+Requires-Dist: torchvision; extra == "ai"
+Requires-Dist: torchaudio; extra == "ai"
+Requires-Dist: pydantic; extra == "ai"
+Provides-Extra: dm
+Requires-Dist: pydantic; extra == "dm"
+Provides-Extra: openai-api
+Requires-Dist: openai; extra == "openai-api"
+Provides-Extra: ai-client
+Requires-Dist: logfire; extra == "ai-client"
+Requires-Dist: semver; extra == "ai-client"
+Requires-Dist: pydantic; extra == "ai-client"
+Requires-Dist: openai; extra == "ai-client"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "ai-client"
+Requires-Dist: ollama; extra == "ai-client"
+Provides-Extra: json-fix
+Requires-Dist: json_repair; extra == "json-fix"
+Provides-Extra: semantic
+Requires-Dist: sentence_transformers; extra == "semantic"
+Requires-Dist: pandas; extra == "semantic"
+Requires-Dist: tabulate; extra == "semantic"
+Requires-Dist: openpyxl; extra == "semantic"
+Provides-Extra: metric
+Requires-Dist: pandas; extra == "metric"
+Requires-Dist: tabulate; extra == "metric"
+Requires-Dist: openpyxl; extra == "metric"
+Provides-Extra: tabular
+Requires-Dist: pandas; extra == "tabular"
+Requires-Dist: tabulate; extra == "tabular"
+Requires-Dist: openpyxl; extra == "tabular"
+Provides-Extra: html
+Requires-Dist: html2text; extra == "html"
+Provides-Extra: interface
+Requires-Dist: flet[all]; extra == "interface"
+Requires-Dist: flet-video; extra == "interface"
+Requires-Dist: flet-webview; extra == "interface"
+Requires-Dist: pydantic; extra == "interface"
+Provides-Extra: google-api
+Requires-Dist: google-auth; extra == "google-api"
+Requires-Dist: google-auth-oauthlib; extra == "google-api"
+Requires-Dist: google-auth-httplib2; extra == "google-api"
+Requires-Dist: google-api-python-client; extra == "google-api"
+Provides-Extra: caching
+Requires-Dist: diskcache; extra == "caching"
+Provides-Extra: pdf
+Requires-Dist: pymupdf; extra == "pdf"
+Requires-Dist: pydantic; extra == "pdf"
+Requires-Dist: pymupdf4llm; extra == "pdf"
+Provides-Extra: debug
+Requires-Dist: pydevd-pycharm; extra == "debug"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: summary
 
 # `fmtr.tools`
 

fmtr.tools-1.0.53/fmtr/tools/version

@@ -1 +0,0 @@
-1.0.53

{fmtr.tools-1.0.53 → fmtr_tools-1.0.55}/fmtr.tools.egg-info/requires.txt

@@ -1,25 +1,25 @@
 
 [ai]
 peft
-pydantic
-torchaudio
-torchvision
 transformers[sentencepiece]
+torchvision
+torchaudio
+pydantic
 
 [ai.client]
 logfire
-ollama
-openai
+semver
 pydantic
+openai
 pydantic-ai[logfire,openai]
-semver
+ollama
 
 [api]
 fastapi
+uvicorn
 logfire
-pydantic
 semver
-uvicorn
+pydantic
 
 [augmentation]
 faker
@@ -38,10 +38,10 @@ pydantic
 docker
 
 [google.api]
-google-api-python-client
 google-auth
-google-auth-httplib2
 google-auth-oauthlib
+google-auth-httplib2
+google-api-python-client
 
 [hfh]
 huggingface_hub
@@ -50,9 +50,9 @@ huggingface_hub
 html2text
 
 [interface]
+flet[all]
 flet-video
 flet-webview
-flet[all]
 pydantic
 
 [json-fix]
@@ -66,9 +66,9 @@ semver
 deepmerge
 
 [metric]
-openpyxl
 pandas
 tabulate
+openpyxl
 
 [netrc]
 tinynetrc
@@ -77,13 +77,13 @@ tinynetrc
 openai
 
 [parallel]
-bokeh
 dask[bag]
 distributed
+bokeh
 
 [pdf]
-pydantic
 pymupdf
+pydantic
 pymupdf4llm
 
 [process]
@@ -94,63 +94,63 @@ semver
 contexttimer
 
 [semantic]
-openpyxl
-pandas
 sentence_transformers
+pandas
 tabulate
+openpyxl
 
 [spaces]
 tinynetrc
 
 [tabular]
-openpyxl
 pandas
 tabulate
+openpyxl
 
 [test]
-Unidecode
-bokeh
-contexttimer
-dask[bag]
-deepmerge
-diskcache
 distributed
-docker
-faker
-fastapi
-flet-video
-flet-webview
-flet[all]
-google-api-python-client
-google-auth
+ollama
+pytest-cov
 google-auth-httplib2
+semver
+pyyaml
+tinynetrc
+dask[bag]
+peft
+openpyxl
 google-auth-oauthlib
-html2text
 huggingface_hub
+bokeh
+Unidecode
+docker
+deepmerge
 json_repair
+fastapi
+transformers[sentencepiece]
+pydevd-pycharm
+tokenizers
+diskcache
 logfire
-ollama
+contexttimer
+flet-video
+torchvision
+google-api-python-client
+google-auth
+pydantic-ai[logfire,openai]
+flet[all]
+uvicorn
+pydantic
+tabulate
+pymupdf4llm
 openai
-openpyxl
 pandas
-peft
-pydantic
-pydantic-ai[logfire,openai]
-pydevd-pycharm
+faker
 pymupdf
-pymupdf4llm
-pytest-cov
-pyyaml
-semver
-sentence_transformers
 sre_yield
-tabulate
-tinynetrc
-tokenizers
+flet-webview
+sentence_transformers
 torchaudio
-torchvision
-transformers[sentencepiece]
-uvicorn
+html2text
 
 [tokenization]
 tokenizers