fmtr.tools 1.1.24__tar.gz → 1.1.26__tar.gz

{fmtr_tools-1.1.24 → fmtr_tools-1.1.26}/PKG-INFO

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

{fmtr_tools-1.1.24 → fmtr_tools-1.1.26}/fmtr/tools/__init__.py

@@ -31,7 +31,7 @@ from fmtr.tools.path_tools import Path, PackagePaths, AppPaths
 from fmtr.tools import ai_tools as ai
 
 import fmtr.tools.setup_tools as setup
-from fmtr.tools.setup_tools import Setup, SetupPaths, Dependencies
+from fmtr.tools.setup_tools import Setup, SetupPaths, Dependencies, Tools
 
 try:
     from fmtr.tools import augmentation_tools as augmentation
@@ -176,3 +176,9 @@ try:
     from fmtr.tools import dns_tools as dns
 except ImportError as exception:
     dns = MissingExtraMockModule('dns', exception)
+
+try:
+    from fmtr.tools import http_tools as http
+    from fmtr.tools.http_tools import Client
+except ImportError as exception:
+    http = Client = MissingExtraMockModule('http', exception)

fmtr_tools-1.1.26/fmtr/tools/http_tools.py

@@ -0,0 +1,26 @@
+import httpx
+from httpx_retries import RetryTransport
+
+from fmtr.tools import logging_tools
+
+logging_tools.logger.instrument_httpx()
+
+
+class Client(httpx.Client):
+    """
+
+    Instrumented client base
+
+    """
+
+    TRANSPORT = RetryTransport()
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, transport=self.TRANSPORT, **kwargs)
+
+
+client = Client()
+
+if __name__ == '__main__':
+    resp = client.get('http://httpbin.org/delay/10')
+    resp

{fmtr_tools-1.1.24 → fmtr_tools-1.1.26}/fmtr/tools/pattern_tools.py

@@ -1,8 +1,9 @@
-import regex as re
 from dataclasses import dataclass
 from functools import cached_property
 from typing import List
 
+import regex as re
+
 from fmtr.tools.logging_tools import logger
 
 
@@ -15,7 +16,7 @@ class RewriteCircularLoopError(Exception):
 
 
 @dataclass
-class Rule:
+class Rewrite:
     """
     Represents a single rule for pattern matching and target string replacement.
 
@@ -66,7 +67,7 @@ class Rewriter:
     recursive rewriting until a stable state is reached.
 
     """
-    rules: List[Rule]
+    rules: List[Rewrite]
 
     @cached_property
     def pattern(self):
@@ -106,7 +107,7 @@ class Rewriter:
 
         """
 
-        match = self.rx.match(source)
+        match = self.rx.fullmatch(source)
 
         if not match:
             return source
@@ -163,75 +164,9 @@ class Rewriter:
 
     @classmethod
     def from_data(cls, data):
-        rules = [Rule(*pair) for pair in data.items()]
+        rules = [Rewrite(*pair) for pair in data.items()]
         self = cls(rules=rules)
         return self
 
 
-if __name__ == '__main__':
-    data = {
-
-        r'(?P<name>[a-z]+)\.dev\.example\.com': '{name}.test.example.com',
-        r'img\d+\.static\.cdn\.example\.com': 'images.cdn.example.com',
-        r'service\.(?P<env>dev|staging|prod)\.example\.org': '{env}-service.example.org',
-        r'legacy\.(?P<region>[a-z]+)\.oldsite\.com': '{region}.newsitenow.com',
-        r'shop\.(?P<country_code>[a-z]{2})\.example\.net': 'store.{country_code}.example.net',
-        r'(?P<user>[a-z]+)\.mail\.example\.com': '{user}.email.example.com',
-        r'app1\.cluster(?P<num>[0-9]+)\.example\.cloud': 'service{num}.example.cloud',
-        r'(?P<project>[a-z]+)\.research\.corp\.com': '{project}.lab.corp.com',
-        r'cdn\.(?P<version>v[0-9]+)\.content\.net': 'static.{version}.content.net',
-        # Literal rule without named group
-        r'corp\.secureaccess\.com': 'access.corp.com',
-        # Literal rule without named group
-        r'redirect\.oldsite\.org': 'homepage.newsite.org',
-        # # Recursive rules
-
-        r'archive\.(?P<year>\d{4})\.oldsite\.net': 'legacy.{year}.oldsite.net',  # Recursive matching
-        r'legacy\.(?P<year>\d{4})\.oldsite\.net': 'archive-backup.{year}.net',  # Continuation
-
-        # r'(?P<subd>[a-zA-Z]+)\.vpn': '{subd}.loop.ts.net',
-        # r'(?P<subd>[a-zA-Z]+)\.loop\.ts\.net': '{subd}.vpn',  # Recursive loop back to .vpn
-    }
-
-    rewriter = Rewriter.from_data(data)
-
-    tests = [
-        "sales.vpn",
-        "marketing.dev.example.com",
-        "img01.static.cdn.example.com",
-        "service.dev.example.org",
-        "legacy.eu.oldsite.com",
-        "shop.us.example.net",
-        "alice.mail.example.com",
-        "app1.cluster1.example.cloud",
-        "genetics.research.corp.com",
-        "cdn.v2.content.net",
-        "corp.secureaccess.com",
-        "redirect.oldsite.org",
-        "support.bbb.ts.net",
-        "support.ccc.ts.net",
-        "archive.2022.oldsite.net",
-        "legacy.2022.oldsite.net",
-        "finance.vpn",
-        "engineering.dev.example.com",
-        "img02.static.cdn.example.com",
-        "service.staging.example.org",
-        "legacy.apac.oldsite.com",
-        "shop.uk.example.net",
-        "bob.mail.example.com",
-        "app1.cluster2.example.cloud",
-        "astrophysics.research.corp.com",
-        "cdn.v3.content.net",
-        "archive.2021.oldsite.net",
-        "legacy.2021.oldsite.net",
-        "quality.bbb.ts.net",
-        "quality.ccc.ts.net"
-    ]
-
-    logger.warning('hello?')
-    for test in tests:
-        print(test)
-        text = rewriter.rewrite(test)
-        text
-
-    tests
+

{fmtr_tools-1.1.24 → fmtr_tools-1.1.26}/fmtr/tools/setup_tools/__init__.py

@@ -1,6 +1,6 @@
 from fmtr.tools.import_tools import MissingExtraMockModule
 
-from fmtr.tools.setup_tools.setup_tools import Setup, SetupPaths, Dependencies
+from fmtr.tools.setup_tools.setup_tools import Setup, SetupPaths, Dependencies, Tools
 
 try:
     from setuptools import find_namespace_packages, find_packages, setup as setup_setuptools

{fmtr_tools-1.1.24 → fmtr_tools-1.1.26}/fmtr/tools/setup_tools/setup_tools.py

@@ -21,7 +21,6 @@ class SetupPaths(FromCallerMixin):
         """
 
         Use calling module path as default path, if not otherwise specified.
-        :param org:
 
         """
         if not path:
@@ -30,8 +29,6 @@ class SetupPaths(FromCallerMixin):
         self.org_name = org
         self.repo = Path(path)
 
-
-
     @property
     def readme(self):
         return self.repo / 'README.md'
@@ -43,12 +40,14 @@ class SetupPaths(FromCallerMixin):
     @cached_property
     def path(self):
 
+        from fmtr.tools import setup
+
         if self.org:
             base = self.org
         else:
             base = self.repo
 
-        directories = [base / dir for dir in self.find(base)]
+        directories = [base / dir for dir in setup.find_packages(base)]
 
         if len(directories) != 1:
             dirs_str = ', '.join([str(dir) for dir in directories])
@@ -74,11 +73,6 @@ class SetupPaths(FromCallerMixin):
     def name(self) -> str:
         return self.path.stem
 
-    @property
-    def find(self):
-        from fmtr.tools import setup
-        return setup.find_packages
-
 
 class Setup(FromCallerMixin):
     AUTHOR = 'Frontmatter'
@@ -209,7 +203,7 @@ class Setup(FromCallerMixin):
 
     @property
     def data(self):
-        return dict(
+        data = dict(
             name=self.name,
             version=self.version,
             author=self.author,
@@ -225,6 +219,7 @@ class Setup(FromCallerMixin):
             install_requires=self.dependencies.install,
             extras_require=self.dependencies.extras,
         ) | self.kwargs
+        return data
 
     def setup(self):
 
@@ -233,6 +228,16 @@ class Setup(FromCallerMixin):
         return setup.setup_setuptools(**self.data)
 
 
+class Tools:
+    MASK = f'{Constants.LIBRARY_NAME}[{{extras}}]'
+
+    def __init__(self, *extras):
+        self.extras = extras
+
+    def __str__(self):
+        extras_str = ','.join(self.extras)
+        return self.MASK.format(extras=extras_str)
+
 
 
 class Dependencies:
@@ -254,7 +259,7 @@ class Dependencies:
         for value in values:
             if value == key or value not in self.dependencies:
                 # Add the value directly if it references itself or is not a dependency key.
-                values_resolved.append(value)
+                values_resolved.append(str(value))
             else:
                 # Recurse into nested dependencies.
                 values_resolved += self.resolve_values(value)

fmtr_tools-1.1.26/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.26

{fmtr_tools-1.1.24 → fmtr_tools-1.1.26}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.1.24 → fmtr_tools-1.1.26}/fmtr.tools.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ setup.py
 ./fmtr/tools/hash_tools.py
 ./fmtr/tools/hfh_tools.py
 ./fmtr/tools/html_tools.py
+./fmtr/tools/http_tools.py
 ./fmtr/tools/import_tools.py
 ./fmtr/tools/inspection_tools.py
 ./fmtr/tools/interface_tools.py

fmtr_tools-1.1.24/fmtr/tools/version

@@ -1 +0,0 @@
-1.1.24

{fmtr_tools-1.1.24 → fmtr_tools-1.1.26}/fmtr.tools.egg-info/requires.txt

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