fmtr.tools 1.1.1__tar.gz → 1.1.3__tar.gz

{fmtr_tools-1.1.1 → fmtr_tools-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.1.1
+Version: 1.1.3
 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
@@ -9,50 +9,51 @@ License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: peft; extra == "test"
 Requires-Dist: flet-webview; extra == "test"
-Requires-Dist: html2text; extra == "test"
-Requires-Dist: deepmerge; extra == "test"
-Requires-Dist: tabulate; extra == "test"
 Requires-Dist: torchvision; extra == "test"
-Requires-Dist: pandas; extra == "test"
-Requires-Dist: distributed; extra == "test"
-Requires-Dist: google-api-python-client; extra == "test"
-Requires-Dist: semver; extra == "test"
-Requires-Dist: pymupdf; extra == "test"
-Requires-Dist: openpyxl; extra == "test"
-Requires-Dist: google-auth; extra == "test"
-Requires-Dist: logfire; extra == "test"
-Requires-Dist: pymupdf4llm; extra == "test"
-Requires-Dist: sentence_transformers; extra == "test"
-Requires-Dist: tinynetrc; extra == "test"
+Requires-Dist: pydevd-pycharm; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: ollama; extra == "test"
 Requires-Dist: torchaudio; extra == "test"
-Requires-Dist: google-auth-httplib2; extra == "test"
-Requires-Dist: flet-video; extra == "test"
+Requires-Dist: faker; extra == "test"
+Requires-Dist: uvicorn[standard]; extra == "test"
 Requires-Dist: Unidecode; extra == "test"
-Requires-Dist: uvicorn; extra == "test"
-Requires-Dist: pyyaml; extra == "test"
-Requires-Dist: transformers[sentencepiece]; extra == "test"
-Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: semver; extra == "test"
 Requires-Dist: openai; extra == "test"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
-Requires-Dist: pydantic; extra == "test"
-Requires-Dist: sre_yield; extra == "test"
-Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: tokenizers; extra == "test"
-Requires-Dist: huggingface_hub; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: diskcache; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: peft; extra == "test"
+Requires-Dist: docker; extra == "test"
 Requires-Dist: json_repair; extra == "test"
-Requires-Dist: ollama; extra == "test"
+Requires-Dist: dask[bag]; extra == "test"
+Requires-Dist: logfire[fastapi]; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: tinynetrc; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
+Requires-Dist: tabulate; extra == "test"
+Requires-Dist: sentence_transformers; extra == "test"
+Requires-Dist: google-auth; extra == "test"
+Requires-Dist: logfire; extra == "test"
+Requires-Dist: html2text; extra == "test"
 Requires-Dist: bokeh; extra == "test"
-Requires-Dist: google-auth-oauthlib; extra == "test"
+Requires-Dist: pydantic; extra == "test"
 Requires-Dist: contexttimer; extra == "test"
 Requires-Dist: flet[all]; extra == "test"
-Requires-Dist: pydevd-pycharm; extra == "test"
-Requires-Dist: faker; extra == "test"
-Requires-Dist: docker; extra == "test"
 Requires-Dist: fastapi; extra == "test"
+Requires-Dist: google-auth-oauthlib; extra == "test"
+Requires-Dist: pandas; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: pymupdf; extra == "test"
+Requires-Dist: google-api-python-client; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: diskcache; extra == "test"
+Requires-Dist: distributed; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
+Requires-Dist: flet-video; extra == "test"
+Requires-Dist: pyyaml; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: pyyaml; extra == "yaml"
 Provides-Extra: logging
@@ -88,10 +89,11 @@ Provides-Extra: merging
 Requires-Dist: deepmerge; extra == "merging"
 Provides-Extra: api
 Requires-Dist: fastapi; extra == "api"
-Requires-Dist: uvicorn; extra == "api"
+Requires-Dist: uvicorn[standard]; extra == "api"
 Requires-Dist: logfire; extra == "api"
 Requires-Dist: semver; extra == "api"
 Requires-Dist: pydantic; extra == "api"
+Requires-Dist: logfire[fastapi]; extra == "api"
 Provides-Extra: ai
 Requires-Dist: peft; extra == "ai"
 Requires-Dist: transformers[sentencepiece]; extra == "ai"

{fmtr_tools-1.1.1 → fmtr_tools-1.1.3}/fmtr/tools/ai_tools/agentic_tools.py

@@ -24,6 +24,7 @@ class Task:
     PROVIDER_FMTR = OpenAIProvider(base_url=API_URL_FMTR)
 
     MODEL_ID = 'gpt-4o'
+    MODEL_ID_FMTR = 'qwen2.5-coder:14b'
     SYSTEM_PROMPT = None
     DEPS_TYPE = str
     RESULT_TYPE = str
@@ -86,14 +87,19 @@ class Task:
         """
         return output
 
+if __name__ == '__main__':
+    import asyncio
+    from fmtr.tools import dm
 
-class TaskTest(Task):
-    PROVIDER = Task.PROVIDER_FMTR
-    MODEL_ID = 'mixtral:8x7b'
 
+    class TestOutput(dm.BaseModel):
+        text: str
 
-if __name__ == '__main__':
-    import asyncio
+
+    class TaskTest(Task):
+        PROVIDER = Task.PROVIDER_FMTR
+        MODEL_ID = 'qwen2.5-coder:14b'
+        RESULT_TYPE = TestOutput
 
     task = TaskTest()
     result = asyncio.run(task.run('Hello! What is your name?'))

{fmtr_tools-1.1.1 → fmtr_tools-1.1.3}/fmtr/tools/api_tools.py

@@ -52,6 +52,7 @@ class ApiBase:
 
     def __init__(self):
         self.app = FastAPI(title=self.TITLE)
+        logger.instrument_fastapi(self.app)
 
         for endpoint in self.get_endpoints():
             self.add_endpoint(endpoint)

{fmtr_tools-1.1.1 → fmtr_tools-1.1.3}/fmtr/tools/constants.py

@@ -27,3 +27,7 @@ class Constants:
 
     FMTR_AI_HOST_KEY = 'FMTR_URL_HOST'
     FMTR_AI_HOST_DEFAULT = 'ai.gex.fmtr.dev'
+
+    FILENAME_CONFIG = 'settings.yaml'
+    DIR_NAME_ARTIFACTS = 'artifacts'
+    FILENAME_VERSION = 'version'

{fmtr_tools-1.1.1 → fmtr_tools-1.1.3}/fmtr/tools/path_tools.py

@@ -153,11 +153,7 @@ class PackagePaths:
 
     """
 
-    FILENAME_CONFIG = 'settings.yaml'
-    DIR_NAME_ARTIFACTS = 'artifacts'
-    FILENAME_VERSION = 'version'
-
-    def __init__(self, path=None, org_singleton=None, dir_name_artifacts=DIR_NAME_ARTIFACTS, filename_config=FILENAME_CONFIG, file_version=FILENAME_VERSION):
+    def __init__(self, path=None, org_singleton=None, dir_name_artifacts=Constants.DIR_NAME_ARTIFACTS, filename_config=Constants.FILENAME_CONFIG, file_version=Constants.FILENAME_VERSION):
 
         """
 

fmtr_tools-1.1.3/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.3

{fmtr_tools-1.1.1 → fmtr_tools-1.1.3}/fmtr.tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.1.1
+Version: 1.1.3
 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
@@ -9,50 +9,51 @@ License: Copyright © 2025 Frontmatter. All rights reserved.
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: test
-Requires-Dist: peft; extra == "test"
 Requires-Dist: flet-webview; extra == "test"
-Requires-Dist: html2text; extra == "test"
-Requires-Dist: deepmerge; extra == "test"
-Requires-Dist: tabulate; extra == "test"
 Requires-Dist: torchvision; extra == "test"
-Requires-Dist: pandas; extra == "test"
-Requires-Dist: distributed; extra == "test"
-Requires-Dist: google-api-python-client; extra == "test"
-Requires-Dist: semver; extra == "test"
-Requires-Dist: pymupdf; extra == "test"
-Requires-Dist: openpyxl; extra == "test"
-Requires-Dist: google-auth; extra == "test"
-Requires-Dist: logfire; extra == "test"
-Requires-Dist: pymupdf4llm; extra == "test"
-Requires-Dist: sentence_transformers; extra == "test"
-Requires-Dist: tinynetrc; extra == "test"
+Requires-Dist: pydevd-pycharm; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: ollama; extra == "test"
 Requires-Dist: torchaudio; extra == "test"
-Requires-Dist: google-auth-httplib2; extra == "test"
-Requires-Dist: flet-video; extra == "test"
+Requires-Dist: faker; extra == "test"
+Requires-Dist: uvicorn[standard]; extra == "test"
 Requires-Dist: Unidecode; extra == "test"
-Requires-Dist: uvicorn; extra == "test"
-Requires-Dist: pyyaml; extra == "test"
-Requires-Dist: transformers[sentencepiece]; extra == "test"
-Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: semver; extra == "test"
 Requires-Dist: openai; extra == "test"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
-Requires-Dist: pydantic; extra == "test"
-Requires-Dist: sre_yield; extra == "test"
-Requires-Dist: dask[bag]; extra == "test"
-Requires-Dist: tokenizers; extra == "test"
-Requires-Dist: huggingface_hub; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: diskcache; extra == "test"
+Requires-Dist: transformers[sentencepiece]; extra == "test"
+Requires-Dist: google-auth-httplib2; extra == "test"
+Requires-Dist: openpyxl; extra == "test"
+Requires-Dist: peft; extra == "test"
+Requires-Dist: docker; extra == "test"
 Requires-Dist: json_repair; extra == "test"
-Requires-Dist: ollama; extra == "test"
+Requires-Dist: dask[bag]; extra == "test"
+Requires-Dist: logfire[fastapi]; extra == "test"
+Requires-Dist: deepmerge; extra == "test"
+Requires-Dist: tinynetrc; extra == "test"
+Requires-Dist: sre_yield; extra == "test"
+Requires-Dist: tabulate; extra == "test"
+Requires-Dist: sentence_transformers; extra == "test"
+Requires-Dist: google-auth; extra == "test"
+Requires-Dist: logfire; extra == "test"
+Requires-Dist: html2text; extra == "test"
 Requires-Dist: bokeh; extra == "test"
-Requires-Dist: google-auth-oauthlib; extra == "test"
+Requires-Dist: pydantic; extra == "test"
 Requires-Dist: contexttimer; extra == "test"
 Requires-Dist: flet[all]; extra == "test"
-Requires-Dist: pydevd-pycharm; extra == "test"
-Requires-Dist: faker; extra == "test"
-Requires-Dist: docker; extra == "test"
 Requires-Dist: fastapi; extra == "test"
+Requires-Dist: google-auth-oauthlib; extra == "test"
+Requires-Dist: pandas; extra == "test"
+Requires-Dist: huggingface_hub; extra == "test"
+Requires-Dist: pymupdf; extra == "test"
+Requires-Dist: google-api-python-client; extra == "test"
+Requires-Dist: pydantic-settings; extra == "test"
+Requires-Dist: diskcache; extra == "test"
+Requires-Dist: distributed; extra == "test"
+Requires-Dist: tokenizers; extra == "test"
+Requires-Dist: flet-video; extra == "test"
+Requires-Dist: pyyaml; extra == "test"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "test"
+Requires-Dist: pymupdf4llm; extra == "test"
 Provides-Extra: yaml
 Requires-Dist: pyyaml; extra == "yaml"
 Provides-Extra: logging
@@ -88,10 +89,11 @@ Provides-Extra: merging
 Requires-Dist: deepmerge; extra == "merging"
 Provides-Extra: api
 Requires-Dist: fastapi; extra == "api"
-Requires-Dist: uvicorn; extra == "api"
+Requires-Dist: uvicorn[standard]; extra == "api"
 Requires-Dist: logfire; extra == "api"
 Requires-Dist: semver; extra == "api"
 Requires-Dist: pydantic; extra == "api"
+Requires-Dist: logfire[fastapi]; extra == "api"
 Provides-Extra: ai
 Requires-Dist: peft; extra == "ai"
 Requires-Dist: transformers[sentencepiece]; extra == "ai"

{fmtr_tools-1.1.1 → fmtr_tools-1.1.3}/fmtr.tools.egg-info/requires.txt

@@ -16,10 +16,11 @@ ollama
 
 [api]
 fastapi
-uvicorn
+uvicorn[standard]
 logfire
 semver
 pydantic
+logfire[fastapi]
 
 [augmentation]
 faker
@@ -112,50 +113,51 @@ tabulate
 openpyxl
 
 [test]
-peft
 flet-webview
-html2text
-deepmerge
-tabulate
 torchvision
-pandas
-distributed
-google-api-python-client
-semver
-pymupdf
-openpyxl
-google-auth
-logfire
-pymupdf4llm
-sentence_transformers
-tinynetrc
+pydevd-pycharm
+pytest-cov
+ollama
 torchaudio
-google-auth-httplib2
-flet-video
+faker
+uvicorn[standard]
 Unidecode
-uvicorn
-pyyaml
-transformers[sentencepiece]
-pydantic-settings
+semver
 openai
-pydantic-ai[logfire,openai]
-pydantic
-sre_yield
-dask[bag]
-tokenizers
-huggingface_hub
-pytest-cov
-diskcache
+transformers[sentencepiece]
+google-auth-httplib2
+openpyxl
+peft
+docker
 json_repair
-ollama
+dask[bag]
+logfire[fastapi]
+deepmerge
+tinynetrc
+sre_yield
+tabulate
+sentence_transformers
+google-auth
+logfire
+html2text
 bokeh
-google-auth-oauthlib
+pydantic
 contexttimer
 flet[all]
-pydevd-pycharm
-faker
-docker
 fastapi
+google-auth-oauthlib
+pandas
+huggingface_hub
+pymupdf
+google-api-python-client
+pydantic-settings
+diskcache
+distributed
+tokenizers
+flet-video
+pyyaml
+pydantic-ai[logfire,openai]
+pymupdf4llm
 
 [tokenization]
 tokenizers

fmtr_tools-1.1.1/fmtr/tools/version

@@ -1 +0,0 @@
-1.1.1