watchmen-collector-kernel 17.0.1__tar.gz → 17.0.3__tar.gz

{watchmen_collector_kernel-17.0.1 → watchmen_collector_kernel-17.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: watchmen-collector-kernel
-Version: 17.0.1
+Version: 17.0.3
 Summary: 
 License: MIT
 Author: botlikes
@@ -17,11 +17,11 @@ 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.1)
-Requires-Dist: watchmen-storage-mongodb (==17.0.1) ; extra == "mongodb"
-Requires-Dist: watchmen-storage-mssql (==17.0.1) ; extra == "mssql"
-Requires-Dist: watchmen-storage-mysql (==17.0.1) ; extra == "mysql"
-Requires-Dist: watchmen-storage-oracle (==17.0.1) ; extra == "oracle"
-Requires-Dist: watchmen-storage-oss (==17.0.1) ; extra == "oss"
-Requires-Dist: watchmen-storage-postgresql (==17.0.1) ; extra == "postgresql"
-Requires-Dist: watchmen-storage-s3 (==17.0.1) ; extra == "s3"
+Requires-Dist: watchmen-data-kernel (==17.0.3)
+Requires-Dist: watchmen-storage-mongodb (==17.0.3) ; extra == "mongodb"
+Requires-Dist: watchmen-storage-mssql (==17.0.3) ; extra == "mssql"
+Requires-Dist: watchmen-storage-mysql (==17.0.3) ; extra == "mysql"
+Requires-Dist: watchmen-storage-oracle (==17.0.3) ; extra == "oracle"
+Requires-Dist: watchmen-storage-oss (==17.0.3) ; extra == "oss"
+Requires-Dist: watchmen-storage-postgresql (==17.0.3) ; extra == "postgresql"
+Requires-Dist: watchmen-storage-s3 (==17.0.3) ; extra == "s3"

{watchmen_collector_kernel-17.0.1 → watchmen_collector_kernel-17.0.3}/pyproject.toml

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

{watchmen_collector_kernel-17.0.1 → watchmen_collector_kernel-17.0.3}/src/watchmen_collector_kernel/model/scheduled_task.py

@@ -53,7 +53,8 @@ class ScheduledTask(TenantBasedTuple, BaseModel):
 	isFinished: bool
 	status: int
 	result: Dict
-	eventId: str
+	eventId: str  # Deprecated
+	eventTriggerId: int
 	pipelineId: str
 	type: int
 

{watchmen_collector_kernel-17.0.1 → watchmen_collector_kernel-17.0.3}/src/watchmen_collector_kernel/storage/scheduled_task_service.py

@@ -32,6 +32,7 @@ class ScheduledTaskShaper(EntityShaper):
 			'status': entity.status,
 			'result': entity.result,
 			'event_id': entity.eventId,
+			'event_trigger_id': entity.eventTriggerId,
 			'pipeline_id': entity.pipelineId,
 			'type': entity.type
 		})
@@ -53,6 +54,7 @@ class ScheduledTaskShaper(EntityShaper):
 			status=row.get('status'),
 			result=row.get('result'),
 			eventId=row.get('event_id'),
+			eventTriggerId=row.get('event_trigger_id'),
 			pipelineId=row.get('pipeline_id'),
 			type=row.get('type')
 		))
@@ -205,7 +207,7 @@ class ScheduledTaskService(TupleService):
 		finally:
 			self.close_transaction()
 
-	def find_model_dependent_tasks(self, model_name: str, object_id: str, event_id: str, tenant_id: str) -> List[ScheduledTask]:
+	def find_model_dependent_tasks(self, model_name: str, object_id: str, event_trigger_id: int, tenant_id: str) -> List[ScheduledTask]:
 		self.begin_transaction()
 		try:
 			# noinspection PyTypeChecker
@@ -215,8 +217,8 @@ class ScheduledTaskService(TupleService):
 					                         right=model_name),
 					EntityCriteriaExpression(left=ColumnNameLiteral(columnName='object_id'),
 					                         right=object_id),
-					EntityCriteriaExpression(left=ColumnNameLiteral(columnName='event_id'),
-					                         right=event_id),
+					EntityCriteriaExpression(left=ColumnNameLiteral(columnName='event_trigger_id'),
+					                         right=event_trigger_id),
 					EntityCriteriaExpression(left=ColumnNameLiteral(columnName='tenant_id'),
 					                         right=tenant_id)
 				],
@@ -247,7 +249,7 @@ class ScheduledTaskService(TupleService):
 	def count_scheduled_task(self, event_trigger_id: int) -> int:
 		return self.storage.count(self.get_entity_finder(
 			criteria=[
-				EntityCriteriaExpression(left=ColumnNameLiteral(columnName='event_id'),
+				EntityCriteriaExpression(left=ColumnNameLiteral(columnName='event_trigger_id'),
 				                         right=event_trigger_id)
 			]
 		))
@@ -264,7 +266,7 @@ class ScheduledTaskService(TupleService):
 		finally:
 			self.storage.close()
 
-	def is_model_finished(self, model_name: str, event_id: str) -> bool:
+	def is_model_finished(self, model_name: str, event_trigger_id: int) -> bool:
 		try:
 			self.begin_transaction()
 			results = self.storage.find_limited(
@@ -273,7 +275,7 @@ class ScheduledTaskService(TupleService):
 					shaper=self.get_entity_shaper(),
 					criteria=[
 						EntityCriteriaExpression(left=ColumnNameLiteral(columnName='model_name'), right=model_name),
-						EntityCriteriaExpression(left=ColumnNameLiteral(columnName='event_id'), right=event_id)
+						EntityCriteriaExpression(left=ColumnNameLiteral(columnName='event_trigger_id'), right=event_trigger_id)
 					],
 					limit=1
 				)
@@ -289,7 +291,7 @@ class ScheduledTaskService(TupleService):
 		finally:
 			self.close_transaction()
 
-	def is_event_finished(self, event_id: str) -> bool:
+	def is_event_finished(self, event_trigger_id: int) -> bool:
 		try:
 			self.begin_transaction()
 			results = self.storage.find_limited(
@@ -297,7 +299,7 @@ class ScheduledTaskService(TupleService):
 					name=self.get_entity_name(),
 					shaper=self.get_entity_shaper(),
 					criteria=[
-						EntityCriteriaExpression(left=ColumnNameLiteral(columnName='event_id'), right=event_id)
+						EntityCriteriaExpression(left=ColumnNameLiteral(columnName='event_trigger_id'), right=event_trigger_id)
 					],
 					limit=1
 				)