airia 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

airia/__init__.py

@@ -1,6 +1,19 @@
-from .logs import configure_logging
+from .logs import (
+    configure_logging,
+    set_correlation_id,
+    get_correlation_id,
+    clear_correlation_id,
+)
 from .client import AiriaClient, AiriaAsyncClient
 from .exceptions import AiriaAPIError
 
 __version__ = "0.1.0"
-__all__ = ["AiriaClient", "AiriaAsyncClient", "AiriaAPIError", "configure_logging"]
+__all__ = [
+    "AiriaClient",
+    "AiriaAsyncClient",
+    "AiriaAPIError",
+    "configure_logging",
+    "set_correlation_id",
+    "get_correlation_id",
+    "clear_correlation_id",
+]

airia/client/_request_handler/async_request_handler.py

@@ -1,9 +1,9 @@
 import asyncio
+import logging
 import weakref
 from typing import Any, AsyncIterator, Dict, Optional
 
 import aiohttp
-import loguru
 
 from ...exceptions import AiriaAPIError
 from ...types._request_data import RequestData
@@ -14,7 +14,7 @@ from .base_request_handler import BaseRequestHandler
 class AsyncRequestHandler(BaseRequestHandler):
     def __init__(
         self,
-        logger: "loguru.Logger",
+        logger: logging.Logger,
         timeout: float,
         base_url: str,
         api_key: Optional[str] = None,

airia/client/_request_handler/base_request_handler.py

@@ -1,8 +1,7 @@
 import json
+import logging
 from typing import Any, Dict, Optional
 
-import loguru
-
 from ...logs import set_correlation_id
 from ...types._request_data import RequestData
 
@@ -10,7 +9,7 @@ from ...types._request_data import RequestData
 class BaseRequestHandler:
     def __init__(
         self,
-        logger: "loguru.Logger",
+        logger: logging.Logger,
         timeout: float,
         base_url: str,
         api_key: Optional[str] = None,

airia/client/_request_handler/sync_request_handler.py

@@ -1,7 +1,7 @@
+import logging
 import weakref
 from typing import Any, Dict, Optional
 
-import loguru
 import requests
 
 from ...exceptions import AiriaAPIError
@@ -13,7 +13,7 @@ from .base_request_handler import BaseRequestHandler
 class RequestHandler(BaseRequestHandler):
     def __init__(
         self,
-        logger: "loguru.Logger",
+        logger: logging.Logger,
         timeout: float,
         base_url: str,
         api_key: Optional[str] = None,

airia/client/async_client.py

@@ -1,7 +1,6 @@
+import logging
 from typing import Optional
 
-import loguru
-
 from ..constants import (
     DEFAULT_ANTHROPIC_GATEWAY_URL,
     DEFAULT_BASE_URL,
@@ -34,7 +33,7 @@ class AiriaAsyncClient(AiriaBaseClient):
         bearer_token: Optional[str] = None,
         timeout: float = DEFAULT_TIMEOUT,
         log_requests: bool = False,
-        custom_logger: Optional["loguru.Logger"] = None,
+        custom_logger: Optional[logging.Logger] = None,
     ):
         """
         Initialize the asynchronous Airia API client.
@@ -85,7 +84,7 @@ class AiriaAsyncClient(AiriaBaseClient):
         api_key: Optional[str] = None,
         timeout: float = DEFAULT_TIMEOUT,
         log_requests: bool = False,
-        custom_logger: Optional["loguru.Logger"] = None,
+        custom_logger: Optional[logging.Logger] = None,
         **kwargs,
     ):
         """
@@ -125,7 +124,7 @@ class AiriaAsyncClient(AiriaBaseClient):
         api_key: Optional[str] = None,
         timeout: float = DEFAULT_TIMEOUT,
         log_requests: bool = False,
-        custom_logger: Optional["loguru.Logger"] = None,
+        custom_logger: Optional[logging.Logger] = None,
         **kwargs,
     ):
         """
@@ -164,7 +163,7 @@ class AiriaAsyncClient(AiriaBaseClient):
         base_url: str = DEFAULT_BASE_URL,
         timeout: float = DEFAULT_TIMEOUT,
         log_requests: bool = False,
-        custom_logger: Optional["loguru.Logger"] = None,
+        custom_logger: Optional[logging.Logger] = None,
     ):
         """
         Initialize the asynchronous Airia API client with bearer token authentication.

airia/client/base_client.py

@@ -1,8 +1,7 @@
+import logging
 import os
 from typing import Optional
 
-import loguru
-
 from ..constants import DEFAULT_BASE_URL, DEFAULT_TIMEOUT
 from ..logs import configure_logging
 
@@ -20,7 +19,7 @@ class AiriaBaseClient:
         bearer_token: Optional[str] = None,
         timeout: float = DEFAULT_TIMEOUT,
         log_requests: bool = False,
-        custom_logger: Optional["loguru.Logger"] = None,
+        custom_logger: Optional[logging.Logger] = None,
     ):
         """
         Initialize the Airia API client base class.

airia/client/sync_client.py

@@ -1,7 +1,6 @@
+import logging
 from typing import Optional
 
-import loguru
-
 from ..constants import (
     DEFAULT_ANTHROPIC_GATEWAY_URL,
     DEFAULT_BASE_URL,
@@ -34,7 +33,7 @@ class AiriaClient(AiriaBaseClient):
         bearer_token: Optional[str] = None,
         timeout: float = DEFAULT_TIMEOUT,
         log_requests: bool = False,
-        custom_logger: Optional["loguru.Logger"] = None,
+        custom_logger: Optional[logging.Logger] = None,
     ):
         """
         Initialize the synchronous Airia API client.
@@ -85,7 +84,7 @@ class AiriaClient(AiriaBaseClient):
         api_key: Optional[str] = None,
         timeout: float = DEFAULT_TIMEOUT,
         log_requests: bool = False,
-        custom_logger: Optional["loguru.Logger"] = None,
+        custom_logger: Optional[logging.Logger] = None,
         **kwargs,
     ):
         """
@@ -125,7 +124,7 @@ class AiriaClient(AiriaBaseClient):
         api_key: Optional[str] = None,
         timeout: float = DEFAULT_TIMEOUT,
         log_requests: bool = False,
-        custom_logger: Optional["loguru.Logger"] = None,
+        custom_logger: Optional[logging.Logger] = None,
         **kwargs,
     ):
         """
@@ -164,7 +163,7 @@ class AiriaClient(AiriaBaseClient):
         base_url: str = DEFAULT_BASE_URL,
         timeout: float = DEFAULT_TIMEOUT,
         log_requests: bool = False,
-        custom_logger: Optional["loguru.Logger"] = None,
+        custom_logger: Optional[logging.Logger] = None,
     ):
         """
         Initialize the synchronous Airia API client with bearer token authentication.

airia/logs.py

@@ -1,15 +1,42 @@
+import logging
 import os
 import sys
 import uuid
 from contextvars import ContextVar
 from typing import BinaryIO, Optional, TextIO, Union
 
-import loguru
-from loguru import logger
-
 # Create a context variable to store correlation ID
 correlation_id_context: ContextVar[str] = ContextVar("correlation_id", default="")
 
+# ANSI color codes
+RESET = "\033[0m"
+COLORS = {
+    "DEBUG": "\033[36m",  # Cyan
+    "INFO": "\033[32m",  # Green
+    "WARNING": "\033[33m",  # Yellow
+    "ERROR": "\033[31m",  # Red
+    "CRITICAL": "\033[35m",  # Magenta
+}
+GREY = "\033[90m"  # Grey for metadata
+MAGENTA = "\033[35m"  # Magenta for correlation ID
+
+
+def _enable_windows_ansi_support():
+    """Enable ANSI color support on Windows."""
+    if sys.platform == "win32":
+        try:
+            import ctypes
+
+            kernel32 = ctypes.windll.kernel32
+            kernel32.SetConsoleMode(kernel32.GetStdHandle(-11), 7)
+        except Exception:
+            # If it fails, colors just won't work on Windows
+            pass
+
+
+# Enable Windows ANSI support at module load
+_enable_windows_ansi_support()
+
 
 def get_correlation_id() -> str:
     """
@@ -42,71 +69,175 @@ def clear_correlation_id() -> None:
     correlation_id_context.set("")
 
 
-# Define a function to be used as a filter to inject correlation_id
-def correlation_id_filter(record):
-    record["extra"]["correlation_id"] = get_correlation_id() or "no-correlation-id"
-    return record
+class CorrelationIdFilter(logging.Filter):
+    """Filter to inject correlation_id into log records."""
+
+    def filter(self, record):
+        """Add correlation_id to the log record."""
+        record.correlation_id = get_correlation_id() or "no-correlation-id"
+        return True
+
+
+class ColoredFormatter(logging.Formatter):
+    """Custom formatter that adds colors to log output using ANSI codes."""
+
+    def __init__(self, fmt: Optional[str] = None, use_colors: bool = True):
+        """
+        Initialize the colored formatter.
+
+        Args:
+            fmt: The format string for log messages
+            use_colors: Whether to use ANSI color codes
+        """
+        super().__init__(fmt)
+        self.use_colors = use_colors
+
+    def format(self, record: logging.LogRecord) -> str:
+        """Format the log record with colors."""
+        if not self.use_colors:
+            return super().format(record)
+
+        # Get the color for this log level
+        level_color = COLORS.get(record.levelname, "")
+
+        # Save the original values
+        orig_levelname = record.levelname
+        orig_msg = record.msg
+
+        # Color the level name
+        record.levelname = f"{level_color}{record.levelname}{RESET}"
+
+        # Format the message
+        formatted = super().format(record)
+
+        # Restore original values
+        record.levelname = orig_levelname
+        record.msg = orig_msg
+
+        # Add colors to specific parts of the formatted message
+        # Color the correlation ID if present
+        if hasattr(record, "correlation_id"):
+            formatted = formatted.replace(
+                f"[{record.correlation_id}]",
+                f"{MAGENTA}[{record.correlation_id}]{RESET}",
+            )
+
+        # Color the timestamp (first part before |)
+        parts = formatted.split("|", 1)
+        if len(parts) > 1:
+            timestamp_part = parts[0].split("]", 1)
+            if len(timestamp_part) > 1:
+                # Has correlation ID
+                formatted = (
+                    timestamp_part[0]
+                    + "]"
+                    + f"{GREY}{timestamp_part[1]}{RESET}|"
+                    + parts[1]
+                )
+            else:
+                # No correlation ID
+                formatted = f"{GREY}{parts[0]}{RESET}|{parts[1]}"
+
+        return formatted
 
 
 def configure_logging(
-    format_string: str = "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>",
+    format_string: Optional[str] = None,
     level: str = "INFO",
     sink: Union[os.PathLike[str], TextIO, BinaryIO] = sys.stderr,
-    rotation: Optional[str] = None,
-    retention: Optional[str] = None,
     include_correlation_id: bool = True,
-) -> "loguru.Logger":
+    use_colors: bool = True,
+) -> logging.Logger:
     """
-    Configure the loguru logger with custom settings.
-    Check [Loguru Documentation](https://loguru.readthedocs.io/en/stable/api/logger.html) for more details.
+    Configure the logger with custom settings using Python's standard logging module.
 
     Args:
-        format_string (str): The format string for log messages.
+        format_string (Optional[str]): The format string for log messages.
+                                      If None, a default format will be used.
         level (str): The minimum logging level. Default: "INFO"
         sink: Where to send the log. Default: sys.stderr
-        rotation (str, optional): When to rotate the log file.
-                                  Example: "10 MB", "1 day"
-                                  Only used when sink is a file path.
-        retention (str, optional): How long to keep log files.
-                                   Example: "1 week", "10 days"
-                                   Only used when sink is a file path.
+              Can be a file path, TextIO, or BinaryIO.
         include_correlation_id (bool): Whether to include correlation ID in log messages.
                                       Default: True
+        use_colors (bool): Whether to use colored output for console logging.
+                          Automatically disabled for file output. Default: True
 
     Returns:
-        The configured logger object
+        logging.Logger: The configured logger object
+
+    Example:
+        ```python
+        from airia import configure_logging
+
+        # Basic configuration with colors
+        logger = configure_logging()
+
+        # Disable colors
+        logger = configure_logging(use_colors=False)
+
+        # File-based logging (colors automatically disabled)
+        file_logger = configure_logging(
+            level="DEBUG",
+            sink="app.log",
+            include_correlation_id=True
+        )
+
+        # Console output
+        console_logger = configure_logging(
+            level="INFO",
+            sink=sys.stdout
+        )
+        ```
     """
-    # Remove any existing handlers
-    logger.remove()
+    logger = logging.getLogger("airia")
+    logger.handlers.clear()
+    logger.setLevel(getattr(logging, level.upper(), logging.INFO))
 
-    # Modify format string to include correlation ID if requested
-    if include_correlation_id:
-        format_string = "<magenta>[{extra[correlation_id]}]</magenta> " + format_string
+    # Determine if this is file or console output
+    is_file_output = isinstance(sink, (str, os.PathLike))
+
+    # Create handler based on sink type
+    if is_file_output:
+        handler = logging.FileHandler(str(sink))
+        # Disable colors for file output
+        use_colors = False
+    elif hasattr(sink, "write"):
+        handler = logging.StreamHandler(sink)  # type: ignore
+    else:
+        handler = logging.StreamHandler(sys.stderr)
+
+    # Create formatter
+    if format_string is None:
+        if include_correlation_id:
+            format_string = "[%(correlation_id)s] %(asctime)s | %(levelname)-8s | %(name)s:%(funcName)s:%(lineno)d - %(message)s"
+        else:
+            format_string = "%(asctime)s | %(levelname)-8s | %(name)s:%(funcName)s:%(lineno)d - %(message)s"
 
-    # Add rotation and retention only for file paths
-    kwargs = {
-        "format": format_string,
-        "level": level,
-        "filter": correlation_id_filter,  # Add the filter for each handler
-    }
+    # Use ColoredFormatter for console, regular Formatter for files
+    if use_colors and not is_file_output:
+        formatter = ColoredFormatter(format_string, use_colors=True)
+    else:
+        formatter = logging.Formatter(format_string)
 
-    if isinstance(sink, (str, os.PathLike)):
-        if rotation is not None:
-            kwargs["rotation"] = rotation
-        if retention is not None:
-            kwargs["retention"] = retention
+    handler.setFormatter(formatter)
 
-    # Add the new handler
-    logger.add(sink, **kwargs)
+    # Add correlation ID filter if enabled
+    if include_correlation_id:
+        handler.addFilter(CorrelationIdFilter())
+
+    logger.addHandler(handler)
 
     return logger
 
 
 # Example usage:
 if __name__ == "__main__":
-    # Basic configuration (uses sys.stderr)
+    # Basic configuration (uses sys.stderr with colors)
     log = configure_logging()
+    log.debug("Debug message")
     log.info("Basic logging configured successfully")
+    log.warning("This is a warning")
+    log.error("This is an error")
 
     # Set a correlation ID
     set_correlation_id("request-123")
@@ -120,18 +251,17 @@ if __name__ == "__main__":
     set_correlation_id()
     log.info("This log has an auto-generated correlation ID")
 
-    # File-based logging with rotation and retention
+    # File-based logging (colors automatically disabled)
     file_log = configure_logging(
-        format_string="[{time:YYYY-MM-DD HH:mm:ss}] [{level}] {message}",
         level="DEBUG",
         sink="app.log",
-        rotation="10 MB",
-        retention="1 week",
     )
     file_log.debug("File logging configured successfully")
 
-    # Stream-based logging
-    stream_log = configure_logging(
-        format_string="[{time:HH:mm:ss}] {message}", level="INFO", sink=sys.stdout
-    )
+    # Stream-based logging with colors
+    stream_log = configure_logging(level="INFO", sink=sys.stdout)
     stream_log.info("Stream logging configured successfully")
+
+    # Disable colors explicitly
+    no_color_log = configure_logging(use_colors=False)
+    no_color_log.info("Logging without colors")

airia/types/api/pipelines_config/__init__.py

@@ -24,13 +24,17 @@ from .export_pipeline_definition import (
     AgentDetailItemDefinition,
     ExportPipelineDefinitionResponse,
     ExportChunkingConfig,
+    ExportConditionalBranchConfigDefinition,
     ExportCredentialDataList,
     ExportCredentials,
+    ExportCustomCredentials,
     ExportDataSource,
     ExportDataSourceFile,
     ExportDependency,
     ExportDeployment,
     ExportHandle,
+    ExportJsonFormatterStepConfiguration,
+    ExportLoopStepConfiguration,
     ExportMemory,
     ExportMetadata,
     ExportModel,
@@ -38,56 +42,68 @@ from .export_pipeline_definition import (
     ExportPipelineStep,
     ExportPosition,
     ExportPrompt,
-    ExportPromptMessageList,
     ExportPythonCodeBlock,
+    ExportRetryConfiguration,
     ExportRouter,
     ExportRouterConfig,
+    ExportSDKStepCredentialReference,
+    ExportSDKStepDefinition,
     ExportTool,
     ExportToolHeaders,
     ExportToolParameters,
     ExportUserPrompt,
+    ExportVectorStore,
+    ExportWebhookApprovalRequest,
 )
 
 __all__ = [
     "AboutDeploymentMetadata",
     "AgentDetailsEntry",
+    "AgentDetailItemDefinition",
     "AgentTrigger",
     "Deployment",
     "DeploymentAssignment",
     "DeploymentUserPrompt",
-    "ExportPipelineDefinitionResponse",
-    "GetPipelinesConfigResponse",
-    "Pipeline",
-    "PipelineConfigItem",
-    "PipelineConfigResponse",
-    "PipelineExecutionStats",
-    "PipelineStep",
-    "PipelineStepDependency",
-    "PipelineStepHandle",
-    "PipelineStepPosition",
-    "PipelineVersion",
-    "AgentDetailItemDefinition",
     "ExportChunkingConfig",
+    "ExportConditionalBranchConfigDefinition",
     "ExportCredentialDataList",
     "ExportCredentials",
+    "ExportCustomCredentials",
     "ExportDataSource",
     "ExportDataSourceFile",
     "ExportDependency",
     "ExportDeployment",
     "ExportHandle",
+    "ExportJsonFormatterStepConfiguration",
+    "ExportLoopStepConfiguration",
     "ExportMemory",
     "ExportMetadata",
     "ExportModel",
     "ExportPipeline",
+    "ExportPipelineDefinitionResponse",
     "ExportPipelineStep",
     "ExportPosition",
     "ExportPrompt",
-    "ExportPromptMessageList",
     "ExportPythonCodeBlock",
+    "ExportRetryConfiguration",
     "ExportRouter",
     "ExportRouterConfig",
+    "ExportSDKStepCredentialReference",
+    "ExportSDKStepDefinition",
     "ExportTool",
     "ExportToolHeaders",
     "ExportToolParameters",
     "ExportUserPrompt",
+    "ExportVectorStore",
+    "ExportWebhookApprovalRequest",
+    "GetPipelinesConfigResponse",
+    "Pipeline",
+    "PipelineConfigItem",
+    "PipelineConfigResponse",
+    "PipelineExecutionStats",
+    "PipelineStep",
+    "PipelineStepDependency",
+    "PipelineStepHandle",
+    "PipelineStepPosition",
+    "PipelineVersion",
 ]