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

atomicshop/mitm/statistic_analyzer.py

@@ -352,6 +352,7 @@ def deviation_calculator_by_moving_average(
         moving_average_window_days: int = 5,
         top_bottom_deviation_percentage: float = 0.25,
         get_deviation_for_last_day_only: bool = False,
+        get_deviation_for_date: str = None,
         summary: bool = False,
         output_file_path: str = None,
         output_file_type: Literal['json', 'csv'] = 'json',
@@ -386,6 +387,8 @@ def deviation_calculator_by_moving_average(
         Files 01 to 05 will be used for moving average and the file 06 for deviation.
         Meaning the average calculated for 2021-01-06 will be compared to the values moving average of 2021-01-01
         to 2021-01-05.
+    :param get_deviation_for_date: string, if specified, only the specified date will be analyzed.
+        The date must be in the format of 'YYYY-MM-DD'. Example: '2021-01-06'.
     :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_file_path: string, if None, no file will be written.
@@ -437,6 +440,9 @@ def deviation_calculator_by_moving_average(
     if by_type not in ['host', 'url']:
         raise ValueError(f'by_type must be "host" or "url", not [{by_type}]')
 
+    if get_deviation_for_last_day_only and get_deviation_for_date:
+        raise ValueError('Either [get_deviation_for_last_day_only] or [get_deviation_for_date] can be provided, not both.')
+
     if statistics_file_directory:
         statistics_file_path: str | None = f'{statistics_file_directory}{os.sep}{STATISTICS_FILE_NAME}'
     else:
@@ -449,6 +455,7 @@ def deviation_calculator_by_moving_average(
         moving_average_window_days,
         top_bottom_deviation_percentage,
         get_deviation_for_last_day_only,
+        get_deviation_for_date,
         skip_total_count_less_than
     )
 

atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py

@@ -1,6 +1,7 @@
 import statistics
 from pathlib import Path
 from typing import Literal
+import datetime
 
 from ...print_api import print_api
 from ...wrappers.loggingw import reading, consts
@@ -15,6 +16,7 @@ def calculate_moving_average(
         moving_average_window_days: int = 5,
         top_bottom_deviation_percentage: float = 0.25,
         get_deviation_for_last_day_only: bool = False,
+        get_deviation_for_date: str = None,
         skip_total_count_less_than: int = None,
         print_kwargs: dict = None
 ) -> list:
@@ -29,6 +31,7 @@ def calculate_moving_average(
     :param top_bottom_deviation_percentage: float, the percentage of deviation from the moving average to the top or
         bottom.
     :param get_deviation_for_last_day_only: bool, check the 'get_all_files_content' function.
+    :param get_deviation_for_date: str, check the 'get_all_files_content' function.
     :param skip_total_count_less_than: integer, if the total count is less than this number, skip the deviation.
     :param print_kwargs: dict, the print_api arguments.
     """
@@ -38,10 +41,15 @@ def calculate_moving_average(
     if file_path and statistics_content:
         raise ValueError('Only one of file_path or statistics_content must be provided.')
 
+    if get_deviation_for_last_day_only and get_deviation_for_date:
+        raise ValueError('Only one of get_deviation_for_last_day_only or get_deviation_for_date can be set.')
+
     if not statistics_content:
         statistics_content: dict = get_all_files_content(
             file_path=file_path, moving_average_window_days=moving_average_window_days,
-            get_deviation_for_last_day_only=get_deviation_for_last_day_only, print_kwargs=print_kwargs)
+            get_deviation_for_last_day_only=get_deviation_for_last_day_only,
+            get_deviation_for_date=get_deviation_for_date,
+            print_kwargs=print_kwargs)
 
     for date_string, day_dict in statistics_content.items():
         day_dict['content_no_useless'] = get_content_without_useless(day_dict['content'])
@@ -73,6 +81,7 @@ def get_all_files_content(
         file_path: str,
         moving_average_window_days: int,
         get_deviation_for_last_day_only: bool = False,
+        get_deviation_for_date: str = None,
         print_kwargs: dict = None
 ) -> dict:
     """
@@ -83,7 +92,7 @@ def get_all_files_content(
     :param get_deviation_for_last_day_only: bool, if True, only the last day will be analyzed.
         Example: With 'moving_average_window_days=5', the last 6 days will be analyzed.
         5 days for moving average and the last day for deviation.
-        File names example:
+        File names example the last day is 2021-01-06:
             statistics_2021-01-01.csv
             statistics_2021-01-02.csv
             statistics_2021-01-03.csv
@@ -93,12 +102,24 @@ def get_all_files_content(
         Files 01 to 05 will be used for moving average and the file 06 for deviation.
         Meaning the average calculated for 2021-01-06 will be compared to the values moving average of 2021-01-01
         to 2021-01-05.
+    :param get_deviation_for_date: str, if set, the last day is considered the date that you set here.
+        The format should be the same as in the file names, e.g. 'YYYY-MM-DD'.
     :param print_kwargs: dict, the print_api arguments.
     :return:
     """
 
+    if get_deviation_for_last_day_only and get_deviation_for_date:
+        raise ValueError('Only one of get_deviation_for_last_day_only or get_deviation_for_date can be set.')
+
     date_format: str = consts.DEFAULT_ROTATING_SUFFIXES_FROM_WHEN['midnight']
 
+    def is_valid_date(date_str: str) -> bool:
+        try:
+            datetime.datetime.strptime(date_str, date_format)
+            return True
+        except ValueError:
+            return False
+
     # Get all the file paths and their midnight rotations.
     logs_paths: list[filesystem.AtomicPath] = reading.get_logs_paths(
         log_file_path=file_path,
@@ -109,6 +130,24 @@ def get_all_files_content(
         days_back_to_analyze: int = moving_average_window_days + 1
         logs_paths = logs_paths[-days_back_to_analyze:]
 
+    if get_deviation_for_date:
+        # Check if the date format is correct.
+        if not is_valid_date(get_deviation_for_date):
+            raise ValueError(f'Date [{get_deviation_for_date}] is not in the correct format: {date_format}')
+
+        # Find the index of the date in the logs_paths list.
+        date_index: int | None = None
+        for index, log_atomic_path in enumerate(logs_paths):
+            if log_atomic_path.datetime_string == get_deviation_for_date:
+                date_index = index
+                break
+
+        if date_index is None:
+            raise ValueError(f'Date {get_deviation_for_date} not found in the log files.')
+
+        start_index: int = max(0, date_index - moving_average_window_days)
+        logs_paths = logs_paths[start_index:date_index + 1]
+
     statistics_content: dict = {}
     # Read each file to its day.
     for log_atomic_path in logs_paths:
@@ -260,7 +299,7 @@ def compute_moving_averages_from_average_statistics(
 
         # Create list of the last 'moving_average_window_days' days, including the current day.
         last_x_window_days_content_list = (
-            list(average_statistics_dict.values()))[current_day-moving_average_window_days:current_day]
+            list(average_statistics_dict.values()))[current_day - moving_average_window_days:current_day]
 
         # Compute the moving averages.
         moving_average[day] = compute_average_for_current_day_from_past_x_days(
@@ -443,7 +482,8 @@ def find_deviation_from_moving_average(
         if day_index == 0:
             previous_day_moving_average_dict = {}
         else:
-            previous_day_moving_average_dict = list(statistics_content.values())[day_index-1].get('moving_average', {})
+            previous_day_moving_average_dict = list(statistics_content.values())[day_index - 1].get('moving_average',
+                                                                                                    {})
 
         # If there is no moving average for previous day continue to the next day.
         if not previous_day_moving_average_dict:

{atomicshop-3.3.17.dist-info → atomicshop-3.3.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atomicshop
-Version: 3.3.17
+Version: 3.3.18
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License-Expression: MIT

{atomicshop-3.3.17.dist-info → atomicshop-3.3.18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=Dpoh5myDY76x-yt8GnffOAHw--mjow5KnNkH5ARBuyc,123
+atomicshop/__init__.py,sha256=ZZgIypIAzAvhlg6GcAfDfISP0Pv6PTd2kCCEgIKx420,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
@@ -134,7 +134,7 @@ atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,30
 atomicshop/mitm/mitm_main.py,sha256=u9q4BYIhScw9W9M7AS4h217gKQXkuppOFxvprEBVPGE,39366
 atomicshop/mitm/recs_files.py,sha256=tv8XFhYZMkBv4DauvpiAdPgvSo0Bcm1CghnmwO7dx8M,5018
 atomicshop/mitm/shared_functions.py,sha256=0lzeyINd44sVEfFbahJxQmz6KAMWbYrW5ou3UYfItvw,1777
-atomicshop/mitm/statistic_analyzer.py,sha256=D7DzpgqZN303jS8hfXn5HKq1edbTil7CpJr85bk9ERA,28489
+atomicshop/mitm/statistic_analyzer.py,sha256=EC9g21ocOsFzNfntV-nZHSGtrS1-Kxb0QDSGWS5FuNA,28942
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/create_module_template.py,sha256=PHE2pVC9JNgaIh2o7M5dFMrkdOkmIyHLoO2mdzE5BdM,5938
 atomicshop/mitm/engines/create_module_template_main_example.py,sha256=LeQ44Rp2Gi_KbIDY_4OMS0odkSK3zFZWra_oAka5eJY,243
@@ -150,7 +150,7 @@ atomicshop/mitm/engines/__reference_general/requester___reference_general.py,sha
 atomicshop/mitm/engines/__reference_general/responder___reference_general.py,sha256=5XSmvF0d6d9mPkPOGw7f9T-Cr-YoUiUTVYgBIjiKh7s,10615
 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=pQDDiLuySFk8rwLJT6GFVEF2HItdiBX3nhWBDfwejWI,21542
+atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py,sha256=j_0_8p-6ExVbbhILMeY7RuQ3PTNjs-mB6y0wr2ie34U,23501
 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
@@ -316,8 +316,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=_gA8bMX6Sw_UCXKi2y9wNAwlqif
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
-atomicshop-3.3.17.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.3.17.dist-info/METADATA,sha256=rJmcAVoJKVxK4eEyafjPZ2rCdQDLlyHewEpgEiYM9eQ,9345
-atomicshop-3.3.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atomicshop-3.3.17.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.3.17.dist-info/RECORD,,
+atomicshop-3.3.18.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.3.18.dist-info/METADATA,sha256=9i69mSa_kRBTR5_2RN1F5-rAJm7myfH7dBjI3gXBrsA,9345
+atomicshop-3.3.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atomicshop-3.3.18.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.3.18.dist-info/RECORD,,