provide-foundation 0.0.0.dev1__py3-none-any.whl → 0.0.0.dev2__py3-none-any.whl

provide/foundation/console/output.py

@@ -6,6 +6,7 @@ for JSON mode, colors, and proper stream separation.
 """
 
 import json
+import os
 import sys
 from typing import Any
 
@@ -17,34 +18,48 @@ except ImportError:
     click = None
     _HAS_CLICK = False
 
-from provide.foundation.context import Context
+from provide.foundation.context import CLIContext
+from provide.foundation.errors.decorators import with_error_handling
 from provide.foundation.logger import get_logger
 
 log = get_logger(__name__)
 
 
-def _get_context() -> Context | None:
+def _get_context() -> CLIContext | None:
     """Get current context from Click or environment."""
     if not _HAS_CLICK:
         return None
     ctx = click.get_current_context(silent=True)
-    if ctx and hasattr(ctx, "obj") and isinstance(ctx.obj, Context):
+    if ctx and hasattr(ctx, "obj") and isinstance(ctx.obj, CLIContext):
         return ctx.obj
     return None
 
 
-def _should_use_json(ctx: Context | None = None) -> bool:
+def _should_use_json(ctx: CLIContext | None = None) -> bool:
     """Determine if JSON output should be used."""
     if ctx is None:
         ctx = _get_context()
     return ctx.json_output if ctx else False
 
 
-def _should_use_color(ctx: Context | None = None, stream=None) -> bool:
+def _should_use_color(ctx: CLIContext | None = None, stream=None) -> bool:
     """Determine if color output should be used."""
     if ctx is None:
         ctx = _get_context()
 
+    # Check FORCE_COLOR first (enables color even for non-TTY)
+    force_color = os.environ.get('FORCE_COLOR', '').lower()
+    if force_color in ('1', 'true', 'yes'):
+        return True
+
+    # Check NO_COLOR (disables color even for TTY)
+    if os.environ.get('NO_COLOR'):
+        return False
+
+    # Check context no_color setting
+    if ctx and ctx.no_color:
+        return False
+
     # Check if stream is a TTY
     if stream:
         return getattr(stream, "isatty", lambda: False)()
@@ -52,19 +67,21 @@ def _should_use_color(ctx: Context | None = None, stream=None) -> bool:
     return sys.stdout.isatty() or sys.stderr.isatty()
 
 
+@with_error_handling(fallback=None, suppress=(TypeError, ValueError, AttributeError))
 def _output_json(data: Any, stream=sys.stdout) -> None:
     """Output data as JSON."""
-    try:
-        json_str = json.dumps(data, indent=2, default=str)
+    json_str = json.dumps(data, indent=2, default=str)
+    if _HAS_CLICK:
         click.echo(json_str, file=stream)
-    except (TypeError, ValueError) as e:
-        # Fallback to string representation
-        click.echo(
-            json.dumps({"error": f"JSON encoding failed: {e}", "data": str(data)}),
-            file=stream,
-        )
+    else:
+        print(json_str, file=stream)
 
 
+@with_error_handling(
+    fallback=None,
+    suppress=(OSError, IOError, UnicodeEncodeError),
+    context_provider=lambda: {"function": "pout"}
+)
 def pout(message: Any, **kwargs: Any) -> None:
     """
     Output message to stdout.
@@ -122,6 +139,11 @@ def pout(message: Any, **kwargs: Any) -> None:
                 print(output, file=sys.stdout, end="")
 
 
+@with_error_handling(
+    fallback=None,
+    suppress=(OSError, IOError, UnicodeEncodeError),
+    context_provider=lambda: {"function": "perr"}
+)
 def perr(message: Any, **kwargs: Any) -> None:
     """
     Output message to stderr.

provide/foundation/context/__init__.py

@@ -1,12 +1,16 @@
 """
 Core context management for provide-foundation.
 
-Provides unified application context that bridges configuration, runtime state,
-and presentation concerns across the foundation library.
+Provides CLI runtime context for managing command execution state,
+output formatting, and CLI-specific settings.
 """
 
-from provide.foundation.context.core import Context
+from provide.foundation.context.core import CLIContext
+
+# Backward compatibility
+Context = CLIContext
 
 __all__ = [
-    "Context",
+    "CLIContext",
+    "Context",  # Backward compatibility
 ]

provide/foundation/context/core.py

@@ -8,9 +8,11 @@ from typing import Any
 
 from attrs import define, field, fields, validators
 
+from provide.foundation.config.env import RuntimeConfig
+from provide.foundation.config.base import field as config_field, ConfigSource
+from provide.foundation.config.converters import parse_bool_strict
 from provide.foundation.logger import get_logger
 from provide.foundation.logger.config import TelemetryConfig
-from provide.foundation.utils.parsing import parse_bool
 
 try:
     import tomli as tomllib
@@ -29,36 +31,68 @@ except ImportError:
 VALID_LOG_LEVELS = {"DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"}
 
 
-@define(slots=True, frozen=False)
-class Context:
+@define(slots=True, repr=False)
+class CLIContext(RuntimeConfig):
     """
-    Unified context for configuration and CLI state.
+    Runtime context for CLI execution and state management.
 
-    Combines configuration management with runtime state for CLI tools
-    and services. Supports loading from files, environment variables,
-    and programmatic updates.
+    Manages CLI-specific settings, output formatting, and runtime state
+    during command execution. Supports loading from files, environment variables,
+    and programmatic updates during CLI command execution.
     """
 
-    log_level: str = field(
-        default="INFO", validator=validators.in_(VALID_LOG_LEVELS), converter=str.upper
+    log_level: str = config_field(
+        default="INFO",
+        env_var="PROVIDE_LOG_LEVEL",
+        converter=str.upper,
+        validator=validators.in_(VALID_LOG_LEVELS),
+        description="Logging level for CLI output"
     )
-    profile: str = field(default="default")
-    debug: bool = field(default=False, converter=lambda x: parse_bool(x, strict=True))
-    json_output: bool = field(
-        default=False, converter=lambda x: parse_bool(x, strict=True)
+    profile: str = config_field(
+        default="default",
+        env_var="PROVIDE_PROFILE",
+        description="Configuration profile to use"
     )
-    config_file: Path | None = field(
-        default=None, converter=lambda x: Path(x) if x else None
+    debug: bool = config_field(
+        default=False,
+        env_var="PROVIDE_DEBUG",
+        converter=parse_bool_strict,
+        description="Enable debug mode"
     )
-    log_file: Path | None = field(
-        default=None, converter=lambda x: Path(x) if x else None
+    json_output: bool = config_field(
+        default=False,
+        env_var="PROVIDE_JSON_OUTPUT",
+        converter=parse_bool_strict,
+        description="Output in JSON format"
     )
-    log_format: str = field(default="key_value")
-    no_color: bool = field(
-        default=False, converter=lambda x: parse_bool(x, strict=True)
+    config_file: Path | None = config_field(
+        default=None,
+        env_var="PROVIDE_CONFIG_FILE",
+        converter=lambda x: Path(x) if x else None,
+        description="Path to configuration file"
     )
-    no_emoji: bool = field(
-        default=False, converter=lambda x: parse_bool(x, strict=True)
+    log_file: Path | None = config_field(
+        default=None,
+        env_var="PROVIDE_LOG_FILE",
+        converter=lambda x: Path(x) if x else None,
+        description="Path to log file"
+    )
+    log_format: str = config_field(
+        default="key_value",
+        env_var="PROVIDE_LOG_FORMAT",
+        description="Log output format (key_value or json)"
+    )
+    no_color: bool = config_field(
+        default=False,
+        env_var="NO_COLOR",
+        converter=parse_bool_strict,
+        description="Disable colored output"
+    )
+    no_emoji: bool = config_field(
+        default=False,
+        env_var="PROVIDE_NO_EMOJI",
+        converter=parse_bool_strict,
+        description="Disable emoji in output"
     )
 
     # Private fields - using Factory for mutable defaults
@@ -69,62 +103,9 @@ class Context:
         """Post-initialization hook."""
         pass  # Validation is handled by attrs validators
 
-    def _validate(self) -> None:
-        """Validate context values. For attrs compatibility."""
-        # Validation is handled by attrs validators automatically
-        pass
-
-    @classmethod
-    def from_env(cls, prefix: str = "PROVIDE") -> "Context":
-        """
-        Create context from environment variables using TelemetryConfig system.
-
-        Args:
-            prefix: Environment variable prefix (default: PROVIDE)
-
-        Returns:
-            New Context instance with values from environment
-        """
-        # Use the main TelemetryConfig system for parsing
-        telemetry_config = TelemetryConfig.from_env(strict=False)
-
-        kwargs = {}
-
-        # Map telemetry config values to CLI context
-        kwargs["log_level"] = telemetry_config.logging.default_level
-        if telemetry_config.logging.console_formatter:
-            kwargs["log_format"] = telemetry_config.logging.console_formatter
-        if telemetry_config.logging.log_file:
-            kwargs["log_file"] = telemetry_config.logging.log_file
-
-        # CLI-specific environment variables that don't exist in TelemetryConfig
-        if profile := os.environ.get(f"{prefix}_PROFILE"):
-            kwargs["profile"] = profile
-
-        if debug := os.environ.get(f"{prefix}_DEBUG"):
-            kwargs["debug"] = debug.lower() in ("true", "1", "yes", "on")
-
-        if json_output := os.environ.get(f"{prefix}_JSON_OUTPUT"):
-            kwargs["json_output"] = json_output.lower() in ("true", "1", "yes", "on")
-
-        if config_file := os.environ.get(f"{prefix}_CONFIG_FILE"):
-            kwargs["config_file"] = Path(config_file)
-
-        # Map emoji settings to no_emoji (inverted)
-        kwargs["no_emoji"] = not (
-            telemetry_config.logging.logger_name_emoji_prefix_enabled
-            and telemetry_config.logging.das_emoji_prefix_enabled
-        )
-
-        # Check for explicit NO_COLOR override
-        if no_color := os.environ.get(f"{prefix}_NO_COLOR"):
-            kwargs["no_color"] = no_color.lower() in ("true", "1", "yes", "on")
-
-        return cls(**kwargs)
-
     def update_from_env(self, prefix: str = "PROVIDE") -> None:
         """
-        Update context from environment variables using TelemetryConfig system.
+        Update context from environment variables.
 
         Args:
             prefix: Environment variable prefix (default: PROVIDE)
@@ -132,28 +113,19 @@ class Context:
         if self._frozen:
             raise RuntimeError("Context is frozen and cannot be modified")
 
-        env_ctx = self.from_env(prefix)
-
-        # Update values from TelemetryConfig (these are always updated since they're the primary source)
-        self.log_level = env_ctx.log_level
-        self.log_format = env_ctx.log_format
-        if env_ctx.log_file:
-            self.log_file = env_ctx.log_file
-        self.no_emoji = env_ctx.no_emoji
-
-        # Update CLI-specific values only if explicitly set in environment
-        if os.environ.get(f"{prefix}_PROFILE"):
-            self.profile = env_ctx.profile
-        if os.environ.get(f"{prefix}_DEBUG"):
-            self.debug = env_ctx.debug
-        if os.environ.get(f"{prefix}_JSON_OUTPUT"):
-            self.json_output = env_ctx.json_output
-        if os.environ.get(f"{prefix}_CONFIG_FILE"):
-            self.config_file = env_ctx.config_file
-        if os.environ.get(f"{prefix}_NO_COLOR"):
-            self.no_color = env_ctx.no_color
-
-        self._validate()
+        # Create default instance and environment instance
+        default_ctx = self.__class__()  # All defaults
+        env_ctx = self.from_env(prefix=prefix)  # Environment + defaults
+        
+        # Only update fields where environment differs from default
+        for attr in fields(self.__class__):
+            if not attr.name.startswith("_"):  # Skip private fields
+                default_value = getattr(default_ctx, attr.name)
+                env_value = getattr(env_ctx, attr.name)
+                
+                # If environment value differs from default, it came from env
+                if env_value != default_value:
+                    setattr(self, attr.name, env_value)
 
     def to_dict(self) -> dict[str, Any]:
         """Convert context to dictionary."""
@@ -170,15 +142,16 @@ class Context:
         }
 
     @classmethod
-    def from_dict(cls, data: dict[str, Any]) -> "Context":
+    def from_dict(cls, data: dict[str, Any], source: ConfigSource = ConfigSource.RUNTIME) -> "CLIContext":
         """
         Create context from dictionary.
 
         Args:
             data: Dictionary with context values
+            source: Source of the configuration data
 
         Returns:
-            New Context instance
+            New CLIContext instance
         """
         kwargs = {}
 
@@ -212,9 +185,7 @@ class Context:
         Args:
             path: Path to configuration file
         """
-        if self._frozen:
-            raise RuntimeError("Context is frozen and cannot be modified")
-
+        # CLIContext is not frozen, so we can modify it
         path = Path(path)
         if not path.exists():
             raise FileNotFoundError(f"Config file not found: {path}")
@@ -294,16 +265,16 @@ class Context:
 
         path.write_text(content)
 
-    def merge(self, other: "Context", override_defaults: bool = False) -> "Context":
+    def merge(self, other: "CLIContext", override_defaults: bool = False) -> "CLIContext":
         """
         Merge with another context, with other taking precedence.
 
         Args:
-            other: Context to merge with
+            other: CLIContext to merge with
             override_defaults: If False, only override if other's value differs from its class default
 
         Returns:
-            New merged Context instance
+            New merged CLIContext instance
         """
         merged_data = self.to_dict()
         other_data = other.to_dict()
@@ -318,7 +289,7 @@ class Context:
             from attrs import Factory
 
             defaults = {}
-            for f in fields(Context):
+            for f in fields(CLIContext):
                 if not f.name.startswith("_"):  # Skip private fields
                     if isinstance(f.default, Factory):
                         defaults[f.name] = f.default.factory()
@@ -333,7 +304,7 @@ class Context:
                         continue
                     merged_data[key] = value
 
-        return Context.from_dict(merged_data)
+        return CLIContext.from_dict(merged_data)
 
     def freeze(self) -> None:
         """Freeze context to prevent further modifications."""
@@ -341,7 +312,7 @@ class Context:
         # This is kept for API compatibility but does nothing
         self._frozen = True
 
-    def copy(self) -> "Context":
+    def copy(self) -> "CLIContext":
         """Create a deep copy of the context."""
         return copy.deepcopy(self)
 
@@ -354,3 +325,8 @@ class Context:
                 profile=self.profile,
             )
         return self._logger
+
+    def _validate(self) -> None:
+        """Validate context values. For attrs compatibility."""
+        # Validation is handled by attrs validators automatically
+        pass

provide/foundation/crypto/certificates/operations.py

@@ -30,7 +30,7 @@ from provide.foundation.crypto.constants import (
     DEFAULT_CERTIFICATE_VALIDITY_DAYS,
     DEFAULT_RSA_KEY_SIZE,
 )
-from .base import CertificateBase, CertificateError, KeyPair, PublicKey
+from provide.foundation.crypto.certificates.base import CertificateBase, CertificateError, KeyPair, PublicKey
 
 
 def create_x509_certificate(

provide/foundation/errors/__init__.py

@@ -6,6 +6,8 @@ and utilities for robust error handling throughout the application.
 """
 
 from provide.foundation.errors.auth import AuthenticationError, AuthorizationError
+# Re-export from resilience module for compatibility
+from provide.foundation.resilience.decorators import retry as retry_on_error
 from provide.foundation.errors.base import FoundationError
 from provide.foundation.errors.config import (
     ConfigurationError,
@@ -20,7 +22,6 @@ from provide.foundation.errors.context import (
 )
 from provide.foundation.errors.decorators import (
     fallback_on_error,
-    retry_on_error,
     suppress_and_log,
     with_error_handling,
 )
@@ -50,7 +51,6 @@ from provide.foundation.errors.safe_decorators import log_only_error_context
 from provide.foundation.errors.types import (
     ErrorCode,
     ErrorMetadata,
-    RetryPolicy,
 )
 
 __all__ = [
@@ -77,7 +77,6 @@ __all__ = [
     "ProcessError",
     "ProcessTimeoutError",
     "ResourceError",
-    "RetryPolicy",
     "RuntimeError",
     "StateError",
     "TimeoutError",