atomicshop 2.16.22__py3-none-any.whl → 2.16.24__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.16.22'
+__version__ = '2.16.24'

atomicshop/mitm/statistic_analyzer.py

@@ -353,7 +353,8 @@ def deviation_calculator_by_moving_average(
         get_deviation_for_last_day_only: bool = False,
         summary: bool = False,
         output_file_path: str = None,
-        output_file_type: Literal['json', 'csv'] = 'json'
+        output_file_type: Literal['json', 'csv'] = 'json',
+        convert_sizes_lists_and_ma_data_to_string: bool = False
 ) -> Union[list, None]:
     """
     This function is the main function for the moving average calculator.
@@ -383,6 +384,8 @@ def deviation_calculator_by_moving_average(
         to calculate the averages and the moving average data.
     :param output_file_path: string, if None, no file will be written.
     :param output_file_type: string, the type of the output file. 'json' or 'csv'.
+    :param convert_sizes_lists_and_ma_data_to_string: bool, if True, the 'request_sizes', 'response_sizes' and 'ma_data'
+        will be converted to string. This is useful when writing to files, so the view will be more readable.
     -----------------------------
     :return: the deviation list of dicts.
 
@@ -428,39 +431,22 @@ def deviation_calculator_by_moving_average(
     )
 
     if deviation_list:
+        if convert_sizes_lists_and_ma_data_to_string:
+            for deviation_list_index, deviation in enumerate(deviation_list):
+                convert_data_value_to_string('request_sizes', deviation_list_index)
+                convert_data_value_to_string('response_sizes', deviation_list_index)
+                convert_value_to_string('ma_data', deviation_list_index)
+
         if summary:
-            summary_deviation_list: list = []
             for deviation in deviation_list:
-                value = deviation.get('value', None)
-                ma_value = deviation.get('ma_value', None)
-                if not value or not ma_value:
-                    total_entries_averaged = None
-                else:
-                    total_entries_averaged = deviation['data']['count']
-                    
-                summary_deviation_list.append({
-                    'day': deviation['day'],
-                    'host': deviation['host'],
-                    'message': deviation['message'],
-                    'value': deviation.get('value', None),
-                    'ma_value': deviation.get('ma_value', None),
-                    'deviation_percentage': deviation.get('deviation_percentage', None),
-                    'total_entries_averaged': total_entries_averaged,
-                    'median_request_size': deviation.get('median_request_size', None),
-                    'median_response_size': deviation.get('median_response_size', None),
-                    'mm_request_size': deviation.get('mm_request_size', None),
-                    'mm_response_size': deviation.get('mm_response_size', None),
-                })
-
-            deviation_list = summary_deviation_list
+                _ = deviation.pop('check_type')
+                _ = deviation.pop('percentage')
+                _ = deviation.pop('ma_value_checked')
+                _ = deviation.pop('deviation_type')
+                _ = deviation.pop('data')
+                _ = deviation.pop('ma_data')
 
         if output_file_path:
-            if not summary:
-                for deviation_list_index, deviation in enumerate(deviation_list):
-                    convert_data_value_to_string('request_sizes', deviation_list_index)
-                    convert_data_value_to_string('response_sizes', deviation_list_index)
-                    convert_value_to_string('ma_data', deviation_list_index)
-
             print_api(f'Deviation Found, saving to file: {output_file_path}', color='blue')
 
             if output_file_type == 'csv':
@@ -518,8 +504,10 @@ def deviation_calculator_by_moving_average_main():
 
     if args.full_details:
         summary = False
+        convert_sizes_lists_and_ma_data_to_string = True
     else:
         summary = True
+        convert_sizes_lists_and_ma_data_to_string = False
 
     _ = deviation_calculator_by_moving_average(
         statistics_file_directory=args.directory,
@@ -529,6 +517,7 @@ def deviation_calculator_by_moving_average_main():
         summary=summary,
         output_file_path=args.output_file,
         output_file_type=args.output_type,
+        convert_sizes_lists_and_ma_data_to_string=convert_sizes_lists_and_ma_data_to_string
     )
 
     return 0

atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py

@@ -270,6 +270,7 @@ def compute_average_for_current_day_from_past_x_days(
         ma_count = statistics.mean(host_dict['counts'])
         ma_request_size = statistics.mean(host_dict['avg_request_sizes'])
         ma_response_size = statistics.mean(host_dict['avg_response_sizes'])
+        mm_count = statistics.median(host_dict['counts'])
         mm_request_size = statistics.median(host_dict['median_request_sizes'])
         mm_response_size = statistics.median(host_dict['median_response_sizes'])
 
@@ -277,6 +278,7 @@ def compute_average_for_current_day_from_past_x_days(
             'ma_count': ma_count,
             'ma_request_size': ma_request_size,
             'ma_response_size': ma_response_size,
+            'mm_count': mm_count,
             'mm_request_size': mm_request_size,
             'mm_response_size': mm_response_size,
             'counts': host_dict['counts'],
@@ -332,8 +334,28 @@ def find_deviation_from_moving_average(
             deviation_percentage = (
                     (host_moving_average_by_type - day_statistics_content_dict[check_type]) /
                     host_moving_average_by_type)
+
         if deviation_type:
             message = f'[{check_type}] is [{deviation_type}] the moving average.'
+
+            # Get the right moving median.
+            if check_type == 'count':
+                median_type_string: str = 'count'
+                moving_median_type_string: str = 'mm_count'
+            else:
+                median_type_string: str = check_type.replace('avg', 'median')
+                moving_median_type_string: str = check_type.replace('avg', 'mm')
+
+            # The median and the total count are None for the count, Since they are the count.
+            if check_type == 'count':
+                total_entries_averaged = None
+                median_size = None
+            else:
+                total_entries_averaged = day_statistics_content_dict['count']
+                median_size = day_statistics_content_dict[median_type_string]
+
+            moving_median_size = moving_averages_dict[host][moving_median_type_string]
+
             deviation_list.append({
                 'day': day,
                 'host': host,
@@ -344,11 +366,10 @@ def find_deviation_from_moving_average(
                 'percentage': top_bottom_deviation_percentage,
                 'ma_value_checked': check_type_moving_above,
                 'deviation_percentage': deviation_percentage,
+                'total_entries_averaged': total_entries_averaged,
                 'deviation_type': deviation_type,
-                'median_request_size': day_statistics_content_dict['median_request_size'],
-                'median_response_size': day_statistics_content_dict['median_response_size'],
-                'mm_request_size': moving_averages_dict[host]['mm_request_size'],
-                'mm_response_size': moving_averages_dict[host]['mm_response_size'],
+                'median_size': median_size,
+                'mm_size': moving_median_size,
                 'data': day_statistics_content_dict,
                 'ma_data': moving_averages_dict[host]
             })
@@ -373,9 +394,19 @@ def find_deviation_from_moving_average(
                 deviation_list.append({
                     'day': day,
                     'host': host,
-                    'data': host_dict,
                     'message': message,
-                    'type': 'clear'
+                    'value': None,
+                    'ma_value': None,
+                    'check_type': None,
+                    'percentage': None,
+                    'ma_value_checked': None,
+                    'deviation_percentage': None,
+                    'total_entries_averaged': None,
+                    'deviation_type': 'clear',
+                    'median_size': None,
+                    'mm_size': None,
+                    'data': host_dict,
+                    'ma_data': previous_day_moving_average_dict
                 })
                 continue
 

{atomicshop-2.16.22.dist-info → atomicshop-2.16.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.16.22
+Version: 2.16.24
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.16.22.dist-info → atomicshop-2.16.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=NVC0lbA3Ua_9Z-pCiq_rauheR-QtAnITRIbPvzPTez0,124
+atomicshop/__init__.py,sha256=CTmlCQGjYSV8TXiXGaZZB1S8I3hG61RNpEbQc104SF8,124
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -131,7 +131,7 @@ atomicshop/mitm/message.py,sha256=d_sm3O_aoZf87dDQP44xOMNEG-uZBN1ZecQgMCacbZs,18
 atomicshop/mitm/mitm_main.py,sha256=gA8sV7hI107OnoeedCHpy8f3zcE4vAsBc44l_VTjVFo,21622
 atomicshop/mitm/recs_files.py,sha256=B8fSuvYXlh50LWfwLRw_bYswreTjmdZLuHJzbDC5Gss,2930
 atomicshop/mitm/shared_functions.py,sha256=hplm98tz8pgJ4WHUVI9sf_oVqUM2KJ1Y2pD6EFSb8P0,1879
-atomicshop/mitm/statistic_analyzer.py,sha256=0QYmkdSp5tjHkyl5MGWVEsgpRR3FgN7A2fE6pKTSO8I,27164
+atomicshop/mitm/statistic_analyzer.py,sha256=mBmwEe68WAjnIskGndQTRldnsAsDHuaOW0O7UXlM3Pc,26702
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/create_module_template.py,sha256=tRjVSm1sD6FzML71Qbuwvita0qsusdFGm8NZLsZ-XMs,4853
 atomicshop/mitm/engines/create_module_template_example.py,sha256=X5xhvbV6-g9jU_bQVhf_crZmaH50LRWz3bS-faQ18ds,489
@@ -145,7 +145,7 @@ atomicshop/mitm/engines/__reference_general/recorder___reference_general.py,sha2
 atomicshop/mitm/engines/__reference_general/responder___reference_general.py,sha256=IUyQYMPeEhIARfALWiKPFeXagSQD6lRzAxUdi4ZIT88,7010
 atomicshop/mitm/statistic_analyzer_helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/statistic_analyzer_helper/analyzer_helper.py,sha256=pk6L1t1ea1kvlBoR9QEJptOmaX-mumhwLsP2GCKukbk,5920
-atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py,sha256=Wge-OfbbClfjeEWwOyksd-x9C5QZdRD3KRSjtP9VL9Q,16651
+atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py,sha256=XkJBAKD20j4rBpTWuhRJG3ONDWsktOh3PfOqzVDSORo,17883
 atomicshop/monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/monitor/change_monitor.py,sha256=K5NlVp99XIDDPnQQMdru4BDmua_DtcDIhVAzkTOvD5s,7673
 atomicshop/monitor/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -309,8 +309,8 @@ atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0L
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=V_m1D0KpizQox3IEWp2AUcncwWy5kG25hbFrc-mBSJE,3029
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=bQ8Jql8bVGBJ0dt3VQ56lga_1LBOMLI3Km_otvvbU6c,7138
-atomicshop-2.16.22.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.22.dist-info/METADATA,sha256=lOjy44JtH_ETUEAHES0RmxZDkA4alJcAXWY2IpUDvxA,10473
-atomicshop-2.16.22.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.22.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.22.dist-info/RECORD,,
+atomicshop-2.16.24.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.24.dist-info/METADATA,sha256=172BnmXPSDlG-AxPVViiY5xQNY2m7UqFq6DQ0ytD9zM,10473
+atomicshop-2.16.24.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.24.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.24.dist-info/RECORD,,