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

karrio/server/VERSION

@@ -1 +1 @@
-2025.5rc32
+2025.5rc33

karrio/server/settings/base.py

@@ -60,6 +60,8 @@ CORS_ALLOW_CREDENTIALS = True
 CORS_ALLOW_HEADERS = list(default_headers) + [
     "x-test-mode",
     "x-org-id",
+    "x-tenant-id",
+    "x-request-id",
 ]
 
 # HTTPS configuration

karrio/server/settings/cache.py

@@ -1,4 +1,5 @@
 # type: ignore
+import sys
 from decouple import config
 from karrio.server.settings.base import *
 from karrio.server.settings.apm import HEALTH_CHECK_APPS
@@ -7,6 +8,16 @@ from karrio.server.core.logging import logger
 
 CACHE_TTL = 60 * 15
 
+# Check if worker is running in detached mode (separate from API server)
+DETACHED_WORKER = config("DETACHED_WORKER", default=False, cast=bool)
+
+# Detect if running as a worker process (via run_huey command)
+IS_WORKER_PROCESS = any("run_huey" in arg for arg in sys.argv)
+
+# Skip default Redis cache configuration if in worker mode
+# Workers only need HUEY Redis, not the default Django cache
+SKIP_DEFAULT_CACHE = DETACHED_WORKER or IS_WORKER_PROCESS
+
 # 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")
@@ -31,7 +42,7 @@ if REDIS_URL is not None:
 
     # 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'
+    REDIS_CONNECTION_URL = f"{REDIS_SCHEME}://{REDIS_AUTH}{REDIS_HOST}:{REDIS_PORT}/1"
 
 else:
     # Fall back to individual parameters
@@ -43,10 +54,12 @@ else:
     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'
+        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:
+# Configure Django cache if Redis is available and not in worker mode
+if REDIS_HOST is not None and not SKIP_DEFAULT_CACHE:
     HEALTH_CHECK_APPS += ["health_check.contrib.redis"]
     INSTALLED_APPS += ["health_check.contrib.redis"]
 
@@ -56,9 +69,17 @@ if REDIS_HOST is not None:
             "LOCATION": REDIS_CONNECTION_URL,
             "OPTIONS": {
                 "CLIENT_CLASS": "django_redis.client.DefaultClient",
-                **({"CONNECTION_POOL_KWARGS": {"ssl_cert_reqs": None}} if REDIS_SSL else {}),
+                **(
+                    {"CONNECTION_POOL_KWARGS": {"ssl_cert_reqs": None}}
+                    if REDIS_SSL
+                    else {}
+                ),
             },
             "KEY_PREFIX": REDIS_PREFIX,
         }
     }
-    logger.info("Redis connection initialized", redis_url=REDIS_CONNECTION_URL)
+    print(f"Redis cache connection initialized")
+elif SKIP_DEFAULT_CACHE:
+    print(
+        "Skipping default Redis cache configuration (worker mode - only HUEY Redis needed)"
+    )

karrio/server/settings/workers.py

@@ -1,5 +1,7 @@
 # type: ignore
 import os
+import sys
+import socket
 import huey
 import redis
 import decouple
@@ -12,65 +14,125 @@ DEFAULT_TRACKERS_UPDATE_INTERVAL = decouple.config(
     "TRACKING_PULSE", default=7200, cast=int
 )  # value is seconds. so 10800 seconds = 3 Hours
 
+# Check if worker is running in detached mode (separate from API server)
+DETACHED_WORKER = decouple.config("DETACHED_WORKER", default=False, cast=bool)
+
 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)
+# Detect if running as a worker process (via run_huey command)
+# Workers always need Huey configured regardless of DETACHED_WORKER setting
+IS_WORKER_PROCESS = any("run_huey" in arg for arg in sys.argv)
 
-# Parse REDIS_URL or construct from individual parameters
-if REDIS_URL is not None:
-    from urllib.parse import urlparse
+# Skip Huey configuration only if:
+# 1. Running in detached worker mode (DETACHED_WORKER=True)
+# 2. AND not running as a worker process (IS_WORKER_PROCESS=False)
+# This ensures workers always get Huey configured, but API servers don't when detached
+if DETACHED_WORKER and not IS_WORKER_PROCESS:
+    # API server in detached mode - skip Huey configuration
+    HUEY = None
+else:
+    # Either: worker process, or API server with embedded workers
+    # Redis configuration - REDIS_URL takes precedence and supersedes granular env vars
+    REDIS_URL = decouple.config("REDIS_URL", default=None)
 
-    parsed = urlparse(REDIS_URL)
+    # Parse REDIS_URL or construct from individual parameters
+    if REDIS_URL is not None:
+        from urllib.parse import urlparse
 
-    # 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
+        parsed = urlparse(REDIS_URL)
 
-    # 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"
+        # 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
 
-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 {}),
-    )
+        # 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:
-    # 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 {}),
-    )
+    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:
+        # Calculate max connections based on environment
+        # Each worker replica needs: (workers_per_replica + 1 scheduler) connections
+        # Formula: (worker_replicas * (threads_per_worker + 1)) + api_connections + buffer
+        # Example: 100 connections = (5 replicas * (8 workers + 1 scheduler)) + 40 API + 15 buffer
+        REDIS_MAX_CONNECTIONS = decouple.config(
+            "REDIS_MAX_CONNECTIONS", default=100, cast=int
+        )
+
+        # Connection pool configuration with timeouts
+        # Use BlockingConnectionPool to wait for available connections instead of failing immediately
+        pool_kwargs = {
+            "host": REDIS_HOST,
+            "port": REDIS_PORT,
+            "max_connections": REDIS_MAX_CONNECTIONS,
+            "timeout": 20,  # Wait up to 20 seconds for an available connection
+            # Timeout settings to prevent hung connections
+            "socket_timeout": 10,  # Command execution timeout (seconds)
+            "socket_connect_timeout": 10,  # Connection establishment timeout (seconds)
+            # Keep connections alive to prevent closure by firewalls/load balancers
+            "socket_keepalive": True,
+            # Retry on transient failures
+            "retry_on_timeout": True,
+        }
+
+        # Add TCP keepalive options if available (Linux/Unix only)
+        try:
+            pool_kwargs["socket_keepalive_options"] = {
+                socket.TCP_KEEPIDLE: 60,  # Start keepalive after 60s idle
+                socket.TCP_KEEPINTVL: 10,  # Keepalive interval
+                socket.TCP_KEEPCNT: 3,  # Keepalive probes before timeout
+            }
+        except AttributeError:
+            # TCP keepalive constants not available on this platform
+            pass
+
+        # Add authentication if provided
+        if REDIS_PASSWORD:
+            pool_kwargs["password"] = REDIS_PASSWORD
+        if REDIS_USERNAME:
+            pool_kwargs["username"] = REDIS_USERNAME
+
+        # Add SSL/TLS configuration if enabled
+        if REDIS_SSL:
+            # Use SSLConnection class for SSL/TLS connections
+            pool_kwargs["connection_class"] = redis.SSLConnection
+            pool_kwargs["ssl_cert_reqs"] = None  # For Azure Redis compatibility
+
+        # Use BlockingConnectionPool to wait for connections instead of raising errors immediately
+        pool = redis.BlockingConnectionPool(**pool_kwargs)
+
+        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.5rc32.dist-info → karrio_server-2025.5rc33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karrio_server
-Version: 2025.5rc32
+Version: 2025.5rc33
 Summary: Multi-carrier shipping API
 Author-email: karrio <hello@karrio.io>
 License-Expression: Apache-2.0

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

@@ -1,4 +1,4 @@
-karrio/server/VERSION,sha256=XNzgmUDikIDatuZ8iDHbUCq5nJQzGvX4ntLiAGaC9vE,10
+karrio/server/VERSION,sha256=Jmh7RfdYs16oKOK2DMy-Yo-5r45YiB1puxKA3AUCuGc,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
@@ -7,12 +7,12 @@ karrio/server/wsgi.py,sha256=SpWqkEYlMsj89_znZ8p8IjH3EgTVRWRq_9eS8t64dMw,403
 karrio/server/lib/otel_huey.py,sha256=6MP6vX6b6x6RPF2K1m8B8L8S9GK1Q3vANmLidsxh65k,5428
 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/base.py,sha256=UbZ4pEBEKG0mJSlNED1iU9KEpNmrZjjmwdujwnQ30fI,22285
+karrio/server/settings/cache.py,sha256=nAHLgqynNtohxCJSMYP2RzcnBGC0ZC30KH6LlKdxgo4,3218
 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/settings/workers.py,sha256=Ey59-TQ2odW-e15Mf2OZjQSLzX3jNCnWMC7dy-T2A3o,5755
 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
@@ -73,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.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,,
+karrio_server-2025.5rc33.dist-info/METADATA,sha256=dCp9nxE9T_UWaj-PjNugMeqMiHG_7Udgr8PvKnfPioA,4305
+karrio_server-2025.5rc33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server-2025.5rc33.dist-info/entry_points.txt,sha256=c2eftt6MpJjyp0OFv1OmO9nUYSDemt9fGq_RDdvpGLw,55
+karrio_server-2025.5rc33.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server-2025.5rc33.dist-info/RECORD,,