-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Include utbot-executor and fix bugs (#2548)
- Loading branch information
1 parent
d8d5197
commit b775394
Showing
53 changed files
with
2,629 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| dist/ | ||
| __pycache__/ | ||
| build/ | ||
| develop-eggs/ | ||
| eggs/ | ||
| .eggs/ | ||
| lib/ | ||
| lib64/ | ||
| parts/ | ||
| sdist/ | ||
| var/ | ||
| wheels/ | ||
| share/python-wheels/ | ||
| *.egg-info/ | ||
| .installed.cfg | ||
| *.egg | ||
| MANIFEST | ||
| .pytest_cache/ | ||
| poetry.lock | ||
| .env/ | ||
| .venv/ | ||
| env/ | ||
| venv/ | ||
| .mypy_cache/ | ||
| .dmypy.json | ||
| dmypy.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| val kotlinLoggingVersion: String? by rootProject | ||
|
|
||
| val utbotExecutorVersion = File(project.projectDir, "src/main/resources/utbot_executor_version").readText() | ||
| // these two properties --- from GRADLE_USER_HOME/gradle.properties | ||
| val pypiToken: String? by project | ||
| val pythonInterpreter: String? by project | ||
| val utbotExecutorPath = File(project.projectDir, "src/main/python/utbot_executor") | ||
| val localUtbotExecutorPath = File(utbotExecutorPath, "dist") | ||
|
|
||
| tasks.register("cleanDist") { | ||
| group = "python" | ||
| delete(localUtbotExecutorPath.canonicalPath) | ||
| } | ||
|
|
||
| val installPoetry = | ||
| if (pythonInterpreter != null) { | ||
| tasks.register<Exec>("installPoetry") { | ||
| group = "python" | ||
| workingDir = utbotExecutorPath | ||
| commandLine(pythonInterpreter, "-m", "pip", "install", "poetry") | ||
| } | ||
| } else { | ||
| null | ||
| } | ||
|
|
||
| val setExecutorVersion = | ||
| if (pythonInterpreter != null) { | ||
| tasks.register<Exec>("setVersion") { | ||
| dependsOn(installPoetry!!) | ||
| group = "python" | ||
| workingDir = utbotExecutorPath | ||
| commandLine(pythonInterpreter, "-m", "poetry", "version", utbotExecutorVersion) | ||
| } | ||
| } else { | ||
| null | ||
| } | ||
|
|
||
| val buildExecutor = | ||
| if (pythonInterpreter != null) { | ||
| tasks.register<Exec>("buildUtbotExecutor") { | ||
| dependsOn(setExecutorVersion!!) | ||
| group = "python" | ||
| workingDir = utbotExecutorPath | ||
| commandLine(pythonInterpreter, "-m", "poetry", "build") | ||
| } | ||
| } else { | ||
| null | ||
| } | ||
|
|
||
| if (pythonInterpreter != null && pypiToken != null) { | ||
| tasks.register<Exec>("publishUtbotExecutor") { | ||
| dependsOn(buildExecutor!!) | ||
| group = "python" | ||
| workingDir = utbotExecutorPath | ||
| commandLine( | ||
| pythonInterpreter, | ||
| "-m", | ||
| "poetry", | ||
| "publish", | ||
| "-u", | ||
| "__token__", | ||
| "-p", | ||
| pypiToken | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| val installExecutor = | ||
| if (pythonInterpreter != null) { | ||
| tasks.register<Exec>("installUtbotExecutor") { | ||
| dependsOn(buildExecutor!!) | ||
| group = "python" | ||
| environment("PIP_FIND_LINKS" to localUtbotExecutorPath.canonicalPath) | ||
| commandLine( | ||
| pythonInterpreter, | ||
| "-m", | ||
| "pip", | ||
| "install", | ||
| "utbot_executor==$utbotExecutorVersion" | ||
| ) | ||
| } | ||
| } else { | ||
| null | ||
| } | ||
|
|
||
| val installPytest = | ||
| if (pythonInterpreter != null) { | ||
| tasks.register<Exec>("installPytest") { | ||
| group = "pytest" | ||
| workingDir = utbotExecutorPath | ||
| commandLine(pythonInterpreter, "-m", "pip", "install", "pytest") | ||
| } | ||
| } else { | ||
| null | ||
| } | ||
|
|
||
| if (pythonInterpreter != null) { | ||
| tasks.register<Exec>("runTests") { | ||
| dependsOn(installExecutor!!) | ||
| dependsOn(installPytest!!) | ||
| group = "pytest" | ||
| workingDir = utbotExecutorPath | ||
| commandLine( | ||
| pythonInterpreter, | ||
| "-m", | ||
| "pytest", | ||
| ) | ||
| } | ||
| } |
4 changes: 4 additions & 0 deletions
4
utbot-python-executor/src/main/kotlin/org/utbot/python/UtbotExecutor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package org.utbot.python | ||
|
|
||
| class UtbotExecutor { | ||
| } |
127 changes: 127 additions & 0 deletions
127
utbot-python-executor/src/main/python/utbot_executor/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| # UtBot Executor | ||
|
|
||
| Util for python code execution and state serialization. | ||
|
|
||
| ## Installation | ||
|
|
||
| You can install module from [PyPI](https://pypi.org/project/utbot-executor/): | ||
|
|
||
| ```bash | ||
| python -m pip install utbot-executor | ||
| ``` | ||
|
|
||
| ## Usage | ||
|
|
||
| ### From console with socket listener | ||
|
|
||
| Run with your `<hostname>` and `<port>` for socket connection | ||
| ```bash | ||
| $ python -m utbot_executor <hostname> <port> <logfile> [<loglevel DEBUG | INFO | ERROR>] <coverage_hostname> <coverage_port> | ||
| ``` | ||
|
|
||
| ### Request format | ||
| ```json | ||
| { | ||
| "functionName": "f", | ||
| "functionModule": "my_module.submod1", | ||
| "imports": ["sys", "math", "json"], | ||
| "syspaths": ["/home/user/my_project/"], | ||
| "argumentsIds": ["1", "2"], | ||
| "kwargumentsIds": ["4", "5"], | ||
| "serializedMemory": "string", | ||
| "filepath": ["/home/user/my_project/my_module/submod1.py"], | ||
| "coverageId": "1" | ||
| } | ||
| ``` | ||
|
|
||
| * `functionName` - name of the tested function | ||
| * `functionModule` - name of the module of the tested function | ||
| * `imports` - all modules which need to run function with current arguments | ||
| * `syspaths` - all syspaths which need to import modules (usually it is a project root) | ||
| * `argumentsIds` - list of argument's ids | ||
| * `kwargumentsIds` - list of keyword argument's ids | ||
| * `serializedMemory` - serialized memory throw `deep_serialization` algorithm | ||
| * `filepath` - path to the tested function's containing file | ||
| * `coverageId` - special id witch will be used for sending information about covered lines | ||
|
|
||
| ### Response format: | ||
|
|
||
| If execution is successful: | ||
| ```json | ||
| { | ||
| "status": "success", | ||
| "isException": false, | ||
| "statements": [1, 2, 3], | ||
| "missedStatements": [4, 5], | ||
| "stateInit": "string", | ||
| "stateBefore": "string", | ||
| "stateAfter": "string", | ||
| "diffIds": ["3", "4"], | ||
| "argsIds": ["1", "2", "3"], | ||
| "kwargs": ["4", "5", "6"], | ||
| "resultId": "7" | ||
| } | ||
| ``` | ||
|
|
||
| * `status` - always "success" | ||
| * `isException` - boolean value, if it is `true`, execution ended with an exception | ||
| * `statements` - list of the numbers of covered rows | ||
| * `missedStatements` - list of numbers of uncovered rows | ||
| * `stateInit` - serialized states from request | ||
| * `stateBefore` - serialized states of arguments before execution | ||
| * `stateAfter` - serialized states of arguments after execution | ||
| * `diffIds` - ids of the objects which have been changed | ||
| * `argsIds` - ids of the function's arguments | ||
| * `kwargsIds` - ids of the function's keyword arguments | ||
| * `resultId` - id of the returned value | ||
|
|
||
| or error format if there was exception in running algorith: | ||
|
|
||
| ```json | ||
| { | ||
| "status": "fail", | ||
| "exception": "stacktrace" | ||
| } | ||
| ``` | ||
| * `status` - always "fail" | ||
| * `exception` - string representation of the exception stack trace | ||
|
|
||
| ### Submodule `deep_serialization` | ||
|
|
||
| JSON serializer and deserializer for python objects | ||
|
|
||
| #### States memory json-format | ||
|
|
||
| ```json | ||
| { | ||
| "objects": { | ||
| "id": { | ||
| "id": "1", | ||
| "strategy": "strategy name", | ||
| "typeinfo": { | ||
| "module": "builtins", | ||
| "kind": "int" | ||
| }, | ||
| "comparable": true, | ||
|
|
||
| // iff strategy is 'repr' | ||
| "value": "1", | ||
|
|
||
| // iff strategy is 'list' or 'dict' | ||
| "items": ["3", "2"], | ||
|
|
||
| // iff strategy = 'reduce' | ||
| "constructor": "mymod.A.__new__", | ||
| "args": ["mymod.A"], | ||
| "state": {"a": "4", "b": "5"}, | ||
| "listitems": ["7", "8"], | ||
| "dictitems": {"ka": "10"} | ||
| } | ||
| } | ||
| } | ||
| ``` | ||
|
|
||
|
|
||
| ## Source | ||
|
|
||
| GitHub [repository](https://github.com/tamarinvs19/utbot_executor) |
21 changes: 21 additions & 0 deletions
21
utbot-python-executor/src/main/python/utbot_executor/pyproject.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| [tool.poetry] | ||
| name = "utbot-executor" | ||
| version = "1.4.41" | ||
| description = "" | ||
| authors = ["Vyacheslav Tamarin <[email protected]>"] | ||
| readme = "README.md" | ||
| packages = [{include = "utbot_executor"}] | ||
|
|
||
| [tool.poetry.dependencies] | ||
| python = "^3.8" | ||
|
|
||
| [tool.poetry.dev-dependencies] | ||
| pytest = "^7.3" | ||
|
|
||
| [build-system] | ||
| requires = ["poetry-core"] | ||
| build-backend = "poetry.core.masonry.api" | ||
|
|
||
| [tool.poetry.scripts] | ||
| utbot-executor = "utbot_executor:utbot_executor" | ||
|
|
File renamed without changes.
2 changes: 2 additions & 0 deletions
2
utbot-python-executor/src/main/python/utbot_executor/tests/pytest.ini
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [pytest] | ||
| python_files = test_*.py *_test.py *_tests.py |
Oops, something went wrong.