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

fmtr/tools/logging_tools.py

@@ -1,71 +1,57 @@
-import sys
+import logging
+import os
 
-from fmtr.tools.config import ToolsConfig
-from fmtr.tools.config_tools import ConfigClass
-from fmtr.tools.environment_tools import get
-from fmtr.tools.path_tools import Path
+from fmtr.tools import environment_tools
 
+DEVELOPMENT = "development"
+PRODUCTION = "production"
+HOST_DEFAULT = "log.sv.fmtr.dev"
+ORG_DEFAULT = "fmtr"
+STREAM_DEFAULT = DEVELOPMENT
+ENVIRONMENT_DEFAULT = DEVELOPMENT
 
-class LoggingConfig(ConfigClass):
-    SEP = ' '
-    TIME = '<bold><green>{time:' + ToolsConfig.DATETIME_FILENAME_FORMAT + '}</green></bold>'
-    ICON = '<level>{level.icon}</level>'
-    LEVEL = '<level>{level:<8}</level>'
-    FILE = '{file}:{line}'
-    FUNCTION = '{function}(…)'
-    MESSAGE = '{message}'
-    DEFAULT_LEVEL_KEY = 'FMTR_LOG_LEVEL'
-    DEFAULT_LEVEL = get(DEFAULT_LEVEL_KEY, 'INFO')
+LEVEL_DEFAULT = logging.DEBUG if environment_tools.IS_DEBUG else logging.INFO
 
-    FILENAME = f'log-{ToolsConfig.DATETIME_NOW_STR}.log'
 
-
-def default_filter(record):
-    return True
-
-
-def default_patch(record):
-    return record
-
-
-def get_logger(terminal=True, level=LoggingConfig.DEFAULT_LEVEL, time_format=LoggingConfig.TIME,
-               icon_format=LoggingConfig.ICON,
-               level_format=LoggingConfig.LEVEL, file_format=LoggingConfig.FILE, function_format=LoggingConfig.FUNCTION,
-               message_format=LoggingConfig.MESSAGE,
-               logfile=False, logfile_dir=None):
+def get_logger(name, version, host=HOST_DEFAULT, org=ORG_DEFAULT, stream=STREAM_DEFAULT,
+               environment=ENVIRONMENT_DEFAULT, level=LEVEL_DEFAULT):
     """
 
-    Get a pre-configured loguru logger, if dependency is present, otherwise default to native logger.
+    Get a pre-configured logfire logger, if dependency is present, otherwise default to native logger.
 
     """
 
     try:
-        from loguru import logger as logger_loguru
-        logger = logger_loguru
+        import logfire
     except ImportError:
-        import logging
-
         logger = logging.getLogger(None)
         logger.setLevel(level)
+        logger.warning(f'Logging dependencies not installed. Using native logger.')
 
         return logger
 
+    key = environment_tools.get("FMTR_OBS_API_KEY")
+    traces_endpoint = 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_HEADERS"] = headers
+    os.environ["OTEL_EXPORTER_OTLP_INSECURE"] = str(False).lower()
 
-    components = [time_format, icon_format, level_format, file_format, function_format, message_format]
-    format = LoggingConfig.SEP.join([component for component in components if component])
-    logger.remove()
+    logfire.configure(
+        service_name=name,
+        service_version=version,
+        environment=environment,
+        send_to_logfire=False
 
-    if terminal:
-        logger.add(sys.stderr, format=format, level=level, filter=default_filter)
-        logger = logger.patch(default_patch)
+    )
 
-    if logfile:
-        logfile_dir = Path(logfile_dir or '.')
-        logfile_path = logfile_dir / LoggingConfig.FILENAME
-        logger.add(logfile_path, format=format)
+    logging.getLogger(name).setLevel(level)
 
+    logger = logfire
     return logger
 
 
+logger = get_logger(name='fmtr.tools', version='0.0.0')
+
 logger = get_logger()

fmtr/tools/version

@@ -1 +1 @@
-1.0.23
+1.0.25

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.23
+Version: 1.0.25
 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
@@ -21,7 +21,7 @@ Requires-Dist: pydantic ; extra == 'ai.client'
 Requires-Dist: pydantic-ai[openai] ; extra == 'ai.client'
 Provides-Extra: api
 Requires-Dist: fastapi ; extra == 'api'
-Requires-Dist: loguru ; extra == 'api'
+Requires-Dist: logfire ; extra == 'api'
 Requires-Dist: pydantic ; extra == 'api'
 Requires-Dist: uvicorn ; extra == 'api'
 Provides-Extra: augmentation
@@ -48,7 +48,7 @@ Requires-Dist: streamlit ; extra == 'interface'
 Provides-Extra: json-fix
 Requires-Dist: json-repair ; extra == 'json-fix'
 Provides-Extra: logging
-Requires-Dist: loguru ; extra == 'logging'
+Requires-Dist: logfire ; extra == 'logging'
 Provides-Extra: merging
 Requires-Dist: deepmerge ; extra == 'merging'
 Provides-Extra: metric
@@ -62,7 +62,7 @@ Requires-Dist: bokeh ; extra == 'parallel'
 Requires-Dist: dask[bag] ; extra == 'parallel'
 Requires-Dist: distributed ; extra == 'parallel'
 Provides-Extra: process
-Requires-Dist: loguru ; extra == 'process'
+Requires-Dist: logfire ; extra == 'process'
 Provides-Extra: profiling
 Requires-Dist: contexttimer ; extra == 'profiling'
 Provides-Extra: semantic
@@ -88,7 +88,7 @@ Requires-Dist: google-auth-oauthlib ; extra == 'test'
 Requires-Dist: html2text ; extra == 'test'
 Requires-Dist: huggingface-hub ; extra == 'test'
 Requires-Dist: json-repair ; extra == 'test'
-Requires-Dist: loguru ; extra == 'test'
+Requires-Dist: logfire ; extra == 'test'
 Requires-Dist: ollama ; extra == 'test'
 Requires-Dist: openai ; extra == 'test'
 Requires-Dist: pandas ; extra == 'test'
@@ -244,9 +244,9 @@ The included modules, plus any extra requirements, are as follows:
   - Extras: `semantic`
 - `tools.string`: Provides utilities for handling string formatting.
     - Extras: None
-- `tools.logging`: Configures and initializes a logger using the Loguru library. Provides customizable logging formats for time, level, file, function, and message components.
+- `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, timestamped, color-coded, etc.
+- `tools.logger`: Prefabricated `logger` object, suitable for most projects: service name, timestamped, etc.
     - Extras: `logging`
 - `tools.augmentation`: Data augmentation stub.
     - Extras: `augmentation`

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

@@ -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=bO2w0L68IQSD4-ZEdSRxC_hrvZJGih1FNzPTO3inGEA,2040
+fmtr/tools/logging_tools.py,sha256=-2yq4Q4ix2GAhfaiVVIewTugVJhRQbCC5WhUX0pBbH0,1527
 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=-0IsOoAYGw3apMf_bkqNUj3ez-bflN6Nhv4yAlIek9U,6
+fmtr/tools/version,sha256=g68-alC5ZPPI3XsrxUra7Vi69ztfWGBJHODg-kMqXc4,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.23.dist-info/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr.tools-1.0.23.dist-info/METADATA,sha256=DnR_GKPlVgKaCMqgLCiqWnA0XaDQqvg5a_RiHqp_7qQ,12854
-fmtr.tools-1.0.23.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-fmtr.tools-1.0.23.dist-info/entry_points.txt,sha256=CEStVkwJ1mTFvhN1WV5RdW83SkNW1d5Syj-KZ6A19ng,72
-fmtr.tools-1.0.23.dist-info/top_level.txt,sha256=t5341a8ii3n4RFizwTeXGmcq_pf4GqL1h9ylE5LIWRk,12
-fmtr.tools-1.0.23.dist-info/RECORD,,
+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,,