vantiqservicesdk 0.4.1__tar.gz → 0.4.2__tar.gz

{vantiqservicesdk-0.4.1/src/main/python/vantiqservicesdk.egg-info → vantiqservicesdk-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vantiqservicesdk
-Version: 0.4.1
+Version: 0.4.2
 Summary: SDK for building Vantiq service connectors in Python
 Author-email: Vantiq <sfitts@vantiq.com>
 License: MIT

{vantiqservicesdk-0.4.1 → vantiqservicesdk-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vantiqservicesdk"
-version = "0.4.1"
+version = "0.4.2"
 description = "SDK for building Vantiq service connectors in Python"
 authors = [
     { name = "Vantiq", email = "sfitts@vantiq.com" },

{vantiqservicesdk-0.4.1 → vantiqservicesdk-0.4.2/src/main/python/vantiqservicesdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vantiqservicesdk
-Version: 0.4.1
+Version: 0.4.2
 Summary: SDK for building Vantiq service connectors in Python
 Author-email: Vantiq <sfitts@vantiq.com>
 License: MIT

{vantiqservicesdk-0.4.1 → vantiqservicesdk-0.4.2}/src/main/python/vantiqservicesdk.py

@@ -10,7 +10,7 @@ from contextlib import asynccontextmanager
 from enum import Enum
 from os.path import exists
 from threading import Thread
-from typing import Union, Any, Set, TypeVar, List, Callable, Iterable, Optional
+from typing import Union, Any, Set, TypeVar, List, Callable, Iterable
 
 import yaml
 from fastapi import FastAPI, APIRouter, WebSocket, WebSocketDisconnect
@@ -73,7 +73,7 @@ class BaseVantiqServiceConnector:
         cur_class = self.__class__
         self._logger = logging.getLogger(f"{cur_class.__module__}.{cur_class.__name__}")
 
-    # noinspection PyUnusedLocal,unused-parameter
+    # noinspection PyUnusedLocal
     @asynccontextmanager
     async def __lifespan(self, app):
         await self._startup()
@@ -98,8 +98,6 @@ class BaseVantiqServiceConnector:
         async with self._config_set:
             if self._client_config is None:
                 await self._config_set.wait()
-            if self._client_config is None:
-                raise RuntimeError('Client config not set')
             return self._client_config
 
     async def _set_client_config(self, config: dict) -> bool:
@@ -182,8 +180,7 @@ class BaseVantiqServiceConnector:
                         task.add_done_callback(__complete_request)
 
             except WebSocketDisconnect:
-                # Clear the config in case it changes before the next connection
-                await self._clear_client_config()
+                pass
 
             finally:
                 # Cancel all active requests
@@ -195,11 +192,11 @@ class BaseVantiqServiceConnector:
         # Get the procedure name and parameters
         self._logger.debug('Request was: %s', request)
         procedure_name: str = request.get("procName", "unknown")
-        params = request.get("params", {})
+        params = request.get("params")
 
         # In the future, it should be set by an explicit value isSystemRequest. For compatibility reasons, we
         # must accept appending "__system" to the requestId as equivalent
-        is_system_request = request.get("isSystemRequest", False) or request.get("requestId", "").endswith("__system")
+        is_system_request = request.get("isSystemRequest", False) or request.get("requestId").endswith("__system")
 
         # Invoke the procedure and store the result
         request_timer = self.__get_resource_metric(self._resources_executions, procedure_name)
@@ -259,7 +256,7 @@ class BaseVantiqServiceConnector:
         # Send the response
         await websocket.send({"type": "websocket.send", "bytes": encoded_response})
 
-    def _handle_exception(self, e: Exception, request: dict, response: Optional[dict]) -> bytes:
+    def _handle_exception(self, e: Exception, request: dict, response: dict) -> bytes:
         # Log and record error
         procedure_name = request.get("procName", "unknown")
         self._logger.debug(f"Error invoking procedure {procedure_name}", exc_info=e)
@@ -376,7 +373,7 @@ class LoggerConfig:
     """
     DEFAULT_MONITORING_INTERVAL = 2 * 60
 
-    def __init__(self, config_files: Optional[List[str]] = None, monitor_interval: Optional[int] = None):
+    def __init__(self, config_files: List[str] = None, monitor_interval: int = None):
         self._logger = logging.getLogger(__name__)
         self._config_files = config_files or []
         self._config_files.append('logger.yaml')