watchmen-collector-kernel 16.6.17__tar.gz → 17.0.0__tar.gz

watchmen_collector_kernel-17.0.0/PKG-INFO

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

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

{watchmen_collector_kernel-16.6.17 → watchmen_collector_kernel-17.0.0}/src/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-16.6.17 → watchmen_collector_kernel-17.0.0}/src/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-16.6.17 → watchmen_collector_kernel-17.0.0}/src/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-16.6.17 → watchmen_collector_kernel-17.0.0}/src/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-16.6.17 → watchmen_collector_kernel-17.0.0}/src/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-16.6.17 → watchmen_collector_kernel-17.0.0}/src/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-16.6.17 → watchmen_collector_kernel-17.0.0}/src/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-16.6.17/PKG-INFO

@@ -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"