karrio-server 2025.5rc30__py3-none-any.whl → 2025.5rc32__py3-none-any.whl

karrio/server/VERSION

@@ -1 +1 @@
-2025.5rc30
+2025.5rc32

karrio/server/settings/__init__.py

@@ -5,6 +5,7 @@ import importlib.util
 from karrio.server.settings.base import *
 from karrio.server.settings.apm import *
 from karrio.server.settings.cache import *
+from karrio.server.settings.workers import *
 from karrio.server.settings.debug import *
 from karrio.server.settings.email import *
 from karrio.server.settings.constance import *

karrio/server/settings/apm.py

@@ -164,7 +164,7 @@ if OTEL_ENABLED and OTEL_EXPORTER_OTLP_ENDPOINT:
             pass  # Psycopg2 might not be installed
     
     # Instrument Redis if configured
-    if config("REDIS_HOST", default=None):
+    if config("REDIS_URL", default=None) or config("REDIS_HOST", default=None):
         try:
             RedisInstrumentor().instrument()
         except Exception:

karrio/server/settings/base.py

@@ -31,9 +31,11 @@ config = decouple.AutoConfig(search_path=Path().resolve())
 
 if not config("SECRET_KEY", default=None):
     try:
+        # Note: Using print here intentionally as logging isn't configured yet
         print("> fallback .env.sample...")
         config = decouple.Config(decouple.RepositoryEnv(".env.sample"))
     except Exception as e:
+        # Note: Using print here intentionally as logging isn't configured yet
         print(f"> error: {e}")
 
 
@@ -261,62 +263,6 @@ OTP_APPS = [
     "two_factor.plugins.email",
 ]
 
-# Configure HUEY before djhuey/apps are loaded
-# This must be done here (not in workers.py) because task modules import djhuey
-# at module load time, which happens when Django loads apps from INSTALLED_APPS
-_REDIS_HOST = config("REDIS_HOST", default=None)
-_REDIS_PORT = config("REDIS_PORT", default=None)
-_REDIS_PASSWORD = config("REDIS_PASSWORD", default=None)
-_REDIS_USERNAME = config("REDIS_USERNAME", default="default")
-_WORKER_IMMEDIATE_MODE = config("WORKER_IMMEDIATE_MODE", default=False, cast=bool) and (
-    _REDIS_HOST is None
-)
-
-HUEY = {
-    "huey_class": "huey.RedisHuey" if _REDIS_HOST else "huey.SqliteHuey",
-    "name": "default",
-    "results": True,
-    "store_none": False,
-    "utc": True,
-    **(
-        {
-            "blocking": True,
-            "connection": {
-                "host": _REDIS_HOST,
-                "port": _REDIS_PORT or 6379,
-                "db": 0,
-                "connection_pool": None,
-                "read_timeout": 1,
-                "max_connections": 20,
-                **(
-                    {
-                        "username": _REDIS_USERNAME,
-                        "password": _REDIS_PASSWORD,
-                    }
-                    if _REDIS_PASSWORD
-                    else {}
-                ),
-            },
-        }
-        if _REDIS_HOST
-        else {}
-    ),
-    **(
-        {
-            "filename": os.path.join(WORK_DIR, "tasks.sqlite3"),
-            "immediate": _WORKER_IMMEDIATE_MODE,
-        }
-        if not _REDIS_HOST
-        else {}
-    ),
-}
-
-# Karrio Server Background jobs interval config
-DEFAULT_SCHEDULER_RUN_INTERVAL = 3600  # value is seconds. so 3600 seconds = 1 Hour
-DEFAULT_TRACKERS_UPDATE_INTERVAL = config(
-    "TRACKING_PULSE", default=7200, cast=int
-)  # value is seconds. so 10800 seconds = 3 Hours
-
 INSTALLED_APPS = [
     "constance",
     *KARRIO_APPS,
@@ -409,7 +355,7 @@ if config("DATABASE_URL", default=None):
     DATABASES["default"].update(db_from_env)
 
 # Configure workers database for SQLite storage when Redis is not available
-if not config("REDIS_HOST", default=None):
+if not config("REDIS_URL", default=None) and not config("REDIS_HOST", default=None):
     _WORKER_DB_DIR = config("WORKER_DB_DIR", default=WORK_DIR)
     _WORKER_DB_FILE_NAME = os.path.join(_WORKER_DB_DIR, "tasks.sqlite3")
     DATABASES["workers"] = {
@@ -637,54 +583,91 @@ LOG_FILE_DIR = config("LOG_DIR", default=WORK_DIR)
 LOG_FILE_NAME = os.path.join(LOG_FILE_DIR, "debug.log")
 DRF_TRACKING_ADMIN_LOG_READONLY = True
 
-LOGGING = {
-    "version": 1,
-    "disable_existing_loggers": False,
-    "formatters": {
-        "verbose": {
-            "format": "{levelname} {asctime} {module} {process:d} {thread:d} {message}",
-            "style": "{",
-        },
-        "simple": {
-            "format": "{levelname} {filename} {lineno} {message}",
-            "style": "{",
-        },
-    },
-    "handlers": {
-        "file": {
-            "level": "DEBUG",
-            "class": "logging.handlers.TimedRotatingFileHandler",
-            "formatter": "verbose",
-            "filename": LOG_FILE_NAME,
-            "when": "D",
-            "interval": 1,
-            "backupCount": 20,
-        },
-        "console": {
-            "class": "logging.StreamHandler",
-            "formatter": "simple",
+# Option to use Loguru (default: True)
+USE_LOGURU = config("USE_LOGURU", default=True, cast=bool)
+
+if USE_LOGURU:
+    # Minimal LOGGING config - will be intercepted by Loguru
+    LOGGING = {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "handlers": {
+            "console": {
+                "class": "logging.StreamHandler",
+            },
         },
-    },
-    "loggers": {
-        "oauth2_provider": {
-            "level": "DEBUG",
+        "root": {
             "handlers": ["console"],
-            "propagate": True,
+            "level": "INFO",
         },
-        "django": {
-            "handlers": ["file", "console"],
-            "level": DJANGO_LOG_LEVEL,
-            "propagate": False,
+    }
+else:
+    # Traditional Django logging configuration
+    LOGGING = {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "formatters": {
+            "verbose": {
+                "format": "{levelname} {asctime} {module} {process:d} {thread:d} {message}",
+                "style": "{",
+            },
+            "simple": {
+                "format": "{levelname} {filename} {lineno} {message}",
+                "style": "{",
+            },
         },
-        "karrio": {
-            "handlers": ["file", "console"],
-            "level": LOG_LEVEL,
-            "propagate": False,
+        "handlers": {
+            "file": {
+                "level": "DEBUG",
+                "class": "logging.handlers.TimedRotatingFileHandler",
+                "formatter": "verbose",
+                "filename": LOG_FILE_NAME,
+                "when": "D",
+                "interval": 1,
+                "backupCount": 20,
+            },
+            "console": {
+                "class": "logging.StreamHandler",
+                "formatter": "simple",
+            },
         },
-        "karrio.server.core.exceptions": {
-            "handlers": ["file", "console"],
-            "level": "DEBUG",
-            "propagate": False,
+        "loggers": {
+            "oauth2_provider": {
+                "level": "DEBUG",
+                "handlers": ["console"],
+                "propagate": True,
+            },
+            "django": {
+                "handlers": ["file", "console"],
+                "level": DJANGO_LOG_LEVEL,
+                "propagate": False,
+            },
+            "karrio": {
+                "handlers": ["file", "console"],
+                "level": LOG_LEVEL,
+                "propagate": False,
+            },
+            "karrio.server.core.exceptions": {
+                "handlers": ["file", "console"],
+                "level": "DEBUG",
+                "propagate": False,
+            },
         },
-    },
-}
+    }
+
+# Initialize Loguru if enabled
+if USE_LOGURU:
+    try:
+        from karrio.server.core.logging import setup_django_loguru, logger
+
+        setup_django_loguru(
+            level=LOG_LEVEL,
+            log_file=LOG_FILE_NAME,
+            intercept_django=True,
+            enqueue=True,  # Thread-safe async logging
+        )
+    except ImportError as e:
+        # Note: Using print here as Loguru failed to load
+        print(f"Warning: Failed to initialize Loguru: {e}")
+        print("Falling back to standard Django logging")
+        USE_LOGURU = False

karrio/server/settings/cache.py

@@ -2,28 +2,63 @@
 from decouple import config
 from karrio.server.settings.base import *
 from karrio.server.settings.apm import HEALTH_CHECK_APPS
+from karrio.server.core.logging import logger
 
 
 CACHE_TTL = 60 * 15
-REDIS_HOST = config("REDIS_HOST", default=None)
-REDIS_PORT = config("REDIS_PORT", default=None)
-REDIS_PASSWORD = config("REDIS_PASSWORD", default=None)
-REDIS_USERNAME = config("REDIS_USERNAME", default="default")
+
+# Redis configuration - REDIS_URL takes precedence and supersedes granular env vars
+REDIS_URL = config("REDIS_URL", default=None)
 REDIS_PREFIX = config("REDIS_PREFIX", default="karrio")
+REDIS_SSL = config("REDIS_SSL", default=False, cast=bool)
+
+# Parse REDIS_URL or construct from individual parameters
+if REDIS_URL is not None:
+    from urllib.parse import urlparse, urlunparse
+    import re
+
+    parsed = urlparse(REDIS_URL)
+
+    # Extract values from REDIS_URL (these supersede granular env vars)
+    REDIS_HOST = parsed.hostname
+    REDIS_PORT = parsed.port or 6379
+    REDIS_USERNAME = parsed.username or "default"
+    REDIS_PASSWORD = parsed.password
+
+    # Determine SSL from URL scheme (rediss:// means SSL is enabled)
+    REDIS_SCHEME = parsed.scheme if parsed.scheme in ("redis", "rediss") else "redis"
+    REDIS_SSL = REDIS_SCHEME == "rediss"
 
-# karrio server caching setup
+    # Build connection URL with database 1 for cache
+    REDIS_AUTH = f"{REDIS_USERNAME}:{REDIS_PASSWORD}@" if REDIS_PASSWORD else ""
+    REDIS_CONNECTION_URL = f'{REDIS_SCHEME}://{REDIS_AUTH}{REDIS_HOST}:{REDIS_PORT}/1'
+
+else:
+    # Fall back to individual parameters
+    REDIS_HOST = config("REDIS_HOST", default=None)
+    REDIS_PORT = config("REDIS_PORT", default=None)
+    REDIS_PASSWORD = config("REDIS_PASSWORD", default=None)
+    REDIS_USERNAME = config("REDIS_USERNAME", default="default")
+
+    if REDIS_HOST is not None:
+        REDIS_AUTH = f"{REDIS_USERNAME}:{REDIS_PASSWORD}@" if REDIS_PASSWORD else ""
+        REDIS_SCHEME = "rediss" if REDIS_SSL else "redis"
+        REDIS_CONNECTION_URL = f'{REDIS_SCHEME}://{REDIS_AUTH}{REDIS_HOST}:{REDIS_PORT or "6379"}/1'
+
+# Configure Django cache if Redis is available
 if REDIS_HOST is not None:
     HEALTH_CHECK_APPS += ["health_check.contrib.redis"]
     INSTALLED_APPS += ["health_check.contrib.redis"]
-    REDIS_AUTH = f"{REDIS_USERNAME}:{REDIS_PASSWORD}@" if REDIS_PASSWORD else ""
 
-    REDIS_CONNECTION_URL = f'redis://{REDIS_AUTH}{REDIS_HOST}:{REDIS_PORT or "6379"}/1'
     CACHES = {
         "default": {
             "BACKEND": "django_redis.cache.RedisCache",
             "LOCATION": REDIS_CONNECTION_URL,
-            "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient"},
+            "OPTIONS": {
+                "CLIENT_CLASS": "django_redis.client.DefaultClient",
+                **({"CONNECTION_POOL_KWARGS": {"ssl_cert_reqs": None}} if REDIS_SSL else {}),
+            },
             "KEY_PREFIX": REDIS_PREFIX,
         }
     }
-    print(f"Redis connection initialized at: {REDIS_CONNECTION_URL}")
+    logger.info("Redis connection initialized", redis_url=REDIS_CONNECTION_URL)

karrio/server/settings/workers.py

@@ -0,0 +1,76 @@
+# type: ignore
+import os
+import huey
+import redis
+import decouple
+from karrio.server.settings import base as settings
+
+
+# Karrio Server Background jobs interval config
+DEFAULT_SCHEDULER_RUN_INTERVAL = 3600  # value is seconds. so 3600 seconds = 1 Hour
+DEFAULT_TRACKERS_UPDATE_INTERVAL = decouple.config(
+    "TRACKING_PULSE", default=7200, cast=int
+)  # value is seconds. so 10800 seconds = 3 Hours
+
+WORKER_IMMEDIATE_MODE = decouple.config(
+    "WORKER_IMMEDIATE_MODE", default=False, cast=bool
+)
+
+# Redis configuration - REDIS_URL takes precedence and supersedes granular env vars
+REDIS_URL = decouple.config("REDIS_URL", default=None)
+
+# Parse REDIS_URL or construct from individual parameters
+if REDIS_URL is not None:
+    from urllib.parse import urlparse
+
+    parsed = urlparse(REDIS_URL)
+
+    # Extract values from REDIS_URL (these supersede granular env vars)
+    REDIS_HOST = parsed.hostname
+    REDIS_PORT = parsed.port or 6379
+    REDIS_USERNAME = parsed.username or "default"
+    REDIS_PASSWORD = parsed.password
+
+    # Determine SSL from URL scheme (rediss:// means SSL is enabled)
+    REDIS_SCHEME = parsed.scheme if parsed.scheme in ("redis", "rediss") else "redis"
+    REDIS_SSL = REDIS_SCHEME == "rediss"
+
+else:
+    # Fall back to individual parameters
+    REDIS_HOST = decouple.config("REDIS_HOST", default=None)
+    REDIS_PORT = decouple.config("REDIS_PORT", default=None)
+    REDIS_PASSWORD = decouple.config("REDIS_PASSWORD", default=None)
+    REDIS_USERNAME = decouple.config("REDIS_USERNAME", default="default")
+    REDIS_SSL = decouple.config("REDIS_SSL", default=False, cast=bool)
+
+# Configure HUEY based on available Redis configuration
+if REDIS_HOST is not None:
+    pool = redis.ConnectionPool(
+        host=REDIS_HOST,
+        port=REDIS_PORT,
+        max_connections=20,
+        **({"ssl": REDIS_SSL} if REDIS_SSL else {}),
+        **({"password": REDIS_PASSWORD} if REDIS_PASSWORD else {}),
+        **({"username": REDIS_USERNAME} if REDIS_USERNAME else {}),
+    )
+    HUEY = huey.RedisHuey(
+        "default",
+        connection_pool=pool,
+        **({"immediate": WORKER_IMMEDIATE_MODE} if WORKER_IMMEDIATE_MODE else {}),
+    )
+
+else:
+    # No Redis configured, use SQLite
+    WORKER_DB_DIR = decouple.config("WORKER_DB_DIR", default=settings.WORK_DIR)
+    WORKER_DB_FILE_NAME = os.path.join(WORKER_DB_DIR, "tasks.sqlite3")
+
+    settings.DATABASES["workers"] = {
+        "NAME": WORKER_DB_FILE_NAME,
+        "ENGINE": "django.db.backends.sqlite3",
+    }
+
+    HUEY = huey.SqliteHuey(
+        name="default",
+        filename=WORKER_DB_FILE_NAME,
+        **({"immediate": WORKER_IMMEDIATE_MODE} if WORKER_IMMEDIATE_MODE else {}),
+    )

{karrio_server-2025.5rc30.dist-info → karrio_server-2025.5rc32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server
-Version: 2025.5rc30
+Version: 2025.5rc32
 Summary: Multi-carrier shipping API
 Author-email: karrio <hello@karrio.io>
 License-Expression: Apache-2.0
@@ -42,6 +42,7 @@ Requires-Dist: opentelemetry-instrumentation-logging
 Requires-Dist: opentelemetry-instrumentation-psycopg2
 Requires-Dist: opentelemetry-instrumentation-redis
 Requires-Dist: opentelemetry-semantic-conventions
+Requires-Dist: loguru
 
 # <a href="https://karrio.io" target="_blank"><img alt="Karrio" src="https://docs.karrio.io/img/logo.svg" height="50px" /></a>
 

{karrio_server-2025.5rc30.dist-info → karrio_server-2025.5rc32.dist-info}/RECORD

@@ -1,17 +1,18 @@
-karrio/server/VERSION,sha256=TS1XH1yu99ZMb3FKrCfrLPcYQPR8kVZYdkjtKn54feQ,10
+karrio/server/VERSION,sha256=XNzgmUDikIDatuZ8iDHbUCq5nJQzGvX4ntLiAGaC9vE,10
 karrio/server/__init__.py,sha256=iOEMwnlORWezdO8-2vxBIPSR37D7JGjluZ8f55vzxls,81
 karrio/server/__main__.py,sha256=hy2-Zb2wSVe_Pu6zWZ-BhiM4rBaGZ3D16HSuhudygqg,632
 karrio/server/asgi.py,sha256=LsZYMWo8U9zURVPdHnvUsziOhMjdCdQoD2-gMJbS2U0,462
 karrio/server/workers.py,sha256=wOlWmXC7zRJV86IfbQnfUZsnCIvvWtXzFHH_EIkg1J0,179
 karrio/server/wsgi.py,sha256=SpWqkEYlMsj89_znZ8p8IjH3EgTVRWRq_9eS8t64dMw,403
 karrio/server/lib/otel_huey.py,sha256=6MP6vX6b6x6RPF2K1m8B8L8S9GK1Q3vANmLidsxh65k,5428
-karrio/server/settings/__init__.py,sha256=rpHZgzt7czC0ZUvlu7QWkFYuJokelp5yACtK8UQCaTk,821
-karrio/server/settings/apm.py,sha256=PfILlN71p38pNHeV3AysAdnyErnsIvh_8buPVt6ASfw,7378
-karrio/server/settings/base.py,sha256=2cv8tMgjiX-kmgnZbZgoNDFTuQc4d_GxhsbzpSRRDoc,22552
-karrio/server/settings/cache.py,sha256=BCFIjbLKBgYs34i099Z_i8EC55lRF39oJfsPHoXq3vc,1112
+karrio/server/settings/__init__.py,sha256=iw-NBcReOnDYpnvSEBdYDfV7jC0040jYdupnmSdElec,866
+karrio/server/settings/apm.py,sha256=fp9_CVzNfQ8MvNp1-WQbCILzLU3RSJeeu1vYAtdrgfs,7415
+karrio/server/settings/base.py,sha256=311L71Lxk-9tv0nqeERtKIrWjvEhD9g2LmUcpd0MkoA,22246
+karrio/server/settings/cache.py,sha256=wiuhbTPjEyHY5xgvVfwNV0-QxsFN5kTI8sSwnibCSVI,2502
 karrio/server/settings/constance.py,sha256=wKi7u-NORAPjIJMIbl3k5kPRkUA6jJJWe9kxsV3aoeA,7113
 karrio/server/settings/debug.py,sha256=fFyK2XX47UGeK0eRNSV-9ZLaComay5QvJW0692vaH98,527
 karrio/server/settings/email.py,sha256=bHBLKM_v3HTkmjrz_Msdj_Z7_kMzAb7i6pvJCZuzu1E,1403
+karrio/server/settings/workers.py,sha256=snzAxzZLxP5i0mTNEE6AD3bHT7WBjh-fe-A-vT0cQIE,2666
 karrio/server/static/extra/branding/android-chrome-192x192.png,sha256=qSwEKKBtk4udSHb0OWGC5-jfkP5cVpULDD1Cdkuk8PU,7005
 karrio/server/static/extra/branding/android-chrome-512x512.png,sha256=YFwVPnPChO30tTuyrwSc_z548H7C6OFXh4CCu2krvHA,21062
 karrio/server/static/extra/branding/favicon-16x16.png,sha256=wkELpij29bIvvKr5sDcjfNeYvj7i0yk-__bJbZckEK8,1085
@@ -72,8 +73,8 @@ karrio/server/templates/admin/base_site.html,sha256=kbcdvehXZ1EHaw07JL7fSZmjrnVM
 karrio/server/templates/openapi/openapi.html,sha256=3ApCZ5pE6Wjv7CJllVbqD2WiDQuLy-BFS-IIHurXhBY,1133
 karrio/server/urls/__init__.py,sha256=Ah-XqaqRsfecQgCGRHjxmXe8O7a0avq5ocU90tkVwQI,1998
 karrio/server/urls/jwt.py,sha256=QN2L-EpUEQCF2UGYPu_VVlA49Fc0BtcY7Ov3-xpp7_U,6772
-karrio_server-2025.5rc30.dist-info/METADATA,sha256=tifknyLMeuNQgaLGsQRT70r3T_7BxrhU-qS56CJhjQE,4283
-karrio_server-2025.5rc30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-karrio_server-2025.5rc30.dist-info/entry_points.txt,sha256=c2eftt6MpJjyp0OFv1OmO9nUYSDemt9fGq_RDdvpGLw,55
-karrio_server-2025.5rc30.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
-karrio_server-2025.5rc30.dist-info/RECORD,,
+karrio_server-2025.5rc32.dist-info/METADATA,sha256=FoCDlHgfC1ctngm3M4xIDcTCajXjxQFYiWGouGBgklA,4305
+karrio_server-2025.5rc32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server-2025.5rc32.dist-info/entry_points.txt,sha256=c2eftt6MpJjyp0OFv1OmO9nUYSDemt9fGq_RDdvpGLw,55
+karrio_server-2025.5rc32.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server-2025.5rc32.dist-info/RECORD,,