fmtr.tools 1.0.25__tar.gz → 1.0.27__tar.gz

{fmtr.tools-1.0.25 → fmtr.tools-1.0.27}/PKG-INFO

@@ -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
@@ -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.25 → fmtr.tools-1.0.27}/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.25 → fmtr.tools-1.0.27}/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-1.0.25 → fmtr.tools-1.0.27}/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-1.0.27/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.27

{fmtr.tools-1.0.25 → fmtr.tools-1.0.27}/fmtr.tools.egg-info/PKG-INFO

@@ -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
@@ -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.25 → fmtr.tools-1.0.27}/fmtr.tools.egg-info/requires.txt

@@ -16,6 +16,7 @@ pydantic-ai[openai]
 fastapi
 logfire
 pydantic
+semver
 uvicorn
 
 [augmentation]
@@ -52,6 +53,7 @@ json_repair
 
 [logging]
 logfire
+semver
 
 [merging]
 deepmerge
@@ -72,6 +74,7 @@ distributed
 
 [process]
 logfire
+semver
 
 [profiling]
 contexttimer

fmtr.tools-1.0.25/fmtr/tools/version

@@ -1 +0,0 @@
-1.0.25