bedger 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

bedger/edge/connection.py

@@ -1,123 +1,65 @@
 from __future__ import annotations
 
-import logging
+import json
 import socket
-from typing import Optional
+from .config import Config
+from . import entities
+import logging
 
-from bedger.edge import errors
-from bedger.edge.config import Config
-from bedger.edge.entities import Message, Severity
 
 logger = logging.getLogger("bedger.edge.connection")
 
 
-class ConnectionManager:
-    """Manages a connection to a UNIX socket for sending and receiving messages.
-
-    This class provides context manager support for establishing and tearing
-    down a connection to a UNIX socket.
-
-    Attributes:
-        _config (Config): The configuration containing the socket path.
-        _socket (Optional[socket.socket]): The current socket connection.
-    """
-
+class BedgerConnection:
     def __init__(self, config: Config = Config()):
-        """Initializes the ConnectionManager.
-
-        Args:
-            config (Config): Configuration for the connection. Defaults to a new `Config` instance.
-        """
         self._config = config
-        self._socket: Optional[socket.socket] = None
 
-    def __enter__(self) -> ConnectionManager:
-        """Establishes the socket connection when entering the context.
+        self._socket = None
 
-        Returns:
-            ConnectionManager: The instance of the ConnectionManager.
-        """
+    def __enter__(self) -> BedgerConnection:
         self._connect()
         return self
 
-    def __exit__(self, exc_type, exc_value, traceback) -> None:
-        """Closes the socket connection when exiting the context."""
-        self._disconnect()
-
     def _connect(self) -> None:
-        """Establish a connection to the UNIX socket.
-
-        Raises:
-            errors.SocketPermissionDeniedError: If the application does not have permission to connect to the socket.
-            errors.SocketFileNotFoundError: If the socket file is not found at the specified path.
-            errors.SocketConnectionError: If any other error occurs during the connection attempt.
-        """
-        logger.info(f"Attempting to connect to socket at {self._config.socket_path}")
+        logger.info(f"Connecting to socket at {self._config.socket_path}")
         try:
             self._socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
             self._socket.connect(self._config.socket_path)
-            logger.info("Successfully connected to the socket")
-        except PermissionError:
-            logger.error("Permission denied: Unable to connect to the socket. Ensure you have the correct permissions.")
-            raise errors.SocketPermissionDeniedError("Permission denied to connect to socket. Are you running as root?")
-        except FileNotFoundError:
-            logger.error("Socket file not found. Verify the server is running and the socket path is correct.")
-            raise errors.SocketFileNotFoundError("Socket file not found. Is the server running?")
+            logger.info("Connected to socket")
         except Exception as e:
-            logger.exception(f"Unexpected error while connecting to the socket: {e}")
-            raise errors.SocketConnectionError(f"An unexpected error occurred while connecting to the socket: {e}")
-
-    def _disconnect(self) -> None:
-        """Close the socket connection gracefully.
-
-        Ensures the socket is closed and cleaned up properly, even in case of errors.
-        """
-        if self._socket:
-            try:
-                logger.info("Closing the socket connection")
-                self._socket.close()
-            except Exception as e:
-                logger.warning(f"Error occurred while closing the socket: {e}")
-            finally:
-                self._socket = None
-
-    def send_event(self, event_type: str, severity: str | Severity, payload: dict) -> None:
-        """Send an event message through the socket.
-
-        Args:
-            event_type (str): The type of event being sent.
-            severity (str | Severity): The severity level of the event.
-            payload (dict): The event's payload details.
-
-        Raises:
-            errors.SocketNotConnectedError: If no active socket connection exists.
-            errors.SocketBrokenPipeError: If the socket connection is lost during message transmission.
-            errors.SocketCommunicationError: If any error occurs during socket communication.
-        """
-        if not self._socket:
-            logger.error("Attempted to send a message without an active socket connection.")
-            raise errors.SocketNotConnectedError("No active socket connection. Ensure the connection is established.")
+            logger.error(f"Error connecting to socket: {e}")
+            raise e
 
-        try:
-            message = Message(
-                event_type=event_type,
-                severity=severity,
-                details=payload,
-            )
-            message_json = message.model_dump_json()
-            logger.debug(f"Prepared message: {message_json}")
+    def __exit__(self, exc_type, exc_value, traceback) -> None:
+        self._socket.close()
+
+    def send_event(self, event_type, severity, payload):
+        message = entities.Message(
+            event_type=event_type,
+            severity=severity,
+            details=payload,
+        )
 
+        try:
             logger.debug("Sending message")
-            self._socket.sendall(message_json.encode())
+            self._socket.sendall(json.dumps(message).encode())
 
             ack = self._socket.recv(1024)
-            logger.info(f"Received acknowledgment from server: {ack.decode()}")
-        except BrokenPipeError:
-            logger.error("Broken pipe error: The socket connection was lost during message transmission.")
-            raise errors.SocketBrokenPipeError("Socket connection lost. Unable to send message.")
-        except socket.error as e:
-            logger.error(f"Socket error occurred: {e}")
-            raise errors.SocketCommunicationError(f"Socket error during communication: {e}")
+            logger.info(f"Received acknowledgment: {ack.decode()}")
         except Exception as e:
-            logger.exception(f"Unexpected error while sending the message: {e}")
-            raise errors.SocketCommunicationError(f"Unexpected error occurred: {e}")
+            logger.error(f"Error sending message: {e}")
+            raise e
+
+
+# Example usage
+if __name__ == "__main__":
+    import time
+
+    connection = BedgerConnection()
+
+    with connection:
+        for i in range(5):
+            connection.send_event(
+                event_type="TestEvent", severity=entities.Severity.INFO, payload={"message": f"Test message {i}"}
+            )
+            time.sleep(1)

bedger/edge/entities/__init__.py

@@ -1,4 +1,5 @@
 from .message import Message
 from .severity import Severity
 
-__all__ = [Message, Severity]
+
+__all__ = [Message, Severity]

bedger/edge/entities/message.py

@@ -1,10 +1,7 @@
-import json
-from typing import Dict
-
-from pydantic import BaseModel, Field, field_serializer, field_validator
-from typing_extensions import Annotated
-
+from typing import Dict, Annotated
+from pydantic import BaseModel, Field, field_validator, field_serializer
 from .severity import Severity
+import json
 
 
 class Message(BaseModel):

bedger/edge/errors.py

@@ -1,18 +0,0 @@
-class SocketPermissionDeniedError(Exception):
-    pass
-
-
-class SocketFileNotFoundError(Exception):
-    pass
-
-
-class SocketConnectionError(Exception):
-    pass
-
-
-class SocketNotConnectedError(Exception):
-    pass
-
-
-class SocketCommunicationError(Exception):
-    pass

bedger-0.0.6.dist-info/METADATA

@@ -0,0 +1,14 @@
+Metadata-Version: 2.1
+Name: bedger
+Version: 0.0.6
+Summary: 
+Author: Henk van den Brink
+Requires-Python: >=3.8.1,<4.0.0
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Description-Content-Type: text/markdown
+
+

bedger-0.0.6.dist-info/RECORD

@@ -0,0 +1,12 @@
+bedger/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bedger/edge/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bedger/edge/config.py,sha256=0fUKThP0aJFk3WBF7JUtuKKhXlV07SX5VnqVOLNou-A,152
+bedger/edge/connection.py,sha256=j5ICwK-kxsOUK-_HvWEF9iDYafoLfX3U01TNAnwj_dI,1792
+bedger/edge/entities/__init__.py,sha256=8pu4RyMB-VfEPLiZPfLkS4j5p4cmHwFTsryYoBlb03k,91
+bedger/edge/entities/message.py,sha256=VWJSadZe510Rggu7b1M8_E1qFzmcKatSwHN-SZgXYVg,882
+bedger/edge/entities/severity.py,sha256=tUN7eDSEN5cc5eAqhvKzVHD1pSEmrdwvNEGsmh4Pnfw,157
+bedger/edge/errors.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bedger-0.0.6.dist-info/LICENSE,sha256=lVrf6pfElYZ_o6ETq-XR91_7GHTzKGyeNWAKghvcNUE,1075
+bedger-0.0.6.dist-info/METADATA,sha256=kbJkOoIQSrf0HkK8SH-iPpIG5ZlGAz-cgrnVF9INKHM,412
+bedger-0.0.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+bedger-0.0.6.dist-info/RECORD,,

{bedger-0.0.4.dist-info → bedger-0.0.6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any

bedger-0.0.4.dist-info/METADATA

@@ -1,105 +0,0 @@
-Metadata-Version: 2.1
-Name: bedger
-Version: 0.0.4
-Summary: Edge monitoring software for secure and efficient device management.
-Author: Henk van den Brink
-Author-email: henk.vandenbrink@bedger.io
-Requires-Python: >=3.8.1,<4.0.0
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: pydantic (>=2.9.2,<3.0.0)
-Requires-Dist: typing-extensions (>=4.12.2,<5.0.0)
-Project-URL: homepage, https://github.com/bedger-io/BEDGER-edgeservices-securitymonitoring-sdk
-Project-URL: issues, https://github.com/bedger-io/BEDGER-edgeservices-securitymonitoring-sdk/issues
-Description-Content-Type: text/markdown
-
-# ConnectionManager Class Documentation
-
-The `ConnectionManager` class manages connections to a UNIX socket for sending and receiving messages.
-It provides context management capabilities to ensure connections are properly opened and closed.
-
-## Features
-- Context manager support for connection lifecycle management.
-- Error handling for socket-related issues.
-- Sends event messages with acknowledgment handling.
-
-## Installation
-Ensure you have the `bedger` package and its dependencies installed.
-
-```bash
-pip install bedger
-```
-
-## Usage
-The following example demonstrates how to use the `ConnectionManager` to send events:
-
-```python
-import time
-import bedger.edge.config as config
-import bedger.edge.connection as connection
-import bedger.edge.entities as entities
-
-if __name__ == "__main__":
-    events = [
-        {"event_type": "EventA", "severity": entities.Severity.HIGH, "payload": {"key": "value1"}},
-        {"event_type": "EventB", "severity": entities.Severity.LOW, "payload": {"key": "value2"}},
-        {"event_type": "EventC", "severity": entities.Severity.CRITICAL, "payload": {"key": "value3"}},
-    ]
-
-    with connection.ConnectionManager(config.Config()) as conn:
-        for event in events:
-            time.sleep(1)
-            conn.send_event(event["event_type"], event["severity"], event["payload"])
-```
-
-## API Reference
-
-### `ConnectionManager`
-Manages a connection to a UNIX socket for sending and receiving messages.
-
-#### Constructor
-- **`__init__(config: Config = Config())`**
-  - Initializes the `ConnectionManager` with a specified configuration.
-  - **Parameters:**
-    - `config (Config)`: The configuration containing the socket path. Defaults to a new `Config` instance.
-
-#### Context Management
-- **`__enter__() -> ConnectionManager`**
-  - Establishes the socket connection when entering the context.
-  - **Returns:** The instance of the `ConnectionManager`.
-
-- **`__exit__(exc_type, exc_value, traceback) -> None`**
-  - Closes the socket connection when exiting the context.
-
-#### Methods
-- **`send_event(event_type: str, severity: str | Severity, payload: dict) -> None`**
-  - Sends an event message through the socket.
-  - **Parameters:**
-    - `event_type (str)`: The type of event being sent.
-    - `severity (str | Severity)`: The severity level of the event.
-    - `payload (dict)`: The event's payload details.
-  - **Raises:**
-    - `SocketNotConnectedError`: If no active socket connection exists.
-    - `SocketBrokenPipeError`: If the socket connection is lost during transmission.
-    - `SocketCommunicationError`: If an error occurs during socket communication.
-
-## Error Handling
-The `ConnectionManager` raises custom errors from the `bedger.edge.errors` module for:
-- Permission issues (`SocketPermissionDeniedError`).
-- Missing socket files (`SocketFileNotFoundError`).
-- Connection problems (`SocketConnectionError`).
-- Communication errors (`SocketCommunicationError`, `SocketBrokenPipeError`).
-
-## Logging
-The class uses the `logging` module to log the following:
-- Connection attempts and successes.
-- Errors during connection, disconnection, and message sending.
-- Debug information for message preparation and acknowledgments.
-
-## License
-This project is licensed under the MIT License. See the LICENSE file for details.
-

bedger-0.0.4.dist-info/RECORD

@@ -1,12 +0,0 @@
-bedger/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bedger/edge/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bedger/edge/config.py,sha256=0fUKThP0aJFk3WBF7JUtuKKhXlV07SX5VnqVOLNou-A,152
-bedger/edge/connection.py,sha256=25h7PzRhSw8m0w679p23M6X_o-wuIOl7M1P837bpy9I,5400
-bedger/edge/entities/__init__.py,sha256=_oKO_XdDerqOwVX8izhDPtGv4HqVDwQaT-otOdY8lYg,91
-bedger/edge/entities/message.py,sha256=wLbEZik_FBboyEAvX5Uvlto1t4BsjaeLXUFGOIjIHRU,913
-bedger/edge/entities/severity.py,sha256=tUN7eDSEN5cc5eAqhvKzVHD1pSEmrdwvNEGsmh4Pnfw,157
-bedger/edge/errors.py,sha256=6jdmhlKoWlD-kZ8-xRiAlObRHEo9PwrKqhWQ5su5TLk,266
-bedger-0.0.4.dist-info/LICENSE,sha256=lVrf6pfElYZ_o6ETq-XR91_7GHTzKGyeNWAKghvcNUE,1075
-bedger-0.0.4.dist-info/METADATA,sha256=4-TQzz5tqRT_YWfbDh3Zo7BK8vR-bRzcCtvFb2mgHt4,4144
-bedger-0.0.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-bedger-0.0.4.dist-info/RECORD,,