isolate 0.14.2__tar.gz → 0.15.0__tar.gz

{isolate-0.14.2 → isolate-0.15.0}/.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false
 
       matrix:
         os: [ubuntu-latest]

{isolate-0.14.2 → isolate-0.15.0}/.pre-commit-config.yaml

@@ -3,7 +3,10 @@ repos:
   rev: 'v0.3.4'
   hooks:
   - id: ruff
-    args: [--fix, --exit-non-zero-on-fix]
+    args:
+    - --fix
+    - --exit-non-zero-on-fix
+    - --exclude=UP007
     exclude: ".*(_pb2.py|_pb2.pyi|_pb2_grpc.py)$"
   - id: ruff-format
     exclude: ".*(_pb2.py|_pb2.pyi|_pb2_grpc.py)$"

{isolate-0.14.2 → isolate-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.14.2
+Version: 0.15.0
 Summary: Managed isolated environments for Python
 Author-email: Features & Labels <hello@fal.ai>
 Project-URL: Issues, https://github.com/fal-ai/isolate/issues

{isolate-0.14.2 → isolate-0.15.0}/pyproject.toml

@@ -67,5 +67,9 @@ dev = [
 target-version = "py38"
 exclude = ["*_pb2.py", "*_pb2.pyi", "*_pb2_grpc.py"]
 
+[tool.ruff.lint.pyupgrade]
+# Preserve types, even if a file imports `from __future__ import annotations`.
+keep-runtime-typing = true
+
 [tool.ruff.lint]
 select = ["E", "F", "W", "PLC", "PLE", "PLW", "I", "UP"]

{isolate-0.14.2 → isolate-0.15.0}/src/isolate/_isolate_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.14.2'
-__version_tuple__ = version_tuple = (0, 14, 2)
+__version__ = version = '0.15.0'
+__version_tuple__ = version_tuple = (0, 15, 0)

{isolate-0.14.2 → isolate-0.15.0}/src/isolate/backends/settings.py

@@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, Callable, Iterator
 from platformdirs import user_cache_dir
 
 from isolate.backends.common import lock_build_path
-from isolate.logs import Log
+from isolate.logs import Log, LogLevel, LogSource
 
 if TYPE_CHECKING:
     from isolate.backends import BaseEnvironment
@@ -28,7 +28,37 @@ class IsolateSettings:
     strict_cache: bool = _STRICT_CACHE
 
     def log(self, log: Log) -> None:
-        self.log_hook(log)
+        self.log_hook(self._infer_log_level(log))
+
+    def _infer_log_level(self, log: Log) -> Log:
+        """Infer the log level if it's correctly set."""
+        if log.level not in (LogLevel.STDOUT, LogLevel.STDERR):
+            # We should only infer the log level for stdout/stderr logs.
+            return log
+
+        if log.source in (LogSource.BUILDER, LogSource.BRIDGE):
+            return replace(log, level=LogLevel.TRACE)
+
+        line = log.message.lower()
+
+        if "[error]" in line:
+            return replace(log, level=LogLevel.ERROR)
+        if "[warning]" in line:
+            return replace(log, level=LogLevel.WARNING)
+        if "[warn]" in line:
+            return replace(log, level=LogLevel.WARNING)
+        if "[info]" in line:
+            return replace(log, level=LogLevel.INFO)
+        if "[debug]" in line:
+            return replace(log, level=LogLevel.DEBUG)
+        if "[trace]" in line:
+            return replace(log, level=LogLevel.TRACE)
+
+        if log.level == LogLevel.STDERR:
+            return replace(log, level=LogLevel.ERROR)
+
+        # Default to INFO level
+        return replace(log, level=LogLevel.INFO)
 
     def _get_temp_base(self) -> Path:
         """Return the base path for creating temporary files/directories.

{isolate-0.14.2 → isolate-0.15.0}/src/isolate/connections/_local/_base.py

@@ -173,7 +173,9 @@ class PythonExecutionBase(Generic[ConnectionType]):
         """Return the command to run the agent process with."""
         raise NotImplementedError
 
-    def handle_agent_log(self, line: str, level: LogLevel, source: LogSource) -> None:
+    def handle_agent_log(
+        self, line: str, *, level: LogLevel, source: LogSource
+    ) -> None:
         """Handle a log line emitted by the agent process. The level will be either
         STDOUT or STDERR."""
         raise NotImplementedError

{isolate-0.14.2 → isolate-0.15.0}/src/isolate/connections/grpc/_base.py

@@ -147,5 +147,7 @@ class LocalPythonGRPC(PythonExecutionBase[str], GRPCExecutionBase):
             str(log_fd),
         ]
 
-    def handle_agent_log(self, line: str, level: LogLevel, source: LogSource) -> None:
+    def handle_agent_log(
+        self, line: str, *, level: LogLevel, source: LogSource
+    ) -> None:
         self.log(line, level=level, source=source)

{isolate-0.14.2 → isolate-0.15.0}/src/isolate/connections/ipc/_base.py

@@ -219,5 +219,7 @@ class PythonIPC(PythonExecutionBase[AgentListener], IsolatedProcessConnection):
             str(log_fd),
         ]
 
-    def handle_agent_log(self, line: str, level: LogLevel, source: LogSource) -> None:
+    def handle_agent_log(
+        self, line: str, *, level: LogLevel, source: LogSource
+    ) -> None:
         self.log(line, level=level, source=source)

{isolate-0.14.2 → isolate-0.15.0}/src/isolate/logger.py

@@ -1,5 +1,6 @@
 import json
 import os
+from datetime import datetime, timezone
 from typing import Dict
 
 from isolate.logs import LogLevel, LogSource
@@ -16,6 +17,9 @@ class IsolateLogger:
 
     def log(self, level: LogLevel, message: str, source: LogSource) -> None:
         record = {
+            # Set the timestamp from source so we can be sure no buffering or
+            # latency is affecting the timestamp.
+            "logged_at": datetime.now(tz=timezone.utc).isoformat(),
             "isolate_source": source.name,
             "level": level.name,
             "message": message,

{isolate-0.14.2 → isolate-0.15.0}/src/isolate.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isolate
-Version: 0.14.2
+Version: 0.15.0
 Summary: Managed isolated environments for Python
 Author-email: Features & Labels <hello@fal.ai>
 Project-URL: Issues, https://github.com/fal-ai/isolate/issues

{isolate-0.14.2 → isolate-0.15.0}/tests/test_backends.py

@@ -16,6 +16,7 @@ from isolate.backends.pyenv import PyenvEnvironment, _get_pyenv_executable
 from isolate.backends.remote import IsolateServer
 from isolate.backends.settings import IsolateSettings
 from isolate.backends.virtualenv import VirtualPythonEnvironment
+from isolate.logs import LogLevel, LogSource
 
 
 class GenericEnvironmentTests:
@@ -660,6 +661,46 @@ def test_isolate_server_logs(isolate_server):
     assert "hello!!!" in [log.message for log in collected_logs]
 
 
+def test_isolate_server_logs_level_inference(isolate_server):
+    collected_logs = []
+    environment = IsolateServer(
+        host=isolate_server,
+        target_environments=[
+            {
+                "kind": "virtualenv",
+                "configuration": {"requirements": ["pyjokes==0.5.0"]},
+            }
+        ],
+    )
+
+    environment.apply_settings(IsolateSettings(log_hook=collected_logs.append))
+
+    with environment.connect() as connection:
+        connection.run(
+            partial(
+                eval,
+                "print('[debug] hello!!!') or "
+                "print('[error] bad!!!') or "
+                "print('[trace] hide!!!') or "
+                "print('[warning] warn1!!!') or "
+                "print('warn2!!! [warn]') or "
+                "print('default') or "
+                "__import__('time').sleep(0.5)",
+            )
+        )
+
+    user_logs = [log for log in collected_logs if log.source == LogSource.USER]
+    assert len(user_logs) == 6
+    assert [log.level for log in user_logs] == [
+        LogLevel.DEBUG,
+        LogLevel.ERROR,
+        LogLevel.TRACE,
+        LogLevel.WARNING,
+        LogLevel.WARNING,
+        LogLevel.INFO,
+    ]
+
+
 def test_isolate_server_demo(isolate_server):
     from functools import partial
 

{isolate-0.14.2 → isolate-0.15.0}/tests/test_server.py

@@ -252,6 +252,7 @@ def test_user_logs_immediate(stub: definitions.IsolateStub, monkeypatch: Any) ->
                 import sys, pyjokes
                 print(pyjokes.__version__)
                 print("error error!", file=sys.stderr)
+                print("[debug] error!", file=sys.stderr)
                 """
                 ),
             ),
@@ -263,11 +264,12 @@ def test_user_logs_immediate(stub: definitions.IsolateStub, monkeypatch: Any) ->
     user_logs: List[Log] = []
     run_request(stub, request, user_logs=user_logs)
 
-    assert len(user_logs) == 2
+    assert len(user_logs) == 3
 
     by_stream = {log.level: log.message for log in user_logs}
-    assert by_stream[LogLevel.STDOUT] == "0.6.0"
-    assert by_stream[LogLevel.STDERR] == "error error!"
+    assert by_stream[LogLevel.INFO] == "0.6.0"
+    assert by_stream[LogLevel.ERROR] == "error error!"
+    assert by_stream[LogLevel.DEBUG] == "[debug] error!"
 
 
 def test_unknown_environment(stub: definitions.IsolateStub, monkeypatch: Any) -> None: