support interact worker

src/aexpy/__init__.py

@@ -4,7 +4,7 @@
 from datetime import datetime
 from functools import cache
 
-__version__ = "0.4.3"
+__version__ = "0.4.4"
 
 COMMIT_ID = "<GIT_COMMIT>"
 SHORT_COMMIT_ID = COMMIT_ID[:7]

src/aexpy/cli.py

@@ -11,22 +11,10 @@
 
 import click
 
-from . import (
-    __version__,
-    BUILD_DATE,
-    SHORT_COMMIT_ID,
-    initializeLogging,
-    runInContainer,
-)
-from .models import (
-    ApiDescription,
-    ApiDifference,
-    Distribution,
-    ProduceState,
-    Product,
-    Release,
-    Report,
-)
+from . import (BUILD_DATE, SHORT_COMMIT_ID, __version__, initializeLogging,
+               runInContainer)
+from .models import (ApiDescription, ApiDifference, Distribution, ProduceState,
+                     Product, Release, Report)
 from .producers import ProduceContext, produce
 from .services import ServiceProvider, getService, loadServiceFromCode
 
@@ -290,10 +278,8 @@ def extractCore(
         elif temp:
             envBuilder = service.environmentBuilder(logger=context.logger)
         else:
-            from .environments import (
-                CurrentEnvironment,
-                SingleExecutionEnvironmentBuilder,
-            )
+            from .environments import (CurrentEnvironment,
+                                       SingleExecutionEnvironmentBuilder)
 
             envBuilder = SingleExecutionEnvironmentBuilder(
                 CurrentEnvironment(context.logger), context.logger

src/aexpy/io/__init__.py

@@ -4,14 +4,8 @@
 from pathlib import Path
 from typing import IO, Callable, Literal, overload, override
 
-from ..models import (
-    ApiDescription,
-    ApiDifference,
-    CoreProduct,
-    Distribution,
-    Product,
-    Report,
-)
+from ..models import (ApiDescription, ApiDifference, CoreProduct, Distribution,
+                      Product, Report)
 from ..utils import ensureDirectory
 
 

src/aexpy/services.py

@@ -1,12 +1,12 @@
 from contextlib import contextmanager
 from logging import Logger
 
-from . import __version__, SHORT_COMMIT_ID
+from . import SHORT_COMMIT_ID, __version__
 from .diffing import Differ
 from .environments import ExecutionEnvironment, ExecutionEnvironmentBuilder
 from .extracting import Extractor
 from .models import (ApiDescription, ApiDifference, Distribution, Product,
-                      Report)
+                     Report)
 from .preprocessing import Preprocessor
 from .producers import ProduceContext, produce
 from .reporting import Reporter

src/aexpy/tools/cli.py

@@ -102,7 +102,11 @@ def runimage(
     from .workers import AexPyDockerWorker
 
     worker = AexPyDockerWorker(
-        cwd=volume, verbose=clictx.verbose, compress=clictx.gzip, tag=tag
+        cwd=volume,
+        verbose=clictx.verbose,
+        compress=clictx.gzip,
+        tag=tag,
+        interact=clictx.interact,
     )
 
     result = worker.run(list(args), capture_output=False)

src/aexpy/tools/workers/__init__.py

@@ -14,7 +14,7 @@
 from ...extracting import Extractor
 from ...io import StreamProductSaver
 from ...models import (ApiDescription, ApiDifference, Distribution, Product,
-                      Report)
+                       Report)
 from ...producers import Producer
 from ...reporting import Reporter
 
@@ -42,10 +42,12 @@ def __init__(
         verbose: int = 0,
         compress: bool = False,
         cwd: Path | None = None,
+        interact: bool = False,
         logger: Logger | None = None,
     ) -> None:
         self.verbose = min(5, max(0, verbose))
         self.compress = compress
+        self.interact = interact
         self.logger = logger or logging.getLogger()
         self.cwd = cwd or Path(os.getcwd()).resolve()
 
@@ -59,6 +61,8 @@ def run(self, /, args: list[str], **kwargs) -> subprocess.CompletedProcess[bytes
         args = (
             self.getCommandPrefix()
             + (["-" + "v" * self.verbose] if self.verbose > 0 else [])
+            + (["--interact"] if self.interact else [])
+            + (["--gzip"] if self.compress else [])
             + args
         )
         self.logger.debug(f"Worker run args: {args}")
@@ -149,11 +153,12 @@ def __init__(
         verbose: int = 0,
         compress: bool = False,
         cwd: Path | None = None,
+        interact: bool = False,
         logger: Logger | None = None,
         *,
         tag: str = "",
     ) -> None:
-        super().__init__(verbose, compress, cwd, logger)
+        super().__init__(verbose, compress, cwd, interact, logger)
         self.tag = tag or self.defaultTag()
 
     def getImageTag(self, /, version: str):
@@ -165,23 +170,27 @@ def getCommandPrefix(self, /):
 
         try:
             import pwd
-            uid = os.getuid()               # type: ignore
+
+            uid = os.getuid()  # type: ignore
             gid = pwd.getpwuid(uid).pw_gid  # type: ignore
             user = f"{uid}:{gid}"
         except Exception:
             pass
-
-        return [
-            "docker",
-            "run",
-            "-i",
-            "-v",
-            f"{str(self.cwd.resolve())}:/data",
-            "-u",
-            user,
-            "--rm",
-            self.tag,
-        ] + (["--gzip"] if self.compress else [])
+
+        return (
+            [
+                "docker",
+                "run",
+                "-i",
+                "-v",
+                f"{str(self.cwd.resolve())}:/data",
+                "-u",
+                user,
+                "--rm",
+            ]
+            + (["-t"] if self.interact else [])
+            + [self.tag]
+        )
 
     @override
     def resolvePath(self, /, path):

src/aexpy/tools/workers/services.py

@@ -4,12 +4,12 @@
 from typing import Callable, override
 
 from ...environments import (CurrentEnvironment, ExecutionEnvironmentBuilder,
-                            SingleExecutionEnvironmentBuilder)
+                             SingleExecutionEnvironmentBuilder)
 from ...models import ApiDescription, Distribution
 from ...producers import ProduceContext
-from . import (AexPyDockerWorker, AexPyWorker, WorkerDiffer,
-                             WorkerExtractor, WorkerReporter)
 from ...services import ServiceProvider
+from . import (AexPyDockerWorker, AexPyWorker, WorkerDiffer, WorkerExtractor,
+               WorkerReporter)
 
 
 class WorkerServiceProvider(ServiceProvider):