WIP Windows #89

panther/__init__.py

@@ -1,6 +1,6 @@
 from panther.main import Panther  # noqa: F401
 
-__version__ = '4.1.1'
+__version__ = '4.1.2'
 
 
 def version():

panther/_utils.py

@@ -82,7 +82,7 @@ def clean_traceback_message(exception: Exception) -> str:
     tb = TracebackException(type(exception), exception, exception.__traceback__)
     stack = tb.stack.copy()
     for t in stack:
-        if t.filename.find('site-packages/panther') != -1:
+        if t.filename.find('site-packages/panther') != -1 or t.filename.find('site-packages\\panther') != -1:
             tb.stack.remove(t)
     _traceback = list(tb.format(chain=False))
     return exception if len(_traceback) == 1 else f'{exception}\n' + ''.join(_traceback)

panther/base_websocket.py

@@ -52,8 +52,11 @@ async def __call__(self):
             queue = self.pubsub.subscribe()
             logger.info("Subscribed to 'websocket_connections' queue")
             while True:
-                received_message = queue.get()
-                await self._handle_received_message(received_message=received_message)
+                try:
+                    received_message = queue.get()
+                    await self._handle_received_message(received_message=received_message)
+                except InterruptedError:
+                    break
         else:
             # We have a redis connection, so use it for pubsub
             self.pubsub = self.pubsub_connection.pubsub()

panther/cli/monitor_command.py

@@ -57,7 +57,7 @@ def initialize(self) -> str:
 
         # Check log file
         if not self.monitoring_log_file.exists():
-            return f'`{self.monitoring_log_file}` file not found. (Make sure `MONITORING` is `True` in `configs`'
+            return f'`{self.monitoring_log_file}` file not found. (Make sure `MONITORING` is `True` in `configs` and you have at least one record)'
 
         # Initialize Deque
         self.update_rows()

panther/cli/run_command.py

@@ -1,3 +1,4 @@
+import contextlib
 import os
 
 import uvicorn
@@ -75,6 +76,7 @@ def run(args: list[str]) -> None:
     command.update(_handle_commands(args))
     command.update(args)
     try:
-        uvicorn.run('main:app', **command)
+        with contextlib.suppress(KeyboardInterrupt):
+            uvicorn.run('main:app', **command)
     except TypeError as e:
         cli_error(e)

panther/db/connections.py

@@ -122,7 +122,13 @@ def __init__(
     def sync_ping(self):
         from redis import Redis
 
-        Redis(host=self.host, port=self.port, **self.kwargs).ping()
+        Redis(host=self.host, port=self.port, socket_timeout=3, **self.kwargs).ping()
+
+    async def execute_command(self, *args, **options):
+        if self.is_connected:
+            return await super().execute_command(*args, **options)
+        msg = '`REDIS` is not found in `configs`'
+        raise ValueError(msg)
 
     def create_connection_for_websocket(self) -> _Redis:
         if not hasattr(self, 'websocket_connection'):

panther/db/models.py

@@ -58,7 +58,7 @@ async def update_last_login(self) -> None:
 
     async def login(self) -> dict:
         """Return dict of access and refresh token"""
-        return config.AUTHENTICATION.login(self.id)
+        return config.AUTHENTICATION.login(str(self.id))
 
     async def logout(self) -> dict:
         return await config.AUTHENTICATION.logout(self._auth_token)

panther/logging.py

@@ -66,8 +66,8 @@ def __init__(self, filename, mode='a', encoding=None, delay=False, errors=None):
         },
         'uvicorn.error': {
             'handlers': ['default'],
-            'level': 'WARNING',
+            'level': 'INFO',
             'propagate': False,
         },
     }
-}
+}