watchmen-collector-kernel 16.6.14__tar.gz → 16.6.16__tar.gz

{watchmen_collector_kernel-16.6.14 → watchmen_collector_kernel-16.6.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: watchmen-collector-kernel
-Version: 16.6.14
+Version: 16.6.16
 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.14)
-Requires-Dist: watchmen-storage-mongodb (==16.6.14) ; extra == "mongodb"
-Requires-Dist: watchmen-storage-mssql (==16.6.14) ; extra == "mssql"
-Requires-Dist: watchmen-storage-mysql (==16.6.14) ; extra == "mysql"
-Requires-Dist: watchmen-storage-oracle (==16.6.14) ; extra == "oracle"
-Requires-Dist: watchmen-storage-oss (==16.6.14) ; extra == "oss"
-Requires-Dist: watchmen-storage-postgresql (==16.6.14) ; extra == "postgresql"
-Requires-Dist: watchmen-storage-s3 (==16.6.14) ; extra == "s3"
+Requires-Dist: watchmen-data-kernel (==16.6.16)
+Requires-Dist: watchmen-storage-mongodb (==16.6.16) ; extra == "mongodb"
+Requires-Dist: watchmen-storage-mssql (==16.6.16) ; extra == "mssql"
+Requires-Dist: watchmen-storage-mysql (==16.6.16) ; extra == "mysql"
+Requires-Dist: watchmen-storage-oracle (==16.6.16) ; extra == "oracle"
+Requires-Dist: watchmen-storage-oss (==16.6.16) ; extra == "oss"
+Requires-Dist: watchmen-storage-postgresql (==16.6.16) ; extra == "postgresql"
+Requires-Dist: watchmen-storage-s3 (==16.6.16) ; extra == "s3"

{watchmen_collector_kernel-16.6.14 → watchmen_collector_kernel-16.6.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "watchmen-collector-kernel"
-version = "16.6.14"
+version = "16.6.16"
 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.14"
-watchmen-storage-mysql = { version = "16.6.14", optional = true }
-watchmen-storage-oracle = { version = "16.6.14", optional = true }
-watchmen-storage-mongodb = { version = "16.6.14", optional = true }
-watchmen-storage-mssql = { version = "16.6.14", optional = true }
-watchmen-storage-postgresql = { version = "16.6.14", optional = true }
-watchmen-storage-oss = { version = "16.6.14", optional = true }
-watchmen-storage-s3 = { version = "16.6.14", optional = true }
+watchmen-data-kernel = "16.6.16"
+watchmen-storage-mysql = { version = "16.6.16", optional = true }
+watchmen-storage-oracle = { version = "16.6.16", optional = true }
+watchmen-storage-mongodb = { version = "16.6.16", optional = true }
+watchmen-storage-mssql = { version = "16.6.16", optional = true }
+watchmen-storage-postgresql = { version = "16.6.16", optional = true }
+watchmen-storage-oss = { version = "16.6.16", optional = true }
+watchmen-storage-s3 = { version = "16.6.16", optional = true }
 
 [tool.poetry.dev-dependencies]
 

{watchmen_collector_kernel-16.6.14 → watchmen_collector_kernel-16.6.16}/src/watchmen_collector_kernel/service/criteria_builder.py

@@ -43,11 +43,14 @@ class CriteriaBuilder:
 				variable_name = condition_value.removeprefix(LEFT_BRACE).removesuffix(RIGHT_BRACE)
 				variable_value = self.variables.get(variable_name)
 				if isinstance(variable_value, str):
-					parsed, value = is_date(variable_value, ask_all_date_formats())
-					if parsed:
-						return value
-					else:
+					if variable_value.isdigit():
 						return variable_value
+					else:
+						parsed, value = is_date(variable_value, ask_all_date_formats())
+						if parsed:
+							return value
+						else:
+							return variable_value
 				else:
 					return variable_value
 			else: