fmtr.tools 1.0.27__tar.gz → 1.0.29__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fmtr.tools
-Version: 1.0.27
+Version: 1.0.29
 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.27 → fmtr.tools-1.0.29}/fmtr/tools/logging_tools.py

@@ -1,6 +1,5 @@
 import logging
 import os
-from logfire import ConsoleOptions
 
 from fmtr.tools import environment_tools
 from fmtr.tools.config import ToolsConfig
@@ -13,7 +12,8 @@ ENVIRONMENT_DEFAULT = DEVELOPMENT
 LEVEL_DEFAULT = logging.DEBUG if environment_tools.IS_DEBUG else logging.INFO
 
 
-def get_logger(name, version=None, host=ToolsConfig.FMTR_OBS_HOST, org=ToolsConfig.ORG_NAME, 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):
     """
 
@@ -30,7 +30,8 @@ def get_logger(name, version=None, host=ToolsConfig.FMTR_OBS_HOST, org=ToolsConf
 
         return logger
 
-    key = environment_tools.get(ToolsConfig.FMTR_OBS_API_KEY_KEY)
+    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}"
 
@@ -47,7 +48,7 @@ def get_logger(name, version=None, host=ToolsConfig.FMTR_OBS_HOST, org=ToolsConf
         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)
@@ -58,4 +59,7 @@ def get_logger(name, version=None, host=ToolsConfig.FMTR_OBS_HOST, org=ToolsConf
 
 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.29/fmtr/tools/version

@@ -0,0 +1 @@
+1.0.29

{fmtr.tools-1.0.27 → fmtr.tools-1.0.29}/fmtr/tools/version_tools.py

@@ -14,19 +14,34 @@ except ImportError as exception:
 def read() -> str:
     """
 
-    Read a generic version file from the calling package path. Optionally add dev build info.
+    Read a generic version file from the calling package path.
 
     """
-    import os
+
     from fmtr.tools.tools import ToolsConfig
-    from fmtr.tools import datatype_tools
+
     path = get_call_path(offset=2).parent / 'version'
     text = path.read_text(encoding=ToolsConfig.ENCODING).strip()
 
+    text = get(text)
+
+    return text
+
+
+def get(text) -> str:
+    """
+
+    Optionally add dev build info.
+
+    """
+    import os
+    from fmtr.tools import datatype_tools
+
     is_dev = datatype_tools.to_bool(os.getenv('FMTR_DEV', default=False))
 
     if is_dev:
         import datetime
+        from fmtr.tools.tools import ToolsConfig
 
         timestamp = datetime.datetime.now(datetime.timezone.utc).strftime(ToolsConfig.DATETIME_SEMVER_BUILD_FORMAT)
 

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

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

@@ -7,10 +7,12 @@ torchvision
 transformers[sentencepiece]
 
 [ai.client]
+logfire
 ollama
 openai
 pydantic
-pydantic-ai[openai]
+pydantic-ai[logfire,openai]
+semver
 
 [api]
 fastapi
@@ -110,7 +112,7 @@ openai
 pandas
 peft
 pydantic
-pydantic-ai[openai]
+pydantic-ai[logfire,openai]
 pytest-cov
 pyyaml
 semver

fmtr.tools-1.0.27/fmtr/tools/version

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