fmtr.tools 1.1.24__py3-none-any.whl → 1.1.26__py3-none-any.whl

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/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/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/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/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/version

@@ -1 +1 @@
-1.1.24
+1.1.26

{fmtr_tools-1.1.24.dist-info → fmtr_tools-1.1.26.dist-info}/METADATA

@@ -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.dist-info → fmtr_tools-1.1.26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fmtr/tools/__init__.py,sha256=PeQKmb9q7xTaiDGy7TUa_5V2lh8k0rV0BJgjwf37udI,5571
+fmtr/tools/__init__.py,sha256=yXBnDJFPfv6qj4_KuLpMXoDZ92aiEzugLs0vcM31D5k,5770
 fmtr/tools/api_tools.py,sha256=w8Zrp_EwN5KlUghwLoTCXo4z1irg5tAsReCqDLjASfE,2133
 fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
@@ -17,6 +17,7 @@ fmtr/tools/google_api_tools.py,sha256=owWE0GlnJjmVbXus8ENxT2PH7Fnd3m_r-14xyR7lAn
 fmtr/tools/hash_tools.py,sha256=tr4HXpeT6rRrDk6TvMlRPUSrLRRaov96y128OI2tzsc,729
 fmtr/tools/hfh_tools.py,sha256=DCDIWuWlhtmIGCtp9cLcOTTEw_4yN_NocLX8w5NZsbk,2384
 fmtr/tools/html_tools.py,sha256=0nN8Nz5HtG9bXyApYfHSKEivLlxjsm3Gn6Mg2TK0brI,394
+fmtr/tools/http_tools.py,sha256=RVwGrBNMyjfbpgAPCSnxEkXfSzXXWARb3ayq981ONQE,464
 fmtr/tools/import_tools.py,sha256=XJmiWLukRncJAcaGReDn4jIz1_IpVBjfYCQHH1hIg7c,588
 fmtr/tools/inspection_tools.py,sha256=tLTRvzy9XVomQPi0dfnF_cgwc7KiDVZAr7gPTk4S_bQ,278
 fmtr/tools/interface_tools.py,sha256=JVYUV7wuMr24BORuUtNaBlTeBFt8VDGJ3HPRajd7Y_4,1341
@@ -31,7 +32,7 @@ fmtr/tools/netrc_tools.py,sha256=PpNpz_mWlQi6VHGromKwFfTyLpHUXsd4LY6-OKLCbeI,376
 fmtr/tools/openai_tools.py,sha256=6SUgejgzUzmlKKct2_ePXntvMegu3FJgfk9x7aqtqYc,742
 fmtr/tools/packaging_tools.py,sha256=FlgOTnDRHZWQL2iR-wucTsyGEHRE-MlddKL30MPmUqE,253
 fmtr/tools/parallel_tools.py,sha256=QEb_gN1StkxsqYaH4HSjiJX8Y3gpb2uKNsOzG4uFpaM,3071
-fmtr/tools/pattern_tools.py,sha256=of-a26bRf-DgbzI0xJWSNkAONZozYylE_9E1hmpp6mw,6793
+fmtr/tools/pattern_tools.py,sha256=Tv67jftyfjp04QlRMD4pwS1IV_SIXCtDTD_uIlMZiSM,4229
 fmtr/tools/pdf_tools.py,sha256=xvv9B84uAF81rFJRnXhSsxYuP42vY9ZdPVFrSMVe8G8,4069
 fmtr/tools/platform_tools.py,sha256=7p69CmAHe_sF68Fx9uVhns1k5EewTHTWgUYzkl6ZQKA,308
 fmtr/tools/process_tools.py,sha256=Ysh5Dk2QFBhXQerArjKdt7xZd3JrN5Ho02AaOjH0Nnw,1425
@@ -45,7 +46,7 @@ fmtr/tools/tabular_tools.py,sha256=tpIpZzYku1HcJrHZJL6BC39LmN3WUWVhFbK2N7nDVmE,1
 fmtr/tools/tokenization_tools.py,sha256=me-IBzSLyNYejLybwjO9CNB6Mj2NYfKPaOVThXyaGNg,4268
 fmtr/tools/tools.py,sha256=CAsApa1YwVdNE6H66Vjivs_mXYvOas3rh7fPELAnTpk,795
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=fMaLB6rmZIaUWwd3AaKbbqQ2mgl-suriSc_QCo-bRSk,6
+fmtr/tools/version,sha256=qdONjQrKG26HBKWvtcv7oRITgNwT9_551G27tbp2pgI,6
 fmtr/tools/version_tools.py,sha256=yNs_CGqWpqE4jbK9wsPIi14peJVXYbhIcMqHAFOw3yE,1480
 fmtr/tools/yaml_tools.py,sha256=9kuYChqJelWQIjGlSnK4iDdOWWH06P0gp9jIcRrC3UI,1903
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
@@ -55,8 +56,8 @@ fmtr/tools/path_tools/__init__.py,sha256=v5CpmzXq5Ii90FtcmxAJKiLxmguZMrPnQ_HdT87
 fmtr/tools/path_tools/app_path_tools.py,sha256=JrJvtTDd_gkCKcZtBCDTMktsM77PZwGV_hzQX0g5GU8,1722
 fmtr/tools/path_tools/path_tools.py,sha256=8WBzNctpds5tVT1-FcizAORrBCGlkUbPcfOel-Js7ps,7878
 fmtr/tools/path_tools/type_path_tools.py,sha256=Zgs-ek-GXRKDIlVDGdg3muB0PIxTg2ba0NeHw6y8FWQ,40
-fmtr/tools/setup_tools/__init__.py,sha256=8HX-GvGxeCK3nIHH5PHkvhkH0MIt89AK8a5l6Vua2dQ,379
-fmtr/tools/setup_tools/setup_tools.py,sha256=bwx0fkmPqZz9j8kyqEjKM9xdr54_SoeR45OODuFXUl4,7613
+fmtr/tools/setup_tools/__init__.py,sha256=fUCjzyE4JBPEOZhC4B--VPj_eOCkQb1QG5PIgiGj03U,386
+fmtr/tools/setup_tools/setup_tools.py,sha256=A70uc80HrfvTh41LOizC14jQEY6N-ol4O-PkxYIJNBQ,7803
 fmtr/tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/tests/conftest.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/tests/helpers.py,sha256=N5sf9YoZV93a7tf_UxpLeyQ9vp6Ec0teNIimFDvc054,1091
@@ -65,9 +66,9 @@ fmtr/tools/tests/test_environment.py,sha256=iHaiMQfECYZPkPKwfuIZV9uHuWe3aE-p_dN_
 fmtr/tools/tests/test_json.py,sha256=IeSP4ziPvRcmS8kq7k9tHonC9rN5YYq9GSNT2ul6Msk,287
 fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g,2188
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
-fmtr_tools-1.1.24.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.1.24.dist-info/METADATA,sha256=NGiex3myYBSC4501v0wDzpfy-ueqwqf8-MZim1ZOXKM,15735
-fmtr_tools-1.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.1.24.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
-fmtr_tools-1.1.24.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.1.24.dist-info/RECORD,,
+fmtr_tools-1.1.26.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.1.26.dist-info/METADATA,sha256=FtJBsmBvoK7KrRHHybQWVULi5JeFwzjcz0H5QxlqF8Q,15735
+fmtr_tools-1.1.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.1.26.dist-info/entry_points.txt,sha256=e-eOW1Ml13tbxHC6Er1MnVOEDePeWw7DKwlE-l-gCY0,205
+fmtr_tools-1.1.26.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.1.26.dist-info/RECORD,,