Skip to content

Commit 22d461f

Browse files
[Andrew Polyakov] python-executor imports fix
1 parent a17aca9 commit 22d461f

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

utbot-python-executor/src/main/python/utbot_executor/utbot_executor/deep_serialization/json_converter.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
MemoryDump, IteratorMemoryObject, NdarrayMemoryObject,
1515
)
1616
from utbot_executor.deep_serialization.utils import PythonId, TypeInfo
17-
import numpy as np
17+
try:
18+
import numpy as np
19+
except ImportError:
20+
import sys
21+
print("numpy is not installed", file=sys.stderr)
1822

1923

2024
class MemoryObjectEncoder(json.JSONEncoder):

utbot-python-executor/src/main/python/utbot_executor/utbot_executor/deep_serialization/memory_objects.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
import typing
99
from itertools import zip_longest
1010
from typing import Any, Callable, Dict, List, Optional, Set, Type, Iterable
11-
import numpy as np
11+
try:
12+
import numpy as np
13+
except ImportError:
14+
import sys
15+
print("numpy is not installed", file=sys.stderr)
1216

1317
from utbot_executor.deep_serialization.config import PICKLE_PROTO
1418
from utbot_executor.deep_serialization.iterator_wrapper import IteratorWrapper

utbot-python-executor/src/main/python/utbot_executor/utbot_executor/executor.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ def add_imports(imports: Iterable[str]):
8787
globals()[submodule_name] = importlib.import_module(
8888
submodule_name
8989
)
90-
except ModuleNotFoundError:
90+
except ModuleNotFoundError as e:
9191
logging.warning("Import submodule %s failed", submodule_name)
92+
raise e
9293
logging.debug("Submodule #%d: OK", i)
9394

9495
def run_function(self, request: ExecutionRequest) -> ExecutionResponse:
@@ -115,6 +116,9 @@ def run_reduce_function(self, request: ExecutionRequest) -> ExecutionResponse:
115116
self.add_imports(request.imports)
116117
loader.add_syspaths(request.syspaths)
117118
loader.add_imports(request.imports)
119+
except ModuleNotFoundError as _:
120+
logging.debug("Error \n%s", traceback.format_exc())
121+
return ExecutionFailResponse("fail", traceback.format_exc())
118122
except Exception as _:
119123
logging.debug("Error \n%s", traceback.format_exc())
120124
return ExecutionFailResponse("fail", traceback.format_exc())

utbot-python-executor/src/main/python/utbot_executor/utbot_executor/memory_compressor.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
from utbot_executor.deep_serialization.memory_objects import MemoryDump
44
from utbot_executor.deep_serialization.utils import PythonId
55

6-
import numpy as np
7-
6+
try:
7+
import numpy as np
8+
except ImportError:
9+
import sys
10+
print("numpy is not installed", file=sys.stderr)
811

912
def compress_memory(
1013
ids: typing.List[PythonId],

0 commit comments

Comments
 (0)