fmtr.tools 1.1.15__tar.gz → 1.1.17__tar.gz

{fmtr_tools-1.1.15 → fmtr_tools-1.1.17}/PKG-INFO

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

{fmtr_tools-1.1.15 → fmtr_tools-1.1.17}/fmtr/tools/__init__.py

@@ -163,4 +163,19 @@ except ImportError as exception:
 try:
     from fmtr.tools import settings_tools as sets
 except ImportError as exception:
-    sets = MissingExtraMockModule('sets', exception)
+    sets = MissingExtraMockModule('sets', exception)
+
+try:
+    from fmtr.tools import pattern_tools as patterns
+except ImportError as exception:
+    patterns = MissingExtraMockModule('patterns', exception)
+
+try:
+    from fmtr.tools import dns_tools as dns
+except ImportError as exception:
+    dns = MissingExtraMockModule('dns', exception)
+
+try:
+    from fmtr.tools import setup_tools as setup
+except ImportError as exception:
+    setup = MissingExtraMockModule('setup', exception)

fmtr_tools-1.1.17/fmtr/tools/dns_tools.py

@@ -0,0 +1,57 @@
+import dns
+import httpx
+import socket
+from dns.message import Message, QueryMessage
+
+
+class Server:
+
+    def __init__(self, host, port):
+        self.host = host
+        self.port = port
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+
+    def resolve(self, message: Message) -> QueryMessage:
+        raise NotImplemented
+
+    def start(self):
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.bind((self.host, self.port))
+        print(f"Listening on {self.host}:{self.port}")
+        while True:
+            data, addr = sock.recvfrom(512)
+            question = dns.message.from_wire(data)
+            answer = self.resolve(question)
+            sock.sendto(answer.to_wire(), addr)
+
+
+class Proxy(Server):
+    url = "https://cloudflare-dns.com/dns-query"
+    headers = {"accept": "application/dns-json"}
+
+    def resolve(self, question: Message) -> Message:
+        qname = question.question[0].name.to_text()
+        qtype = dns.rdatatype.to_text(question.question[0].rdtype)
+        params = {"name": qname, "type": qtype}
+
+        response = httpx.get(self.url, headers=self.headers, params=params)
+        response.raise_for_status()
+
+        answer = dns.message.make_response(question)
+        answer.flags |= dns.flags.RA
+
+        data = response.json()
+        for answer_rr in data.get("Answer", []):
+            name = dns.name.from_text(answer_rr["name"])
+            rtype = answer_rr["type"]
+            ttl = answer_rr["TTL"]
+            rdata = dns.rdata.from_text(dns.rdataclass.IN, rtype, answer_rr["data"])
+            rrset = dns.rrset.from_rdata(name, ttl, rdata)
+            answer.answer.append(rrset)
+
+        return answer
+
+
+if __name__ == "__main__":
+    proxy = Proxy("127.0.0.1", 5354)
+    proxy.start()

{fmtr_tools-1.1.15 → fmtr_tools-1.1.17}/fmtr/tools/logging_tools.py

@@ -43,16 +43,23 @@ def get_logger(name, version=None, host=Constants.FMTR_OBS_HOST, key=None, org=C
         from fmtr.tools import version_tools
         version = version_tools.read()
 
+    # Rigmarole to translate native levels to logfire/otel ones.
+    lev_num_otel = logfire._internal.constants.LOGGING_TO_OTEL_LEVEL_NUMBERS[level]
+    lev_name_otel = logfire._internal.constants.NUMBER_TO_LEVEL[lev_num_otel]
+
+    console_opts = logfire.ConsoleOptions(
+        colors='always' if environment_tools.IS_DEBUG else 'auto',
+        min_log_level=lev_name_otel,
+    )
+
     logfire.configure(
         service_name=name,
         service_version=version,
         environment=environment,
         send_to_logfire=False,
-        console=logfire.ConsoleOptions(colors='always' if environment_tools.IS_DEBUG else 'auto')
+        console=console_opts
     )
 
-    logging.getLogger(name).setLevel(level)
-
     logger = logfire
     return logger
 
@@ -63,3 +70,4 @@ if __name__ == '__main__':
     logger.info('Hello World')
     logger.warning('test warning')
     logger.debug('Hello World')
+    logger

fmtr_tools-1.1.17/fmtr/tools/pattern_tools.py

@@ -0,0 +1,237 @@
+import regex as re
+from dataclasses import dataclass
+from functools import cached_property
+from typing import List
+
+from fmtr.tools.logging_tools import logger
+
+
+class RewriteCircularLoopError(Exception):
+    """
+
+    Circular loop error
+
+    """
+
+
+@dataclass
+class Rule:
+    """
+    Represents a single rule for pattern matching and target string replacement.
+
+    This class is used to define a rule with a pattern and a target string.
+    The `pattern` is a regular expression used to identify matches in input text.
+    The `target` allows rewriting the identified matches with a formatted string.
+    It provides properties for generating a unique identifier for use as a regex group name and compiling the provided pattern into a regular expression object.
+
+    """
+    pattern: str
+    target: str
+
+    @cached_property
+    def id(self):
+        """
+        
+        Regex group name.
+        
+        """
+        return f'id{abs(hash(self.pattern))}'
+
+    @cached_property
+    def rx(self):
+        """
+
+        Regex object.
+
+        """
+        return re.compile(self.pattern)
+
+    def apply(self, match: re.Match):
+        """
+
+        Rewrite using the target string and match groups.
+
+        """
+        target = self.target.format(**match.groupdict())
+        return target
+
+
+@dataclass
+class Rewriter:
+    """
+    
+    Represents a Rewriter class that handles pattern matching, rule application, and text rewriting.
+    Compiles a single regex pattern from a list of rules, and determines which rule matched.
+    It supports initialization from structured rule data, execution of a single rewrite pass, and
+    recursive rewriting until a stable state is reached.
+
+    """
+    rules: List[Rule]
+
+    @cached_property
+    def pattern(self):
+        """
+        
+        Provides a dynamically generated regex pattern based on the rules provided.
+
+        """
+        patterns = [fr"(?P<{rule.id}>{rule.pattern})" for rule in self.rules]
+        sorted(patterns, key=len, reverse=True)
+        pattern = '|'.join(patterns)
+        return pattern
+
+    @cached_property
+    def rule_lookup(self):
+        """
+
+        Dictionary mapping rule identifiers to their corresponding rules.
+        """
+
+        return {rule.id: rule for rule in self.rules}
+
+    @cached_property
+    def rx(self):
+        """
+
+        Regex object.
+
+        """
+        return re.compile(self.pattern)
+
+    def rewrite_pass(self, source: str):
+        """
+
+        Single rewrite pass.
+        Rewrites the provided source string based on the matching rule.
+
+        """
+
+        match = self.rx.match(source)
+
+        if not match:
+            return source
+
+        match_ids = {k: v for k, v in match.groupdict().items() if v}
+        match_id = match_ids & self.rule_lookup.keys()
+
+        if len(match_id) != 1:
+            msg = f'Multiple group matches: {match_id}'
+            raise ValueError(msg)
+
+        match_id = next(iter(match_id))
+        rule = self.rule_lookup[match_id]
+        target = rule.apply(match)
+
+        logger.debug(f'Rewrote using {match_id=}: {source=} -> {target=}')
+
+        return target
+
+    def rewrite(self, source: str) -> str:
+        """
+
+        Rewrites the provided text by continuously applying rewrite rules until no changes are made
+        or a circular loop is detected.
+
+        """
+        history = []
+        previous = source
+
+        def get_history_str():
+            return ' -> '.join(history)
+
+        with logger.span(f'Rewriting "{source}"...'):
+            while True:
+                if previous in history:
+                    history.append(previous)
+                    msg = f'Loop detected on node "{previous}": {get_history_str()}'
+                    raise RewriteCircularLoopError(msg)
+
+                history.append(previous)
+
+                new = previous
+
+                new = self.rewrite_pass(new)
+
+                if new == previous:
+                    break
+
+                previous = new
+
+            logger.debug(f'Finished rewriting: {get_history_str()}')
+
+        return previous
+
+    @classmethod
+    def from_data(cls, data):
+        rules = [Rule(*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.17/fmtr/tools/setup_tools.py

@@ -0,0 +1,268 @@
+from itertools import chain
+
+from datetime import datetime
+from functools import cached_property
+from setuptools import find_namespace_packages, find_packages
+from typing import List, Dict
+
+from fmtr.tools.constants import Constants
+from fmtr.tools.path_tools import Path
+from fmtr.tools.path_tools.path_tools import PathsBase, path
+
+
+class SetupPaths(PathsBase):
+    """
+
+    Canonical paths for a package.
+
+    """
+
+    SKIP_DIRS = {'data'}
+
+    def __init__(self, path=None):
+
+        """
+
+        Use calling module path as default path, if not otherwise specified.
+
+        """
+        if not path:
+            path = self.from_caller()
+
+        self.repo = Path(path)
+
+    @property
+    def path(self):
+        if self.is_namespace:
+            return self.repo / self.org / self.name
+        else:
+            return self.repo / self.name
+
+    @property
+    def readme(self):
+        return self.repo / 'README.md'
+
+    @property
+    def version(self):
+        return self.path / Constants.FILENAME_VERSION
+
+    @cached_property
+    def layout(self):
+
+        directories = [
+            dir for dir in self.repo.iterdir()
+            if dir.is_dir() and not dir.name.startswith('.') and dir.name not in self.SKIP_DIRS
+        ]
+
+        if len(directories) != 1:
+            raise ValueError(f'Expected exactly one directory in "{path}", found {','.join(directories)}')
+
+        target = next(iter(directories))
+
+        contents = list(target.iterdir())
+        if len(contents) == 1 and (item := next(iter(contents))).is_dir():
+            return True, target.name, item.name
+
+        else:
+            return False, None, target.name
+
+    @property
+    def is_namespace(self) -> str:
+        is_namespace, org, name = self.layout
+        return is_namespace
+
+    @property
+    def org(self) -> str:
+        is_namespace, org, name = self.layout
+        return org
+
+    @property
+    def name(self) -> str:
+        is_namespace, org, name = self.layout
+        return name
+
+
+class Setup:
+    AUTHOR = 'Frontmatter'
+    AUTHOR_EMAIL = 'innovative.fowler@mask.pro.fmtr.dev'
+
+    paths = SetupPaths(path=Path(__file__).absolute().parent.parent.parent)
+
+    def __init__(self, dependencies, console_scripts=None, client=None, **kwargs):
+
+        self.client = client
+        self.kwargs = kwargs
+        self.dependencies = dependencies
+        self.paths
+
+        self.console_scripts = console_scripts
+
+    def get_entrypoint_path(self, key, value):
+        if value:
+            return f'{self.name}.{value}:{key}'
+        else:
+            return f'{self.name}:{key}'
+
+    @property
+    def entrypoints(self):
+        if self.console_scripts:
+            return dict(
+                console_scripts=[f'{key} = {self.get_entrypoint_path(key, value)}' for key, value in self.console_scripts.items()],
+            )
+        else:
+            return dict()
+
+    @property
+    def name(self):
+        if self.paths.is_namespace:
+            return f'{self.paths.org}.{self.paths.name}'
+        return self.paths.name
+
+    @property
+    def author(self):
+        if self.client:
+            return f'{self.AUTHOR} on behalf of {self.client}'
+        return self.AUTHOR
+
+    @property
+    def copyright(self):
+        if self.client:
+            return self.client
+        return self.AUTHOR
+
+    @property
+    def long_description(self):
+
+        return self.paths.readme.read_text()
+
+    @property
+    def version(self):
+        return self.paths.version.read_text().strip()
+
+    @property
+    def packages(self):
+        if self.paths.is_namespace:
+            return find_namespace_packages(where=str(self.paths.repo))
+        else:
+            return find_packages(where=str(self.paths.repo))
+
+    @property
+    def package_dir(self):
+        if self.paths.is_namespace:
+            return {'': str(self.paths.repo)}
+        else:
+            return None
+
+    @property
+    def package_data(self):
+        return {self.name: [Constants.FILENAME_VERSION]}
+
+    @property
+    def url(self):
+        return f'https://github.com/{self.paths.org}/{self.paths.name}'
+
+    def get_data_setup(self):
+        return dict(
+            name=self.name,
+            version=self.version,
+            author=self.author,
+            author_email=self.AUTHOR_EMAIL,
+            url=self.url,
+            license=f'Copyright © {datetime.now().year} {self.copyright}. All rights reserved.',
+            long_description=self.long_description,
+            long_description_content_type='text/markdown',
+            packages=self.packages,
+            package_dir=self.package_dir,
+            package_data=self.package_data,
+            entry_points=self.entrypoints,
+            install_requires=self.dependencies.install,
+            extras_require=self.dependencies.extras,
+        ) | self.kwargs
+
+
+class Entrypoints:
+    ALL = 'all'
+    INSTALL = 'install'
+
+    def __init__(self, console_scripts=None, **kwargs):
+        self.kwargs = kwargs
+        self._console_scripts = console_scripts
+
+    @property
+    def console_scripts(self):
+        return [f'{key} = {value}:{key}' for key, value in self._console_scripts.items()]
+
+    @property
+    def data(self):
+        return dict(
+            console_scripts=self.console_scripts,
+        ) | self.kwargs
+
+
+class Dependencies:
+    ALL = 'all'
+    INSTALL = 'install'
+
+    def __init__(self, **kwargs):
+        self.dependencies = kwargs
+
+    def resolve_values(self, key) -> List[str]:
+        """
+
+        Flatten a list of values.
+
+        """
+        values_resolved = []
+        values = self.dependencies[key]
+
+        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)
+            else:
+                # Recurse into nested dependencies.
+                values_resolved += self.resolve_values(value)
+
+        return values_resolved
+
+    @property
+    def extras(self) -> Dict[str, List[str]]:
+        """
+
+        Flatten dependencies.
+
+        """
+        resolved = {key: self.resolve_values(key) for key in self.dependencies.keys()}
+        resolved.pop(self.INSTALL, None)
+        resolved[self.ALL] = list(set(chain.from_iterable(resolved.values())))
+        return resolved
+
+    @property
+    def install(self):
+        return self.resolve_values(self.INSTALL)
+
+
+if __name__ == '__main__':
+    ds = Dependencies(
+        install=['version', 'yaml'],
+
+        yaml=['yamlscript', 'pyyaml'],
+        logging=['logfire', 'version'],
+        version=['semver', 'av'],
+        av=['av']
+        # Add the rest of your dependencies...
+    )
+
+    ds
+
+    setup = Setup(
+        # client='Acme',
+        dependencies=ds,
+        description='some tools test',
+        console_scripts=dict(
+            cache_hfh='console_script_tools',
+            test=None,
+        )
+    )
+    data = setup.get_data_setup()
+    data

{fmtr_tools-1.1.15 → fmtr_tools-1.1.17}/fmtr/tools/string_tools.py

@@ -171,9 +171,3 @@ def trim(text: str) -> str:
 
     """
     return dedent(text).strip()
-
-if __name__ == '__main__':
-    import numpy as np
-
-    st = join([1, None, 'test', np.nan, 0, '', 'yeah'])
-    st

fmtr_tools-1.1.17/fmtr/tools/version

@@ -0,0 +1 @@
+1.1.17

{fmtr_tools-1.1.15 → fmtr_tools-1.1.17}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.1.15 → fmtr_tools-1.1.17}/fmtr.tools.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ setup.py
 ./fmtr/tools/dataclass_tools.py
 ./fmtr/tools/datatype_tools.py
 ./fmtr/tools/debugging_tools.py
+./fmtr/tools/dns_tools.py
 ./fmtr/tools/docker_tools.py
 ./fmtr/tools/environment_tools.py
 ./fmtr/tools/function_tools.py
@@ -33,6 +34,7 @@ setup.py
 ./fmtr/tools/openai_tools.py
 ./fmtr/tools/packaging_tools.py
 ./fmtr/tools/parallel_tools.py
+./fmtr/tools/pattern_tools.py
 ./fmtr/tools/pdf_tools.py
 ./fmtr/tools/platform_tools.py
 ./fmtr/tools/process_tools.py
@@ -40,6 +42,7 @@ setup.py
 ./fmtr/tools/random_tools.py
 ./fmtr/tools/semantic_tools.py
 ./fmtr/tools/settings_tools.py
+./fmtr/tools/setup_tools.py
 ./fmtr/tools/spaces_tools.py
 ./fmtr/tools/string_tools.py
 ./fmtr/tools/tabular_tools.py

{fmtr_tools-1.1.15 → fmtr_tools-1.1.17}/fmtr.tools.egg-info/requires.txt

@@ -35,6 +35,9 @@ pydevd-pycharm
 [dm]
 pydantic
 
+[dns]
+dnspython[doh]
+
 [docker.api]
 docker
 
@@ -50,6 +53,13 @@ huggingface_hub
 [html]
 html2text
 
+[http]
+httpx
+httpx_retries
+logfire
+semver
+logfire[httpx]
+
 [interface]
 flet[all]
 flet-video
@@ -88,6 +98,9 @@ appdirs
 [path.type]
 filetype
 
+[patterns]
+regex
+
 [pdf]
 pymupdf
 pydantic
@@ -110,6 +123,9 @@ openpyxl
 pydantic-settings
 pydantic
 
+[setup]
+setuptools
+
 [spaces]
 tinynetrc
 
@@ -119,54 +135,60 @@ tabulate
 openpyxl
 
 [test]
-google-auth-oauthlib
-logfire
-torchvision
-uvicorn[standard]
-tinynetrc
-google-auth
+fastapi
+tabulate
+torchaudio
+semver
+distributed
+filetype
+pandas
+dnspython[doh]
+sentence_transformers
+logfire[httpx]
+transformers[sentencepiece]
 openai
-bokeh
-appdirs
+regex
+contexttimer
+uvicorn[standard]
 flet-webview
+pyyaml
+tinynetrc
 pytest-cov
-google-api-python-client
-diskcache
-openpyxl
+tokenizers
+logfire[fastapi]
+json_repair
+faker
 huggingface_hub
-semver
-dask[bag]
-sentence_transformers
-contexttimer
+flet[all]
+torchvision
+httpx
+pydantic-settings
+google-auth-oauthlib
+setuptools
 pydantic-ai[logfire,openai]
-flet-video
-tabulate
-faker
-deepmerge
+logfire
+dask[bag]
+html2text
+yamlscript
+pymupdf4llm
+peft
+bokeh
+Unidecode
+google-auth
+appdirs
+openpyxl
+diskcache
+pydantic
+pydevd-pycharm
 sre_yield
 docker
-pandas
-pymupdf4llm
-json_repair
-distributed
-pymupdf
-html2text
-transformers[sentencepiece]
-filetype
-logfire[fastapi]
 ollama
-tokenizers
-Unidecode
+google-api-python-client
+pymupdf
+httpx_retries
+flet-video
+deepmerge
 google-auth-httplib2
-flet[all]
-torchaudio
-pyyaml
-pydantic-settings
-yamlscript
-fastapi
-pydevd-pycharm
-pydantic
-peft
 
 [tokenization]
 tokenizers

fmtr_tools-1.1.15/fmtr/tools/version

@@ -1 +0,0 @@
-1.1.15