watchmen-collector-kernel 16.4.8__tar.gz → 16.4.9__tar.gz

{watchmen_collector_kernel-16.4.8 → watchmen_collector_kernel-16.4.9}/PKG-INFO

@@ -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 → watchmen_collector_kernel-16.4.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "watchmen-collector-kernel"
-version = "16.4.8"
+version = "16.4.9"
 description = ""
 authors = ["botlikes <75356972+botlikes456@users.noreply.github.com>"]
 license = "MIT"
@@ -10,14 +10,14 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.9"
-watchmen-data-kernel = "16.4.8"
-watchmen-storage-mysql = { version = "16.4.8", optional = true }
-watchmen-storage-oracle = { version = "16.4.8", optional = true }
-watchmen-storage-mongodb = { version = "16.4.8", optional = true }
-watchmen-storage-mssql = { version = "16.4.8", optional = true }
-watchmen-storage-postgresql = { version = "16.4.8", optional = true }
-watchmen-storage-oss = { version = "16.4.8", optional = true }
-watchmen-storage-s3 = { version = "16.4.8", optional = true }
+watchmen-data-kernel = "16.4.9"
+watchmen-storage-mysql = { version = "16.4.9", optional = true }
+watchmen-storage-oracle = { version = "16.4.9", optional = true }
+watchmen-storage-mongodb = { version = "16.4.9", optional = true }
+watchmen-storage-mssql = { version = "16.4.9", optional = true }
+watchmen-storage-postgresql = { version = "16.4.9", optional = true }
+watchmen-storage-oss = { version = "16.4.9", optional = true }
+watchmen-storage-s3 = { version = "16.4.9", optional = true }
 
 [tool.poetry.dev-dependencies]
 

{watchmen_collector_kernel-16.4.8 → watchmen_collector_kernel-16.4.9}/setup.py

@@ -15,20 +15,20 @@ package_data = \
 {'': ['*']}
 
 install_requires = \
-['watchmen-data-kernel==16.4.8']
+['watchmen-data-kernel==16.4.9']
 
 extras_require = \
-{'mongodb': ['watchmen-storage-mongodb==16.4.8'],
- 'mssql': ['watchmen-storage-mssql==16.4.8'],
- 'mysql': ['watchmen-storage-mysql==16.4.8'],
- 'oracle': ['watchmen-storage-oracle==16.4.8'],
- 'oss': ['watchmen-storage-oss==16.4.8'],
- 'postgresql': ['watchmen-storage-postgresql==16.4.8'],
- 's3': ['watchmen-storage-s3==16.4.8']}
+{'mongodb': ['watchmen-storage-mongodb==16.4.9'],
+ 'mssql': ['watchmen-storage-mssql==16.4.9'],
+ 'mysql': ['watchmen-storage-mysql==16.4.9'],
+ 'oracle': ['watchmen-storage-oracle==16.4.9'],
+ 'oss': ['watchmen-storage-oss==16.4.9'],
+ 'postgresql': ['watchmen-storage-postgresql==16.4.9'],
+ 's3': ['watchmen-storage-s3==16.4.9']}
 
 setup_kwargs = {
     'name': 'watchmen-collector-kernel',
-    'version': '16.4.8',
+    'version': '16.4.9',
     'description': '',
     'long_description': 'None',
     'author': 'botlikes',

{watchmen_collector_kernel-16.4.8 → watchmen_collector_kernel-16.4.9}/src/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-16.4.8 → watchmen_collector_kernel-16.4.9}/src/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-16.4.8 → watchmen_collector_kernel-16.4.9}/src/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-16.4.8 → watchmen_collector_kernel-16.4.9}/src/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-16.4.8 → watchmen_collector_kernel-16.4.9}/src/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)
 				]