fmtr.tools 1.0.26__tar.gz → 1.0.28__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.26
+Version: 1.0.28
 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

{fmtr.tools-1.0.26 → fmtr.tools-1.0.28}/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.26 → fmtr.tools-1.0.28}/fmtr/tools/logging_tools.py

@@ -1,20 +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, key=None, org=ToolsConfig.ORG_NAME,
+               stream=STREAM_DEFAULT,
                environment=ENVIRONMENT_DEFAULT, level=LEVEL_DEFAULT):
     """
 
@@ -31,21 +30,25 @@ 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"
+    if key is None:
+        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,
-        console=ConsoleOptions(colors='always' if environment_tools.IS_DEBUG else 'auto')
-
+        console=logfire.ConsoleOptions(colors='always' if environment_tools.IS_DEBUG else 'auto')
     )
 
     logging.getLogger(name).setLevel(level)
@@ -54,6 +57,9 @@ 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()
+if __name__ == '__main__':
+    logger.info('Hello World')
+    logger.warning('test warning')
+    logger.debug('Hello World')

fmtr.tools-1.0.28/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.28

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.26
+Version: 1.0.28
 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

{fmtr.tools-1.0.26 → fmtr.tools-1.0.28}/fmtr.tools.egg-info/requires.txt

@@ -7,15 +7,18 @@ torchvision
 transformers[sentencepiece]
 
 [ai.client]
+logfire
 ollama
 openai
 pydantic
-pydantic-ai[openai]
+pydantic-ai[logfire,openai]
+semver
 
 [api]
 fastapi
 logfire
 pydantic
+semver
 uvicorn
 
 [augmentation]
@@ -52,6 +55,7 @@ json_repair
 
 [logging]
 logfire
+semver
 
 [merging]
 deepmerge
@@ -72,6 +76,7 @@ distributed
 
 [process]
 logfire
+semver
 
 [profiling]
 contexttimer
@@ -107,7 +112,7 @@ openai
 pandas
 peft
 pydantic
-pydantic-ai[openai]
+pydantic-ai[logfire,openai]
 pytest-cov
 pyyaml
 semver

fmtr.tools-1.0.26/fmtr/tools/version

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