queue-local 0.0.53__tar.gz → 0.0.55__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {queue_local-0.0.53 → queue_local-0.0.55}/PKG-INFO +1 -1
- {queue_local-0.0.53 → queue_local-0.0.55}/pyproject.toml +1 -1
- {queue_local-0.0.53 → queue_local-0.0.55}/queue_local/src/database_queue.py +26 -28
- {queue_local-0.0.53 → queue_local-0.0.55}/queue_local.egg-info/PKG-INFO +1 -1
- {queue_local-0.0.53 → queue_local-0.0.55}/setup.py +1 -1
- {queue_local-0.0.53 → queue_local-0.0.55}/README.md +0 -0
- {queue_local-0.0.53 → queue_local-0.0.55}/queue_local/src/__init__.py +0 -0
- {queue_local-0.0.53 → queue_local-0.0.55}/queue_local/src/our_queue.py +0 -0
- {queue_local-0.0.53 → queue_local-0.0.55}/queue_local.egg-info/SOURCES.txt +0 -0
- {queue_local-0.0.53 → queue_local-0.0.55}/queue_local.egg-info/dependency_links.txt +0 -0
- {queue_local-0.0.53 → queue_local-0.0.55}/queue_local.egg-info/requires.txt +0 -0
- {queue_local-0.0.53 → queue_local-0.0.55}/queue_local.egg-info/top_level.txt +0 -0
- {queue_local-0.0.53 → queue_local-0.0.55}/setup.cfg +0 -0
|
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
|
|
|
6
6
|
|
|
7
7
|
[tool.poetry]
|
|
8
8
|
name = "queue-local"
|
|
9
|
-
version = "0.0.
|
|
9
|
+
version = "0.0.2" # https://pypi.org/project/queue-local
|
|
10
10
|
description = "queue-local Python Package"
|
|
11
11
|
readme = "README.md"
|
|
12
12
|
authors = [
|
|
@@ -2,12 +2,12 @@ import json
|
|
|
2
2
|
import os
|
|
3
3
|
from collections.abc import Iterable
|
|
4
4
|
from enum import Enum
|
|
5
|
-
|
|
6
5
|
from database_mysql_local.generic_crud import GenericCRUD
|
|
7
6
|
from logger_local.LoggerComponentEnum import LoggerComponentEnum
|
|
8
7
|
from logger_local.MetaLogger import MetaLogger
|
|
9
8
|
from user_context_remote.user_context import UserContext
|
|
10
9
|
|
|
10
|
+
|
|
11
11
|
from .our_queue import OurQueue
|
|
12
12
|
|
|
13
13
|
QUEUE_LOCAL_PYTHON_COMPONENT_ID = 155
|
|
@@ -65,34 +65,33 @@ class DatabaseQueue(OurQueue, GenericCRUD, metaclass=MetaLogger, object=queue_lo
|
|
|
65
65
|
is_test_data=is_test_data)
|
|
66
66
|
self.user_context = UserContext()
|
|
67
67
|
|
|
68
|
-
|
|
69
|
-
def push(self, data_dict: dict) -> int:
|
|
68
|
+
def push(self, queue_dict: dict) -> int:
|
|
70
69
|
"""Pushes a new entry to the queue and returns the new queue id.
|
|
71
|
-
|
|
70
|
+
queue_dict consists of columns and values to insert into the queue table."""
|
|
72
71
|
created_user_id = UserContext().get_effective_user_id()
|
|
73
72
|
|
|
74
|
-
self._fix_parameters_json(
|
|
73
|
+
self._fix_parameters_json(queue_dict)
|
|
75
74
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
75
|
+
queue_dict["queue_status_id"] = QueueStatusEnum.NEW.value
|
|
76
|
+
|
|
77
|
+
queue_dict["created_user_id"] = created_user_id
|
|
79
78
|
|
|
80
|
-
if self.queue_item_id_column_name in
|
|
81
|
-
column_value =
|
|
82
|
-
del
|
|
83
|
-
self.update_by_column_and_value(column_value=column_value,
|
|
84
|
-
|
|
79
|
+
if self.queue_item_id_column_name in queue_dict:
|
|
80
|
+
column_value = queue_dict[self.queue_item_id_column_name]
|
|
81
|
+
del queue_dict[self.queue_item_id_column_name]
|
|
82
|
+
self.update_by_column_and_value(column_value=column_value, queue_dict=queue_dict)
|
|
83
|
+
queue_id = column_value
|
|
85
84
|
else:
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
return
|
|
85
|
+
queue_id = self.insert(data_dict=queue_dict)
|
|
86
|
+
self.logger.end("...", object={'push_result': queue_id} )
|
|
87
|
+
return queue_id
|
|
89
88
|
# TODO Can we do this everywhere? [I will make it auto in the meta logger]
|
|
90
|
-
|
|
89
|
+
|
|
91
90
|
|
|
92
91
|
def push_back(self, queue_item: dict) -> None:
|
|
93
92
|
"""Push a taken queue item back to the queue."""
|
|
94
|
-
|
|
95
|
-
self.update_by_column_and_value(column_value=queue_item[self.queue_item_id_column_name],
|
|
93
|
+
queue_dict = {"queue_status_id": QueueStatusEnum.NEW.value, "process_id": None}
|
|
94
|
+
self.update_by_column_and_value(column_value=queue_item[self.queue_item_id_column_name], queue_dict=queue_dict)
|
|
96
95
|
|
|
97
96
|
def get(self, *, action_ids: tuple = (), custom_condition: str = "") -> dict:
|
|
98
97
|
"""
|
|
@@ -104,21 +103,20 @@ class DatabaseQueue(OurQueue, GenericCRUD, metaclass=MetaLogger, object=queue_lo
|
|
|
104
103
|
"""
|
|
105
104
|
action_ids = self._fix_action_ids(action_ids)
|
|
106
105
|
|
|
107
|
-
|
|
106
|
+
queue_dict = {"process_id": os.getpid()}
|
|
108
107
|
update_where = f"process_id IS NULL " \
|
|
109
108
|
f"AND (queue_status_id IS NULL OR queue_status_id = {QueueStatusEnum.NEW.value}) " \
|
|
110
109
|
f"AND NOW() > start_timestamp AND (end_timestamp is NULL or NOW() < end_timestamp) " + \
|
|
111
110
|
(f"AND action_id IN {action_ids} " if action_ids else "") + \
|
|
112
111
|
(f"AND {custom_condition}" if custom_condition else "")
|
|
113
|
-
self.update_by_where(where=update_where, order_by=self.queue_item_id_column_name, limit=1, data_dict=
|
|
112
|
+
self.update_by_where(where=update_where, order_by=self.queue_item_id_column_name, limit=1, data_dict=queue_dict)
|
|
114
113
|
|
|
115
|
-
# TODO In which cases queue_status_id IS NULL? - Does it indicate a problem/bug?
|
|
116
114
|
select_where = f"process_id = {os.getpid()} AND (queue_status_id IS NULL OR queue_status_id = {QueueStatusEnum.NEW.value})"
|
|
117
115
|
queue_item = self.select_one_dict_by_where(where=select_where)
|
|
118
116
|
if queue_item:
|
|
119
|
-
|
|
117
|
+
update_queue_dict = {"queue_status_id": QueueStatusEnum.RETRIEVED.value,
|
|
120
118
|
"user_jwt": self.user_context.get_user_jwt()}
|
|
121
|
-
self.update_by_column_and_value(column_value=queue_item[self.queue_item_id_column_name], data_dict=
|
|
119
|
+
self.update_by_column_and_value(column_value=queue_item[self.queue_item_id_column_name], data_dict=update_queue_dict)
|
|
122
120
|
self.logger.info("Entry retrieved and updated from the queue database successfully",
|
|
123
121
|
object=queue_item)
|
|
124
122
|
else:
|
|
@@ -147,11 +145,11 @@ class DatabaseQueue(OurQueue, GenericCRUD, metaclass=MetaLogger, object=queue_lo
|
|
|
147
145
|
return action_ids if len(action_ids) != 1 else f"({action_ids[0]})"
|
|
148
146
|
|
|
149
147
|
@staticmethod
|
|
150
|
-
def _fix_parameters_json(
|
|
148
|
+
def _fix_parameters_json(queue_dict: dict):
|
|
151
149
|
"""Fixes the parameters_json argument to fit the SQL syntax (parameters_json must be a string)"""
|
|
152
|
-
for key, value in
|
|
150
|
+
for key, value in queue_dict.items():
|
|
153
151
|
if "parameters_json" in key:
|
|
154
152
|
if isinstance(value, str):
|
|
155
|
-
|
|
153
|
+
queue_dict[key] = value.replace("'", '"')
|
|
156
154
|
else:
|
|
157
|
-
|
|
155
|
+
queue_dict[key] = json.dumps(value)
|
|
@@ -5,7 +5,7 @@ package_dir = PACKAGE_NAME.replace("-", "_")
|
|
|
5
5
|
|
|
6
6
|
setuptools.setup(
|
|
7
7
|
name=PACKAGE_NAME, # https://pypi.org/project/queue-local
|
|
8
|
-
version='0.0.
|
|
8
|
+
version='0.0.55',
|
|
9
9
|
author="Circles",
|
|
10
10
|
author_email="info@circles.life",
|
|
11
11
|
url=f"https://github.com/circles-zone/{PACKAGE_NAME}-python-package",
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|