queue-worker-local 0.0.56b2880__tar.gz → 0.0.58__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_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/PKG-INFO +2 -2
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/pyproject.toml +1 -1
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local/src/queue_worker.py +14 -8
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local.egg-info/PKG-INFO +2 -2
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/setup.py +3 -3
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/README.md +0 -0
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local/src/__init__.py +0 -0
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local.egg-info/SOURCES.txt +0 -0
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local.egg-info/dependency_links.txt +0 -0
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local.egg-info/requires.txt +0 -0
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local.egg-info/top_level.txt +0 -0
- {queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: queue-worker-local
|
|
3
|
-
Version: 0.0.
|
|
3
|
+
Version: 0.0.58
|
|
4
4
|
Home-page: https://github.com/circles-zone/queue-worker-local-python-package
|
|
5
5
|
Author: Circles
|
|
6
6
|
Author-email: info@circlez.ai
|
|
@@ -20,4 +20,4 @@ Dynamic: description-content-type
|
|
|
20
20
|
Dynamic: home-page
|
|
21
21
|
Dynamic: requires-dist
|
|
22
22
|
|
|
23
|
-
This is a package for sharing common
|
|
23
|
+
This is a package for sharing common CRUD operations to queue schema in the DB
|
|
@@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta"
|
|
|
11
11
|
# TODO: Please update the name, similar to storage-local (suffix -local)
|
|
12
12
|
name = "queue-worker-local"
|
|
13
13
|
# I believe we are still using the version from setup.py and not from here until potery will work
|
|
14
|
-
version = "0.0.
|
|
14
|
+
version = "0.0.27" # https://pypi.org/project/queue-worker-local
|
|
15
15
|
description = "queue-worker-local Python Package"
|
|
16
16
|
readme = "README.md"
|
|
17
17
|
authors = [
|
{queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local/src/queue_worker.py
RENAMED
|
@@ -14,7 +14,7 @@ from database_infrastructure_local.number_generator import NumberGenerator
|
|
|
14
14
|
from database_mysql_local.utils import get_table_columns
|
|
15
15
|
from logger_local.LoggerComponentEnum import LoggerComponentEnum
|
|
16
16
|
from logger_local.MetaLogger import MetaLogger
|
|
17
|
-
from logger_local import Logger
|
|
17
|
+
from logger_local.MetaLogger import Logger
|
|
18
18
|
from queue_local.database_queue import DatabaseQueue
|
|
19
19
|
from user_context_remote.user_context import UserContext
|
|
20
20
|
|
|
@@ -30,10 +30,13 @@ SESSION_LENGTH = 32
|
|
|
30
30
|
DELIMITER = "returned_value: "
|
|
31
31
|
SUCCESS_RETURN_CODE = 0
|
|
32
32
|
ERROR_RETURN_CODE = -1
|
|
33
|
-
installed = [] # to avoid installing the same package multiple times
|
|
33
|
+
installed: list[str] = [] # to avoid installing the same package multiple times
|
|
34
34
|
|
|
35
35
|
|
|
36
|
-
class QueueWorker(DatabaseQueue, metaclass=MetaLogger, object=logger_object):
|
|
36
|
+
class QueueWorker(DatabaseQueue, metaclass=MetaLogger, object=logger_object): # type: ignore[call-arg]
|
|
37
|
+
# mypy checks class-keyword args against object.__init_subclass__ and doesn't know
|
|
38
|
+
# that MetaLogger.__new__(cls, name, bases, dct, **kwargs) forwards "object" through
|
|
39
|
+
# to Logger.create_logger(); this is a real, intentional keyword consumed by our metaclass.
|
|
37
40
|
"""A queue worker that executes tasks from the queue.
|
|
38
41
|
If the given table does not have the required columns, the results will be saved in the logger instead.
|
|
39
42
|
"""
|
|
@@ -41,8 +44,6 @@ class QueueWorker(DatabaseQueue, metaclass=MetaLogger, object=logger_object):
|
|
|
41
44
|
def __init__(self, schema_name: str = "queue", table_name: str = "queue_item_table",
|
|
42
45
|
view_name: str = "queue_item_view", queue_item_id_column_name: str = "queue_item_id",
|
|
43
46
|
action_boolean_column: str = "is_queue_action", is_test_data: bool = False) -> None:
|
|
44
|
-
from user_context_remote import user_context as user_context_module
|
|
45
|
-
user_context_module.global_user = None
|
|
46
47
|
super().__init__(schema_name=schema_name, table_name=table_name, view_name=view_name,
|
|
47
48
|
queue_item_id_column_name=queue_item_id_column_name, is_test_data=is_test_data)
|
|
48
49
|
self.queue_item_id_column_name = queue_item_id_column_name
|
|
@@ -69,7 +70,7 @@ class QueueWorker(DatabaseQueue, metaclass=MetaLogger, object=logger_object):
|
|
|
69
70
|
push_back_on_error: bool = False, # is_try_to_resend_on_error (dangerous if will fail again)
|
|
70
71
|
install_packages: bool = True,
|
|
71
72
|
working_directory: str | None = None,
|
|
72
|
-
execution_details: dict = None,
|
|
73
|
+
execution_details: dict | None = None,
|
|
73
74
|
custom_condition: str = ""
|
|
74
75
|
) -> bool:
|
|
75
76
|
"""Execute tasks from the queue.
|
|
@@ -140,7 +141,9 @@ class QueueWorker(DatabaseQueue, metaclass=MetaLogger, object=logger_object):
|
|
|
140
141
|
self.user.login_using_user_jwt(queue_item_dict["user_jwt"])
|
|
141
142
|
last_user_jwt = queue_item_dict["user_jwt"]
|
|
142
143
|
|
|
143
|
-
stdout
|
|
144
|
+
stdout: str | None = None
|
|
145
|
+
stderr: str | None = None
|
|
146
|
+
returncode: int | None = None
|
|
144
147
|
if filename.endswith('.py'):
|
|
145
148
|
try:
|
|
146
149
|
# we prefer using exec as it is faster
|
|
@@ -163,6 +166,9 @@ class QueueWorker(DatabaseQueue, metaclass=MetaLogger, object=logger_object):
|
|
|
163
166
|
self.logger.info(
|
|
164
167
|
f"stdout: {stdout}\nstderr: {stderr}\nreturn code: {returncode}")
|
|
165
168
|
|
|
169
|
+
# By this point stdout/stderr/returncode are always populated: either the
|
|
170
|
+
# exec() branch above set all three, or the subprocess.run() fallback did.
|
|
171
|
+
assert stdout is not None and stderr is not None and returncode is not None
|
|
166
172
|
save_result = self.save_execution_result(
|
|
167
173
|
queue_item_dict, stdout, stderr, returncode)
|
|
168
174
|
|
|
@@ -196,7 +202,7 @@ class QueueWorker(DatabaseQueue, metaclass=MetaLogger, object=logger_object):
|
|
|
196
202
|
)
|
|
197
203
|
return successed
|
|
198
204
|
|
|
199
|
-
def execute_python_script(self, args: list) -> tuple:
|
|
205
|
+
def execute_python_script(self, args: list) -> tuple[str, str, int]:
|
|
200
206
|
# Save the original stdout and stderr
|
|
201
207
|
original_stdout = sys.stdout
|
|
202
208
|
original_stderr = sys.stderr
|
{queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local.egg-info/PKG-INFO
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: queue-worker-local
|
|
3
|
-
Version: 0.0.
|
|
3
|
+
Version: 0.0.58
|
|
4
4
|
Home-page: https://github.com/circles-zone/queue-worker-local-python-package
|
|
5
5
|
Author: Circles
|
|
6
6
|
Author-email: info@circlez.ai
|
|
@@ -20,4 +20,4 @@ Dynamic: description-content-type
|
|
|
20
20
|
Dynamic: home-page
|
|
21
21
|
Dynamic: requires-dist
|
|
22
22
|
|
|
23
|
-
This is a package for sharing common
|
|
23
|
+
This is a package for sharing common CRUD operations to queue schema in the DB
|
|
@@ -4,15 +4,15 @@ PACKAGE_NAME = "queue-worker-local"
|
|
|
4
4
|
package_dir = PACKAGE_NAME.replace("-", "_")
|
|
5
5
|
|
|
6
6
|
setuptools.setup(
|
|
7
|
-
name=PACKAGE_NAME, # https://pypi.org/project/queue-worker-local
|
|
8
|
-
version='0.0.
|
|
7
|
+
name=PACKAGE_NAME, # https://pypi.org/project/queue-worker-local#history
|
|
8
|
+
version='0.0.58',
|
|
9
9
|
author="Circles",
|
|
10
10
|
author_email="info@circlez.ai",
|
|
11
11
|
url=f"https://github.com/circles-zone/{PACKAGE_NAME}-python-package",
|
|
12
12
|
packages=[package_dir],
|
|
13
13
|
package_dir={package_dir: f'{package_dir}/src'},
|
|
14
14
|
package_data={package_dir: ['*.py']},
|
|
15
|
-
long_description="This is a package for sharing common
|
|
15
|
+
long_description="This is a package for sharing common CRUD operations to queue schema in the DB",
|
|
16
16
|
long_description_content_type='text/markdown',
|
|
17
17
|
classifiers=[
|
|
18
18
|
"Programming Language :: Python :: 3",
|
|
File without changes
|
{queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local/src/__init__.py
RENAMED
|
File without changes
|
{queue_worker_local-0.0.56b2880 → queue_worker_local-0.0.58}/queue_worker_local.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|