fastlib-py 0.3.6__tar.gz → 0.3.8__tar.gz

{fastlib_py-0.3.6 → fastlib_py-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastlib-py
-Version: 0.3.6
+Version: 0.3.8
 Summary: Fastlib, high performance, easy to use, fast to code, ready for production
 Author-email: tyvekZhang <tyvekzhang@gmail.com>
 Maintainer-email: tyvekZhang <tyvekzhang@gmail.com>
@@ -21,13 +21,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiosqlite>=0.21
 Requires-Dist: alembic>=1.15.2
-Requires-Dist: cryptography>=45.0.6
+Requires-Dist: fakeredis>=2.32
 Requires-Dist: fastapi[standard]>=0.115.12
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: openpyxl>=3.1.5
 Requires-Dist: pandas>=2.2.3
-Requires-Dist: passlib[bcrypt]>=1.7.4
-Requires-Dist: pyjwt>=2.10.1
+Requires-Dist: pyjwt[crypto]>=2.10.1
 Requires-Dist: sqlmodel>=0.0.24
 Dynamic: license-file
 

fastlib_py-0.3.8/fastlib/_logging/config.py

@@ -0,0 +1,109 @@
+# SPDX-License-Identifier: MIT
+"""
+Log configuration and logging utility for the application.
+"""
+
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Literal
+
+from fastlib.config.base import BaseConfig
+from fastlib.config.manager import config_class
+from fastlib.config.utils import ProjectInfo
+
+LogLevel = Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+
+
+@config_class("log")
+@dataclass
+class LogConfig(BaseConfig):
+    """
+    Configuration for logging settings.
+
+    Attributes:
+        log_dir (str): Directory where log files will be stored.
+        app_name (str): Name of the application for log file naming.
+        log_level (LogLevel): Minimum log level to record. Possible values: DEBUG, INFO, WARNING, ERROR, CRITICAL.
+        log_rotation (str): Frequency of log file rotation. Default is "1 day".
+        log_retention (str): How long to keep log files. Default is "90 days".
+        enable_console_log (bool): Whether to output logs to console. Default is True.
+        enable_json_logs (bool): Whether to use JSON format for logs. Default is False.
+        error_log_rotation (str): Frequency of error log rotation. Default is "1 day".
+        error_log_retention (str): How long to keep error log files. Default is "90 days".
+        enable_async (bool): Whether to use asynchronous logging. Default is True.
+        max_file_size (Optional[str]): Maximum size for log files before rotation. Default is "10 MB".
+        time_format (str): Format string for timestamps in log file names. Default is "YYYY-MM-DD".
+    """
+
+    log_dir: str = "/var/log"
+    app_name: str | None = None
+    log_level: LogLevel = "INFO"
+    log_rotation: str = "1 day"
+    log_retention: str = "90 days"
+    enable_console_log: bool = True
+    enable_json_logs: bool = False
+    error_log_rotation: str = "1 day"
+    error_log_retention: str = "90 days"
+    enable_async: bool = True
+    max_file_size: str | None = "10 MB"
+    time_format: str = "YYYY-MM-DD"
+
+    def __post_init__(self):
+        """
+        Set default app_name if not provided.
+
+        If `app_name` is not provided, it will be set to the name of the project
+        retrieved from the `pyproject.toml` file.
+        """
+        if self.app_name is None:
+            self.app_name = ProjectInfo.from_pyproject().name
+
+    @property
+    def default_format(self) -> str:
+        """
+        Default log format string.
+
+        Returns:
+            str: The default format used for log messages.
+        """
+        return "{time:YYYY-MM-DD HH:mm:ss.SSS} | {level: <8} | {name}:{function}:{line} | {message}"
+
+    @property
+    def log_file_pattern(self) -> str:
+        """
+        Returns the main log file pattern with timestamp.
+
+        Returns:
+            str: The pattern used to name the main log file.
+        """
+        return f"{{time:{self.time_format}}}_{self.app_name}.log"
+
+    @property
+    def error_log_file_pattern(self) -> str:
+        """
+        Returns the error log file pattern with timestamp.
+
+        Returns:
+            str: The pattern used to name the error log file.
+        """
+        return f"{{time:{self.time_format}}}_error_{self.app_name}.log"
+
+    @property
+    def log_file_path(self) -> Path:
+        """
+        Returns the full path for the main log file.
+
+        Returns:
+            Path: The full path to the main log file.
+        """
+        return Path(self.log_dir) / self.log_file_pattern
+
+    @property
+    def error_log_file_path(self) -> Path:
+        """
+        Returns the full path for the error log file.
+
+        Returns:
+            Path: The full path to the error log file.
+        """
+        return Path(self.log_dir) / self.error_log_file_pattern

fastlib_py-0.3.8/fastlib/cache/_memony_cache.py

@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: MIT
+"""Memory (FakeRedis) Cache Manager for in-memory caching"""
+
+import asyncio
+
+from fakeredis.aioredis import FakeRedis
+
+
+class MemoryCacheManager:
+    """Singleton manager for in-memory (FakeRedis) cache client."""
+
+    _instance: FakeRedis | None = None
+    _lock = asyncio.Lock()
+
+    @classmethod
+    async def get_instance(cls) -> FakeRedis:
+        """Get a singleton FakeRedis instance."""
+        if cls._instance is None:
+            async with cls._lock:
+                if cls._instance is None:
+                    cls._instance = FakeRedis()
+        return cls._instance
+
+    @classmethod
+    async def close(cls):
+        """Close the FakeRedis instance (for cleanup in tests)."""
+        if cls._instance is not None:
+            await cls._instance.close()
+            cls._instance = None
+
+    @classmethod
+    async def reset(cls):
+        """Clear all cached data without destroying the instance."""
+        if cls._instance is not None:
+            await cls._instance.flushall()

fastlib_py-0.3.8/fastlib/cache/_redis_cache.py

@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: MIT
+"""Redis cache implementation"""
+
+import asyncio
+from typing import Optional
+
+from loguru import logger
+
+from fastlib import ConfigManager
+
+try:
+    import redis.asyncio as redis
+except ModuleNotFoundError:
+    logger.warning(
+        "Cannot find redis module, please install it via `uv add redis[hiredis]`"
+    )
+    redis = None
+    RedisError = Exception
+except Exception:
+    logger.error("Error importing redis module")
+    redis = None
+    RedisError = Exception
+
+
+class RedisCacheManager:
+    _instance: Optional["redis.Redis"] = None
+    _connection_pool: Optional["redis.ConnectionPool"] = None
+    _lock = asyncio.Lock()
+
+    @classmethod
+    async def get_instance(cls) -> "redis.Redis":
+        """
+        Get redis instance
+        """
+        if redis is None:
+            raise RuntimeError(
+                "Redis module is not available. Please install it via 'uv add redis[hiredis]'"
+            )
+
+        if cls._instance is None:
+            async with cls._lock:
+                if cls._connection_pool is None:
+                    database_config = ConfigManager.get_database_config()
+                    cls._connection_pool = redis.ConnectionPool.from_url(
+                        f"redis://:{database_config.cache_pass}@{database_config.cache_host}:{database_config.cache_port}/{database_config.db_num}",
+                        decode_responses=True,
+                    )
+                if cls._instance is None:
+                    cls._instance = redis.Redis(connection_pool=cls._connection_pool)
+        return cls._instance
+
+    @classmethod
+    async def close_pool(cls):
+        """Close the connection pool."""
+        if cls._connection_pool:
+            await cls._connection_pool.disconnect()
+            cls._connection_pool = None
+            cls._instance = None

{fastlib_py-0.3.6 → fastlib_py-0.3.8}/fastlib/cache/manager.py

@@ -1,23 +1,24 @@
 # SPDX-License-Identifier: MIT
 """Cache Client manager to instantiate the appropriate cache client"""
 
-from fastlib.cache.base import Cache
 from fastlib.config.manager import ConfigManager
 
 
-async def get_cache_client() -> Cache:
+async def get_cache_client():
     """Initialize and return the appropriate cache client based on configuration.
 
     Returns:
-        Cache: Redis client if Redis is enabled in config, otherwise returns page cache.
+        Cache: Redis client if Redis is enabled in config, otherwise returns FakeRedis client.
     """
     config = ConfigManager.get_database_config()
+
     if config.enable_redis:
-        from fastlib.cache._redis_cache import RedisCache, RedisManager
+        from fastlib.cache._redis_cache import RedisManager
 
         redis_client = await RedisManager.get_instance()
-        return RedisCache(redis_client)
+        return redis_client
     else:
-        from fastlib.cache._memony_cache import MemoryCache
+        from fastlib.cache._memony_cache import MemoryCacheManager
 
-        return MemoryCache()
+        fake_client = await MemoryCacheManager.get_instance()
+        return fake_client

{fastlib_py-0.3.6 → fastlib_py-0.3.8}/fastlib/logging.py

@@ -3,6 +3,6 @@
 Logging module
 """
 
-from ._logging.handlers import Logger
+from _logging.handlers import Logger
 
 logger = Logger.initialize()

{fastlib_py-0.3.6 → fastlib_py-0.3.8}/fastlib/router.py

@@ -25,7 +25,6 @@ def register_router(
     api_version: str = "/v1",
     module_base_prefix: str = "src",
     module_separator: str = ".",
-    controller_file_pattern_template: str = "*_{}.py",
 ) -> APIRouter:
     """Register routers recursively from controller directories.
 

{fastlib_py-0.3.6/fastlib/security → fastlib_py-0.3.8/fastlib}/security.py

@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: MIT
+import base64
+import hashlib
+import secrets
 from collections.abc import Callable
 from datetime import datetime, timedelta
 from typing import Any
@@ -7,7 +10,6 @@ import jwt
 from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
 from jwt.exceptions import InvalidTokenError
-from passlib.context import CryptContext
 
 from fastlib.config.manager import ConfigManager
 from fastlib.schema import CurrentUser
@@ -16,8 +18,6 @@ from fastlib.schema import CurrentUser
 security_config = ConfigManager.get_security_config()
 server_config = ConfigManager.get_server_config()
 
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-
 
 def decode_jwt_token(token: str) -> dict[str, Any]:
     """Decode and validate JWT token.
@@ -50,6 +50,11 @@ def decode_jwt_token(token: str) -> dict[str, Any]:
 
 
 def get_oauth2_scheme() -> OAuth2PasswordBearer:
+    """Create OAuth2 password bearer scheme.
+
+    Returns:
+        OAuth2PasswordBearer instance
+    """
     oauth2_scheme = OAuth2PasswordBearer(
         tokenUrl=f"{server_config.api_prefix}/v1/auth/auth:signInWithEmailAndPassword"
     )
@@ -57,8 +62,7 @@ def get_oauth2_scheme() -> OAuth2PasswordBearer:
 
 
 def get_current_user() -> Callable[[], CurrentUser]:
-    """
-    Acquire current info through access_token
+    """Get current user from access token.
 
     Returns:
         CurrentUser instance
@@ -114,29 +118,86 @@ def create_token(
     )
 
 
-def verify_password(plain_password: str, hashed_password: str) -> bool:
-    """Verify password against hashed version.
+def generate_salt(length: int = 16) -> str:
+    """Generate a cryptographically secure random salt.
+
+    Args:
+        length: Length of the salt in bytes
+
+    Returns:
+        Base64 encoded salt string
+    """
+    return base64.b64encode(secrets.token_bytes(length)).decode("utf-8")
+
+
+def hash_password_sha256(password: str, salt: str | None = None) -> tuple[str, str]:
+    """Hash password using SHA-256 with salt.
+
+    Args:
+        password: Plain text password to hash
+        salt: Salt for hashing. If None, generates random salt.
+
+    Returns:
+        Tuple of (hashed_password, salt)
+    """
+    if salt is None:
+        salt = generate_salt()
+
+    # Decode base64 salt
+    salt_bytes = base64.b64decode(salt.encode("utf-8"))
+
+    # Create hash with salt and password
+    hash_obj = hashlib.sha256()
+    hash_obj.update(salt_bytes + password.encode("utf-8"))
+
+    # Multiple iterations for increased security (optional)
+    for _ in range(1000):  # 1000 iterations
+        hash_obj = hashlib.sha256(
+            hash_obj.digest() + salt_bytes + password.encode("utf-8")
+        )
+
+    hashed_password = base64.b64encode(hash_obj.digest()).decode("utf-8")
+    return hashed_password, salt
+
+
+def verify_password(
+    plain_password: str, hashed_password: str, salt: str | None = None
+) -> bool:
+    """Verify password against hashed version using SHA-256.
 
     Args:
-        plain_password: Input password
+        plain_password: Input password to verify
         hashed_password: Stored hashed password
+        salt: Salt used for the original hash. If None, uses a default salt.
 
     Returns:
         True if passwords match
     """
-    return pwd_context.verify(plain_password, hashed_password)
+    try:
+        # Use default salt if none provided (for backward compatibility)
+        if salt is None:
+            # Default salt - in production, this should be stored with the hash
+            salt = "default_salt_placeholder"
+
+        # Recalculate hash with the same salt and algorithm
+        calculated_hash, _ = hash_password_sha256(plain_password, salt)
+
+        # Use timing-safe comparison function
+        return secrets.compare_digest(calculated_hash, hashed_password)
+    except Exception:
+        return False
 
 
-def get_password_hash(password: str) -> str:
-    """Generate password hash.
+def get_password_hash(password: str) -> tuple[str, str]:
+    """Generate password hash using SHA-256.
 
     Args:
         password: Plain text password
 
     Returns:
-        Hashed password string
+        Tuple of (hashed_password, salt)
     """
-    return pwd_context.hash(password)
+    return hash_password_sha256(password)
 
 
 def validate_token(token: str) -> bool:
@@ -177,3 +238,53 @@ def get_user_id(token: str) -> int:
     """
     payload = decode_jwt_token(token)
     return int(payload["sub"])
+
+
+# Backward compatibility wrapper functions
+def verify_password_compat(plain_password: str, hashed_password: str) -> bool:
+    """Compatibility version of password verification with default salt.
+
+    Args:
+        plain_password: Input password to verify
+        hashed_password: Stored hashed password
+
+    Returns:
+        True if passwords match
+    """
+    return verify_password(plain_password, hashed_password, salt=None)
+
+
+def get_password_hash_compat(password: str) -> str:
+    """Compatibility version of password hash function.
+
+    Args:
+        password: Plain text password
+
+    Returns:
+        Formatted string containing hash and salt (hash:salt)
+    """
+    hashed_password, salt = get_password_hash(password)
+    return f"{hashed_password}:{salt}"
+
+
+def parse_hashed_password(hashed_data: str) -> tuple[str, str]:
+    """Parse hashed password data in format 'hash:salt'.
+
+    Args:
+        hashed_data: String containing hash and salt separated by colon
+
+    Returns:
+        Tuple of (hashed_password, salt)
+
+    Raises:
+        ValueError: If format is invalid
+    """
+    if ":" not in hashed_data:
+        # If no salt is present, use default salt
+        return hashed_data, "default_salt_placeholder"
+
+    parts = hashed_data.split(":", 1)
+    if len(parts) != 2:
+        raise ValueError("Invalid hashed password format")
+
+    return parts[0], parts[1]

{fastlib_py-0.3.6 → fastlib_py-0.3.8}/fastlib/stream/handler.py

@@ -9,12 +9,11 @@ import asyncio
 from abc import ABC, abstractmethod
 from collections.abc import AsyncIterable
 from datetime import datetime
-from typing import Generic, TypeVar
+from typing import Any, Generic, TypeVar
 
 from loguru import logger
 from pydantic import BaseModel
 
-from fastlib.cache.base import Cache
 from fastlib.cache.manager import get_cache_client
 
 from .schema import (
@@ -37,7 +36,7 @@ class StreamHandler(ABC, Generic[T]):
         self,
         message: T,
         source: AsyncIterable[V],
-        storage: Cache | None,
+        storage: Any,
     ):
         self._message = message
         self._source = source
@@ -79,7 +78,7 @@ class AsyncStreamHandler(StreamHandler[T]):
         self,
         message: T,
         source: AsyncIterable[V],
-        storage: Cache | None,
+        storage: Any,
         buffer_size: int = 100,
     ):
         super().__init__(message, source, storage)

{fastlib_py-0.3.6 → fastlib_py-0.3.8}/fastlib_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastlib-py
-Version: 0.3.6
+Version: 0.3.8
 Summary: Fastlib, high performance, easy to use, fast to code, ready for production
 Author-email: tyvekZhang <tyvekzhang@gmail.com>
 Maintainer-email: tyvekZhang <tyvekzhang@gmail.com>
@@ -21,13 +21,12 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiosqlite>=0.21
 Requires-Dist: alembic>=1.15.2
-Requires-Dist: cryptography>=45.0.6
+Requires-Dist: fakeredis>=2.32
 Requires-Dist: fastapi[standard]>=0.115.12
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: openpyxl>=3.1.5
 Requires-Dist: pandas>=2.2.3
-Requires-Dist: passlib[bcrypt]>=1.7.4
-Requires-Dist: pyjwt>=2.10.1
+Requires-Dist: pyjwt[crypto]>=2.10.1
 Requires-Dist: sqlmodel>=0.0.24
 Dynamic: license-file
 

{fastlib_py-0.3.6 → fastlib_py-0.3.8}/fastlib_py.egg-info/SOURCES.txt

@@ -14,13 +14,13 @@ fastlib/request.py
 fastlib/response.py
 fastlib/router.py
 fastlib/schema.py
+fastlib/security.py
 fastlib/_logging/__init__.py
 fastlib/_logging/config.py
 fastlib/_logging/handlers.py
 fastlib/cache/__init__.py
 fastlib/cache/_memony_cache.py
 fastlib/cache/_redis_cache.py
-fastlib/cache/base.py
 fastlib/cache/manager.py
 fastlib/config/__init__.py
 fastlib/config/_database_config.py
@@ -48,9 +48,6 @@ fastlib/middleware/__init__.py
 fastlib/middleware/db_session.py
 fastlib/middleware/i18n.py
 fastlib/middleware/jwt.py
-fastlib/security/__init__.py
-fastlib/security/security.py
-fastlib/security/utils.py
 fastlib/service/__init__.py
 fastlib/service/base_service.py
 fastlib/service/impl/__init__.py
@@ -66,6 +63,7 @@ fastlib/utils/excel_util.py
 fastlib/utils/file_util.py
 fastlib/utils/http_util.py
 fastlib/utils/ip_util.py
+fastlib/utils/security_util.py
 fastlib/utils/snowflake_util.py
 fastlib/utils/str_util.py
 fastlib/utils/validate_util.py

{fastlib_py-0.3.6 → fastlib_py-0.3.8}/fastlib_py.egg-info/requires.txt

@@ -1,10 +1,9 @@
 aiosqlite>=0.21
 alembic>=1.15.2
-cryptography>=45.0.6
+fakeredis>=2.32
 fastapi[standard]>=0.115.12
 loguru>=0.7.3
 openpyxl>=3.1.5
 pandas>=2.2.3
-passlib[bcrypt]>=1.7.4
-pyjwt>=2.10.1
+pyjwt[crypto]>=2.10.1
 sqlmodel>=0.0.24

{fastlib_py-0.3.6 → fastlib_py-0.3.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastlib-py"
-version = "0.3.6"
+version = "0.3.8"
 description = "Fastlib, high performance, easy to use, fast to code, ready for production"
 readme = "README.md"
 keywords = [
@@ -31,13 +31,12 @@ classifiers = [
 dependencies = [
   "aiosqlite>=0.21",
   "alembic>=1.15.2",
-  "cryptography>=45.0.6",
+  "fakeredis>=2.32",
   "fastapi[standard]>=0.115.12",
   "loguru>=0.7.3",
   "openpyxl>=3.1.5",
   "pandas>=2.2.3",
-  "passlib[bcrypt]>=1.7.4",
-  "pyjwt>=2.10.1",
+  "pyjwt[crypto]>=2.10.1",
   "sqlmodel>=0.0.24",
 ]
 
@@ -119,6 +118,6 @@ title = "FastLib Coverage Report"
 strict = true
 
 [[tool.uv.index]]
-name = "tsinghua"
-url = "https://pypi.tuna.tsinghua.edu.cn/simple/"
+name = "ustc"
+url = "https://pypi.mirrors.ustc.edu.cn/simple/"
 default = true