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

karrio/server/VERSION

@@ -1 +1 @@
-2025.5rc30
+2025.5rc31

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/base.py

@@ -261,62 +261,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,

karrio/server/settings/workers.py

@@ -0,0 +1,53 @@
+# 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_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")
+
+
+# Use redis if available
+if REDIS_HOST is not None:
+    pool = redis.ConnectionPool(
+        host=REDIS_HOST,
+        port=REDIS_PORT or "6379",
+        max_connections=20,
+        **({"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:
+    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.5rc31.dist-info}/METADATA

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

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

@@ -1,17 +1,18 @@
-karrio/server/VERSION,sha256=TS1XH1yu99ZMb3FKrCfrLPcYQPR8kVZYdkjtKn54feQ,10
+karrio/server/VERSION,sha256=mbeRK4sJZA26Mqme_nviTrhpkJlUXIywotpDUr5EmG8,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/__init__.py,sha256=iw-NBcReOnDYpnvSEBdYDfV7jC0040jYdupnmSdElec,866
 karrio/server/settings/apm.py,sha256=PfILlN71p38pNHeV3AysAdnyErnsIvh_8buPVt6ASfw,7378
-karrio/server/settings/base.py,sha256=2cv8tMgjiX-kmgnZbZgoNDFTuQc4d_GxhsbzpSRRDoc,22552
+karrio/server/settings/base.py,sha256=c_rNOlOsE5qFEHjIo1yE5FtPfQwkzUhs5e7T9h9cfoA,20752
 karrio/server/settings/cache.py,sha256=BCFIjbLKBgYs34i099Z_i8EC55lRF39oJfsPHoXq3vc,1112
 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=s3km5UZcultq4O1adWZWso7jvRyfhc4jk3T1Jx0EoCA,1697
 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.5rc31.dist-info/METADATA,sha256=QnPfGK8HPEUkpXjpugdxXmoydJNSTqLY3TcPT4vHR9Q,4283
+karrio_server-2025.5rc31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+karrio_server-2025.5rc31.dist-info/entry_points.txt,sha256=c2eftt6MpJjyp0OFv1OmO9nUYSDemt9fGq_RDdvpGLw,55
+karrio_server-2025.5rc31.dist-info/top_level.txt,sha256=D1D7x8R3cTfjF_15mfiO7wCQ5QMtuM4x8GaPr7z5i78,12
+karrio_server-2025.5rc31.dist-info/RECORD,,