fmtr.tools 1.3.34__tar.gz → 1.3.35__tar.gz

{fmtr_tools-1.3.34 → fmtr_tools-1.3.35}/PKG-INFO

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

{fmtr_tools-1.3.34 → fmtr_tools-1.3.35}/fmtr/tools/function_tools.py

@@ -47,7 +47,7 @@ class MethodDecorator:
     def __init__(self):
         """
 
-        Initialise with decorator arguments
+        Initialise the decorator itself with any arguments
 
         """
         self.func = None
@@ -55,28 +55,17 @@ class MethodDecorator:
     def __call__(self, func: Callable) -> Self:
         """
 
-        If called, arguments were provided, so return the object with those applied.
+        Add the (unbound) method.
 
         """
         self.func = func
         functools.update_wrapper(self, func)
         return self
 
-    def get_context(self, instance):
-        """
-
-        If the instance has a context attribute, use that - otherwise use a null context.
-
-        """
-        context = getattr(instance, self.CONTEXT_KEY, None)
-        if context:
-            return context
-        return context_tools.null()
-
     def __get__(self, instance, owner):
         """
 
-        Wrap at runtime, call start/stop within context.
+        Wrap bound method at runtime, call start/stop within context.
 
         """
         if instance is None:  # Class method called.
@@ -85,9 +74,9 @@ class MethodDecorator:
         if inspect.iscoroutinefunction(self.func):
             async def async_wrapper(*args, **kwargs):
                 with self.get_context(instance):
-                    self.start(instance)
+                    self.start(instance, *args, **kwargs)
                     result = await self.func(instance, *args, **kwargs)
-                    self.stop(instance)
+                    self.stop(instance, *args, **kwargs)
                     return result
 
             return async_wrapper
@@ -95,15 +84,26 @@ class MethodDecorator:
         else:
             def sync_wrapper(*args, **kwargs):
                 with self.get_context(instance):
-                    self.start(instance)
+                    self.start(instance, *args, **kwargs)
                     result = self.func(instance, *args, **kwargs)
-                    self.stop(instance)
+                    self.stop(instance, *args, **kwargs)
                     return result
 
             return sync_wrapper
 
-    def start(self, instance):
+    def get_context(self, instance):
+        """
+
+        If the instance has a context attribute, use that - otherwise use a null context.
+
+        """
+        context = getattr(instance, self.CONTEXT_KEY, None)
+        if context:
+            return context
+        return context_tools.null()
+
+    def start(self, instance, *args, **kwargs):
         pass
 
-    def stop(self, instance):
+    def stop(self, instance, *args, **kwargs):
         pass

fmtr_tools-1.3.35/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.35

{fmtr_tools-1.3.34 → fmtr_tools-1.3.35}/fmtr.tools.egg-info/PKG-INFO

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

fmtr_tools-1.3.34/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.34

{fmtr_tools-1.3.34 → fmtr_tools-1.3.35}/fmtr.tools.egg-info/requires.txt

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