watchmen-collector-kernel 16.6.17__py3-none-any.whl → 17.0.0__py3-none-any.whl

watchmen_collector_kernel/common/settings.py

@@ -15,7 +15,7 @@ class CollectorSettings(BaseSettings):
 	S3_CONNECTOR_LOCK_TIMEOUT = 300
 	PARTIAL_SIZE: int = 100
 	COLLECTOR_CONFIG_CACHE_ENABLED: bool = True
-	EXCEPTION_MAX_LENGTH = 3000  # character
+	EXCEPTION_MAX_LENGTH = 5000  # character
 	GROUPED_TASK_DATA_SIZE_THRESHOLD = 100
 	TASK_PARTIAL_SIZE: int = 100
 

watchmen_collector_kernel/model/scheduled_task.py

@@ -45,6 +45,7 @@ class ScheduledTask(TenantBasedTuple, BaseModel):
 	resourceId: str  # global unique, monotonous increase
 	topicCode: str
 	content: Dict
+	changeJsonIds: List[int]
 	modelName: str
 	objectId: str
 	dependOn: List[Dependence]

watchmen_collector_kernel/model/status.py

@@ -5,7 +5,8 @@ class Status(int, Enum):
 	INITIAL = 0,
 	EXECUTING = 1,
 	SUCCESS = 2,
-	FAIL = 3
+	FAIL = 3,
+	WAITING = 4
 
 
 class ExecutionStatus(int, Enum):

watchmen_collector_kernel/service/extract_utils.py

@@ -38,7 +38,7 @@ def build_audit_column_criteria(audit_column_name: str, start_time: datetime, en
 	return [
 		EntityCriteriaExpression(
 			left=ColumnNameLiteral(columnName=audit_column_name),
-			operator=EntityCriteriaOperator.GREATER_THAN_OR_EQUALS,
+			operator=EntityCriteriaOperator.GREATER_THAN,
 			right=start_time),
 		EntityCriteriaExpression(
 			left=ColumnNameLiteral(columnName=audit_column_name),

watchmen_collector_kernel/service/lock_helper.py

@@ -19,7 +19,7 @@ def try_lock_nowait(lock_service: CompetitiveLockService, lock: CompetitiveLock)
 
 def unlock(lock_service: CompetitiveLockService, lock: CompetitiveLock) -> bool:
 	lock_service.delete_by_id(lock.lockId)
-	return True ##TODO check exception
+	return True  # TODO check exception
 
 
 def get_resource_lock(lock_id: int, resource_id: Union[str, int], tenant_id: str) -> CompetitiveLock:

watchmen_collector_kernel/service/task_service.py

@@ -44,12 +44,9 @@ class TaskService:
 			for raw_data in raw_data_list:
 				executed(task.topicCode, raw_data, task.tenantId)
 
-	def update_task_result(self, task: ScheduledTask, status: int, result=None) -> ScheduledTask:
+	def update_task_result(self, task: ScheduledTask) -> ScheduledTask:
 		try:
 			self.scheduled_task_service.begin_transaction()
-			task.isFinished = True
-			task.status = status
-			task.result = result
 			self.scheduled_task_history_service.create(task)
 			self.scheduled_task_service.delete(task.taskId)
 			self.scheduled_task_service.commit_transaction()
@@ -60,9 +57,9 @@ class TaskService:
 		finally:
 			self.scheduled_task_service.close_transaction()
 
-	def finish_task(self, task: ScheduledTask, status: int, result=None) -> ScheduledTask:
+	def finish_task(self, task: ScheduledTask) -> ScheduledTask:
 		try:
-			return self.update_task_result(task, status, result)
+			return self.update_task_result(task)
 		except IntegrityError:
 			self.delete_task(task)
 

watchmen_collector_kernel/storage/scheduled_task_service.py

@@ -22,6 +22,7 @@ class ScheduledTaskShaper(EntityShaper):
 			'resource_id': entity.resourceId,
 			'topic_code': entity.topicCode,
 			'content': entity.content,
+			'change_json_ids': entity.changeJsonIds,
 			'model_name': entity.modelName,
 			'object_id': entity.objectId,
 			'depend_on': ArrayHelper(entity.dependOn).map(lambda x: x.to_dict()).to_list(),
@@ -42,6 +43,7 @@ class ScheduledTaskShaper(EntityShaper):
 			resourceId=row.get('resource_id'),
 			topicCode=row.get('topic_code'),
 			content=row.get('content'),
+			changeJsonIds=row.get('change_json_ids'),
 			modelName=row.get('model_name'),
 			objectId=row.get('object_id'),
 			dependOn=row.get('depend_on'),

watchmen_collector_kernel-17.0.0.dist-info/METADATA

@@ -0,0 +1,27 @@
+Metadata-Version: 2.1
+Name: watchmen-collector-kernel
+Version: 17.0.0
+Summary: 
+License: MIT
+Author: botlikes
+Author-email: 75356972+botlikes456@users.noreply.github.com
+Requires-Python: >=3.12,<3.13
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
+Provides-Extra: mongodb
+Provides-Extra: mssql
+Provides-Extra: mysql
+Provides-Extra: oracle
+Provides-Extra: oss
+Provides-Extra: postgresql
+Provides-Extra: s3
+Requires-Dist: numpy (>=1.26.4,<2.0.0)
+Requires-Dist: watchmen-data-kernel (==17.0.0)
+Requires-Dist: watchmen-storage-mongodb (==17.0.0) ; extra == "mongodb"
+Requires-Dist: watchmen-storage-mssql (==17.0.0) ; extra == "mssql"
+Requires-Dist: watchmen-storage-mysql (==17.0.0) ; extra == "mysql"
+Requires-Dist: watchmen-storage-oracle (==17.0.0) ; extra == "oracle"
+Requires-Dist: watchmen-storage-oss (==17.0.0) ; extra == "oss"
+Requires-Dist: watchmen-storage-postgresql (==17.0.0) ; extra == "postgresql"
+Requires-Dist: watchmen-storage-s3 (==17.0.0) ; extra == "s3"

{watchmen_collector_kernel-16.6.17.dist-info → watchmen_collector_kernel-17.0.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ watchmen_collector_kernel/cache/table_config_cache.py,sha256=oOjyatujD-J6hFcj42h
 watchmen_collector_kernel/common/__init__.py,sha256=KCifKsnn6NPHkUMSq2q__fL9aWg52eK35a_mIfLKYRM,627
 watchmen_collector_kernel/common/constants.py,sha256=mBc0dVjMXKp2pluN2HMNcArcOWvycNzLNu7zcZO0Eao,320
 watchmen_collector_kernel/common/exception.py,sha256=AY4JAL0fBP6fAkgT7bfMTABp3x3oYtvV5vdPO5jI6S4,49
-watchmen_collector_kernel/common/settings.py,sha256=Sivg_S8lEaEn6IdJFP6lrTB3JnQi5m_FCqoP37A9wqQ,2012
+watchmen_collector_kernel/common/settings.py,sha256=h5k9PDhd5QG-iDTTXLPFmVXNeaV9-eFZdiIZyfqCr_A,2012
 watchmen_collector_kernel/model/__init__.py,sha256=7FUgGxozQ3TMHBllZmds7g6nQbN2H6fID8cCLED7u04,845
 watchmen_collector_kernel/model/change_data_json.py,sha256=ckCj2vvDoZCWryYE8lGjJnZ_WEfynsVrL2RvmKA2IUk,530
 watchmen_collector_kernel/model/change_data_json_history.py,sha256=L9ACRe5tCP5Pc5MrpAVkLHe-6EfgZsUBfnQ2BXIYu4M,99
@@ -20,9 +20,9 @@ watchmen_collector_kernel/model/collector_module_config.py,sha256=0knkFhBdx4gpRX
 watchmen_collector_kernel/model/collector_table_config.py,sha256=apxZRQmLEMsVK3Z8KnAUy61LRSITDhTEs1EVNTvC-M0,3266
 watchmen_collector_kernel/model/competitive_lock.py,sha256=fxDRuzZpsgrZjGeuADS3zRYqQioqWhg72Pr592U_Yvw,264
 watchmen_collector_kernel/model/condition.py,sha256=I0QSsz1pP2DRKsgfjw_M7Z_seaPFfzOCvlg6Ud2Te0s,1603
-watchmen_collector_kernel/model/scheduled_task.py,sha256=Fzw_IeHGFYeEmWSQMajOb2WVCoX80wfmIL0scFG-6Ak,1491
+watchmen_collector_kernel/model/scheduled_task.py,sha256=qQVh-EnN6eTx93LqW8IBUli5olXy7Vp8l6ejHJ4NkME,1517
 watchmen_collector_kernel/model/scheduled_task_history.py,sha256=0lgWIQWN2r_HcMoLGwKxzLmaxGNtr0NZF7NaT_DeOyE,93
-watchmen_collector_kernel/model/status.py,sha256=ctv8szNlnij5ZNQq2QPu5lWJds-QYwBX4kMAI6HqB3k,196
+watchmen_collector_kernel/model/status.py,sha256=7JgTF8SZJIKH0acwzJdFCAaW3O2g_dpH0wcnN6DNVjU,210
 watchmen_collector_kernel/model/trigger_event.py,sha256=vERU5ebEAy_2d7Au6WAEkpszou9Svb9tnk4rjMMKEOk,479
 watchmen_collector_kernel/model/trigger_model.py,sha256=LGhtT8xmeDGB1UivAiaQ9FaHYYkaIjKztRUIuyHGBes,213
 watchmen_collector_kernel/model/trigger_module.py,sha256=LVhhS-tD5Gl7GLxKDmadSYJxkSJYwlKrlnl93h4-yZQ,193
@@ -32,12 +32,12 @@ watchmen_collector_kernel/service/criteria_builder.py,sha256=oIwIhFno3eL-UB175V_
 watchmen_collector_kernel/service/data_capture.py,sha256=EvXPttdd_cbXiI5oInUytceLDI04nEPY1iJjGzzDsLk,3568
 watchmen_collector_kernel/service/extract_source.py,sha256=n1L0rH6ykrFgDtYi8QziA2w_JigMF7hdvtQoZLfrIzo,15697
 watchmen_collector_kernel/service/extract_spi.py,sha256=aNGVqHRG9PwVe9fCecDGOkJq5nrR-mbLcDn-G259OL8,728
-watchmen_collector_kernel/service/extract_utils.py,sha256=8xKelW_NCVdqcTcLDGquRhgPyf1XWq_KdwPkGt5PHHY,2230
-watchmen_collector_kernel/service/lock_helper.py,sha256=Jwh9J4alPReXpuKmhNxFbZ6z5xmrHyxoR0YVaF5EjGc,924
+watchmen_collector_kernel/service/extract_utils.py,sha256=pmeUKc9dret_mfjqbaBDJtIPjOr-xQCh7EzQ13gFUD4,2220
+watchmen_collector_kernel/service/lock_helper.py,sha256=rr37IFj80OAPdP7TBhGLdmG8hSOkm_L6r6RTmJxNNbw,925
 watchmen_collector_kernel/service/model_config_service.py,sha256=1tFd_MUldwl37JyRJF4FX6ywmFQ2caFYfslAlqnv2Jk,2235
 watchmen_collector_kernel/service/module_config_service.py,sha256=M4Mn45WEV9rllpX4A9LhtVE7VjBo-Q9LrHnR4_U2UYA,2027
 watchmen_collector_kernel/service/table_config_service.py,sha256=1jmaaOEM0ETRrTDGgGK7S9SCX85bPIP_jJ2zqsHH4DU,3962
-watchmen_collector_kernel/service/task_service.py,sha256=MRpdcMAH6N3M8WyJ3g9O47ZrHNsq9643bXVlIWqjQyg,4847
+watchmen_collector_kernel/service/task_service.py,sha256=7bKbRmHwyWRV6cff8V9rfVlf8EXa2DidVlocuVaHGpc,4705
 watchmen_collector_kernel/service/trigger_collector.py,sha256=p07SEQsfrBYIT02Ea5w9R70Yh7NAMC1TlFnn7hn79-o,10852
 watchmen_collector_kernel/service/trigger_event_helper.py,sha256=l01bMQrHM-bij4_S0vdzHDuERaTZ4PFo7jQQMRw7dTc,17784
 watchmen_collector_kernel/storage/__init__.py,sha256=064rAoXd3IkhPL6aVisW4BGYImKItD6h3btXsHkrBZo,1369
@@ -50,12 +50,12 @@ watchmen_collector_kernel/storage/collector_module_config_service.py,sha256=OB4q
 watchmen_collector_kernel/storage/collector_table_config_service.py,sha256=PcXEgW4igoEqeTbYI8uikudRFuom4a-G9eGUAzjH9Vo,7705
 watchmen_collector_kernel/storage/competitive_lock_service.py,sha256=SIXpoeRP1S88ZQJy_-iZgGV9HTJwwM5r3vJn7J9WJbU,3154
 watchmen_collector_kernel/storage/scheduled_task_history_service.py,sha256=f-JXZ5G87oy7FdYPkbbfTKhI_oRm4wauWNvTw9hxGjM,1586
-watchmen_collector_kernel/storage/scheduled_task_service.py,sha256=ENDhcjPzFkwr2YlLtOMiEerROyeUGufQM9G_LEw4-BE,10644
+watchmen_collector_kernel/storage/scheduled_task_service.py,sha256=KvijmGPXD1QzwKW_pqch9PYgISDtKLzIvdi6axuX4Qo,10733
 watchmen_collector_kernel/storage/trigger_event_service.py,sha256=pQwfrwt6-6qkJvorO28dTR7cGuvcmvFQUMPUfTujjWg,6836
 watchmen_collector_kernel/storage/trigger_model_service.py,sha256=FE_88sYzh9ibUS1bOyDmGvryfPQraqkMbZc3BKtzfpI,3760
 watchmen_collector_kernel/storage/trigger_module_service.py,sha256=Ca4J8vnBzS90qP3ljwDJ7lt6MzaOushGjoFRwsSKfHI,3377
 watchmen_collector_kernel/storage/trigger_table_service.py,sha256=TRAFknaX6IW8lX7dMCR4y_3yjA2bYFFH1HdwW21--Kc,3915
-watchmen_collector_kernel-16.6.17.dist-info/LICENSE,sha256=iuuG7ErblOdcEZi5u89VXS0VIUiTb4flerGp_PAS9E4,1061
-watchmen_collector_kernel-16.6.17.dist-info/METADATA,sha256=3efWYBEnQQDE7M6Kl9y24FWx4wrek6Mwe3nqFMW4F6s,1234
-watchmen_collector_kernel-16.6.17.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-watchmen_collector_kernel-16.6.17.dist-info/RECORD,,
+watchmen_collector_kernel-17.0.0.dist-info/LICENSE,sha256=iuuG7ErblOdcEZi5u89VXS0VIUiTb4flerGp_PAS9E4,1061
+watchmen_collector_kernel-17.0.0.dist-info/METADATA,sha256=j-rEGiyOTIn627GS2exWRX-AfWomI4wKsuSeTlSRYTk,1075
+watchmen_collector_kernel-17.0.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+watchmen_collector_kernel-17.0.0.dist-info/RECORD,,

watchmen_collector_kernel-16.6.17.dist-info/METADATA

@@ -1,30 +0,0 @@
-Metadata-Version: 2.1
-Name: watchmen-collector-kernel
-Version: 16.6.17
-Summary: 
-License: MIT
-Author: botlikes
-Author-email: 75356972+botlikes456@users.noreply.github.com
-Requires-Python: >=3.9,<4.0
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Provides-Extra: mongodb
-Provides-Extra: mssql
-Provides-Extra: mysql
-Provides-Extra: oracle
-Provides-Extra: oss
-Provides-Extra: postgresql
-Provides-Extra: s3
-Requires-Dist: numpy (>=1.26.4,<2.0.0)
-Requires-Dist: watchmen-data-kernel (==16.6.17)
-Requires-Dist: watchmen-storage-mongodb (==16.6.17) ; extra == "mongodb"
-Requires-Dist: watchmen-storage-mssql (==16.6.17) ; extra == "mssql"
-Requires-Dist: watchmen-storage-mysql (==16.6.17) ; extra == "mysql"
-Requires-Dist: watchmen-storage-oracle (==16.6.17) ; extra == "oracle"
-Requires-Dist: watchmen-storage-oss (==16.6.17) ; extra == "oss"
-Requires-Dist: watchmen-storage-postgresql (==16.6.17) ; extra == "postgresql"
-Requires-Dist: watchmen-storage-s3 (==16.6.17) ; extra == "s3"