watchmen-collector-kernel 16.4.8__py3-none-any.whl → 16.4.9__py3-none-any.whl

watchmen_collector_kernel/model/__init__.py

@@ -1,5 +1,5 @@
 from .competitive_lock import CompetitiveLock
-from .scheduled_task import ScheduledTask, TaskStatus
+from .scheduled_task import ScheduledTask
 
 from .collector_model_config import CollectorModelConfig
 from .collector_table_config import CollectorTableConfig

watchmen_collector_kernel/model/scheduled_task.py

@@ -2,7 +2,7 @@ from typing import Dict, List
 
 from watchmen_model.common import TenantBasedTuple, ScheduledTaskId, Storable
 from pydantic import BaseModel
-from enum import Enum, IntEnum
+from enum import Enum
 
 
 class Result(str, Enum):
@@ -11,12 +11,6 @@ class Result(str, Enum):
 	PROCESS_TASK_FAILED = "PROCESS_TASK_FAILED"
 
 
-class TaskStatus(IntEnum):
-	INITIAL = 0
-	SUCCESS = 1
-	FAILED = 2
-
-
 class Dependence(Storable, BaseModel):
 	modelName: str
 	objectId: str
@@ -31,6 +25,6 @@ class ScheduledTask(TenantBasedTuple, BaseModel):
 	objectId: str
 	dependOn: List[Dependence]
 	parentTaskId: List[int]
-	status: TaskStatus
+	isFinished: bool
 	result: Dict
 

watchmen_collector_kernel/service/task_service.py

@@ -3,7 +3,7 @@ from traceback import format_exc
 from typing import Callable, Dict, Optional, List
 
 from watchmen_auth import PrincipalService
-from watchmen_collector_kernel.model import ScheduledTask, TaskStatus
+from watchmen_collector_kernel.model import ScheduledTask
 from watchmen_collector_kernel.model.scheduled_task import Dependence
 from watchmen_collector_kernel.storage import get_scheduled_task_service
 from watchmen_model.common import ScheduledTaskId
@@ -31,11 +31,11 @@ class TaskService:
 	def consume_task(self, task: ScheduledTask, executed: Callable[[str, Dict, str], None]) -> ScheduledTask:
 		try:
 			executed(task.topicCode, task.content, task.tenantId)
-			task.status = int(TaskStatus.SUCCESS)
+			task.isFinished = True
 			return self.scheduled_task_service.update_task(task)
 		except Exception as e:
 			logger.error(e, exc_info=True, stack_info=True)
-			task.status = int(TaskStatus.FAILED)
+			task.isFinished = True
 			task.result = format_exc()
 			return self.scheduled_task_service.update_task(task)
 

watchmen_collector_kernel/storage/change_data_json_service.py

@@ -24,6 +24,7 @@ class ChangeDataJsonShaper(EntityShaper):
 			                                          'content': entity.content,
 			                                          'depend_on': entity.dependOn,
 			                                          'is_posted': entity.isPosted,
+			                                          'result': entity.result,
 			                                          'task_id': entity.taskId,
 			                                          'table_trigger_id': entity.tableTriggerId,
 			                                          'model_trigger_id': entity.modelTriggerId,
@@ -43,6 +44,7 @@ class ChangeDataJsonShaper(EntityShaper):
 			                                            content=row.get('content'),
 			                                            dependOn=row.get('depend_on'),
 			                                            isPosted=row.get('is_posted'),
+			                                            result=row.get('result'),
 			                                            taskId=row.get('task_id'),
 			                                            tableTriggerId=row.get('table_trigger_id'),
 			                                            modelTriggerId=row.get('model_trigger_id'),

watchmen_collector_kernel/storage/scheduled_task_service.py

@@ -23,7 +23,7 @@ class ScheduledTaskShaper(EntityShaper):
 			'depend_on': entity.dependOn,
 			'parent_task_id': entity.parentTaskId,
 			'tenant_id': entity.tenantId,
-			'status': entity.status,
+			'is_finished': entity.isFinished,
 			'result': entity.result
 		})
 
@@ -39,7 +39,7 @@ class ScheduledTaskShaper(EntityShaper):
 			dependOn=row.get('depend_on'),
 			parentTaskId=row.get('parent_task_id'),
 			tenantId=row.get('tenant_id'),
-			status=row.get('status'),
+			isFinished=row.get('is_finished'),
 			result=row.get('result')
 		))
 
@@ -107,7 +107,7 @@ class ScheduledTaskService(TupleService):
 				criteria=[EntityCriteriaJoint(
 					children=[
 						EntityCriteriaExpression(
-							left=ColumnNameLiteral(columnName='status'), right=0)
+							left=ColumnNameLiteral(columnName='is_finished'), right=False)
 					]
 				)],
 				straightColumns=[EntityStraightColumn(columnName='task_id'),
@@ -139,8 +139,8 @@ class ScheduledTaskService(TupleService):
 					                         right=model_name),
 					EntityCriteriaExpression(left=ColumnNameLiteral(columnName='object_id'),
 					                         right=object_id),
-					EntityCriteriaExpression(left=ColumnNameLiteral(columnName='status'),
-					                         right=0),
+					EntityCriteriaExpression(left=ColumnNameLiteral(columnName='is_finished'),
+					                         right=False),
 					EntityCriteriaExpression(left=ColumnNameLiteral(columnName='tenant_id'),
 					                         right=tenant_id)
 				]

{watchmen_collector_kernel-16.4.8.dist-info → watchmen_collector_kernel-16.4.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: watchmen-collector-kernel
-Version: 16.4.8
+Version: 16.4.9
 Summary: 
 License: MIT
 Author: botlikes
@@ -18,11 +18,11 @@ Provides-Extra: oracle
 Provides-Extra: oss
 Provides-Extra: postgresql
 Provides-Extra: s3
-Requires-Dist: watchmen-data-kernel (==16.4.8)
-Requires-Dist: watchmen-storage-mongodb (==16.4.8) ; extra == "mongodb"
-Requires-Dist: watchmen-storage-mssql (==16.4.8) ; extra == "mssql"
-Requires-Dist: watchmen-storage-mysql (==16.4.8) ; extra == "mysql"
-Requires-Dist: watchmen-storage-oracle (==16.4.8) ; extra == "oracle"
-Requires-Dist: watchmen-storage-oss (==16.4.8) ; extra == "oss"
-Requires-Dist: watchmen-storage-postgresql (==16.4.8) ; extra == "postgresql"
-Requires-Dist: watchmen-storage-s3 (==16.4.8) ; extra == "s3"
+Requires-Dist: watchmen-data-kernel (==16.4.9)
+Requires-Dist: watchmen-storage-mongodb (==16.4.9) ; extra == "mongodb"
+Requires-Dist: watchmen-storage-mssql (==16.4.9) ; extra == "mssql"
+Requires-Dist: watchmen-storage-mysql (==16.4.9) ; extra == "mysql"
+Requires-Dist: watchmen-storage-oracle (==16.4.9) ; extra == "oracle"
+Requires-Dist: watchmen-storage-oss (==16.4.9) ; extra == "oss"
+Requires-Dist: watchmen-storage-postgresql (==16.4.9) ; extra == "postgresql"
+Requires-Dist: watchmen-storage-s3 (==16.4.9) ; extra == "s3"

{watchmen_collector_kernel-16.4.8.dist-info → watchmen_collector_kernel-16.4.9.dist-info}/RECORD

@@ -1,14 +1,14 @@
 watchmen_collector_kernel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watchmen_collector_kernel/common/__init__.py,sha256=QJHylPJAMoSbSa6EfgiQTLNtkQKSCUJucf7ZG3Nqswg,175
 watchmen_collector_kernel/common/constants.py,sha256=mIsGBhAjHbmeuVeNYDOKLhiBqG2sSX-0vs8ipEEIo9E,302
-watchmen_collector_kernel/model/__init__.py,sha256=ZhsKn7a2KW7LaVj87coIRC4Z8wsysE2RXn6v8AmoUsg,554
+watchmen_collector_kernel/model/__init__.py,sha256=PfA3bsFeAXTTQRSZMyzdm9Oe6dSqDR-y5vfQBlgAdSE,542
 watchmen_collector_kernel/model/change_data_json.py,sha256=-oNIGsvYo8KJJsSFusbGa9kIuFfE0otLnWe-zz9O42A,495
 watchmen_collector_kernel/model/change_data_record.py,sha256=vadzugcX4nl6G3F-jt7DtuVqjE8vtlasu86DDjpaGGM,330
 watchmen_collector_kernel/model/collector_model_config.py,sha256=oE0T9I_9uGppttoytvzl7-35WgwlWu7s6awNtsK4Q20,288
 watchmen_collector_kernel/model/collector_table_config.py,sha256=R80d2rqfVRj_rZ6-mognaLYe26R7r3g4nFR3Wj-4YLY,2143
 watchmen_collector_kernel/model/competitive_lock.py,sha256=fxDRuzZpsgrZjGeuADS3zRYqQioqWhg72Pr592U_Yvw,264
 watchmen_collector_kernel/model/condition.py,sha256=jGsjvb5z9XRFW0B55k-iC2_Zle4rl-A5J_6PB6EV6mA,1942
-watchmen_collector_kernel/model/scheduled_task.py,sha256=Zb6blDfDmxX90vZwAODQLQtyfI_0JTb1aWGi80voAyY,752
+watchmen_collector_kernel/model/scheduled_task.py,sha256=tPk4CmBvL0E61jk-6TYJHD2Ch4k-NdF9tMBi8WPMWc4,674
 watchmen_collector_kernel/model/trigger_event.py,sha256=ZjVgWQS_qqILchw4fGFzxn1tJUMx77s2_UpyiBd7azA,251
 watchmen_collector_kernel/model/trigger_model.py,sha256=NpnIbdax8vQeGYeGcOMpWpjYUhkeZUil--6-yTNpv3k,175
 watchmen_collector_kernel/model/trigger_table.py,sha256=aPYJlIb-8aX_-O6vZQp3DU58zYtyosYLGFjpL81ijds,229
@@ -20,19 +20,19 @@ watchmen_collector_kernel/service/extract_utils.py,sha256=PIyxFG7U37ZXLYlOdIK-Dh
 watchmen_collector_kernel/service/lock_clean.py,sha256=qeNc8vZtfxXTNpGhGc_ZnUD9iRGK2VXNEpv1VglVWCA,965
 watchmen_collector_kernel/service/lock_helper.py,sha256=GxqjIsCD-jn5kDICVWS1LlTFCuMpnRSpcrQtPLv5bxs,842
 watchmen_collector_kernel/service/task_housekeeping.py,sha256=i1lnZ4jo-RLjLQD0Z7HSLQqjXuSqdL3zqHDfFVaNbe8,1673
-watchmen_collector_kernel/service/task_service.py,sha256=XNc-nudTpk569ibqd5wLpzLGlcHUAf71Acn9_iKuS2Y,3091
+watchmen_collector_kernel/service/task_service.py,sha256=thA_PRNrWvx_g8tuwMbUUqrXBYgnYcBozoNohA4jqTI,3050
 watchmen_collector_kernel/service/trigger_collector.py,sha256=IP_ILJNMhahBogtvfS1iHDOJAxKCDBDJFXTDi98R11M,6790
 watchmen_collector_kernel/storage/__init__.py,sha256=sstizR2fcwo4ZhqfiqceTxxS49HTtfExCPMeEaYc9bc,832
-watchmen_collector_kernel/storage/change_data_json_service.py,sha256=JvaIFWPDzq6CHKNbMaUvbIaXs0iAT4IMUFj-zeZFPcw,7393
+watchmen_collector_kernel/storage/change_data_json_service.py,sha256=YwbHDff0W_ydfOJRXB8W_J4iE4VIj0XEwRrXd0KUWCg,7536
 watchmen_collector_kernel/storage/change_data_record_service.py,sha256=MOju5vTl-ZQrpEfL7DytvB_T_JM0dYyXGAzrhNnzb2Y,7463
 watchmen_collector_kernel/storage/collector_model_config_service.py,sha256=kWLjmppPpRuN0VptiAEGA38BJ20fFD5Q5gxPZJRbQYs,3830
 watchmen_collector_kernel/storage/collector_table_config_service.py,sha256=aVZeN5AhzUORHaZQUDo_MlKcX6AkgcHcQeI6UwAoAT0,5659
 watchmen_collector_kernel/storage/competitive_lock_service.py,sha256=jjxxHb4Dr0DIDX_g26wtCa8vGLGLnc4BJQGl0d3J31M,2534
-watchmen_collector_kernel/storage/scheduled_task_service.py,sha256=ROHYW-pTQaL8kWkLgk9h18XsxfKGjsReMoBY0hoD4SM,5340
+watchmen_collector_kernel/storage/scheduled_task_service.py,sha256=sZLwF8zKOArh8QuchkDPcip7B-kTyVBhHM73nxU89Tg,5376
 watchmen_collector_kernel/storage/trigger_event_service.py,sha256=DKSCQ0sYSH3uAtGmokvncD9FIYvjoVsk7QtqdRMQGhM,3099
 watchmen_collector_kernel/storage/trigger_model_service.py,sha256=0-_YcL5FNGHy2MKn8vTYrWFaYOPW_u4iKQRG00AOfCI,3219
 watchmen_collector_kernel/storage/trigger_table_service.py,sha256=RHiFJaT3UQmCpz-gxnfsoBPV7lS8JM1i9DCQn3BnfA4,3779
-watchmen_collector_kernel-16.4.8.dist-info/LICENSE,sha256=iuuG7ErblOdcEZi5u89VXS0VIUiTb4flerGp_PAS9E4,1061
-watchmen_collector_kernel-16.4.8.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-watchmen_collector_kernel-16.4.8.dist-info/METADATA,sha256=7-zGOrH90-yWi6UZGqtvw4qbSvOFs6a934l9YrQoLVM,1135
-watchmen_collector_kernel-16.4.8.dist-info/RECORD,,
+watchmen_collector_kernel-16.4.9.dist-info/LICENSE,sha256=iuuG7ErblOdcEZi5u89VXS0VIUiTb4flerGp_PAS9E4,1061
+watchmen_collector_kernel-16.4.9.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+watchmen_collector_kernel-16.4.9.dist-info/METADATA,sha256=Nr3F6yWxRJrnpIyEMYfecoJA9zGY8-5mH6Oeh5uyBXY,1135
+watchmen_collector_kernel-16.4.9.dist-info/RECORD,,