streamlit-octostar-utils 0.1.7a8__tar.gz → 0.1.7a9__tar.gz

{streamlit_octostar_utils-0.1.7a8 → streamlit_octostar_utils-0.1.7a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: streamlit-octostar-utils
-Version: 0.1.7a8
+Version: 0.1.7a9
 Summary: 
 License: MIT
 Author: Octostar

{streamlit_octostar_utils-0.1.7a8 → streamlit_octostar_utils-0.1.7a9}/pyproject.toml

@@ -5,7 +5,7 @@ include = '\.pyi?$'
 
 [tool.poetry]
 name = "streamlit-octostar-utils"
-version = "0.1.7a8"
+version = "0.1.7a9"
 description = ""
 license = "MIT"
 authors = ["Octostar"]

{streamlit_octostar_utils-0.1.7a8 → streamlit_octostar_utils-0.1.7a9}/streamlit_octostar_utils/api_crafter/celery.py

@@ -493,18 +493,9 @@ class CeleryExecutor(object):
                 task_id,
             )
 
-            try:
-                await asyncio.get_running_loop().run_in_executor(
-                    self.set_thread_pool, _send_task, task_fn, task_id, options
-                )
-
-            except CeleryExecutor.QueueFullException as e:
-                if os.path.isfile(os.path.join(self.in_folder, task_id)):
-                    with RedisFileLock(self.redis_client, os.path.join(self.in_folder, task_id)):
-                        os.remove(os.path.join(self.in_folder, task_id))
-
-                logger.warning(f"Queue full exception: {str(e)}")
-                return None
+            await asyncio.get_running_loop().run_in_executor(
+                self.set_thread_pool, _send_task, task_fn, task_id, options
+            )
 
         except asyncio.CancelledError:
             logger.info(f"Cancelling task {task_id} due to disconnect!")
@@ -694,20 +685,26 @@ class CeleryErrorRoute(DefaultErrorRoute):
     DEFAULT_SILENCED_EXCEPTIONS = {CeleryExecutor.QueueFullException: lambda exc: True}
 
     def add_default_exceptions_handler(
-        fs_app,
-        debug=False,
-        excs_to_status_codes=None,
-        silenced_excs=None,
-        log_filter=None,
+            fs_app,
+            debug=False,
+            excs_to_status_codes=None,
+            silenced_excs=None,
     ):
-        if excs_to_status_codes is None:
-            excs_to_status_codes = {
-                **DefaultErrorRoute.DEFAULT_STATUS_CODE_MAPPINGS,
-                **CeleryErrorRoute.DEFAULT_STATUS_CODE_MAPPINGS,
-            }
-        if silenced_excs is None:
-            silenced_excs = {
-                **DefaultErrorRoute.DEFAULT_SILENCED_EXCEPTIONS,
-                **CeleryErrorRoute.DEFAULT_SILENCED_EXCEPTIONS,
-            }
-        DefaultErrorRoute.add_default_exceptions_handler(fs_app, debug, excs_to_status_codes)
+        extra_status = {CeleryExecutor.QueueFullException: lambda exc: 429}
+        extra_silence = {CeleryExecutor.QueueFullException: lambda exc: True}
+
+        status_codes = {
+            **DefaultErrorRoute.DEFAULT_STATUS_CODE_MAPPINGS,
+            **(excs_to_status_codes or {}),
+            **extra_status,
+        }
+
+        silenced = {
+            **DefaultErrorRoute.DEFAULT_SILENCED_EXCEPTIONS,
+            **(silenced_excs or {}),
+            **extra_silence,
+        }
+
+        super(CeleryErrorRoute, CeleryErrorRoute).add_default_exceptions_handler(
+            fs_app, debug, status_codes, silenced
+        )

{streamlit_octostar_utils-0.1.7a8 → streamlit_octostar_utils-0.1.7a9}/streamlit_octostar_utils/api_crafter/fastapi.py

@@ -241,20 +241,30 @@ class CommonModels(object):
             headers["Content-Disposition"] += f' filename="{filename}"'
             return StreamingResponse(zip_buffer, media_type="application/zip", headers=headers)
 
+
 class ErrorLogFilter(logging.Filter):
-    def __init__(self, silenced_excs: dict):
+    def __init__(self, silenced_excs: dict[type, callable]):
         super().__init__()
         self.silenced_excs = silenced_excs
-        
-    def filter(self, record):
-        exc_info = getattr(record, 'exc_info', None)
-        if exc_info:
-            if record.exc_info:
-                exc_type, exc_value, exc_tb = record.exc_info
-                if exc_value:
-                    for etype, cond in self.silenced_excs.items():
-                        if isinstance(exc_value, etype) and cond(exc_value):
-                            return False
+
+    def _silenced(self, exc_value) -> bool:
+        for etype, cond in self.silenced_excs.items():
+            if isinstance(exc_value, etype) and cond(exc_value):
+                return True
+        return False
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        if record.exc_info:
+            exc_type, exc_value, _ = record.exc_info
+            if self._silenced(exc_value):
+                return False
+
+        msg = record.getMessage()
+        for etype in self.silenced_excs:
+            if etype.__name__ in msg:
+                if self.silenced_excs[etype](None):
+                    return False
+
         return True
 
 
@@ -334,10 +344,10 @@ class DefaultErrorRoute:
         return DefaultErrorRoute.format_error(exc, body, debug, excs_to_status_codes)
 
     def add_default_exceptions_handler(
-        fs_app,
-        debug=False,
-        excs_to_status_codes=None,
-        silenced_excs=None,
+            fs_app,
+            debug=False,
+            excs_to_status_codes=None,
+            silenced_excs=None,
     ):
         if excs_to_status_codes is None:
             excs_to_status_codes = DefaultErrorRoute.DEFAULT_STATUS_CODE_MAPPINGS
@@ -351,11 +361,12 @@ class DefaultErrorRoute:
         fs_app.add_exception_handler(RequestValidationError, _async_handle_error)
         fs_app.add_exception_handler(StarletteHTTPException, _async_handle_error)
         fs_app.add_exception_handler(Exception, _async_handle_error)
-        
+
         log_filter = ErrorLogFilter(silenced_excs)
-        logging.getLogger("uvicorn.error").addFilter(log_filter)
-        logging.getLogger("uvicorn").addFilter(log_filter)
-        logging.getLogger("fastapi").addFilter(log_filter)
+        for name in ("uvicorn.error", "uvicorn.access", "fastapi", "uvicorn"):
+            logging.getLogger(name).addFilter(log_filter)
+
+        logging.getLogger().addFilter(log_filter)
 
 class RequestCancelledMiddleware:
     def __init__(self, app):