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

karrio/server/VERSION

@@ -1 +1 @@
-2025.5rc28
+2025.5rc30

karrio/server/settings/__init__.py

@@ -5,7 +5,6 @@ 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

@@ -169,15 +169,18 @@ if OTEL_ENABLED and OTEL_EXPORTER_OTLP_ENDPOINT:
             RedisInstrumentor().instrument()
         except Exception:
             pass  # Redis might not be installed
-    
-    # Instrument Huey task queue (temporarily disabled due to compatibility issues)
-    # try:
-    #     from karrio.server.lib.otel_huey import instrument_huey
-    #     instrument_huey()
-    # except Exception as e:
-    #     logger = logging.getLogger(__name__)
-    #     logger.warning(f"Failed to instrument Huey: {e}")
-    
+
+    # Instrument Huey task queue
+    try:
+        from huey.contrib.djhuey import HUEY as huey_instance
+        from karrio.server.lib.otel_huey import HueyInstrumentor
+
+        instrumentor = HueyInstrumentor()
+        instrumentor.instrument(huey_instance)
+    except Exception as e:
+        logger = logging.getLogger(__name__)
+        logger.warning(f"Failed to instrument Huey: {e}")
+
     # Log that OpenTelemetry is enabled
     logger = logging.getLogger(__name__)
     logger.info(f"OpenTelemetry enabled: Service={OTEL_SERVICE_NAME}, Endpoint={OTEL_EXPORTER_OTLP_ENDPOINT}")

karrio/server/settings/base.py

@@ -261,6 +261,62 @@ 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,
@@ -352,6 +408,15 @@ 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):
+    _WORKER_DB_DIR = config("WORKER_DB_DIR", default=WORK_DIR)
+    _WORKER_DB_FILE_NAME = os.path.join(_WORKER_DB_DIR, "tasks.sqlite3")
+    DATABASES["workers"] = {
+        "NAME": _WORKER_DB_FILE_NAME,
+        "ENGINE": "django.db.backends.sqlite3",
+    }
+
 # Password validation
 # https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators