fmtr.tools 1.0.24__tar.gz → 1.0.26__tar.gz

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

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

@@ -128,7 +128,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.26/fmtr/tools/logging_tools.py

@@ -0,0 +1,59 @@
+import logging
+import os
+from logfire import ConsoleOptions
+
+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
+
+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,
+               environment=ENVIRONMENT_DEFAULT, level=LEVEL_DEFAULT):
+    """
+
+    Get a pre-configured logfire 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
+
+    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()
+
+    logfire.configure(
+        service_name=name,
+        service_version=version,
+        environment=environment,
+        send_to_logfire=False,
+        console=ConsoleOptions(colors='always' if environment_tools.IS_DEBUG else 'auto')
+
+    )
+
+    logging.getLogger(name).setLevel(level)
+
+    logger = logfire
+    return logger
+
+
+logger = get_logger(name='fmtr.tools', version='0.0.0')
+
+logger = get_logger()

fmtr.tools-1.0.26/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.26

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.24
+Version: 1.0.26
 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
@@ -166,7 +166,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.24/fmtr/tools/logging_tools.py

@@ -1,35 +0,0 @@
-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

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