fmtr.tools 1.1.25__tar.gz → 1.1.27__tar.gz

{fmtr_tools-1.1.25 → fmtr_tools-1.1.27}/PKG-INFO

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

{fmtr_tools-1.1.25 → fmtr_tools-1.1.27}/fmtr/tools/__init__.py

@@ -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.27/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.25 → fmtr_tools-1.1.27}/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.25 → fmtr_tools-1.1.27}/fmtr/tools/setup_tools/setup_tools.py

@@ -144,7 +144,7 @@ class Setup(FromCallerMixin):
     @property
     def name(self):
         if self.paths.is_namespace:
-            return f'{self.paths.org}.{self.paths.name}'
+            return f'{self.paths.org_name}.{self.paths.name}'
         return self.paths.name
 
     @property
@@ -199,7 +199,7 @@ class Setup(FromCallerMixin):
 
     @property
     def url(self):
-        return f'https://github.com/{self.paths.org}/{self.paths.name}'
+        return f'https://github.com/{self.org}/{self.paths.name}'
 
     @property
     def data(self):

fmtr_tools-1.1.27/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.27

{fmtr_tools-1.1.25 → fmtr_tools-1.1.27}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.1.25 → fmtr_tools-1.1.27}/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.25/fmtr/tools/version

@@ -1 +0,0 @@
-1.1.25

{fmtr_tools-1.1.25 → fmtr_tools-1.1.27}/fmtr.tools.egg-info/requires.txt

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