fmtr.tools 1.3.8__py3-none-any.whl → 1.3.10__py3-none-any.whl

fmtr/tools/__init__.py

@@ -1,8 +1,4 @@
-from fmtr.tools import version_tools as version
-
-__version__ = version.read()
-
-
+import fmtr.tools.async_tools as asyncio
 import fmtr.tools.dataclass_tools as dataclass
 import fmtr.tools.datatype_tools as datatype
 import fmtr.tools.environment_tools as env
@@ -12,26 +8,22 @@ import fmtr.tools.hash_tools as hash
 import fmtr.tools.import_tools as import_
 import fmtr.tools.iterator_tools as iterator
 import fmtr.tools.json_tools as json
+import fmtr.tools.logging_tools as logging
+import fmtr.tools.name_tools as name
+import fmtr.tools.packaging_tools as packaging
 import fmtr.tools.path_tools as path
 import fmtr.tools.platform_tools as platform
 import fmtr.tools.random_tools as random
+import fmtr.tools.setup_tools as setup
 import fmtr.tools.string_tools as string
-import fmtr.tools.name_tools as name
-import fmtr.tools.logging_tools as logging
-import fmtr.tools.async_tools as asyncio
-import fmtr.tools.packaging_tools as packaging
-from fmtr.tools.logging_tools import logger
-
-from fmtr.tools.import_tools import MissingExtraMockModule
-
+from fmtr.tools import ai_tools as ai
+from fmtr.tools import dns_tools as dns
+from fmtr.tools import version_tools as version
 from fmtr.tools.constants import Constants
-
+from fmtr.tools.import_tools import MissingExtraMockModule
+from fmtr.tools.logging_tools import logger
 # Submodules
 from fmtr.tools.path_tools import Path, PackagePaths, AppPaths
-from fmtr.tools import ai_tools as ai
-from fmtr.tools import dns_tools as dns
-
-import fmtr.tools.setup_tools as setup
 from fmtr.tools.setup_tools import Setup, SetupPaths, Dependencies, Tools
 
 try:
@@ -178,3 +170,12 @@ try:
     from fmtr.tools.http_tools import Client
 except ImportError as exception:
     http = Client = MissingExtraMockModule('http', exception)
+
+
+def get_version():
+    """
+
+    Defer reading version
+
+    """
+    return version.read()

fmtr/tools/api_tools.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from fastapi import FastAPI, Request
 from typing import Callable, List, Optional, Union
 
-from fmtr.tools.environment_tools import IS_DEBUG
+from fmtr.tools import environment_tools
 from fmtr.tools.iterator_tools import enlist
 from fmtr.tools.logging_tools import logger
 
@@ -57,7 +57,7 @@ class ApiBase:
         for endpoint in self.get_endpoints():
             self.add_endpoint(endpoint)
 
-        if IS_DEBUG:
+        if environment_tools.IS_DEV:
             self.app.exception_handler(Exception)(self.handle_exception)
 
     def get_endpoints(self) -> List[Endpoint]:

fmtr/tools/caching_tools.py

@@ -2,7 +2,9 @@ import cachetools
 from datetime import timedelta, datetime
 from diskcache import Cache
 
-from fmtr.tools import logger, Path, Constants
+from fmtr.tools.constants import Constants
+from fmtr.tools.logging_tools import logger
+from fmtr.tools.path_tools.path_tools import Path
 
 
 class Dump(dict):

fmtr/tools/constants.py

@@ -17,6 +17,7 @@ class Constants:
     ARROW = '→'
     ARROW_SEP = f' {ARROW} '
 
+    FMTR_DEV_KEY = 'FMTR_DEV'
     FMTR_LOG_LEVEL_KEY = 'FMTR_LOG_LEVEL'
     FMTR_OBS_API_KEY_KEY = 'FMTR_OBS_API_KEY'
     FMTR_OBS_HOST = 'obs.sv.fmtr.dev'
@@ -43,3 +44,6 @@ class Constants:
     ENTRYPOINTS_DIR = 'entrypoints'
     PACKAGE_EXCLUDE_DIRS = {'data', 'build', 'dist', '.*', '*egg-info*'}
     INIT_FILENAME = '__init__.py'
+
+    DEVELOPMENT = "development"
+    PRODUCTION = "production"

fmtr/tools/dns_tools/dm.py

@@ -1,11 +1,12 @@
-from dataclasses import dataclass
-from functools import cached_property
-from typing import Self, Optional
-
 import dns
 import httpx
+from dataclasses import dataclass
 from dns.message import Message, QueryMessage
 from dns.rrset import RRset
+from functools import cached_property
+from typing import Self, Optional
+
+from fmtr.tools.string_tools import join
 
 
 @dataclass
@@ -25,7 +26,6 @@ class BaseDNSData:
     def from_message(cls, message: Message) -> Self:
         return cls(message.to_wire())
 
-
 @dataclass
 class Response(BaseDNSData):
     """
@@ -39,15 +39,41 @@ class Response(BaseDNSData):
 
     @classmethod
     def from_http(cls, response: httpx.Response) -> Self:
+        """
+
+        Initialise from an HTTP response.
+
+        """
         self = cls(response.content, http=response)
         return self
 
     @property
     def answer(self) -> Optional[RRset]:
+        """
+
+        Get the latest answer, if one exists.
+
+        """
         if not self.message.answer:
             return None
         return self.message.answer[-1]
 
+    def __str__(self):
+        """
+
+        Put answer and ID text in string representation.
+
+        """
+        answer = self.answer
+
+        if answer:
+            answer = join(answer.to_text().splitlines(), sep=', ')
+
+        string = join([answer, self.message.flags], sep=', ')
+        string = f'{self.__class__.__name__}({string})'
+        return string
+
+
 
 @dataclass
 class Request(BaseDNSData):
@@ -157,3 +183,13 @@ class Exchange:
         question_last = self.question_last
         query = dns.message.make_query(qname=question_last.name, rdclass=question_last.rdclass, rdtype=question_last.rdtype)
         return query
+
+    @property
+    def key(self):
+        """
+
+        Hashable key for caching
+
+        """
+        data = tuple(self.request.question.to_text().split())
+        return data

fmtr/tools/dns_tools/proxy.py

@@ -1,11 +1,11 @@
 from dataclasses import dataclass
 
-from fmtr.tools import logger
 from fmtr.tools.dns_tools import server, client
 from fmtr.tools.dns_tools.dm import Exchange
+from fmtr.tools.logging_tools import logger
 
 
-@dataclass
+@dataclass(kw_only=True, eq=False)
 class Proxy(server.Plain):
     """
 
@@ -31,7 +31,7 @@ class Proxy(server.Plain):
         """
         return
 
-    def resolve(self, exchange: Exchange):
+    def resolve(self, exchange: Exchange) -> Exchange:
         """
 
         Resolve a request, processing each stage, initial question, upstream response etc.
@@ -39,29 +39,19 @@ class Proxy(server.Plain):
 
         """
 
-        request = exchange.request
+        with logger.span(f'Processing question...'):
+            self.process_question(exchange)
+        if exchange.response.is_complete:
+            return exchange
 
-        with logger.span(f'Handling request {request.message.id=} {request.question=} {exchange.client=}...'):
+        with logger.span(f'Making upstream request...'):
+            self.client.resolve(exchange)
+        if exchange.response.is_complete:
+            return exchange
 
-            if not request.is_valid:
-                raise ValueError(f'Only one question per request is supported. Got {len(request.question)} questions.')
+        with logger.span(f'Processing upstream response...'):
+            self.process_upstream(exchange)
+        if exchange.response.is_complete:
+            return exchange
 
-            with logger.span(f'Processing question...'):
-                self.process_question(exchange)
-            if exchange.response.is_complete:
-                return
-
-            with logger.span(f'Making upstream request...'):
-                self.client.resolve(exchange)
-            if exchange.response.is_complete:
-                return
-
-            with logger.span(f'Processing upstream response...'):
-                self.process_upstream(exchange)
-            if exchange.response.is_complete:
-                return
-
-            exchange.response.is_complete = True
-
-        logger.info(f'Resolution complete {request.message.id=} {exchange.response.answer=}')
-        return
+        return exchange

fmtr/tools/dns_tools/server.py

@@ -1,11 +1,14 @@
 import socket
 from dataclasses import dataclass
+from datetime import timedelta
+from functools import cached_property
 
+from fmtr.tools import caching_tools as caching
 from fmtr.tools.dns_tools.dm import Exchange
 from fmtr.tools.logging_tools import logger
 
 
-@dataclass
+@dataclass(kw_only=True, eq=False)
 class Plain:
     """
 
@@ -16,12 +19,19 @@ class Plain:
     host: str
     port: int
 
-    def __post_init__(self):
+    @cached_property
+    def sock(self):
+        return socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
-        self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    @cached_property
+    def cache(self):
+        """
 
-    def resolve(self, exchange: Exchange):
-        raise NotImplemented
+        Overridable cache.
+
+        """
+        cache = caching.TLRU(maxsize=1_024, ttu_static=timedelta(hours=1), desc='DNS Request')
+        return cache
 
     def start(self):
         """
@@ -35,5 +45,50 @@ class Plain:
         while True:
             data, (ip, port) = sock.recvfrom(512)
             exchange = Exchange.from_wire(data, ip=ip, port=port)
-            self.resolve(exchange)
+            self.handle(exchange)
             sock.sendto(exchange.response.message.to_wire(), (ip, port))
+
+    def resolve(self, exchange: Exchange) -> Exchange:
+        """
+
+        Defined in subclasses
+
+        """
+        raise NotImplemented
+
+    def check_cache(self, exchange: Exchange):
+        """
+
+        Check cache, patch in in new ID and mark complete
+
+        """
+        if exchange.key in self.cache:
+            logger.info(f'Request found in cache.')
+            exchange.response = self.cache[exchange.key]
+            exchange.response.message.id = exchange.request.message.id
+            exchange.response.is_complete = True
+
+    def handle(self, exchange: Exchange):
+        """
+
+        Check validity of request, presence in cache and resolve.
+
+        """
+        request = exchange.request
+
+        if not request.is_valid:
+            raise ValueError(f'Only one question per request is supported. Got {len(request.question)} questions.')
+
+        with logger.span(f'Handling request {request.message.id=} {request.question=} {exchange.client=}...'):
+
+            with logger.span(f'Checking cache...'):
+                self.check_cache(exchange)
+
+            if not exchange.response.is_complete:
+                exchange = self.resolve(exchange)
+                exchange.response.is_complete = True
+
+        self.cache[exchange.key] = exchange.response
+
+        logger.info(f'Resolution complete {request.message.id=} {exchange.response.answer=}')
+        return exchange

fmtr/tools/environment_tools.py

@@ -76,4 +76,4 @@ get_date = get_getter(date.fromisoformat)
 get_datetime = get_getter(datetime.fromisoformat)
 get_path = get_getter(Path)
 
-IS_DEBUG = get(Constants.FMTR_LOG_LEVEL_KEY, None, converter=str.upper) == 'DEBUG'
+IS_DEV = get_bool(Constants.FMTR_DEV_KEY, default=False)

fmtr/tools/logging_tools.py

@@ -4,23 +4,26 @@ import os
 from fmtr.tools import environment_tools
 from fmtr.tools.constants import Constants
 
-DEVELOPMENT = "development"
-PRODUCTION = "production"
-STREAM_DEFAULT = DEVELOPMENT
-ENVIRONMENT_DEFAULT = DEVELOPMENT
+if environment_tools.IS_DEV:
+    STREAM_DEFAULT = ENVIRONMENT_DEFAULT = Constants.DEVELOPMENT
+else:
+    STREAM_DEFAULT = None
+    ENVIRONMENT_DEFAULT = Constants.PRODUCTION
 
-LEVEL_DEFAULT = logging.DEBUG if environment_tools.IS_DEBUG else logging.INFO
+IS_DEBUG = environment_tools.get(Constants.FMTR_LOG_LEVEL_KEY, None, converter=str.upper) == 'DEBUG'
+LEVEL_DEFAULT = logging.DEBUG if IS_DEBUG else logging.INFO
 
 
 def get_logger(name, version=None, host=Constants.FMTR_OBS_HOST, key=None, org=Constants.ORG_NAME,
-               stream=STREAM_DEFAULT,
-               environment=ENVIRONMENT_DEFAULT, level=LEVEL_DEFAULT):
+               stream=STREAM_DEFAULT, environment=ENVIRONMENT_DEFAULT, level=LEVEL_DEFAULT):
     """
 
     Get a pre-configured logfire logger, if dependency is present, otherwise default to native logger.
 
     """
 
+    stream = stream or name
+
     try:
         import logfire
     except ImportError:
@@ -65,7 +68,8 @@ def get_logger(name, version=None, host=Constants.FMTR_OBS_HOST, key=None, org=C
     )
 
     if key is None:
-        logger.warning(f'Observability dependencies installed, but "{Constants.FMTR_OBS_API_KEY_KEY}" not set. Cloud observability will be disabled.')
+        msg = f'Observability dependencies installed, but "{Constants.FMTR_OBS_API_KEY_KEY}" not set. Cloud observability will be disabled.'
+        logger.warning(msg)
 
     return logger
 

fmtr/tools/pattern_tools.py

@@ -92,7 +92,8 @@ class Item:
     source: Key
     target: Key
 
-@dataclass
+
+@dataclass(kw_only=True)
 class Transformer:
     """
     

fmtr/tools/version

@@ -1 +1 @@
-1.3.8
+1.3.10

fmtr/tools/version_tools/__init__.py

@@ -0,0 +1,12 @@
+from fmtr.tools.import_tools import MissingExtraMockModule
+
+from fmtr.tools.version_tools.version_tools import read, read_path, get
+
+try:
+    import semver
+
+    semver = semver
+    parse = semver.VersionInfo.parse
+
+except ImportError as exception:
+    semver = parse = MissingExtraMockModule('version.dev', exception)

fmtr/tools/version_tools/version_tools.py

@@ -0,0 +1,51 @@
+from fmtr.tools import environment_tools as env
+from fmtr.tools.constants import Constants
+from fmtr.tools.inspection_tools import get_call_path
+
+
+def read() -> str:
+    """
+
+    Read a generic version file from the calling package path.
+
+    """
+
+    path = get_call_path(offset=2).parent / Constants.FILENAME_VERSION
+    return read_path(path)
+
+
+def read_path(path) -> str:
+    """
+
+    Read in version from specified path
+
+    """
+    from fmtr.tools.tools import Constants
+    text = path.read_text(encoding=Constants.ENCODING).strip()
+
+    text = get(text)
+    return text
+
+
+def get(text) -> str:
+    """
+
+    Optionally add dev build info to raw version string.
+
+    """
+
+    if not env.IS_DEV:
+        return text
+
+    import datetime
+    from fmtr.tools.tools import Constants
+    from fmtr.tools.version_tools import parse
+
+    timestamp = datetime.datetime.now(datetime.timezone.utc).strftime(Constants.DATETIME_SEMVER_BUILD_FORMAT)
+
+    version = parse(text)
+    version = version.bump_patch()
+    version = version.replace(prerelease=Constants.DEVELOPMENT, build=timestamp)
+    text = str(version)
+
+    return text

fmtr/tools/yaml_tools.py

@@ -29,7 +29,7 @@ def install():
 
 
 @lru_cache
-def get_module(is_auto=env.IS_DEBUG):
+def get_module(is_auto=env.IS_DEV):
     """
 
     Get the YAML Script runtime module, installing the runtime if specified

{fmtr_tools-1.3.8.dist-info → fmtr_tools-1.3.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmtr.tools
-Version: 1.3.8
+Version: 1.3.10
 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
@@ -15,7 +15,6 @@ Requires-Dist: yamlscript; extra == "yaml"
 Requires-Dist: pyyaml; extra == "yaml"
 Provides-Extra: logging
 Requires-Dist: logfire; extra == "logging"
-Requires-Dist: semver; extra == "logging"
 Provides-Extra: parallel
 Requires-Dist: dask[bag]; extra == "parallel"
 Requires-Dist: distributed; extra == "parallel"
@@ -27,7 +26,6 @@ Requires-Dist: faker; extra == "augmentation"
 Requires-Dist: sre_yield; extra == "augmentation"
 Provides-Extra: process
 Requires-Dist: logfire; extra == "process"
-Requires-Dist: semver; extra == "process"
 Provides-Extra: profiling
 Requires-Dist: contexttimer; extra == "profiling"
 Provides-Extra: docker-api
@@ -35,7 +33,8 @@ Requires-Dist: docker; extra == "docker-api"
 Provides-Extra: unicode
 Requires-Dist: Unidecode; extra == "unicode"
 Provides-Extra: version
-Requires-Dist: semver; extra == "version"
+Provides-Extra: version-dev
+Requires-Dist: semver; extra == "version-dev"
 Provides-Extra: spaces
 Requires-Dist: tinynetrc; extra == "spaces"
 Provides-Extra: netrc
@@ -48,7 +47,6 @@ Provides-Extra: api
 Requires-Dist: fastapi; extra == "api"
 Requires-Dist: uvicorn[standard]; extra == "api"
 Requires-Dist: logfire; extra == "api"
-Requires-Dist: semver; extra == "api"
 Requires-Dist: pydantic; extra == "api"
 Requires-Dist: logfire[fastapi]; extra == "api"
 Provides-Extra: ai
@@ -63,7 +61,6 @@ Provides-Extra: openai-api
 Requires-Dist: openai; extra == "openai-api"
 Provides-Extra: ai-client
 Requires-Dist: logfire; extra == "ai-client"
-Requires-Dist: semver; extra == "ai-client"
 Requires-Dist: pydantic; extra == "ai-client"
 Requires-Dist: openai; extra == "ai-client"
 Requires-Dist: pydantic-ai[logfire,openai]; extra == "ai-client"
@@ -118,7 +115,6 @@ Requires-Dist: dnspython[doh]; extra == "dns"
 Requires-Dist: httpx; extra == "dns"
 Requires-Dist: httpx_retries; extra == "dns"
 Requires-Dist: logfire; extra == "dns"
-Requires-Dist: semver; extra == "dns"
 Requires-Dist: logfire[httpx]; extra == "dns"
 Provides-Extra: patterns
 Requires-Dist: regex; extra == "patterns"
@@ -126,66 +122,65 @@ 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"
 Provides-Extra: all
-Requires-Dist: html2text; extra == "all"
-Requires-Dist: appdirs; extra == "all"
-Requires-Dist: httpx_retries; extra == "all"
-Requires-Dist: diskcache; extra == "all"
-Requires-Dist: google-auth; extra == "all"
-Requires-Dist: docker; extra == "all"
+Requires-Dist: flet-video; extra == "all"
 Requires-Dist: faker; extra == "all"
-Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
-Requires-Dist: sre_yield; extra == "all"
 Requires-Dist: fastapi; extra == "all"
+Requires-Dist: torchvision; extra == "all"
 Requires-Dist: bokeh; extra == "all"
-Requires-Dist: huggingface_hub; extra == "all"
-Requires-Dist: pymupdf; extra == "all"
-Requires-Dist: google-api-python-client; extra == "all"
-Requires-Dist: pydantic; extra == "all"
-Requires-Dist: dnspython[doh]; extra == "all"
-Requires-Dist: pandas; extra == "all"
-Requires-Dist: yamlscript; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: deepmerge; extra == "all"
-Requires-Dist: filetype; extra == "all"
 Requires-Dist: regex; extra == "all"
-Requires-Dist: peft; extra == "all"
-Requires-Dist: transformers[sentencepiece]; extra == "all"
-Requires-Dist: tinynetrc; extra == "all"
-Requires-Dist: flet-video; extra == "all"
 Requires-Dist: logfire; extra == "all"
-Requires-Dist: google-auth-oauthlib; extra == "all"
+Requires-Dist: google-auth; extra == "all"
+Requires-Dist: html2text; extra == "all"
+Requires-Dist: tokenizers; extra == "all"
+Requires-Dist: sentence_transformers; extra == "all"
 Requires-Dist: logfire[fastapi]; extra == "all"
+Requires-Dist: peft; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: pydantic-ai[logfire,openai]; extra == "all"
 Requires-Dist: httpx; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
-Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
-Requires-Dist: distributed; extra == "all"
 Requires-Dist: contexttimer; extra == "all"
-Requires-Dist: pymupdf4llm; extra == "all"
-Requires-Dist: setuptools; extra == "all"
+Requires-Dist: distributed; extra == "all"
+Requires-Dist: appdirs; extra == "all"
+Requires-Dist: dask[bag]; extra == "all"
+Requires-Dist: yamlscript; extra == "all"
 Requires-Dist: uvicorn[standard]; extra == "all"
-Requires-Dist: logfire[httpx]; extra == "all"
-Requires-Dist: json_repair; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: openai; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Requires-Dist: pydantic; extra == "all"
+Requires-Dist: deepmerge; extra == "all"
+Requires-Dist: dnspython[doh]; extra == "all"
 Requires-Dist: openpyxl; extra == "all"
-Requires-Dist: semver; extra == "all"
+Requires-Dist: huggingface_hub; extra == "all"
+Requires-Dist: flet-webview; extra == "all"
+Requires-Dist: pydevd-pycharm~=251.25410.159; extra == "all"
+Requires-Dist: sre_yield; extra == "all"
+Requires-Dist: tinynetrc; extra == "all"
+Requires-Dist: pymupdf; extra == "all"
 Requires-Dist: torchaudio; extra == "all"
 Requires-Dist: pydantic-settings; extra == "all"
-Requires-Dist: dask[bag]; extra == "all"
-Requires-Dist: tokenizers; extra == "all"
-Requires-Dist: tabulate; extra == "all"
-Requires-Dist: cachetools; extra == "all"
-Requires-Dist: torchvision; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: semver; extra == "all"
+Requires-Dist: json_repair; extra == "all"
+Requires-Dist: flet[all]; extra == "all"
+Requires-Dist: diskcache; extra == "all"
+Requires-Dist: logfire[httpx]; extra == "all"
+Requires-Dist: pytest-cov; extra == "all"
+Requires-Dist: pyyaml; extra == "all"
+Requires-Dist: docker; extra == "all"
 Requires-Dist: Unidecode; extra == "all"
-Requires-Dist: sentence_transformers; extra == "all"
+Requires-Dist: tabulate; extra == "all"
+Requires-Dist: transformers[sentencepiece]; extra == "all"
+Requires-Dist: google-api-python-client; extra == "all"
+Requires-Dist: httpx_retries; extra == "all"
+Requires-Dist: google-auth-oauthlib; extra == "all"
 Requires-Dist: google-auth-httplib2; extra == "all"
-Requires-Dist: flet[all]; extra == "all"
-Requires-Dist: flet-webview; extra == "all"
 Requires-Dist: ollama; extra == "all"
+Requires-Dist: setuptools; extra == "all"
+Requires-Dist: pymupdf4llm; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{fmtr_tools-1.3.8.dist-info → fmtr_tools-1.3.10.dist-info}/RECORD

@@ -1,15 +1,15 @@
-fmtr/tools/__init__.py,sha256=vCxKR0SymygpO-EtCGPmGZEQv5O1goM7Jr8P4m-eJsQ,5676
-fmtr/tools/api_tools.py,sha256=w8Zrp_EwN5KlUghwLoTCXo4z1irg5tAsReCqDLjASfE,2133
+fmtr/tools/__init__.py,sha256=sjXo4eRDOPp20zlLpJqaB48h7RQXKJd_RwR3fwD6oGk,5731
+fmtr/tools/api_tools.py,sha256=u2uEw-5OGN-eU4bNMC7ef5nmopVZTPyVN5eb_rr8ZS0,2140
 fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
-fmtr/tools/caching_tools.py,sha256=BZ5HSzcyCSnvJ6h5xtu5jELPSPDazVsMU7q7OX_oKBE,4886
-fmtr/tools/constants.py,sha256=QHJWu2UZwdV1ceGKT-pq-eYGPw4t7aFxb_W8r4G9VVk,1429
+fmtr/tools/caching_tools.py,sha256=74p7m2GLFfeP41LX69wxgfkilxEAoWkMIfFMjKsYpyg,4976
+fmtr/tools/constants.py,sha256=R6kyJOahQwwjBqmiD-c-4pMMAyGpffxZUSHMffkYmLI,1522
 fmtr/tools/data_modelling_tools.py,sha256=0BFm-F_cYzVTxftWQwORkPd0FM2BTLVh9-s0-rTTFoo,1744
 fmtr/tools/dataclass_tools.py,sha256=0Gt6KeLhtPgubo_2tYkIVqB8oQ91Qzag8OAGZDdjvMU,1209
 fmtr/tools/datatype_tools.py,sha256=3P4AWIFGkJ-UqvXlj0Jc9IvkIIgTOE9jRrOk3NVbpH8,1508
 fmtr/tools/debugging_tools.py,sha256=_xzqS0V5BpL8d06j-jVQjGgI7T020QsqVXKAKMz7Du8,2082
 fmtr/tools/docker_tools.py,sha256=rdaZje2xhlmnfQqZnR7IHgRdWncTLjrJcViUTt5oEwk,617
-fmtr/tools/environment_tools.py,sha256=ZO2e8pTzbQ8jNXnmKpaZF7_3qkVM6U5iqku5YSwOszE,1849
+fmtr/tools/environment_tools.py,sha256=jlx6LYFVv9tyNBT_pVD-tDhyR3ccNC7w6ENVlnoxCLM,1823
 fmtr/tools/function_tools.py,sha256=_oW3-HZXMst2pcU-I-U7KTMmzo0g9MIQKmX-c2_NEoE,858
 fmtr/tools/google_api_tools.py,sha256=owWE0GlnJjmVbXus8ENxT2PH7Fnd3m_r-14xyR7lAnA,1107
 fmtr/tools/hash_tools.py,sha256=tr4HXpeT6rRrDk6TvMlRPUSrLRRaov96y128OI2tzsc,729
@@ -22,7 +22,7 @@ fmtr/tools/interface_tools.py,sha256=JVYUV7wuMr24BORuUtNaBlTeBFt8VDGJ3HPRajd7Y_4
 fmtr/tools/iterator_tools.py,sha256=xj5f0c7LgLK53dddRRRJxBoLaBzlZoQS3_GfmpDPMoo,1311
 fmtr/tools/json_fix_tools.py,sha256=vNSlswVQnujPmKEqDjFJcO901mjMyv59q3awsT7mlhs,477
 fmtr/tools/json_tools.py,sha256=WkFc5q7oqMtcFejhN1K5zQFULa9TdLOup83Fr0saDRY,348
-fmtr/tools/logging_tools.py,sha256=rVNoq46hsO3wF1dnpaGZxu_usFV_SLy16MlKbhivN_M,2332
+fmtr/tools/logging_tools.py,sha256=M7I5igs_tX5SIRv4f-jfb75LOODclSdmEg5ziAAMSPE,2503
 fmtr/tools/merging_tools.py,sha256=KDxCEFJEQJEwGw1qGKAgR55uUE2X2S5NWLKcfHRmX_k,227
 fmtr/tools/metric_tools.py,sha256=Lvia5CGFRIfrDFA8s37btIfTU5zHbo04cPJdAMtbndQ,272
 fmtr/tools/name_tools.py,sha256=5CB_phqhHjl66iI8oLxOGPF2odC1apdul-M8Fv2xBhs,5514
@@ -30,7 +30,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=Rmengjn_Ya246mlkAVR9fxVxXJUqEHWdDYu8Hsl9pXw,6003
+fmtr/tools/pattern_tools.py,sha256=DlEKzNJKhwFmU3-awoGkN5Xy-yLF_bsoj8eoSMCEytE,6018
 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
@@ -44,17 +44,16 @@ 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=TcdU53CiqvG9NX8A4sH_s0eyfztzmjd5EWmCXTCwpQE,5
-fmtr/tools/version_tools.py,sha256=yNs_CGqWpqE4jbK9wsPIi14peJVXYbhIcMqHAFOw3yE,1480
-fmtr/tools/yaml_tools.py,sha256=9kuYChqJelWQIjGlSnK4iDdOWWH06P0gp9jIcRrC3UI,1903
+fmtr/tools/version,sha256=KXp_jTzlhrmPBGoDE8ZyMR8_fR2OLdfF-J8Z6JpyZHk,6
+fmtr/tools/yaml_tools.py,sha256=Bhhyd6GQVKO72Lp8ky7bAUjIB_65Hdh0Q45SKIEe6S8,1901
 fmtr/tools/ai_tools/__init__.py,sha256=JZrLuOFNV1A3wvJgonxOgz_4WS-7MfCuowGWA5uYCjs,372
 fmtr/tools/ai_tools/agentic_tools.py,sha256=acSEPFS-aguDXanWGs3fAAlRyJSYPZW7L-Kb2qDLm-I,4300
 fmtr/tools/ai_tools/inference_tools.py,sha256=2UP2gXEyOJUjyyV6zmFIYmIxUsh1rXkRH0IbFvr2bRs,11908
 fmtr/tools/dns_tools/__init__.py,sha256=PjD3Og6D5yvDVpKmsUsrnSpz_rjXpl4zBtvMqm8xKWU,237
 fmtr/tools/dns_tools/client.py,sha256=c2vzWBDZSxijwL1KvWUoDGc8wqk_KTAFxCr0P1rNjy8,2367
-fmtr/tools/dns_tools/dm.py,sha256=KWQeeZhsDyrKoXzAD5zEOoHH3aiD4uKRqwnD8fFP1nI,3725
-fmtr/tools/dns_tools/proxy.py,sha256=L0utKw8D1JXtAW9IfXcBdNMb-AyPFgW5XGiPnWuk7D8,1878
-fmtr/tools/dns_tools/server.py,sha256=t38TmSpra3FRoMk351eHzOOPlSuaCyjxbvPwX9o15ak,942
+fmtr/tools/dns_tools/dm.py,sha256=QqEYebamLWMzr1KM1x4P4dUvPZL_zvymZrNj6ghw0rg,4445
+fmtr/tools/dns_tools/proxy.py,sha256=b3TdSwRO7IwcNjrWg1e8jVQb-YxJhT377rdVkeDc8_I,1466
+fmtr/tools/dns_tools/server.py,sha256=FK5S9r34aWapD3tv7rYG1dvHZrfCgg0hL9yGpZkZHkc,2623
 fmtr/tools/entrypoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fmtr/tools/entrypoints/cache_hfh.py,sha256=fQNs4J9twQuZH_Yj98-oOvEX7-LrSUP3kO8nzw2HrHs,60
 fmtr/tools/entrypoints/ep_test.py,sha256=B8HfWISfSgw_xVX475CbJGh_QnpOe9MH65H8qGjTWbY,46
@@ -75,9 +74,11 @@ 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.3.8.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr_tools-1.3.8.dist-info/METADATA,sha256=m6mbZy-IYtew40xeEmDdyBYhxDLdfiLg_hhR_H2xMEc,16148
-fmtr_tools-1.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fmtr_tools-1.3.8.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
-fmtr_tools-1.3.8.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
-fmtr_tools-1.3.8.dist-info/RECORD,,
+fmtr/tools/version_tools/__init__.py,sha256=pg4iLtmIr5HtyEW_j0fMFoIdzqi_w9xH8-grQaXLB28,318
+fmtr/tools/version_tools/version_tools.py,sha256=Hcc6yferZS1hHbugRTdiHhSNmXEEG0hjCiTTXKna-YY,1127
+fmtr_tools-1.3.10.dist-info/licenses/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr_tools-1.3.10.dist-info/METADATA,sha256=9m1RZ98vJX10nSFr-cIsA7VaNfePzOTqRjyMj_jDv_o,15938
+fmtr_tools-1.3.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fmtr_tools-1.3.10.dist-info/entry_points.txt,sha256=h-r__Xh5njtFqreMLg6cGuTFS4Qh-QqJPU1HB-_BS-Q,357
+fmtr_tools-1.3.10.dist-info/top_level.txt,sha256=LXem9xCgNOD72tE2gRKESdiQTL902mfFkwWb6-dlwEE,5
+fmtr_tools-1.3.10.dist-info/RECORD,,

fmtr/tools/version_tools.py

@@ -1,62 +0,0 @@
-from fmtr.tools.import_tools import MissingExtraMockModule
-from fmtr.tools.inspection_tools import get_call_path
-
-try:
-    import semver
-
-    semver = semver
-    parse = semver.VersionInfo.parse
-except ImportError as exception:
-    # Special case to allow module import.
-    # Should be slit out into separate version.dev subpackage
-    parse = MissingExtraMockModule('version', exception)
-    semver = MissingExtraMockModule('version', exception)
-
-
-def read() -> str:
-    """
-
-    Read a generic version file from the calling package path.
-
-    """
-
-    path = get_call_path(offset=2).parent / 'version'
-    return read_path(path)
-
-
-def read_path(path) -> str:
-    """
-
-    Read in version from specified path
-
-    """
-    from fmtr.tools.tools import Constants
-    text = path.read_text(encoding=Constants.ENCODING).strip()
-
-    text = get(text)
-    return text
-
-
-def get(text) -> str:
-    """
-
-    Optionally add dev build info to raw version string.
-
-    """
-    import os
-    from fmtr.tools import datatype_tools
-
-    is_dev = datatype_tools.to_bool(os.getenv('FMTR_DEV', default=False))
-
-    if is_dev:
-        import datetime
-        from fmtr.tools.tools import Constants
-
-        timestamp = datetime.datetime.now(datetime.timezone.utc).strftime(Constants.DATETIME_SEMVER_BUILD_FORMAT)
-
-        version = parse(text)
-        version = version.bump_patch()
-        version = version.replace(prerelease='dev', build=timestamp)
-        text = str(version)
-
-    return text