watchmen-collector-kernel 16.6.2__tar.gz → 16.6.4__tar.gz

{watchmen_collector_kernel-16.6.2 → watchmen_collector_kernel-16.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: watchmen-collector-kernel
-Version: 16.6.2
+Version: 16.6.4
 Summary: 
 License: MIT
 Author: botlikes
@@ -20,11 +20,11 @@ Provides-Extra: oss
 Provides-Extra: postgresql
 Provides-Extra: s3
 Requires-Dist: numpy (>=1.23.3,<2.0.0)
-Requires-Dist: watchmen-data-kernel (==16.6.2)
-Requires-Dist: watchmen-storage-mongodb (==16.6.2) ; extra == "mongodb"
-Requires-Dist: watchmen-storage-mssql (==16.6.2) ; extra == "mssql"
-Requires-Dist: watchmen-storage-mysql (==16.6.2) ; extra == "mysql"
-Requires-Dist: watchmen-storage-oracle (==16.6.2) ; extra == "oracle"
-Requires-Dist: watchmen-storage-oss (==16.6.2) ; extra == "oss"
-Requires-Dist: watchmen-storage-postgresql (==16.6.2) ; extra == "postgresql"
-Requires-Dist: watchmen-storage-s3 (==16.6.2) ; extra == "s3"
+Requires-Dist: watchmen-data-kernel (==16.6.4)
+Requires-Dist: watchmen-storage-mongodb (==16.6.4) ; extra == "mongodb"
+Requires-Dist: watchmen-storage-mssql (==16.6.4) ; extra == "mssql"
+Requires-Dist: watchmen-storage-mysql (==16.6.4) ; extra == "mysql"
+Requires-Dist: watchmen-storage-oracle (==16.6.4) ; extra == "oracle"
+Requires-Dist: watchmen-storage-oss (==16.6.4) ; extra == "oss"
+Requires-Dist: watchmen-storage-postgresql (==16.6.4) ; extra == "postgresql"
+Requires-Dist: watchmen-storage-s3 (==16.6.4) ; extra == "s3"

{watchmen_collector_kernel-16.6.2 → watchmen_collector_kernel-16.6.4}/pyproject.toml

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

{watchmen_collector_kernel-16.6.2 → watchmen_collector_kernel-16.6.4}/src/watchmen_collector_kernel/service/extract_source.py

@@ -364,6 +364,34 @@ class TopicTableExtractor(SourceExtractor):
 		                                                                               config.tenantId)
 		return schema.topic
 
+	def find_primary_keys_by_criteria(self, criteria: EntityCriteria) -> Optional[List[Dict[str, Any]]]:
+		return self.service.find_straight_values(
+			criteria=criteria,
+			columns=ArrayHelper(self.config.primaryKey).map(
+				lambda column_name: EntityStraightColumn(columnName=column_name)
+			).to_list()
+		)
+
+	def find_one_record_of_table(self) -> Optional[List[Dict[str, Any]]]:
+		result = self.service.find_limited_values(criteria=[], limit=1)
+		if result:
+			return self.process_json_columns(result)
+		else:
+			return [ArrayHelper(self.topic.factors).to_map(lambda factor: factor.name, lambda factor: None)]
+
+	def find_one_by_primary_keys(self, data_id: Dict) -> Optional[Dict[str, Any]]:
+		results = self.service.find(build_criteria_by_primary_key(data_id))
+		if len(results) == 1:
+			return self.process_json_columns(results)[0]
+		elif len(results) == 0:
+			return None
+		else:
+			raise RuntimeError(f'too many results with {data_id} find')
+
+	def find_records_by_criteria(self, criteria: EntityCriteria) -> Optional[List[Dict[str, Any]]]:
+		data_ = self.service.find(criteria)
+		return self.process_json_columns(data_)
+
 
 def ask_source_extractor(config: CollectorTableConfig) -> ExtractorSPI:
 	if config.configId.startswith("f-"):

{watchmen_collector_kernel-16.6.2 → watchmen_collector_kernel-16.6.4}/src/watchmen_collector_kernel/service/trigger_event_helper.py

@@ -293,7 +293,7 @@ def trigger_event_by_pipeline(trigger_event: TriggerEvent):
 			return TriggerModule(
 				moduleName=module_name,
 				priority=priority,
-				is_finished=True,
+				is_finished=False,
 				eventTriggerId=event_trigger_id,
 				tenantId=tenant_id
 			)
@@ -317,7 +317,7 @@ def trigger_event_by_pipeline(trigger_event: TriggerEvent):
 			return TriggerModel(
 				modelName=model_name,
 				priority=priority,
-				isFinished=True,
+				isFinished=False,
 				moduleTriggerId=module_trigger_id,
 				eventTriggerId=event_trigger_id,
 				tenantId=tenant_id