atomicshop 2.16.1__py3-none-any.whl → 2.16.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.16.1'
+__version__ = '2.16.3'

atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py

@@ -1,4 +1,5 @@
 import statistics
+from pathlib import Path
 from typing import Literal
 
 from ...print_api import print_api
@@ -39,12 +40,12 @@ def calculate_moving_average(
     :param print_kwargs: dict, the print_api arguments.
     """
 
-    date_pattern: str = consts.DEFAULT_ROTATING_SUFFIXES_FROM_WHEN['midnight']
+    date_format: str = consts.DEFAULT_ROTATING_SUFFIXES_FROM_WHEN['midnight']
 
     # Get all the file paths and their midnight rotations.
     logs_paths: list = reading.get_logs_paths(
         log_file_path=file_path,
-        date_pattern=date_pattern
+        date_format=date_format
     )
 
     if get_deviation_for_last_day_only:
@@ -129,7 +130,12 @@ def get_data_dict_from_statistics_content(
             type_to_check: str = line['host'] + line['path']
             # Remove the parameters from the URL.
             url_parsed = urls.url_parser(type_to_check)
-            type_to_check = url_parsed['path']
+
+            if url_parsed['file'] and Path(url_parsed['file']).suffix in ['.gz', '.gzip', '.zip']:
+                type_to_check = '/'.join(url_parsed['directories'][:-1])
+            else:
+                type_to_check = url_parsed['path']
+
             # Remove the last slash from the URL.
             type_to_check = type_to_check.removesuffix('/')
         else:

atomicshop/urls.py

@@ -8,6 +8,11 @@ def url_parser(url):
     directories = parts.path.strip('/').split('/')
     queries = parts.query.strip('&').split('&')
 
+    if len(directories) > 1 and '.' in directories[-1]:
+        file = directories[-1]
+    else:
+        file = ''
+
     elements = {
         'scheme': parts.scheme,
         'netloc': parts.netloc,
@@ -17,6 +22,7 @@ def url_parser(url):
         'fragment': parts.fragment,
         'directories': directories,
         'queries': queries,
+        'file': file
     }
 
     return elements

atomicshop/wrappers/loggingw/reading.py

@@ -4,6 +4,7 @@ from pathlib import Path
 import datetime
 
 from ... import filesystem, datetimes
+from ...basics import booleans
 from ...file_io import csvs
 
 
@@ -15,9 +16,10 @@ def get_logs_paths(
         log_files_directory_path: str = None,
         log_file_path: str = None,
         file_name_pattern: str = '*.*',
-        date_pattern: str = None,
+        date_format: str = None,
         latest_only: bool = False,
-        previous_day_only: bool = False
+        previous_day_only: bool = False,
+        specific_date: str = None
 ):
     """
     This function gets the logs file paths from the directory. Supports rotating files to get the logs by time.
@@ -37,11 +39,18 @@ def get_logs_paths(
         log_files_directory_path = 'C:/logs'
     :param file_name_pattern: Pattern to match the log files names.
         Default file_name_pattern will match all the files.
-    :param date_pattern: Pattern to match the date in the log file name.
+    :param date_format: date format string pattern to match the date in the log file name.
         If specified, the function will get the log file by the date pattern.
         If not specified, the function will get the file date by file last modified time.
+
+        Example:
+        date_format = '%Y-%m-%d'
     :param latest_only: Boolean, if True, only the latest log file path will be returned.
     :param previous_day_only: Boolean, if True, only the log file path from the previous day will be returned.
+    :param specific_date: Specific date to get the log file path.
+        If specified, the function will get the log file by the specific date.
+        Meaning that 'date_format' must be specified.
+
     """
 
     if not log_files_directory_path and not log_file_path:
@@ -49,8 +58,14 @@ def get_logs_paths(
     elif log_files_directory_path and log_file_path:
         raise ValueError('Both "log_files_directory_path" and "log_file_path" cannot be specified at the same time.')
 
-    if latest_only and previous_day_only:
-        raise ValueError('Both "latest_only" and "previous_day_only" cannot be True at the same time.')
+    if latest_only or previous_day_only or specific_date:
+        booleans.check_3_booleans_when_only_1_can_be_true(
+                (latest_only, 'latest_only'),
+                (previous_day_only, 'previous_day_only'),
+                (specific_date, 'specific_date'))
+
+    if not date_format and specific_date:
+        raise ValueError('If "specific_date" is specified, "date_format" must be specified.')
 
     # If log file path is specified, get the file_name_pattern from the file name.
     if log_file_path:
@@ -74,22 +89,22 @@ def get_logs_paths(
     if logs_files:
         first_file_name: str = Path(logs_files[0]['file_path']).name
         first_datetime_object, first_date_string, first_timestamp_float = (
-            datetimes.get_datetime_from_complex_string_by_pattern(first_file_name, date_pattern))
+            datetimes.get_datetime_from_complex_string_by_pattern(first_file_name, date_format))
 
     # The problem here is the file name that doesn't contain the date string in the name.
     # If it is regular log rotation, then there will be one file that doesn't have the date string in the name.
     # If the function used to get the previous day log, then there will be no file that doesn't have the date string.
     if len(logs_files) > 1 or (len(logs_files) == 1 and first_date_string):
-        if date_pattern:
+        if date_format:
             latest_timestamp: float = 0
             for file_index, single_file in enumerate(logs_files):
                 # Get file name from current loop file path.
                 current_file_name: str = Path(single_file['file_path']).name
                 logs_files[file_index]['file_name'] = current_file_name
 
-                # Get the datetime object from the file name by the date pattern.
+                # Get the datetime object from the file name by the date format pattern.
                 datetime_object, date_string, timestamp_float = (
-                    datetimes.get_datetime_from_complex_string_by_pattern(current_file_name, date_pattern))
+                    datetimes.get_datetime_from_complex_string_by_pattern(current_file_name, date_format))
 
                 # Update the last modified time to the dictionary.
                 logs_files[file_index]['last_modified'] = timestamp_float
@@ -113,7 +128,7 @@ def get_logs_paths(
                     latest_timestamp += 86400
                     logs_files[file_index]['last_modified'] = latest_timestamp
                     logs_files[file_index]['datetime'] = datetime.datetime.fromtimestamp(latest_timestamp)
-                    logs_files[file_index]['date_string'] = logs_files[file_index]['datetime'].strftime(date_pattern)
+                    logs_files[file_index]['date_string'] = logs_files[file_index]['datetime'].strftime(date_format)
                     break
 
             # Sort the files by the last modified time.
@@ -128,6 +143,10 @@ def get_logs_paths(
                 logs_files = []
             else:
                 logs_files = [logs_files[-2]]
+
+        if specific_date:
+            # Check if there is a specific date log file.
+            logs_files = [single_file for single_file in logs_files if single_file['date_string'] == specific_date]
     # If there is only one file, meaning it is the current day log.
     # If the 'previous_day_only' is True, then there are no previous day logs to output.
     elif len(logs_files) == 1 and previous_day_only:
@@ -140,7 +159,7 @@ def get_all_log_files_into_list(
         log_files_directory_path: str = None,
         log_file_path: str = None,
         file_name_pattern: str = '*.*',
-        date_pattern: str = None,
+        date_format: str = None,
         log_type: Literal['csv'] = 'csv',
         header_type_of_files: Literal['first', 'all'] = 'first',
         remove_logs: bool = False,
@@ -155,9 +174,12 @@ def get_all_log_files_into_list(
     :param log_file_path: Path to the log file. Check the 'get_logs_paths' function for more details.
     :param file_name_pattern: Pattern to match the log files names.
         Default file_name_pattern will match all the files.
-    :param date_pattern: Pattern to match the date in the log file name.
+    :param date_format: date format string pattern to match the date in the log file name.
         If specified, the function will get the log file by the date pattern.
         If not specified, the function will get the file date by file last modified time.
+
+        Example:
+        date_format = '%Y-%m-%d'
     :param log_type: Type of log to get.
     :param header_type_of_files: Type of header to get from the files.
         'first' - Only the first file has a header for CSV. This header will be used for the rest of the files.
@@ -183,7 +205,7 @@ def get_all_log_files_into_list(
         log_files_directory_path=log_files_directory_path,
         log_file_path=log_file_path,
         file_name_pattern=file_name_pattern,
-        date_pattern=date_pattern)
+        date_format=date_format)
 
     # Read all the logs.
     logs_content: list = list()
@@ -263,16 +285,19 @@ class LogReader:
     def __init__(
             self,
             log_file_path: str,
-            date_pattern: str = None,
+            date_format: str = None,
             log_type: Literal['csv'] = 'csv',
             get_previous_file: bool = False,
             header: list = None
     ):
         """
         :param log_file_path: Path to the log file.
-        :param date_pattern: Pattern to match the date in the log file name.
+        :param date_format: date format string pattern to match the date in the log file name.
             If specified, the function will get the log file by the date pattern.
             If not specified, the function will get the file date by file last modified time.
+
+            Example:
+            date_format = '%Y-%m-%d'
         :param log_type: Type of log to get.
         :param get_previous_file: Boolean, if True, the function will get the previous log file.
             For example, your log is set to rotate every Midnight.
@@ -287,7 +312,7 @@ class LogReader:
         """
 
         self.log_file_path: str = log_file_path
-        self.date_pattern: str = date_pattern
+        self.date_format: str = date_format
         self.log_type: Literal['csv'] = log_type
         self.get_previous_file: bool = get_previous_file
         self.header: list = header
@@ -329,7 +354,7 @@ class LogReader:
         # Get the latest statistics file path.
         latest_statistics_file_path_object = get_logs_paths(
             log_file_path=self.log_file_path,
-            date_pattern=self.date_pattern,
+            date_format=self.date_format,
             latest_only=True
         )
 
@@ -344,7 +369,7 @@ class LogReader:
         try:
             previous_day_statistics_file_path = get_logs_paths(
                 log_file_path=self.log_file_path,
-                date_pattern=self.date_pattern,
+                date_format=self.date_format,
                 previous_day_only=True
             )[0]['file_path']
         # If you get IndexError, it means that there are no previous day logs to read.

{atomicshop-2.16.1.dist-info → atomicshop-2.16.3.dist-info}/METADATA

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

{atomicshop-2.16.1.dist-info → atomicshop-2.16.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=tNo-zv64ouxuBBLz7a94FTgCjvROQM_rI3A3RN7k-R4,123
+atomicshop/__init__.py,sha256=AKEuH8PqWV4-EZXo12aT4GrKcoEcFGoUZbDx7SgXtAY,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
@@ -41,7 +41,7 @@ atomicshop/system_resource_monitor.py,sha256=WvnnQrD5W9NRqOWI2YNcL-ut2UrvhrYToVl
 atomicshop/system_resources.py,sha256=0mhDZBEcMzToCOw5ArJhtqYjktOW6iJGdyRkJ01Cpwk,9272
 atomicshop/tempfiles.py,sha256=uq1ve2WlWehZ3NOTXJnpBBMt6HyCdBufqedF0HyzA6k,2517
 atomicshop/timer.py,sha256=7Zw1KRV0acHCRATMnanyX2MLBb63Hc-6us3rCZ9dNlY,2345
-atomicshop/urls.py,sha256=yqEn8YJS2Ma-cZidn0NZgIfuzFX0rReJ_L5IDt6iWJA,1414
+atomicshop/urls.py,sha256=aJ0NGS9qqaKeqjkkWBs80jaBBg6MYBiPuLIyPGxscVc,1557
 atomicshop/uuids.py,sha256=JSQdm3ZTJiwPQ1gYe6kU0TKS_7suwVrHc8JZDGYlydM,2214
 atomicshop/virtualization.py,sha256=LPP4vjE0Vr10R6DA4lqhfX_WaNdDGRAZUW0Am6VeGco,494
 atomicshop/web.py,sha256=J9izvF5LNEVOVkkWon0XUgJmR7nrFln03nIxW7wUZWg,11547
@@ -143,7 +143,7 @@ atomicshop/mitm/engines/__reference_general/recorder___reference_general.py,sha2
 atomicshop/mitm/engines/__reference_general/responder___reference_general.py,sha256=1AM49UaFTKA0AHw-k3SV3uH3QbG-o6ux0c-GoWkKNU0,6993
 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=xMvFnbsiDjtbmASErV-Deuy9u4ft14seM33o-immhhM,16391
+atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py,sha256=lsG_eSWf6M_3AfWqIYEBNwYAyVHJfBiRVKHhmWIOZ9A,16615
 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
@@ -248,7 +248,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=ZgFbmQdStLg2nlgzJEznsvEP0r63ki_2RRwsNnggLDI,18148
+atomicshop/wrappers/loggingw/reading.py,sha256=ZVFc6jjxNBbxknK8m4ec5WUFHtDUiM7vnsyYnWUBjWU,19109
 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=21Re0NpikgYOKelyPTkosoQQxzu67dy80Kj204TL5eo,6644
@@ -304,8 +304,8 @@ atomicshop/wrappers/socketw/socket_server_tester.py,sha256=SdchUf9qrPk1Rrat0RzvM
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=655nGQp0HFy-7KNx8zHsA-miXi9ufC7DNeGsvvGALak,28415
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=q5vRA7jL5ERFhIGctn5HjBlOppwSY9qMoEVgo898AIo,2979
-atomicshop-2.16.1.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.1.dist-info/METADATA,sha256=M8TADOGpoNdNhtlfkIZsTKGma4EbAlbeDeSKjINGIvA,10502
-atomicshop-2.16.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.1.dist-info/RECORD,,
+atomicshop-2.16.3.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.3.dist-info/METADATA,sha256=ysLTKs85RLuQJr6JD-u3QVGH4EkdVE4ETVdwMjdCm-M,10502
+atomicshop-2.16.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.3.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.3.dist-info/RECORD,,