atomicshop 2.15.2__py3-none-any.whl → 2.15.3__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.15.2'
+__version__ = '2.15.3'

atomicshop/mitm/statistic_analyzer.py

@@ -1,12 +1,12 @@
 import os
 import datetime
 import json
-from typing import Union
+from typing import Union, Literal
 
 from .statistic_analyzer_helper import analyzer_helper, moving_average_helper
 from .. import filesystem, domains, datetimes, urls
 from ..basics import dicts
-from ..file_io import tomls, xlsxs, jsons
+from ..file_io import tomls, xlsxs, jsons, csvs
 from ..wrappers.loggingw import reading
 from ..print_api import print_api
 
@@ -350,7 +350,8 @@ def deviation_calculator_by_moving_average_main(
         top_bottom_deviation_percentage: float,
         get_deviation_for_last_day_only: bool = False,
         summary: bool = False,
-        output_json_file_path: str = None
+        output_file_path: str = None,
+        output_file_type: Literal['json', 'csv'] = 'json'
 ) -> Union[list, None]:
     """
     This function is the main function for the moving average calculator.
@@ -375,7 +376,8 @@ def deviation_calculator_by_moving_average_main(
         to 2021-01-05.
     :param summary: bool, if True, Only the summary will be generated without all the numbers that were used
         to calculate the averages and the moving average data.
-    :param output_json_file_path: string, if None, no json file will be written.
+    :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'.
     -----------------------------
     :return: the deviation list of dicts.
 
@@ -397,6 +399,9 @@ def deviation_calculator_by_moving_average_main(
         sys.exit(main())
     """
 
+    if output_file_type not in ['json', 'csv']:
+        raise ValueError(f'output_file_type must be "json" or "csv", not [{output_file_type}]')
+
     statistics_file_path: str = f'{statistics_file_directory}{os.sep}{STATISTICS_FILE_NAME}'
 
     def convert_data_value_to_string(value_key: str, list_index: int) -> None:
@@ -414,29 +419,41 @@ def deviation_calculator_by_moving_average_main(
     )
 
     if deviation_list:
-        if output_json_file_path:
-            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_json_file_path}', color='blue')
-            jsons.write_json_file(deviation_list, output_json_file_path, use_default_indent=True)
-
         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['value'],
-                    'ma_value': deviation['ma_value'],
-                    'total_entries_averaged': deviation['data']['count']
+                    'value': deviation.get('value', None),
+                    'ma_value': deviation.get('ma_value', None),
+                    'total_entries_averaged': total_entries_averaged
                 })
 
             deviation_list = summary_deviation_list
 
+        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':
+                csvs.write_list_to_csv(output_file_path, deviation_list)
+            elif output_file_type == 'json':
+                jsons.write_json_file(deviation_list, output_file_path, use_default_indent=True)
+
         return deviation_list
 
     return None

atomicshop/wrappers/loggingw/reading.py

@@ -7,6 +7,10 @@ from ... import filesystem, datetimes
 from ...file_io import csvs
 
 
+class LogReaderTimeCouldntBeFoundInFileNameError(Exception):
+    pass
+
+
 def get_logs_paths(
         log_files_directory_path: str = None,
         log_file_path: str = None,
@@ -95,6 +99,13 @@ def get_logs_paths(
                 if timestamp_float and timestamp_float > latest_timestamp:
                     latest_timestamp = timestamp_float
 
+            # Check timestamps, if more than 1 file is None, then the function that gets the date from the file name
+            # didn't work properly, probably because of the string datetime format or the filenames.
+            none_timestamps = [single_file['last_modified'] for single_file in logs_files].count(None)
+            if none_timestamps > 1:
+                raise LogReaderTimeCouldntBeFoundInFileNameError(
+                    'The date pattern could not be found in the file name. Check the date pattern and the file names.')
+
             # Now, there should be a file that doesn't have the string date pattern in the file name.
             # We will add one day to the latest date that we found and assign to that file path.
             for file_index, single_file in enumerate(logs_files):

{atomicshop-2.15.2.dist-info → atomicshop-2.15.3.dist-info}/METADATA

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

{atomicshop-2.15.2.dist-info → atomicshop-2.15.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=YjtioQo2yCdlVopAxK5ML-3qjCBp2BtnyqJLsu5hSYI,123
+atomicshop/__init__.py,sha256=aCesTJoNLZUFzz58NTSDXvO_WoEVSNiCYUamRk5wgJs,123
 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
@@ -128,7 +128,7 @@ atomicshop/mitm/initialize_engines.py,sha256=YnXPK1UKrmULnfL4zLo2LOpKWq-aGKzc9p3
 atomicshop/mitm/initialize_mitm_server.py,sha256=j1yMUbHsnFh9l5rFiUgBQA0mRZqREOKviP0frRzYikM,14611
 atomicshop/mitm/message.py,sha256=u2U2f2SOHdBNU-6r1Ik2W14ai2EOwxUV4wVfGZA098k,1732
 atomicshop/mitm/shared_functions.py,sha256=PaK_sbnEA5zo9k2ktEOKLmvo-6wRUunxzSNRr41uXIQ,1924
-atomicshop/mitm/statistic_analyzer.py,sha256=FdUmKVmDZp0-2ohBVwubG9v0wz8Wb-NIi50Qk8BR85E,22913
+atomicshop/mitm/statistic_analyzer.py,sha256=w3mqvnfh68zW78bcIyw1Au4DimSu9dbNlqoG7jP--fM,23750
 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
@@ -244,7 +244,7 @@ atomicshop/wrappers/loggingw/formatters.py,sha256=7XUJvlB0CK4DCkEp8NTL0S0dkyrZD0
 atomicshop/wrappers/loggingw/handlers.py,sha256=yFYBeTkxnpmtlauoH3ZEFEHUYQYu9YL-ycd9sYTvOl4,16928
 atomicshop/wrappers/loggingw/loggers.py,sha256=DHOOTAtqkwn1xgvLHSkOiBm6yFGNuQy1kvbhG-TDog8,2374
 atomicshop/wrappers/loggingw/loggingw.py,sha256=lo4OZPXCbYZi3GqpaaJSs9SOGFfqD2EgHzzTK7f5IR4,11275
-atomicshop/wrappers/loggingw/reading.py,sha256=b4-ibM5WwjEOanvHY3hIsu9-4b2RAdPYiCxvl7745fk,17521
+atomicshop/wrappers/loggingw/reading.py,sha256=ZgFbmQdStLg2nlgzJEznsvEP0r63ki_2RRwsNnggLDI,18148
 atomicshop/wrappers/mongodbw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/mongodbw/infrastructure.py,sha256=tHqtt__yKGtj24CT5AIk0V0k9t1p_PjezFExXRmmmcA,1517
 atomicshop/wrappers/mongodbw/install_mongodb.py,sha256=dik6tpXws4FaQN_-u8s-yn5Z1InHROV7k1WhFA8eu4M,6617
@@ -294,8 +294,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=AhpurHJmP2kgzHaUbq5ey
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=aXBwlEIJhFT0-c4i8iNlFx2It9VpCEpsv--5Oqcpxao,11624
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=t3dtDEfN47CfYVi0CW6Kc2QHTEeZVyYhc57IYYh5nmA,826
-atomicshop-2.15.2.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.15.2.dist-info/METADATA,sha256=mAbT1nfgZ4Tj46GcfHsaEw8vnvZnt3ygZxipKe9aUco,10502
-atomicshop-2.15.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.15.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.15.2.dist-info/RECORD,,
+atomicshop-2.15.3.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.15.3.dist-info/METADATA,sha256=0Fx6JFpY55KI4OpSnfP220ErQEvXv5RX4kcJKAvmCpI,10502
+atomicshop-2.15.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.15.3.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.15.3.dist-info/RECORD,,