lima2.client 4.1.2__tar.gz → 4.1.4__tar.gz

{lima2_client-4.1.2/src/lima2_client.egg-info → lima2_client-4.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lima2-client
-Version: 4.1.2
+Version: 4.1.4
 Summary: The Python client library of the Lima2 system
 Author: BCU (ESRF)
 License-Expression: MIT

{lima2_client-4.1.2 → lima2_client-4.1.4}/src/lima2/client/services.py

@@ -23,7 +23,7 @@ from lima2.common import pipelines, types
 from lima2.common.devencoded.dense_frame import Frame
 from lima2.common.devencoded.smx_sparse_frame import SmxSparseFrame
 from lima2.common.devencoded.sparse_frame import SparseFrame
-from lima2.common.exceptions import Lima2NotFound
+from lima2.common.exceptions import Lima2LookupError, Lima2NotFound
 from lima2.common.progress_counter import ProgressCounter, SingleCounter
 from lima2.common.state import RunState, State
 from lima2.common.types import FrameInfo
@@ -343,8 +343,17 @@ class Pipeline:
     def get_frame(
         self, frame_idx: int, source: str, uuid: str | UUID = "current"
     ) -> Frame | SparseFrame | SmxSparseFrame:
-        """Fetch a frame directly from a receiver device."""
-        fidx, rcv_url = self.lookup(frame_idx=frame_idx, uuid=uuid)
+        """Fetch a frame directly from a receiver device.
+
+        Raises:
+          ValueError: Invalid frame source.
+          RuntimeError: The frame isn't available.
+        """
+        try:
+            fidx, rcv_url = self.lookup(frame_idx=frame_idx, uuid=uuid)
+        except Lima2LookupError as e:
+            raise RuntimeError(f"Can't find {source} {frame_idx}: {e}") from None
+
         class_name = self.pipeline(uuid=uuid)["type"]
         try:
             pipeline_info = pipelines.by_name[class_name]

{lima2_client-4.1.2 → lima2_client-4.1.4}/src/lima2/conductor/topology.py

@@ -261,7 +261,7 @@ class LookupTable:
 
         logger.info(
             "Lookup table done building "
-            f"({(self.lut[:, 0] != LookupTable.UNKNOWN).sum()} frames)\n"
+            f"({(self.lut[:, 0] != LookupTable.UNKNOWN).sum()} frames)"
         )
 
         self.build_done.set()

{lima2_client-4.1.2 → lima2_client-4.1.4}/src/lima2/conductor/webservice/main.py

@@ -7,7 +7,7 @@
 
 This file is meant to be executed by an ASGI server for the webapp to be served, e.g.
 ```
-uvicorn lima2.conductor.main:app
+uvicorn lima2.conductor.webservice.main:app
 ```
 """
 
@@ -31,10 +31,7 @@ logger = logging.getLogger(__name__)
 log_level = utils.env_or("LIMA2_LOG_LEVEL", default="info").upper()
 log_path = Path(utils.env_or("LIMA2_LOG_PATH", default="/tmp/lima2_conductor.log"))
 
-utils.configure_logger(
-    file_path=log_path,
-    stdout_log_level=log_level,
-)
+utils.configure_logger(file_path=log_path, stdout_log_level=log_level)
 
 logger.info("Launching lima2-conductor.")
 
@@ -44,7 +41,7 @@ try:
 except RuntimeError as e:
     raise RuntimeError(
         f"{__file__} must be executed with a running event loop.\n"
-        "Try `uvicorn lima2.conductor.main:app`."
+        "Try `uvicorn lima2.conductor.webservice.main:app`."
     ) from e
 
 

{lima2_client-4.1.2 → lima2_client-4.1.4}/src/lima2/conductor/webservice/utils.py

@@ -11,6 +11,7 @@ import logging.handlers
 import os
 import sys
 from pathlib import Path
+import traceback
 from typing import Any
 
 
@@ -44,26 +45,39 @@ class ColoredFormatter(logging.Formatter):
             f"{self.FILE_LINE_COLOR}[{pathname}:{lineno}]{self.RESET} "
             f"{record.msg}"
         )
+
+        if record.exc_info:
+            # Exception log: show trace
+            if record.exc_text:
+                # Traceback provided
+                format_str += f"{record.exc_text}"
+            else:
+                exc_lines = traceback.format_exception(*record.exc_info)
+                format_str += "".join(exc_lines)
+
         if record.args:
             format_str = format_str % record.args
 
         return format_str
 
 
+stream_log_handler = logging.StreamHandler(sys.stdout)
+"""Global stream handler, allows the console log level to be changed dynamically."""
+
+
 def configure_logger(file_path: Path, stdout_log_level: str | int) -> None:
     """Configure the 'lima2' logger, from which all loggers in this package inherit.
 
     Sets up a rotating file handler in DEBUG level to write at `file_path`, and a
     stream handler to print logs above `stdout_log_level` to stdout.
     """
-    logger = logging.getLogger("lima2")
+    lima2_logger = logging.getLogger("lima2")
 
-    sh = logging.StreamHandler(sys.stdout)
     fh = logging.handlers.RotatingFileHandler(
         file_path, maxBytes=10 * 1024 * 1024, backupCount=10
     )
 
-    sh.setFormatter(
+    stream_log_handler.setFormatter(
         ColoredFormatter("%(levelname)-10s [%(pathname)s:%(lineno)d] %(message)s")
     )
     fh.setFormatter(
@@ -72,16 +86,22 @@ def configure_logger(file_path: Path, stdout_log_level: str | int) -> None:
         )
     )
 
-    sh.setLevel(stdout_log_level)
+    stream_log_handler.setLevel(stdout_log_level)
     fh.setLevel(logging.DEBUG)
-    logger.setLevel(logging.DEBUG)
 
-    logger.addHandler(sh)
-    logger.addHandler(fh)
+    # Assimilate uvicorn logs
+    uvicorn_logger = logging.getLogger("uvicorn")
+    access_logger = logging.getLogger("uvicorn.access")
+    error_logger = logging.getLogger("uvicorn.error")
+
+    # NOTE: because we assign the same handlers to "uvicorn" and "uvicorn.*" loggers,
+    # we get duplicate messages unless we disable propagation.
+    access_logger.propagate = False
+    error_logger.propagate = False
 
-    # Send HTTP server logs to file
-    logging.getLogger("uvicorn.access").addHandler(fh)
-    logging.getLogger("uvicorn.error").addHandler(fh)
+    for logger in (lima2_logger, uvicorn_logger, access_logger, error_logger):
+        logger.handlers = [stream_log_handler, fh]
+        logger.setLevel(logging.DEBUG)
 
 
 def env_or(key: str, default: Any) -> Any:

{lima2_client-4.1.2 → lima2_client-4.1.4}/src/lima2/conductor/webservice/webapp.py

@@ -27,7 +27,7 @@ from starlette.schemas import SchemaGenerator
 
 from lima2.common.exceptions import Lima2ValueError, serialize
 from lima2.conductor.acquisition_system import AcquisitionSystem
-from lima2.conductor.webservice import acquisition, detector, pipeline
+from lima2.conductor.webservice import acquisition, detector, pipeline, utils
 
 logger = logging.getLogger(__name__)
 
@@ -167,7 +167,7 @@ async def get_log_level(request: Request) -> JSONResponse:
         description: OK
     """
     lima2: AcquisitionSystem = request.state.lima2
-    level = logging.getLevelName(logging.getLogger("lima2").level).lower()
+    level = logging.getLevelName(utils.stream_log_handler.level).lower()
 
     dev_levels = {"conductor": level} | {
         dev.name: await dev.log_level() for dev in [lima2.control, *lima2.receivers]
@@ -194,10 +194,8 @@ async def set_conductor_log_level(request: Request) -> JSONResponse:
     except JSONDecodeError:
         raise Lima2ValueError("Invalid JSON payload") from None
 
-    logger = logging.getLogger("lima2")
-
     try:
-        logger.setLevel(level=level)
+        utils.stream_log_handler.setLevel(level=level)
     except ValueError as e:
         raise Lima2ValueError(e) from None
 

{lima2_client-4.1.2 → lima2_client-4.1.4/src/lima2_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lima2-client
-Version: 4.1.2
+Version: 4.1.4
 Summary: The Python client library of the Lima2 system
 Author: BCU (ESRF)
 License-Expression: MIT