autonomous-app 0.3.31__tar.gz → 0.3.33__tar.gz

{autonomous_app-0.3.31 → autonomous_app-0.3.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autonomous-app
-Version: 0.3.31
+Version: 0.3.33
 Summary: Containerized application framework built on Flask with additional libraries and tools for rapid development of web applications.
 Author-email: Steven A Moore <samoore@binghamton.edu>
 Project-URL: homepage, https://github.com/Sallenmoore/autonomous

{autonomous_app-0.3.31 → autonomous_app-0.3.33}/src/autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.31"
+__version__ = "0.3.33"
 
 from dotenv import load_dotenv
 

{autonomous_app-0.3.31 → autonomous_app-0.3.33}/src/autonomous/db/db_sync.py

@@ -8,7 +8,7 @@ import numpy as np
 import pymongo
 import redis
 import requests
-
+from autonomous.taskrunner.autotasks import AutoTasks, TaskPriority
 # CONFIGURATION
 db_host = os.getenv("DB_HOST", "db")
 db_port = os.getenv("DB_PORT", 27017)
@@ -46,8 +46,8 @@ def process_single_object_sync(object_id, collection_name, token):
     token_key = f"sync_token:{collection_name}:{str_id}"
 
     # 1. THE DEBOUNCE WAIT (Happens in background)
-    print(f"Debouncing {str_id} for 5 seconds...")
-    time.sleep(5)
+    print(f"Debouncing {str_id} for 2 seconds...")
+    time.sleep(2)
 
     # 2. THE VERIFICATION
     # Check if a newer save happened while we slept
@@ -111,8 +111,6 @@ def request_indexing(object_id, collection_name):
     MUST BE FAST. NO SLEEPING HERE.
     """
     print("Requesting Indexing...")
-    # Import your Queue Wrapper
-    from autonomous.tasks.autotask import AutoTasks
 
     # Initialize the Task Runner
     task_runner = AutoTasks()
@@ -133,6 +131,7 @@ def request_indexing(object_id, collection_name):
             object_id=str_id,
             collection_name=collection_name,
             token=current_token,
+            priority=TaskPriority.LOW
         )
         return True
     except Exception as e:

autonomous_app-0.3.33/src/autonomous/taskrunner/__init__.py

@@ -0,0 +1 @@
+from .autotasks import AutoTasks, TaskPriority

autonomous_app-0.3.31/src/autonomous/tasks/autotask.py → autonomous_app-0.3.33/src/autonomous/taskrunner/autotasks.py

@@ -1,8 +1,15 @@
 import os
+from enum import Enum
 from redis import Redis
 from rq import Queue
 from rq.job import Job
 
+# 1. Define Priorities clearly
+class TaskPriority(Enum):
+    HIGH = "high"
+    DEFAULT = "default"
+    LOW = "low"
+
 class AutoTask:
     def __init__(self, job):
         self.job = job
@@ -17,7 +24,6 @@ class AutoTask:
 
     @property
     def result(self):
-        # Simplified result fetching
         return {
             "id": self.id,
             "return_value": self.job.result,
@@ -27,9 +33,8 @@ class AutoTask:
 
 class AutoTasks:
     _connection = None
-    queue = None
+    # We remove the single 'queue' class attribute because we now have multiple
 
-    # Config stays the same
     config = {
         "host": os.environ.get("REDIS_HOST", "cachedb"),
         "port": os.environ.get("REDIS_PORT", 6379),
@@ -38,32 +43,40 @@ class AutoTasks:
         "db": os.environ.get("REDIS_DB", 0),
     }
 
-    def __init__(self, queue_name="default"):
+    def __init__(self):
+        # Establish connection once (Singleton pattern logic)
         if not AutoTasks._connection:
             options = {}
             if AutoTasks.config.get("password"):
                 options["password"] = AutoTasks.config.get("password")
 
-            # Create Redis Connection
             AutoTasks._connection = Redis(
                 host=AutoTasks.config.get("host"),
                 port=AutoTasks.config.get("port"),
-                decode_responses=False, # RQ requires bytes, not strings
+                decode_responses=False,
                 **options,
             )
 
-        # Initialize Queue
-        AutoTasks.queue = Queue(queue_name, connection=AutoTasks._connection)
+    def _get_queue(self, priority_name):
+        """Helper to get or create the queue object for a specific priority"""
+        return Queue(priority_name, connection=AutoTasks._connection)
 
     def task(self, func, *args, **kwargs):
         """
-        Enqueues a job to Redis. Does NOT start a worker.
+        Enqueues a job.
+        kwarg 'priority' determines the queue (default: 'default').
         """
         job_timeout = kwargs.pop("_task_job_timeout", 3600)
 
-        # Enqueue the job
-        # func can be a string path or the function object itself
-        job = AutoTasks.queue.enqueue(
+        # 2. Extract Priority (support Enum or string)
+        priority = kwargs.pop("priority", TaskPriority.DEFAULT)
+        queue_name = priority.value if isinstance(priority, TaskPriority) else priority
+
+        # 3. Get the specific queue
+        q = self._get_queue(queue_name)
+
+        # 4. Enqueue
+        job = q.enqueue(
             func,
             args=args,
             kwargs=kwargs,
@@ -77,4 +90,4 @@ class AutoTasks:
             job = Job.fetch(job_id, connection=AutoTasks._connection)
             return AutoTask(job)
         except Exception:
-            return None
+            return None

{autonomous_app-0.3.31 → autonomous_app-0.3.33}/src/autonomous_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autonomous-app
-Version: 0.3.31
+Version: 0.3.33
 Summary: Containerized application framework built on Flask with additional libraries and tools for rapid development of web applications.
 Author-email: Steven A Moore <samoore@binghamton.edu>
 Project-URL: homepage, https://github.com/Sallenmoore/autonomous

{autonomous_app-0.3.31 → autonomous_app-0.3.33}/src/autonomous_app.egg-info/SOURCES.txt

@@ -58,9 +58,9 @@ src/autonomous/model/automodel.py
 src/autonomous/storage/__init__.py
 src/autonomous/storage/imagestorage.py
 src/autonomous/storage/localstorage.py
-src/autonomous/tasks/__init__.py
-src/autonomous/tasks/autotask.py
-src/autonomous/tasks/task_router.py
+src/autonomous/taskrunner/__init__.py
+src/autonomous/taskrunner/autotasks.py
+src/autonomous/taskrunner/task_router.py
 src/autonomous/utils/markdown.py
 src/autonomous_app.egg-info/PKG-INFO
 src/autonomous_app.egg-info/SOURCES.txt

autonomous_app-0.3.31/src/autonomous/tasks/__init__.py

@@ -1 +0,0 @@
-from .autotask import AutoTasks