bakefile 0.0.9__py3-none-any.whl → 0.0.10__py3-none-any.whl

bake/manage/find_python.py

@@ -9,6 +9,8 @@ from bake.utils.exceptions import PythonNotFoundError
 
 logger = logging.getLogger(__name__)
 
+_NO_PROJECT_PYTHON_MSG = "No project Python found"
+
 
 def is_standalone_bakefile(bakefile_path: Path) -> bool:
     inline_metadata = read_inline(bakefile_path)
@@ -101,18 +103,33 @@ def _find_project_python(bakefile_path: Path) -> Path | None:
     # Check if stderr contains "Found `...` at `...` (...)"
     # where source is "active virtual environment" or "virtual environment"
     stderr = result.stderr.strip()
-    pattern = r"Found `[^`]+` at `[^`]+` \(([^)]+)\)"
+    pattern = r"Found `[^`]+` at `([^`]+)` \(([^)]+)\)"
     match = re.search(pattern, stderr)
 
-    if result.returncode == 0 and match:
-        source = match.group(1)
-        if source in {"active virtual environment", "virtual environment"}:
-            python_path = Path(result.stdout.strip())
-            logger.debug(f"Found project Python at {python_path} (source: {source})")
-            return python_path
+    if not (result.returncode == 0 and match):
+        logger.debug(_NO_PROJECT_PYTHON_MSG)
+        return None
 
-    logger.debug("No project Python found")
-    return None
+    source = match.group(2)
+    if source not in {"active virtual environment", "virtual environment"}:
+        logger.debug(_NO_PROJECT_PYTHON_MSG)
+        return None
+
+    python_path_from_log = Path(match.group(1))
+    python_path_from_stdout = Path(result.stdout.strip())
+    if python_path_from_log != python_path_from_stdout:
+        logger.debug(
+            "Python path mismatch between log and stdout",
+            extra={
+                "python_path_from_log": python_path_from_log,
+                "python_path_from_stdout": python_path_from_stdout,
+            },
+        )
+        logger.debug(_NO_PROJECT_PYTHON_MSG)
+        return None
+
+    logger.debug(f"Found project Python at {python_path_from_stdout} (source: {source})")
+    return python_path_from_stdout
 
 
 def _create_bakefile_venv(bakefile_path: Path) -> Path | None:

bake/ui/run/splitter.py

@@ -47,44 +47,55 @@ class OutputSplitter:
             output_list.append(data)
         return True
 
-    def _read_pty(self, pty_fd: int, target, output_list, proc: subprocess.Popen):
-        """Read from PTY file descriptor in chunks and stream to output."""
+    def _read_pty_eio_safe(self, pty_fd: int) -> bytes | None:
+        """Read from PTY, treating EIO as EOF (returns None)."""
+        try:
+            return os.read(pty_fd, 4096)
+        except OSError as e:
+            if e.errno == errno.EIO:
+                return None
+            raise
+
+    def _try_immediate_read(self, pty_fd: int, target, output_list) -> bool:
+        """Try immediate non-blocking read. Returns True if should continue."""
+        import fcntl
+
+        flags = fcntl.fcntl(pty_fd, fcntl.F_GETFL)
+        fcntl.fcntl(pty_fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
+
+        data = self._read_pty_eio_safe(pty_fd)
+        if data is None or not self._handle_data(data, target, output_list):
+            fcntl.fcntl(pty_fd, fcntl.F_SETFL, flags)
+            return False
+
+        fcntl.fcntl(pty_fd, fcntl.F_SETFL, flags)
+        return True
+
+    def _blocking_pty_read(self, pty_fd: int, target, output_list) -> bool:
+        """Try select-based blocking read. Returns True if should continue."""
         import fcntl
 
+        flags = fcntl.fcntl(pty_fd, fcntl.F_GETFL)
+        fcntl.fcntl(pty_fd, fcntl.F_SETFL, flags)
+
+        ready, _, _ = select.select([pty_fd], [], [], 0.1)
+        if ready:
+            data = self._read_pty_eio_safe(pty_fd)
+            if data is None or not self._handle_data(data, target, output_list):
+                return False
+        return True
+
+    def _read_pty(self, pty_fd: int, target, output_list, proc: subprocess.Popen):
+        """Read from PTY file descriptor in chunks and stream to output."""
         try:
             while True:
-                # Try immediate non-blocking read first (catches fast-exiting processes)
                 try:
-                    # Set non-blocking mode
-                    flags = fcntl.fcntl(pty_fd, fcntl.F_GETFL)
-                    fcntl.fcntl(pty_fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
-
-                    data = os.read(pty_fd, 4096)
-                    if not self._handle_data(data, target, output_list):
+                    if not self._try_immediate_read(pty_fd, target, output_list):
                         break
-
-                    # Restore blocking mode
-                    fcntl.fcntl(pty_fd, fcntl.F_SETFL, flags)
                 except BlockingIOError:
-                    # No data available yet, restore blocking mode and wait with select
-                    fcntl.fcntl(pty_fd, fcntl.F_SETFL, flags)
-
-                    # Wait for data to be available
-                    ready, _, _ = select.select([pty_fd], [], [], 0.1)
-
-                    if ready:
-                        try:
-                            data = os.read(pty_fd, 4096)
-                        except OSError as e:
-                            # EIO (errno 5) means PTY slave closed - treat as EOF
-                            # This can happen in CI environments when process exits
-                            if e.errno == errno.EIO:
-                                break
-                            raise
-                        if not self._handle_data(data, target, output_list):
-                            break
-
-                # Check if process exited after reading data
+                    if not self._blocking_pty_read(pty_fd, target, output_list):
+                        break
+
                 if proc.poll() is not None:
                     self._drain_pty(pty_fd, target, output_list)
                     break

{bakefile-0.0.9.dist-info → bakefile-0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bakefile
-Version: 0.0.9
+Version: 0.0.10
 Summary: Add your description here
 Author: Wisaroot Lertthaweedech
 Author-email: Wisaroot Lertthaweedech <l.wisaroot@gmail.com>

{bakefile-0.0.9.dist-info → bakefile-0.0.10.dist-info}/RECORD

@@ -28,7 +28,7 @@ bake/cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bake/cli/utils/version.py,sha256=aiweLD0vDezBlJAcCC99oMms71WGD9CWSJuZ4i3VLHA,390
 bake/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bake/manage/add_inline.py,sha256=yefHmF33ghCB8NZ-v61ybeVsaeE8iDFvfRGeTAKg4I8,2245
-bake/manage/find_python.py,sha256=oVmd8KaSsgDQWHuGZpYiQx-DHn50P9EkRi6-YIad99E,7165
+bake/manage/find_python.py,sha256=67PAFPDA3fdSsDGjYfPcXOVUcgC63wg5mipjVIt1VUQ,7730
 bake/manage/lint.py,sha256=OqwYFF8GGvzHGVPuJcWMRAv5esXEIX4nQXdGcChnkqA,2394
 bake/manage/run_uv.py,sha256=QzlKeVpr20dXNDcwUgyJqnXT4MofRqK-6XkWpzBbUhE,3234
 bake/manage/write_bakefile.py,sha256=efGViLk7sh-QX9Mox7yQw_A1Tp7EOuc_vmSTbFmXUm0,736
@@ -45,7 +45,7 @@ bake/ui/params.py,sha256=yNDChJQkbeZSxQzXTSBrAPCbwsJ5zOK4s4sFHQPSnHs,140
 bake/ui/run/__init__.py,sha256=A671l5YVTRAtS47ewvaMCNwPRim_Wkof1am0WibxA2I,205
 bake/ui/run/run.py,sha256=qfDgy-YqcexJyHhSjnQ5IXipBDoK-umwKq-wAn8ZITU,17504
 bake/ui/run/script.py,sha256=fk7KiDklYDYpFGkH3wu-hZGI4OnvgcB8z5jtNt41Hg0,2263
-bake/ui/run/splitter.py,sha256=uS9v822aGkeA0mLu_OmVA2I0rgoLSvkoITMfCM75tVs,9025
+bake/ui/run/splitter.py,sha256=L6uCU3bzpoMgj891Q1BZnOtiWF07QFDcCOx9RyUqHKk,9198
 bake/ui/run/uv.py,sha256=3NpnjgAwQNijJiUT_H6U-3mTHQgBZPlJbNWEeYCZY1g,2077
 bake/ui/style.py,sha256=v9dferzV317Acb0GHpVK_niCj_s2HtL-yiToBZtXky4,70
 bake/utils/__init__.py,sha256=GUu_xlJy3RAHo6UcZXu2x4khxGqLHMA9Zos4hDiQIY8,326
@@ -59,10 +59,10 @@ bakelib/environ/base.py,sha256=azPUdc9C5zVU8iyXJrEm3uDfe39nG48DRAZiF9rTdHI,3753
 bakelib/environ/get_bakebook.py,sha256=LihxB3VDcVq81KJy1HT-N-beyt2C7ReWm2kMPrd7VlA,1563
 bakelib/environ/presets.py,sha256=IwHGeDeQe4e57k9_u_vBQ61bjMS5Z2Jj9zkXw6YJHAE,1943
 bakelib/space/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bakelib/space/base.py,sha256=bJlpPkP85xBu8X5fJoVaHrMzX27rQrYTEPSObwBANJ8,6008
+bakelib/space/base.py,sha256=4afkB2Cmq3kP-xBeL45lvmmOhARsA-m5F1-rEPLAgEc,5871
 bakelib/space/python.py,sha256=0qxjIQ1SYIvDkaeQjkykE2t8doBUTl1MONK8cuG5juo,2793
 bakelib/space/utils.py,sha256=xx4X_txhDH_p97CKJ-KuvFpgfNBC0y_din1IBlUVusU,2983
-bakefile-0.0.9.dist-info/WHEEL,sha256=XV0cjMrO7zXhVAIyyc8aFf1VjZ33Fen4IiJk5zFlC3g,80
-bakefile-0.0.9.dist-info/entry_points.txt,sha256=Ecvvh7BYHCPJ0UdntrDc3Od6AZdRPXN5Z7o_7ok_0Qw,107
-bakefile-0.0.9.dist-info/METADATA,sha256=ed15p6Yb_Bx_nnsu2rxVCsL7_AfSbu3Plr2-XHiKIIU,2367
-bakefile-0.0.9.dist-info/RECORD,,
+bakefile-0.0.10.dist-info/WHEEL,sha256=XV0cjMrO7zXhVAIyyc8aFf1VjZ33Fen4IiJk5zFlC3g,80
+bakefile-0.0.10.dist-info/entry_points.txt,sha256=Ecvvh7BYHCPJ0UdntrDc3Od6AZdRPXN5Z7o_7ok_0Qw,107
+bakefile-0.0.10.dist-info/METADATA,sha256=sb-rcoJxanUjkn2dA-9ZfOg0aaXdlVF4ys-ATVVjuuk,2368
+bakefile-0.0.10.dist-info/RECORD,,

bakelib/space/base.py

@@ -57,20 +57,16 @@ class BaseSpace(Bakebook):
                 help="Patterns to exclude",
             ),
         ] = None,
-        use_default_excludes: Annotated[
+        default_excludes: Annotated[
             bool,
-            typer.Option(
-                "--no-default-excludes",
-                help="Do not apply default exclude patterns",
-                is_flag=True,
-            ),
-        ] = False,
+            typer.Option(help="Apply default exclude patterns (.env, .cache)"),
+        ] = True,
     ) -> None:
         results = ctx.run("git clean -fdX -n", stream=False, dry_run=False, echo=True)
 
         exclude_patterns: set[str] = set(exclude_patterns if exclude_patterns else [])
 
-        if not use_default_excludes:
+        if default_excludes:
             exclude_patterns |= {".env", ".cache"}
 
         console.err.print(f"Exclude pattens: {exclude_patterns}")
@@ -175,7 +171,6 @@ class BaseSpace(Bakebook):
                 "--skip-test",
                 "-s",
                 help="Skip running tests",
-                is_flag=True,
             ),
         ] = False,
     ) -> None: