fmtr.tools 1.0.24__py3-none-any.whl → 1.0.26__py3-none-any.whl

fmtr/tools/logging_tools.py

@@ -1,10 +1,24 @@
 import logging
+import os
+from logfire import ConsoleOptions
 
+from fmtr.tools import environment_tools
 
-def get_logger(name, version, level, environment):
+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 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.
 
     """
 
@@ -17,19 +31,29 @@ def get_logger(name, version, level, environment):
 
         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
+        send_to_logfire=False,
+        console=ConsoleOptions(colors='always' if environment_tools.IS_DEBUG else 'auto')
 
     )
 
     logging.getLogger(name).setLevel(level)
 
-    return logfire
+    logger = logfire
+    return logger
 
 
-logger = get_logger(name='fmtr.tools', version='0.0.0', level=logging.DEBUG, environment='dev')
+logger = get_logger(name='fmtr.tools', version='0.0.0')
 
 logger = get_logger()

fmtr/tools/version

@@ -1 +1 @@
-1.0.24
+1.0.26

{fmtr.tools-1.0.24.dist-info → fmtr.tools-1.0.26.dist-info}/METADATA

@@ -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
@@ -246,7 +246,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.dist-info → fmtr.tools-1.0.26.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=4kLmoRZ2dGlJQ2a9skjN-Dzoig2TTrQagTzOSHCC59E,764
+fmtr/tools/logging_tools.py,sha256=31zExdIo2hNplKHFc8vX30qXcTgpItvKSNtfVhJOSeY,1653
 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=NKsrXXSR5CF_60j-qlDbIX61NAgRq7jQYxPyZdMX-dk,6
+fmtr/tools/version,sha256=7IhJvp28Xo4-0k6CetFL-o-uYHtMu0UaRn-KBLcLn8s,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.24.dist-info/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
-fmtr.tools-1.0.24.dist-info/METADATA,sha256=Jzy_zKQS4nFe-JnldB4-bJB-QkD1dwQ7M264IrdPmnQ,12801
-fmtr.tools-1.0.24.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-fmtr.tools-1.0.24.dist-info/entry_points.txt,sha256=CEStVkwJ1mTFvhN1WV5RdW83SkNW1d5Syj-KZ6A19ng,72
-fmtr.tools-1.0.24.dist-info/top_level.txt,sha256=t5341a8ii3n4RFizwTeXGmcq_pf4GqL1h9ylE5LIWRk,12
-fmtr.tools-1.0.24.dist-info/RECORD,,
+fmtr.tools-1.0.26.dist-info/LICENSE,sha256=FW9aa6vVN5IjRQWLT43hs4_koYSmpcbIovlKeAJ0_cI,10757
+fmtr.tools-1.0.26.dist-info/METADATA,sha256=UvbXsSdI4ZH3xRSqVWhFJvizqghXHUztUX_y9q6bOc4,12817
+fmtr.tools-1.0.26.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+fmtr.tools-1.0.26.dist-info/entry_points.txt,sha256=CEStVkwJ1mTFvhN1WV5RdW83SkNW1d5Syj-KZ6A19ng,72
+fmtr.tools-1.0.26.dist-info/top_level.txt,sha256=t5341a8ii3n4RFizwTeXGmcq_pf4GqL1h9ylE5LIWRk,12
+fmtr.tools-1.0.26.dist-info/RECORD,,