fmtr.tools 1.0.23__tar.gz → 1.0.24__tar.gz

{fmtr.tools-1.0.23 → fmtr.tools-1.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.23
+Version: 1.0.24
 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
@@ -164,9 +164,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 → fmtr.tools-1.0.24}/README.md

@@ -126,9 +126,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.24/fmtr/tools/logging_tools.py

@@ -0,0 +1,35 @@
+import logging
+
+
+def get_logger(name, version, level, environment):
+    """
+
+    Get a pre-configured loguru logger, if dependency is present, otherwise default to native logger.
+
+    """
+
+    try:
+        import logfire
+    except ImportError:
+        logger = logging.getLogger(None)
+        logger.setLevel(level)
+        logger.warning(f'Logging dependencies not installed. Using native logger.')
+
+        return logger
+
+    logfire.configure(
+        service_name=name,
+        service_version=version,
+        environment=environment,
+        send_to_logfire=False
+
+    )
+
+    logging.getLogger(name).setLevel(level)
+
+    return logfire
+
+
+logger = get_logger(name='fmtr.tools', version='0.0.0', level=logging.DEBUG, environment='dev')
+
+logger = get_logger()

fmtr.tools-1.0.24/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.24

{fmtr.tools-1.0.23 → fmtr.tools-1.0.24}/fmtr.tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.23
+Version: 1.0.24
 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
@@ -164,9 +164,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 → fmtr.tools-1.0.24}/fmtr.tools.egg-info/requires.txt

@@ -14,7 +14,7 @@ pydantic-ai[openai]
 
 [api]
 fastapi
-loguru
+logfire
 pydantic
 uvicorn
 
@@ -51,7 +51,7 @@ streamlit
 json_repair
 
 [logging]
-loguru
+logfire
 
 [merging]
 deepmerge
@@ -71,7 +71,7 @@ dask[bag]
 distributed
 
 [process]
-loguru
+logfire
 
 [profiling]
 contexttimer
@@ -101,7 +101,7 @@ google-auth-oauthlib
 html2text
 huggingface_hub
 json_repair
-loguru
+logfire
 ollama
 openai
 pandas

fmtr.tools-1.0.23/fmtr/tools/logging_tools.py

@@ -1,71 +0,0 @@
-import sys
-
-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
-
-
-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')
-
-    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):
-    """
-
-    Get a pre-configured loguru logger, if dependency is present, otherwise default to native logger.
-
-    """
-
-    try:
-        from loguru import logger as logger_loguru
-        logger = logger_loguru
-    except ImportError:
-        import logging
-
-        logger = logging.getLogger(None)
-        logger.setLevel(level)
-
-        return logger
-
-
-
-    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()
-
-    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)
-
-    return logger
-
-
-logger = get_logger()

fmtr.tools-1.0.23/fmtr/tools/version

@@ -1 +0,0 @@
-1.0.23