SIENTIAPDE-1205
Refactor Ingestor and OPC Manager for Asynchronous Operations - Updated main function to be asynchronous and integrated asyncio for better concurrency. - Refactored Ingestor methods to support async operations, including prepare_ingestor, loop, and shutdown. - Enhanced IngestorManager and OpcManager with async methods for improved performance and responsiveness. - Replaced blocking calls with await statements to ensure non-blocking behavior during operations. - Added a new run_async_main function to handle the async event loop setup.
This commit is contained in:
vitor-aignosi
@@ -1,7 +1,8 @@
|
||||
import json
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
from asyncua.crypto.security_policies import SecurityPolicyBasic256
|
||||
from asyncua.sync import Client
|
||||
from asyncua import Client
|
||||
from sientia_do.notifications.models import NotificationLevel
|
||||
from sientia_do.notifications.handlers import CoreNotificationHandler as NotificationHandler
|
||||
from sientia_do.temporal.activities.base import BaseActivity
|
||||
@@ -42,7 +43,18 @@ class OpcManager(BaseActivity):
|
||||
return f"OpcManager(name={self.name}, url={self.url}, server_uri={self.server_uri})\n" \
|
||||
f"nodes={self.nodes}, subscriptions={self.subscriptions}"
|
||||
|
||||
def set_security(self):
|
||||
async def shutdown(self):
|
||||
"""Comprehensive cleanup method"""
|
||||
try:
|
||||
|
||||
await self.disconnect()
|
||||
except Exception as e:
|
||||
self.logger.error(f"Error during cleanup: {e}")
|
||||
|
||||
def __del__(self):
|
||||
asyncio.run(self.shutdown())
|
||||
|
||||
async def set_security(self):
|
||||
"""
|
||||
Configures the security settings for the OPC UA client.
|
||||
This method sets up the security policy, certificates, and timeouts
|
||||
@@ -70,18 +82,18 @@ class OpcManager(BaseActivity):
|
||||
server_cert = Path(
|
||||
self.server_cert_path) if self.server_cert_path else None
|
||||
|
||||
self.client.application_uri = self.server_uri
|
||||
await self.client.set_application_uri(self.server_uri)
|
||||
self.logger.info('Setting security...')
|
||||
self.client.set_security(
|
||||
await self.client.set_security(
|
||||
SecurityPolicyBasic256,
|
||||
certificate=str(cert),
|
||||
private_key=str(private_key),
|
||||
server_certificate=str(server_cert)
|
||||
)
|
||||
self.client.secure_channel_timeout = 10000000
|
||||
self.client.session_timeout = 10000000
|
||||
await self.client.set_secure_channel_timeout(10000000)
|
||||
await self.client.set_session_timeout(10000000)
|
||||
|
||||
def connect(self):
|
||||
async def connect(self):
|
||||
"""
|
||||
Establishes a connection to the OPC server.
|
||||
This method initializes the OPC client using the provided URL and
|
||||
@@ -96,9 +108,9 @@ class OpcManager(BaseActivity):
|
||||
try:
|
||||
self.client = Client(self.url)
|
||||
if self.cert_path:
|
||||
self.set_security()
|
||||
await self.set_security()
|
||||
self.logger.info(f'Starting connection to {self.name}...')
|
||||
self.client.connect()
|
||||
await self.client.connect()
|
||||
metrics.OPC_CONNECTION_STATUS.labels(
|
||||
pod_id=self.pod_id, server_name=self.name, server_url=self.url).set(1)
|
||||
self.logger.info(f'Connection to {self.name} successful.')
|
||||
@@ -110,7 +122,7 @@ class OpcManager(BaseActivity):
|
||||
self.logger.error(f"Failed to connect to {self.name}: {e}")
|
||||
raise
|
||||
|
||||
def create_subscription(self, name: str, period: int = 500):
|
||||
async def create_subscription(self, name: str, period: int = 500):
|
||||
"""
|
||||
Creates a subscription with the specified monitoring period.
|
||||
This method establishes a subscription to monitor data changes or events
|
||||
@@ -129,7 +141,7 @@ class OpcManager(BaseActivity):
|
||||
raise ValueError("Client not connected. Call connect first.")
|
||||
try:
|
||||
p = period if period is not None else 500
|
||||
self.subscriptions[name] = self.client.create_subscription(p, self)
|
||||
self.subscriptions[name] = await self.client.create_subscription(p, self)
|
||||
self.logger.info(f'Subscription {name} created on {self.name}.')
|
||||
metrics.OPC_SUBSCRIPTIONS_CREATED.labels(
|
||||
pod_id=self.pod_id, server_name=self.name, slot_name=name).inc()
|
||||
@@ -138,7 +150,7 @@ class OpcManager(BaseActivity):
|
||||
f"Failed to create subscription {name} on {self.name}: {e}")
|
||||
raise
|
||||
|
||||
def subscribe(self, subscription: str, nodes: dict, collect_period: int):
|
||||
async def subscribe(self, subscription: str, nodes: dict, collect_period: int):
|
||||
"""
|
||||
Subscribes to a set of OPC UA nodes for data change notifications.
|
||||
This method adds the specified nodes to the subscription and configures
|
||||
@@ -161,8 +173,7 @@ class OpcManager(BaseActivity):
|
||||
|
||||
self.logger.info(f"Subscribing to {subscription} on {self.name}...")
|
||||
self.logger.info(f"Subscribing to nodes: {nodes}")
|
||||
addr_nodes = [self.client.get_node(
|
||||
n) for n in nodes]
|
||||
addr_nodes = [self.client.get_node(n) for n in nodes]
|
||||
self.logger.debug(f"Addr nodes: {addr_nodes}")
|
||||
self.nodes.update(nodes)
|
||||
self.logger.debug(f"Nodes: {self.nodes}")
|
||||
@@ -176,9 +187,9 @@ class OpcManager(BaseActivity):
|
||||
'cycle_count': 0
|
||||
}
|
||||
|
||||
self.subscriptions[subscription].subscribe_data_change(addr_nodes)
|
||||
await self.subscriptions[subscription].subscribe_data_change(addr_nodes)
|
||||
|
||||
def unsubscribe(self, subscription: str):
|
||||
async def unsubscribe(self, subscription: str):
|
||||
"""
|
||||
Unsubscribes from a given subscription.
|
||||
Args:
|
||||
@@ -196,14 +207,11 @@ class OpcManager(BaseActivity):
|
||||
self.logger.warning(
|
||||
f"Subscription '{subscription}' not found. Cannot unsubscribe.")
|
||||
return
|
||||
self.subscriptions[subscription].delete()
|
||||
await self.subscriptions[subscription].delete()
|
||||
del self.subscriptions[subscription]
|
||||
self.logger.info(f"Unsubscribed from {subscription}.")
|
||||
|
||||
def __del__(self):
|
||||
self.disconnect()
|
||||
|
||||
def disconnect(self):
|
||||
async def disconnect(self):
|
||||
"""
|
||||
Disconnects from the OPC UA server.
|
||||
This method handles the disconnection process by deleting the subscription
|
||||
@@ -219,14 +227,14 @@ class OpcManager(BaseActivity):
|
||||
self.logger.warning("Client already disconnected.")
|
||||
return
|
||||
try:
|
||||
_a = [self.subscriptions[sub].delete()
|
||||
for sub in self.subscriptions]
|
||||
for sub in self.subscriptions:
|
||||
await self.subscriptions[sub].delete()
|
||||
self.logger.warning("Deleted all subscriptions.")
|
||||
except Exception as sub_error:
|
||||
self.logger.error(f"Failed to clean up subscription: {sub_error}")
|
||||
|
||||
try:
|
||||
self.client.disconnect()
|
||||
await self.client.disconnect()
|
||||
except Exception as conn_error:
|
||||
self.logger.error(
|
||||
f"Failed to disconnect from OPC UA server: {conn_error}")
|
||||
@@ -239,7 +247,7 @@ class OpcManager(BaseActivity):
|
||||
pod_id=self.pod_id, server_name=self.name).set(0)
|
||||
self.logger.warning("Disconnected from OPC UA server.")
|
||||
|
||||
def datachange_notification(self, node, _val, data):
|
||||
async def datachange_notification(self, node, _val, data):
|
||||
"""
|
||||
Handles data change notifications for monitored OPC UA nodes.
|
||||
This method is triggered when a monitored node's value changes. It processes
|
||||
|
||||
Reference in New Issue
Block a user