fmtr.tools 1.0.25__py3-none-any.whl → 1.0.27__py3-none-any.whl

fmtr/tools/config.py

@@ -5,7 +5,8 @@ from fmtr.tools.config_tools import ConfigClass
 
 class ToolsConfig(ConfigClass):
     ENCODING = 'UTF-8'
-    LIBRARY_NAME = 'fmtr.tools'
+    ORG_NAME = 'fmtr'
+    LIBRARY_NAME = f'{ORG_NAME}.tools'
     DATE_FILENAME_FORMAT = '%Y-%m-%d'
     TIME_FILENAME_FORMAT = '%H-%M-%S'
 
@@ -16,3 +17,5 @@ class ToolsConfig(ConfigClass):
     SERIALIZATION_INDENT = 4
 
     FMTR_LOG_LEVEL_KEY = 'FMTR_LOG_LEVEL'
+    FMTR_OBS_API_KEY_KEY = 'FMTR_OBS_API_KEY'
+    FMTR_OBS_HOST = 'log.sv.fmtr.dev'

fmtr/tools/logging_tools.py

@@ -1,19 +1,19 @@
 import logging
 import os
+from logfire import ConsoleOptions
 
 from fmtr.tools import environment_tools
+from fmtr.tools.config import ToolsConfig
 
 DEVELOPMENT = "development"
 PRODUCTION = "production"
-HOST_DEFAULT = "log.sv.fmtr.dev"
-ORG_DEFAULT = "fmtr"
 STREAM_DEFAULT = DEVELOPMENT
 ENVIRONMENT_DEFAULT = DEVELOPMENT
 
 LEVEL_DEFAULT = logging.DEBUG if environment_tools.IS_DEBUG else logging.INFO
 
 
-def get_logger(name, version, host=HOST_DEFAULT, org=ORG_DEFAULT, stream=STREAM_DEFAULT,
+def get_logger(name, version=None, host=ToolsConfig.FMTR_OBS_HOST, org=ToolsConfig.ORG_NAME, stream=STREAM_DEFAULT,
                environment=ENVIRONMENT_DEFAULT, level=LEVEL_DEFAULT):
     """
 
@@ -30,20 +30,24 @@ def get_logger(name, version, host=HOST_DEFAULT, org=ORG_DEFAULT, stream=STREAM_
 
         return logger
 
-    key = environment_tools.get("FMTR_OBS_API_KEY")
-    traces_endpoint = f"https://{host}/api/{org}/v1/traces"
+    key = environment_tools.get(ToolsConfig.FMTR_OBS_API_KEY_KEY)
+    url = f"https://{host}/api/{org}/v1/traces"
     headers = f"Authorization=Basic {key},stream-name={stream}"
 
-    os.environ["OTEL_EXPORTER_OTLP_TRACES_ENDPOINT"] = traces_endpoint
+    os.environ["OTEL_EXPORTER_OTLP_TRACES_ENDPOINT"] = url
     os.environ["OTEL_EXPORTER_OTLP_HEADERS"] = headers
     os.environ["OTEL_EXPORTER_OTLP_INSECURE"] = str(False).lower()
 
+    if not version:
+        from fmtr.tools import version_tools
+        version = version_tools.read()
+
     logfire.configure(
         service_name=name,
         service_version=version,
         environment=environment,
-        send_to_logfire=False
-
+        send_to_logfire=False,
+        console=ConsoleOptions(colors='always' if environment_tools.IS_DEBUG else 'auto')
     )
 
     logging.getLogger(name).setLevel(level)
@@ -52,6 +56,6 @@ def get_logger(name, version, host=HOST_DEFAULT, org=ORG_DEFAULT, stream=STREAM_
     return logger
 
 
-logger = get_logger(name='fmtr.tools', version='0.0.0')
+logger = get_logger(name=ToolsConfig.LIBRARY_NAME)
 
 logger = get_logger()

fmtr/tools/version

@@ -1 +1 @@
-1.0.25
+1.0.27

{fmtr.tools-1.0.25.dist-info → fmtr.tools-1.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.25
+Version: 1.0.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
@@ -23,6 +23,7 @@ Provides-Extra: api
 Requires-Dist: fastapi ; extra == 'api'
 Requires-Dist: logfire ; extra == 'api'
 Requires-Dist: pydantic ; extra == 'api'
+Requires-Dist: semver ; extra == 'api'
 Requires-Dist: uvicorn ; extra == 'api'
 Provides-Extra: augmentation
 Requires-Dist: faker ; extra == 'augmentation'
@@ -49,6 +50,7 @@ Provides-Extra: json-fix
 Requires-Dist: json-repair ; extra == 'json-fix'
 Provides-Extra: logging
 Requires-Dist: logfire ; extra == 'logging'
+Requires-Dist: semver ; extra == 'logging'
 Provides-Extra: merging
 Requires-Dist: deepmerge ; extra == 'merging'
 Provides-Extra: metric
@@ -63,6 +65,7 @@ Requires-Dist: dask[bag] ; extra == 'parallel'
 Requires-Dist: distributed ; extra == 'parallel'
 Provides-Extra: process
 Requires-Dist: logfire ; extra == 'process'
+Requires-Dist: semver ; extra == 'process'
 Provides-Extra: profiling
 Requires-Dist: contexttimer ; extra == 'profiling'
 Provides-Extra: semantic
@@ -246,7 +249,8 @@ The included modules, plus any extra requirements, are as follows:
     - Extras: None
 - `tools.logging`: Configures and initializes a logger using the Logfire library to log to an OpenTelemetry consumer.
     - Extras: `logging`
-- `tools.logger`: Prefabricated `logger` object, suitable for most projects: service name, timestamped, etc.
+- `tools.logger`: Prefabricated
+  `logger` object, suitable for most projects: service name, colour-coded, timestamped, etc.
     - Extras: `logging`
 - `tools.augmentation`: Data augmentation stub.
     - Extras: `augmentation`

{fmtr.tools-1.0.25.dist-info → fmtr.tools-1.0.27.dist-info}/RECORD

@@ -4,7 +4,7 @@ fmtr/tools/api_tools.py,sha256=KU_qetI7WQRZijZ0l1nCKjPcRbseMMCWj0W8n_NTJCM,2027
 fmtr/tools/async_tools.py,sha256=ewz757WcveQJd-G5SVr2JDOQVbdLGecCgl-tsBGVZz4,284
 fmtr/tools/augmentation_tools.py,sha256=-6ESbO4CDlKqVOV1J1V6qBeoBMzbFIinkDHRHnCBej0,55
 fmtr/tools/caching_tools.py,sha256=UOCYUNvLQ-NofR_dhqBmZF96-HRPf4At5MmxVk3gAIk,2943
-fmtr/tools/config.py,sha256=YBnasdUeRnP9LpyXLAukx8K4-41CM3aNhZyxHb-wBXc,602
+fmtr/tools/config.py,sha256=AUlNqXqJxB8muPwM7AQMDsET9B51BmMQaNr8YoROjNo,715
 fmtr/tools/config_tools.py,sha256=27PbPYj90ClIW4QcRoUoiFM3SbWeMIIZsZR32IPU4V8,805
 fmtr/tools/console_script_tools.py,sha256=T968S6fL--84G5ALaKwcTAzUOFyVhTU7Ts6qbk8oaeE,65
 fmtr/tools/data_modelling_tools.py,sha256=bggZ-INJWr4depWC00lfXhzBtoFUOdon7Xahrj76vrY,574
@@ -23,7 +23,7 @@ fmtr/tools/interface_tools.py,sha256=fi0KW0veB2NQCmVmCA9iJUL_03gz0MD-gJ4OK-QUBVA
 fmtr/tools/iterator_tools.py,sha256=xj5f0c7LgLK53dddRRRJxBoLaBzlZoQS3_GfmpDPMoo,1311
 fmtr/tools/json_fix_tools.py,sha256=vNSlswVQnujPmKEqDjFJcO901mjMyv59q3awsT7mlhs,477
 fmtr/tools/json_tools.py,sha256=IKmrANhcftIz2msCZeItidJ1PcpY_tnbfxbRDnta-c0,349
-fmtr/tools/logging_tools.py,sha256=-2yq4Q4ix2GAhfaiVVIewTugVJhRQbCC5WhUX0pBbH0,1527
+fmtr/tools/logging_tools.py,sha256=-4I-Wb76RBFyEpPKV0xWw5qVAyHnbnTaC7CkHdO6hx4,1757
 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
@@ -41,7 +41,7 @@ fmtr/tools/string_tools.py,sha256=w0lw70bgzJ8tAHj_4lMrjtMyefE5kELgpCBgGzGcalo,31
 fmtr/tools/tokenization_tools.py,sha256=9FP5vgPufWv0XA961eVKObFll0d_2mM0W3ut3rtZyeo,4329
 fmtr/tools/tools.py,sha256=xnfUrOnrT4OxFYez6vV5tAhydzCICJFiGVnviiZDEQo,796
 fmtr/tools/unicode_tools.py,sha256=yS_9wpu8ogNoiIL7s1G_8bETFFO_YQlo4LNPv1NLDeY,52
-fmtr/tools/version,sha256=g68-alC5ZPPI3XsrxUra7Vi69ztfWGBJHODg-kMqXc4,6
+fmtr/tools/version,sha256=tMqbun-S_JrDZ7Qkw2sg9_dBM4nxyG1EwedIUztopKE,6
 fmtr/tools/version_tools.py,sha256=pHxD425tc5JhGfMjE3-lRLnJOVPpf63Y5FGha5ntiVY,1112
 fmtr/tools/yaml_tools.py,sha256=Ol43ZwbnSXGnn1K98Uxx61KPGSqfC4axE-X2q1LKMwk,349
 fmtr/tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -52,9 +52,9 @@ fmtr/tools/tests/test_environment.py,sha256=iHaiMQfECYZPkPKwfuIZV9uHuWe3aE-p_dN_
 fmtr/tools/tests/test_json.py,sha256=IeSP4ziPvRcmS8kq7k9tHonC9rN5YYq9GSNT2ul6Msk,287
 fmtr/tools/tests/test_path.py,sha256=AkZQa6_8BQ-VaCyL_J-iKmdf2ZaM-xFYR37Kun3k4_g,2188
 fmtr/tools/tests/test_yaml.py,sha256=jc0TwwKu9eC0LvFGNMERdgBue591xwLxYXFbtsRwXVM,287
-fmtr.tools-1.0.25.dist-info/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr.tools-1.0.25.dist-info/METADATA,sha256=M81uS0nLsDF31jgvgrzFIk_n05ls5u912iakzyZBpsA,12801
-fmtr.tools-1.0.25.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-fmtr.tools-1.0.25.dist-info/entry_points.txt,sha256=CEStVkwJ1mTFvhN1WV5RdW83SkNW1d5Syj-KZ6A19ng,72
-fmtr.tools-1.0.25.dist-info/top_level.txt,sha256=t5341a8ii3n4RFizwTeXGmcq_pf4GqL1h9ylE5LIWRk,12
-fmtr.tools-1.0.25.dist-info/RECORD,,
+fmtr.tools-1.0.27.dist-info/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr.tools-1.0.27.dist-info/METADATA,sha256=M4_BVM2K1c5IuabYoda-aF0NDPz0wbY09JNKdpYTSIQ,12942
+fmtr.tools-1.0.27.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+fmtr.tools-1.0.27.dist-info/entry_points.txt,sha256=CEStVkwJ1mTFvhN1WV5RdW83SkNW1d5Syj-KZ6A19ng,72
+fmtr.tools-1.0.27.dist-info/top_level.txt,sha256=t5341a8ii3n4RFizwTeXGmcq_pf4GqL1h9ylE5LIWRk,12
+fmtr.tools-1.0.27.dist-info/RECORD,,