fmtr.tools 1.3.9__tar.gz → 1.3.11__tar.gz

{fmtr_tools-1.3.9 → fmtr_tools-1.3.11}/PKG-INFO

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

{fmtr_tools-1.3.9 → fmtr_tools-1.3.11}/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-1.3.9 → fmtr_tools-1.3.11}/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-1.3.9 → fmtr_tools-1.3.11}/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,8 @@ class Constants:
     ENTRYPOINTS_DIR = 'entrypoints'
     PACKAGE_EXCLUDE_DIRS = {'data', 'build', 'dist', '.*', '*egg-info*'}
     INIT_FILENAME = '__init__.py'
+
+    DEVELOPMENT = "development"
+    PRODUCTION = "production"
+
+    INFRA = 'infra'

{fmtr_tools-1.3.9 → fmtr_tools-1.3.11}/fmtr/tools/dns_tools/server.py

@@ -88,7 +88,7 @@ class Plain:
                 exchange = self.resolve(exchange)
                 exchange.response.is_complete = True
 
-        self.cache[exchange.key] = exchange.response
+            self.cache[exchange.key] = exchange.response
 
-        logger.info(f'Resolution complete {request.message.id=} {exchange.response.answer=}')
+            logger.info(f'Resolution complete {request.message.id=} {exchange.response.answer=}')
         return exchange

{fmtr_tools-1.3.9 → fmtr_tools-1.3.11}/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-1.3.9 → fmtr_tools-1.3.11}/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-1.3.11/fmtr/tools/version

@@ -0,0 +1 @@
+1.3.11

fmtr_tools-1.3.11/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-1.3.11/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-1.3.9 → fmtr_tools-1.3.11}/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.9 → fmtr_tools-1.3.11}/fmtr.tools.egg-info/PKG-INFO

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

{fmtr_tools-1.3.9 → fmtr_tools-1.3.11}/fmtr.tools.egg-info/SOURCES.txt

@@ -49,7 +49,6 @@ setup.py
 ./fmtr/tools/tools.py
 ./fmtr/tools/unicode_tools.py
 ./fmtr/tools/version
-./fmtr/tools/version_tools.py
 ./fmtr/tools/yaml_tools.py
 ./fmtr/tools/ai_tools/__init__.py
 ./fmtr/tools/ai_tools/agentic_tools.py
@@ -79,6 +78,8 @@ setup.py
 ./fmtr/tools/tests/test_json.py
 ./fmtr/tools/tests/test_path.py
 ./fmtr/tools/tests/test_yaml.py
+./fmtr/tools/version_tools/__init__.py
+./fmtr/tools/version_tools/version_tools.py
 fmtr.tools.egg-info/PKG-INFO
 fmtr.tools.egg-info/SOURCES.txt
 fmtr.tools.egg-info/dependency_links.txt
@@ -132,7 +133,6 @@ fmtr/tools/tokenization_tools.py
 fmtr/tools/tools.py
 fmtr/tools/unicode_tools.py
 fmtr/tools/version
-fmtr/tools/version_tools.py
 fmtr/tools/yaml_tools.py
 fmtr/tools/ai_tools/__init__.py
 fmtr/tools/ai_tools/agentic_tools.py
@@ -161,4 +161,6 @@ fmtr/tools/tests/test_datatype.py
 fmtr/tools/tests/test_environment.py
 fmtr/tools/tests/test_json.py
 fmtr/tools/tests/test_path.py
-fmtr/tools/tests/test_yaml.py
+fmtr/tools/tests/test_yaml.py
+fmtr/tools/version_tools/__init__.py
+fmtr/tools/version_tools/version_tools.py

{fmtr_tools-1.3.9 → fmtr_tools-1.3.11}/fmtr.tools.egg-info/requires.txt

@@ -8,74 +8,72 @@ pydantic
 
 [ai.client]
 logfire
-semver
 pydantic
 openai
 pydantic-ai[logfire,openai]
 ollama
 
 [all]
-uvicorn[standard]
-json_repair
-httpx
-openai
-openpyxl
-flet[all]
-regex
-tabulate
+setuptools
 tinynetrc
-filetype
-google-api-python-client
-yamlscript
-tokenizers
-deepmerge
-sre_yield
-diskcache
+contexttimer
+tabulate
 transformers[sentencepiece]
-google-auth-oauthlib
+peft
+html2text
+pymupdf
+torchvision
+docker
+openai
+json_repair
+semver
 Unidecode
-sentence_transformers
-logfire
-logfire[fastapi]
+httpx_retries
 pydantic
-semver
-dnspython[doh]
-pydevd-pycharm~=251.25410.159
-google-auth-httplib2
+pyyaml
 pymupdf4llm
-html2text
-google-auth
+regex
+bokeh
+sre_yield
 pydantic-settings
+distributed
+openpyxl
 huggingface_hub
-pyyaml
-torchvision
-pymupdf
+filetype
+yamlscript
 fastapi
-logfire[httpx]
-contexttimer
-httpx_retries
-dask[bag]
-peft
-distributed
-docker
-faker
-cachetools
 torchaudio
-setuptools
-pytest-cov
-pydantic-ai[logfire,openai]
+google-api-python-client
+dask[bag]
+google-auth
+pydevd-pycharm~=251.25410.159
 flet-video
+sentence_transformers
+ollama
+google-auth-httplib2
+cachetools
+deepmerge
+google-auth-oauthlib
 flet-webview
-appdirs
+logfire[httpx]
+logfire[fastapi]
+dnspython[doh]
+httpx
+faker
 pandas
-bokeh
-ollama
+diskcache
+tokenizers
+pydantic-ai[logfire,openai]
+appdirs
+flet[all]
+uvicorn[standard]
+pytest-cov
+logfire
 
 [api]
 fastapi
 uvicorn[standard]
 logfire
-semver
 pydantic
 logfire[fastapi]
 
@@ -98,7 +96,6 @@ dnspython[doh]
 httpx
 httpx_retries
 logfire
-semver
 logfire[httpx]
 
 [docker.api]
@@ -120,7 +117,6 @@ html2text
 httpx
 httpx_retries
 logfire
-semver
 logfire[httpx]
 
 [interface]
@@ -134,7 +130,6 @@ json_repair
 
 [logging]
 logfire
-semver
 
 [merging]
 deepmerge
@@ -171,7 +166,6 @@ pymupdf4llm
 
 [process]
 logfire
-semver
 
 [profiling]
 contexttimer
@@ -209,6 +203,8 @@ tokenizers
 Unidecode
 
 [version]
+
+[version.dev]
 semver
 
 [yaml]

{fmtr_tools-1.3.9 → fmtr_tools-1.3.11}/setup.py

@@ -12,7 +12,8 @@ DEPENDENCIES = {
     'profiling': ['contexttimer'],
     'docker.api': ['docker'],
     'unicode': ['Unidecode'],
-    'version': ['semver'],
+    'version': [],
+    'version.dev': ['semver'],
     'spaces': ['netrc'],
     'netrc': ['tinynetrc'],
     'hfh': ['huggingface_hub'],

fmtr_tools-1.3.9/fmtr/tools/version

@@ -1 +0,0 @@
-1.3.9

fmtr_tools-1.3.9/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