fmtr.tools 1.3.74__tar.gz → 1.3.76__tar.gz

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/PKG-INFO

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

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/fmtr/tools/constants.py

@@ -46,7 +46,10 @@ class Constants:
     FILENAME_VERSION = 'version'
     DIR_NAME_HF = 'hf'
 
-    ENTRYPOINTS_DIR = 'entrypoints'
+    ENTRYPOINT = 'entrypoint'
+    ENTRYPOINTS_DIR = f'{ENTRYPOINT}s'
+    ENTRYPOINT_FILE = f'{ENTRYPOINT}.py'
+
     PACKAGE_EXCLUDE_DIRS = {'data', 'build', 'dist', '.*', '*egg-info*'}
     INIT_FILENAME = '__init__.py'
 

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/fmtr/tools/data_modelling_tools.py

@@ -182,8 +182,38 @@ class MixinFromJson:
         return self
 
 
+class CliRunMixin:
+    """
+
+    Mixin only so that it can also be used with Pydantic Settings.
+
+    TODO Ideally, the run method would be defined on dm.Base and the settings base would just inherit like set.Base(BaseSettings, dm.Base), but this isn't yet tested/could break Fields.
+
+    """
+
+    def run(self):
+        """
+
+        Behaviour when run as a CLI command, i.e. via Pydantic Settings. Run any subcommands then exit.
+
+        """
+
+        from pydantic_settings import get_subcommand
+
+        command = get_subcommand(self, is_required=False, cli_exit_on_error=False)
+
+        if not command:
+            return
+
+        result = command.run()
+        if inspect.isawaitable(result):
+            import asyncio
+            result = asyncio.run(result)
+
+        raise SystemExit(result)
+
 
-class Base(BaseModel, MixinFromJson):
+class Base(BaseModel, MixinFromJson, CliRunMixin):
     """
 
     Base model allowing model definition via a list of custom Field objects.

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/fmtr/tools/database_tools/document.py

@@ -3,7 +3,7 @@ from typing import List
 
 import beanie
 from beanie.odm import actions
-from motor.motor_asyncio import AsyncIOMotorClient
+from pymongo import AsyncMongoClient
 
 from fmtr.tools import data_modelling_tools
 from fmtr.tools.constants import Constants
@@ -34,7 +34,7 @@ class Client:
         self.port = port
         self.documents = documents
 
-        self.client = AsyncIOMotorClient(self.uri, tz_aware=True)
+        self.client = AsyncMongoClient(self.uri, tz_aware=True)
         self.db = self.client[self.name]
 
     @cached_property

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/fmtr/tools/interface_tools/interface_tools.py

@@ -31,14 +31,6 @@ class progress(update):
 
     """
 
-    def get_context(self, instance):
-        """
-
-        Use instance-defined context.
-
-        """
-        return instance.context
-
     def start(self, instance, *args, **kwargs):
         """
 

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/fmtr/tools/settings_tools.py

@@ -1,6 +1,8 @@
-from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, YamlConfigSettingsSource, EnvSettingsSource, CliSettingsSource
 from typing import ClassVar, Any
 
+from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, YamlConfigSettingsSource, EnvSettingsSource, CliSettingsSource
+
+from fmtr.tools.data_modelling_tools import CliRunMixin
 from fmtr.tools.path_tools import PackagePaths, Path
 
 
@@ -21,7 +23,7 @@ class YamlScriptConfigSettingsSource(YamlConfigSettingsSource):
         return data
 
 
-class Base(BaseSettings):
+class Base(BaseSettings, CliRunMixin):
     """
 
     Base class for settings configuration using Pydantic BaseSettings.

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/fmtr/tools/setup_tools/setup_tools.py

@@ -88,6 +88,15 @@ class SetupPaths(FromCallerMixin):
             return False
         return org
 
+    @property
+    def entrypoint(self) -> Path:
+        """
+
+        Path of base entrypoint module.
+
+        """
+        return self.path / Constants.ENTRYPOINT_FILE
+
     @property
     def entrypoints(self) -> Path:
         """
@@ -182,23 +191,38 @@ class Setup(FromCallerMixin):
     def console_scripts(self) -> List[str]:
         """
 
-        Generate console scripts for any modules in the `entrypoints` sub-package.
+        Generate console scripts for the `entrypoint` module - and/or any modules in `entrypoints` sub-package.
 
         """
 
         if not self.paths.entrypoints.exists():
-            return []
+            paths_mods = []
+        else:
+            paths_mods = list(self.paths.entrypoints.iterdir())
 
-        names_mods = [path.stem for path in self.paths.entrypoints.iterdir() if path.is_file() and path.name != Constants.INIT_FILENAME]
-        command_prefix = self.name.replace('.', self.ENTRYPOINT_COMMAND_SEP)
+        names_mods = [path.stem for path in paths_mods if path.is_file() and path.name != Constants.INIT_FILENAME]
         command_suffixes = [name_mod.replace(self.ENTRYPOINT_FUNCTION_SEP, self.ENTRYPOINT_COMMAND_SEP) for name_mod in names_mods]
-        commands = [f'{command_prefix}-{command_suffix}' for command_suffix in command_suffixes]
+        commands = [f'{self.name_command}-{command_suffix}' for command_suffix in command_suffixes]
         paths = [f'{self.name}.{Constants.ENTRYPOINTS_DIR}.{name_mod}:{self.ENTRYPOINT_FUNC_NAME}' for name_mod in names_mods]
 
+        if self.paths.entrypoint.exists():
+            commands.append(self.name_command)
+            path = f'{self.name}.{self.paths.entrypoint.stem}:{self.ENTRYPOINT_FUNC_NAME}'
+            paths.append(path)
+
         console_scripts = [f'{command} = {path}' for command, path in zip(commands, paths)]
 
         return console_scripts
 
+    @cached_property
+    def name_command(self) -> str:
+        """
+
+        Name as a command, e.g. `fmtr-tools`
+
+        """
+        return self.name.replace('.', self.ENTRYPOINT_COMMAND_SEP)
+
     @property
     def name(self) -> str:
         """

fmtr_tools-1.3.76/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.76

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/fmtr.tools.egg-info/requires.txt

@@ -18,68 +18,67 @@ pydantic-ai[logfire,openai]
 ollama
 
 [all]
-tinynetrc
-cachetools
-appdirs
 json_repair
+distributed
+pyyaml
+Unidecode
+ollama
 openai
+pymupdf
 logfire[httpx]
+sentence_transformers
 setuptools
-pydantic-settings
-pydantic
-pyyaml
-logfire[fastapi]
-odfpy
-httpx_retries
-pydantic-extra-types
-python-on-whales
-peft
-logfire
-uvicorn[standard]
-flet-video
-diskcache
-pymupdf4llm
-pydantic-ai[logfire,openai]
-html2text
-pandas
-filetype
 contexttimer
-flet-webview
-distributed
-fastapi
-ollama
-motor
-pymupdf
-google-api-python-client
-regex
+sre_yield
+huggingface_hub
+logfire
 torchaudio
+playwright
 torchvision
-pydevd-pycharm~=251.25410.159
-beanie[odm]
-faker
-huggingface_hub
+deepdiff
 tabulate
-semver
-openpyxl
-google-auth
-playwright
-transformers[sentencepiece]
-Unidecode
+pydantic-extra-types
 pycountry
-deepmerge
 dask[bag]
-sre_yield
+html2text
+appdirs
+logfire[fastapi]
+openpyxl
+httpx_retries
+dnspython[doh]
+pymupdf4llm
+uvicorn[standard]
+google-api-python-client
+google-auth-httplib2
+bokeh
+beanie[odm]
 flet[all]
 google-auth-oauthlib
+filetype
+deepmerge
+tinynetrc
+fastapi
+tokenizers
+pydantic-ai[logfire,openai]
+odfpy
 pytest-cov
-dnspython[doh]
+python-on-whales
+pydevd-pycharm~=251.25410.159
+google-auth
 httpx
-sentence_transformers
+semver
+flet-video
+flet-webview
 yamlscript
-tokenizers
-google-auth-httplib2
-deepdiff
-bokeh
+cachetools
+diskcache
+pandas
+regex
+faker
+pydantic
+peft
+pydantic-settings
+transformers[sentencepiece]
 
 [api]
 fastapi
@@ -105,7 +104,6 @@ cachetools
 
 [db.document]
 beanie[odm]
-motor
 
 [debug]
 pydevd-pycharm~=251.25410.159
@@ -121,7 +119,6 @@ pycountry
 yamlscript
 pyyaml
 beanie[odm]
-motor
 
 [dm]
 pydantic

{fmtr_tools-1.3.74 → fmtr_tools-1.3.76}/setup.py

@@ -45,7 +45,7 @@ DEPENDENCIES = {
     'webhook': ['http'],
     'browsers': ['playwright'],
     'db': [],
-    'db.document': ['beanie[odm]', 'motor'],
+    'db.document': ['beanie[odm]'],
 
 }
 

fmtr_tools-1.3.74/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.74