oe-python-template-example 0.3.7__tar.gz → 0.3.8__tar.gz

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oe-python-template-example
-Version: 0.3.7
+Version: 0.3.8
 Summary: 🧠 Example project scaffolded and kept up to date with OE Python Template (oe-python-template).
 Project-URL: Homepage, https://oe-python-template-example.readthedocs.io/en/latest/
 Project-URL: Documentation, https://oe-python-template-example.readthedocs.io/en/latest/
@@ -163,7 +163,7 @@ Projects generated with this template come with a comprehensive development tool
 
 Beyond development tooling, projects generated with this template include the code, documentation, and configuration of a fully functioning application and service. This reference implementation serves as a starting point for your own business logic with modern patterns and enterprise practices already in place:
 
-1. Usable as library with "Hello" module exposing a simple service
+1. Usable as library with "Hello" module exposing a simple service that can say "Hello, world!" and echo utterances.
 2. Command-line interface (CLI) with [Typer](https://typer.tiangolo.com/)
 3. Versioned webservice API with [FastAPI](https://fastapi.tiangolo.com/)
 4. [Interactive Jupyter notebook](https://jupyter.org/) and [reactive Marimo notebook](https://marimo.io/)
@@ -173,8 +173,9 @@ Beyond development tooling, projects generated with this template include the co
 8. Info command enabling to inspect the runtime, compiled settings, and further info provided dynamically by modules
 9. Health endpoint exposing system health dynamically aggregated from all modules and dependencies
 10. Flexible logging and instrumentation, including support for [Sentry](https://sentry.io/) and [Logfire](https://logfire.dev/) 
-11. Modular architecture including auto-registration of services, CLI commands and API routes exposed by modules
-12. Documentation including dynamic badges, setup instructions, contribution guide and security policy
+11. Hello service demonstrates use of custom real time metrics collected via Logfire
+12. Modular architecture including auto-registration of services, CLI commands and API routes exposed by modules
+13. Documentation including dynamic badges, setup instructions, contribution guide and security policy
 
 Explore [here](https://github.com/helmut-hoffer-von-ankershoffen/oe-python-template-example) for what's generated out of the box.
 

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/README.md

@@ -90,7 +90,7 @@ Projects generated with this template come with a comprehensive development tool
 
 Beyond development tooling, projects generated with this template include the code, documentation, and configuration of a fully functioning application and service. This reference implementation serves as a starting point for your own business logic with modern patterns and enterprise practices already in place:
 
-1. Usable as library with "Hello" module exposing a simple service
+1. Usable as library with "Hello" module exposing a simple service that can say "Hello, world!" and echo utterances.
 2. Command-line interface (CLI) with [Typer](https://typer.tiangolo.com/)
 3. Versioned webservice API with [FastAPI](https://fastapi.tiangolo.com/)
 4. [Interactive Jupyter notebook](https://jupyter.org/) and [reactive Marimo notebook](https://marimo.io/)
@@ -100,8 +100,9 @@ Beyond development tooling, projects generated with this template include the co
 8. Info command enabling to inspect the runtime, compiled settings, and further info provided dynamically by modules
 9. Health endpoint exposing system health dynamically aggregated from all modules and dependencies
 10. Flexible logging and instrumentation, including support for [Sentry](https://sentry.io/) and [Logfire](https://logfire.dev/) 
-11. Modular architecture including auto-registration of services, CLI commands and API routes exposed by modules
-12. Documentation including dynamic badges, setup instructions, contribution guide and security policy
+11. Hello service demonstrates use of custom real time metrics collected via Logfire
+12. Modular architecture including auto-registration of services, CLI commands and API routes exposed by modules
+13. Documentation including dynamic badges, setup instructions, contribution guide and security policy
 
 Explore [here](https://github.com/helmut-hoffer-von-ankershoffen/oe-python-template-example) for what's generated out of the box.
 

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oe-python-template-example"
-version = "0.3.7"
+version = "0.3.8"
 description = "🧠 Example project scaffolded and kept up to date with OE Python Template (oe-python-template)."
 readme = "README.md"
 authors = [
@@ -278,7 +278,7 @@ source = ["src/"]
 
 
 [tool.bumpversion]
-current_version = "0.3.7"
+current_version = "0.3.8"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/src/oe_python_template_example/api.py

@@ -13,6 +13,7 @@ from .utils import (
     VersionedAPIRouter,
     __author_email__,
     __author_name__,
+    __base__url__,
     __documentation__url__,
     __repository_url__,
     locate_implementations,
@@ -26,6 +27,9 @@ CONTACT_EMAIL = __author_email__
 CONTACT_URL = __repository_url__
 TERMS_OF_SERVICE_URL = __documentation__url__
 
+API_BASE_URL = __base__url__
+if not API_BASE_URL:
+    API_BASE_URL = f"http://{UVICORN_HOST}:{UVICORN_PORT}"
 
 app = FastAPI(
     root_path="/api",
@@ -42,7 +46,7 @@ app = FastAPI(
             "description": f"API version {version.lstrip('v')}, check link on the right",
             "externalDocs": {
                 "description": "sub-docs",
-                "url": f"http://{UVICORN_HOST}:{UVICORN_PORT}/api/{version}/docs",
+                "url": f"{API_BASE_URL}/api/{version}/docs",
             },
         }
         for version, _ in API_VERSIONS.items()

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/src/oe_python_template_example/hello/_service.py

@@ -5,6 +5,7 @@ import string
 from http import HTTPStatus
 from typing import Any
 
+import logfire
 import requests
 
 from oe_python_template_example.utils import BaseService, Health
@@ -74,6 +75,9 @@ class Service(BaseService):
         Returns:
             str: Hello world message.
         """
+        messages_sent = logfire.metric_counter("hello_world_messages_sent")
+        messages_sent.add(1)
+
         match self._settings.language:
             case Language.GERMAN:
                 return HELLO_WORLD_DE_DE

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/src/oe_python_template_example/hello/_settings.py

@@ -3,10 +3,15 @@
 from enum import StrEnum
 from typing import Annotated
 
-from pydantic import Field
-from pydantic_settings import BaseSettings, SettingsConfigDict
+from pydantic import BeforeValidator, Field, PlainSerializer, SecretStr
+from pydantic_settings import SettingsConfigDict
 
-from oe_python_template_example.utils import __env_file__, __project_name__
+from oe_python_template_example.utils import (
+    OpaqueSettings,
+    __env_file__,
+    __project_name__,
+    strip_to_none_before_validator,
+)
 
 
 class Language(StrEnum):
@@ -18,7 +23,7 @@ class Language(StrEnum):
 
 # Settings derived from BaseSettings and exported by modules via their __init__.py are automatically registered
 # by the system module e.g. for showing all settings via the system info command.
-class Settings(BaseSettings):
+class Settings(OpaqueSettings):
     """Settings."""
 
     model_config = SettingsConfigDict(
@@ -35,3 +40,15 @@ class Settings(BaseSettings):
             description="Language to use for output - defaults to US english.",
         ),
     ]
+
+    token: Annotated[
+        SecretStr | None,
+        BeforeValidator(strip_to_none_before_validator),  # strip and if empty set to None
+        PlainSerializer(
+            func=OpaqueSettings.serialize_sensitive_info, return_type=str, when_used="always"
+        ),  # allow to unhide sensitive info from CLI or if user presents valid token via API
+        Field(
+            description="Secret token of Hello module.",
+            default=None,
+        ),
+    ]

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/src/oe_python_template_example/system/_service.py

@@ -149,7 +149,9 @@ class Service(BaseService):
         for settings_class in locate_subclasses(BaseSettings):
             settings_instance = load_settings(settings_class)
             env_prefix = settings_instance.model_config.get("env_prefix", "")
-            settings_dict = settings_instance.model_dump(context={UNHIDE_SENSITIVE_INFO: not filter_secrets})
+            settings_dict = json.loads(
+                settings_instance.model_dump_json(context={UNHIDE_SENSITIVE_INFO: not filter_secrets})
+            )
             for key, value in settings_dict.items():
                 flat_key = f"{env_prefix}{key}".upper()
                 settings[flat_key] = value

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/src/oe_python_template_example/utils/__init__.py

@@ -6,6 +6,7 @@ from ._console import console
 from ._constants import (
     __author_email__,
     __author_name__,
+    __base__url__,
     __documentation__url__,
     __env__,
     __env_file__,
@@ -23,7 +24,7 @@ from ._logfire import LogfireSettings
 from ._process import ProcessInfo, get_process_info
 from ._sentry import SentrySettings
 from ._service import BaseService
-from ._settings import UNHIDE_SENSITIVE_INFO, OpaqueSettings, load_settings
+from ._settings import UNHIDE_SENSITIVE_INFO, OpaqueSettings, load_settings, strip_to_none_before_validator
 from .boot import boot
 
 __all__ = [
@@ -39,6 +40,7 @@ __all__ = [
     "VersionedAPIRouter",
     "__author_email__",
     "__author_name__",
+    "__base__url__",
     "__documentation__url__",
     "__env__",
     "__env_file__",
@@ -56,4 +58,5 @@ __all__ = [
     "locate_implementations",
     "locate_subclasses",
     "prepare_cli",
+    "strip_to_none_before_validator",
 ]

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/src/oe_python_template_example/utils/_constants.py

@@ -5,6 +5,10 @@ import sys
 from importlib import metadata
 from pathlib import Path
 
+from dotenv import load_dotenv
+
+load_dotenv()
+
 __project_name__ = __name__.split(".")[0]
 __project_path__ = str(Path(__file__).parent.parent.parent)
 __version__ = metadata.version(__project_name__)
@@ -21,6 +25,13 @@ env_file_path = os.getenv(f"{__project_name__.upper()}_ENV_FILE")
 if env_file_path:
     __env_file__.insert(2, Path(env_file_path))
 
+vercel_base_url = os.getenv("VERCEL_URL", None)
+if vercel_base_url:
+    vercel_base_url = "https://" + vercel_base_url
+__base__url__ = os.getenv(__project_name__.upper() + "_BASE_URL", None)
+if not __base__url__ and vercel_base_url:
+    __base__url__ = vercel_base_url
+
 
 def get_project_url_by_label(prefix: str) -> str:
     """Get labeled Project-URL.

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/src/oe_python_template_example/utils/_logfire.py

@@ -3,11 +3,11 @@
 from typing import Annotated
 
 import logfire
-from pydantic import Field, PlainSerializer, SecretStr
+from pydantic import BeforeValidator, Field, PlainSerializer, SecretStr
 from pydantic_settings import SettingsConfigDict
 
 from ._constants import __env__, __env_file__, __project_name__, __repository_url__, __version__
-from ._settings import OpaqueSettings, load_settings
+from ._settings import OpaqueSettings, load_settings, strip_to_none_before_validator
 
 
 class LogfireSettings(OpaqueSettings):
@@ -22,6 +22,7 @@ class LogfireSettings(OpaqueSettings):
 
     token: Annotated[
         SecretStr | None,
+        BeforeValidator(strip_to_none_before_validator),
         PlainSerializer(func=OpaqueSettings.serialize_sensitive_info, return_type=str, when_used="always"),
         Field(description="Logfire token. Leave empty to disable logfire.", examples=["YOUR_TOKEN"], default=None),
     ]

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/src/oe_python_template_example/utils/_sentry.py

@@ -3,12 +3,12 @@
 from typing import Annotated
 
 import sentry_sdk
-from pydantic import Field, PlainSerializer, SecretStr
+from pydantic import BeforeValidator, Field, PlainSerializer, SecretStr
 from pydantic_settings import SettingsConfigDict
 from sentry_sdk.integrations.typer import TyperIntegration
 
 from ._constants import __env__, __env_file__, __project_name__, __version__
-from ._settings import OpaqueSettings, load_settings
+from ._settings import OpaqueSettings, load_settings, strip_to_none_before_validator
 
 
 class SentrySettings(OpaqueSettings):
@@ -23,6 +23,7 @@ class SentrySettings(OpaqueSettings):
 
     dsn: Annotated[
         SecretStr | None,
+        BeforeValidator(strip_to_none_before_validator),
         PlainSerializer(func=OpaqueSettings.serialize_sensitive_info, return_type=str, when_used="always"),
         Field(description="Sentry DSN", examples=["https://SECRET@SECRET.ingest.de.sentry.io/SECRET"], default=None),
     ]
@@ -44,12 +45,14 @@ class SentrySettings(OpaqueSettings):
         int,
         Field(
             description="Max breadcrumbs (https://docs.sentry.io/platforms/python/configuration/options/#max_breadcrumbs)",
-            default=5.0,
+            ge=0,
+            default=50,
         ),
     ]
     sample_rate: Annotated[
         float,
         Field(
+            ge=0.0,
             description="Sample Rate (https://docs.sentry.io/platforms/python/configuration/sampling/#sampling-error-events)",
             default=1.0,
         ),
@@ -57,6 +60,7 @@ class SentrySettings(OpaqueSettings):
     traces_sample_rate: Annotated[
         float,
         Field(
+            ge=0.0,
             description="Traces Sample Rate (https://docs.sentry.io/platforms/python/configuration/sampling/#configuring-the-transaction-sample-rate)",
             default=1.0,
         ),
@@ -64,6 +68,7 @@ class SentrySettings(OpaqueSettings):
     profiles_sample_rate: Annotated[
         float,
         Field(
+            ge=0.0,
             description="Traces Sample Rate (https://docs.sentry.io/platforms/python/tracing/#configure)",
             default=1.0,
         ),
@@ -84,7 +89,7 @@ def sentry_initialize() -> bool:
     sentry_sdk.init(
         release=f"{__project_name__}@{__version__}",  # https://docs.sentry.io/platforms/python/configuration/releases/,
         environment=__env__,
-        dsn=settings.dsn.get_secret_value(),
+        dsn=settings.dsn.get_secret_value().strip(),
         max_breadcrumbs=settings.max_breadcrumbs,
         debug=settings.debug,
         send_default_pii=settings.send_default_pii,

{oe_python_template_example-0.3.7 → oe_python_template_example-0.3.8}/src/oe_python_template_example/utils/_settings.py

@@ -20,6 +20,15 @@ logger = logging.getLogger(__name__)
 UNHIDE_SENSITIVE_INFO = "unhide_sensitive_info"
 
 
+def strip_to_none_before_validator(v: str | None) -> str | None:
+    if v is None:
+        return None
+    v = v.strip()
+    if not v:
+        return None
+    return v
+
+
 class OpaqueSettings(BaseSettings):
     @staticmethod
     def serialize_sensitive_info(input_value: SecretStr, info: FieldSerializationInfo) -> str | None: