@@ -105,7 +105,8 @@ def regex_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
105105if isinstance (value ,list ):
106106return f"({ self .or_token .join (self .regex_modifier (field = field ,value = v )for v in value )} )"
107107value = self ._pre_process_value (field ,value ,value_type = ValueType .regex_value ,wrap_int = True )
108- return f'{ self .apply_field (field )} regex~ "{ value } [^z].?"'
108+
109+ return f'{ self .apply_field (field )} regex~ "{ value } .?"'
109110
110111def keywords (self ,field :str ,value :DEFAULT_VALUE_TYPE )-> str :
111112if isinstance (value ,list ):
@@ -139,14 +140,18 @@ def _generate_from_tokenized_query_container_by_source_mapping(
139140self ,query_container :TokenizedQueryContainer ,source_mapping :SourceMapping
140141 )-> str :
141142unmapped_fields = self .mappings .check_fields_mapping_existence (
142- query_container .meta_info .query_fields ,source_mapping
143+ query_container .meta_info .query_fields ,
144+ query_container .meta_info .function_fields_map ,
145+ self .platform_functions .manager .supported_render_names ,
146+ source_mapping ,
143147 )
144148rendered_functions = self .generate_functions (query_container .functions .functions ,source_mapping )
145149prefix = self .generate_prefix (source_mapping .log_source_signature ,rendered_functions .rendered_prefix )
146150
147151if source_mapping .raw_log_fields :
148152defined_raw_log_fields = self .generate_raw_log_fields (
149- fields = query_container .meta_info .query_fields ,source_mapping = source_mapping
153+ fields = query_container .meta_info .query_fields + query_container .meta_info .function_fields ,
154+ source_mapping = source_mapping ,
150155 )
151156prefix += f"\n { defined_raw_log_fields } "
152157if source_mapping .conditions :