pyproxytools 0.3.2__tar.gz → 0.4.1__tar.gz

{pyproxytools-0.3.2/pyproxytools.egg-info → pyproxytools-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyproxytools
-Version: 0.3.2
+Version: 0.4.1
 Summary: Lightweight and fast python web proxy
 Author: 6C656C65
 License-Expression: MIT
@@ -28,6 +28,7 @@ Requires-Dist: requests>=2.31.0
 Requires-Dist: Flask>=3.1.0
 Requires-Dist: Flask-HTTPAuth>=4.8.0
 Requires-Dist: psutil>=5.9.8
+Requires-Dist: colorlog>=6.9.0
 Dynamic: license-file
 
 <div align="center">
@@ -47,9 +48,8 @@ Dynamic: license-file
   <img src="https://img.shields.io/github/commit-activity/w/6C656C65/pyproxy?style=for-the-badge">
   <img src="https://img.shields.io/github/contributors/6C656C65/pyproxy?style=for-the-badge">
   <br>
-  <img src="https://img.shields.io/github/actions/workflow/status/6C656C65/pyproxy/code-scan.yml?label=Scan&style=for-the-badge">
-  <img src="https://img.shields.io/github/actions/workflow/status/6C656C65/pyproxy/unittest.yml?label=Tests&style=for-the-badge">
-  <img src="https://img.shields.io/github/actions/workflow/status/6C656C65/pyproxy/docker-images.yml?label=Delivery&style=for-the-badge">
+  <img src="https://img.shields.io/pypi/v/pyproxytools?style=for-the-badge">
+  <img src="https://img.shields.io/pypi/pyversions/pyproxytools?style=for-the-badge">
 </p>
 
 ---
@@ -74,6 +74,11 @@ Dynamic: license-file
 
 ## 📦 **Installation**
 
+### Install from package
+```bash
+pip install pyproxytools
+```
+
 ### Install from source
 ```bash
 git clone https://github.com/6C656C65/pyproxy.git
@@ -92,7 +97,7 @@ You can use slim images by adding `-slim` to the end of the tags
 
 ### Start the proxy
 ```bash
-python3 -m pyproxy.pyproxy
+python3 -m pyproxy
 ```
 The proxy will be available at: `0.0.0.0:8080`.
 The access log will be available at `./logs/access.log`.

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/README.md

@@ -15,9 +15,8 @@
   <img src="https://img.shields.io/github/commit-activity/w/6C656C65/pyproxy?style=for-the-badge">
   <img src="https://img.shields.io/github/contributors/6C656C65/pyproxy?style=for-the-badge">
   <br>
-  <img src="https://img.shields.io/github/actions/workflow/status/6C656C65/pyproxy/code-scan.yml?label=Scan&style=for-the-badge">
-  <img src="https://img.shields.io/github/actions/workflow/status/6C656C65/pyproxy/unittest.yml?label=Tests&style=for-the-badge">
-  <img src="https://img.shields.io/github/actions/workflow/status/6C656C65/pyproxy/docker-images.yml?label=Delivery&style=for-the-badge">
+  <img src="https://img.shields.io/pypi/v/pyproxytools?style=for-the-badge">
+  <img src="https://img.shields.io/pypi/pyversions/pyproxytools?style=for-the-badge">
 </p>
 
 ---
@@ -42,6 +41,11 @@
 
 ## 📦 **Installation**
 
+### Install from package
+```bash
+pip install pyproxytools
+```
+
 ### Install from source
 ```bash
 git clone https://github.com/6C656C65/pyproxy.git
@@ -60,7 +64,7 @@ You can use slim images by adding `-slim` to the end of the tags
 
 ### Start the proxy
 ```bash
-python3 -m pyproxy.pyproxy
+python3 -m pyproxy
 ```
 The proxy will be available at: `0.0.0.0:8080`.
 The access log will be available at `./logs/access.log`.

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/pyproxy/__init__.py

@@ -5,7 +5,7 @@ that holds the current version number of the application.
 
 import os
 
-__version__ = "0.3.2"
+__version__ = "0.4.1"
 
 if os.path.isdir("pyproxy/monitoring"):
     __slim__ = False

pyproxytools-0.4.1/pyproxy/__main__.py

@@ -0,0 +1,4 @@
+from .pyproxy import main
+
+if __name__ == "__main__":
+    main()

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/pyproxy/pyproxy.py

@@ -36,6 +36,13 @@ def main():
     proxy_host = get_config_value(args, config, "proxy_host", "Proxy", "127.0.0.1")
     proxy_port = get_config_value(args, config, "proxy_port", "Proxy", 8081)
 
+    console_format = None
+    if config.has_section("Logging") and config.has_option("Logging", "console_format"):
+        console_format = config.get("Logging", "console_format")
+    datefmt = None
+    if config.has_section("Logging") and config.has_option("Logging", "datefmt"):
+        datefmt = config.get("Logging", "datefmt")
+
     logger_config = ProxyConfigLogger(
         access_log=get_config_value(
             args, config, "access_log", "Logging", "logs/access.log"
@@ -49,6 +56,12 @@ def main():
         no_logging_block=str_to_bool(
             get_config_value(args, config, "no_logging_block", "Logging", False)
         ),
+        console_format=(
+            console_format
+            if console_format is not None
+            else "%(asctime)s - %(levelname)s - %(message)s"
+        ),
+        datefmt=datefmt if datefmt is not None else "%d/%m/%Y %H:%M:%S",
     )
 
     filter_config = ProxyConfigFilter(

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/pyproxy/server.py

@@ -113,7 +113,7 @@ class ProxyServer:
         self.custom_header_result_queue = multiprocessing.Queue()
 
         # Logging
-        self.console_logger = configure_console_logger()
+        self.console_logger = configure_console_logger(self.logger_config)
         if not self.logger_config.no_logging_access:
             self.logger_config.access_logger = configure_file_logger(
                 self.logger_config.access_log, "AccessLogger"

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/pyproxy/utils/args.py

@@ -124,7 +124,7 @@ def load_config(config_path: str) -> configparser.ConfigParser:
     Returns:
         configparser.ConfigParser: The parsed configuration object.
     """
-    config = configparser.ConfigParser()
+    config = configparser.ConfigParser(interpolation=None)
     config.read(config_path)
     return config
 

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/pyproxy/utils/config.py

@@ -10,20 +10,32 @@ class ProxyConfigLogger:
     Handles logging configuration for the proxy.
     """
 
-    def __init__(self, access_log, block_log, no_logging_access, no_logging_block):
+    def __init__(
+        self,
+        access_log,
+        block_log,
+        no_logging_access,
+        no_logging_block,
+        console_format,
+        datefmt,
+    ):
         self.access_log = access_log
         self.block_log = block_log
         self.access_logger = None
         self.block_logger = None
         self.no_logging_access = no_logging_access
         self.no_logging_block = no_logging_block
+        self.console_format = console_format
+        self.datefmt = datefmt
 
     def __repr__(self):
         return (
             f"ProxyConfigLogger(access_log={self.access_log}, "
             f"block_log={self.block_log}, "
             f"no_logging_access={self.no_logging_access}, "
-            f"no_logging_block={self.no_logging_block})"
+            f"no_logging_block={self.no_logging_block}), "
+            f"console_format={self.console_format}), "
+            f"datefmt={self.datefmt})"
         )
 
     def to_dict(self):
@@ -35,6 +47,8 @@ class ProxyConfigLogger:
             "block_log": self.block_log,
             "no_logging_access": self.no_logging_access,
             "no_logging_block": self.no_logging_block,
+            "console_format": self.console_format,
+            "datefmt": self.datefmt,
         }
 
 

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/pyproxy/utils/logger.py

@@ -6,22 +6,38 @@ This module contains functions to configure and return loggers for both console
 
 import logging
 import os
+import colorlog
 
 
-def configure_console_logger() -> logging.Logger:
+def configure_console_logger(logger_config) -> logging.Logger:
     """
     Configures and returns a logger that outputs log messages to the console.
 
     Returns:
         logging.Logger: A logger instance that writes logs to the console.
     """
+    print(logger_config)
     console_logger = logging.getLogger("ConsoleLogger")
     console_logger.setLevel(logging.INFO)
-    console_formatter = logging.Formatter(
-        "%(asctime)s - %(message)s", datefmt="%d/%m/%Y %H:%M:%S"
+
+    if "%(log_color)s" not in logger_config.console_format:
+        fmt = "%(log_color)s" + logger_config.console_format
+    else:
+        fmt = logger_config.console_format
+
+    formatter = colorlog.ColoredFormatter(
+        fmt,
+        datefmt=logger_config.datefmt,
+        log_colors={
+            "DEBUG": "cyan",
+            "INFO": "green",
+            "WARNING": "yellow",
+            "ERROR": "red",
+            "CRITICAL": "bold_red",
+        },
     )
     console_handler = logging.StreamHandler()
-    console_handler.setFormatter(console_formatter)
+    console_handler.setFormatter(formatter)
     console_logger.addHandler(console_handler)
     return console_logger
 

{pyproxytools-0.3.2 → pyproxytools-0.4.1/pyproxytools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyproxytools
-Version: 0.3.2
+Version: 0.4.1
 Summary: Lightweight and fast python web proxy
 Author: 6C656C65
 License-Expression: MIT
@@ -28,6 +28,7 @@ Requires-Dist: requests>=2.31.0
 Requires-Dist: Flask>=3.1.0
 Requires-Dist: Flask-HTTPAuth>=4.8.0
 Requires-Dist: psutil>=5.9.8
+Requires-Dist: colorlog>=6.9.0
 Dynamic: license-file
 
 <div align="center">
@@ -47,9 +48,8 @@ Dynamic: license-file
   <img src="https://img.shields.io/github/commit-activity/w/6C656C65/pyproxy?style=for-the-badge">
   <img src="https://img.shields.io/github/contributors/6C656C65/pyproxy?style=for-the-badge">
   <br>
-  <img src="https://img.shields.io/github/actions/workflow/status/6C656C65/pyproxy/code-scan.yml?label=Scan&style=for-the-badge">
-  <img src="https://img.shields.io/github/actions/workflow/status/6C656C65/pyproxy/unittest.yml?label=Tests&style=for-the-badge">
-  <img src="https://img.shields.io/github/actions/workflow/status/6C656C65/pyproxy/docker-images.yml?label=Delivery&style=for-the-badge">
+  <img src="https://img.shields.io/pypi/v/pyproxytools?style=for-the-badge">
+  <img src="https://img.shields.io/pypi/pyversions/pyproxytools?style=for-the-badge">
 </p>
 
 ---
@@ -74,6 +74,11 @@ Dynamic: license-file
 
 ## 📦 **Installation**
 
+### Install from package
+```bash
+pip install pyproxytools
+```
+
 ### Install from source
 ```bash
 git clone https://github.com/6C656C65/pyproxy.git
@@ -92,7 +97,7 @@ You can use slim images by adding `-slim` to the end of the tags
 
 ### Start the proxy
 ```bash
-python3 -m pyproxy.pyproxy
+python3 -m pyproxy
 ```
 The proxy will be available at: `0.0.0.0:8080`.
 The access log will be available at `./logs/access.log`.

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/pyproxytools.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ benchmark/utils/__init__.py
 benchmark/utils/html.py
 benchmark/utils/req.py
 pyproxy/__init__.py
+pyproxy/__main__.py
 pyproxy/pyproxy.py
 pyproxy/server.py
 pyproxy/handlers/__init__.py

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/pyproxytools.egg-info/requires.txt

@@ -4,3 +4,4 @@ requests>=2.31.0
 Flask>=3.1.0
 Flask-HTTPAuth>=4.8.0
 psutil>=5.9.8
+colorlog>=6.9.0

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/pyproxytools.egg-info/top_level.txt

@@ -1,9 +1,7 @@
 assets
 benchmark
 build
-certs
 config
 dist
-logs
 pyproxy
 tests

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/requirements.txt

@@ -3,4 +3,5 @@ pyOpenSSL>=25.0.0
 requests>=2.31.0
 Flask>=3.1.0
 Flask-HTTPAuth>=4.8.0
-psutil>=5.9.8
+psutil>=5.9.8
+colorlog>=6.9.0

{pyproxytools-0.3.2 → pyproxytools-0.4.1}/tests/utils/test_logger.py

@@ -12,6 +12,14 @@ from unittest.mock import patch, MagicMock
 from pyproxy.utils.logger import configure_console_logger, configure_file_logger
 
 
+class DummyLoggerConfig:
+    def __init__(self, console_format=None, datefmt=None):
+        self.console_format = (
+            console_format or "%(log_color)s%(asctime)s - %(levelname)s - %(message)s"
+        )
+        self.datefmt = datefmt or "%d/%m/%Y %H:%M:%S"
+
+
 class TestLogger(unittest.TestCase):
     """
     Test suite for the logger module.
@@ -26,7 +34,8 @@ class TestLogger(unittest.TestCase):
         - Checks that the log level is set to INFO.
         - Verifies that the handler is a StreamHandler.
         """
-        logger = configure_console_logger()
+        logger_config = DummyLoggerConfig()
+        logger = configure_console_logger(logger_config)
 
         self.assertTrue(logger.hasHandlers())
         self.assertEqual(logger.level, logging.INFO)