fmtr.tools 1.3.44__tar.gz → 1.3.46__tar.gz

{fmtr_tools-1.3.44 → fmtr_tools-1.3.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.44
+Version: 1.3.46
 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
@@ -48,6 +48,7 @@ Requires-Dist: fastapi; extra == "api"
 Requires-Dist: uvicorn[standard]; extra == "api"
 Requires-Dist: logfire; extra == "api"
 Requires-Dist: pydantic; extra == "api"
+Requires-Dist: pydantic-extra-types; extra == "api"
 Requires-Dist: logfire[fastapi]; extra == "api"
 Provides-Extra: ai
 Requires-Dist: peft; extra == "ai"
@@ -55,13 +56,16 @@ Requires-Dist: transformers[sentencepiece]; extra == "ai"
 Requires-Dist: torchvision; extra == "ai"
 Requires-Dist: torchaudio; extra == "ai"
 Requires-Dist: pydantic; extra == "ai"
+Requires-Dist: pydantic-extra-types; extra == "ai"
 Provides-Extra: dm
 Requires-Dist: pydantic; extra == "dm"
+Requires-Dist: pydantic-extra-types; extra == "dm"
 Provides-Extra: openai-api
 Requires-Dist: openai; extra == "openai-api"
 Provides-Extra: ai-client
 Requires-Dist: logfire; extra == "ai-client"
 Requires-Dist: pydantic; extra == "ai-client"
+Requires-Dist: pydantic-extra-types; extra == "ai-client"
 Requires-Dist: openai; extra == "ai-client"
 Requires-Dist: pydantic-ai[logfire,openai]; extra == "ai-client"
 Requires-Dist: ollama; extra == "ai-client"
@@ -97,12 +101,14 @@ Requires-Dist: cachetools; extra == "caching"
 Provides-Extra: pdf
 Requires-Dist: pymupdf; extra == "pdf"
 Requires-Dist: pydantic; extra == "pdf"
+Requires-Dist: pydantic-extra-types; extra == "pdf"
 Requires-Dist: pymupdf4llm; extra == "pdf"
 Provides-Extra: debug
 Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "debug"
 Provides-Extra: sets
 Requires-Dist: pydantic-settings; extra == "sets"
 Requires-Dist: pydantic; extra == "sets"
+Requires-Dist: pydantic-extra-types; extra == "sets"
 Requires-Dist: yamlscript; extra == "sets"
 Requires-Dist: pyyaml; extra == "sets"
 Provides-Extra: path-app
@@ -136,64 +142,65 @@ Provides-Extra: db-document
 Requires-Dist: beanie[odm]; extra == "db-document"
 Requires-Dist: motor; extra == "db-document"
 Provides-Extra: all
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
-Requires-Dist: peft; extra == "all"
-Requires-Dist: playwright; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: pydantic; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: google-auth; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: setuptools; extra == "all"
 Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: flet-video; extra == "all"
+Requires-Dist: motor; extra == "all"
 Requires-Dist: httpx; extra == "all"
-Requires-Dist: beanie[odm]; extra == "all"
-Requires-Dist: openai; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
+Requires-Dist: appdirs; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: playwright; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: json_repair; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: logfire; extra == "all"
 Requires-Dist: faker; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: appdirs; extra == "all"
+Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: pydantic-extra-types; extra == "all"
 Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: tabulate; extra == "all"
 Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: torchvision; extra == "all"
+Requires-Dist: peft; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
 Requires-Dist: diskcache; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: docker; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: semver; extra == "all"
 Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: setuptools; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
 Requires-Dist: html2text; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
 Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: beanie[odm]; extra == "all"
+Requires-Dist: pymupdf; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
 Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: motor; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: docker; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: tabulate; extra == "all"
+Requires-Dist: bokeh; extra == "all"
 Requires-Dist: regex; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
 Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: google-auth; extra == "all"
-Requires-Dist: flet-video; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: pandas; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.44 → fmtr_tools-1.3.46}/fmtr/tools/ai_tools/agentic_tools.py

@@ -132,6 +132,15 @@ class Task:
         """
         self.history = []
 
+    @property
+    def tool_schema(self):
+        """
+
+        Impossible to find otherwise.
+
+        """
+        return self.agent._output_toolset
+
     def __repr__(self):
         """
 

{fmtr_tools-1.3.44 → fmtr_tools-1.3.46}/fmtr/tools/interface_tools/interface_tools.py

@@ -2,7 +2,7 @@ import flet as ft
 from flet.core.types import AppView
 from flet.core.view import View
 from functools import cached_property
-from typing import TypeVar, Generic, Type
+from typing import TypeVar, Generic, Type, Self
 
 from fmtr.tools import environment_tools
 from fmtr.tools.constants import Constants
@@ -86,7 +86,7 @@ class Interface(Generic[T], ft.Column):
         super().__init__(*args, **kwargs, scroll=self.SCROLL)
 
     @classmethod
-    def render(cls, page: ft.Page):
+    async def render(cls, page: ft.Page):
         """
 
         Interface entry point. Set relevant callbacks, and add instantiated self to page views
@@ -97,7 +97,9 @@ class Interface(Generic[T], ft.Column):
             page.theme = cls.get_theme()
             page.views.clear()
             context = cls.TypeContext(page=page)
-            self = cls(context)
+
+            self = await cls.create(context)
+
             view = self.view
             if not view:
                 view = self
@@ -107,6 +109,17 @@ class Interface(Generic[T], ft.Column):
 
             page.go(cls.ROUTE_ROOT)
 
+    @classmethod
+    async def create(cls, context: T) -> Self:
+        """
+
+        Overridable async interface constructor.
+
+        """
+        self = cls(context)
+        return self
+
+
     @cached_property
     def view(self):
         """

fmtr_tools-1.3.46/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.46

{fmtr_tools-1.3.44 → fmtr_tools-1.3.46}/fmtr.tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.44
+Version: 1.3.46
 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
@@ -48,6 +48,7 @@ Requires-Dist: fastapi; extra == "api"
 Requires-Dist: uvicorn[standard]; extra == "api"
 Requires-Dist: logfire; extra == "api"
 Requires-Dist: pydantic; extra == "api"
+Requires-Dist: pydantic-extra-types; extra == "api"
 Requires-Dist: logfire[fastapi]; extra == "api"
 Provides-Extra: ai
 Requires-Dist: peft; extra == "ai"
@@ -55,13 +56,16 @@ Requires-Dist: transformers[sentencepiece]; extra == "ai"
 Requires-Dist: torchvision; extra == "ai"
 Requires-Dist: torchaudio; extra == "ai"
 Requires-Dist: pydantic; extra == "ai"
+Requires-Dist: pydantic-extra-types; extra == "ai"
 Provides-Extra: dm
 Requires-Dist: pydantic; extra == "dm"
+Requires-Dist: pydantic-extra-types; extra == "dm"
 Provides-Extra: openai-api
 Requires-Dist: openai; extra == "openai-api"
 Provides-Extra: ai-client
 Requires-Dist: logfire; extra == "ai-client"
 Requires-Dist: pydantic; extra == "ai-client"
+Requires-Dist: pydantic-extra-types; extra == "ai-client"
 Requires-Dist: openai; extra == "ai-client"
 Requires-Dist: pydantic-ai[logfire,openai]; extra == "ai-client"
 Requires-Dist: ollama; extra == "ai-client"
@@ -97,12 +101,14 @@ Requires-Dist: cachetools; extra == "caching"
 Provides-Extra: pdf
 Requires-Dist: pymupdf; extra == "pdf"
 Requires-Dist: pydantic; extra == "pdf"
+Requires-Dist: pydantic-extra-types; extra == "pdf"
 Requires-Dist: pymupdf4llm; extra == "pdf"
 Provides-Extra: debug
 Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "debug"
 Provides-Extra: sets
 Requires-Dist: pydantic-settings; extra == "sets"
 Requires-Dist: pydantic; extra == "sets"
+Requires-Dist: pydantic-extra-types; extra == "sets"
 Requires-Dist: yamlscript; extra == "sets"
 Requires-Dist: pyyaml; extra == "sets"
 Provides-Extra: path-app
@@ -136,64 +142,65 @@ Provides-Extra: db-document
 Requires-Dist: beanie[odm]; extra == "db-document"
 Requires-Dist: motor; extra == "db-document"
 Provides-Extra: all
-Requires-Dist: sre_yield; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
-Requires-Dist: peft; extra == "all"
-Requires-Dist: playwright; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: pydantic; extra == "all"
+Requires-Dist: torchaudio; extra == "all"
+Requires-Dist: google-auth; extra == "all"
+Requires-Dist: ollama; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: setuptools; extra == "all"
 Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
+Requires-Dist: flet-video; extra == "all"
+Requires-Dist: motor; extra == "all"
 Requires-Dist: httpx; extra == "all"
-Requires-Dist: beanie[odm]; extra == "all"
-Requires-Dist: openai; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: Unidecode; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
+Requires-Dist: appdirs; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: playwright; extra == "all"
 Requires-Dist: cachetools; extra == "all"
-Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: json_repair; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: ollama; extra == "all"
-Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: logfire; extra == "all"
 Requires-Dist: faker; extra == "all"
-Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: bokeh; extra == "all"
-Requires-Dist: distributed; extra == "all"
-Requires-Dist: semver; extra == "all"
-Requires-Dist: appdirs; extra == "all"
+Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: pydantic-extra-types; extra == "all"
 Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: tabulate; extra == "all"
 Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: torchvision; extra == "all"
+Requires-Dist: peft; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: openpyxl; extra == "all"
+Requires-Dist: google-auth-httplib2; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
 Requires-Dist: diskcache; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: docker; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: semver; extra == "all"
 Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: setuptools; extra == "all"
+Requires-Dist: uvicorn[standard]; extra == "all"
 Requires-Dist: html2text; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
+Requires-Dist: pydantic-settings; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
 Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: beanie[odm]; extra == "all"
+Requires-Dist: pymupdf; extra == "all"
+Requires-Dist: contexttimer; extra == "all"
 Requires-Dist: sentence_transformers; extra == "all"
-Requires-Dist: motor; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: docker; extra == "all"
-Requires-Dist: logfire; extra == "all"
-Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: tabulate; extra == "all"
+Requires-Dist: bokeh; extra == "all"
 Requires-Dist: regex; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
 Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: torchaudio; extra == "all"
-Requires-Dist: torchvision; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
-Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: logfire[fastapi]; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: google-auth; extra == "all"
-Requires-Dist: flet-video; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: pandas; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.44 → fmtr_tools-1.3.46}/fmtr.tools.egg-info/requires.txt

@@ -5,79 +5,83 @@ transformers[sentencepiece]
 torchvision
 torchaudio
 pydantic
+pydantic-extra-types
 
 [ai.client]
 logfire
 pydantic
+pydantic-extra-types
 openai
 pydantic-ai[logfire,openai]
 ollama
 
 [all]
-sre_yield
-yamlscript
-pyyaml
-flet-webview
-peft
-playwright
-httpx_retries
-pydantic
+torchaudio
+google-auth
+ollama
+pydevd-pycharm~=251.25410.159
+setuptools
 flet[all]
+dnspython[doh]
+flet-video
+motor
 httpx
-beanie[odm]
-openai
+pydantic
+Unidecode
+huggingface_hub
+pymupdf4llm
+appdirs
+distributed
+playwright
 cachetools
-pymupdf
-fastapi
-json_repair
-deepmerge
-ollama
-pydantic-settings
+openai
+logfire
 faker
-uvicorn[standard]
-bokeh
-distributed
-semver
-appdirs
+logfire[fastapi]
+google-auth-oauthlib
+pydantic-extra-types
 pydantic-ai[logfire,openai]
+deepmerge
+tabulate
 dask[bag]
+torchvision
+peft
+json_repair
+openpyxl
+google-auth-httplib2
+tokenizers
+flet-webview
 diskcache
+fastapi
+docker
+pyyaml
+google-api-python-client
+pytest-cov
+semver
 tinynetrc
-tokenizers
-setuptools
+uvicorn[standard]
 html2text
+sre_yield
+pydantic-settings
+filetype
+pandas
+httpx_retries
 transformers[sentencepiece]
-pydevd-pycharm~=251.25410.159
+beanie[odm]
+pymupdf
+contexttimer
 sentence_transformers
-motor
-pytest-cov
-docker
-logfire
-openpyxl
-tabulate
+bokeh
 regex
-google-api-python-client
+yamlscript
 logfire[httpx]
-torchaudio
-torchvision
-google-auth-oauthlib
-google-auth-httplib2
-filetype
-huggingface_hub
-logfire[fastapi]
-pymupdf4llm
-contexttimer
-Unidecode
-google-auth
-flet-video
-dnspython[doh]
-pandas
 
 [api]
 fastapi
 uvicorn[standard]
 logfire
 pydantic
+pydantic-extra-types
 logfire[fastapi]
 
 [augmentation]
@@ -102,6 +106,7 @@ pydevd-pycharm~=251.25410.159
 
 [dm]
 pydantic
+pydantic-extra-types
 
 [dns]
 dnspython[doh]
@@ -173,6 +178,7 @@ regex
 [pdf]
 pymupdf
 pydantic
+pydantic-extra-types
 pymupdf4llm
 
 [process]
@@ -190,6 +196,7 @@ openpyxl
 [sets]
 pydantic-settings
 pydantic
+pydantic-extra-types
 yamlscript
 pyyaml
 

{fmtr_tools-1.3.44 → fmtr_tools-1.3.46}/setup.py

@@ -20,7 +20,7 @@ DEPENDENCIES = {
     'merging': ['deepmerge'],
     'api': ['fastapi', 'uvicorn[standard]', 'logging', 'dm', 'logfire[fastapi]'],
     'ai': ['peft', 'transformers[sentencepiece]', 'torchvision', 'torchaudio', 'dm'],
-    'dm': ['pydantic'],
+    'dm': ['pydantic', 'pydantic-extra-types'],
     'openai.api': ['openai'],
     'ai.client': ['logging', 'dm', 'openai.api', 'pydantic-ai[logfire,openai]', 'ollama'],
     'json-fix': ['json_repair'],

fmtr_tools-1.3.44/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.44